From 7b9baf1a9f896b136b7f94861cb9411c805097f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= Date: Sat, 17 Jan 2026 15:59:36 +0000 Subject: [PATCH] Huawei: Rename HuaweiCoordinatorSupplier to HuaweiCoordinator --- .../devices/huawei/HuaweiBRCoordinator.java | 2 +- ...ordinatorSupplier.java => HuaweiCoordinator.java} | 2 +- .../devices/huawei/HuaweiLECoordinator.java | 2 +- .../devices/huawei/packets/DeviceConfig.java | 2 +- .../devices/huawei/HuaweiSupportProvider.java | 12 ++++++------ .../devices/huawei/packets/TestDeviceConfig.java | 6 +++--- 6 files changed, 13 insertions(+), 13 deletions(-) rename app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/{HuaweiCoordinatorSupplier.java => HuaweiCoordinator.java} (99%) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiBRCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiBRCoordinator.java index e9ff889b06..80677132c6 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiBRCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiBRCoordinator.java @@ -22,7 +22,7 @@ import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport; import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiBRSupport; -public abstract class HuaweiBRCoordinator extends HuaweiCoordinatorSupplier { +public abstract class HuaweiBRCoordinator extends HuaweiCoordinator { @Override public ConnectionType getConnectionType() { return ConnectionType.BT_CLASSIC; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCoordinatorSupplier.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCoordinator.java similarity index 99% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCoordinatorSupplier.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCoordinator.java index bc578fc67f..033ee4a088 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCoordinatorSupplier.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCoordinator.java @@ -77,7 +77,7 @@ import nodomain.freeyourgadget.gadgetbridge.model.TemperatureSample; import nodomain.freeyourgadget.gadgetbridge.model.heartratezones.HeartRateZonesSpec; import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiWorkoutGbParser; -public abstract class HuaweiCoordinatorSupplier extends AbstractDeviceCoordinator { +public abstract class HuaweiCoordinator extends AbstractDeviceCoordinator { public enum HuaweiDeviceType { AW(0), //BLE behind diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiLECoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiLECoordinator.java index 30708dafcb..5d6114ea26 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiLECoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiLECoordinator.java @@ -23,7 +23,7 @@ import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport; import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiLESupport; -public abstract class HuaweiLECoordinator extends HuaweiCoordinatorSupplier { +public abstract class HuaweiLECoordinator extends HuaweiCoordinator { @Override public ConnectionType getConnectionType() { return ConnectionType.BLE; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DeviceConfig.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DeviceConfig.java index 34d9739153..08b9496c3a 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DeviceConfig.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DeviceConfig.java @@ -32,7 +32,7 @@ import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiCrypto; import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket; import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiTLV; import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiUtil; -import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiCoordinatorSupplier.HuaweiDeviceType; +import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiCoordinator.HuaweiDeviceType; import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiTLV.TLV; import nodomain.freeyourgadget.gadgetbridge.util.GB; import nodomain.freeyourgadget.gadgetbridge.util.StringUtils; 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 b36a45ec99..53b610a7ee 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 @@ -66,9 +66,9 @@ import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventDisplayMes 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.HuaweiCoordinator.HuaweiDeviceType; import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiCrypto; import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiDeviceStateManager; import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiDictTypes; @@ -266,7 +266,7 @@ public class HuaweiSupportProvider { private GBDevice gbDevice; private Context context; - private HuaweiCoordinatorSupplier.HuaweiDeviceType huaweiType; + private HuaweiCoordinator.HuaweiDeviceType huaweiType; private final Handler handler = new Handler(Looper.getMainLooper()); private final Runnable batteryRunner = () -> { @@ -333,8 +333,8 @@ public class HuaweiSupportProvider { HuaweiStressCalibration stressCalibration = null; - public HuaweiCoordinatorSupplier getCoordinator() { - return ((HuaweiCoordinatorSupplier) this.gbDevice.getDeviceCoordinator()); + public HuaweiCoordinator getCoordinator() { + return ((HuaweiCoordinator) this.gbDevice.getDeviceCoordinator()); } public HuaweiState getDeviceState() { @@ -803,7 +803,7 @@ public class HuaweiSupportProvider { paramsProvider.setSecretKey(authKey); } - public HuaweiCoordinatorSupplier.HuaweiDeviceType getHuaweiType() { + public HuaweiCoordinator.HuaweiDeviceType getHuaweiType() { return this.huaweiType; } diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestDeviceConfig.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestDeviceConfig.java index d8d48c1802..c2cb7cb636 100644 --- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestDeviceConfig.java +++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestDeviceConfig.java @@ -17,7 +17,7 @@ along with this program. If not, see . */ package nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets; -import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiCoordinatorSupplier; +import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiCoordinator; import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiCrypto; import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket; import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiTLV; @@ -85,7 +85,7 @@ public class TestDeviceConfig { byte[] serialized = new byte[] {(byte) 0x5a, (byte) 0x00, (byte) 0x0b, (byte) 0x00, (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x00, (byte) 0x02, (byte) 0x00, (byte) 0x03, (byte) 0x00, (byte) 0x04, (byte) 0x00, (byte) 0xf1, (byte) 0x3b}; DeviceConfig.LinkParams.Request request = new DeviceConfig.LinkParams.Request( - secretsProvider, HuaweiCoordinatorSupplier.HuaweiDeviceType.BLE + secretsProvider, HuaweiCoordinator.HuaweiDeviceType.BLE ); Assert.assertEquals(0x01, request.serviceId); @@ -350,7 +350,7 @@ public class TestDeviceConfig { // Outdated //byte[] serialized = new byte[] {(byte) 0x5A, (byte) 0x00, (byte) 0x3A, (byte) 0x00, (byte) 0x01, (byte) 0x07, (byte) 0x7C, (byte) 0x01, (byte) 0x01, (byte) 0x7D, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7E, (byte) 0x20, (byte) 0x10, (byte) 0x9B, (byte) 0x27, (byte) 0x5D, (byte) 0xB1, (byte) 0x3C, (byte) 0xFD, (byte) 0x40, (byte) 0x4B, (byte) 0xA8, (byte) 0xAC, (byte) 0xAF, (byte) 0x8A, (byte) 0xB6, (byte) 0xA5, (byte) 0x3D, (byte) 0x40, (byte) 0x30, (byte) 0x2C, (byte) 0x79, (byte) 0x98, (byte) 0x6D, (byte) 0xEC, (byte) 0xD1, (byte) 0x39, (byte) 0xE6, (byte) 0xFE, (byte) 0x5C, (byte) 0xE8, (byte) 0xB2, (byte) 0xF3, (byte) 0x9E, (byte) 0x3E, (byte) 0x1B}; DeviceConfig.ProductInfo.Request request = new DeviceConfig.ProductInfo.Request ( - secretsProvider, HuaweiCoordinatorSupplier.HuaweiDeviceType.BLE + secretsProvider, HuaweiCoordinator.HuaweiDeviceType.BLE ); Assert.assertEquals(0x01, request.serviceId);