Standardise all scans to go via scanWithOptions

don · May 6, 2023 · 6d507fd · 6d507fd
1 parent f131861
commit 6d507fd
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 85 deletions.
diff --git a/src/android/BLECentralPlugin.java b/src/android/BLECentralPlugin.java
@@ -64,8 +64,6 @@ public class BLECentralPlugin extends CordovaPlugin {
     private static final String BLUETOOTH_SCAN =  "android.permission.BLUETOOTH_SCAN" ; // API 31
 
     // actions
-    private static final String SCAN = "scan";
-    private static final String START_SCAN = "startScan";
     private static final String STOP_SCAN = "stopScan";
     private static final String START_SCAN_WITH_OPTIONS = "startScanWithOptions";
     private static final String BONDED_DEVICES = "bondedDevices";
@@ -210,21 +208,7 @@ public boolean execute(String action, CordovaArgs args, CallbackContext callback
         }
 
         boolean validAction = true;
-
-        if (action.equals(SCAN)) {
-
-            UUID[] serviceUUIDs = parseServiceUUIDList(args.getJSONArray(0));
-            int scanSeconds = args.getInt(1);
-            resetScanOptions();
-            findLowEnergyDevices(callbackContext, serviceUUIDs, scanSeconds);
-
-        } else if (action.equals(START_SCAN)) {
-
-            UUID[] serviceUUIDs = parseServiceUUIDList(args.getJSONArray(0));
-            resetScanOptions();
-            findLowEnergyDevices(callbackContext, serviceUUIDs, -1);
-
-        } else if (action.equals(STOP_SCAN)) {
+        if (action.equals(STOP_SCAN)) {
             stopScan();
             callbackContext.success();
 
@@ -1187,10 +1171,6 @@ public void onScanFailed(int errorCode) {
     };
 
 
-    private void findLowEnergyDevices(CallbackContext callbackContext, UUID[] serviceUUIDs, int scanSeconds) {
-        findLowEnergyDevices( callbackContext, serviceUUIDs, scanSeconds, new ScanSettings.Builder().build() );
-    }
-
     private void findLowEnergyDevices(CallbackContext callbackContext, UUID[] serviceUUIDs, int scanSeconds, ScanSettings scanSettings) {
 
         if (!locationServicesEnabled() && Build.VERSION.SDK_INT < 31) {

diff --git a/src/browser/BLECentralPlugin.js b/src/browser/BLECentralPlugin.js
@@ -16,14 +16,7 @@ function formatUUID(uuid) {
 
 module.exports = {
     deviceInfos: new Map(),
-
-    scan: function(services, seconds, success, failure) {
-        return this.startScanWithOptions(services, {}, success, failure);
-    },
-    startScan: function(services, success, failure) {
-        return this.startScanWithOptions(services, {}, success, failure);
-    },
-    startScanWithOptions: function(services, options, success, failure) {
+    startScanWithOptions: function (services, options, success, failure) {
         if (!navigator.bluetooth) {
             failure('Bluetooth is not supported on this browser.');
             return;

diff --git a/src/ios/BLECentralPlugin.h b/src/ios/BLECentralPlugin.h
@@ -43,8 +43,6 @@
 @property (strong, nonatomic) NSMutableSet *peripherals;
 @property (strong, nonatomic) CBCentralManager *manager;
 
-- (void)scan:(CDVInvokedUrlCommand *)command;
-- (void)startScan:(CDVInvokedUrlCommand *)command;
 - (void)startScanWithOptions:(CDVInvokedUrlCommand *)command;
 - (void)stopScan:(CDVInvokedUrlCommand *)command;
 - (void)connectedPeripheralsWithServices:(CDVInvokedUrlCommand*)command;

diff --git a/src/ios/BLECentralPlugin.m b/src/ios/BLECentralPlugin.m
@@ -354,50 +354,6 @@ - (void)isEnabled:(CDVInvokedUrlCommand*)command {
     [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
 }
 
-- (void)scan:(CDVInvokedUrlCommand*)command {
-    NSLog(@"scan");
-    if ([manager state] != CBManagerStatePoweredOn) {
-        NSString *error = @"Bluetooth is disabled";
-        NSLog(@"%@", error);
-        CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR
-                                                          messageAsString:error];
-        [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-        return;
-    }
-
-    discoverPeripheralCallbackId = [command.callbackId copy];
-
-    NSArray<NSString *> *serviceUUIDStrings = [command argumentAtIndex:0];
-    NSNumber *timeoutSeconds = [command argumentAtIndex:1];
-    NSArray<CBUUID *> *serviceUUIDs = [self uuidStringsToCBUUIDs:serviceUUIDStrings];
-
-    [manager scanForPeripheralsWithServices:serviceUUIDs options:nil];
-
-    [NSTimer scheduledTimerWithTimeInterval:[timeoutSeconds floatValue]
-                                     target:self
-                                   selector:@selector(stopScanTimer:)
-                                   userInfo:[command.callbackId copy]
-                                    repeats:NO];
-}
-
-- (void)startScan:(CDVInvokedUrlCommand*)command {
-    NSLog(@"startScan");
-    if ([manager state] != CBManagerStatePoweredOn) {
-        NSString *error = @"Bluetooth is disabled";
-        NSLog(@"%@", error);
-        CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR
-                                                          messageAsString:error];
-        [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-        return;
-    }
-
-    discoverPeripheralCallbackId = [command.callbackId copy];
-    NSArray<NSString *> *serviceUUIDStrings = [command argumentAtIndex:0];
-    NSArray<CBUUID *> *serviceUUIDs = [self uuidStringsToCBUUIDs:serviceUUIDStrings];
-
-    [manager scanForPeripheralsWithServices:serviceUUIDs options:nil];
-}
-
 - (void)startScanWithOptions:(CDVInvokedUrlCommand*)command {
     NSLog(@"startScanWithOptions");
     if ([manager state] != CBManagerStatePoweredOn) {

diff --git a/www/ble.js b/www/ble.js
@@ -51,19 +51,11 @@ var autoconnected = {};
 
 module.exports = {
     scan: function (services, seconds, success, failure) {
-        var successWrapper = function (peripheral) {
-            convertToNativeJS(peripheral);
-            success(peripheral);
-        };
-        cordova.exec(successWrapper, failure, 'BLE', 'scan', [services, seconds]);
+        module.exports.startScanWithOptions(services, { duration: seconds }, success, failure);
     },
 
     startScan: function (services, success, failure) {
-        var successWrapper = function (peripheral) {
-            convertToNativeJS(peripheral);
-            success(peripheral);
-        };
-        cordova.exec(successWrapper, failure, 'BLE', 'startScan', [services]);
+        module.exports.startScanWithOptions(services, undefined, success, failure);
     },
 
     stopScan: function (success, failure) {