Allow support classes to vary by GBDevice

This paves the way for configurable btle / btbr support class for the same device (eg. Zepp OS / Huawei / Xiaomi), as well as migration to a new support class for future pebble devices.
2026-07-31 07:44:24 +02:00 · 2025-04-19 20:19:25 +01:00
parent 2e1529f374
commit 8deea74d67
125 changed files with 136 additions and 196 deletions
@@ -821,7 +821,7 @@ public interface DeviceCoordinator {
    int getOrderPriority();

    @NonNull
-    Class<? extends DeviceSupport> getDeviceSupportClass();
+    Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device);

    EnumSet<ServiceDeviceSupport.Flags> getInitialFlags();

@@ -21,7 +21,6 @@ import android.app.Activity;
 import android.content.Context;
 import android.net.Uri;

-import java.util.Collections;
 import java.util.List;

 import androidx.annotation.DrawableRes;
@@ -153,7 +152,7 @@ public class UnknownDeviceCoordinator extends AbstractDeviceCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return UnknownDeviceSupport.class;
    }

@@ -87,7 +87,7 @@ public class AsteroidOSDeviceCoordinator extends AbstractDeviceCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return AsteroidOSDeviceSupport.class;
    }

@@ -26,7 +26,7 @@ public class BandWPSeriesDeviceCoordinator extends AbstractBLEDeviceCoordinator

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return BandWPSeriesDeviceSupport.class;
    }

@@ -270,7 +270,7 @@ public class BangleJSCoordinator extends AbstractBLEDeviceCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return BangleJSDeviceSupport.class;
    }

@@ -22,7 +22,6 @@ import android.bluetooth.le.ScanFilter;
 import android.content.Context;
 import android.net.Uri;
 import android.os.ParcelUuid;
-import android.util.Log;

 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -41,7 +40,6 @@ import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
 import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
-import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.binary_sensor.BinarySensorSupport;

@@ -160,7 +158,7 @@ public class BinarySensorCoordinator extends AbstractBLEDeviceCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return BinarySensorSupport.class;
    }

@@ -51,7 +51,7 @@ public class CasioECBS100DeviceCoordinator extends Casio2C2DDeviceCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return CasioECBS100DeviceSupport.class;
    }

@@ -37,9 +37,7 @@ import nodomain.freeyourgadget.gadgetbridge.devices.casio.CasioDeviceCoordinator
 import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
 import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
-import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.casio.gb6900.CasioGB6900DeviceSupport;

@@ -141,7 +139,7 @@ public class CasioGB6900DeviceCoordinator extends CasioDeviceCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return CasioGB6900DeviceSupport.class;
    }

@@ -148,7 +148,7 @@ public class CasioGBX100DeviceCoordinator extends Casio2C2DDeviceCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return CasioGBX100DeviceSupport.class;
    }

@@ -17,24 +17,14 @@
 /*  Based on code from BlueWatcher, https://github.com/masterjc/bluewatcher */
 package nodomain.freeyourgadget.gadgetbridge.devices.casio.gwb5600;

-import android.app.Activity;
-import android.content.Context;
-import android.net.Uri;
-
 import androidx.annotation.NonNull;

 import java.util.regex.Pattern;

 import nodomain.freeyourgadget.gadgetbridge.R;
-import nodomain.freeyourgadget.gadgetbridge.devices.AbstractBLEDeviceCoordinator;
-import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
-import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
-import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
-import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;

 import nodomain.freeyourgadget.gadgetbridge.devices.casio.Casio2C2DDeviceCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
@@ -103,8 +93,9 @@ public class CasioGWB5600DeviceCoordinator extends Casio2C2DDeviceCoordinator {
        return 5;
    }

+    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return CasioGWB5600DeviceSupport.class;
    }

@@ -145,7 +145,7 @@ public class CmfWatchProCoordinator extends AbstractBLEDeviceCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return CmfWatchProSupport.class;
    }

@@ -94,7 +94,7 @@ public abstract class AbstractColmiR0xCoordinator extends AbstractBLEDeviceCoord

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return ColmiR0xDeviceSupport.class;
    }

@@ -103,7 +103,7 @@ public class CyclingSensorCoordinator extends AbstractBLEDeviceCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return CyclingSensorSupport.class;
    }

@@ -51,7 +51,7 @@ public class PixooCoordinator extends AbstractBLEDeviceCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return PixooSupport.class;
    }

@@ -32,9 +32,7 @@ import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
 import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
-import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.ServiceDeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.domyos.DomyosT540Support;
@@ -122,7 +120,7 @@ public class DomyosT540Coordinator extends AbstractBLEDeviceCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return DomyosT540Support.class;
    }

@@ -28,7 +28,7 @@ public abstract class AbstractEarFunCoordinator extends AbstractDeviceCoordinato

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return EarFunDeviceSupport.class;
    }

@@ -61,7 +61,7 @@ public class EarFunAirPro4Coordinator extends AbstractEarFunCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return EarFunAirPro4DeviceSupport.class;
    }

@@ -60,7 +60,7 @@ public class EarFunAirSCoordinator extends AbstractEarFunCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return EarFunAirSDeviceSupport.class;
    }

@@ -31,7 +31,7 @@ public class G1DeviceCoordinator extends AbstractBLEDeviceCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return G1DeviceSupport.class;
    }

@@ -45,7 +45,7 @@ public class FemometerVinca2DeviceCoordinator extends AbstractDeviceCoordinator

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return FemometerVinca2DeviceSupport.class;
    }

@@ -164,7 +164,7 @@ public class FitProDeviceCoordinator extends AbstractBLEDeviceCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return FitProDeviceSupport.class;
    }

@@ -35,7 +35,6 @@ import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
 import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
-import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.flipper.zero.support.FlipperZeroSupport;

@@ -122,7 +121,7 @@ public class FlipperZeroCoordinator extends AbstractBLEDeviceCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return FlipperZeroSupport.class;
    }

@@ -128,7 +128,7 @@ public abstract class GalaxyBudsGenericCoordinator extends AbstractBLClassicDevi

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return GalaxyBudsDeviceSupport.class;
    }

@@ -108,7 +108,7 @@ public abstract class GarminCoordinator extends AbstractBLEDeviceCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return GarminSupport.class;
    }

@@ -64,7 +64,7 @@ public class GenericHeadphonesCoordinator extends AbstractDeviceCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return GenericHeadphonesSupport.class;
    }

@@ -34,7 +34,7 @@ public class GreeAcCoordinator extends AbstractBLEDeviceCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return GreeAcSupport.class;
    }

@@ -94,7 +94,7 @@ public final class HamaFit6900DeviceCoordinator extends AbstractBLEDeviceCoordin

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return HamaFit6900DeviceSupport.class;
    }

@@ -26,6 +26,7 @@ import androidx.annotation.NonNull;
 import java.util.regex.Pattern;

 import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.hplus.EXRIZUK8Support;

@@ -50,7 +51,7 @@ public class EXRIZUK8Coordinator extends HPlusCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return EXRIZUK8Support.class;
    }
 }
@@ -249,7 +249,7 @@ public class HPlusCoordinator extends AbstractBLEDeviceCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return HPlusSupport.class;
    }

@@ -24,6 +24,7 @@ package nodomain.freeyourgadget.gadgetbridge.devices.hplus;
 import androidx.annotation.NonNull;

 import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.hplus.MakibesF68Support;
@@ -50,7 +51,7 @@ public class MakibesF68Coordinator extends HPlusCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return MakibesF68Support.class;
    }
 }
@@ -26,6 +26,7 @@ import androidx.annotation.NonNull;
 import java.util.regex.Pattern;

 import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.hplus.Q8Support;

@@ -50,7 +51,7 @@ public class Q8Coordinator extends HPlusCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return Q8Support.class;
    }
 }
@@ -68,7 +68,7 @@ public class SG2Coordinator extends HPlusCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return SG2Support.class;
    }
 }
@@ -162,7 +162,7 @@ public class AmazfitBand5Coordinator extends HuamiCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return AmazfitBand5Support.class;
    }

@@ -121,7 +121,7 @@ public class AmazfitBipCoordinator extends HuamiCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return AmazfitBipSupport.class;
    }

@@ -92,7 +92,7 @@ public class AmazfitBipLiteCoordinator extends AmazfitBipCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return AmazfitBipLiteSupport.class;
    }
 }
@@ -173,7 +173,7 @@ public class AmazfitBip3Coordinator extends HuamiCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return AmazfitBip3Support.class;
    }

@@ -170,7 +170,7 @@ public class AmazfitBip3ProCoordinator extends HuamiCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return AmazfitBip3ProSupport.class;
    }

@@ -137,7 +137,7 @@ public class AmazfitBipSCoordinator extends HuamiCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return AmazfitBipSSupport.class;
    }

@@ -25,6 +25,7 @@ import java.util.regex.Pattern;

 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitbips.AmazfitBipSLiteSupport;

