Handle some common descriptors

android/build.gradle

@@ -36,6 +36,11 @@ android {
             }
         }
     }
+    buildTypes {
+        release {
+            consumerProguardFiles 'proguard-rules.pro'
+        }
+    }
 }
 
 protobuf {

android/proguard-rules.pro

@@ -0,0 +1,2 @@
+# Retain Flutter Blue protocol buffer files
+-keep class com.pauldemarco.flutter_blue.** { *; }

example/lib/main.dart

@@ -54,7 +54,7 @@ class BluetoothOffScreen extends StatelessWidget {
               'Bluetooth Adapter is ${state != null ? state.toString().substring(15) : 'not available'}.',
               style: Theme.of(context)
                   .primaryTextTheme
-                  .subhead
+                  .subtitle1
                   ?.copyWith(color: Colors.white),
             ),
           ],

example/lib/widgets.dart

@@ -135,7 +135,7 @@ class ServiceTile extends StatelessWidget {
           children: <Widget>[
             Text('Service'),
             Text('0x${service.uuid.toString().toUpperCase().substring(4, 8)}',
-                style: Theme.of(context).textTheme.body1?.copyWith(
+                style: Theme.of(context).textTheme.bodyText1?.copyWith(
                     color: Theme.of(context).textTheme.caption?.color))
           ],
         ),
@@ -183,7 +183,7 @@ class CharacteristicTile extends StatelessWidget {
                 Text('Characteristic'),
                 Text(
                     '0x${characteristic.uuid.toString().toUpperCase().substring(4, 8)}',
-                    style: Theme.of(context).textTheme.body1?.copyWith(
+                    style: Theme.of(context).textTheme.bodyText1?.copyWith(
                         color: Theme.of(context).textTheme.caption?.color))
               ],
             ),
@@ -245,7 +245,7 @@ class DescriptorTile extends StatelessWidget {
           Text('0x${descriptor.uuid.toString().toUpperCase().substring(4, 8)}',
               style: Theme.of(context)
                   .textTheme
-                  .body1
+                  .bodyText1
                   ?.copyWith(color: Theme.of(context).textTheme.caption?.color))
         ],
       ),
@@ -289,11 +289,11 @@ class AdapterStateTile extends StatelessWidget {
       child: ListTile(
         title: Text(
           'Bluetooth adapter is ${state.toString().substring(15)}',
-          style: Theme.of(context).primaryTextTheme.subhead,
+          style: Theme.of(context).primaryTextTheme.subtitle1,
         ),
         trailing: Icon(
           Icons.error,
-          color: Theme.of(context).primaryTextTheme.subhead?.color,
+          color: Theme.of(context).primaryTextTheme.subtitle1?.color,
         ),
       ),
     );

ios/Classes/FlutterBluePlugin.m

@@ -506,8 +506,29 @@ - (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)]];
+  // Descriptors returning NSNumber (UInt16)
+  if ([descriptor.UUID.UUIDString isEqualToString: CBUUIDCharacteristicExtendedPropertiesString]  ||
+      [descriptor.UUID.UUIDString isEqualToString: CBUUIDClientCharacteristicConfigurationString] ||
+      [descriptor.UUID.UUIDString isEqualToString: CBUUIDServerCharacteristicConfigurationString] )
+  {
+    int value = [descriptor.value unsignedShortValue];
+    [result setValue:[NSData dataWithBytes:&value length:sizeof(value)]];
+  }
+
+  // Descriptors returning NSString
+  else if ([descriptor.UUID.UUIDString isEqualToString: CBUUIDCharacteristicUserDescriptionString])
+  {
+    NSData *value = [descriptor.value dataUsingEncoding: NSUTF8StringEncoding];
+    [result setValue: value];
+  }
+
+  // Descriptors returning NSData
+  else if ([descriptor.UUID.UUIDString isEqualToString: CBUUIDCharacteristicFormatString] ||
+           [descriptor.UUID.UUIDString isEqualToString: CBUUIDCharacteristicAggregateFormatString])
+  {
+    [result setValue:descriptor.value];
+  }
+
   [_channel invokeMethod:@"ReadDescriptorResponse" arguments:[self toFlutterData:result]];
 
   // If descriptor is CCCD, send a SetNotificationResponse in case anything is awaiting

lib/src/bluetooth_device.dart

@@ -26,22 +26,55 @@ class BluetoothDevice {
       ..remoteId = id.toString()
       ..androidAutoConnect = autoConnect;
 
+    Completer<void> _completer = Completer();
+
     Timer? timer;
     if (timeout != null) {
       timer = Timer(timeout, () {
         disconnect();
-        throw TimeoutException('Failed to connect in time.', timeout);
+        if (!_completer.isCompleted) {
+          _completer.completeError(
+              TimeoutException('Failed to connect in time.', timeout));
+        }
       });
     }
 
     await FlutterBlue.instance._channel
         .invokeMethod('connect', request.writeToBuffer());
 
-    await state.firstWhere((s) => s == BluetoothDeviceState.connected);
-
-    timer?.cancel();
+    state.firstWhere((_state) {
+      bool connected = _state == BluetoothDeviceState.connected;
+      if (connected) {
+        timer?.cancel();
+        if (!_completer.isCompleted) {
+          _completer.complete();
+        }
+      }
+      return connected;
+    }, orElse: () {
+      if (!_completer.isCompleted) {
+        timer?.cancel();
+        disconnect();
+        _completer.completeError(
+            TimeoutException('Failed to connect in time.', timeout));
+      }
+      return BluetoothDeviceState.disconnected;
+    }).then((_state) {
+      timer?.cancel();
+      if (_state == BluetoothDeviceState.connected) {
+        if (!_completer.isCompleted) {
+          _completer.complete();
+        }
+      }
+    }).catchError((error) {
+      timer?.cancel();
+      disconnect();
+      if (!_completer.isCompleted) {
+        _completer.completeError(error);
+      }
+    });
 
-    return;
+    return _completer.future;
   }
 
   /// Cancels connection to the Bluetooth Device