meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix #77: when shutting down interfaces, cancel any retry attempts

Browse source
This commit is contained in:
geeksville 2020-07-01 16:31:23 -07:00
parent 41bd082296
commit 800060a991
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/com/geeksville/mesh/service/BluetoothInterface.kt
View file

@ -10,6 +10,7 @@ import com.geeksville.concurrent.handledLaunch
import com.geeksville.util.anonymize
import com.geeksville.util.exceptionReporter
import com.geeksville.util.ignoreException
import kotlinx.coroutines.CancellationException
import kotlinx.coroutines.Job
import kotlinx.coroutines.delay
import java.lang.reflect.Method
@ -319,7 +320,7 @@ class BluetoothInterface(val service: RadioInterfaceService, val address: String
* Some buggy BLE stacks can fail on initial connect, with either missing services or missing characteristics. If that happens we
* disconnect and try again when the device reenumerates.
*/
private suspend fun retryDueToException() {
private suspend fun retryDueToException() = try {
/// We gracefully handle safe being null because this can occur if someone has unpaired from our device - just abandon the reconnect attempt
val s = safe
if (s != null) {
@ -340,6 +341,8 @@ class BluetoothInterface(val service: RadioInterfaceService, val address: String
} else {
warn("Abandoning reconnect because safe==null, someone must have closed the device")
}
} catch (ex: CancellationException) {
warn("retryDueToException was cancelled")
}
/// We only try to set MTU once, because some buggy implementations fail
@ -424,6 +427,9 @@ class BluetoothInterface(val service: RadioInterfaceService, val address: String
override fun close() {
reconnectJob?.cancel() // Cancel any queued reconnect attempts
reconnectJob = null
if (safe != null) {
info("Closing BluetoothInterface")
val s = safe