@@ -47,7 +48,7 @@ public class AmazfitBipSLiteCoordinator extends AmazfitBipSCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return AmazfitBipSLiteSupport.class;
    }
 }
@@ -166,7 +166,7 @@ public class AmazfitBipUCoordinator extends HuamiCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return AmazfitBipUSupport.class;
    }

@@ -157,7 +157,7 @@ public class AmazfitBipUProCoordinator extends HuamiCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return AmazfitBipUProSupport.class;
    }

@@ -131,7 +131,7 @@ public class AmazfitCorCoordinator extends HuamiCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return AmazfitCorSupport.class;
    }

@@ -131,7 +131,7 @@ public class AmazfitCor2Coordinator extends HuamiCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return AmazfitCor2Support.class;
    }

@@ -132,7 +132,7 @@ public class AmazfitGTRCoordinator extends HuamiCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return AmazfitGTRSupport.class;
    }

@@ -125,7 +125,7 @@ public class AmazfitGTRLiteCoordinator extends HuamiCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return AmazfitGTRLiteSupport.class;
    }

@@ -142,7 +142,7 @@ public class AmazfitGTR2Coordinator extends HuamiCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return AmazfitGTR2Support.class;
    }

@@ -142,7 +142,7 @@ public class AmazfitGTR2eCoordinator extends HuamiCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return AmazfitGTR2eSupport.class;
    }

@@ -132,7 +132,7 @@ public class AmazfitGTSCoordinator extends HuamiCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return AmazfitGTSSupport.class;
    }

@@ -137,7 +137,7 @@ public class AmazfitGTS2Coordinator extends HuamiCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return AmazfitGTS2Support.class;
    }

@@ -87,7 +87,7 @@ public class AmazfitGTS2MiniCoordinator extends AmazfitGTS2Coordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return AmazfitGTS2MiniSupport.class;
    }
 }
@@ -137,7 +137,7 @@ public class AmazfitGTS2eCoordinator extends HuamiCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return AmazfitGTS2eSupport.class;
    }

@@ -132,7 +132,7 @@ public class AmazfitNeoCoordinator extends HuamiCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return AmazfitNeoSupport.class;
    }

@@ -26,6 +26,7 @@ import java.util.regex.Pattern;
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitbipu.AmazfitBipUCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitpop.AmazfitPopSupport;

@@ -58,7 +59,7 @@ public class AmazfitPopCoordinator extends AmazfitBipUCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return AmazfitPopSupport.class;
    }
 }
@@ -26,6 +26,7 @@ import java.util.regex.Pattern;
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitbipupro.AmazfitBipUProCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitpoppro.AmazfitPopProSupport;

@@ -48,7 +49,7 @@ public class AmazfitPopProCoordinator extends AmazfitBipUProCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return AmazfitPopProSupport.class;
    }
 }
@@ -132,7 +132,7 @@ public class AmazfitTRexCoordinator extends HuamiCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return AmazfitTRexSupport.class;
    }

@@ -132,7 +132,7 @@ public class AmazfitTRexProCoordinator extends HuamiCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return AmazfitTRexProSupport.class;
    }

@@ -113,7 +113,7 @@ public class AmazfitVergeLCoordinator extends HuamiCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return AmazfitVergeLSupport.class;
    }

@@ -125,7 +125,7 @@ public class AmazfitXCoordinator extends HuamiCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return AmazfitXSupport.class;
    }

@@ -114,7 +114,7 @@ public class MiBand2Coordinator extends HuamiCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return MiBand2Support.class;
    }

@@ -105,7 +105,7 @@ public class MiBand2HRXCoordinator extends HuamiCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return MiBand2Support.class;
    }

@@ -154,7 +154,7 @@ public class MiBand3Coordinator extends HuamiCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return MiBand3Support.class;
    }

@@ -164,7 +164,7 @@ public class MiBand4Coordinator extends HuamiCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return MiBand4Support.class;
    }

@@ -183,7 +183,7 @@ public class MiBand5Coordinator extends HuamiCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return MiBand5Support.class;
    }

@@ -203,7 +203,7 @@ public class MiBand6Coordinator extends HuamiCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return MiBand6Support.class;
    }

@@ -132,7 +132,7 @@ public class ZeppECoordinator extends HuamiCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return ZeppESupport.class;
    }

@@ -99,7 +99,7 @@ public abstract class ZeppOsCoordinator extends HuamiCoordinator {

    @NonNull
    @Override
-    public final Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public final Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return ZeppOsSupport.class;
    }

@@ -19,6 +19,7 @@ package nodomain.freeyourgadget.gadgetbridge.devices.huawei;

 import androidx.annotation.NonNull;

+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HonorBRSupport;

@@ -27,7 +28,7 @@ public abstract class  HonorBRCoordinator extends  HuaweiBRCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return HonorBRSupport.class;
    }
 }
@@ -290,7 +290,7 @@ public abstract class HuaweiBRCoordinator extends AbstractBLClassicDeviceCoordin

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return HuaweiBRSupport.class;
    }

@@ -299,7 +299,7 @@ public abstract class HuaweiLECoordinator extends AbstractBLEDeviceCoordinator i

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return HuaweiLESupport.class;
    }

@@ -27,6 +27,7 @@ import java.util.regex.Pattern;
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiFreebudsCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiHeadphonesCapabilities;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiFreebudsSupport;
@@ -48,7 +49,7 @@ public class HuaweiFreebuds5iCoordinator extends HuaweiFreebudsCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return HuaweiFreebudsSupport.class;
    }

@@ -27,6 +27,7 @@ import java.util.regex.Pattern;
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiFreebudsCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiHeadphonesCapabilities;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiFreebudsSupport;
@@ -50,7 +51,7 @@ public class HuaweiFreebudsProCoordinator extends HuaweiFreebudsCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return HuaweiFreebudsSupport.class;
    }

@@ -38,7 +38,6 @@ import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
 import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
-import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.id115.ID115Support;

@@ -156,7 +155,7 @@ public class ID115Coordinator extends AbstractBLEDeviceCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return ID115Support.class;
    }

@@ -37,7 +37,7 @@ public class IdasenCoordinator extends AbstractBLEDeviceCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return IdasenDeviceSupport.class;
    }

@@ -35,9 +35,7 @@ import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
 import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
-import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.itag.ITagSupport;

@@ -144,7 +142,7 @@ public class ITagCoordinator extends AbstractBLEDeviceCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return ITagSupport.class;
    }

@@ -40,9 +40,7 @@ import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
 import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
-import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.jyou.BFH16DeviceSupport;

@@ -180,7 +178,7 @@ public class BFH16DeviceCoordinator extends AbstractBLEDeviceCoordinator

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return BFH16DeviceSupport.class;
    }

@@ -28,7 +28,6 @@ import org.slf4j.LoggerFactory;

 import java.util.Collection;
 import java.util.Collections;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;

 import androidx.annotation.NonNull;
@@ -43,7 +42,6 @@ import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
 import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
-import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.jyou.TeclastH30.TeclastH30Support;

@@ -101,7 +99,7 @@ public class TeclastH30Coordinator extends AbstractBLEDeviceCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return TeclastH30Support.class;
    }

@@ -36,9 +36,7 @@ import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.entities.JYouActivitySampleDao;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
 import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
-import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.jyou.y5.Y5Support;

@@ -138,7 +136,7 @@ public class Y5Coordinator extends AbstractBLEDeviceCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return Y5Support.class;
    }

@@ -17,7 +17,6 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.lefun;

-import android.app.Activity;
 import android.content.Context;
 import android.net.Uri;

@@ -145,7 +144,7 @@ public class LefunDeviceCoordinator extends AbstractBLEDeviceCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return LefunDeviceSupport.class;
    }

@@ -163,7 +163,7 @@ public class WatchXPlusDeviceCoordinator extends AbstractBLEDeviceCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return WatchXPlusDeviceSupport.class;
    }

@@ -33,9 +33,7 @@ import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
 import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
-import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.liveview.LiveviewSupport;

@@ -122,7 +120,7 @@ public class LiveviewCoordinator extends AbstractBLClassicDeviceCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return LiveviewSupport.class;
    }

@@ -19,9 +19,7 @@ package nodomain.freeyourgadget.gadgetbridge.devices.makibeshr3;

 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.Calendar;
-import java.util.List;
 import java.util.regex.Pattern;

 import android.app.Activity;
@@ -46,12 +44,9 @@ import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.entities.MakibesHR3ActivitySampleDao;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
 import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
-import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.makibeshr3.MakibesHR3DeviceSupport;
-import nodomain.freeyourgadget.gadgetbridge.util.Prefs;

 import static nodomain.freeyourgadget.gadgetbridge.GBApplication.getContext;

@@ -244,7 +239,7 @@ public class MakibesHR3Coordinator extends AbstractBLEDeviceCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return MakibesHR3DeviceSupport.class;
    }

@@ -56,7 +56,7 @@ public class MarstekB2500DeviceCoordinator extends AbstractDeviceCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return MarstekB2500DeviceSupport.class;
    }

