Merge remote-tracking branch 'randdusing/master'

Author: helixhuang

CHANGELOG.md

@@ -1,9 +1,10 @@
-## master - 2016-04-06
+## master - 2016-05-01
 - wasConnected helper function
 - Improved subscribe with Android. No longer need to specify whether notification or indication
 - Read, write, subscribe, unsubscribe, readDescriptor, writeDescriptor queueing for Android [\#263](https://github.com/randdusing/BluetoothLE/issues/263), [\#153](https://github.com/randdusing/BluetoothLE/issues/153)
 - Everything now runs on the single WebCore thread with Android. It should prevent issues with race conditions
 - Fix issue with writeDescriptor on Android
+- Fix issue with UUID validation on iOS
 
 ## 4.0.0 - 2016-03-30
 - Update OS X

readme.md

@@ -93,6 +93,9 @@ Another option is to connect to the device and use the "Device Information" (0x1
 See the following StackOverflow posts for more info: [here](https://stackoverflow.com/questions/18973098/get-mac-address-of-bluetooth-low-energy-peripheral) and [here](https://stackoverflow.com/questions/22833198/get-advertisement-data-for-ble-in-ios)
 
 
+## Data Values ##
+
+
 ## Emulator ##
 Neither Android nor iOS support Bluetooth on emulators, so you'll need to test on a real device.
 
@@ -942,7 +945,7 @@ bluetoothle.read(readSuccess, readError, params);
 ```javascript
 {
   "status": "read",
-  "value": "AQ==",
+  "value": "UmVhZCBIZWxsbyBXb3JsZA==", //Read Hello World
   "characteristic": "2a38",
   "name": "Polar H7 3B321015",
   "service": "180d",
@@ -989,7 +992,7 @@ bluetoothle.subscribe(subscribeSuccess, subscribeError, params);
 
 {
   "status": "subscribedResult",
-  "value": "BkY=",
+  "value": "U3Vic2NyaWJlIEhlbGxvIFdvcmxk", //Subscribe Hello World
   "characteristic": "2a37",
   "name": "Polar H7 3B321015",
   "service": "180d",
@@ -1053,21 +1056,21 @@ bluetoothle.write(writeSuccess, writeError, params);
 Value is a base64 encoded string of bytes to write. Use bluetoothle.bytesToEncodedString(bytes) to convert to base64 encoded string from a unit8Array.
 To write without response, set type to "noResponse". Any other value will default to write with response. Note, no callback will occur on write without response on iOS.
 ```javascript
-var string = "Hello World";
+var string = "Write Hello World";
 var bytes = bluetoothle.stringToBytes(string);
 var encodedString = bluetoothle.bytesToEncodedString(bytes);
 
 //Note, this example doesn't actually work since it's read only characteristic
-{"value":encodedString,"service":"180F","characteristic":"2A19","type":"noResponse","address":"ABC123"}
+{"value":"V3JpdGUgSGVsbG8gV29ybGQ=","service":"180F","characteristic":"2A19","type":"noResponse","address":"ABC123"}
 ```
 
 ##### Success #####
 Value is a base64 encoded string of written bytes. Use bluetoothle.encodedStringToBytes(obj.value) to convert to a unit8Array. See characteristic's specification and example below on how to correctly parse this.
 
 ```javascript
-var returnObj = {"status":"written","service":"180F","characteristic":"2A19","value":"SGVsbG8gV29ybGQ=","address":"ABC123"}
+var returnObj = {"status":"written","service":"180F","characteristic":"2A19","value":"V3JpdGUgSGVsbG8gV29ybGQ=","address":"ABC123"}
 var bytes = bluetoothle.encodedStringToBytes(returnObj.value);
-var string = bluetoothle.bytesToString(bytes); //This should equal Hello World!
+var string = bluetoothle.bytesToString(bytes); //This should equal Write Hello World
 ```
 
 
@@ -1157,14 +1160,14 @@ var string = "Hello World";
 var bytes = bluetoothle.stringToBytes(string);
 var encodedString = bluetoothle.bytesToEncodedString(bytes);
 
-{"service":"180D","characteristic":"2A37","descriptor":"2902","value":encodedString,"address":"ABC123"}
+{"service":"180D","characteristic":"2A37","descriptor":"2902","value":"AQAAAAAAAAA=","address":"ABC123"}
 ```
 
 ##### Success #####
 Value is a base64 encoded string of written bytes. Use bluetoothle.encodedStringToBytes(obj.value) to convert to a unit8Array.
 
 ```javascript
-{"status":"writeDescriptor","service":"180D","characteristic":"2A37", "descriptor":"2902","value":"SGVsbG8gV29ybGQ","address":"ABC123"}
+{"status":"writeDescriptor","service":"180D","characteristic":"2A37", "descriptor":"2902","value":"AQAAAAAAAAA=","address":"ABC123"}
 var bytes = bluetoothle.encodedStringToBytes(returnObj.value);
 var string = bluetoothle.bytesToString(bytes); //This should equal Hello World!
 ```
@@ -1548,7 +1551,7 @@ bluetoothle.initializePeripheral(success, error, params);
   "address":"5163F1E0-5341-AF9B-9F67-613E15EC83F7",
   "service":"1234",
   "characteristic":"ABCD",
-  requestId":0,
+  requestId":0, //This integer value will be incremented every read/writeRequested
   "offset":0
 }
 ```
@@ -1560,7 +1563,7 @@ bluetoothle.initializePeripheral(success, error, params);
   "address":"5163F1E0-5341-AF9B-9F67-613E15EC83F7",
   "service":"1234",
   "characteristic":"ABCD",
-  "requestId":2,
+  "requestId":1, //This integer value will be incremented every read/writeRequested
   "value":"V3JpdGUgSGVsbG8gV29ybGQ=", //Write Hello World
   "offset":0
 }
@@ -1652,8 +1655,7 @@ var params = {
         //authenticatedSignedWrites: true,
         //notifyEncryptionRequired: true,
         //indicateEncryptionRequired: true,
-      },
-      value: "base64encodedstring"
+      }
     }
   ]
 };

src/android/BluetoothLePlugin.java

@@ -1032,7 +1032,7 @@ private void disableAction(CallbackContext callbackContext) {
     //Else listen to initialize callback for disabling
   }
 
-  private void startScanAction(JSONArray args, CallbackContext callbackContext) {
+  private synchronized void startScanAction(JSONArray args, CallbackContext callbackContext) {
     if (isNotInitialized(callbackContext, true)) {
       return;
     }
@@ -1119,7 +1119,7 @@ private void startScanAction(JSONArray args, CallbackContext callbackContext) {
     }
   }
 
-  private void stopScanAction(CallbackContext callbackContext) {
+  private synchronized void stopScanAction(CallbackContext callbackContext) {
     if (isNotInitialized(callbackContext, true)) {
       return;
     }
@@ -2539,21 +2539,24 @@ public void onActivityResult(int requestCode, int resultCode, Intent intent) {
   private LeScanCallback scanCallbackKitKat = new LeScanCallback() {
     @Override
     public void onLeScan(final BluetoothDevice device, int rssi, byte[] scanRecord) {
-      if (scanCallbackContext == null) {
-        return;
-      }
+      synchronized(BluetoothLePlugin.this){
 
-      JSONObject returnObj = new JSONObject();
+        if (scanCallbackContext == null) {
+          return;
+        }
 
-      addDevice(returnObj, device);
+        JSONObject returnObj = new JSONObject();
 
-      addProperty(returnObj, keyRssi, rssi);
-      addPropertyBytes(returnObj, keyAdvertisement, scanRecord);
-      addProperty(returnObj, keyStatus, statusScanResult);
+        addDevice(returnObj, device);
 
-      PluginResult pluginResult = new PluginResult(PluginResult.Status.OK, returnObj);
-      pluginResult.setKeepCallback(true);
-      scanCallbackContext.sendPluginResult(pluginResult);
+        addProperty(returnObj, keyRssi, rssi);
+        addPropertyBytes(returnObj, keyAdvertisement, scanRecord);
+        addProperty(returnObj, keyStatus, statusScanResult);
+
+        PluginResult pluginResult = new PluginResult(PluginResult.Status.OK, returnObj);
+        pluginResult.setKeepCallback(true);
+        scanCallbackContext.sendPluginResult(pluginResult);
+      }
     }
   };
 
@@ -2571,43 +2574,47 @@ public void onBatchScanResults(List<ScanResult> results) {
 
       @Override
       public void onScanFailed(int errorCode) {
-        if (scanCallbackContext == null)
-          return;
+        synchronized(BluetoothLePlugin.this){
+          if (scanCallbackContext == null)
+            return;
 
-        JSONObject returnObj = new JSONObject();
-        addProperty(returnObj, keyError, errorStartScan);
+          JSONObject returnObj = new JSONObject();
+          addProperty(returnObj, keyError, errorStartScan);
+
+          if (errorCode == ScanCallback.SCAN_FAILED_ALREADY_STARTED) {
+            addProperty(returnObj, keyMessage, "Scan already started");
+          } else if (errorCode == ScanCallback.SCAN_FAILED_APPLICATION_REGISTRATION_FAILED) {
+            addProperty(returnObj, keyMessage, "Application registration failed");
+          } else if (errorCode == ScanCallback.SCAN_FAILED_FEATURE_UNSUPPORTED) {
+            addProperty(returnObj, keyMessage, "Feature unsupported");
+          } else if (errorCode == ScanCallback.SCAN_FAILED_INTERNAL_ERROR) {
+            addProperty(returnObj, keyMessage, "Internal error");
+          } else {
+            addProperty(returnObj, keyMessage, logScanStartFail);
+          }
 
-        if (errorCode == ScanCallback.SCAN_FAILED_ALREADY_STARTED) {
-          addProperty(returnObj, keyMessage, "Scan already started");
-        } else if (errorCode == ScanCallback.SCAN_FAILED_APPLICATION_REGISTRATION_FAILED) {
-          addProperty(returnObj, keyMessage, "Application registration failed");
-        } else if (errorCode == ScanCallback.SCAN_FAILED_FEATURE_UNSUPPORTED) {
-          addProperty(returnObj, keyMessage, "Feature unsupported");
-        } else if (errorCode == ScanCallback.SCAN_FAILED_INTERNAL_ERROR) {
-          addProperty(returnObj, keyMessage, "Internal error");
-        } else {
-          addProperty(returnObj, keyMessage, logScanStartFail);
+          scanCallbackContext.error(returnObj);
+          scanCallbackContext = null;
         }
-
-        scanCallbackContext.error(returnObj);
-        scanCallbackContext = null;
       }
 
       @Override
       public void onScanResult(int callbackType, ScanResult result) {
-        if (scanCallbackContext == null)
-          return;
+        synchronized(BluetoothLePlugin.this){
+          if (scanCallbackContext == null)
+            return;
 
-        JSONObject returnObj = new JSONObject();
+          JSONObject returnObj = new JSONObject();
 
-        addDevice(returnObj, result.getDevice());
-        addProperty(returnObj, keyRssi, result.getRssi());
-        addPropertyBytes(returnObj, keyAdvertisement, result.getScanRecord().getBytes());
-        addProperty(returnObj, keyStatus, statusScanResult);
+          addDevice(returnObj, result.getDevice());
+          addProperty(returnObj, keyRssi, result.getRssi());
+          addPropertyBytes(returnObj, keyAdvertisement, result.getScanRecord().getBytes());
+          addProperty(returnObj, keyStatus, statusScanResult);
 
-        PluginResult pluginResult = new PluginResult(PluginResult.Status.OK, returnObj);
-        pluginResult.setKeepCallback(true);
-        scanCallbackContext.sendPluginResult(pluginResult);
+          PluginResult pluginResult = new PluginResult(PluginResult.Status.OK, returnObj);
+          pluginResult.setKeepCallback(true);
+          scanCallbackContext.sendPluginResult(pluginResult);
+        }
       }
     };
   }

src/ios/BluetoothLePlugin.m

@@ -3367,6 +3367,10 @@ -(NSMutableArray*) getUuids:(NSDictionary *) dictionary forType:(NSString*) type
   }
 
   for (NSString* checkUuid in checkUuids) {
+    if (![checkUuid isKindOfClass:[NSString class]]) {
+      continue;
+    }
+
     CBUUID* uuid = [CBUUID UUIDWithString:checkUuid];
 
     if (uuid != nil) {

src/osx/BluetoothLePlugin.m

@@ -3367,6 +3367,10 @@ -(NSMutableArray*) getUuids:(NSDictionary *) dictionary forType:(NSString*) type
   }
 
   for (NSString* checkUuid in checkUuids) {
+    if (![checkUuid isKindOfClass:[NSString class]]) {
+      continue;
+    }
+
     CBUUID* uuid = [CBUUID UUIDWithString:checkUuid];
 
     if (uuid != nil) {