Merge pull request #259 from randdusing/wasConnected

wasConnected

Author: randdusing

readme.md

@@ -132,6 +132,7 @@ Neither Android nor iOS support Bluetooth on emulators, so you'll need to test o
 * [bluetoothle.isInitialized] (#isinitialized)
 * [bluetoothle.isEnabled] (#isenabled)
 * [bluetoothle.isScanning] (#isscanning)
+* [bluetoothle.wasConnected] (#wasconnected)
 * [bluetoothle.isConnected] (#isconnected)
 * [bluetoothle.isDiscovered] (#isdiscovered)
 * [bluetoothle.hasPermission] (#haspermission) (Android 6+)
@@ -1325,6 +1326,35 @@ bluetoothle.isScanning(isScanning);
 
 
 
+### wasConnected ###
+Determine whether the device was connected, or error if not initialized.
+
+```javascript
+bluetoothle.wasConnected(wasConnectedSuccess, wasConnectedError, params);
+```
+
+#### Params ####
+* address = The address/identifier provided by the scan's return object
+
+```javascript
+{
+  "address": "ECC037FD-72AE-AFC5-9213-CA785B3B5C63"
+}
+```
+
+##### Success #####
+* status => wasConnected = true/false
+
+```javascript
+{
+  "name": "Polar H7 3B321015",
+  "address": "ECC037FD-72AE-AFC5-9213-CA785B3B5C63",
+  "wasConnected": false
+}
+```
+
+
+
 ### isConnected ###
 Determine whether the device is connected, or error if not initialized or never connected to device.
 

src/android/BluetoothLePlugin.java

@@ -492,6 +492,13 @@ public void run() {
         }
       });
       return true;
+    } else if ("wasConnected".equals(action)) {
+      cordova.getThreadPool().execute(new Runnable() {
+        public void run() {
+          wasConnectedAction(args,callbackContext);
+        }
+      });
+      return true;
     } else if (isConnectedActionName.equals(action)) {
       cordova.getThreadPool().execute(new Runnable() {
         public void run() {
@@ -2427,6 +2434,47 @@ private void isScanningAction(CallbackContext callbackContext) {
     callbackContext.success(returnObj);
   }
 
+  private void wasConnectedAction(JSONArray args, CallbackContext callbackContext) {
+    if (isNotInitialized(callbackContext, true)) {
+      return;
+    }
+
+    JSONObject obj = getArgsObject(args);
+    if (isNotArgsObject(obj, callbackContext)) {
+      return;
+    }
+
+    String address = getAddress(obj);
+    if (isNotAddress(address, callbackContext)) {
+      return;
+    }
+
+    HashMap<Object, Object> connection = connections.get(address);
+    if (connection == null) {
+      JSONObject returnObj = new JSONObject();
+
+      addProperty(returnObj, "wasConnected", false);
+
+      addProperty(returnObj, keyAddress, address);
+
+      callbackContext.success(returnObj);
+
+      return;
+    }
+
+    BluetoothGatt bluetoothGatt = (BluetoothGatt)connection.get(keyPeripheral);
+
+    BluetoothDevice device = bluetoothGatt.getDevice();
+
+    JSONObject returnObj = new JSONObject();
+
+    addProperty(returnObj, "wasConnected", true);
+
+    addDevice(returnObj, device);
+
+    callbackContext.success(returnObj);
+  }
+
   private void isConnectedAction(JSONArray args, CallbackContext callbackContext) {
     if (isNotInitialized(callbackContext, true)) {
       return;

src/ios/BluetoothLePlugin.h

@@ -44,6 +44,7 @@
 - (void)isInitialized:(CDVInvokedUrlCommand *)command;
 - (void)isEnabled:(CDVInvokedUrlCommand *)command;
 - (void)isScanning:(CDVInvokedUrlCommand *)command;
+- (void)wasConnected:(CDVInvokedUrlCommand *)command;
 - (void)isConnected:(CDVInvokedUrlCommand *)command;
 - (void)isDiscovered:(CDVInvokedUrlCommand *)command;
 - (void)hasPermission:(CDVInvokedUrlCommand *)command;

src/ios/BluetoothLePlugin.m

@@ -1820,6 +1820,55 @@ - (void)isScanning:(CDVInvokedUrlCommand *)command {
   [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
 }
 
+- (void)wasConnected:(CDVInvokedUrlCommand *)command {
+  //Ensure Bluetooth is enabled
+  if ([self isNotInitialized:command]) {
+    return;
+  }
+
+  //Get the arguments
+  NSDictionary* obj = [self getArgsObject:command.arguments];
+  if ([self isNotArgsObject:obj :command]) {
+    return;
+  }
+
+  //Get the connection address
+  NSUUID* address = [self getAddress:obj];
+  if ([self isNotAddress:address :command]) {
+    return;
+  }
+
+  NSMutableDictionary* connection = [connections objectForKey:address];
+  if (connection == nil) {
+    //Return wasConnected => false
+    NSMutableDictionary* returnObj = [NSMutableDictionary dictionary];
+
+    [returnObj setValue:address.UUIDString forKey:keyAddress];
+
+    [returnObj setValue:[NSNumber numberWithBool:false] forKey:@"wasConnected"];
+
+    CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:returnObj];
+    [pluginResult setKeepCallbackAsBool:false];
+    [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+
+    return;
+  }
+
+  //Get the peripheral
+  CBPeripheral* peripheral = [connection objectForKey:keyPeripheral];
+
+  //Return wasConnected => true
+  NSMutableDictionary* returnObj = [NSMutableDictionary dictionary];
+
+  [self addDevice:peripheral :returnObj];
+
+  [returnObj setValue:[NSNumber numberWithBool:true] forKey:@"wasConnected"];
+
+  CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:returnObj];
+  [pluginResult setKeepCallbackAsBool:false];
+  [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+}
+
 - (void)isConnected:(CDVInvokedUrlCommand *)command {
   //Ensure Bluetooth is enabled
   if ([self isNotInitialized:command]) {

src/osx/BluetoothLePlugin.h

@@ -44,6 +44,7 @@
 - (void)isInitialized:(CDVInvokedUrlCommand *)command;
 - (void)isEnabled:(CDVInvokedUrlCommand *)command;
 - (void)isScanning:(CDVInvokedUrlCommand *)command;
+- (void)wasConnected:(CDVInvokedUrlCommand *)command;
 - (void)isConnected:(CDVInvokedUrlCommand *)command;
 - (void)isDiscovered:(CDVInvokedUrlCommand *)command;
 - (void)hasPermission:(CDVInvokedUrlCommand *)command;

src/osx/BluetoothLePlugin.m

@@ -1820,6 +1820,55 @@ - (void)isScanning:(CDVInvokedUrlCommand *)command {
   [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
 }
 
+- (void)wasConnected:(CDVInvokedUrlCommand *)command {
+  //Ensure Bluetooth is enabled
+  if ([self isNotInitialized:command]) {
+    return;
+  }
+
+  //Get the arguments
+  NSDictionary* obj = [self getArgsObject:command.arguments];
+  if ([self isNotArgsObject:obj :command]) {
+    return;
+  }
+
+  //Get the connection address
+  NSUUID* address = [self getAddress:obj];
+  if ([self isNotAddress:address :command]) {
+    return;
+  }
+
+  NSMutableDictionary* connection = [connections objectForKey:address];
+  if (connection == nil) {
+    //Return wasConnected => false
+    NSMutableDictionary* returnObj = [NSMutableDictionary dictionary];
+
+    [returnObj setValue:address.UUIDString forKey:keyAddress];
+
+    [returnObj setValue:[NSNumber numberWithBool:false] forKey:@"wasConnected"];
+
+    CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:returnObj];
+    [pluginResult setKeepCallbackAsBool:false];
+    [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+
+    return;
+  }
+
+  //Get the peripheral
+  CBPeripheral* peripheral = [connection objectForKey:keyPeripheral];
+
+  //Return wasConnected => true
+  NSMutableDictionary* returnObj = [NSMutableDictionary dictionary];
+
+  [self addDevice:peripheral :returnObj];
+
+  [returnObj setValue:[NSNumber numberWithBool:true] forKey:@"wasConnected"];
+
+  CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:returnObj];
+  [pluginResult setKeepCallbackAsBool:false];
+  [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+}
+
 - (void)isConnected:(CDVInvokedUrlCommand *)command {
   //Ensure Bluetooth is enabled
   if ([self isNotInitialized:command]) {

www/bluetoothle.js

@@ -81,6 +81,9 @@ var bluetoothle = {
   isScanning: function(successCallback) {
     cordova.exec(successCallback, successCallback, bluetoothleName, "isScanning", []);
   },
+  wasConnected: function(successCallback, errorCallback, params) {
+    cordova.exec(successCallback, errorCallback, bluetoothleName, "wasConnected", [params]);
+  },
   isConnected: function(successCallback, errorCallback, params) {
     cordova.exec(successCallback, errorCallback, bluetoothleName, "isConnected", [params]);
   },