From ec17ae383f57e7a4df5f707a5e26dfc2bea031f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= Date: Sat, 17 Jan 2026 15:58:26 +0000 Subject: [PATCH] Huawei: Rename HuaweiCoordinator to HuaweiState --- .../devices/huawei/HuaweiCoordinatorSupplier.java | 5 ++--- .../devices/huawei/HuaweiDeviceStateManager.java | 8 ++++---- .../devices/huawei/HuaweiHeartRateZonesSpec.java | 12 ++++++------ .../devices/huawei/HuaweiInstallHandler.java | 2 +- .../devices/huawei/HuaweiSettingsCustomizer.java | 2 +- .../{HuaweiCoordinator.java => HuaweiState.java} | 6 +++--- .../devices/huawei/HuaweiSupportProvider.java | 4 ++-- .../devices/huawei/HuaweiWatchfaceManager.java | 3 +-- .../p2p/HuaweiP2PDataDictionarySyncService.java | 6 +++--- .../dictionarysync/HuaweiDictionarySyncAltitude.java | 6 +++--- .../HuaweiDictionarySyncArterialStiffness.java | 6 +++--- .../HuaweiDictionarySyncBloodPressure.java | 6 +++--- .../dictionarysync/HuaweiDictionarySyncEmotion.java | 6 +++--- .../p2p/dictionarysync/HuaweiDictionarySyncHRV.java | 6 +++--- .../HuaweiDictionarySyncInterface.java | 4 ++-- .../HuaweiDictionarySyncLakeLouiseAMS.java | 6 +++--- .../HuaweiDictionarySyncSkinTemperature.java | 6 +++--- .../HuaweiDictionarySyncSleepApnea.java | 6 +++--- 18 files changed, 49 insertions(+), 51 deletions(-) rename app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/{HuaweiCoordinator.java => HuaweiState.java} (99%) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCoordinatorSupplier.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCoordinatorSupplier.java index 830a55ca99..bc578fc67f 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCoordinatorSupplier.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCoordinatorSupplier.java @@ -30,7 +30,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; -import java.util.Locale; import de.greenrobot.dao.query.QueryBuilder; import nodomain.freeyourgadget.gadgetbridge.GBApplication; @@ -163,7 +162,7 @@ public abstract class HuaweiCoordinatorSupplier extends AbstractDeviceCoordinato @Override protected void deleteDevice(@NonNull final GBDevice gbDevice, @NonNull final Device device, @NonNull final DaoSession session) { // Clear capabilities shared preferences - GBApplication.getContext().getSharedPreferences(HuaweiCoordinator.getCapabilitiesSharedPreferencesName(gbDevice.getAddress()), Context.MODE_PRIVATE).edit().clear().apply(); + GBApplication.getContext().getSharedPreferences(HuaweiState.getCapabilitiesSharedPreferencesName(gbDevice.getAddress()), Context.MODE_PRIVATE).edit().clear().apply(); // Before #5629, we would persist capabilities per device type, so clear those as well if they exist GBApplication.getContext().getSharedPreferences("huawei_coordinator_capatilities" + gbDevice.getType().name(), Context.MODE_PRIVATE).edit().clear().apply(); @@ -435,7 +434,7 @@ public abstract class HuaweiCoordinatorSupplier extends AbstractDeviceCoordinato @Override public DeviceSpecificSettings getDeviceSpecificSettings(final GBDevice device) { - final HuaweiCoordinator deviceState = HuaweiDeviceStateManager.get(device); + final HuaweiState deviceState = HuaweiDeviceStateManager.get(device); final DeviceSpecificSettings deviceSpecificSettings = new DeviceSpecificSettings(); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiDeviceStateManager.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiDeviceStateManager.java index bab32f1108..9236dcdcd5 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiDeviceStateManager.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiDeviceStateManager.java @@ -22,13 +22,13 @@ import java.util.concurrent.ConcurrentHashMap; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; public class HuaweiDeviceStateManager { - private static final Map STATES = new ConcurrentHashMap<>(); + private static final Map STATES = new ConcurrentHashMap<>(); - public static HuaweiCoordinator get(final GBDevice device) { + public static HuaweiState get(final GBDevice device) { return get(device.getAddress()); } - public static HuaweiCoordinator get(final String macAddress) { - return STATES.computeIfAbsent(macAddress, HuaweiCoordinator::new); + public static HuaweiState get(final String macAddress) { + return STATES.computeIfAbsent(macAddress, HuaweiState::new); } } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiHeartRateZonesSpec.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiHeartRateZonesSpec.java index 88dd740813..f1b4d1eb8e 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiHeartRateZonesSpec.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiHeartRateZonesSpec.java @@ -31,11 +31,11 @@ public class HuaweiHeartRateZonesSpec extends HeartRateZonesSpec { public static final int HUAWEI_CALCULATE_METHOD_HRR = 1; public static final int HUAWEI_CALCULATE_METHOD_LTHR = 3; - private final HuaweiCoordinator coordinator; + private final HuaweiState state; - public HuaweiHeartRateZonesSpec(GBDevice device, HuaweiCoordinator coordinator) { + public HuaweiHeartRateZonesSpec(GBDevice device, HuaweiState state) { super(device); - this.coordinator = coordinator; + this.state = state; } @Override @@ -67,11 +67,11 @@ public class HuaweiHeartRateZonesSpec extends HeartRateZonesSpec { int age = new ActivityUser().getAge(); - if (!coordinator.supportsTrack() && coordinator.supportsHeartRateZones()) { + if (!state.supportsTrack() && state.supportsHeartRateZones()) { List zones = new ArrayList<>(); int maxHRThreshold = (HeartRateZonesUtils.MAXIMUM_HEART_RATE - age) - getHRCorrection(HeartRateZonesSpec.PostureType.UPRIGHT); zones.add(loadOrCreateZones(HeartRateZonesSpec.PostureType.UPRIGHT, HeartRateZones.CalculationMethod.MHR, maxHRThreshold)); - if (coordinator.supportsExtendedHeartRateZones()) + if (state.supportsExtendedHeartRateZones()) zones.add(loadOrCreateZones(HeartRateZonesSpec.PostureType.UPRIGHT, HeartRateZones.CalculationMethod.HRR, maxHRThreshold)); res.add(loadOrCreateHeartRateZonesConfig(HeartRateZonesSpec.PostureType.UPRIGHT, true, @@ -82,7 +82,7 @@ public class HuaweiHeartRateZonesSpec extends HeartRateZonesSpec { return res; } - if (!coordinator.supportsTrack()) + if (!state.supportsTrack()) return null; res.add(loadOrCreateHeartRateZonesConfig(HeartRateZonesSpec.PostureType.UPRIGHT, diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiInstallHandler.java index 2903a6b611..9c8f7ecd29 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiInstallHandler.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiInstallHandler.java @@ -111,7 +111,7 @@ public class HuaweiInstallHandler implements InstallHandler { @Override public void validateInstallation(InstallActivity installActivity, GBDevice device) { - final HuaweiCoordinator huaweiDeviceState = HuaweiDeviceStateManager.get(device); + final HuaweiState huaweiDeviceState = HuaweiDeviceStateManager.get(device); if (helper.isFirmware) { this.valid = true; //NOTE: nothing to verify for now diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSettingsCustomizer.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSettingsCustomizer.java index d28e74d28c..5d4b28dea2 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSettingsCustomizer.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSettingsCustomizer.java @@ -64,7 +64,7 @@ import static nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstant public class HuaweiSettingsCustomizer implements DeviceSpecificSettingsCustomizer { final GBDevice device; - final HuaweiCoordinator deviceState; + final HuaweiState deviceState; public HuaweiSettingsCustomizer(final GBDevice device) { this.device = device; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiState.java similarity index 99% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCoordinator.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiState.java index d1a7408265..fd94506625 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiState.java @@ -44,8 +44,8 @@ import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.Dev import androidx.annotation.NonNull; -public class HuaweiCoordinator { - Logger LOG = LoggerFactory.getLogger(HuaweiCoordinator.class); +public class HuaweiState { + Logger LOG = LoggerFactory.getLogger(HuaweiState.class); TreeMap commandsPerService = new TreeMap<>(); // Each byte of expandCapabilities represent a "service" @@ -77,7 +77,7 @@ public class HuaweiCoordinator { private boolean navigationAvailable = false; - public HuaweiCoordinator(final String address) { + public HuaweiState(final String address) { this.address = address; // Set non-numeric capabilities diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiSupportProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiSupportProvider.java index d8afa255ca..b36a45ec99 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiSupportProvider.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiSupportProvider.java @@ -67,7 +67,7 @@ import nodomain.freeyourgadget.gadgetbridge.devices.DeviceCoordinator; import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiCompatTemperatureSampleProvider; import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants; import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiCoordinatorSupplier; -import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiCoordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiState; import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiCoordinatorSupplier.HuaweiDeviceType; import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiCrypto; import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiDeviceStateManager; @@ -337,7 +337,7 @@ public class HuaweiSupportProvider { return ((HuaweiCoordinatorSupplier) this.gbDevice.getDeviceCoordinator()); } - public HuaweiCoordinator getDeviceState() { + public HuaweiState getDeviceState() { return HuaweiDeviceStateManager.get(getDevice()); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiWatchfaceManager.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiWatchfaceManager.java index f8b85f22bf..40c9264c09 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiWatchfaceManager.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiWatchfaceManager.java @@ -37,7 +37,6 @@ import java.util.UUID; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; -import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiCoordinator; import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.Watchface; import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceApp; import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.GetWatchfacesList; @@ -46,7 +45,7 @@ import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.Requ import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.SendWatchfaceOperation; public class HuaweiWatchfaceManager { - static Logger LOG = LoggerFactory.getLogger(HuaweiCoordinator.class); + static Logger LOG = LoggerFactory.getLogger(HuaweiWatchfaceManager.class); public static class Resolution { diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/HuaweiP2PDataDictionarySyncService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/HuaweiP2PDataDictionarySyncService.java index 907ec82da6..27c0fb98ee 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/HuaweiP2PDataDictionarySyncService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/HuaweiP2PDataDictionarySyncService.java @@ -28,7 +28,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; -import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiCoordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiState; import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket; import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiTLV; import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiP2PManager; @@ -102,11 +102,11 @@ public class HuaweiP2PDataDictionarySyncService extends HuaweiBaseP2PService { return ret; } - public Map getAllSupported(HuaweiCoordinator coordinator) { + public Map getAllSupported(HuaweiState state) { List handlers = getSyncHandlers(); Map ret = new HashMap<>(); for(HuaweiDictionarySyncInterface i: handlers) { - if(i.supports(coordinator)) { + if(i.supports(state)) { ret.put(i.getDataClass(), i); } } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/dictionarysync/HuaweiDictionarySyncAltitude.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/dictionarysync/HuaweiDictionarySyncAltitude.java index 2a4818c195..2b1a2bc11e 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/dictionarysync/HuaweiDictionarySyncAltitude.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/dictionarysync/HuaweiDictionarySyncAltitude.java @@ -7,7 +7,7 @@ import org.slf4j.LoggerFactory; import java.util.List; -import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiCoordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiState; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.p2p.HuaweiP2PDataDictionarySyncService; @@ -23,8 +23,8 @@ public class HuaweiDictionarySyncAltitude implements HuaweiDictionarySyncInterf } @Override - public boolean supports(HuaweiCoordinator coordinator) { - return false; // coordinator.supportsAltitude() + public boolean supports(HuaweiState state) { + return false; // state.supportsAltitude() } @Override diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/dictionarysync/HuaweiDictionarySyncArterialStiffness.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/dictionarysync/HuaweiDictionarySyncArterialStiffness.java index 1aacd67f1b..b6328c8a11 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/dictionarysync/HuaweiDictionarySyncArterialStiffness.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/dictionarysync/HuaweiDictionarySyncArterialStiffness.java @@ -7,7 +7,7 @@ import org.slf4j.LoggerFactory; import java.util.List; -import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiCoordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiState; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.p2p.HuaweiP2PDataDictionarySyncService; @@ -23,8 +23,8 @@ public class HuaweiDictionarySyncArterialStiffness implements HuaweiDictionaryS } @Override - public boolean supports(HuaweiCoordinator coordinator) { - return false; // coordinator.supportsArterialStiffnessDetection() + public boolean supports(HuaweiState state) { + return false; // state.supportsArterialStiffnessDetection() } @Override diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/dictionarysync/HuaweiDictionarySyncBloodPressure.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/dictionarysync/HuaweiDictionarySyncBloodPressure.java index 71235e02f5..9cef2ee97b 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/dictionarysync/HuaweiDictionarySyncBloodPressure.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/dictionarysync/HuaweiDictionarySyncBloodPressure.java @@ -7,7 +7,7 @@ import org.slf4j.LoggerFactory; import java.util.List; -import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiCoordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiState; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.p2p.HuaweiP2PDataDictionarySyncService; @@ -23,8 +23,8 @@ public class HuaweiDictionarySyncBloodPressure implements HuaweiDictionarySyncI } @Override - public boolean supports(HuaweiCoordinator coordinator) { - return false; //coordinator.supportsBloodPressure() + public boolean supports(HuaweiState state) { + return false; //state.supportsBloodPressure() } @Override diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/dictionarysync/HuaweiDictionarySyncEmotion.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/dictionarysync/HuaweiDictionarySyncEmotion.java index 3e4bdb84ff..c90d74db22 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/dictionarysync/HuaweiDictionarySyncEmotion.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/dictionarysync/HuaweiDictionarySyncEmotion.java @@ -10,7 +10,7 @@ import java.util.List; import nodomain.freeyourgadget.gadgetbridge.GBApplication; import nodomain.freeyourgadget.gadgetbridge.database.DBHandler; -import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiCoordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiState; import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiEmotionsSampleProvider; import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiUtil; import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession; @@ -33,8 +33,8 @@ public class HuaweiDictionarySyncEmotion implements HuaweiDictionarySyncInterfa } @Override - public boolean supports(HuaweiCoordinator coordinator) { - return coordinator.supportsEmotion(); + public boolean supports(HuaweiState state) { + return state.supportsEmotion(); } @Override diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/dictionarysync/HuaweiDictionarySyncHRV.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/dictionarysync/HuaweiDictionarySyncHRV.java index da7f42f773..07d8eb3d5b 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/dictionarysync/HuaweiDictionarySyncHRV.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/dictionarysync/HuaweiDictionarySyncHRV.java @@ -10,7 +10,7 @@ import java.util.List; import nodomain.freeyourgadget.gadgetbridge.GBApplication; import nodomain.freeyourgadget.gadgetbridge.database.DBHandler; -import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiCoordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiState; import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiHrvValueSampleProvider; import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiUtil; import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession; @@ -30,8 +30,8 @@ public class HuaweiDictionarySyncHRV implements HuaweiDictionarySyncInterface { } @Override - public boolean supports(HuaweiCoordinator coordinator) { - return coordinator.supportsHRV(); + public boolean supports(HuaweiState state) { + return state.supportsHRV(); } @Override diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/dictionarysync/HuaweiDictionarySyncInterface.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/dictionarysync/HuaweiDictionarySyncInterface.java index 02c46ec872..de52e8ef50 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/dictionarysync/HuaweiDictionarySyncInterface.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/dictionarysync/HuaweiDictionarySyncInterface.java @@ -4,7 +4,7 @@ import android.content.Context; import java.util.List; -import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiCoordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiState; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.p2p.HuaweiP2PDataDictionarySyncService; @@ -12,7 +12,7 @@ public interface HuaweiDictionarySyncInterface { int getDataClass(); - boolean supports(HuaweiCoordinator coordinator); + boolean supports(HuaweiState state); long getLastDataSyncTimestamp(GBDevice gbDevice); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/dictionarysync/HuaweiDictionarySyncLakeLouiseAMS.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/dictionarysync/HuaweiDictionarySyncLakeLouiseAMS.java index 69ca7c7ee7..8ca4054f28 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/dictionarysync/HuaweiDictionarySyncLakeLouiseAMS.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/dictionarysync/HuaweiDictionarySyncLakeLouiseAMS.java @@ -8,7 +8,7 @@ import org.slf4j.LoggerFactory; import java.util.List; -import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiCoordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiState; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.p2p.HuaweiP2PDataDictionarySyncService; @@ -24,8 +24,8 @@ public class HuaweiDictionarySyncLakeLouiseAMS implements HuaweiDictionarySyncI } @Override - public boolean supports(HuaweiCoordinator coordinator) { - return false; // coordinator.supportsAltitude() + public boolean supports(HuaweiState state) { + return false; // state.supportsAltitude() } @Override diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/dictionarysync/HuaweiDictionarySyncSkinTemperature.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/dictionarysync/HuaweiDictionarySyncSkinTemperature.java index 253c819a24..c930248a5d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/dictionarysync/HuaweiDictionarySyncSkinTemperature.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/dictionarysync/HuaweiDictionarySyncSkinTemperature.java @@ -10,7 +10,7 @@ import java.util.List; import nodomain.freeyourgadget.gadgetbridge.GBApplication; import nodomain.freeyourgadget.gadgetbridge.database.DBHandler; -import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiCoordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiState; import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiDictTypes; import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiTemperatureSampleProvider; import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiUtil; @@ -29,8 +29,8 @@ public class HuaweiDictionarySyncSkinTemperature implements HuaweiDictionarySyn } @Override - public boolean supports(HuaweiCoordinator coordinator) { - return coordinator.supportsTemperature(); + public boolean supports(HuaweiState state) { + return state.supportsTemperature(); } @Override diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/dictionarysync/HuaweiDictionarySyncSleepApnea.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/dictionarysync/HuaweiDictionarySyncSleepApnea.java index 3a8aa99b5c..b5f8ec9bc2 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/dictionarysync/HuaweiDictionarySyncSleepApnea.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/p2p/dictionarysync/HuaweiDictionarySyncSleepApnea.java @@ -11,7 +11,7 @@ import java.util.List; import nodomain.freeyourgadget.gadgetbridge.GBApplication; import nodomain.freeyourgadget.gadgetbridge.database.DBHandler; -import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiCoordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiState; import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiSleepApneaSampleProvider; import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiUtil; import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession; @@ -31,8 +31,8 @@ public class HuaweiDictionarySyncSleepApnea implements HuaweiDictionarySyncInte } @Override - public boolean supports(HuaweiCoordinator coordinator) { - return coordinator.supportsSleepApnea(); + public boolean supports(HuaweiState state) { + return state.supportsSleepApnea(); } @Override