From 27a5601d2aca7edb413eb231eb8bdae941a022aa Mon Sep 17 00:00:00 2001
From: Sylwester Zielinski <sylwester.zielinski@nordicsemi.no>
Date: Thu, 20 Apr 2023 15:47:45 +0200
Subject: [PATCH] Fix crash when alarm is triggered before client is connected
 for PRX

---
 .../no/nordicsemi/android/prx/repository/PRXService.kt    | 8 ++++----
 settings.gradle.kts                                       | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/profile_prx/src/main/java/no/nordicsemi/android/prx/repository/PRXService.kt b/profile_prx/src/main/java/no/nordicsemi/android/prx/repository/PRXService.kt
index 9cef5629..9de087b6 100644
--- a/profile_prx/src/main/java/no/nordicsemi/android/prx/repository/PRXService.kt
+++ b/profile_prx/src/main/java/no/nordicsemi/android/prx/repository/PRXService.kt
@@ -100,10 +100,6 @@ internal class PRXService : NotificationService() {
             .onEach { disconnect() }
             .launchIn(lifecycleScope)
 
-        repository.remoteAlarmLevel
-            .onEach { writeAlertLevel(it) }
-            .launchIn(lifecycleScope)
-
         return START_REDELIVER_INTENT
     }
 
@@ -180,6 +176,10 @@ internal class PRXService : NotificationService() {
             .filterNotNull()
             .onEach { configureGatt(it, device) }
             .launchIn(lifecycleScope)
+
+        repository.remoteAlarmLevel
+            .onEach { writeAlertLevel(it) }
+            .launchIn(lifecycleScope)
     }
 
     private suspend fun configureGatt(services: BleGattServices, device: ServerDevice) {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 316156d7..0ba54cf1 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -50,7 +50,7 @@ dependencyResolutionManagement {
     }
     versionCatalogs {
         create("libs") {
-            from("no.nordicsemi.android.gradle:version-catalog:1.4.2")
+            from("no.nordicsemi.android.gradle:version-catalog:1.4.3")
         }
     }
 }
@@ -79,6 +79,6 @@ include(":lib_utils")
 //    includeBuild("../Android-Common-Libraries")
 //}
 
-//if (file("../Kotlin-BLE-Library").exists()) {
-//    includeBuild("../Kotlin-BLE-Library")
-//}
+if (file("../Kotlin-BLE-Library").exists()) {
+    includeBuild("../Kotlin-BLE-Library")
+}