Fix issue on phones that don't stop scanning properly when toggling b…

…luetooth
weliem · Oct 22, 2021 · d29b82f · d29b82f
1 parent 55bbbef
commit d29b82f
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/blessed/src/main/java/com/welie/blessed/BluetoothCentralManager.java b/blessed/src/main/java/com/welie/blessed/BluetoothCentralManager.java
@@ -407,6 +407,10 @@ private void startScan(@NotNull final List<ScanFilter> filters, @NotNull final S
 
         if (bluetoothScanner == null) {
             bluetoothScanner = bluetoothAdapter.getBluetoothLeScanner();
+
+            // On some phones like Nokia 8, this scanner may still have an older active scan from us
+            // This happens when bluetooth is toggled. So make sure it is gone.
+            bluetoothScanner.stopScan(scanCallback);
         }
 
         if (bluetoothScanner != null) {
@@ -567,6 +571,7 @@ public void stopScan() {
         }
         currentCallback = null;
         currentFilters = null;
+        bluetoothScanner = null;
         scannedPeripherals.clear();
     }
 
@@ -1135,13 +1140,19 @@ private void handleAdapterState(final int state) {
                 break;
             case BluetoothAdapter.STATE_TURNING_OFF:
                 // Stop all scans so that we are back in a clean state
-                // Note that we can't call stopScan if the adapter is off
                 if (isScanning()) {
-                    stopScan();
+                    // Note that we can't call stopScan if the adapter is off
+                    // On some phones like the Nokia 8, the adapter will be already off at this point
+                    // So add a try/catch to handle any exceptions
+                    try {
+                        stopScan();
+                    } catch (Exception ignored) { }
                 }
 
                 if(isAutoScanning()) {
-                    stopAutoconnectScan();
+                    try {
+                        stopAutoconnectScan();
+                    } catch (Exception ignored) { }
                 }
 
                 expectingBluetoothOffDisconnects = true;
@@ -1151,6 +1162,7 @@ private void handleAdapterState(final int state) {
                 currentCallback = null;
                 currentFilters = null;
                 autoConnectScanner = null;
+                bluetoothScanner = null;
                 Logger.d(TAG,"bluetooth turning off");
                 break;
             case BluetoothAdapter.STATE_ON: