Fix issue when using Central and Peripheral modes at the same time (#174)

* Add checks to see if connect event is really for a Central or Peripheral

* Update gradle

Author: weliem

blessed/src/main/java/com/welie/blessed/BluetoothCentralManager.java

@@ -79,8 +79,8 @@ public class BluetoothCentralManager {
     private @Nullable volatile BluetoothLeScanner bluetoothScanner;
     private @Nullable volatile BluetoothLeScanner autoConnectScanner;
     private @NotNull final BluetoothCentralManagerCallback bluetoothCentralManagerCallback;
-    private @NotNull final Map<String, BluetoothPeripheral> connectedPeripherals = new ConcurrentHashMap<>();
-    private @NotNull final Map<String, BluetoothPeripheral> unconnectedPeripherals = new ConcurrentHashMap<>();
+    protected @NotNull final Map<String, BluetoothPeripheral> connectedPeripherals = new ConcurrentHashMap<>();
+    protected @NotNull final Map<String, BluetoothPeripheral> unconnectedPeripherals = new ConcurrentHashMap<>();
     private @NotNull final Map<String, BluetoothPeripheral> scannedPeripherals = new ConcurrentHashMap<>();
     private @NotNull final List<String> reconnectPeripheralAddresses = new ArrayList<>();
     private @NotNull final Map<String, BluetoothPeripheralCallback> reconnectCallbacks = new ConcurrentHashMap<>();

blessed/src/main/java/com/welie/blessed/BluetoothPeripheralManager.java

@@ -90,6 +90,7 @@ public class BluetoothPeripheralManager {
     private @NotNull final BluetoothLeAdvertiser bluetoothLeAdvertiser;
     private @NotNull final BluetoothGattServer bluetoothGattServer;
     private @NotNull final BluetoothPeripheralManagerCallback callback;
+    private @Nullable BluetoothCentralManager centralManager = null;
     protected @NotNull final Queue<Runnable> commandQueue = new ConcurrentLinkedQueue<>();
     private @NotNull final HashMap<BluetoothGattCharacteristic, byte[]> writeLongCharacteristicTemporaryBytes = new HashMap<>();
     private @NotNull final HashMap<BluetoothGattDescriptor, byte[]> writeLongDescriptorTemporaryBytes = new HashMap<>();
@@ -106,6 +107,15 @@ public class BluetoothPeripheralManager {
         public void onConnectionStateChange(final BluetoothDevice device, final int status, final int newState) {
             if (status == BluetoothGatt.GATT_SUCCESS) {
                 if (newState == BluetoothProfile.STATE_CONNECTED) {
+
+                    // First check if this is a connecting peripheral because Android
+                    // will also call this callback for connecting peripherals
+                    if (centralManager != null) {
+                        if (centralManager.unconnectedPeripherals.containsKey(device.getAddress())) {
+                            return;
+                        }
+                    }
+
                     // Call connect() even though we are already connected
                     // It basically tells Android we will really use this connection
                     // If we don't do this, then cancelConnection won't work
@@ -119,7 +129,7 @@ public void onConnectionStateChange(final BluetoothDevice device, final int stat
 
                     handleDeviceConnected(device);
                 } else if (newState == BluetoothProfile.STATE_DISCONNECTED) {
-                    // Deal is double disconnect messages
+                    // Deal with double disconnect messages
                     if (!connectedCentralsMap.containsKey(device.getAddress())) return;
 
                     handleDeviceDisconnected(device);
@@ -486,6 +496,10 @@ public BluetoothPeripheralManager(@NotNull final Context context, @NotNull final
         context.registerReceiver(adapterStateReceiver, filter);
     }
 
+    public void setCentralManager(@NotNull final BluetoothCentralManager central) {
+        this.centralManager = Objects.requireNonNull(central);
+    }
+
     /**
      * Close the BluetoothPeripheralManager
      *

build.gradle

@@ -7,7 +7,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.2'
+        classpath 'com.android.tools.build:gradle:7.3.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip