Prevent API warnings on iOS if Bluetooth is disabled during timed scan

don · May 20, 2023 · 4601ef1 · 4601ef1
1 parent b728ffc
commit 4601ef1
Showing 1 changed file with 15 additions and 13 deletions.
diff --git a/src/ios/BLECentralPlugin.m b/src/ios/BLECentralPlugin.m
@@ -393,12 +393,7 @@ - (void)startScanWithOptions:(CDVInvokedUrlCommand*)command {
 
 - (void)stopScan:(CDVInvokedUrlCommand*)command {
     NSLog(@"stopScan");
-    [scanTimer invalidate];
-    scanTimer = nil;
-
-    if ([manager state] == CBManagerStatePoweredOn) {
-        [manager stopScan];
-    }
+    [self internalStopScan]
 
     if (discoverPeripheralCallbackId) {
         discoverPeripheralCallbackId = nil;
@@ -608,13 +603,7 @@ - (void)writeL2Cap:(CDVInvokedUrlCommand *)command {
 
 -(void)stopScanTimer:(NSTimer *)timer {
     NSLog(@"stopScanTimer");
-    [scanTimer invalidate];
-    scanTimer = nil;
-    [manager stopScan];
-
-    if (discoverPeripheralCallbackId) {
-        discoverPeripheralCallbackId = nil;
-    }
+    [self internalStopScan]
 }
 
 #pragma mark - CBCentralManagerDelegate
@@ -1221,4 +1210,17 @@ - (id) tryDecodeBinaryData:(id)value {
     return value;
 }
 
+- (void) internalStopScan {
+    [scanTimer invalidate];
+    scanTimer = nil;
+
+    if ([manager state] == CBManagerStatePoweredOn) {
+        [manager stopScan];
+    }
+
+    if (discoverPeripheralCallbackId) {
+        discoverPeripheralCallbackId = nil;
+    }
+}
+
 @end