From 6526268804636efd5b8b242a09f41d271475eea8 Mon Sep 17 00:00:00 2001 From: Andreas Shimokawa Date: Wed, 2 Jun 2021 17:12:59 +0200 Subject: [PATCH] Never show GPS or HW versions, just show FW2 The problem is that a lot of devices showed HR which had GPS, which confused people --- .../freeyourgadget/gadgetbridge/impl/GBDevice.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDevice.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDevice.java index ee9f8e534..a704bfd9d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDevice.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDevice.java @@ -62,8 +62,7 @@ public class GBDevice implements Parcelable { public static final String EXTRA_DEVICE = "device"; private static final String DEVINFO_HW_VER = "HW: "; private static final String DEVINFO_FW_VER = "FW: "; - private static final String DEVINFO_HR_VER = "HR: "; - private static final String DEVINFO_GPS_VER = "GPS: "; + private static final String DEVINFO_FW2_VER = "FW2: "; private static final String DEVINFO_ADDR = "ADDR: "; private static final String DEVINFO_ADDR2 = "ADDR2: "; private String mName; @@ -562,12 +561,7 @@ public class GBDevice implements Parcelable { result.add(new GenericItem(DEVINFO_FW_VER, mFirmwareVersion)); } if (mFirmwareVersion2 != null) { - // FIXME: This is ugly - if (mDeviceType == DeviceType.AMAZFITBIP) { - result.add(new GenericItem(DEVINFO_GPS_VER, mFirmwareVersion2)); - } else { - result.add(new GenericItem(DEVINFO_HR_VER, mFirmwareVersion2)); - } + result.add(new GenericItem(DEVINFO_FW2_VER, mFirmwareVersion2)); } if (mAddress != null) { result.add(new GenericItem(DEVINFO_ADDR, mAddress));