From 68cc4940210a62cc03d20c6d01c1eceac57f6d2f Mon Sep 17 00:00:00 2001 From: geeksville Date: Sun, 28 Jun 2020 16:09:37 -0700 Subject: [PATCH] autobug - don't fail if the gatt goes away while we are connecting --- .../com/geeksville/mesh/service/BluetoothInterface.kt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/geeksville/mesh/service/BluetoothInterface.kt b/app/src/main/java/com/geeksville/mesh/service/BluetoothInterface.kt index 3ec512a2e..6560919c4 100644 --- a/app/src/main/java/com/geeksville/mesh/service/BluetoothInterface.kt +++ b/app/src/main/java/com/geeksville/mesh/service/BluetoothInterface.kt @@ -285,10 +285,11 @@ class BluetoothInterface(val service: RadioInterfaceService, val address: String */ private fun forceServiceRefresh() { exceptionReporter { - // BluetoothGatt gatt - val gatt = safe!!.gatt!! - val refresh: Method = gatt.javaClass.getMethod("refresh") - refresh.invoke(gatt) + // If the gatt has been destroyed, skip the refresh attempt + safe?.gatt?.let { gatt -> + val refresh: Method = gatt.javaClass.getMethod("refresh") + refresh.invoke(gatt) + } } }