From 1c1f8e8535087a9414ff975bd00e71dcef7c3a21 Mon Sep 17 00:00:00 2001 From: Sergey Trofimov Date: Sun, 18 Oct 2015 09:20:18 +0300 Subject: [PATCH 1/2] Make DeviceSupportFactory recognize device names starting with MI --- .../gadgetbridge/service/DeviceSupportFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceSupportFactory.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceSupportFactory.java index 47530d2f6..62259e5e3 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceSupportFactory.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceSupportFactory.java @@ -79,7 +79,7 @@ public class DeviceSupportFactory { try { BluetoothDevice btDevice = mBtAdapter.getRemoteDevice(deviceAddress); - if (btDevice.getName() == null || btDevice.getName().equals("MI")) { //FIXME: workaround for Miband not being paired + if (btDevice.getName() == null || btDevice.getName().startsWith("MI")) { //FIXME: workaround for Miband not being paired gbDevice = new GBDevice(deviceAddress, "MI", DeviceType.MIBAND); deviceSupport = new ServiceDeviceSupport(new MiBandSupport(), EnumSet.of(ServiceDeviceSupport.Flags.THROTTLING, ServiceDeviceSupport.Flags.BUSY_CHECKING)); } else if (btDevice.getName().indexOf("Pebble") == 0) { From a1fd31c2600d687d680ef749cd2f20d604e96de8 Mon Sep 17 00:00:00 2001 From: Sergey Trofimov Date: Sun, 18 Oct 2015 09:34:51 +0300 Subject: [PATCH 2/2] Show toast when no valid DeviceSupport found for pairing. --- .../gadgetbridge/service/DeviceCommunicationService.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java index 3648a5474..eba03518f 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java @@ -183,6 +183,8 @@ public class DeviceCommunicationService extends Service { } else { deviceSupport.connect(); } + } else { + GB.toast(this, getString(R.string.cannot_connect, "Can't create device support"), Toast.LENGTH_SHORT, GB.ERROR); } } catch (Exception e) { GB.toast(this, getString(R.string.cannot_connect, e.getMessage()), Toast.LENGTH_SHORT, GB.ERROR);