react-native-ble-manager 11.5.2 → 11.5.4

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

@@ -2,8 +2,6 @@ package it.innove;
 
 import static android.app.Activity.RESULT_OK;
 import static android.bluetooth.BluetoothProfile.GATT;
-import static android.os.Build.VERSION_CODES.LOLLIPOP;
-import static android.os.Build.VERSION_CODES.UPSIDE_DOWN_CAKE;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.bluetooth.BluetoothAdapter;
@@ -167,7 +165,7 @@ class BleManager extends ReactContextBaseJavaModule {
         filter.addAction(BluetoothDevice.ACTION_BOND_STATE_CHANGED);
         IntentFilter intentFilter = new IntentFilter(BluetoothDevice.ACTION_PAIRING_REQUEST);
         intentFilter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY);
-        if (Build.VERSION.SDK_INT >= UPSIDE_DOWN_CAKE){
+        if (Build.VERSION.SDK_INT >= 34){
             // Google in 2023 decides that flag RECEIVER_NOT_EXPORTED or RECEIVER_EXPORTED should be explicit set SDK 34(UPSIDE_DOWN_CAKE) on registering receivers.
             // Also the export flags are available on Android 8 and higher, should be used with caution so that don't break compability with that devices.
             context.registerReceiver(mReceiver, filter, Context.RECEIVER_EXPORTED);
@@ -565,11 +563,17 @@ class BleManager extends ReactContextBaseJavaModule {
                     break;
                 case BluetoothAdapter.STATE_TURNING_OFF:
                     state = "turning_off";
+                    if (scanManager != null) {
+                        scanManager.setScanning(false);
+                    }
                     break;
                 case BluetoothAdapter.STATE_OFF:
                 default:
                     // should not happen as per https://developer.android.com/reference/android/bluetooth/BluetoothAdapter#getState()
                     state = "off";
+                    if (scanManager != null) {
+                        scanManager.setScanning(false);
+                    }
                     break;
             }
         }

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

@@ -64,10 +64,12 @@ public class CompanionScanner {
                     if (peripheral != null && scanCallback != null) {
                         scanCallback.invoke(null, peripheral.asWritableMap());
                         scanCallback = null;
+                        bleManager.sendEvent("BleManagerCompanionPeripheral", peripheral.asWritableMap());
                     }
                 } else {
                     scanCallback.invoke(null, null);
                     scanCallback = null;
+                    bleManager.sendEvent("BleManagerCompanionPeripheral", null);
                 }
 
             } else {
@@ -122,6 +124,9 @@ public class CompanionScanner {
                 Log.d(LOG_TAG, "companion failure: " + charSequence);
                 scanCallback.invoke("Companion association failed: " + charSequence.toString());
                 scanCallback = null;
+                WritableMap map = Arguments.createMap();
+                map.putString("error", charSequence.toString());
+                bleManager.sendEvent("BleManagerCompanionFailure", map);
             }
 
             @Override

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

@@ -255,7 +255,13 @@ public class DefaultScanManager extends ScanManager {
         }
     };
 
+    @Override
     public boolean isScanning() {
         return isScanning;
     }
+
+    @Override
+    public void setScanning(boolean scanning) {
+        isScanning = scanning;
+    }
 }

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

@@ -104,4 +104,9 @@ public class LegacyScanManager extends ScanManager {
     public boolean isScanning() {
         return false;
     }
+
+    @Override
+    public void setScanning(boolean value) {
+
+    }
 }

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

@@ -39,4 +39,6 @@ public abstract class ScanManager {
     public abstract void scan(ReadableArray serviceUUIDs, final int scanSeconds, ReadableMap options, Callback callback);
 
     public abstract boolean isScanning();
+
+    public abstract void setScanning(boolean value);
 }

package/ios/BleManager.swift

@@ -122,14 +122,17 @@ class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegat
     // Helper method to call the callbacks for a specific peripheral and clear the queue
     func invokeAndClearDictionary(_ dictionary: inout Dictionary<String, [RCTResponseSenderBlock]>, withKey key: String, usingParameters parameters: [Any]) {
         serialQueue.sync {
-            
-            if let peripheralCallbacks = dictionary[key] {
-                for callback in peripheralCallbacks {
-                    callback(parameters)
-                }
-                
-                dictionary.removeValue(forKey: key)
+            invokeAndClearDictionary_THREAD_UNSAFE(&dictionary, withKey: key, usingParameters: parameters)
+        }
+    }
+
+    func invokeAndClearDictionary_THREAD_UNSAFE(_ dictionary: inout Dictionary<String, [RCTResponseSenderBlock]>, withKey key: String, usingParameters parameters: [Any]) {
+        if let peripheralCallbacks = dictionary[key] {
+            for callback in peripheralCallbacks {
+                callback(parameters)
             }
+            
+            dictionary.removeValue(forKey: key)
         }
     }
     
@@ -1078,16 +1081,18 @@ class BleManager: RCTEventEmitter, CBCentralManagerDelegate, CBPeripheralDelegat
             NSLog("Read value [\(characteristic.uuid)]: \( value.hexadecimalString())")
         }
         
-        if readCallbacks[key] != nil {
-            invokeAndClearDictionary(&readCallbacks, withKey: key, usingParameters: [NSNull(), characteristic.value!.toArray()])
-        } else {
-            if hasListeners {
-                sendEvent(withName: "BleManagerDidUpdateValueForCharacteristic", body: [
-                    "peripheral": peripheral.uuidAsString(),
-                    "characteristic": characteristic.uuid.uuidString.lowercased(),
-                    "service": characteristic.service!.uuid.uuidString.lowercased(),
-                    "value": characteristic.value!.toArray()
-                ])
+        serialQueue.sync {
+            if readCallbacks[key] != nil {
+                invokeAndClearDictionary_THREAD_UNSAFE(&readCallbacks, withKey: key, usingParameters: [NSNull(), characteristic.value!.toArray()])
+            } else {
+                if hasListeners {
+                    sendEvent(withName: "BleManagerDidUpdateValueForCharacteristic", body: [
+                        "peripheral": peripheral.uuidAsString(),
+                        "characteristic": characteristic.uuid.uuidString.lowercased(),
+                        "service": characteristic.service!.uuid.uuidString.lowercased(),
+                        "value": characteristic.value!.toArray()
+                    ])
+                }
             }
         }
     }

package/package.json

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