simplernble 1.2.1-dev100 → 1.2.1-dev104

package/native/VERSION

@@ -1 +1 @@
-1.2.1-dev100
+1.2.1-dev104

package/native/simpleble/src/backends/android/AdapterAndroid.cpp

@@ -21,14 +21,8 @@ AdapterAndroid::AdapterAndroid() {
     _btScanCallback.set_callback_onScanResult([this](Android::ScanResult scan_result) {
         std::string address = scan_result.getDevice().getAddress();
 
-        if (this->peripherals_.count(address) == 0) {
-            // If the incoming peripheral has never been seen before, create and save a reference to it.
-            auto base_peripheral = std::make_shared<PeripheralAndroid>(scan_result.getDevice());
-            this->peripherals_.insert(std::make_pair(address, base_peripheral));
-        }
-
         // Update the received advertising data.
-        auto base_peripheral = this->peripherals_.at(address);
+        auto base_peripheral = this->cached_peripheral(scan_result.getDevice());
         base_peripheral->update_advertising_data(scan_result);
 
         // Convert the base object into an external-facing Peripheral object
@@ -101,12 +95,24 @@ SharedPtrVector<PeripheralBase> AdapterAndroid::get_paired_peripherals() {
 
     auto paired_list = _btAdapter.getBondedDevices();
     for (auto& device : paired_list) {
-        peripherals.push_back(std::make_shared<PeripheralAndroid>(device));
+        // Reuse the wrapper a scan made, so that callbacks set on it keep working.
+        peripherals.push_back(cached_peripheral(device));
     }
 
     return peripherals;
 }
 
+std::shared_ptr<PeripheralAndroid> AdapterAndroid::cached_peripheral(const Android::BluetoothDevice& device) {
+    std::string address = device.getAddress();
+
+    std::scoped_lock lock(peripherals_mutex_);
+    if (peripherals_.count(address) == 0) {
+        // If the peripheral has never been seen before, create and save a reference to it.
+        peripherals_.insert(std::make_pair(address, std::make_shared<PeripheralAndroid>(device)));
+    }
+    return peripherals_.at(address);
+}
+
 std::shared_ptr<Local::PeripheralBase> AdapterAndroid::create_local_peripheral() {
     return std::make_shared<Local::PeripheralAndroid>(_btAdapter);
 }

package/native/simpleble/src/backends/android/AdapterAndroid.h

@@ -10,6 +10,7 @@
 #include <atomic>
 #include <functional>
 #include <memory>
+#include <mutex>
 #include <string>
 #include <vector>
 
@@ -60,6 +61,10 @@ class AdapterAndroid : public AdapterBase {
     Android::BluetoothScanner _btScanner = _btAdapter.getBluetoothLeScanner();
     Android::Bridge::ScanCallback _btScanCallback;
 
+    // Returns the wrapper for a device, creating it the first time, so that scans and the paired list share it.
+    std::shared_ptr<PeripheralAndroid> cached_peripheral(const Android::BluetoothDevice& device);
+
+    std::mutex peripherals_mutex_;
     std::map<BluetoothAddress, std::shared_ptr<PeripheralAndroid>> peripherals_;
     std::map<BluetoothAddress, std::shared_ptr<PeripheralAndroid>> seen_peripherals_;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "simplernble",
-  "version": "1.2.1-dev100",
+  "version": "1.2.1-dev104",
   "description": "SimpleBLE for React Native: a cross-platform Bluetooth Low Energy library for iOS and Android",
   "keywords": [
     "react-native",