Show model icon for pairable device and include tintin in LE scan fil…

…tering
pebble-dev · Sep 18, 2020 · e58b717 · e58b717
1 parent 7274350
commit e58b717
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/android/app/src/main/kotlin/io/rebble/fossil/bluetooth/BlueCommon.kt b/android/app/src/main/kotlin/io/rebble/fossil/bluetooth/BlueCommon.kt
@@ -83,7 +83,7 @@ class BlueCommon(private val context: Context, private val packetCallback: (Byte
     private val leScanCallback: ScanCallback = object : ScanCallback() {
         override fun onScanResult(callbackType: Int, result: ScanResult) {
             super.onScanResult(callbackType, result)
-            if (result.device.name != null && result.device.type == BluetoothDevice.DEVICE_TYPE_LE && result.device.name.startsWith("Pebble ")) {
+            if (result.device.name != null && result.device.type == BluetoothDevice.DEVICE_TYPE_LE && (result.device.name.startsWith("Pebble ") || result.device.name.startsWith("Pebble-LE"))) {
                 resultCallback?.invoke(BluePebbleDevice(result))
             }
         }
@@ -92,7 +92,7 @@ class BlueCommon(private val context: Context, private val packetCallback: (Byte
     private val legacyLeScanCallback = object : BluetoothAdapter.LeScanCallback {
         override fun onLeScan(device: BluetoothDevice?, rssi: Int, scanRecord: ByteArray?) {
             if (device != null && device.type == BluetoothDevice.DEVICE_TYPE_LE && scanRecord != null) {
-                if (device.name != null && device.name.startsWith("Pebble ")) {
+                if (device.name != null && (device.name.startsWith("Pebble ") || device.name.startsWith("Pebble-LE"))) {
                     resultCallback?.invoke(BluePebbleDevice(device, scanRecord))
                 }
             }

diff --git a/lib/ui/setup/PairPage.dart b/lib/ui/setup/PairPage.dart
@@ -100,8 +100,7 @@ class _PairPageState extends State<PairPage> {
                             child: Row(children: <Widget>[
                               Container(
                                 child: Center(
-                                    child: PebbleWatchIcon(PebbleWatchModel
-                                        .time_round_rose_gold_14)),
+                                    child: PebbleWatchIcon(PebbleWatchModel.values[e.color])),
                                 width: 56,
                                 height: 56,
                                 decoration: BoxDecoration(