react-native-ble-manager 11.0.4 → 11.0.6

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

@@ -419,8 +419,10 @@ public class Peripheral extends BluetoothGattCallback {
 
     @Override
     public void onCharacteristicChanged(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic) {
-        super.onCharacteristicChanged(gatt, characteristic);
-        onCharacteristicChanged(gatt, characteristic, characteristic.getValue());
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+            super.onCharacteristicChanged(gatt, characteristic);
+            onCharacteristicChanged(gatt, characteristic, characteristic.getValue());
+        }
     }
 
     @Override
@@ -468,8 +470,10 @@ public class Peripheral extends BluetoothGattCallback {
 
     @Override
     public void onCharacteristicRead(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic, int status) {
-        super.onCharacteristicRead(gatt, characteristic, status);
-        onCharacteristicRead(gatt, characteristic, characteristic.getValue(), status);
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+            super.onCharacteristicRead(gatt, characteristic, status);
+            onCharacteristicRead(gatt, characteristic, characteristic.getValue(), status);
+        }
     }
     @Override
     public void onCharacteristicRead(@NonNull final BluetoothGatt gatt,

package/ios/BleManager.swift

@@ -686,7 +686,7 @@ class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegat
     }
     
     @objc func getMaximumWriteValueLengthForWithResponse(_ peripheralUUID: String,
-                                                            callback: @escaping RCTResponseSenderBlock) {
+                                                         callback: @escaping RCTResponseSenderBlock) {
         NSLog("getMaximumWriteValueLengthForWithResponse")
         
         guard let peripheral = peripherals[peripheralUUID] else {
@@ -717,7 +717,7 @@ class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegat
             }
         }
     }
-
+    
     
     func centralManager(_ central: CBCentralManager,
                         didConnect peripheral: CBPeripheral) {
@@ -1072,41 +1072,43 @@ class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegat
                     "code": error._code
                 ])
             }
+        } else {
+            if hasListeners {
+                sendEvent(withName: "BleManagerDidUpdateNotificationStateFor", body: [
+                    "peripheral": peripheral.uuidAsString(),
+                    "characteristic": characteristic.uuid.uuidString.lowercased(),
+                    "isNotifying": characteristic.isNotifying
+                ])
+            }
         }
         
         let key = Helper.key(forPeripheral: peripheral, andCharacteristic: characteristic)
         
-        if characteristic.isNotifying {
+        if let error = error {
             if notificationCallbacks[key] != nil {
-                if let error = error {
-                    invokeAndClearDictionary(&notificationCallbacks, withKey: key, usingParameters: [error])
-                } else {
-                    if BleManager.verboseLogging {
-                        NSLog("Notification began on \(characteristic.uuid)")
-                    }
-                    invokeAndClearDictionary(&notificationCallbacks, withKey: key, usingParameters: [])
-                }
+                invokeAndClearDictionary(&notificationCallbacks, withKey: key, usingParameters: [error])
             }
-        } else {
-            // Notification has stopped
             if stopNotificationCallbacks[key] != nil {
-                if error != nil {
-                    invokeAndClearDictionary(&stopNotificationCallbacks, withKey: key, usingParameters: [error as Any])
-                } else {
-                    if BleManager.verboseLogging {
-                        NSLog("Notification ended on \(characteristic.uuid)")
-                    }
+                invokeAndClearDictionary(&stopNotificationCallbacks, withKey: key, usingParameters: [error])
+            }
+        } else {
+            if characteristic.isNotifying {
+                if BleManager.verboseLogging {
+                    NSLog("Notification began on \(characteristic.uuid)")
+                }
+                if notificationCallbacks[key] != nil {
+                    invokeAndClearDictionary(&notificationCallbacks, withKey: key, usingParameters: [])
+                }
+            } else {
+                // Notification has stopped
+                if BleManager.verboseLogging {
+                    NSLog("Notification ended on \(characteristic.uuid)")
+                }
+                if stopNotificationCallbacks[key] != nil {
                     invokeAndClearDictionary(&stopNotificationCallbacks, withKey: key, usingParameters: [])
                 }
             }
         }
-        if hasListeners {
-            sendEvent(withName: "BleManagerDidUpdateNotificationStateFor", body: [
-                "peripheral": peripheral.uuidAsString(),
-                "characteristic": characteristic.uuid.uuidString.lowercased(),
-                "isNotifying": characteristic.isNotifying
-            ])
-        }
     }
     
     func peripheral(_ peripheral: CBPeripheral,

package/ios/Helper.swift

@@ -105,11 +105,11 @@ class Helper {
             if mfgData.count > 1 {
                 let manufactureID = UInt16(mfgData[0]) + UInt16(mfgData[1]) << 8
                 var manInfo: [String: Any] = [:]
-                manInfo[String(format: "%04X", manufactureID)] = mfgData.subdata(in: 2..<mfgData.endIndex)
-                adv["manufacturerData"] = mfgData
+                manInfo[String(format: "%04X", manufactureID)] = mfgData.subdata(in: 2..<mfgData.endIndex).toArray()
+                adv["manufacturerData"] = manInfo
             }
             adv.removeValue(forKey: CBAdvertisementDataManufacturerDataKey)
-            adv["manufacturerRawData"] = mfgData
+            adv["manufacturerRawData"] = mfgData.toArray()
             
         }
         

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-ble-manager",
-  "version": "11.0.4",
+  "version": "11.0.6",
   "description": "A BLE module for react native.",
   "repository": {
     "type": "git",