aljaz/Android-nRF-Toolbox
1
0
Fork 0
mirror of https://github.com/aljazceru/Android-nRF-Toolbox.git synced 2025-12-23 01:14:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash when alarm is triggered before client is connected for PRX

Browse Source
This commit is contained in:
Sylwester Zielinski
2023-04-20 15:47:45 +02:00
parent 221cb86caf
commit 27a5601d2a
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
profile_prx/src/main/java/no/nordicsemi/android/prx/repository/PRXService.kt
View File

@@ -100,10 +100,6 @@ internal class PRXService : NotificationService() {
.onEach { disconnect() } .onEach { disconnect() }
.launchIn(lifecycleScope) .launchIn(lifecycleScope)
repository.remoteAlarmLevel
.onEach { writeAlertLevel(it) }
.launchIn(lifecycleScope)
return START_REDELIVER_INTENT return START_REDELIVER_INTENT
} }
@@ -180,6 +176,10 @@ internal class PRXService : NotificationService() {
.filterNotNull() .filterNotNull()
.onEach { configureGatt(it, device) } .onEach { configureGatt(it, device) }
.launchIn(lifecycleScope) .launchIn(lifecycleScope)
repository.remoteAlarmLevel
.onEach { writeAlertLevel(it) }
.launchIn(lifecycleScope)
} }
private suspend fun configureGatt(services: BleGattServices, device: ServerDevice) { private suspend fun configureGatt(services: BleGattServices, device: ServerDevice) {

8
settings.gradle.kts
View File

@@ -50,7 +50,7 @@ dependencyResolutionManagement {
} }
versionCatalogs { versionCatalogs {
create("libs") { 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") // includeBuild("../Android-Common-Libraries")
//} //}
//if (file("../Kotlin-BLE-Library").exists()) { if (file("../Kotlin-BLE-Library").exists()) {
// includeBuild("../Kotlin-BLE-Library") includeBuild("../Kotlin-BLE-Library")
//} }