@@ -263,7 +263,7 @@ public class MiBandCoordinator extends AbstractBLEDeviceCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return MiBandSupport.class;
    }

@@ -61,7 +61,7 @@ public abstract class AbstractMijiaLywsdCoordinator extends AbstractBLEDeviceCoo

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return MijiaLywsdSupport.class;
    }

@@ -121,7 +121,7 @@ public class MiCompositionScaleCoordinator extends AbstractBLEDeviceCoordinator

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return MiCompositionScaleDeviceSupport.class;
    }

@@ -125,7 +125,7 @@ public class MiSmartScaleCoordinator extends AbstractBLEDeviceCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return MiSmartScaleDeviceSupport.class;
    }
 }
@@ -76,7 +76,7 @@ public class MoondropSpaceTravelCoordinator extends AbstractBLClassicDeviceCoord

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return MoondropSpaceTravelDeviceSupport.class;
    }
 }
@@ -40,9 +40,7 @@ import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.entities.No1F1ActivitySampleDao;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
 import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
-import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.no1f1.No1F1Support;

@@ -143,7 +141,7 @@ public class No1F1Coordinator extends AbstractBLEDeviceCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return No1F1Support.class;
    }

@@ -70,7 +70,7 @@ public abstract class AbstractEarCoordinator extends AbstractBLClassicDeviceCoor

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return Ear1Support.class;
    }

@@ -35,9 +35,7 @@ import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
 import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
-import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.nut.NutSupport;

@@ -70,7 +68,7 @@ public class NutCoordinator extends AbstractBLEDeviceCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return NutSupport.class;
    }

@@ -35,7 +35,7 @@ public class OneMoreSonoFlowCoordinator extends AbstractDeviceCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return OneMoreSonoFlowSupport.class;
    }

@@ -52,7 +52,7 @@ public abstract class OppoHeadphonesCoordinator extends AbstractBLClassicDeviceC

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return OppoHeadphonesSupport.class;
    }

@@ -42,7 +42,6 @@ import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSpec
 import nodomain.freeyourgadget.gadgetbridge.devices.AbstractBLClassicDeviceCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
 import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
-import nodomain.freeyourgadget.gadgetbridge.devices.garmin.GarminSettingsCustomizer;
 import nodomain.freeyourgadget.gadgetbridge.entities.AbstractActivitySample;
 import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.Device;
@@ -260,7 +259,7 @@ public class PebbleCoordinator extends AbstractBLClassicDeviceCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return PebbleSupport.class;
    }

@@ -33,9 +33,7 @@ import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
 import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
-import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.pinetime.PineTimeJFSupport;

@@ -150,7 +148,7 @@ public class PineTimeJFCoordinator extends AbstractBLEDeviceCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return PineTimeJFSupport.class;
    }

@@ -16,8 +16,6 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.qc35;

-import android.app.Activity;
-
 import androidx.annotation.NonNull;

 import java.util.regex.Pattern;
@@ -52,7 +50,7 @@ public class QC35Coordinator extends AbstractBLClassicDeviceCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return QC35BaseSupport.class;
    }

@@ -289,7 +289,7 @@ public class QHybridCoordinator extends AbstractBLEDeviceCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return QHybridSupport.class;
    }

@@ -24,7 +24,6 @@ import androidx.annotation.NonNull;
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
-import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.roidmi.RoidmiSupport;

@@ -55,7 +54,7 @@ public class Roidmi1Coordinator extends RoidmiCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return RoidmiSupport.class;
    }

@@ -22,8 +22,8 @@ import org.slf4j.LoggerFactory;
 import androidx.annotation.NonNull;

 import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
-import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.roidmi.RoidmiSupport;

@@ -57,7 +57,7 @@ public class Roidmi3Coordinator extends RoidmiCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return RoidmiSupport.class;
    }

@@ -42,7 +42,7 @@ public class ScannableDeviceCoordinator extends AbstractBLEDeviceCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return UnknownDeviceSupport.class;
    }

@@ -41,9 +41,7 @@ import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
 import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
-import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;

 public class SMAQ2OSSCoordinator extends AbstractBLEDeviceCoordinator {
@@ -154,7 +152,7 @@ public class SMAQ2OSSCoordinator extends AbstractBLEDeviceCoordinator {

    @NonNull
    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+    public Class<? extends DeviceSupport> getDeviceSupportClass(final GBDevice device) {
        return SMAQ2OSSSupport.class;
    }

--- a/Show More
+++ b/Show More