discoverServices crashes in "toDescriptorProto" on iOS #583

- https://github.com/pauldemarco/flutter_blue/issues/583
ujjwalmaity · Oct 1, 2021 · f6382eb · f6382eb
1 parent 3f9bfdd
commit f6382eb
Showing 1 changed file with 24 additions and 4 deletions.
diff --git a/ios/Classes/FlutterBluePlugin.m b/ios/Classes/FlutterBluePlugin.m
@@ -506,8 +506,18 @@ - (void)peripheral:(CBPeripheral *)peripheral didUpdateValueForDescriptor:(CBDes
   }
   ProtosReadDescriptorResponse *result = [[ProtosReadDescriptorResponse alloc] init];
   [result setRequest:q];
-  int value = [descriptor.value intValue];
-  [result setValue:[NSData dataWithBytes:&value length:sizeof(value)]];
+  //int value = [descriptor.value intValue];
+  //[result setValue:[NSData dataWithBytes:&value length:sizeof(value)]];
+  @try {
+    if  ([descriptor.value isKindOfClass:NSNumber.class]) {
+      int value = [descriptor.value intValue];
+      [result setValue:[NSData dataWithBytes:&value length:sizeof(value)]];
+    } else {
+      [result setValue:descriptor.value];
+    }
+  } @catch (NSException *exception) {
+    NSLog(exception.reason);
+  }
   [_channel invokeMethod:@"ReadDescriptorResponse" arguments:[self toFlutterData:result]];
 
   // If descriptor is CCCD, send a SetNotificationResponse in case anything is awaiting
@@ -709,8 +719,18 @@ - (ProtosBluetoothDescriptor*)toDescriptorProto:(CBPeripheral *)peripheral descr
   [result setRemoteId:[peripheral.identifier UUIDString]];
   [result setCharacteristicUuid:[descriptor.characteristic.UUID fullUUIDString]];
   [result setServiceUuid:[descriptor.characteristic.service.UUID fullUUIDString]];
-  int value = [descriptor.value intValue];
-  [result setValue:[NSData dataWithBytes:&value length:sizeof(value)]];
+  //int value = [descriptor.value intValue];
+  //[result setValue:[NSData dataWithBytes:&value length:sizeof(value)]];
+  @try {
+    if  ([descriptor.value isKindOfClass:NSNumber.class]) {
+      int value = [descriptor.value intValue];
+      [result setValue:[NSData dataWithBytes:&value length:sizeof(value)]];
+    } else {
+      [result setValue:descriptor.value];
+    }
+  } @catch (NSException *exception) {
+    NSLog(exception.reason);
+  }
   return result;
 }