Squashed merge: fix services not available after discoverAllServicesA…

…ndCharacteristics
dotintent · Dec 20, 2024 · 149e84c · 149e84c
1 parent 36f0b56
commit 149e84c
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 3 deletions.
diff --git a/android/src/main/java/com/bleplx/adapter/Device.java b/android/src/main/java/com/bleplx/adapter/Device.java
@@ -3,6 +3,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
@@ -61,6 +62,20 @@ public List<Service> getServices() {
     return services;
   }
 
+  @Nullable
+  public List<UUID> getServicesUUIDs() {
+    if (services == null) {
+      return null;
+    }
+
+    List<UUID> servicesUUIDs = new ArrayList<>();
+    for (Service service : services) {
+      servicesUUIDs.add(service.getUuid());
+    }
+
+    return servicesUUIDs;
+  }
+
   public void setServices(@Nullable List<Service> services) {
     this.services = services;
   }

diff --git a/android/src/main/java/com/bleplx/converter/DeviceToJsObjectConverter.java b/android/src/main/java/com/bleplx/converter/DeviceToJsObjectConverter.java
@@ -1,9 +1,16 @@
 package com.bleplx.converter;
 
+import android.util.Log;
+
 import com.bleplx.adapter.Device;
+import com.bleplx.utils.ReadableArrayConverter;
 import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.WritableMap;
 
+import java.util.List;
+import java.util.UUID;
+
 public class DeviceToJsObjectConverter extends JSObjectConverter<Device> {
 
   private interface Metadata {
@@ -39,10 +46,15 @@ public WritableMap toJSObject(Device value) {
       result.putNull(Metadata.MTU);
     }
 
+    if(value.getServices() != null) {
+      result.putArray(Metadata.SERVICE_UUIDS, ReadableArrayConverter.toReadableArray(value.getServicesUUIDs()));
+    } else {
+      result.putNull(Metadata.SERVICE_UUIDS);
+    }
+
     // Advertisement data is not set
     result.putNull(Metadata.MANUFACTURER_DATA);
     result.putNull(Metadata.SERVICE_DATA);
-    result.putNull(Metadata.SERVICE_UUIDS);
     result.putNull(Metadata.LOCAL_NAME);
     result.putNull(Metadata.TX_POWER_LEVEL);
     result.putNull(Metadata.SOLICITED_SERVICE_UUIDS);

diff --git a/android/src/main/java/com/bleplx/utils/ReadableArrayConverter.java b/android/src/main/java/com/bleplx/utils/ReadableArrayConverter.java
@@ -1,6 +1,11 @@
 package com.bleplx.utils;
 
+import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.WritableArray;
+
+import java.util.List;
+import java.util.UUID;
 
 public class ReadableArrayConverter {
   public static String[] toStringArray(ReadableArray readableArray) {
@@ -10,4 +15,14 @@ public static String[] toStringArray(ReadableArray readableArray) {
     }
     return stringArray;
   }
+
+  public static ReadableArray toReadableArray(List<UUID> uuids) {
+    WritableArray array = Arguments.createArray();
+
+    for (UUID uuid : uuids) {
+      array.pushString(uuid.toString());
+    }
+
+    return array;
+  }
 }
diff --git a/ios/MultiplatformBleAdapter/BleExtensions.swift b/ios/MultiplatformBleAdapter/BleExtensions.swift
@@ -104,7 +104,7 @@ extension Peripheral {
 
             "manufacturerData": NSNull(),
             "serviceData": NSNull(),
-            "serviceUUIDs": NSNull(),
+            "serviceUUIDs": services?.map { $0.uuid.fullUUIDString } ?? NSNull(),
             "localName": NSNull(),
             "txPowerLevel": NSNull(),
             "solicitedServiceUUIDs": NSNull(),
@@ -233,4 +233,4 @@ extension BluetoothState {
         case .poweredOn: return "PoweredOn"
         }
     }
-}
+}