Merge pull request #43 from ChangJoo-Park/master

Fix #42 Error when meet unknown devices.
edufolly · Jul 1, 2019 · 52aa263 · 52aa263
2 parents 051ab9d + 85901d2
commit 52aa263
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 15 deletions.
diff --git a/example/lib/BluetoothDeviceListEntry.dart b/example/lib/BluetoothDeviceListEntry.dart
@@ -13,7 +13,7 @@ class BluetoothDeviceListEntry extends ListTile {
     onLongPress: onLongPress,
     enabled: enabled,
     leading: Icon(Icons.devices), // @TODO . !BluetoothClass! class aware icon
-    title: Text(device.name),
+    title: Text(device.name ?? "Unknown device"),
     subtitle: Text(device.address.toString()),
     trailing: Row(
       mainAxisSize: MainAxisSize.min,

diff --git a/example/lib/DiscoveryPage.dart b/example/lib/DiscoveryPage.dart
@@ -9,7 +9,7 @@ class DiscoveryPage extends StatefulWidget {
   final bool start;
 
   const DiscoveryPage({this.start = true});
-  
+
   @override
   _DiscoveryPage createState() => new _DiscoveryPage();
 }
@@ -18,13 +18,13 @@ class _DiscoveryPage extends State<DiscoveryPage> {
   StreamSubscription<BluetoothDiscoveryResult> _streamSubscription;
   List<BluetoothDiscoveryResult> results = List<BluetoothDiscoveryResult>();
   bool isDiscovering;
-  
+
   _DiscoveryPage();
 
   @override
   void initState() {
     super.initState();
-    
+
     isDiscovering = widget.start;
     if (isDiscovering) {
       _startDiscovery();
@@ -44,7 +44,7 @@ class _DiscoveryPage extends State<DiscoveryPage> {
     _streamSubscription = FlutterBluetoothSerial.instance.startDiscovery().listen((r) {
       setState(() { results.add(r); });
     });
-    
+
     _streamSubscription.onDone(() {
       setState(() { isDiscovering = false; });
     });
@@ -59,22 +59,15 @@ class _DiscoveryPage extends State<DiscoveryPage> {
 
     super.dispose();
   }
-  
+
   @override
   Widget build(BuildContext context) {
-    List<BluetoothDeviceListEntry> list = results.map((result) => BluetoothDeviceListEntry(
-      device: result.device,
-      rssi: result.rssi,
-      onTap: () {
-        Navigator.of(context).pop(result.device);
-      },
-    )).toList();
     return Scaffold(
       appBar: AppBar(
         title: isDiscovering ? Text('Discovering devices') : Text('Discovered devices'),
         actions: <Widget>[
           (
-            isDiscovering ? 
+            isDiscovering ?
               FittedBox(child: Container(
                 margin: new EdgeInsets.all(16.0),
                 child: CircularProgressIndicator(valueColor: AlwaysStoppedAnimation<Color>(Colors.white))
@@ -87,7 +80,19 @@ class _DiscoveryPage extends State<DiscoveryPage> {
           )
         ],
       ),
-      body: ListView(children: list)
+      body: ListView.builder(
+        itemCount: results.length,
+        itemBuilder: (BuildContext context, index) {
+          BluetoothDiscoveryResult result = results[index];
+          return BluetoothDeviceListEntry(
+            device: result.device,
+            rssi: result.rssi,
+            onTap: () {
+              Navigator.of(context).pop(result.device);
+            },
+          );
+        },
+      )
     );
   }
 }