Merge pull request Fitbit#17 from Fitbit/irvin/bugfix/fix-max-client-…

…if-bug PI scans must be stopped
MC10Inc · Oct 11, 2019 · bd54b12 · bd54b12
2 parents ce78c08 + ffe5c85
commit bd54b12
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 8 deletions.
diff --git a/src/main/java/com/fitbit/bluetooth/fbgatt/FitbitGatt.java b/src/main/java/com/fitbit/bluetooth/fbgatt/FitbitGatt.java
@@ -115,6 +115,7 @@ public class FitbitGatt implements PeripheralScanner.TrackerScannerListener, Blu
     @VisibleForTesting
     AtomicBoolean isStarted = new AtomicBoolean(false);
     private Handler connectionCleanup;
+    @Nullable
     private LooperWatchdog asyncOperationThreadWatchdog;
     // this should be max priority so as to not affect performance
     private HandlerThread fitbitGattAsyncOperationThread = new HandlerThread("FitbitGatt Async Operation Thread", Thread.MAX_PRIORITY);
@@ -831,7 +832,9 @@ private synchronized boolean startSimple(Context context) {
         addConnectedDevices(context);
         // will start the cleanup process
         decrementAndInvalidateClosedConnections();
-        asyncOperationThreadWatchdog.startProbing();
+        if(asyncOperationThreadWatchdog != null) {
+            asyncOperationThreadWatchdog.startProbing();
+        }
         return true;
     }
 
@@ -891,7 +894,9 @@ void shutdown() {
             radioStatusListener.stopListening();
             radioStatusListener.removeListener();
         }
-        this.asyncOperationThreadWatchdog.stopProbing();
+        if(asyncOperationThreadWatchdog != null) {
+            this.asyncOperationThreadWatchdog.stopProbing();
+        }
     }
 
     @VisibleForTesting

diff --git a/src/main/java/com/fitbit/bluetooth/fbgatt/PeripheralScanner.java b/src/main/java/com/fitbit/bluetooth/fbgatt/PeripheralScanner.java
@@ -466,12 +466,13 @@ public boolean isPeriodicalScanEnabled() {
 
     synchronized void cancelPendingIntentBasedBackgroundScan() {
         if (atLeastSDK(Build.VERSION_CODES.O)) {
+            Context appContext = FitbitGatt.getInstance().getAppContext();
             if (!scanner.isBluetoothEnabled()) {
                 Timber.v("No scanners can be started while bluetooth is off");
                 // must release the scanner here so that the system can clean it up since
                 // we can't access it with bt off
                 synchronized (PeripheralScanner.class) {
-                    scanner = new BitgattLeScanner(FitbitGatt.getInstance().getAppContext());
+                    scanner = new BitgattLeScanner(appContext);
                 }
                 boolean oldValue = pendingIntentIsScanning.getAndSet(false);
                 Timber.v("Stopping scan, changing from %b to %b", oldValue, false);
@@ -480,6 +481,9 @@ synchronized void cancelPendingIntentBasedBackgroundScan() {
             }
             if (backgroundIntentBasedScanIntent != null) {
                 scanner.stopScan(backgroundIntentBasedScanIntent);
+            } else {
+                Timber.i("No existing pending intent, cancelling using system intent just in case ...");
+                scanner.stopScan(getSystemPendingIntent(appContext));
             }
             stopPeriodicalScan = false;
             backgroundIntentBasedScanIntent = null;
@@ -535,11 +539,7 @@ synchronized boolean startPendingIntentBasedBackgroundScan(@NonNull List<ScanFil
                 listener.onPendingIntentScanStatusChanged(pendingIntentIsScanning.get());
                 return false;
             }
-            Intent broadcastIntent = new Intent(context, HandleIntentBasedScanResult.class);
-            broadcastIntent.setAction(SCANNED_DEVICE_ACTION);
-            broadcastIntent.setClass(context, HandleIntentBasedScanResult.class);
-            backgroundIntentBasedScanIntent = PendingIntent.getBroadcast(context,
-                BACKGROUND_SCAN_REQUEST_CODE, broadcastIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+            backgroundIntentBasedScanIntent = getSystemPendingIntent(context);
             int didStart;
             try {
                 didStart = scanner.startScan(scanFilters, null, backgroundIntentBasedScanIntent);
@@ -589,6 +589,14 @@ synchronized boolean startPendingIntentBasedBackgroundScan(@NonNull List<ScanFil
         }
     }
 
+    private PendingIntent getSystemPendingIntent(Context context){
+        Intent broadcastIntent = new Intent(context, HandleIntentBasedScanResult.class);
+        broadcastIntent.setAction(SCANNED_DEVICE_ACTION);
+        broadcastIntent.setClass(context, HandleIntentBasedScanResult.class);
+        return PendingIntent.getBroadcast(context,
+            BACKGROUND_SCAN_REQUEST_CODE, broadcastIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+    }
+
     /**
      * Will start a background scan that will continue to run even if our process is killed.
      *