react-native-ble-manager 8.4.3 → 8.5.0

package/README.md

@@ -359,7 +359,7 @@ Returns a `Promise` object.
 - `serviceUUID` - `String` - the UUID of the service.
 - `characteristicUUID` - `String` - the UUID of the characteristic.
 - `data` - `Byte array` - the data to write.
-- `maxByteSize` - `Integer` - specify the max byte size before splitting message
+- `maxByteSize` - `Integer` - specify the max byte size before splitting message, defaults to 20 bytes if not specified
 
 **Data preparation**
 
@@ -691,12 +691,12 @@ The scanning for peripherals is ended.
 
 **Arguments**
 
-- `none`
+- `status` - `Number` - [iOS] the reason for stopping the scan. Error code 10 is used for timeouts, 0 covers everything else. [Android] the reason for stopping the scan (<https://developer.android.com/reference/android/bluetooth/le/ScanCallback#constants_1>). Error code 10 is used for timeouts
 
 **Examples**
 
 ```js
-bleManagerEmitter.addListener("BleManagerStopScan", () => {
+bleManagerEmitter.addListener("BleManagerStopScan", (args) => {
   // Scanning is stopped
 });
 ```

package/android/src/main/java/it/innove/BleManager.java

@@ -218,6 +218,7 @@ class BleManager extends ReactContextBaseJavaModule {
         if (scanManager != null) {
             scanManager.stopScan(callback);
             WritableMap map = Arguments.createMap();
+						map.putInt("status", 0);
             sendEvent("BleManagerStopScan", map);
         }
     }

package/android/src/main/java/it/innove/LegacyScanManager.java

@@ -80,6 +80,7 @@ public class LegacyScanManager extends ScanManager {
 									btAdapter.stopLeScan(mLeScanCallback);
 								}
 								WritableMap map = Arguments.createMap();
+								map.putInt("status", 0);
 								bleManager.sendEvent("BleManagerStopScan", map);
 							}
 						}

package/android/src/main/java/it/innove/LollipopScanManager.java

@@ -39,7 +39,7 @@ public class LollipopScanManager extends ScanManager {
         ScanSettings.Builder scanSettingsBuilder = new ScanSettings.Builder();
         List<ScanFilter> filters = new ArrayList<>();
 
-        if (options.hasKey("legacy")) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && options.hasKey("legacy")) {
             scanSettingsBuilder.setLegacy(options.getBoolean("legacy"));
         }
         
@@ -101,6 +101,7 @@ public class LollipopScanManager extends ScanManager {
                                     btAdapter.getBluetoothLeScanner().stopScan(mScanCallback);
                                 }
                                 WritableMap map = Arguments.createMap();
+																map.putInt("status", 10);
                                 bleManager.sendEvent("BleManagerStopScan", map);
                             }
                         }
@@ -145,6 +146,7 @@ public class LollipopScanManager extends ScanManager {
 		@Override
 		public void onScanFailed(final int errorCode) {
             WritableMap map = Arguments.createMap();
+						map.putInt("status", errorCode);
             bleManager.sendEvent("BleManagerStopScan", map);
 		}
 	};

package/android/src/main/java/it/innove/Peripheral.java

@@ -419,6 +419,7 @@ public class Peripheral extends BluetoothGattCallback {
 				return;
 			}
 			sendBackrError(readCallback, "Error reading " + characteristic.getUuid() + " status=" + status);
+			readCallback = null;
 		} else if (readCallback != null) {
 			final byte[] dataValue = copyOf(characteristic.getValue());
 			final Callback callback = readCallback;
@@ -449,6 +450,7 @@ public class Peripheral extends BluetoothGattCallback {
 				return;
 			}
 			sendBackrError(writeCallback, "Error writing " + characteristic.getUuid() + " status=" + status);
+			writeCallback = null;
 		} else if (writeCallback != null) {
 			final Callback callback = writeCallback;
 			mainHandler.post(new Runnable() {
@@ -470,8 +472,8 @@ public class Peripheral extends BluetoothGattCallback {
 				registerNotifyCallback.invoke();
 				Log.d(BleManager.LOG_TAG, "onDescriptorWrite success");
 			} else {
-				registerNotifyCallback.invoke("Error writing descriptor stats=" + status, null);
-				Log.e(BleManager.LOG_TAG, "Error writing descriptor stats=" + status);
+				registerNotifyCallback.invoke("Error writing descriptor status=" + status, null);
+				Log.e(BleManager.LOG_TAG, "Error writing descriptor status=" + status);
 			}
 
 			registerNotifyCallback = null;
@@ -832,8 +834,11 @@ public class Peripheral extends BluetoothGattCallback {
 					else
 						writeCallback = null;
 					if (!gatt.writeCharacteristic(characteristic)) {
-						sendBackrError(writeCallback, "Write failed");
-						writeCallback = null;
+						// For write without response the caller will handle all callback states
+						if (writeCallback != null) {
+							writeCallback.invoke("Write failed", writeCallback);
+							writeCallback = null;
+						}
 						completedCommand();
 					}
 				}

package/ios/BleManager.m

@@ -378,7 +378,7 @@ RCT_EXPORT_METHOD(stopScan:(nonnull RCTResponseSenderBlock)callback)
     }
     [manager stopScan];
     if (hasListeners) {
-        [self sendEventWithName:@"BleManagerStopScan" body:@{}];
+				[self sendEventWithName:@"BleManagerStopScan" body:@{@"status": @0}];
     }
     callback(@[[NSNull null]]);
 }
@@ -390,7 +390,7 @@ RCT_EXPORT_METHOD(stopScan:(nonnull RCTResponseSenderBlock)callback)
     [manager stopScan];
     if (hasListeners) {
         if (self.bridge) {
-            [self sendEventWithName:@"BleManagerStopScan" body:@{}];
+            [self sendEventWithName:@"BleManagerStopScan" body:@{@"status": @10}];
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-ble-manager",
-  "version": "8.4.3",
+  "version": "8.5.0",
   "description": "A BLE module for react native.",
   "main": "BleManager",
   "types": "./index.d.ts",