update readme, fix critical android bug, standardize permissions

update readme, fix critical android bug, standardize permissions

Author: randdusing

readme.md

@@ -1616,8 +1616,8 @@ var params = {
     {
       uuid: "ABCD",
       permissions: {
-        readable: true,
-        writeable: true,
+        read: true,
+        write: true,
         //readEncryptionRequired: true,
         //writeEncryptionRequired: true,
       },
@@ -1689,7 +1689,7 @@ bluetoothle.removeAllServices(success, error);
 
 
 ### startAdvertising ###
-Start advertising as a BLE device
+Start advertising as a BLE device. Note: This needs to be improved so services can be used for both Android and iOS.
 
 ```javascript
 bluetoothle.startAdvertising(success, error, params);
@@ -1698,7 +1698,8 @@ bluetoothle.startAdvertising(success, error, params);
 ##### Params #####
 ```javascript
 var params = {
-  "services":["1234"],
+  "services":["1234"], //iOS
+  "service":"1234", //Android
   "name":"Hello World",
 };
 ```

src/android/BluetoothLePlugin.java

@@ -629,7 +629,7 @@ private void initializePeripheralAction(JSONArray args, CallbackContext callback
     initPeripheralCallback = callbackContext;
 
     //Re-opening Gatt server seems to cause some issues
-    if (gattServer != null) {
+    if (gattServer == null) {
       Activity activity = cordova.getActivity();
       BluetoothManager bluetoothManager = (BluetoothManager) activity.getSystemService(Context.BLUETOOTH_SERVICE);
       gattServer = bluetoothManager.openGattServer(activity.getApplicationContext(), bluetoothGattServerCallback);

src/ios/BluetoothLePlugin.m

@@ -217,11 +217,11 @@ - (void)addService:(CDVInvokedUrlCommand *)command {
     CBAttributePermissions permissions = 0;
 
     if (permissionsIn) {
-      if ([permissionsIn valueForKey:@"readable"]) {
+      if ([permissionsIn valueForKey:@"read"]) {
         permissions |= CBAttributePermissionsReadable;
       }
 
-      if ([permissionsIn valueForKey:@"writeable"]) {
+      if ([permissionsIn valueForKey:@"write"]) {
         permissions |= CBAttributePermissionsWriteable;
       }
 
@@ -3271,6 +3271,8 @@ -(NSData*) getValue:(NSDictionary *) obj {
 }
 
 -(void) addValue:(NSData *) bytes toDictionary:(NSMutableDictionary *) obj {
+  //TODO what if the value is null
+
   NSString *string = [bytes base64EncodedStringWithOptions:0];
 
   if (string == nil || string.length == 0) {

src/osx/BluetoothLePlugin.m

@@ -217,11 +217,11 @@ - (void)addService:(CDVInvokedUrlCommand *)command {
     CBAttributePermissions permissions = 0;
 
     if (permissionsIn) {
-      if ([permissionsIn valueForKey:@"readable"]) {
+      if ([permissionsIn valueForKey:@"read"]) {
         permissions |= CBAttributePermissionsReadable;
       }
 
-      if ([permissionsIn valueForKey:@"writeable"]) {
+      if ([permissionsIn valueForKey:@"write"]) {
         permissions |= CBAttributePermissionsWriteable;
       }
 
@@ -3271,6 +3271,8 @@ -(NSData*) getValue:(NSDictionary *) obj {
 }
 
 -(void) addValue:(NSData *) bytes toDictionary:(NSMutableDictionary *) obj {
+  //TODO what if the value is null
+
   NSString *string = [bytes base64EncodedStringWithOptions:0];
 
   if (string == nil || string.length == 0) {