[Fix] Descriptor primary/secondary service support on iOS

chipweinberger · Nov 7, 2024 · 153c6ba · 153c6ba
1 parent de86390
commit 153c6ba
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/ios/Classes/FlutterBluePlusPlugin.m b/ios/Classes/FlutterBluePlusPlugin.m
@@ -1919,17 +1919,19 @@ - (NSDictionary *)bmBluetoothService:(CBPeripheral *)peripheral service:(CBServi
 - (NSDictionary*)bmBluetoothCharacteristic:(CBPeripheral *)peripheral
                             characteristic:(CBCharacteristic *)characteristic
 {
+    ServicePair *pair = [self getServicePair:peripheral characteristic:characteristic];
+
     // descriptors
     NSMutableArray *descriptors = [NSMutableArray new];
     for (CBDescriptor *d in [characteristic descriptors])
     {
         // See: BmBluetoothDescriptor
         NSDictionary* desc = @{
             @"remote_id":              [peripheral.identifier UUIDString],
-            @"service_uuid":           [d.characteristic.service.UUID uuidStr],
-            @"service_index":          d.characteristic.service.hash,
-            @"secondary_service_uuid": [NSNull null],
-            @"secondary_service_index": [NSNull null],
+            @"service_uuid":           [pair.primary.UUID uuidStr],
+            @"service_index":          pair.primary.hash,
+            @"secondary_service_uuid": pair.secondary ? [pair.secondary.UUID uuidStr] : [NSNull null],
+            @"secondary_service_index": pair.secondary ? pair.secondary.hash : [NSNull null],
             @"characteristic_uuid":    [d.characteristic.UUID uuidStr],
             @"characteristic_index":   d.characteristic.hash,
             @"descriptor_uuid":        [d.UUID uuidStr],
@@ -1938,8 +1940,6 @@ - (NSDictionary*)bmBluetoothCharacteristic:(CBPeripheral *)peripheral
         [descriptors addObject:desc];
     }
 
-    ServicePair *pair = [self getServicePair:peripheral characteristic:characteristic];
-
     CBCharacteristicProperties props = characteristic.properties;
 
     // See: BmCharacteristicProperties