react-native-ble-manager 8.7.0 → 9.0.0

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

@@ -5,6 +5,7 @@ import android.bluetooth.le.ScanRecord;
 import android.bluetooth.le.ScanResult;
 import android.os.Build;
 import android.os.ParcelUuid;
+
 import androidx.annotation.RequiresApi;
 
 import com.facebook.react.bridge.Arguments;
@@ -18,76 +19,76 @@ import java.util.Map;
 @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
 public class LollipopPeripheral extends Peripheral {
 
-	private ScanRecord advertisingData;
-	private ScanResult scanResult;
-
-	public LollipopPeripheral(ReactContext reactContext, ScanResult result) {
-		super(result.getDevice(), result.getRssi(), result.getScanRecord().getBytes(), reactContext);
-		this.advertisingData = result.getScanRecord();
-		this.scanResult = result;
-	}
-
-	public LollipopPeripheral(BluetoothDevice device, ReactApplicationContext reactContext) {
-		super(device, reactContext);
-	}
-
-	@Override
-	public WritableMap asWritableMap() {
-		WritableMap map = super.asWritableMap();
-		WritableMap advertising = Arguments.createMap();
-
-		try {
-			advertising.putMap("manufacturerData", byteArrayToWritableMap(advertisingDataBytes));
-
-			if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.O){
-				// We can check if peripheral is connectable using the scanresult
-				if (this.scanResult != null) {
-					advertising.putBoolean("isConnectable", scanResult.isConnectable());
-				}
-			} else{
-				// We can't check if peripheral is connectable
-				advertising.putBoolean("isConnectable", true);
-			}
-
-
-			if (advertisingData != null) {
-				String deviceName = advertisingData.getDeviceName();
-				if (deviceName != null)
-					advertising.putString("localName", deviceName.replace("\0", ""));
-
-				WritableArray serviceUuids = Arguments.createArray();
-				if (advertisingData.getServiceUuids() != null && advertisingData.getServiceUuids().size() != 0) {
-					for (ParcelUuid uuid : advertisingData.getServiceUuids()) {
-						serviceUuids.pushString(UUIDHelper.uuidToString(uuid.getUuid()));
-					}
-				}
-				advertising.putArray("serviceUUIDs", serviceUuids);
-
-				WritableMap serviceData = Arguments.createMap();
-				if (advertisingData.getServiceData() != null) {
-					for (Map.Entry<ParcelUuid, byte[]> entry : advertisingData.getServiceData().entrySet()) {
-						if (entry.getValue() != null) {
-							serviceData.putMap(UUIDHelper.uuidToString((entry.getKey()).getUuid()), byteArrayToWritableMap(entry.getValue()));
-						}
-					}
-				}
+    private ScanRecord advertisingData;
+    private ScanResult scanResult;
+
+    public LollipopPeripheral(ReactContext reactContext, ScanResult result) {
+        super(result.getDevice(), result.getRssi(), result.getScanRecord().getBytes(), reactContext);
+        this.advertisingData = result.getScanRecord();
+        this.scanResult = result;
+    }
+
+    public LollipopPeripheral(BluetoothDevice device, ReactApplicationContext reactContext) {
+        super(device, reactContext);
+    }
+
+    @Override
+    public WritableMap asWritableMap() {
+        WritableMap map = super.asWritableMap();
+        WritableMap advertising = Arguments.createMap();
+
+        try {
+            advertising.putMap("manufacturerData", byteArrayToWritableMap(advertisingDataBytes));
+
+            if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                // We can check if peripheral is connectable using the scanresult
+                if (this.scanResult != null) {
+                    advertising.putBoolean("isConnectable", scanResult.isConnectable());
+                }
+            } else {
+                // We can't check if peripheral is connectable
+                advertising.putBoolean("isConnectable", true);
+            }
+
+
+            if (advertisingData != null) {
+                String deviceName = advertisingData.getDeviceName();
+                if (deviceName != null)
+                    advertising.putString("localName", deviceName.replace("\0", ""));
+
+                WritableArray serviceUuids = Arguments.createArray();
+                if (advertisingData.getServiceUuids() != null && advertisingData.getServiceUuids().size() != 0) {
+                    for (ParcelUuid uuid : advertisingData.getServiceUuids()) {
+                        serviceUuids.pushString(UUIDHelper.uuidToString(uuid.getUuid()));
+                    }
+                }
+                advertising.putArray("serviceUUIDs", serviceUuids);
+
+                WritableMap serviceData = Arguments.createMap();
+                if (advertisingData.getServiceData() != null) {
+                    for (Map.Entry<ParcelUuid, byte[]> entry : advertisingData.getServiceData().entrySet()) {
+                        if (entry.getValue() != null) {
+                            serviceData.putMap(UUIDHelper.uuidToString((entry.getKey()).getUuid()), byteArrayToWritableMap(entry.getValue()));
+                        }
+                    }
+                }
 
                 advertising.putMap("serviceData", serviceData);
-				advertising.putInt("txPowerLevel", advertisingData.getTxPowerLevel());
-			}
+                advertising.putInt("txPowerLevel", advertisingData.getTxPowerLevel());
+            }
 
-			map.putMap("advertising", advertising);
-		} catch (Exception e) { // this shouldn't happen
-			e.printStackTrace();
-		}
+            map.putMap("advertising", advertising);
+        } catch (Exception e) { // this shouldn't happen
+            e.printStackTrace();
+        }
 
-		return map;
-	}
+        return map;
+    }
 
