fix build iOS

Author: alerighi

android/src/main/java/it/iotinga/blelibrary/RNBleManager.kt

@@ -7,6 +7,10 @@ import android.bluetooth.BluetoothGattService
 import android.content.Context
 import android.util.Base64
 import android.util.Log
+import androidx.core.graphics.component1
+import androidx.core.graphics.component2
+import androidx.core.graphics.component3
+import androidx.core.graphics.component4
 import expo.modules.kotlin.Promise
 import no.nordicsemi.android.ble.BleManager
 import no.nordicsemi.android.ble.TimeoutableRequest
@@ -102,12 +106,16 @@ class RNBleManager(
     )
   }
 
+  // Function is called after connect to perform initialization before service discovery
   override fun initialize() {
     requestById.clear()
 
     val mtu = mtu
-    if (mtu != null) {
+    if (mtu != null && mtu != 0) {
       requestMtu(mtu)
+        .before {
+          emitConnectionStateChange(ConnectionState.REQUESTING_MTU, 0)
+        }
         .fail { device, status ->
           log(Log.WARN, "Error requesting MTU: $status")
         }
@@ -118,17 +126,22 @@ class RNBleManager(
     }
   }
 
+  // This function is called when services are invalidate, for example when the device
+  // disconnects.
   override fun onServicesInvalidated() {
     gatt = null
   }
 
+  // This function is after service discovery is done. Shall return true if all required
+  // services are available.
+  // Since I don't know the services to be used in advance I just return true
   override fun isRequiredServiceSupported(gatt: BluetoothGatt): Boolean {
     this.gatt = gatt
 
     return true
   }
 
-  fun enqueue(transactionId: String, request: TimeoutableRequest) {
+  private fun enqueue(transactionId: String, request: TimeoutableRequest) {
     requestById[transactionId] = request
 
     request
@@ -146,8 +159,9 @@ class RNBleManager(
     this.mtu = mtu
 
     if (isConnected) {
+      log(Log.WARN, "Device already connected. Disconnecting it first.")
       disconnect()
-        .done { log(Log.INFO, "device disconnected") }
+        .done { log(Log.INFO, "Device disconnected") }
         .fail { device, status ->
           Log.w(
             LOG_TAG,

ios/ReactNativeBleLibraryModule.swift

@@ -256,7 +256,7 @@ private final class BleLibraryImpl: NSObject, CBCentralManagerDelegate,
   // MARK: Scan
 
   func scanStart(serviceUuids: [String]?, promise: Promise) {
-    print("[BleLibrary] scanStart(\(serviceUuids, default: "[]")")
+    print("[BleLibrary] scanStart(\(serviceUuids ?? [])")
     guard self.isModuleInitialized else {
       print("[BleLibrary] manager is not initialized")
       return promise.reject(
@@ -310,7 +310,7 @@ private final class BleLibraryImpl: NSObject, CBCentralManagerDelegate,
     promise: Promise
   ) {
     print(
-      "[BleLibrary] connect(\(deviceId), \(mtu), \(options, default: "null"))"
+      "[BleLibrary] connect(\(deviceId), \(mtu), \(options ?? [:])"
     )
     guard self.isModuleInitialized else {
       print("[BleLibrary] module is not initialized")
@@ -799,7 +799,7 @@ private final class BleLibraryImpl: NSObject, CBCentralManagerDelegate,
     error: Error?
   ) {
     print(
-      "[BleLibrary] error connecting to peripheral \(peripheral) (error: \(error, default: "nil")"
+      "[BleLibrary] error connecting to peripheral \(peripheral) (error: \(String(describing: error))"
     )
 
     // Cancel connection promise if present
@@ -913,7 +913,7 @@ private final class BleLibraryImpl: NSObject, CBCentralManagerDelegate,
   ) {
     if let error = error {
       print(
-        "[BleLibrary] error discovering characteristics for service \(service.uuid) (error: \(error, default: "null")"
+        "[BleLibrary] error discovering characteristics for service \(service.uuid) (error: \(String(describing: error))"
       )
       // Cancel connection promise if present
       if let p = connectionPromise {
@@ -1030,7 +1030,7 @@ private final class BleLibraryImpl: NSObject, CBCentralManagerDelegate,
       )
     } else {
       print(
-        "[BleLibrary] disconnected from peripheral \(peripheral) failed (error: \(error, default: "null"). Trigger new connection"
+        "[BleLibrary] disconnected from peripheral \(peripheral) failed (error: \(String(describing: error)). Trigger new connection"
       )
 
       module.sendEvent(
@@ -1090,7 +1090,7 @@ private final class BleLibraryImpl: NSObject, CBCentralManagerDelegate,
       print("[BleLibrary] read RSSI success, RSSI = \(RSSI)")
       t.succeed(RSSI)
     } else {
-      print("[BleLibrary] read RSSI error (error: \(error, default: "null")")
+      print("[BleLibrary] read RSSI error (error: \(String(describing: error))")
       t.fail(ERROR_GATT, (error! as NSError).description)
     }
     transactionById.removeValue(forKey: t.transactionId)
@@ -1145,7 +1145,7 @@ private final class BleLibraryImpl: NSObject, CBCentralManagerDelegate,
       }
     } else {
       print(
-        "[BleLibrary] write value failure (error: \(error, default: "null")"
+        "[BleLibrary] write value failure (error: \(String(describing: error))"
       )
       write.fail(ERROR_GATT, error?.localizedDescription ?? "")
       transactionById.removeValue(forKey: write.transactionId)
@@ -1200,7 +1200,7 @@ private final class BleLibraryImpl: NSObject, CBCentralManagerDelegate,
         }
       } else {
         print(
-          "[BleLibrary] read value failure (error: \(error, default: "null")"
+          "[BleLibrary] read value failure (error: \(String(describing: error))"
         )
         read.fail(ERROR_GATT, "error reading characteristic")
         transactionById.removeValue(forKey: read.transactionId)
@@ -1253,7 +1253,7 @@ private final class BleLibraryImpl: NSObject, CBCentralManagerDelegate,
       transaction.succeed(nil)
     } else {
       print(
-        "[BleLibrary] characteristic \(characteristic.uuid) notification state update (error: \(error, default: "null")"
+        "[BleLibrary] characteristic \(characteristic.uuid) notification state update (error: \(String(describing: error))"
       )
       transaction.fail(ERROR_GATT, "error setting notification")
     }
@@ -1338,6 +1338,7 @@ public final class ReactNativeBleLibraryModule: Module {
     OnStartObserving {
       print("[BleLibrary] NativeEventListener registered")
     }
+
     OnStopObserving {
       print("[BleLibrary] NativeEventListener removed")
     }