react-native-ble-manager 11.5.0 → 11.5.1

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

@@ -44,7 +44,7 @@ import java.util.Set;
 
 class BleManager extends ReactContextBaseJavaModule {
 
-    public static final String LOG_TAG = "ReactNativeBleManager";
+    public static final String LOG_TAG = "RNBleManager";
     private static final int ENABLE_REQUEST = 539;
 
     private static class BondRequest {
@@ -823,7 +823,7 @@ class BleManager extends ReactContextBaseJavaModule {
         }
 
         WritableArray peripherals = Arguments.createArray();
-        for (String address : getCompanionDeviceManager().getAssociations()) {
+        for (String address : ((CompanionDeviceManager) getCompanionDeviceManager()).getAssociations()) {
             peripherals.pushMap(retrieveOrCreatePeripheral(address).asWritableMap());
         }
 
@@ -838,7 +838,7 @@ class BleManager extends ReactContextBaseJavaModule {
             return;
         }
 
-        CompanionDeviceManager manager = getCompanionDeviceManager();
+        CompanionDeviceManager manager = (CompanionDeviceManager) getCompanionDeviceManager();
         for (String association : manager.getAssociations()) {
             if (association.equals(address)) {
                 manager.disassociate(address);
@@ -851,8 +851,8 @@ class BleManager extends ReactContextBaseJavaModule {
     }
 
     @RequiresApi(api = Build.VERSION_CODES.O)
-    public CompanionDeviceManager getCompanionDeviceManager() {
-        return (CompanionDeviceManager) reactContext
+    public Object getCompanionDeviceManager() {
+        return reactContext
                 .getCurrentActivity().getSystemService(Context.COMPANION_DEVICE_SERVICE);
     }
 

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

@@ -5,6 +5,7 @@ import static android.app.Activity.RESULT_OK;
 import static com.facebook.react.bridge.UiThreadUtil.runOnUiThread;
 
 import android.app.Activity;
+import android.bluetooth.BluetoothDevice;
 import android.bluetooth.le.ScanFilter;
 import android.bluetooth.le.ScanResult;
 import android.companion.AssociationRequest;
@@ -35,7 +36,7 @@ public class CompanionScanner {
 
     private final BleManager bleManager;
     private final ReactContext reactContext;
-    public static final String LOG_TAG = "CompationScanManager";
+    public static final String LOG_TAG = BleManager.LOG_TAG + "_Companion";
     private static final int SELECT_DEVICE_REQUEST_CODE = 540;
 
     private static Callback scanCallback = null;
@@ -52,17 +53,29 @@ public class CompanionScanner {
                 // Have device?
                 Log.d(LOG_TAG, "Ok activity result");
 
-                ScanResult result = intent.getParcelableExtra(CompanionDeviceManager.EXTRA_DEVICE);
-                Peripheral peripheral = bleManager.savePeripheral(result.getDevice());
-
-                if (scanCallback != null) {
-                    scanCallback.invoke(null, peripheral.asWritableMap());
+                Object result = intent.getParcelableExtra(CompanionDeviceManager.EXTRA_DEVICE);
+                if (result != null) {
+                    Peripheral peripheral = null;
+                    if (result instanceof BluetoothDevice) {
+                        peripheral = bleManager.savePeripheral((BluetoothDevice) result);
+                    } else if (result instanceof ScanResult) {
+                        peripheral = bleManager.savePeripheral(((ScanResult) result).getDevice());
+                    }
+                    if (peripheral != null && scanCallback != null) {
+                        scanCallback.invoke(null, peripheral.asWritableMap());
+                        scanCallback = null;
+                    }
+                } else {
+                    scanCallback.invoke(null, null);
+                    scanCallback = null;
                 }
+
             } else {
                 // No device, user cancelled?
                 Log.d(LOG_TAG, "Non-ok activity result");
                 if (scanCallback != null) {
                     scanCallback.invoke(null, null);
+                    scanCallback = null;
                 }
             }
         }
@@ -77,6 +90,11 @@ public class CompanionScanner {
     public void scan(ReadableArray serviceUUIDs, ReadableMap options, Callback callback) {
         Log.d(LOG_TAG, "companion scan start");
 
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+            callback.invoke("Companion not supported");
+            return;
+        }
+
         AssociationRequest.Builder builder = new AssociationRequest.Builder()
                 .setSingleDevice(options.hasKey("single") && options.getBoolean("single")) ;
 
@@ -97,7 +115,8 @@ public class CompanionScanner {
         }
         scanCallback = callback;
 
-        bleManager.getCompanionDeviceManager().associate(pairingRequest, new CompanionDeviceManager.Callback() {
+        CompanionDeviceManager companionDeviceManager = (CompanionDeviceManager) bleManager.getCompanionDeviceManager();
+        companionDeviceManager.associate(pairingRequest, new CompanionDeviceManager.Callback() {
             @Override
             public void onFailure(@Nullable CharSequence charSequence) {
                 Log.d(LOG_TAG, "companion failure: " + charSequence);

package/package.json

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