-	public void updateData(ScanResult result) {
-		advertisingData = result.getScanRecord();
-		advertisingDataBytes = advertisingData.getBytes();
-	}
+    public void updateData(ScanResult result) {
+        advertisingData = result.getScanRecord();
+        advertisingDataBytes = advertisingData.getBytes();
+    }
 
 
 }

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

@@ -88,11 +88,19 @@ public class LollipopScanManager extends ScanManager {
             for (int i = 0; i < serviceUUIDs.size(); i++) {
                 ScanFilter filter = new ScanFilter.Builder().setServiceUuid(new ParcelUuid(UUIDHelper.uuidFromString(serviceUUIDs.getString(i)))).build();
                 filters.add(filter);
-                Log.d(bleManager.LOG_TAG, "Filter service: " + serviceUUIDs.getString(i));
+                Log.d(BleManager.LOG_TAG, "Filter service: " + serviceUUIDs.getString(i));
             }
         }
 
+        if (options.hasKey("exactAdvertisingName")) {
+            String expectedName = options.getString("exactAdvertisingName");
+            Log.d(BleManager.LOG_TAG, "Filter on advertising name:" + expectedName);
+            ScanFilter filter = new ScanFilter.Builder().setDeviceName(expectedName).build();
+            filters.add(filter);
+        }
+
         getBluetoothAdapter().getBluetoothLeScanner().startScan(filters, scanSettingsBuilder.build(), mScanCallback);
+
         if (scanSeconds > 0) {
             Thread thread = new Thread() {
                 private int currentScanSession = scanSessionId.incrementAndGet();
@@ -109,11 +117,13 @@ public class LollipopScanManager extends ScanManager {
                         @Override
                         public void run() {
                             BluetoothAdapter btAdapter = getBluetoothAdapter();
+
                             // check current scan session was not stopped
                             if (scanSessionId.intValue() == currentScanSession) {
                                 if (btAdapter.getState() == BluetoothAdapter.STATE_ON) {
                                     btAdapter.getBluetoothLeScanner().stopScan(mScanCallback);
                                 }
+
                                 WritableMap map = Arguments.createMap();
                                 map.putInt("status", 10);
                                 bleManager.sendEvent("BleManagerStopScan", map);
@@ -129,41 +139,58 @@ public class LollipopScanManager extends ScanManager {
         callback.invoke();
     }
 
-    private ScanCallback mScanCallback = new ScanCallback() {
+    private void onDiscoveredPeripheral(final ScanResult result) {
+        String info;
+        ScanRecord record = result.getScanRecord();
+
+        if (record != null) {
+            info = record.getDeviceName();
+        } else if (ActivityCompat.checkSelfPermission(context, Manifest.permission.BLUETOOTH_CONNECT) == PackageManager.PERMISSION_GRANTED) {
+            info = result.getDevice().getName();
+        } else {
+            info = result.toString();
+        }
+
+        Log.i(BleManager.LOG_TAG, "DiscoverPeripheral: " + info);
+
+        LollipopPeripheral peripheral = (LollipopPeripheral) bleManager.getPeripheral(result.getDevice());
+        if (peripheral == null) {
+            peripheral = new LollipopPeripheral(bleManager.getReactContext(), result);
+        } else {
+            peripheral.updateData(result);
+            peripheral.updateRssi(result.getRssi());
+        }
+        bleManager.savePeripheral(peripheral);
+
+        WritableMap map = peripheral.asWritableMap();
+        bleManager.sendEvent("BleManagerDiscoverPeripheral", map);
+    }
+
+    private final ScanCallback mScanCallback = new ScanCallback() {
         @Override
         public void onScanResult(final int callbackType, final ScanResult result) {
-
             runOnUiThread(new Runnable() {
                 @Override
                 public void run() {
-                    String info;
-                    ScanRecord record = result.getScanRecord();
-                    if (record != null)
-                        info = record.getDeviceName();
-                    else if (ActivityCompat.checkSelfPermission(context, Manifest.permission.BLUETOOTH_CONNECT) == PackageManager.PERMISSION_GRANTED)
-                        info = result.getDevice().getName();
-                    else
-                        info = result.toString();
-
-                    Log.i(bleManager.LOG_TAG, "DiscoverPeripheral: " + info);
-
-                    LollipopPeripheral peripheral = (LollipopPeripheral) bleManager.getPeripheral(result.getDevice());
-                    if (peripheral == null) {
-                        peripheral = new LollipopPeripheral(bleManager.getReactContext(), result);
-                    } else {
-                        peripheral.updateData(result);
-                        peripheral.updateRssi(result.getRssi());
-                    }
-                    bleManager.savePeripheral(peripheral);
-
-                    WritableMap map = peripheral.asWritableMap();
-                    bleManager.sendEvent("BleManagerDiscoverPeripheral", map);
+                    onDiscoveredPeripheral(result);
                 }
             });
         }
 
         @Override
         public void onBatchScanResults(final List<ScanResult> results) {
+            runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    if (results.isEmpty()) {
+                        return;
+                    }
+
+                    for (ScanResult result : results) {
+                        onDiscoveredPeripheral(result);
+                    }
+                }
+            });
         }
 
         @Override