From 73de2c33c2ae36a7e904c5c7dddb1963459f3413 Mon Sep 17 00:00:00 2001 From: geeksville Date: Wed, 17 Jun 2020 14:02:58 -0700 Subject: [PATCH] fix autobug if old work items run after gatt is destroyed --- .../main/java/com/geeksville/mesh/service/SafeBluetooth.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/geeksville/mesh/service/SafeBluetooth.kt b/app/src/main/java/com/geeksville/mesh/service/SafeBluetooth.kt index f3cb6caf3..669323f31 100644 --- a/app/src/main/java/com/geeksville/mesh/service/SafeBluetooth.kt +++ b/app/src/main/java/com/geeksville/mesh/service/SafeBluetooth.kt @@ -608,7 +608,7 @@ class SafeBluetooth(private val context: Context, private val device: BluetoothD cont: Continuation ) = queueWork("reqMtu", cont, 5 * 1000) { isSettingMtu = true - gatt!!.requestMtu(len) + gatt?.requestMtu(len) ?: false } fun asyncRequestMtu( @@ -629,7 +629,7 @@ class SafeBluetooth(private val context: Context, private val device: BluetoothD ) = queueWork("writeC ${c.uuid}", cont) { currentReliableWrite = null c.value = v - gatt!!.writeCharacteristic(c) + gatt?.writeCharacteristic(c) ?: false } fun asyncWriteCharacteristic( @@ -653,7 +653,7 @@ class SafeBluetooth(private val context: Context, private val device: BluetoothD ) = queueWork("rwriteC ${c.uuid}", cont) { logAssert(gatt!!.beginReliableWrite()) currentReliableWrite = c.value.clone() - gatt!!.writeCharacteristic(c) + gatt?.writeCharacteristic(c) ?: false } /* fun asyncWriteReliable(