From 0a4eefcf119746fab3d698e89b8c6943f5c99717 Mon Sep 17 00:00:00 2001 From: cpfeiffer Date: Thu, 29 Sep 2016 22:40:16 +0200 Subject: [PATCH] Use device information from the database for GBDevices fixes offline charts not displaying heartrate for Mi1S --- .../freeyourgadget/gadgetbridge/util/DeviceHelper.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DeviceHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DeviceHelper.java index 346be2fd..943dd1fa 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DeviceHelper.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DeviceHelper.java @@ -101,19 +101,18 @@ public class DeviceHelper { GB.toast(context, context.getString(R.string.bluetooth_is_disabled_), Toast.LENGTH_SHORT, GB.WARN); } List dbDevices = getDatabaseDevices(); + // these come first, as they have the most information already + availableDevices.addAll(dbDevices); if (btAdapter != null) { List bondedDevices = getBondedDevices(btAdapter); availableDevices.addAll(bondedDevices); } - availableDevices.addAll(dbDevices); Prefs prefs = GBApplication.getPrefs(); String miAddr = prefs.getString(MiBandConst.PREF_MIBAND_ADDRESS, ""); if (miAddr.length() > 0) { GBDevice miDevice = new GBDevice(miAddr, "MI", DeviceType.MIBAND); - if (!availableDevices.contains(miDevice)) { - availableDevices.add(miDevice); - } + availableDevices.add(miDevice); } String pebbleEmuAddr = prefs.getString("pebble_emu_addr", "");