TySS-Dev/capod
1
0
Fork 0
mirror of https://github.com/d4rken-org/capod.git synced 2026-09-16 11:16:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling of Bluetooth enable/disable and restarting the monitor.

Browse Source
This commit is contained in:
darken
2022-01-26 13:11:01 +01:00
parent 0bbcfb5e88
commit a6fda04640
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/eu/darken/capod/monitor/core/PodMonitor.kt
+5 -3
View File
@@ -4,7 +4,6 @@ import eu.darken.capod.common.bluetooth.BleScanner
import eu.darken.capod.common.bluetooth.BluetoothManager2 import eu.darken.capod.common.bluetooth.BluetoothManager2
import eu.darken.capod.common.coroutine.AppScope import eu.darken.capod.common.coroutine.AppScope
import eu.darken.capod.common.debug.logging.Logging.Priority.* import eu.darken.capod.common.debug.logging.Logging.Priority.*
import eu.darken.capod.common.debug.logging.asLog
import eu.darken.capod.common.debug.logging.log import eu.darken.capod.common.debug.logging.log
import eu.darken.capod.common.debug.logging.logTag import eu.darken.capod.common.debug.logging.logTag
import eu.darken.capod.common.flow.replayingShare import eu.darken.capod.common.flow.replayingShare
@@ -12,6 +11,7 @@ import eu.darken.capod.main.core.GeneralSettings
import eu.darken.capod.pods.core.PodDevice import eu.darken.capod.pods.core.PodDevice
import eu.darken.capod.pods.core.PodFactory import eu.darken.capod.pods.core.PodFactory
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.* import kotlinx.coroutines.flow.*
import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock import kotlinx.coroutines.sync.withLock
@@ -95,8 +95,10 @@ class PodMonitor @Inject constructor(
(aboveTresholdSorted + belowThresholdSorted).sortedByDescending { it == main } (aboveTresholdSorted + belowThresholdSorted).sortedByDescending { it == main }
} }
.onStart { emit(emptyList()) } .onStart { emit(emptyList()) }
.catch { .retryWhen { cause, attempt ->
log(TAG, ERROR) { "PodMonitor failed:\n${it.asLog()}" } log(TAG, WARN) { "PodMonitor failed (attempt=$attempt), will retry: $cause" }
delay(3000)
true
} }
.replayingShare(appScope) .replayingShare(appScope)