react-native-ble-manager 12.5.0 → 12.5.2

package/android/build.gradle

@@ -9,7 +9,8 @@ buildscript {
         }
 
         dependencies {
-            classpath "com.android.tools.build:gradle:7.2.1"
+            classpath "com.android.tools.build:gradle:8.6.1"
+            classpath "com.facebook.react:react-native-gradle-plugin"
             // noinspection DifferentKotlinGradleVersion
             classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         }
@@ -27,12 +28,16 @@ def isNewArchitectureEnabled() {
 }
 
 apply plugin: 'com.android.library'
-apply plugin: "kotlin-android"
-
-if (isNewArchitectureEnabled()) {
-    apply plugin: 'com.facebook.react'
+// AGP 9 ships built-in Kotlin support and registers the `kotlin` extension
+// itself. Applying the Kotlin plugin on top of it fails configuration with
+// "Cannot add extension with name 'kotlin'". Only apply it when nothing has
+// registered that extension yet.
+if (project.extensions.findByName('kotlin') == null) {
+    apply plugin: "kotlin-android"
 }
 
+apply plugin: 'com.facebook.react'
+
 def safeExtGet(prop, fallback) {
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
 }
@@ -116,17 +121,12 @@ repositories {
 def kotlin_version = getExtOrDefault("kotlinVersion")
 
 dependencies {
-    // For < 0.71, this will be from the local maven repo
-    // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
-    //noinspection GradleDynamicVersion
-    implementation "com.facebook.react:react-native:+"
+    implementation "com.facebook.react:react-android:0.81.5"
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
 
-if (isNewArchitectureEnabled()) {
-    react {
-        jsRootDir = file("../src/")
-        libraryName = "BleManager"
-        codegenJavaPackageName = "it.innove"
-    }
+react {
+    jsRootDir = file("../src/")
+    libraryName = "BleManager"
+    codegenJavaPackageName = "it.innove"
 }

package/android/gradle.properties

@@ -1,5 +1,5 @@
-kotlinVersion=1.7.0
+kotlinVersion=1.9.24
 android.useAndroidX=true
 android.enableJetifier=true
 # https://github.com/facebook/react-native/issues/35168
-org.gradle.jvmargs=-Xmx4096M
+org.gradle.jvmargs=-Xmx4096M

package/android/settings.gradle

@@ -1,2 +1,3 @@
 rootProject.name = 'react-native-ble-manager'
 
+includeBuild('../node_modules/@react-native/gradle-plugin')

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

@@ -119,10 +119,25 @@ public class Peripheral extends BluetoothGattCallback {
 
     public void connect(final Callback callback, Activity activity, ReadableMap options) {
         mainHandler.post(() -> {
-            if (!connected) {
-                BluetoothDevice device = getDevice();
-                this.connectCallbacks.addLast(callback);
-                this.connecting = true;
+            if (connected) {
+                if (gatt != null) {
+                    callback.invoke();
+                } else {
+                    callback.invoke("BluetoothGatt is null");
+                }
+                return;
+            }
+
+            this.connectCallbacks.addLast(callback);
+
+            if (connecting) {
+                return;
+            }
+
+            BluetoothDevice device = getDevice();
+            this.connecting = true;
+
+            try {
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                     Log.d(BleManager.LOG_TAG, " Is Or Greater than M $mBluetoothDevice");
                     boolean autoconnect = false;
@@ -150,12 +165,19 @@ public class Peripheral extends BluetoothGattCallback {
                         gatt = device.connectGatt(activity, false, this);
                     }
                 }
-            } else {
-                if (gatt != null) {
-                    callback.invoke();
-                } else {
-                    callback.invoke("BluetoothGatt is null");
+
+                // connectGatt() may return null if the adapter is not ready
+                if (gatt == null) {
+                    throw new IllegalStateException("connectGatt returned null");
+                }
+            } catch (Exception e) {
+                Log.e(BleManager.LOG_TAG, "[ON CONNECT][NATIVE] connectGatt failed for " + device.getAddress(), e);
+                this.connecting = false;
+                this.gatt = null;
+                for (Callback connectCallback : connectCallbacks) {
+                    connectCallback.invoke("Connection failed to start: " + e.getMessage());
                 }
+                connectCallbacks.clear();
             }
         });
     }
@@ -163,6 +185,7 @@ public class Peripheral extends BluetoothGattCallback {
 
     public void disconnect(final Callback callback, final boolean force) {
         connected = false;
+        connecting = false;
         mainHandler.post(() -> {
             errorAndClearAllCallbacks("Disconnect called before the command completed");
             resetQueuesAndBuffers();
@@ -384,6 +407,7 @@ public class Peripheral extends BluetoothGattCallback {
         commandQueue.clear();
         commandQueueBusy = false;
         connected = false;
+        connecting = false;
         clearBuffers();
     }
 
@@ -1100,33 +1124,33 @@ public class Peripheral extends BluetoothGattCallback {
         }
         return enqueue(() -> {
             try {
-                 if (!isConnected() || gatt == null) {
-                     if (withResponse && callback != null) {
-                         if (writeCallbacks.removeLastOccurrence(callback)) {
-                             try {
-                                 callback.invoke("Device is not connected", null);
-                             } catch (Exception callbackException) {
-                                 Log.e(BleManager.LOG_TAG, "Error invoking write callback for disconnected device", callbackException);
-                             }
-                         }
-                     }
-                     completedCommand();
-                     return;
-                 }
-                 doWrite(characteristic, copyOfData);
-             } catch (Exception e) {
-                 Log.e(BleManager.LOG_TAG, "Error in enqueueWrite lambda", e);
-                 if (withResponse && callback != null) {
-                     if (writeCallbacks.removeLastOccurrence(callback)) {
-                         try {
-                             callback.invoke("Write failed: " + e.getMessage(), null);
-                         } catch (Exception callbackException) {
-                             Log.e(BleManager.LOG_TAG, "Error invoking write callback", callbackException);
-                         }
-                     }
-                 }
-                 completedCommand();
-             }
+                if (!isConnected() || gatt == null) {
+                    if (withResponse && callback != null) {
+                        if (writeCallbacks.removeLastOccurrence(callback)) {
+                            try {
+                                callback.invoke("Device is not connected", null);
+                            } catch (Exception callbackException) {
+                                Log.e(BleManager.LOG_TAG, "Error invoking write callback for disconnected device", callbackException);
+                            }
+                        }
+                    }
+                    completedCommand();
+                    return;
+                }
+                doWrite(characteristic, copyOfData);
+            } catch (Exception e) {
+                Log.e(BleManager.LOG_TAG, "Error in enqueueWrite lambda", e);
+                if (withResponse && callback != null) {
+                    if (writeCallbacks.removeLastOccurrence(callback)) {
+                        try {
+                            callback.invoke("Write failed: " + e.getMessage(), null);
+                        } catch (Exception callbackException) {
+                            Log.e(BleManager.LOG_TAG, "Error invoking write callback", callbackException);
+                        }
+                    }
+                }
+                completedCommand();
+            }
         });
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "react-native-ble-manager",
-    "version": "12.5.0",
+    "version": "12.5.2",
     "description": "A BLE module for react native.",
     "homepage": "https://innoveit.github.io/react-native-ble-manager/",
     "repository": {