Merge branch 'master' into usb

app/src/main/java/com/geeksville/mesh/service/BluetoothInterfaceService.kt

@@ -312,14 +312,20 @@ class BluetoothInterfaceService : InterfaceService() {
             DataPair(1)
         )
 
-        warn("Forcing disconnect and hopefully device will comeback (disabling forced refresh)")
+        /// We gracefully handle safe being null because this can occur if someone has unpaired from our device - just abandon the reconnect attempt
-        hasForcedRefresh = true
+        val s = safe
-        ignoreException {
+        if (s != null) {
-            safe!!.closeConnection()
+            warn("Forcing disconnect and hopefully device will comeback (disabling forced refresh)")
+            hasForcedRefresh = true
+            ignoreException {
+                s.closeConnection()
+            }
+            delay(1000) // Give some nasty time for buggy BLE stacks to shutdown (500ms was not enough)
+            warn("Attempting reconnect")
+            startConnect()
+        } else {
+            warn("Abandoning reconnect because safe==null, someone must have closed the device")
         }
-        delay(1000) // Give some nasty time for buggy BLE stacks to shutdown (500ms was not enough)
-        warn("Attempting reconnect")
-        startConnect()
     }
 
     /// We only try to set MTU once, because some buggy implementations fail