From 773132c4e153e297bea41a6dfbdb823efe486a92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= Date: Mon, 29 Jan 2024 23:30:26 +0000 Subject: [PATCH] Make all Zepp OS classes explicit There are still some actual "Huami 2021" classes that are used in non-ZeppOS devices, but this refactor improves the distinction. --- .../AmazfitActiveCoordinator.java | 8 +-- .../AmazfitActiveFWInstallHandler.java | 4 +- .../AmazfitActiveEdgeCoordinator.java | 8 +-- .../AmazfitActiveEdgeFWInstallHandler.java | 4 +- .../AmazfitBalanceCoordinator.java | 8 +-- .../AmazfitBalanceFWInstallHandler.java | 4 +- .../amazfitband7/AmazfitBand7Coordinator.java | 10 ++-- .../AmazfitBand7FWInstallHandler.java | 4 +- .../amazfitbip5/AmazfitBip5Coordinator.java | 10 ++-- .../AmazfitBip5FWInstallHandler.java | 4 +- .../AmazfitCheetahProCoordinator.java | 10 ++-- .../AmazfitCheetahProFWInstallHandler.java | 4 +- .../AmazfitCheetahRoundCoordinator.java | 10 ++-- .../AmazfitCheetahRoundFWInstallHandler.java | 4 +- .../AmazfitCheetahSquareCoordinator.java | 10 ++-- .../AmazfitCheetahSquareFWInstallHandler.java | 4 +- .../AmazfitFalconCoordinator.java | 10 ++-- .../AmazfitFalconFWInstallHandler.java | 4 +- .../amazfitgtr3/AmazfitGTR3Coordinator.java | 9 ++-- .../AmazfitGTR3FWInstallHandler.java | 4 +- .../AmazfitGTR3ProCoordinator.java | 10 ++-- .../AmazfitGTR3ProFWInstallHandler.java | 4 +- .../amazfitgtr4/AmazfitGTR4Coordinator.java | 10 ++-- .../AmazfitGTR4FWInstallHandler.java | 4 +- .../AmazfitGTRMiniCoordinator.java | 10 ++-- .../AmazfitGTRMiniFWInstallHandler.java | 4 +- .../amazfitgts3/AmazfitGTS3Coordinator.java | 10 ++-- .../AmazfitGTS3FWInstallHandler.java | 4 +- .../amazfitgts4/AmazfitGTS4Coordinator.java | 8 +-- .../AmazfitGTS4FWInstallHandler.java | 4 +- .../AmazfitGTS4MiniCoordinator.java | 10 ++-- .../AmazfitGTS4MiniFWInstallHandler.java | 4 +- .../amazfittrex2/AmazfitTRex2Coordinator.java | 10 ++-- .../AmazfitTRex2FWInstallHandler.java | 4 +- .../AmazfitTRexUltraCoordinator.java | 10 ++-- .../AmazfitTRexUltraFWInstallHandler.java | 4 +- .../huami/miband7/MiBand7Coordinator.java | 8 +-- .../miband7/MiBand7FWInstallHandler.java | 4 +- .../ZeppOsActivitySummaryParser.java} | 19 +++---- .../zeppos/ZeppOsAgpsInstallHandler.java | 10 ++-- .../ZeppOsCoordinator.java} | 20 +++---- .../zeppos/ZeppOsGpxRouteInstallHandler.java | 10 ++-- .../ZeppOsSettingsCustomizer.java} | 22 ++++---- .../devices/huami/AbstractHuamiOperation.java | 3 +- .../service/devices/huami/HuamiSupport.java | 4 +- .../AmazfitActiveFirmwareInfo.java | 4 +- .../amazfitactive/AmazfitActiveSupport.java | 4 +- .../AmazfitActiveEdgeFirmwareInfo.java | 4 +- .../AmazfitActiveEdgeSupport.java | 4 +- .../AmazfitBalanceFirmwareInfo.java | 4 +- .../amazfitbalance/AmazfitBalanceSupport.java | 4 +- .../AmazfitBand7FirmwareInfo.java | 4 +- .../amazfitband7/AmazfitBand7Support.java | 4 +- .../amazfitbip5/AmazfitBip5FirmwareInfo.java | 4 +- .../huami/amazfitbip5/AmazfitBip5Support.java | 4 +- .../AmazfitCheetahProFirmwareInfo.java | 4 +- .../AmazfitCheetahProSupport.java | 4 +- .../AmazfitCheetahRoundFirmwareInfo.java | 4 +- .../AmazfitCheetahRoundSupport.java | 4 +- .../AmazfitCheetahSquareFirmwareInfo.java | 4 +- .../AmazfitCheetahSquareSupport.java | 4 +- .../AmazfitFalconFirmwareInfo.java | 4 +- .../amazfitfalcon/AmazfitFalconSupport.java | 4 +- .../amazfitgtr3/AmazfitGTR3FirmwareInfo.java | 4 +- .../huami/amazfitgtr3/AmazfitGTR3Support.java | 4 +- .../AmazfitGTR3ProFirmwareInfo.java | 4 +- .../amazfitgtr3pro/AmazfitGTR3ProSupport.java | 4 +- .../amazfitgtr4/AmazfitGTR4FirmwareInfo.java | 4 +- .../huami/amazfitgtr4/AmazfitGTR4Support.java | 4 +- .../AmazfitGTRMiniFirmwareInfo.java | 4 +- .../amazfitgtrmini/AmazfitGTRMiniSupport.java | 4 +- .../amazfitgts3/AmazfitGTS3FirmwareInfo.java | 4 +- .../huami/amazfitgts3/AmazfitGTS3Support.java | 5 +- .../amazfitgts4/AmazfitGTS4FirmwareInfo.java | 4 +- .../huami/amazfitgts4/AmazfitGTS4Support.java | 4 +- .../AmazfitGTS4MiniFirmwareInfo.java | 4 +- .../AmazfitGTS4MiniSupport.java | 4 +- .../AmazfitTRex2FirmwareInfo.java | 4 +- .../amazfittrex2/AmazfitTRex2Support.java | 4 +- .../AmazfitTRexUltraFirmwareInfo.java | 4 +- .../AmazfitTRexUltraSupport.java | 4 +- .../huami/miband7/MiBand7FirmwareInfo.java | 7 +-- .../devices/huami/miband7/MiBand7Support.java | 4 +- .../operations/AbstractFetchOperation.java | 20 +++---- .../AbstractRepeatingFetchOperation.java | 4 +- .../FetchSportsSummaryOperation.java | 3 -- .../UpdateFirmwareOperation2021.java | 8 +-- .../AbstractZeppOsFwInstallHandler.java} | 16 +++--- .../huami/zeppos/AbstractZeppOsService.java | 13 +++-- .../ZeppOsActivityDetailsParser.java} | 9 ++-- .../ZeppOsActivityType.java} | 12 ++--- .../ZeppOsFirmwareInfo.java} | 17 +++--- .../ZeppOsMenuType.java} | 6 +-- .../ZeppOsSupport.java} | 52 ++++++++++--------- .../ZeppOsWeather.java} | 10 ++-- .../operations/ZeppOsAgpsUpdateOperation.java | 6 +-- .../ZeppOsGpxRouteUploadOperation.java | 6 +-- .../zeppos/services/ZeppOsAgpsService.java | 4 +- .../zeppos/services/ZeppOsAlarmsService.java | 5 +- .../zeppos/services/ZeppOsAlexaService.java | 9 ++-- .../zeppos/services/ZeppOsAppsService.java | 6 +-- .../services/ZeppOsCalendarService.java | 4 +- .../services/ZeppOsCannedMessagesService.java | 4 +- .../zeppos/services/ZeppOsConfigService.java | 11 ++-- .../services/ZeppOsContactsService.java | 4 +- .../services/ZeppOsDisplayItemsService.java | 19 ++++--- .../services/ZeppOsFileTransferService.java | 5 +- .../services/ZeppOsFtpServerService.java | 4 +- .../zeppos/services/ZeppOsHttpService.java | 8 +-- .../zeppos/services/ZeppOsLogsService.java | 4 +- .../services/ZeppOsLoyaltyCardService.java | 4 +- .../services/ZeppOsMorningUpdatesService.java | 5 +- .../zeppos/services/ZeppOsMusicService.java | 4 +- .../services/ZeppOsNotificationService.java | 4 +- .../zeppos/services/ZeppOsPhoneService.java | 5 +- .../services/ZeppOsRemindersService.java | 4 +- .../services/ZeppOsServicesService.java | 4 +- .../services/ZeppOsShortcutCardsService.java | 5 +- .../services/ZeppOsWatchfaceService.java | 5 +- .../zeppos/services/ZeppOsWifiService.java | 4 +- .../ZeppOsSupportTest.java} | 10 ++-- 121 files changed, 391 insertions(+), 431 deletions(-) rename app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/{Huami2021ActivitySummaryParser.java => zeppos/ZeppOsActivitySummaryParser.java} (93%) rename app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/{Huami2021Coordinator.java => zeppos/ZeppOsCoordinator.java} (96%) rename app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/{Huami2021SettingsCustomizer.java => zeppos/ZeppOsSettingsCustomizer.java} (95%) rename app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/{AbstractHuami2021FWInstallHandler.java => zeppos/AbstractZeppOsFwInstallHandler.java} (88%) rename app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/{Huami2021ActivityDetailsParser.java => zeppos/ZeppOsActivityDetailsParser.java} (96%) rename app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/{Huami2021WorkoutTrackActivityType.java => zeppos/ZeppOsActivityType.java} (94%) rename app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/{Huami2021FirmwareInfo.java => zeppos/ZeppOsFirmwareInfo.java} (95%) rename app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/{Huami2021MenuType.java => zeppos/ZeppOsMenuType.java} (97%) rename app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/{Huami2021Support.java => zeppos/ZeppOsSupport.java} (96%) rename app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/{Huami2021Weather.java => zeppos/ZeppOsWeather.java} (99%) rename app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/{Huami2021SupportTest.java => zeppos/ZeppOsSupportTest.java} (93%) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitactive/AmazfitActiveCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitactive/AmazfitActiveCoordinator.java index 2c3161cf9..0343cc397 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitactive/AmazfitActiveCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitactive/AmazfitActiveCoordinator.java @@ -22,15 +22,15 @@ import android.net.Uri; import androidx.annotation.NonNull; import nodomain.freeyourgadget.gadgetbridge.R; -import nodomain.freeyourgadget.gadgetbridge.devices.huami.Huami2021Coordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate; import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.AbstractHuami2021FWInstallHandler; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitactive.AmazfitActiveSupport; -public class AmazfitActiveCoordinator extends Huami2021Coordinator { +public class AmazfitActiveCoordinator extends ZeppOsCoordinator { @NonNull @Override public Class getDeviceSupportClass() { @@ -49,7 +49,7 @@ public class AmazfitActiveCoordinator extends Huami2021Coordinator { } @Override - public AbstractHuami2021FWInstallHandler createFwInstallHandler(final Uri uri, final Context context) { + public AbstractZeppOsFwInstallHandler createFwInstallHandler(final Uri uri, final Context context) { return new AmazfitActiveFWInstallHandler(uri, context); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitactive/AmazfitActiveFWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitactive/AmazfitActiveFWInstallHandler.java index a4907b898..d2b06955f 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitactive/AmazfitActiveFWInstallHandler.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitactive/AmazfitActiveFWInstallHandler.java @@ -25,9 +25,9 @@ import nodomain.freeyourgadget.gadgetbridge.R; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.model.DeviceType; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.AbstractHuami2021FWInstallHandler; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler; -class AmazfitActiveFWInstallHandler extends AbstractHuami2021FWInstallHandler { +class AmazfitActiveFWInstallHandler extends AbstractZeppOsFwInstallHandler { AmazfitActiveFWInstallHandler(final Uri uri, final Context context) { super(uri, context); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitactiveedge/AmazfitActiveEdgeCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitactiveedge/AmazfitActiveEdgeCoordinator.java index db894c921..75fdab83e 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitactiveedge/AmazfitActiveEdgeCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitactiveedge/AmazfitActiveEdgeCoordinator.java @@ -24,14 +24,14 @@ import androidx.annotation.NonNull; import java.util.regex.Pattern; import nodomain.freeyourgadget.gadgetbridge.R; -import nodomain.freeyourgadget.gadgetbridge.devices.huami.Huami2021Coordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.AbstractHuami2021FWInstallHandler; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitactiveedge.AmazfitActiveEdgeSupport; -public class AmazfitActiveEdgeCoordinator extends Huami2021Coordinator { +public class AmazfitActiveEdgeCoordinator extends ZeppOsCoordinator { @Override public boolean isExperimental() { return true; @@ -54,7 +54,7 @@ public class AmazfitActiveEdgeCoordinator extends Huami2021Coordinator { } @Override - public AbstractHuami2021FWInstallHandler createFwInstallHandler(final Uri uri, final Context context) { + public AbstractZeppOsFwInstallHandler createFwInstallHandler(final Uri uri, final Context context) { return new AmazfitActiveEdgeFWInstallHandler(uri, context); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitactiveedge/AmazfitActiveEdgeFWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitactiveedge/AmazfitActiveEdgeFWInstallHandler.java index b0e4aa7bb..dd8b61f4f 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitactiveedge/AmazfitActiveEdgeFWInstallHandler.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitactiveedge/AmazfitActiveEdgeFWInstallHandler.java @@ -25,9 +25,9 @@ import nodomain.freeyourgadget.gadgetbridge.R; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.model.DeviceType; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.AbstractHuami2021FWInstallHandler; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler; -class AmazfitActiveEdgeFWInstallHandler extends AbstractHuami2021FWInstallHandler { +class AmazfitActiveEdgeFWInstallHandler extends AbstractZeppOsFwInstallHandler { AmazfitActiveEdgeFWInstallHandler(final Uri uri, final Context context) { super(uri, context); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbalance/AmazfitBalanceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbalance/AmazfitBalanceCoordinator.java index 860e1624c..9c6796605 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbalance/AmazfitBalanceCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbalance/AmazfitBalanceCoordinator.java @@ -24,14 +24,14 @@ import androidx.annotation.NonNull; import java.util.regex.Pattern; import nodomain.freeyourgadget.gadgetbridge.R; -import nodomain.freeyourgadget.gadgetbridge.devices.huami.Huami2021Coordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.AbstractHuami2021FWInstallHandler; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitbalance.AmazfitBalanceSupport; -public class AmazfitBalanceCoordinator extends Huami2021Coordinator { +public class AmazfitBalanceCoordinator extends ZeppOsCoordinator { @NonNull @Override public Class getDeviceSupportClass() { @@ -49,7 +49,7 @@ public class AmazfitBalanceCoordinator extends Huami2021Coordinator { } @Override - public AbstractHuami2021FWInstallHandler createFwInstallHandler(final Uri uri, final Context context) { + public AbstractZeppOsFwInstallHandler createFwInstallHandler(final Uri uri, final Context context) { return new AmazfitBalanceFWInstallHandler(uri, context); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbalance/AmazfitBalanceFWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbalance/AmazfitBalanceFWInstallHandler.java index 40d9f628f..e7d90a0fa 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbalance/AmazfitBalanceFWInstallHandler.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbalance/AmazfitBalanceFWInstallHandler.java @@ -25,9 +25,9 @@ import nodomain.freeyourgadget.gadgetbridge.R; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.model.DeviceType; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.AbstractHuami2021FWInstallHandler; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler; -class AmazfitBalanceFWInstallHandler extends AbstractHuami2021FWInstallHandler { +class AmazfitBalanceFWInstallHandler extends AbstractZeppOsFwInstallHandler { AmazfitBalanceFWInstallHandler(final Uri uri, final Context context) { super(uri, context); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband7/AmazfitBand7Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband7/AmazfitBand7Coordinator.java index 090da7b69..b4a86ff86 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband7/AmazfitBand7Coordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband7/AmazfitBand7Coordinator.java @@ -27,16 +27,14 @@ import org.slf4j.LoggerFactory; import java.util.regex.Pattern; import nodomain.freeyourgadget.gadgetbridge.R; -import nodomain.freeyourgadget.gadgetbridge.devices.huami.Huami2021Coordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst; 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.huami.AbstractHuami2021FWInstallHandler; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitband7.AmazfitBand7Support; -public class AmazfitBand7Coordinator extends Huami2021Coordinator { +public class AmazfitBand7Coordinator extends ZeppOsCoordinator { private static final Logger LOG = LoggerFactory.getLogger(AmazfitBand7Coordinator.class); @Override @@ -50,7 +48,7 @@ public class AmazfitBand7Coordinator extends Huami2021Coordinator { } @Override - public AbstractHuami2021FWInstallHandler createFwInstallHandler(final Uri uri, final Context context) { + public AbstractZeppOsFwInstallHandler createFwInstallHandler(final Uri uri, final Context context) { return new AmazfitBand7FWInstallHandler(uri, context); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband7/AmazfitBand7FWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband7/AmazfitBand7FWInstallHandler.java index b19b0312a..c13b5eb56 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband7/AmazfitBand7FWInstallHandler.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband7/AmazfitBand7FWInstallHandler.java @@ -25,9 +25,9 @@ import nodomain.freeyourgadget.gadgetbridge.R; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.model.DeviceType; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.AbstractHuami2021FWInstallHandler; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler; -class AmazfitBand7FWInstallHandler extends AbstractHuami2021FWInstallHandler { +class AmazfitBand7FWInstallHandler extends AbstractZeppOsFwInstallHandler { AmazfitBand7FWInstallHandler(final Uri uri, final Context context) { super(uri, context); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip5/AmazfitBip5Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip5/AmazfitBip5Coordinator.java index 04872983c..ae5353c4c 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip5/AmazfitBip5Coordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip5/AmazfitBip5Coordinator.java @@ -27,16 +27,14 @@ import org.slf4j.LoggerFactory; import java.util.regex.Pattern; import nodomain.freeyourgadget.gadgetbridge.R; -import nodomain.freeyourgadget.gadgetbridge.devices.huami.Huami2021Coordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst; 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.huami.AbstractHuami2021FWInstallHandler; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitbip5.AmazfitBip5Support; -public class AmazfitBip5Coordinator extends Huami2021Coordinator { +public class AmazfitBip5Coordinator extends ZeppOsCoordinator { private static final Logger LOG = LoggerFactory.getLogger(AmazfitBip5Coordinator.class); @NonNull @@ -51,7 +49,7 @@ public class AmazfitBip5Coordinator extends Huami2021Coordinator { } @Override - public AbstractHuami2021FWInstallHandler createFwInstallHandler(final Uri uri, final Context context) { + public AbstractZeppOsFwInstallHandler createFwInstallHandler(final Uri uri, final Context context) { return new AmazfitBip5FWInstallHandler(uri, context); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip5/AmazfitBip5FWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip5/AmazfitBip5FWInstallHandler.java index ef9bcf79a..f84a647c8 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip5/AmazfitBip5FWInstallHandler.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip5/AmazfitBip5FWInstallHandler.java @@ -25,9 +25,9 @@ import nodomain.freeyourgadget.gadgetbridge.R; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.model.DeviceType; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.AbstractHuami2021FWInstallHandler; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler; -class AmazfitBip5FWInstallHandler extends AbstractHuami2021FWInstallHandler { +class AmazfitBip5FWInstallHandler extends AbstractZeppOsFwInstallHandler { AmazfitBip5FWInstallHandler(final Uri uri, final Context context) { super(uri, context); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahpro/AmazfitCheetahProCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahpro/AmazfitCheetahProCoordinator.java index e8d66c694..5cabda521 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahpro/AmazfitCheetahProCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahpro/AmazfitCheetahProCoordinator.java @@ -27,16 +27,14 @@ import org.slf4j.LoggerFactory; import java.util.regex.Pattern; import nodomain.freeyourgadget.gadgetbridge.R; -import nodomain.freeyourgadget.gadgetbridge.devices.huami.Huami2021Coordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst; 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.huami.AbstractHuami2021FWInstallHandler; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitcheetahpro.AmazfitCheetahProSupport; -public class AmazfitCheetahProCoordinator extends Huami2021Coordinator { +public class AmazfitCheetahProCoordinator extends ZeppOsCoordinator { private static final Logger LOG = LoggerFactory.getLogger(AmazfitCheetahProCoordinator.class); @Override @@ -56,7 +54,7 @@ public class AmazfitCheetahProCoordinator extends Huami2021Coordinator { } @Override - public AbstractHuami2021FWInstallHandler createFwInstallHandler(final Uri uri, final Context context) { + public AbstractZeppOsFwInstallHandler createFwInstallHandler(final Uri uri, final Context context) { return new AmazfitCheetahProFWInstallHandler(uri, context); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahpro/AmazfitCheetahProFWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahpro/AmazfitCheetahProFWInstallHandler.java index 1319bc348..4c48362e0 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahpro/AmazfitCheetahProFWInstallHandler.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahpro/AmazfitCheetahProFWInstallHandler.java @@ -25,9 +25,9 @@ import nodomain.freeyourgadget.gadgetbridge.R; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.model.DeviceType; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.AbstractHuami2021FWInstallHandler; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler; -class AmazfitCheetahProFWInstallHandler extends AbstractHuami2021FWInstallHandler { +class AmazfitCheetahProFWInstallHandler extends AbstractZeppOsFwInstallHandler { AmazfitCheetahProFWInstallHandler(final Uri uri, final Context context) { super(uri, context); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahround/AmazfitCheetahRoundCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahround/AmazfitCheetahRoundCoordinator.java index ccd83755b..586e2c8d5 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahround/AmazfitCheetahRoundCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahround/AmazfitCheetahRoundCoordinator.java @@ -27,16 +27,14 @@ import org.slf4j.LoggerFactory; import java.util.regex.Pattern; import nodomain.freeyourgadget.gadgetbridge.R; -import nodomain.freeyourgadget.gadgetbridge.devices.huami.Huami2021Coordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst; 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.huami.AbstractHuami2021FWInstallHandler; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitcheetahround.AmazfitCheetahRoundSupport; -public class AmazfitCheetahRoundCoordinator extends Huami2021Coordinator { +public class AmazfitCheetahRoundCoordinator extends ZeppOsCoordinator { private static final Logger LOG = LoggerFactory.getLogger(AmazfitCheetahRoundCoordinator.class); @Override @@ -61,7 +59,7 @@ public class AmazfitCheetahRoundCoordinator extends Huami2021Coordinator { } @Override - public AbstractHuami2021FWInstallHandler createFwInstallHandler(final Uri uri, final Context context) { + public AbstractZeppOsFwInstallHandler createFwInstallHandler(final Uri uri, final Context context) { return new AmazfitCheetahRoundFWInstallHandler(uri, context); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahround/AmazfitCheetahRoundFWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahround/AmazfitCheetahRoundFWInstallHandler.java index 557c8cd94..dfdd0fde7 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahround/AmazfitCheetahRoundFWInstallHandler.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahround/AmazfitCheetahRoundFWInstallHandler.java @@ -25,9 +25,9 @@ import nodomain.freeyourgadget.gadgetbridge.R; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.model.DeviceType; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.AbstractHuami2021FWInstallHandler; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler; -class AmazfitCheetahRoundFWInstallHandler extends AbstractHuami2021FWInstallHandler { +class AmazfitCheetahRoundFWInstallHandler extends AbstractZeppOsFwInstallHandler { AmazfitCheetahRoundFWInstallHandler(final Uri uri, final Context context) { super(uri, context); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahsquare/AmazfitCheetahSquareCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahsquare/AmazfitCheetahSquareCoordinator.java index 3bca11321..a5ac83940 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahsquare/AmazfitCheetahSquareCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahsquare/AmazfitCheetahSquareCoordinator.java @@ -27,16 +27,14 @@ import org.slf4j.LoggerFactory; import java.util.regex.Pattern; import nodomain.freeyourgadget.gadgetbridge.R; -import nodomain.freeyourgadget.gadgetbridge.devices.huami.Huami2021Coordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst; 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.huami.AbstractHuami2021FWInstallHandler; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitcheetahsquare.AmazfitCheetahSquareSupport; -public class AmazfitCheetahSquareCoordinator extends Huami2021Coordinator { +public class AmazfitCheetahSquareCoordinator extends ZeppOsCoordinator { private static final Logger LOG = LoggerFactory.getLogger(AmazfitCheetahSquareCoordinator.class); @Override @@ -56,7 +54,7 @@ public class AmazfitCheetahSquareCoordinator extends Huami2021Coordinator { } @Override - public AbstractHuami2021FWInstallHandler createFwInstallHandler(final Uri uri, final Context context) { + public AbstractZeppOsFwInstallHandler createFwInstallHandler(final Uri uri, final Context context) { return new AmazfitCheetahSquareFWInstallHandler(uri, context); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahsquare/AmazfitCheetahSquareFWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahsquare/AmazfitCheetahSquareFWInstallHandler.java index 27748cc2b..42b1ae4b7 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahsquare/AmazfitCheetahSquareFWInstallHandler.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahsquare/AmazfitCheetahSquareFWInstallHandler.java @@ -25,9 +25,9 @@ import nodomain.freeyourgadget.gadgetbridge.R; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.model.DeviceType; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.AbstractHuami2021FWInstallHandler; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler; -class AmazfitCheetahSquareFWInstallHandler extends AbstractHuami2021FWInstallHandler { +class AmazfitCheetahSquareFWInstallHandler extends AbstractZeppOsFwInstallHandler { AmazfitCheetahSquareFWInstallHandler(final Uri uri, final Context context) { super(uri, context); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitfalcon/AmazfitFalconCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitfalcon/AmazfitFalconCoordinator.java index 38be3b728..2f7ea3d83 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitfalcon/AmazfitFalconCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitfalcon/AmazfitFalconCoordinator.java @@ -27,16 +27,14 @@ import org.slf4j.LoggerFactory; import java.util.regex.Pattern; import nodomain.freeyourgadget.gadgetbridge.R; -import nodomain.freeyourgadget.gadgetbridge.devices.huami.Huami2021Coordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst; 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.huami.AbstractHuami2021FWInstallHandler; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitfalcon.AmazfitFalconSupport; -public class AmazfitFalconCoordinator extends Huami2021Coordinator { +public class AmazfitFalconCoordinator extends ZeppOsCoordinator { private static final Logger LOG = LoggerFactory.getLogger(AmazfitFalconCoordinator.class); @Override @@ -61,7 +59,7 @@ public class AmazfitFalconCoordinator extends Huami2021Coordinator { } @Override - public AbstractHuami2021FWInstallHandler createFwInstallHandler(final Uri uri, final Context context) { + public AbstractZeppOsFwInstallHandler createFwInstallHandler(final Uri uri, final Context context) { return new AmazfitFalconFWInstallHandler(uri, context); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitfalcon/AmazfitFalconFWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitfalcon/AmazfitFalconFWInstallHandler.java index ae35c230d..24c15a53c 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitfalcon/AmazfitFalconFWInstallHandler.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitfalcon/AmazfitFalconFWInstallHandler.java @@ -25,9 +25,9 @@ import nodomain.freeyourgadget.gadgetbridge.R; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.model.DeviceType; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.AbstractHuami2021FWInstallHandler; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler; -class AmazfitFalconFWInstallHandler extends AbstractHuami2021FWInstallHandler { +class AmazfitFalconFWInstallHandler extends AbstractZeppOsFwInstallHandler { AmazfitFalconFWInstallHandler(final Uri uri, final Context context) { super(uri, context); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3/AmazfitGTR3Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3/AmazfitGTR3Coordinator.java index 15ac270d6..8d4f7a05c 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3/AmazfitGTR3Coordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3/AmazfitGTR3Coordinator.java @@ -25,16 +25,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import nodomain.freeyourgadget.gadgetbridge.R; -import nodomain.freeyourgadget.gadgetbridge.devices.huami.Huami2021Coordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst; 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.huami.AbstractHuami2021FWInstallHandler; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgtr3.AmazfitGTR3Support; -public class AmazfitGTR3Coordinator extends Huami2021Coordinator { +public class AmazfitGTR3Coordinator extends ZeppOsCoordinator { private static final Logger LOG = LoggerFactory.getLogger(AmazfitGTR3Coordinator.class); @NonNull @@ -64,7 +63,7 @@ public class AmazfitGTR3Coordinator extends Huami2021Coordinator { } @Override - public AbstractHuami2021FWInstallHandler createFwInstallHandler(final Uri uri, final Context context) { + public AbstractZeppOsFwInstallHandler createFwInstallHandler(final Uri uri, final Context context) { return new AmazfitGTR3FWInstallHandler(uri, context); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3/AmazfitGTR3FWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3/AmazfitGTR3FWInstallHandler.java index 485f9f333..fc9afaa48 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3/AmazfitGTR3FWInstallHandler.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3/AmazfitGTR3FWInstallHandler.java @@ -25,9 +25,9 @@ import nodomain.freeyourgadget.gadgetbridge.R; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.model.DeviceType; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.AbstractHuami2021FWInstallHandler; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler; -class AmazfitGTR3FWInstallHandler extends AbstractHuami2021FWInstallHandler { +class AmazfitGTR3FWInstallHandler extends AbstractZeppOsFwInstallHandler { AmazfitGTR3FWInstallHandler(Uri uri, Context context) { super(uri, context); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3pro/AmazfitGTR3ProCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3pro/AmazfitGTR3ProCoordinator.java index 4ce4d7f4a..f187d071a 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3pro/AmazfitGTR3ProCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3pro/AmazfitGTR3ProCoordinator.java @@ -27,16 +27,14 @@ import org.slf4j.LoggerFactory; import java.util.regex.Pattern; import nodomain.freeyourgadget.gadgetbridge.R; -import nodomain.freeyourgadget.gadgetbridge.devices.huami.Huami2021Coordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst; 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.huami.AbstractHuami2021FWInstallHandler; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgtr3pro.AmazfitGTR3ProSupport; -public class AmazfitGTR3ProCoordinator extends Huami2021Coordinator { +public class AmazfitGTR3ProCoordinator extends ZeppOsCoordinator { private static final Logger LOG = LoggerFactory.getLogger(AmazfitGTR3ProCoordinator.class); @Override @@ -56,7 +54,7 @@ public class AmazfitGTR3ProCoordinator extends Huami2021Coordinator { } @Override - public AbstractHuami2021FWInstallHandler createFwInstallHandler(final Uri uri, final Context context) { + public AbstractZeppOsFwInstallHandler createFwInstallHandler(final Uri uri, final Context context) { return new AmazfitGTR3ProFWInstallHandler(uri, context); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3pro/AmazfitGTR3ProFWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3pro/AmazfitGTR3ProFWInstallHandler.java index 363203b39..9bae5d5a4 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3pro/AmazfitGTR3ProFWInstallHandler.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3pro/AmazfitGTR3ProFWInstallHandler.java @@ -25,9 +25,9 @@ import nodomain.freeyourgadget.gadgetbridge.R; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.model.DeviceType; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.AbstractHuami2021FWInstallHandler; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler; -class AmazfitGTR3ProFWInstallHandler extends AbstractHuami2021FWInstallHandler { +class AmazfitGTR3ProFWInstallHandler extends AbstractZeppOsFwInstallHandler { AmazfitGTR3ProFWInstallHandler(Uri uri, Context context) { super(uri, context); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr4/AmazfitGTR4Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr4/AmazfitGTR4Coordinator.java index d5f9c2e26..f800bd5e4 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr4/AmazfitGTR4Coordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr4/AmazfitGTR4Coordinator.java @@ -27,16 +27,14 @@ import org.slf4j.LoggerFactory; import java.util.regex.Pattern; import nodomain.freeyourgadget.gadgetbridge.R; -import nodomain.freeyourgadget.gadgetbridge.devices.huami.Huami2021Coordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst; 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.huami.AbstractHuami2021FWInstallHandler; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgtr4.AmazfitGTR4Support; -public class AmazfitGTR4Coordinator extends Huami2021Coordinator { +public class AmazfitGTR4Coordinator extends ZeppOsCoordinator { private static final Logger LOG = LoggerFactory.getLogger(AmazfitGTR4Coordinator.class); @Override @@ -56,7 +54,7 @@ public class AmazfitGTR4Coordinator extends Huami2021Coordinator { } @Override - public AbstractHuami2021FWInstallHandler createFwInstallHandler(final Uri uri, final Context context) { + public AbstractZeppOsFwInstallHandler createFwInstallHandler(final Uri uri, final Context context) { return new AmazfitGTR4FWInstallHandler(uri, context); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr4/AmazfitGTR4FWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr4/AmazfitGTR4FWInstallHandler.java index 5ada0d821..1d5fff622 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr4/AmazfitGTR4FWInstallHandler.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr4/AmazfitGTR4FWInstallHandler.java @@ -25,9 +25,9 @@ import nodomain.freeyourgadget.gadgetbridge.R; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.model.DeviceType; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.AbstractHuami2021FWInstallHandler; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler; -class AmazfitGTR4FWInstallHandler extends AbstractHuami2021FWInstallHandler { +class AmazfitGTR4FWInstallHandler extends AbstractZeppOsFwInstallHandler { AmazfitGTR4FWInstallHandler(final Uri uri, final Context context) { super(uri, context); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtrmini/AmazfitGTRMiniCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtrmini/AmazfitGTRMiniCoordinator.java index ee5604c75..0c32cbfba 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtrmini/AmazfitGTRMiniCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtrmini/AmazfitGTRMiniCoordinator.java @@ -27,16 +27,14 @@ import org.slf4j.LoggerFactory; import java.util.regex.Pattern; import nodomain.freeyourgadget.gadgetbridge.R; -import nodomain.freeyourgadget.gadgetbridge.devices.huami.Huami2021Coordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst; 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.huami.AbstractHuami2021FWInstallHandler; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgtrmini.AmazfitGTRMiniSupport; -public class AmazfitGTRMiniCoordinator extends Huami2021Coordinator { +public class AmazfitGTRMiniCoordinator extends ZeppOsCoordinator { private static final Logger LOG = LoggerFactory.getLogger(AmazfitGTRMiniCoordinator.class); @NonNull @@ -56,7 +54,7 @@ public class AmazfitGTRMiniCoordinator extends Huami2021Coordinator { } @Override - public AbstractHuami2021FWInstallHandler createFwInstallHandler(final Uri uri, final Context context) { + public AbstractZeppOsFwInstallHandler createFwInstallHandler(final Uri uri, final Context context) { return new AmazfitGTRMiniFWInstallHandler(uri, context); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtrmini/AmazfitGTRMiniFWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtrmini/AmazfitGTRMiniFWInstallHandler.java index 0c2347cd8..87b6d4c56 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtrmini/AmazfitGTRMiniFWInstallHandler.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtrmini/AmazfitGTRMiniFWInstallHandler.java @@ -25,9 +25,9 @@ import nodomain.freeyourgadget.gadgetbridge.R; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.model.DeviceType; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.AbstractHuami2021FWInstallHandler; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler; -class AmazfitGTRMiniFWInstallHandler extends AbstractHuami2021FWInstallHandler { +class AmazfitGTRMiniFWInstallHandler extends AbstractZeppOsFwInstallHandler { AmazfitGTRMiniFWInstallHandler(final Uri uri, final Context context) { super(uri, context); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts3/AmazfitGTS3Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts3/AmazfitGTS3Coordinator.java index 5c4d513e8..b5a7d3563 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts3/AmazfitGTS3Coordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts3/AmazfitGTS3Coordinator.java @@ -27,16 +27,14 @@ import org.slf4j.LoggerFactory; import java.util.regex.Pattern; import nodomain.freeyourgadget.gadgetbridge.R; -import nodomain.freeyourgadget.gadgetbridge.devices.huami.Huami2021Coordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst; 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.huami.AbstractHuami2021FWInstallHandler; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgts3.AmazfitGTS3Support; -public class AmazfitGTS3Coordinator extends Huami2021Coordinator { +public class AmazfitGTS3Coordinator extends ZeppOsCoordinator { private static final Logger LOG = LoggerFactory.getLogger(AmazfitGTS3Coordinator.class); @Override @@ -51,7 +49,7 @@ public class AmazfitGTS3Coordinator extends Huami2021Coordinator { } @Override - public AbstractHuami2021FWInstallHandler createFwInstallHandler(final Uri uri, final Context context) { + public AbstractZeppOsFwInstallHandler createFwInstallHandler(final Uri uri, final Context context) { return new AmazfitGTS3FWInstallHandler(uri, context); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts3/AmazfitGTS3FWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts3/AmazfitGTS3FWInstallHandler.java index 7000005eb..32ec2d7be 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts3/AmazfitGTS3FWInstallHandler.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts3/AmazfitGTS3FWInstallHandler.java @@ -25,9 +25,9 @@ import nodomain.freeyourgadget.gadgetbridge.R; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.model.DeviceType; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.AbstractHuami2021FWInstallHandler; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler; -class AmazfitGTS3FWInstallHandler extends AbstractHuami2021FWInstallHandler { +class AmazfitGTS3FWInstallHandler extends AbstractZeppOsFwInstallHandler { AmazfitGTS3FWInstallHandler(Uri uri, Context context) { super(uri, context); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4/AmazfitGTS4Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4/AmazfitGTS4Coordinator.java index 8b06aa980..ea68f513d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4/AmazfitGTS4Coordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4/AmazfitGTS4Coordinator.java @@ -25,15 +25,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import nodomain.freeyourgadget.gadgetbridge.R; -import nodomain.freeyourgadget.gadgetbridge.devices.huami.Huami2021Coordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate; import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.AbstractHuami2021FWInstallHandler; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgts4.AmazfitGTS4Support; -public class AmazfitGTS4Coordinator extends Huami2021Coordinator { +public class AmazfitGTS4Coordinator extends ZeppOsCoordinator { private static final Logger LOG = LoggerFactory.getLogger(AmazfitGTS4Coordinator.class); @Override @@ -57,7 +57,7 @@ public class AmazfitGTS4Coordinator extends Huami2021Coordinator { } @Override - public AbstractHuami2021FWInstallHandler createFwInstallHandler(final Uri uri, final Context context) { + public AbstractZeppOsFwInstallHandler createFwInstallHandler(final Uri uri, final Context context) { return new AmazfitGTS4FWInstallHandler(uri, context); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4/AmazfitGTS4FWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4/AmazfitGTS4FWInstallHandler.java index 73cea35fb..2495cc7c0 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4/AmazfitGTS4FWInstallHandler.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4/AmazfitGTS4FWInstallHandler.java @@ -25,9 +25,9 @@ import nodomain.freeyourgadget.gadgetbridge.R; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.model.DeviceType; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.AbstractHuami2021FWInstallHandler; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler; -class AmazfitGTS4FWInstallHandler extends AbstractHuami2021FWInstallHandler { +class AmazfitGTS4FWInstallHandler extends AbstractZeppOsFwInstallHandler { AmazfitGTS4FWInstallHandler(final Uri uri, final Context context) { super(uri, context); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4mini/AmazfitGTS4MiniCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4mini/AmazfitGTS4MiniCoordinator.java index a92a4847d..f0f533560 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4mini/AmazfitGTS4MiniCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4mini/AmazfitGTS4MiniCoordinator.java @@ -27,16 +27,14 @@ import org.slf4j.LoggerFactory; import java.util.regex.Pattern; import nodomain.freeyourgadget.gadgetbridge.R; -import nodomain.freeyourgadget.gadgetbridge.devices.huami.Huami2021Coordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst; 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.huami.AbstractHuami2021FWInstallHandler; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgts4mini.AmazfitGTS4MiniSupport; -public class AmazfitGTS4MiniCoordinator extends Huami2021Coordinator { +public class AmazfitGTS4MiniCoordinator extends ZeppOsCoordinator { private static final Logger LOG = LoggerFactory.getLogger(AmazfitGTS4MiniCoordinator.class); @Override @@ -51,7 +49,7 @@ public class AmazfitGTS4MiniCoordinator extends Huami2021Coordinator { } @Override - public AbstractHuami2021FWInstallHandler createFwInstallHandler(final Uri uri, final Context context) { + public AbstractZeppOsFwInstallHandler createFwInstallHandler(final Uri uri, final Context context) { return new AmazfitGTS4MiniFWInstallHandler(uri, context); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4mini/AmazfitGTS4MiniFWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4mini/AmazfitGTS4MiniFWInstallHandler.java index bda959519..13ab4d237 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4mini/AmazfitGTS4MiniFWInstallHandler.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4mini/AmazfitGTS4MiniFWInstallHandler.java @@ -25,9 +25,9 @@ import nodomain.freeyourgadget.gadgetbridge.R; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.model.DeviceType; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.AbstractHuami2021FWInstallHandler; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler; -class AmazfitGTS4MiniFWInstallHandler extends AbstractHuami2021FWInstallHandler { +class AmazfitGTS4MiniFWInstallHandler extends AbstractZeppOsFwInstallHandler { AmazfitGTS4MiniFWInstallHandler(final Uri uri, final Context context) { super(uri, context); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrex2/AmazfitTRex2Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrex2/AmazfitTRex2Coordinator.java index d49880555..568feae10 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrex2/AmazfitTRex2Coordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrex2/AmazfitTRex2Coordinator.java @@ -27,16 +27,14 @@ import org.slf4j.LoggerFactory; import java.util.regex.Pattern; import nodomain.freeyourgadget.gadgetbridge.R; -import nodomain.freeyourgadget.gadgetbridge.devices.huami.Huami2021Coordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst; 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.huami.AbstractHuami2021FWInstallHandler; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfittrex2.AmazfitTRex2Support; -public class AmazfitTRex2Coordinator extends Huami2021Coordinator { +public class AmazfitTRex2Coordinator extends ZeppOsCoordinator { private static final Logger LOG = LoggerFactory.getLogger(AmazfitTRex2Coordinator.class); @Override @@ -56,7 +54,7 @@ public class AmazfitTRex2Coordinator extends Huami2021Coordinator { } @Override - public AbstractHuami2021FWInstallHandler createFwInstallHandler(final Uri uri, final Context context) { + public AbstractZeppOsFwInstallHandler createFwInstallHandler(final Uri uri, final Context context) { return new AmazfitTRex2FWInstallHandler(uri, context); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrex2/AmazfitTRex2FWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrex2/AmazfitTRex2FWInstallHandler.java index 2007ccde2..d721d99d2 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrex2/AmazfitTRex2FWInstallHandler.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrex2/AmazfitTRex2FWInstallHandler.java @@ -25,9 +25,9 @@ import nodomain.freeyourgadget.gadgetbridge.R; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.model.DeviceType; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.AbstractHuami2021FWInstallHandler; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler; -class AmazfitTRex2FWInstallHandler extends AbstractHuami2021FWInstallHandler { +class AmazfitTRex2FWInstallHandler extends AbstractZeppOsFwInstallHandler { AmazfitTRex2FWInstallHandler(final Uri uri, final Context context) { super(uri, context); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrexultra/AmazfitTRexUltraCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrexultra/AmazfitTRexUltraCoordinator.java index 5318e904b..c8c09a379 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrexultra/AmazfitTRexUltraCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrexultra/AmazfitTRexUltraCoordinator.java @@ -27,16 +27,14 @@ import org.slf4j.LoggerFactory; import java.util.regex.Pattern; import nodomain.freeyourgadget.gadgetbridge.R; -import nodomain.freeyourgadget.gadgetbridge.devices.huami.Huami2021Coordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst; 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.huami.AbstractHuami2021FWInstallHandler; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfittrexultra.AmazfitTRexUltraSupport; -public class AmazfitTRexUltraCoordinator extends Huami2021Coordinator { +public class AmazfitTRexUltraCoordinator extends ZeppOsCoordinator { private static final Logger LOG = LoggerFactory.getLogger(AmazfitTRexUltraCoordinator.class); @NonNull @@ -56,7 +54,7 @@ public class AmazfitTRexUltraCoordinator extends Huami2021Coordinator { } @Override - public AbstractHuami2021FWInstallHandler createFwInstallHandler(final Uri uri, final Context context) { + public AbstractZeppOsFwInstallHandler createFwInstallHandler(final Uri uri, final Context context) { return new AmazfitTRexUltraFWInstallHandler(uri, context); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrexultra/AmazfitTRexUltraFWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrexultra/AmazfitTRexUltraFWInstallHandler.java index bde74c693..52754ba2d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrexultra/AmazfitTRexUltraFWInstallHandler.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrexultra/AmazfitTRexUltraFWInstallHandler.java @@ -25,9 +25,9 @@ import nodomain.freeyourgadget.gadgetbridge.R; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.model.DeviceType; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.AbstractHuami2021FWInstallHandler; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler; -class AmazfitTRexUltraFWInstallHandler extends AbstractHuami2021FWInstallHandler { +class AmazfitTRexUltraFWInstallHandler extends AbstractZeppOsFwInstallHandler { AmazfitTRexUltraFWInstallHandler(final Uri uri, final Context context) { super(uri, context); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband7/MiBand7Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband7/MiBand7Coordinator.java index 940648aa3..cf6f43463 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband7/MiBand7Coordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband7/MiBand7Coordinator.java @@ -22,15 +22,15 @@ import android.net.Uri; import androidx.annotation.NonNull; import nodomain.freeyourgadget.gadgetbridge.R; -import nodomain.freeyourgadget.gadgetbridge.devices.huami.Huami2021Coordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate; import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.AbstractHuami2021FWInstallHandler; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.miband7.MiBand7Support; -public class MiBand7Coordinator extends Huami2021Coordinator { +public class MiBand7Coordinator extends ZeppOsCoordinator { @Override public boolean supports(final GBDeviceCandidate candidate) { final String name = candidate.getName(); @@ -38,7 +38,7 @@ public class MiBand7Coordinator extends Huami2021Coordinator { } @Override - public AbstractHuami2021FWInstallHandler createFwInstallHandler(final Uri uri, final Context context) { + public AbstractZeppOsFwInstallHandler createFwInstallHandler(final Uri uri, final Context context) { return new MiBand7FWInstallHandler(uri, context); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband7/MiBand7FWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband7/MiBand7FWInstallHandler.java index a6357bef7..bdf67e957 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband7/MiBand7FWInstallHandler.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband7/MiBand7FWInstallHandler.java @@ -25,9 +25,9 @@ import nodomain.freeyourgadget.gadgetbridge.R; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.model.DeviceType; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.AbstractHuami2021FWInstallHandler; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler; -class MiBand7FWInstallHandler extends AbstractHuami2021FWInstallHandler { +class MiBand7FWInstallHandler extends AbstractZeppOsFwInstallHandler { MiBand7FWInstallHandler(Uri uri, Context context) { super(uri, context); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021ActivitySummaryParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/ZeppOsActivitySummaryParser.java similarity index 93% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021ActivitySummaryParser.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/ZeppOsActivitySummaryParser.java index 929f31b48..1ec714119 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021ActivitySummaryParser.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/ZeppOsActivitySummaryParser.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . */ -package nodomain.freeyourgadget.gadgetbridge.devices.huami; +package nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos; import static nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries.*; @@ -26,19 +26,20 @@ import org.slf4j.LoggerFactory; import java.util.Date; +import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiActivitySummaryParser; import nodomain.freeyourgadget.gadgetbridge.proto.HuamiProtos; import nodomain.freeyourgadget.gadgetbridge.entities.BaseActivitySummary; import nodomain.freeyourgadget.gadgetbridge.model.ActivityKind; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.AbstractHuamiActivityDetailsParser; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021ActivityDetailsParser; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021WorkoutTrackActivityType; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsActivityDetailsParser; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsActivityType; -public class Huami2021ActivitySummaryParser extends HuamiActivitySummaryParser { - private static final Logger LOG = LoggerFactory.getLogger(Huami2021ActivitySummaryParser.class); +public class ZeppOsActivitySummaryParser extends HuamiActivitySummaryParser { + private static final Logger LOG = LoggerFactory.getLogger(ZeppOsActivitySummaryParser.class); @Override public AbstractHuamiActivityDetailsParser getDetailsParser(final BaseActivitySummary summary) { - return new Huami2021ActivityDetailsParser(summary); + return new ZeppOsActivityDetailsParser(summary); } @Override @@ -59,12 +60,12 @@ public class Huami2021ActivitySummaryParser extends HuamiActivitySummaryParser { } if (summaryProto.hasType()) { - final Huami2021WorkoutTrackActivityType workoutTrackActivityType = Huami2021WorkoutTrackActivityType + final ZeppOsActivityType activityType = ZeppOsActivityType .fromCode((byte) summaryProto.getType().getType()); final int activityKind; - if (workoutTrackActivityType != null) { - activityKind = workoutTrackActivityType.toActivityKind(); + if (activityType != null) { + activityKind = activityType.toActivityKind(); } else { LOG.warn("Unknown workout activity type code {}", String.format("0x%X", summaryProto.getType().getType())); activityKind = ActivityKind.TYPE_UNKNOWN; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/ZeppOsAgpsInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/ZeppOsAgpsInstallHandler.java index 7cc131e39..6349f6cb7 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/ZeppOsAgpsInstallHandler.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/ZeppOsAgpsInstallHandler.java @@ -30,11 +30,9 @@ import nodomain.freeyourgadget.gadgetbridge.R; import nodomain.freeyourgadget.gadgetbridge.activities.InstallActivity; import nodomain.freeyourgadget.gadgetbridge.devices.DeviceCoordinator; import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler; -import nodomain.freeyourgadget.gadgetbridge.devices.huami.Huami2021Coordinator; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.model.GenericItem; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.operations.ZeppOsAgpsFile; -import nodomain.freeyourgadget.gadgetbridge.util.DeviceHelper; import nodomain.freeyourgadget.gadgetbridge.util.FileUtils; import nodomain.freeyourgadget.gadgetbridge.util.UriHelper; @@ -80,14 +78,14 @@ public class ZeppOsAgpsInstallHandler implements InstallHandler { } final DeviceCoordinator coordinator = device.getDeviceCoordinator(); - if (!(coordinator instanceof Huami2021Coordinator)) { - LOG.warn("Coordinator is not a Huami2021Coordinator: {}", coordinator.getClass()); + if (!(coordinator instanceof ZeppOsCoordinator)) { + LOG.warn("Coordinator is not a ZeppOsCoordinator: {}", coordinator.getClass()); installActivity.setInfoText(mContext.getString(R.string.fwapp_install_device_not_supported)); installActivity.setInstallEnabled(false); return; } - final Huami2021Coordinator huami2021coordinator = (Huami2021Coordinator) coordinator; - if (!huami2021coordinator.supportsAgpsUpdates()) { + final ZeppOsCoordinator zeppOsCoordinator = (ZeppOsCoordinator) coordinator; + if (!zeppOsCoordinator.supportsAgpsUpdates()) { installActivity.setInfoText(mContext.getString(R.string.fwapp_install_device_not_supported)); installActivity.setInstallEnabled(false); return; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/ZeppOsCoordinator.java similarity index 96% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021Coordinator.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/ZeppOsCoordinator.java index 488cbd498..0077cb81c 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021Coordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/ZeppOsCoordinator.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . */ -package nodomain.freeyourgadget.gadgetbridge.devices.huami; +package nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos; import android.app.Activity; import android.content.Context; @@ -39,8 +39,8 @@ import nodomain.freeyourgadget.gadgetbridge.capabilities.password.PasswordCapabi import nodomain.freeyourgadget.gadgetbridge.GBException; import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler; import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider; -import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsAgpsInstallHandler; -import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsGpxRouteInstallHandler; +import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiCoordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiExtendedSampleProvider; import nodomain.freeyourgadget.gadgetbridge.entities.AbstractActivitySample; import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession; import nodomain.freeyourgadget.gadgetbridge.entities.Device; @@ -54,7 +54,7 @@ import nodomain.freeyourgadget.gadgetbridge.entities.HuamiSpo2SampleDao; import nodomain.freeyourgadget.gadgetbridge.entities.HuamiStressSampleDao; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryParser; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.AbstractHuami2021FWInstallHandler; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services.ZeppOsAlexaService; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services.ZeppOsContactsService; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services.ZeppOsLogsService; @@ -68,8 +68,8 @@ import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.service import nodomain.freeyourgadget.gadgetbridge.util.FileUtils; import nodomain.freeyourgadget.gadgetbridge.util.Prefs; -public abstract class Huami2021Coordinator extends HuamiCoordinator { - public abstract AbstractHuami2021FWInstallHandler createFwInstallHandler(final Uri uri, final Context context); +public abstract class ZeppOsCoordinator extends HuamiCoordinator { + public abstract AbstractZeppOsFwInstallHandler createFwInstallHandler(final Uri uri, final Context context); @Override public InstallHandler findInstallHandler(final Uri uri, final Context context) { @@ -87,7 +87,7 @@ public abstract class Huami2021Coordinator extends HuamiCoordinator { } } - final AbstractHuami2021FWInstallHandler handler = createFwInstallHandler(uri, context); + final AbstractZeppOsFwInstallHandler handler = createFwInstallHandler(uri, context); return handler.isValid() ? handler : null; } @@ -263,7 +263,7 @@ public abstract class Huami2021Coordinator extends HuamiCoordinator { @Override public ActivitySummaryParser getActivitySummaryParser(final GBDevice device) { - return new Huami2021ActivitySummaryParser(); + return new ZeppOsActivitySummaryParser(); } @Override @@ -313,7 +313,7 @@ public abstract class Huami2021Coordinator extends HuamiCoordinator { /** * Returns a superset of all settings supported by Zepp OS Devices. Unsupported settings are removed - * by {@link Huami2021SettingsCustomizer}. + * by {@link ZeppOsSettingsCustomizer}. */ @Override public int[] getSupportedDeviceSpecificSettings(final GBDevice device) { @@ -491,7 +491,7 @@ public abstract class Huami2021Coordinator extends HuamiCoordinator { @Override public DeviceSpecificSettingsCustomizer getDeviceSpecificSettingsCustomizer(final GBDevice device) { - return new Huami2021SettingsCustomizer(device, getVibrationPatternNotificationTypes(device)); + return new ZeppOsSettingsCustomizer(device, getVibrationPatternNotificationTypes(device)); } @Override diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/ZeppOsGpxRouteInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/ZeppOsGpxRouteInstallHandler.java index c6f673704..a17215631 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/ZeppOsGpxRouteInstallHandler.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/ZeppOsGpxRouteInstallHandler.java @@ -30,11 +30,9 @@ import nodomain.freeyourgadget.gadgetbridge.R; import nodomain.freeyourgadget.gadgetbridge.activities.InstallActivity; import nodomain.freeyourgadget.gadgetbridge.devices.DeviceCoordinator; import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler; -import nodomain.freeyourgadget.gadgetbridge.devices.huami.Huami2021Coordinator; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.model.GenericItem; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.operations.ZeppOsGpxRouteFile; -import nodomain.freeyourgadget.gadgetbridge.util.DeviceHelper; import nodomain.freeyourgadget.gadgetbridge.util.FileUtils; import nodomain.freeyourgadget.gadgetbridge.util.UriHelper; @@ -79,14 +77,14 @@ public class ZeppOsGpxRouteInstallHandler implements InstallHandler { } final DeviceCoordinator coordinator = device.getDeviceCoordinator(); - if (!(coordinator instanceof Huami2021Coordinator)) { - LOG.warn("Coordinator is not a Huami2021Coordinator: {}", coordinator.getClass()); + if (!(coordinator instanceof ZeppOsCoordinator)) { + LOG.warn("Coordinator is not a ZeppOsCoordinator: {}", coordinator.getClass()); installActivity.setInfoText(mContext.getString(R.string.fwapp_install_device_not_supported)); installActivity.setInstallEnabled(false); return; } - final Huami2021Coordinator huami2021coordinator = (Huami2021Coordinator) coordinator; - if (!huami2021coordinator.supportsGpxUploads()) { + final ZeppOsCoordinator zeppOsCoordinator = (ZeppOsCoordinator) coordinator; + if (!zeppOsCoordinator.supportsGpxUploads()) { installActivity.setInfoText(mContext.getString(R.string.fwapp_install_device_not_supported)); installActivity.setInstallEnabled(false); return; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021SettingsCustomizer.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/ZeppOsSettingsCustomizer.java similarity index 95% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021SettingsCustomizer.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/ZeppOsSettingsCustomizer.java index 70fe1f3bb..acbbfee23 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021SettingsCustomizer.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/ZeppOsSettingsCustomizer.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . */ -package nodomain.freeyourgadget.gadgetbridge.devices.huami; +package nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos; import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsUtils.hidePrefIfNoneVisible; import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsUtils.populateOrHideListPreference; @@ -44,15 +44,17 @@ import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSett import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSpecificSettingsHandler; import nodomain.freeyourgadget.gadgetbridge.activities.loyaltycards.LoyaltyCardsSettingsConst; import nodomain.freeyourgadget.gadgetbridge.capabilities.GpsCapability; +import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst; +import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiSettingsCustomizer; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.HuamiVibrationPatternNotificationType; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services.ZeppOsConfigService; import nodomain.freeyourgadget.gadgetbridge.util.Prefs; -public class Huami2021SettingsCustomizer extends HuamiSettingsCustomizer { - private static final Logger LOG = LoggerFactory.getLogger(Huami2021SettingsCustomizer.class); +public class ZeppOsSettingsCustomizer extends HuamiSettingsCustomizer { + private static final Logger LOG = LoggerFactory.getLogger(ZeppOsSettingsCustomizer.class); - public Huami2021SettingsCustomizer(final GBDevice device, final List vibrationPatternNotificationTypes) { + public ZeppOsSettingsCustomizer(final GBDevice device, final List vibrationPatternNotificationTypes) { super(device, vibrationPatternNotificationTypes); } @@ -438,18 +440,18 @@ public class Huami2021SettingsCustomizer extends HuamiSettingsCustomizer { DeviceSettingsUtils.enforceMinMax((EditTextPreference) pref, minValue, maxValue); } - public static final Creator CREATOR = new Creator() { + public static final Creator CREATOR = new Creator() { @Override - public Huami2021SettingsCustomizer createFromParcel(final Parcel in) { - final GBDevice device = in.readParcelable(Huami2021SettingsCustomizer.class.getClassLoader()); + public ZeppOsSettingsCustomizer createFromParcel(final Parcel in) { + final GBDevice device = in.readParcelable(ZeppOsSettingsCustomizer.class.getClassLoader()); final List vibrationPatternNotificationTypes = new ArrayList<>(); in.readList(vibrationPatternNotificationTypes, HuamiVibrationPatternNotificationType.class.getClassLoader()); - return new Huami2021SettingsCustomizer(device, vibrationPatternNotificationTypes); + return new ZeppOsSettingsCustomizer(device, vibrationPatternNotificationTypes); } @Override - public Huami2021SettingsCustomizer[] newArray(final int size) { - return new Huami2021SettingsCustomizer[size]; + public ZeppOsSettingsCustomizer[] newArray(final int size) { + return new ZeppOsSettingsCustomizer[size]; } }; } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/AbstractHuamiOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/AbstractHuamiOperation.java index c565c4fcb..2332225b9 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/AbstractHuamiOperation.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/AbstractHuamiOperation.java @@ -18,6 +18,7 @@ package nodomain.freeyourgadget.gadgetbridge.service.devices.huami; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiService; import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsSupport; import nodomain.freeyourgadget.gadgetbridge.service.devices.miband.operations.AbstractMiBandOperation; public abstract class AbstractHuamiOperation extends AbstractMiBandOperation { @@ -30,7 +31,7 @@ public abstract class AbstractHuamiOperation extends AbstractMiBandOperation crcToVersion = new HashMap() {{ // firmware }}; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitactive/AmazfitActiveSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitactive/AmazfitActiveSupport.java index 4db9c45d7..05cf14908 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitactive/AmazfitActiveSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitactive/AmazfitActiveSupport.java @@ -23,9 +23,9 @@ import java.io.IOException; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper; import nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitactive.AmazfitActiveFWHelper; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021Support; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsSupport; -public class AmazfitActiveSupport extends Huami2021Support { +public class AmazfitActiveSupport extends ZeppOsSupport { @Override public HuamiFWHelper createFWHelper(final Uri uri, final Context context) throws IOException { return new AmazfitActiveFWHelper(uri, context); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitactiveedge/AmazfitActiveEdgeFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitactiveedge/AmazfitActiveEdgeFirmwareInfo.java index 3be01098e..273602e11 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitactiveedge/AmazfitActiveEdgeFirmwareInfo.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitactiveedge/AmazfitActiveEdgeFirmwareInfo.java @@ -25,9 +25,9 @@ import java.util.Set; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.model.DeviceType; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021FirmwareInfo; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsFirmwareInfo; -public class AmazfitActiveEdgeFirmwareInfo extends Huami2021FirmwareInfo { +public class AmazfitActiveEdgeFirmwareInfo extends ZeppOsFirmwareInfo { private static final Map crcToVersion = new HashMap() {{ // firmware }}; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitactiveedge/AmazfitActiveEdgeSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitactiveedge/AmazfitActiveEdgeSupport.java index 7ee42269c..2141be205 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitactiveedge/AmazfitActiveEdgeSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitactiveedge/AmazfitActiveEdgeSupport.java @@ -23,9 +23,9 @@ import java.io.IOException; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper; import nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitactiveedge.AmazfitActiveEdgeFWHelper; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021Support; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsSupport; -public class AmazfitActiveEdgeSupport extends Huami2021Support { +public class AmazfitActiveEdgeSupport extends ZeppOsSupport { @Override public HuamiFWHelper createFWHelper(final Uri uri, final Context context) throws IOException { return new AmazfitActiveEdgeFWHelper(uri, context); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbalance/AmazfitBalanceFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbalance/AmazfitBalanceFirmwareInfo.java index cda6695e4..1618f7799 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbalance/AmazfitBalanceFirmwareInfo.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbalance/AmazfitBalanceFirmwareInfo.java @@ -25,9 +25,9 @@ import java.util.Set; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.model.DeviceType; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021FirmwareInfo; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsFirmwareInfo; -public class AmazfitBalanceFirmwareInfo extends Huami2021FirmwareInfo { +public class AmazfitBalanceFirmwareInfo extends ZeppOsFirmwareInfo { private static final Map crcToVersion = new HashMap() {{ // firmware }}; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbalance/AmazfitBalanceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbalance/AmazfitBalanceSupport.java index 89838e758..1827f6e32 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbalance/AmazfitBalanceSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbalance/AmazfitBalanceSupport.java @@ -23,9 +23,9 @@ import java.io.IOException; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper; import nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitbalance.AmazfitBalanceFWHelper; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021Support; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsSupport; -public class AmazfitBalanceSupport extends Huami2021Support { +public class AmazfitBalanceSupport extends ZeppOsSupport { @Override public HuamiFWHelper createFWHelper(final Uri uri, final Context context) throws IOException { return new AmazfitBalanceFWHelper(uri, context); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitband7/AmazfitBand7FirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitband7/AmazfitBand7FirmwareInfo.java index 63e5fafc4..7e0e09ea8 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitband7/AmazfitBand7FirmwareInfo.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitband7/AmazfitBand7FirmwareInfo.java @@ -25,9 +25,9 @@ import java.util.Set; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.model.DeviceType; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021FirmwareInfo; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsFirmwareInfo; -public class AmazfitBand7FirmwareInfo extends Huami2021FirmwareInfo { +public class AmazfitBand7FirmwareInfo extends ZeppOsFirmwareInfo { private static final Map crcToVersion = new HashMap() {{ }}; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitband7/AmazfitBand7Support.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitband7/AmazfitBand7Support.java index 992423f34..0b894f292 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitband7/AmazfitBand7Support.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitband7/AmazfitBand7Support.java @@ -23,9 +23,9 @@ import java.io.IOException; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper; import nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitband7.AmazfitBand7FWHelper; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021Support; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsSupport; -public class AmazfitBand7Support extends Huami2021Support { +public class AmazfitBand7Support extends ZeppOsSupport { @Override public HuamiFWHelper createFWHelper(final Uri uri, final Context context) throws IOException { return new AmazfitBand7FWHelper(uri, context); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip5/AmazfitBip5FirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip5/AmazfitBip5FirmwareInfo.java index 01b6947e7..bcbfc1f97 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip5/AmazfitBip5FirmwareInfo.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip5/AmazfitBip5FirmwareInfo.java @@ -25,9 +25,9 @@ import java.util.Set; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.model.DeviceType; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021FirmwareInfo; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsFirmwareInfo; -public class AmazfitBip5FirmwareInfo extends Huami2021FirmwareInfo { +public class AmazfitBip5FirmwareInfo extends ZeppOsFirmwareInfo { private static final Map crcToVersion = new HashMap() {{ // firmware }}; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip5/AmazfitBip5Support.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip5/AmazfitBip5Support.java index 5685faaa7..945a5f258 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip5/AmazfitBip5Support.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip5/AmazfitBip5Support.java @@ -23,9 +23,9 @@ import java.io.IOException; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper; import nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitbip5.AmazfitBip5FWHelper; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021Support; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsSupport; -public class AmazfitBip5Support extends Huami2021Support { +public class AmazfitBip5Support extends ZeppOsSupport { @Override public HuamiFWHelper createFWHelper(final Uri uri, final Context context) throws IOException { return new AmazfitBip5FWHelper(uri, context); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcheetahpro/AmazfitCheetahProFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcheetahpro/AmazfitCheetahProFirmwareInfo.java index 3370f7662..a586fad82 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcheetahpro/AmazfitCheetahProFirmwareInfo.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcheetahpro/AmazfitCheetahProFirmwareInfo.java @@ -25,9 +25,9 @@ import java.util.Set; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.model.DeviceType; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021FirmwareInfo; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsFirmwareInfo; -public class AmazfitCheetahProFirmwareInfo extends Huami2021FirmwareInfo { +public class AmazfitCheetahProFirmwareInfo extends ZeppOsFirmwareInfo { private static final Map crcToVersion = new HashMap() {{ // firmware }}; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcheetahpro/AmazfitCheetahProSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcheetahpro/AmazfitCheetahProSupport.java index 859715345..fdb32bdc0 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcheetahpro/AmazfitCheetahProSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcheetahpro/AmazfitCheetahProSupport.java @@ -23,9 +23,9 @@ import java.io.IOException; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper; import nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitcheetahpro.AmazfitCheetahProFWHelper; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021Support; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsSupport; -public class AmazfitCheetahProSupport extends Huami2021Support { +public class AmazfitCheetahProSupport extends ZeppOsSupport { @Override public HuamiFWHelper createFWHelper(final Uri uri, final Context context) throws IOException { return new AmazfitCheetahProFWHelper(uri, context); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcheetahround/AmazfitCheetahRoundFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcheetahround/AmazfitCheetahRoundFirmwareInfo.java index 29e6fc7b8..76e2f6253 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcheetahround/AmazfitCheetahRoundFirmwareInfo.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcheetahround/AmazfitCheetahRoundFirmwareInfo.java @@ -25,9 +25,9 @@ import java.util.Set; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.model.DeviceType; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021FirmwareInfo; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsFirmwareInfo; -public class AmazfitCheetahRoundFirmwareInfo extends Huami2021FirmwareInfo { +public class AmazfitCheetahRoundFirmwareInfo extends ZeppOsFirmwareInfo { private static final Map crcToVersion = new HashMap() {{ // firmware }}; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcheetahround/AmazfitCheetahRoundSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcheetahround/AmazfitCheetahRoundSupport.java index 5b1f46555..59d8019c0 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcheetahround/AmazfitCheetahRoundSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcheetahround/AmazfitCheetahRoundSupport.java @@ -23,9 +23,9 @@ import java.io.IOException; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper; import nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitcheetahround.AmazfitCheetahRoundFWHelper; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021Support; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsSupport; -public class AmazfitCheetahRoundSupport extends Huami2021Support { +public class AmazfitCheetahRoundSupport extends ZeppOsSupport { @Override public HuamiFWHelper createFWHelper(final Uri uri, final Context context) throws IOException { return new AmazfitCheetahRoundFWHelper(uri, context); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcheetahsquare/AmazfitCheetahSquareFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcheetahsquare/AmazfitCheetahSquareFirmwareInfo.java index b0685edca..1a232f2a5 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcheetahsquare/AmazfitCheetahSquareFirmwareInfo.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcheetahsquare/AmazfitCheetahSquareFirmwareInfo.java @@ -25,9 +25,9 @@ import java.util.Set; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.model.DeviceType; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021FirmwareInfo; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsFirmwareInfo; -public class AmazfitCheetahSquareFirmwareInfo extends Huami2021FirmwareInfo { +public class AmazfitCheetahSquareFirmwareInfo extends ZeppOsFirmwareInfo { private static final Map crcToVersion = new HashMap() {{ // firmware }}; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcheetahsquare/AmazfitCheetahSquareSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcheetahsquare/AmazfitCheetahSquareSupport.java index 23b3a8d29..3061f5e5c 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcheetahsquare/AmazfitCheetahSquareSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcheetahsquare/AmazfitCheetahSquareSupport.java @@ -23,9 +23,9 @@ import java.io.IOException; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper; import nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitcheetahsquare.AmazfitCheetahSquareFWHelper; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021Support; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsSupport; -public class AmazfitCheetahSquareSupport extends Huami2021Support { +public class AmazfitCheetahSquareSupport extends ZeppOsSupport { @Override public HuamiFWHelper createFWHelper(final Uri uri, final Context context) throws IOException { return new AmazfitCheetahSquareFWHelper(uri, context); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitfalcon/AmazfitFalconFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitfalcon/AmazfitFalconFirmwareInfo.java index dbcc05e2a..2252f4732 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitfalcon/AmazfitFalconFirmwareInfo.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitfalcon/AmazfitFalconFirmwareInfo.java @@ -25,9 +25,9 @@ import java.util.Set; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.model.DeviceType; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021FirmwareInfo; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsFirmwareInfo; -public class AmazfitFalconFirmwareInfo extends Huami2021FirmwareInfo { +public class AmazfitFalconFirmwareInfo extends ZeppOsFirmwareInfo { private static final Map crcToVersion = new HashMap() {{ // firmware }}; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitfalcon/AmazfitFalconSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitfalcon/AmazfitFalconSupport.java index 004904ee1..8dcab31dc 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitfalcon/AmazfitFalconSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitfalcon/AmazfitFalconSupport.java @@ -23,9 +23,9 @@ import java.io.IOException; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper; import nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitfalcon.AmazfitFalconFWHelper; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021Support; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsSupport; -public class AmazfitFalconSupport extends Huami2021Support { +public class AmazfitFalconSupport extends ZeppOsSupport { @Override public HuamiFWHelper createFWHelper(final Uri uri, final Context context) throws IOException { return new AmazfitFalconFWHelper(uri, context); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr3/AmazfitGTR3FirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr3/AmazfitGTR3FirmwareInfo.java index 74305b1ff..0056b84ab 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr3/AmazfitGTR3FirmwareInfo.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr3/AmazfitGTR3FirmwareInfo.java @@ -28,9 +28,9 @@ import java.util.Set; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.model.DeviceType; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021FirmwareInfo; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsFirmwareInfo; -public class AmazfitGTR3FirmwareInfo extends Huami2021FirmwareInfo { +public class AmazfitGTR3FirmwareInfo extends ZeppOsFirmwareInfo { private static final Logger LOG = LoggerFactory.getLogger(AmazfitGTR3FirmwareInfo.class); private static final Map crcToVersion = new HashMap() {{ diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr3/AmazfitGTR3Support.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr3/AmazfitGTR3Support.java index 1929f1541..5d9417862 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr3/AmazfitGTR3Support.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr3/AmazfitGTR3Support.java @@ -26,9 +26,9 @@ import java.io.IOException; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper; import nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgtr3.AmazfitGTR3FWHelper; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021Support; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsSupport; -public class AmazfitGTR3Support extends Huami2021Support { +public class AmazfitGTR3Support extends ZeppOsSupport { private static final Logger LOG = LoggerFactory.getLogger(AmazfitGTR3Support.class); @Override diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr3pro/AmazfitGTR3ProFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr3pro/AmazfitGTR3ProFirmwareInfo.java index 80c349895..cc028f625 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr3pro/AmazfitGTR3ProFirmwareInfo.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr3pro/AmazfitGTR3ProFirmwareInfo.java @@ -28,9 +28,9 @@ import java.util.Set; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.model.DeviceType; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021FirmwareInfo; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsFirmwareInfo; -public class AmazfitGTR3ProFirmwareInfo extends Huami2021FirmwareInfo { +public class AmazfitGTR3ProFirmwareInfo extends ZeppOsFirmwareInfo { private static final Logger LOG = LoggerFactory.getLogger(AmazfitGTR3ProFirmwareInfo.class); private static final Map crcToVersion = new HashMap() {{ diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr3pro/AmazfitGTR3ProSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr3pro/AmazfitGTR3ProSupport.java index 3b2e6f476..d88140bcf 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr3pro/AmazfitGTR3ProSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr3pro/AmazfitGTR3ProSupport.java @@ -26,9 +26,9 @@ import java.io.IOException; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper; import nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgtr3pro.AmazfitGTR3ProFWHelper; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021Support; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsSupport; -public class AmazfitGTR3ProSupport extends Huami2021Support { +public class AmazfitGTR3ProSupport extends ZeppOsSupport { private static final Logger LOG = LoggerFactory.getLogger(AmazfitGTR3ProSupport.class); @Override diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr4/AmazfitGTR4FirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr4/AmazfitGTR4FirmwareInfo.java index fc1dd5d8d..3ac35ae35 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr4/AmazfitGTR4FirmwareInfo.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr4/AmazfitGTR4FirmwareInfo.java @@ -25,9 +25,9 @@ import java.util.Set; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.model.DeviceType; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021FirmwareInfo; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsFirmwareInfo; -public class AmazfitGTR4FirmwareInfo extends Huami2021FirmwareInfo { +public class AmazfitGTR4FirmwareInfo extends ZeppOsFirmwareInfo { private static final Map crcToVersion = new HashMap() {{ // firmware put(1699, "3.17.0.2"); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr4/AmazfitGTR4Support.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr4/AmazfitGTR4Support.java index 5dd3144a2..1c8686de2 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr4/AmazfitGTR4Support.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr4/AmazfitGTR4Support.java @@ -23,9 +23,9 @@ import java.io.IOException; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper; import nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgtr4.AmazfitGTR4FWHelper; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021Support; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsSupport; -public class AmazfitGTR4Support extends Huami2021Support { +public class AmazfitGTR4Support extends ZeppOsSupport { @Override public HuamiFWHelper createFWHelper(final Uri uri, final Context context) throws IOException { return new AmazfitGTR4FWHelper(uri, context); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtrmini/AmazfitGTRMiniFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtrmini/AmazfitGTRMiniFirmwareInfo.java index 56322bf9a..764d5f849 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtrmini/AmazfitGTRMiniFirmwareInfo.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtrmini/AmazfitGTRMiniFirmwareInfo.java @@ -25,9 +25,9 @@ import java.util.Set; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.model.DeviceType; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021FirmwareInfo; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsFirmwareInfo; -public class AmazfitGTRMiniFirmwareInfo extends Huami2021FirmwareInfo { +public class AmazfitGTRMiniFirmwareInfo extends ZeppOsFirmwareInfo { private static final Map crcToVersion = new HashMap() {{ // firmware }}; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtrmini/AmazfitGTRMiniSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtrmini/AmazfitGTRMiniSupport.java index de5acfbb8..b4244827d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtrmini/AmazfitGTRMiniSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtrmini/AmazfitGTRMiniSupport.java @@ -23,9 +23,9 @@ import java.io.IOException; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper; import nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgtrmini.AmazfitGTRMiniFWHelper; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021Support; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsSupport; -public class AmazfitGTRMiniSupport extends Huami2021Support { +public class AmazfitGTRMiniSupport extends ZeppOsSupport { @Override public HuamiFWHelper createFWHelper(final Uri uri, final Context context) throws IOException { return new AmazfitGTRMiniFWHelper(uri, context); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts3/AmazfitGTS3FirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts3/AmazfitGTS3FirmwareInfo.java index d0533c537..157f3c807 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts3/AmazfitGTS3FirmwareInfo.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts3/AmazfitGTS3FirmwareInfo.java @@ -28,9 +28,9 @@ import java.util.Set; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.model.DeviceType; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021FirmwareInfo; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsFirmwareInfo; -public class AmazfitGTS3FirmwareInfo extends Huami2021FirmwareInfo { +public class AmazfitGTS3FirmwareInfo extends ZeppOsFirmwareInfo { private static final Logger LOG = LoggerFactory.getLogger(AmazfitGTS3FirmwareInfo.class); private static final Map crcToVersion = new HashMap() {{ diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts3/AmazfitGTS3Support.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts3/AmazfitGTS3Support.java index be1da6e5f..e20dc7f5c 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts3/AmazfitGTS3Support.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts3/AmazfitGTS3Support.java @@ -24,12 +24,11 @@ import org.slf4j.LoggerFactory; import java.io.IOException; -import nodomain.freeyourgadget.gadgetbridge.R; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper; import nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgts3.AmazfitGTS3FWHelper; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021Support; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsSupport; -public class AmazfitGTS3Support extends Huami2021Support { +public class AmazfitGTS3Support extends ZeppOsSupport { private static final Logger LOG = LoggerFactory.getLogger(AmazfitGTS3Support.class); @Override diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts4/AmazfitGTS4FirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts4/AmazfitGTS4FirmwareInfo.java index 8c87d9a86..91e1d8553 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts4/AmazfitGTS4FirmwareInfo.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts4/AmazfitGTS4FirmwareInfo.java @@ -25,9 +25,9 @@ import java.util.Set; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.model.DeviceType; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021FirmwareInfo; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsFirmwareInfo; -public class AmazfitGTS4FirmwareInfo extends Huami2021FirmwareInfo { +public class AmazfitGTS4FirmwareInfo extends ZeppOsFirmwareInfo { private static final Map crcToVersion = new HashMap() {{ // firmware }}; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts4/AmazfitGTS4Support.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts4/AmazfitGTS4Support.java index fbdc6f166..bd91e9799 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts4/AmazfitGTS4Support.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts4/AmazfitGTS4Support.java @@ -23,9 +23,9 @@ import java.io.IOException; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper; import nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgts4.AmazfitGTS4FWHelper; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021Support; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsSupport; -public class AmazfitGTS4Support extends Huami2021Support { +public class AmazfitGTS4Support extends ZeppOsSupport { @Override public HuamiFWHelper createFWHelper(final Uri uri, final Context context) throws IOException { return new AmazfitGTS4FWHelper(uri, context); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts4mini/AmazfitGTS4MiniFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts4mini/AmazfitGTS4MiniFirmwareInfo.java index 845d17d2b..7866b8be1 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts4mini/AmazfitGTS4MiniFirmwareInfo.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts4mini/AmazfitGTS4MiniFirmwareInfo.java @@ -25,9 +25,9 @@ import java.util.Set; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.model.DeviceType; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021FirmwareInfo; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsFirmwareInfo; -public class AmazfitGTS4MiniFirmwareInfo extends Huami2021FirmwareInfo { +public class AmazfitGTS4MiniFirmwareInfo extends ZeppOsFirmwareInfo { private static final Map crcToVersion = new HashMap() {{ // firmware }}; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts4mini/AmazfitGTS4MiniSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts4mini/AmazfitGTS4MiniSupport.java index ae7e2612b..e85ea3d53 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts4mini/AmazfitGTS4MiniSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts4mini/AmazfitGTS4MiniSupport.java @@ -23,9 +23,9 @@ import java.io.IOException; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper; import nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgts4mini.AmazfitGTS4MiniFWHelper; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021Support; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsSupport; -public class AmazfitGTS4MiniSupport extends Huami2021Support { +public class AmazfitGTS4MiniSupport extends ZeppOsSupport { @Override public HuamiFWHelper createFWHelper(final Uri uri, final Context context) throws IOException { return new AmazfitGTS4MiniFWHelper(uri, context); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfittrex2/AmazfitTRex2FirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfittrex2/AmazfitTRex2FirmwareInfo.java index 25a7bd67d..d0b94a115 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfittrex2/AmazfitTRex2FirmwareInfo.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfittrex2/AmazfitTRex2FirmwareInfo.java @@ -25,9 +25,9 @@ import java.util.Set; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.model.DeviceType; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021FirmwareInfo; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsFirmwareInfo; -public class AmazfitTRex2FirmwareInfo extends Huami2021FirmwareInfo { +public class AmazfitTRex2FirmwareInfo extends ZeppOsFirmwareInfo { private static final Map crcToVersion = new HashMap() {{ // firmware }}; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfittrex2/AmazfitTRex2Support.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfittrex2/AmazfitTRex2Support.java index 5e0f08602..249d8bb2e 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfittrex2/AmazfitTRex2Support.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfittrex2/AmazfitTRex2Support.java @@ -23,9 +23,9 @@ import java.io.IOException; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper; import nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfittrex2.AmazfitTRex2FWHelper; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021Support; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsSupport; -public class AmazfitTRex2Support extends Huami2021Support { +public class AmazfitTRex2Support extends ZeppOsSupport { @Override public HuamiFWHelper createFWHelper(final Uri uri, final Context context) throws IOException { return new AmazfitTRex2FWHelper(uri, context); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfittrexultra/AmazfitTRexUltraFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfittrexultra/AmazfitTRexUltraFirmwareInfo.java index 4dc8da77b..6041aa299 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfittrexultra/AmazfitTRexUltraFirmwareInfo.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfittrexultra/AmazfitTRexUltraFirmwareInfo.java @@ -25,9 +25,9 @@ import java.util.Set; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.model.DeviceType; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021FirmwareInfo; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsFirmwareInfo; -public class AmazfitTRexUltraFirmwareInfo extends Huami2021FirmwareInfo { +public class AmazfitTRexUltraFirmwareInfo extends ZeppOsFirmwareInfo { private static final Map crcToVersion = new HashMap() {{ // firmware }}; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfittrexultra/AmazfitTRexUltraSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfittrexultra/AmazfitTRexUltraSupport.java index ce495a2f5..d3a7d40fd 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfittrexultra/AmazfitTRexUltraSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfittrexultra/AmazfitTRexUltraSupport.java @@ -23,9 +23,9 @@ import java.io.IOException; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper; import nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfittrexultra.AmazfitTRexUltraFWHelper; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021Support; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsSupport; -public class AmazfitTRexUltraSupport extends Huami2021Support { +public class AmazfitTRexUltraSupport extends ZeppOsSupport { @Override public HuamiFWHelper createFWHelper(final Uri uri, final Context context) throws IOException { return new AmazfitTRexUltraFWHelper(uri, context); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband7/MiBand7FirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband7/MiBand7FirmwareInfo.java index 2150f6e0b..dbf225624 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband7/MiBand7FirmwareInfo.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband7/MiBand7FirmwareInfo.java @@ -16,9 +16,6 @@ along with this program. If not, see . */ package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.miband7; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; @@ -28,9 +25,9 @@ import java.util.Set; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.model.DeviceType; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021FirmwareInfo; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsFirmwareInfo; -public class MiBand7FirmwareInfo extends Huami2021FirmwareInfo { +public class MiBand7FirmwareInfo extends ZeppOsFirmwareInfo { private static final Map crcToVersion = new HashMap() {{ // firmware put(26036, "1.20.3.1"); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband7/MiBand7Support.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband7/MiBand7Support.java index 04ecbc674..9dd0bde50 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband7/MiBand7Support.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband7/MiBand7Support.java @@ -23,9 +23,9 @@ import java.io.IOException; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper; import nodomain.freeyourgadget.gadgetbridge.devices.huami.miband7.MiBand7FWHelper; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021Support; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsSupport; -public class MiBand7Support extends Huami2021Support { +public class MiBand7Support extends ZeppOsSupport { @Override public HuamiFWHelper createFWHelper(final Uri uri, final Context context) throws IOException { return new MiBand7FWHelper(uri, context); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/AbstractFetchOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/AbstractFetchOperation.java index dd45a3de2..1e8c4d722 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/AbstractFetchOperation.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/AbstractFetchOperation.java @@ -45,7 +45,7 @@ import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder; import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.AbstractGattListenerWriteAction; import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetDeviceBusyAction; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.AbstractHuamiOperation; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021Support; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsSupport; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.HuamiSupport; import nodomain.freeyourgadget.gadgetbridge.util.ArrayUtils; import nodomain.freeyourgadget.gadgetbridge.util.GB; @@ -163,7 +163,7 @@ public abstract class AbstractFetchOperation extends AbstractHuamiOperation { /** * Validates that the received data has the expected checksum. Only - * relevant for Huami2021Support devices. + * relevant for ZeppOsSupport devices. * * @param crc32 the expected checksum * @return whether the checksum was valid @@ -187,7 +187,7 @@ public abstract class AbstractFetchOperation extends AbstractHuamiOperation { protected void startFetching(TransactionBuilder builder, byte fetchType, GregorianCalendar sinceWhen) { final String taskName = StringUtils.ensureNotNull(builder.getTaskName()); final HuamiSupport support = getSupport(); - final boolean isHuami2021 = support instanceof Huami2021Support; + final boolean isZeppOs = support instanceof ZeppOsSupport; byte[] fetchBytes = BLETypeConversions.join(new byte[]{ HuamiService.COMMAND_ACTIVITY_DATA_START_DATE, fetchType}, @@ -201,9 +201,9 @@ public abstract class AbstractFetchOperation extends AbstractHuamiOperation { if (ArrayUtils.equals(value, HuamiService.RESPONSE_ACTIVITY_DATA_START_DATE_SUCCESS, 0)) { handleActivityMetadata(value); - if (expectedDataLength == 0 && isHuami2021) { + if (expectedDataLength == 0 && isZeppOs) { // Nothing to receive, if we try to fetch data it will fail - sendAck2021(true); + sendAckZeppOs(true); } else if (expectedDataLength != 0) { TransactionBuilder newBuilder = createTransactionBuilder(taskName + " Step 2"); newBuilder.notify(characteristicActivityData, true); @@ -305,7 +305,7 @@ public abstract class AbstractFetchOperation extends AbstractHuamiOperation { if (value.length == 7 && !validChecksum(BLETypeConversions.toUint32(value, 3))) { LOG.warn("Data checksum invalid"); handleActivityFetchFinish(false); - sendAck2021(true); + sendAckZeppOs(true); return; } @@ -319,15 +319,15 @@ public abstract class AbstractFetchOperation extends AbstractHuamiOperation { final boolean keepActivityDataOnDevice = HuamiCoordinator.getKeepActivityDataOnDevice(getDevice().getAddress()); - sendAck2021(keepActivityDataOnDevice || !handleFinishSuccess); + sendAckZeppOs(keepActivityDataOnDevice || !handleFinishSuccess); } - protected void sendAck2021(final boolean keepDataOnDevice) { - if (!(getSupport() instanceof Huami2021Support)) { + protected void sendAckZeppOs(final boolean keepDataOnDevice) { + if (!(getSupport() instanceof ZeppOsSupport)) { return; } - LOG.debug("Sending ack 2021, keepDataOnDevice = {}", keepDataOnDevice); + LOG.debug("Sending Zepp OS ack, keepDataOnDevice = {}", keepDataOnDevice); // 0x01 to ACK, mark as saved on phone (drop from band) // 0x09 to ACK, but keep it marked as not saved diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/AbstractRepeatingFetchOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/AbstractRepeatingFetchOperation.java index f35e231b0..16c1675ca 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/AbstractRepeatingFetchOperation.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/AbstractRepeatingFetchOperation.java @@ -82,7 +82,7 @@ public abstract class AbstractRepeatingFetchOperation extends AbstractFetchOpera if (!success) { // We need to explicitly ack this, or the next operation will fail fetch will become stuck - sendAck2021(true); + sendAckZeppOs(true); super.handleActivityFetchFinish(false); return false; } @@ -112,7 +112,7 @@ public abstract class AbstractRepeatingFetchOperation extends AbstractFetchOpera try { final boolean keepActivityDataOnDevice = HuamiCoordinator.getKeepActivityDataOnDevice(getDevice().getAddress()); - sendAck2021(keepActivityDataOnDevice); + sendAckZeppOs(keepActivityDataOnDevice); startFetching(); return true; } catch (final IOException ex) { diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchSportsSummaryOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchSportsSummaryOperation.java index 17476487a..e36be5e64 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchSportsSummaryOperation.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchSportsSummaryOperation.java @@ -34,7 +34,6 @@ import nodomain.freeyourgadget.gadgetbridge.R; import nodomain.freeyourgadget.gadgetbridge.database.DBHandler; import nodomain.freeyourgadget.gadgetbridge.database.DBHelper; import nodomain.freeyourgadget.gadgetbridge.devices.DeviceCoordinator; -import nodomain.freeyourgadget.gadgetbridge.devices.huami.Huami2021ActivitySummaryParser; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiActivitySummaryParser; import nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitbip.AmazfitBipService; import nodomain.freeyourgadget.gadgetbridge.entities.BaseActivitySummary; @@ -44,10 +43,8 @@ import nodomain.freeyourgadget.gadgetbridge.entities.User; import nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryParser; import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.AbstractHuamiActivityDetailsParser; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021ActivityDetailsParser; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.HuamiSupport; import nodomain.freeyourgadget.gadgetbridge.util.CheckSums; -import nodomain.freeyourgadget.gadgetbridge.util.DeviceHelper; import nodomain.freeyourgadget.gadgetbridge.util.GB; /** diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/UpdateFirmwareOperation2021.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/UpdateFirmwareOperation2021.java index a1ceee766..891e53226 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/UpdateFirmwareOperation2021.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/UpdateFirmwareOperation2021.java @@ -28,14 +28,14 @@ import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiService; import nodomain.freeyourgadget.gadgetbridge.service.btle.BLETypeConversions; import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.AbstractHuamiFirmwareInfo; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021Support; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsSupport; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.HuamiFirmwareType; import nodomain.freeyourgadget.gadgetbridge.util.ArrayUtils; public class UpdateFirmwareOperation2021 extends UpdateFirmwareOperation2020 { private static final Logger LOG = LoggerFactory.getLogger(UpdateFirmwareOperation2021.class); - public UpdateFirmwareOperation2021(final Uri uri, final Huami2021Support support) { + public UpdateFirmwareOperation2021(final Uri uri, final ZeppOsSupport support) { super(uri, support); } @@ -62,8 +62,8 @@ public class UpdateFirmwareOperation2021 extends UpdateFirmwareOperation2020 { } @Override - public Huami2021Support getSupport() { - return (Huami2021Support) super.getSupport(); + public ZeppOsSupport getSupport() { + return (ZeppOsSupport) super.getSupport(); } @Override diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/AbstractHuami2021FWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/AbstractZeppOsFwInstallHandler.java similarity index 88% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/AbstractHuami2021FWInstallHandler.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/AbstractZeppOsFwInstallHandler.java index 722cfc160..ecca27e0e 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/AbstractHuami2021FWInstallHandler.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/AbstractZeppOsFwInstallHandler.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . */ -package nodomain.freeyourgadget.gadgetbridge.service.devices.huami; +package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos; import android.content.Context; import android.graphics.Bitmap; @@ -36,13 +36,13 @@ import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper; import nodomain.freeyourgadget.gadgetbridge.devices.miband.AbstractMiBandFWInstallHandler; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceApp; -import nodomain.freeyourgadget.gadgetbridge.util.DeviceHelper; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.AbstractHuamiFirmwareInfo; import nodomain.freeyourgadget.gadgetbridge.util.FileUtils; -public abstract class AbstractHuami2021FWInstallHandler extends AbstractMiBandFWInstallHandler { - private static final Logger LOG = LoggerFactory.getLogger(AbstractHuami2021FWInstallHandler.class); +public abstract class AbstractZeppOsFwInstallHandler extends AbstractMiBandFWInstallHandler { + private static final Logger LOG = LoggerFactory.getLogger(AbstractZeppOsFwInstallHandler.class); - public AbstractHuami2021FWInstallHandler(final Uri uri, final Context context) { + public AbstractZeppOsFwInstallHandler(final Uri uri, final Context context) { super(uri, context); } @@ -51,8 +51,8 @@ public abstract class AbstractHuami2021FWInstallHandler extends AbstractMiBandFW final AbstractHuamiFirmwareInfo firmwareInfo = getHelper().getFirmwareInfo(); final boolean shouldCache = firmwareInfo.getFirmwareType().isApp() || firmwareInfo.getFirmwareType().isWatchface(); if (shouldCache) { - if (firmwareInfo instanceof Huami2021FirmwareInfo) { - saveToCache((Huami2021FirmwareInfo) firmwareInfo, device); + if (firmwareInfo instanceof ZeppOsFirmwareInfo) { + saveToCache((ZeppOsFirmwareInfo) firmwareInfo, device); } else { LOG.warn("firmwareInfo is {} - this should never happen", firmwareInfo.getClass()); } @@ -70,7 +70,7 @@ public abstract class AbstractHuami2021FWInstallHandler extends AbstractMiBandFW return (HuamiFWHelper) helper; } - private void saveToCache(final Huami2021FirmwareInfo firmwareInfo, final GBDevice device) { + private void saveToCache(final ZeppOsFirmwareInfo firmwareInfo, final GBDevice device) { final DeviceCoordinator coordinator = device.getDeviceCoordinator(); final File appCacheDir; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/AbstractZeppOsService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/AbstractZeppOsService.java index 1b4780f55..b39eeb9cb 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/AbstractZeppOsService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/AbstractZeppOsService.java @@ -26,19 +26,18 @@ import org.slf4j.LoggerFactory; import nodomain.freeyourgadget.gadgetbridge.GBApplication; import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEvent; import nodomain.freeyourgadget.gadgetbridge.devices.DeviceCoordinator; -import nodomain.freeyourgadget.gadgetbridge.devices.huami.Huami2021Coordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator; import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021Support; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services.ZeppOsAlexaService; import nodomain.freeyourgadget.gadgetbridge.util.Prefs; public abstract class AbstractZeppOsService { private static final Logger LOG = LoggerFactory.getLogger(ZeppOsAlexaService.class); - private final Huami2021Support mSupport; + private final ZeppOsSupport mSupport; private boolean encrypted; - public AbstractZeppOsService(final Huami2021Support support, final boolean encryptedDefault) { + public AbstractZeppOsService(final ZeppOsSupport support, final boolean encryptedDefault) { this.mSupport = support; this.encrypted = encryptedDefault; } @@ -75,13 +74,13 @@ public abstract class AbstractZeppOsService { // we will already know the capabilities } - protected Huami2021Support getSupport() { + protected ZeppOsSupport getSupport() { return mSupport; } - protected Huami2021Coordinator getCoordinator() { + protected ZeppOsCoordinator getCoordinator() { final DeviceCoordinator coordinator = getSupport().getDevice().getDeviceCoordinator(); - return (Huami2021Coordinator) coordinator; + return (ZeppOsCoordinator) coordinator; } protected Prefs getDevicePrefs() { diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021ActivityDetailsParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsActivityDetailsParser.java similarity index 96% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021ActivityDetailsParser.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsActivityDetailsParser.java index 1e3eae775..c40ccc0f0 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021ActivityDetailsParser.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsActivityDetailsParser.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . */ -package nodomain.freeyourgadget.gadgetbridge.service.devices.huami; +package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos; import androidx.annotation.Nullable; @@ -36,9 +36,10 @@ import nodomain.freeyourgadget.gadgetbridge.entities.BaseActivitySummary; import nodomain.freeyourgadget.gadgetbridge.model.ActivityPoint; import nodomain.freeyourgadget.gadgetbridge.model.ActivityTrack; import nodomain.freeyourgadget.gadgetbridge.model.GPSCoordinate; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.AbstractHuamiActivityDetailsParser; -public class Huami2021ActivityDetailsParser extends AbstractHuamiActivityDetailsParser { - private static final Logger LOG = LoggerFactory.getLogger(Huami2021ActivityDetailsParser.class); +public class ZeppOsActivityDetailsParser extends AbstractHuamiActivityDetailsParser { + private static final Logger LOG = LoggerFactory.getLogger(ZeppOsActivityDetailsParser.class); private static final SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS", Locale.US); @@ -56,7 +57,7 @@ public class Huami2021ActivityDetailsParser extends AbstractHuamiActivityDetails private final ActivityTrack activityTrack; private ActivityPoint lastActivityPoint; - public Huami2021ActivityDetailsParser(final BaseActivitySummary summary) { + public ZeppOsActivityDetailsParser(final BaseActivitySummary summary) { this.timestamp = summary.getStartTime(); this.longitude = summary.getBaseLongitude(); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021WorkoutTrackActivityType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsActivityType.java similarity index 94% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021WorkoutTrackActivityType.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsActivityType.java index e220cb849..e950e110e 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021WorkoutTrackActivityType.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsActivityType.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . */ -package nodomain.freeyourgadget.gadgetbridge.service.devices.huami; +package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -24,7 +24,7 @@ import nodomain.freeyourgadget.gadgetbridge.model.ActivityKind; /** * The workout types, used to start / when workout tracking starts on the band. */ -public enum Huami2021WorkoutTrackActivityType { +public enum ZeppOsActivityType { AerobicCombo(0x33), Aerobics(0x6d), AirWalker(0x90), @@ -147,11 +147,11 @@ public enum Huami2021WorkoutTrackActivityType { Zumba(0x4d), ; - private static final Logger LOG = LoggerFactory.getLogger(Huami2021WorkoutTrackActivityType.class); + private static final Logger LOG = LoggerFactory.getLogger(ZeppOsActivityType.class); private final byte code; - Huami2021WorkoutTrackActivityType(final int code) { + ZeppOsActivityType(final int code) { this.code = (byte) code; } @@ -210,8 +210,8 @@ public enum Huami2021WorkoutTrackActivityType { return ActivityKind.TYPE_UNKNOWN; } - public static Huami2021WorkoutTrackActivityType fromCode(final byte code) { - for (final Huami2021WorkoutTrackActivityType type : values()) { + public static ZeppOsActivityType fromCode(final byte code) { + for (final ZeppOsActivityType type : values()) { if (type.getCode() == code) { return type; } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021FirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsFirmwareInfo.java similarity index 95% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021FirmwareInfo.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsFirmwareInfo.java index 75c740aaf..6225b70ec 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021FirmwareInfo.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsFirmwareInfo.java @@ -15,7 +15,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . */ -package nodomain.freeyourgadget.gadgetbridge.service.devices.huami; +package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos; import android.graphics.Bitmap; import android.graphics.BitmapFactory; @@ -23,12 +23,10 @@ import android.graphics.BitmapFactory; import androidx.annotation.Nullable; import org.json.JSONArray; -import org.json.JSONException; import org.json.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.File; import java.io.IOException; import java.lang.reflect.Constructor; import java.nio.charset.StandardCharsets; @@ -39,19 +37,22 @@ import java.util.UUID; import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceApp; import nodomain.freeyourgadget.gadgetbridge.service.btle.BLETypeConversions; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.AbstractHuamiFirmwareInfo; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.HuamiFirmwareType; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.UIHHContainer; import nodomain.freeyourgadget.gadgetbridge.util.ArrayUtils; import nodomain.freeyourgadget.gadgetbridge.util.BitmapUtil; import nodomain.freeyourgadget.gadgetbridge.util.ZipFile; import nodomain.freeyourgadget.gadgetbridge.util.ZipFileException; -public abstract class Huami2021FirmwareInfo extends AbstractHuamiFirmwareInfo { - private static final Logger LOG = LoggerFactory.getLogger(Huami2021FirmwareInfo.class); +public abstract class ZeppOsFirmwareInfo extends AbstractHuamiFirmwareInfo { + private static final Logger LOG = LoggerFactory.getLogger(ZeppOsFirmwareInfo.class); private final String preComputedVersion; private GBDeviceApp gbDeviceApp; - public Huami2021FirmwareInfo(final byte[] bytes) { + public ZeppOsFirmwareInfo(final byte[] bytes) { super(bytes); this.preComputedVersion = preComputeVersion(); } @@ -333,7 +334,7 @@ public abstract class Huami2021FirmwareInfo extends AbstractHuamiFirmwareInfo { return null; } - public Huami2021FirmwareInfo repackFirmwareInUIHH() throws IOException { + public ZeppOsFirmwareInfo repackFirmwareInUIHH() throws IOException { if (!firmwareType.equals(HuamiFirmwareType.FIRMWARE)) { throw new IllegalStateException("Can only repack FIRMWARE"); } @@ -341,7 +342,7 @@ public abstract class Huami2021FirmwareInfo extends AbstractHuamiFirmwareInfo { final UIHHContainer uihh = packFirmwareInUIHH(getBytes()); try { - final Constructor constructor = this.getClass().getConstructor(byte[].class); + final Constructor constructor = this.getClass().getConstructor(byte[].class); return constructor.newInstance((Object) uihh.toRawBytes()); } catch (final Exception e) { throw new IOException("Failed to construct new " + getClass().getName(), e); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021MenuType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsMenuType.java similarity index 97% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021MenuType.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsMenuType.java index 00a61727d..300e161dd 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021MenuType.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsMenuType.java @@ -15,14 +15,14 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . */ -package nodomain.freeyourgadget.gadgetbridge.service.devices.huami; +package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos; import java.util.HashMap; import java.util.Map; -public class Huami2021MenuType { +public class ZeppOsMenuType { /** - * These somewhat match the ones in {@link HuamiMenuType}, but not all. The band sends and + * These somewhat match the ones in HuamiMenuType, but not all. The band sends and * receives those as 8-digit upper case hex strings. */ public static final Map displayItemNameLookup = new HashMap() {{ diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021Support.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsSupport.java similarity index 96% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021Support.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsSupport.java index 39e3f3220..c42643902 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021Support.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsSupport.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . */ -package nodomain.freeyourgadget.gadgetbridge.service.devices.huami; +package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos; import static org.apache.commons.lang3.ArrayUtils.subarray; import static nodomain.freeyourgadget.gadgetbridge.devices.huami.Huami2021Service.*; @@ -78,7 +78,7 @@ import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventFindPhone; import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventScreenshot; import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventSilentMode; import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdatePreferences; -import nodomain.freeyourgadget.gadgetbridge.devices.huami.Huami2021Coordinator; +import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator; import nodomain.freeyourgadget.gadgetbridge.devices.huami.Huami2021Service; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiCoordinator; @@ -105,9 +105,13 @@ import nodomain.freeyourgadget.gadgetbridge.model.WeatherSpec; import nodomain.freeyourgadget.gadgetbridge.service.btle.BLETypeConversions; import nodomain.freeyourgadget.gadgetbridge.service.btle.GattCharacteristic; import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.HuamiBatteryInfo; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.HuamiDeviceEvent; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.HuamiPhoneGpsStatus; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.HuamiSupport; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.HuamiVibrationPatternNotificationType; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.operations.UpdateFirmwareOperation; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.operations.UpdateFirmwareOperation2021; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsService; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.operations.ZeppOsAgpsUpdateOperation; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.operations.ZeppOsGpxRouteUploadOperation; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services.ZeppOsAgpsService; @@ -139,8 +143,8 @@ import nodomain.freeyourgadget.gadgetbridge.util.GBPrefs; import nodomain.freeyourgadget.gadgetbridge.util.Prefs; import nodomain.freeyourgadget.gadgetbridge.util.SilentMode; -public abstract class Huami2021Support extends HuamiSupport implements ZeppOsFileTransferService.Callback { - private static final Logger LOG = LoggerFactory.getLogger(Huami2021Support.class); +public abstract class ZeppOsSupport extends HuamiSupport implements ZeppOsFileTransferService.Callback { + private static final Logger LOG = LoggerFactory.getLogger(ZeppOsSupport.class); // Tracks whether realtime HR monitoring is already started, so we can just // send CONTINUE commands @@ -203,11 +207,11 @@ public abstract class Huami2021Support extends HuamiSupport implements ZeppOsFil put(musicService.getEndpoint(), musicService); }}; - public Huami2021Support() { + public ZeppOsSupport() { this(LOG); } - public Huami2021Support(final Logger logger) { + public ZeppOsSupport(final Logger logger) { super(logger); } @@ -343,7 +347,7 @@ public abstract class Huami2021Support extends HuamiSupport implements ZeppOsFil } @Override - protected Huami2021Support sendCalendarEvents(final TransactionBuilder builder) { + protected ZeppOsSupport sendCalendarEvents(final TransactionBuilder builder) { // We have native calendar sync CalendarReceiver.forceSync(); return this; @@ -399,7 +403,7 @@ public abstract class Huami2021Support extends HuamiSupport implements ZeppOsFil } @Override - protected Huami2021Support requestBatteryInfo(TransactionBuilder builder) { + protected ZeppOsSupport requestBatteryInfo(TransactionBuilder builder) { LOG.debug("Requesting Battery Info"); writeToChunked2021(builder, CHUNKED2021_ENDPOINT_BATTERY, BATTERY_REQUEST, false); @@ -408,7 +412,7 @@ public abstract class Huami2021Support extends HuamiSupport implements ZeppOsFil } @Override - protected Huami2021Support setFitnessGoal(final TransactionBuilder builder) { + protected ZeppOsSupport setFitnessGoal(final TransactionBuilder builder) { final int goalSteps = GBApplication.getPrefs().getInt(ActivityUser.PREF_USER_STEPS_GOAL, ActivityUser.defaultUserStepsGoal); final int goalCalories = GBApplication.getPrefs().getInt(ActivityUser.PREF_USER_CALORIES_BURNT, ActivityUser.defaultUserCaloriesBurntGoal); final int goalSleep = GBApplication.getPrefs().getInt(ActivityUser.PREF_USER_SLEEP_DURATION, ActivityUser.defaultUserSleepDurationGoal); @@ -430,7 +434,7 @@ public abstract class Huami2021Support extends HuamiSupport implements ZeppOsFil } @Override - protected Huami2021Support setUserInfo(final TransactionBuilder builder) { + protected ZeppOsSupport setUserInfo(final TransactionBuilder builder) { LOG.info("Attempting to set user info..."); final Prefs prefs = GBApplication.getPrefs(); @@ -487,7 +491,7 @@ public abstract class Huami2021Support extends HuamiSupport implements ZeppOsFil } @Override - protected Huami2021Support setPassword(final TransactionBuilder builder) { + protected ZeppOsSupport setPassword(final TransactionBuilder builder) { final boolean passwordEnabled = HuamiCoordinator.getPasswordEnabled(gbDevice.getAddress()); final String password = HuamiCoordinator.getPassword(gbDevice.getAddress()); @@ -714,7 +718,7 @@ public abstract class Huami2021Support extends HuamiSupport implements ZeppOsFil } @Override - protected Huami2021Support setHeartrateSleepSupport(final TransactionBuilder builder) { + protected ZeppOsSupport setHeartrateSleepSupport(final TransactionBuilder builder) { final boolean enableHrSleepSupport = MiBandCoordinator.getHeartrateSleepSupport(gbDevice.getAddress()); configService.newSetter() @@ -737,7 +741,7 @@ public abstract class Huami2021Support extends HuamiSupport implements ZeppOsFil } @Override - public Huami2021Support setCurrentTimeWithService(TransactionBuilder builder) { + public ZeppOsSupport setCurrentTimeWithService(TransactionBuilder builder) { // It seems that the format sent to the Current Time characteristic changed in newer devices // to kind-of match the GATT spec, but it doesn't quite respect it? // - 11 bytes get sent instead of 10 (extra byte at the end for the offset in quarter-hours?) @@ -773,8 +777,8 @@ public abstract class Huami2021Support extends HuamiSupport implements ZeppOsFil } @Override - public Huami2021Support enableFurtherNotifications(final TransactionBuilder builder, - final boolean enable) { + public ZeppOsSupport enableFurtherNotifications(final TransactionBuilder builder, + final boolean enable) { // Nothing to do here, they are already enabled from enableNotifications return this; } @@ -849,7 +853,7 @@ public abstract class Huami2021Support extends HuamiSupport implements ZeppOsFil } @Override - protected Huami2021Support setTimeFormat(final TransactionBuilder builder) { + protected ZeppOsSupport setTimeFormat(final TransactionBuilder builder) { final GBPrefs gbPrefs = new GBPrefs(getDevicePrefs()); final String timeFormat = gbPrefs.getTimeFormat(); @@ -876,7 +880,7 @@ public abstract class Huami2021Support extends HuamiSupport implements ZeppOsFil } @Override - protected Huami2021Support setDistanceUnit(final TransactionBuilder builder) { + protected ZeppOsSupport setDistanceUnit(final TransactionBuilder builder) { final MiBandConst.DistanceUnit unit = HuamiCoordinator.getDistanceUnit(); LOG.info("Setting distance unit to {}", unit); @@ -899,7 +903,7 @@ public abstract class Huami2021Support extends HuamiSupport implements ZeppOsFil } @Override - protected Huami2021Support setLanguage(final TransactionBuilder builder) { + protected ZeppOsSupport setLanguage(final TransactionBuilder builder) { final String localeString = GBApplication.getDeviceSpecificSharedPrefs(gbDevice.getAddress()) .getString("language", "auto"); @@ -938,7 +942,7 @@ public abstract class Huami2021Support extends HuamiSupport implements ZeppOsFil } @Override - protected Huami2021Support requestGPSVersion(final TransactionBuilder builder) { + protected ZeppOsSupport requestGPSVersion(final TransactionBuilder builder) { LOG.warn("Request GPS version not implemented"); return this; } @@ -1011,7 +1015,7 @@ public abstract class Huami2021Support extends HuamiSupport implements ZeppOsFil // At this point we got the service list from phase 3, so we know which // services are supported, and whether they are encrypted or not - final Huami2021Coordinator coordinator = getCoordinator(); + final ZeppOsCoordinator coordinator = getCoordinator(); // TODO move this to a service setUserInfo(builder); @@ -1066,8 +1070,8 @@ public abstract class Huami2021Support extends HuamiSupport implements ZeppOsFil } @Override - protected Huami2021Coordinator getCoordinator() { - return (Huami2021Coordinator) gbDevice.getDeviceCoordinator(); + protected ZeppOsCoordinator getCoordinator() { + return (ZeppOsCoordinator) gbDevice.getDeviceCoordinator(); } @Override @@ -1199,7 +1203,7 @@ public abstract class Huami2021Support extends HuamiSupport implements ZeppOsFil protected void handle2021Workout(final byte[] payload) { switch (payload[0]) { case WORKOUT_CMD_APP_OPEN: - final Huami2021WorkoutTrackActivityType activityType = Huami2021WorkoutTrackActivityType.fromCode(payload[3]); + final ZeppOsActivityType activityType = ZeppOsActivityType.fromCode(payload[3]); final boolean workoutNeedsGps = (payload[2] == 1); final int activityKind; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021Weather.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsWeather.java similarity index 99% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021Weather.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsWeather.java index 32897ed25..46b0a6274 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021Weather.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsWeather.java @@ -15,7 +15,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . */ -package nodomain.freeyourgadget.gadgetbridge.service.devices.huami; +package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos; import android.location.Location; @@ -55,8 +55,8 @@ import nodomain.freeyourgadget.gadgetbridge.service.devices.pebble.webview.Curre * The weather models that the bands expect as an http response to weather requests. Base URL usually * is https://api-mifit.huami.com. */ -public class Huami2021Weather { - private static final Logger LOG = LoggerFactory.getLogger(Huami2021Weather.class); +public class ZeppOsWeather { + private static final Logger LOG = LoggerFactory.getLogger(ZeppOsWeather.class); private static final Gson GSON = new GsonBuilder() .serializeNulls() @@ -86,7 +86,7 @@ public class Huami2021Weather { if (weatherSpec == null) { LOG.error("No weather in weather instance"); - return new Huami2021Weather.ErrorResponse(404, -2001, "Not found"); + return new ZeppOsWeather.ErrorResponse(404, -2001, "Not found"); } switch (path) { @@ -109,7 +109,7 @@ public class Huami2021Weather { } LOG.error("Unknown weather path {}", path); - return new Huami2021Weather.ErrorResponse(404, -2001, "Not found"); + return new ZeppOsWeather.ErrorResponse(404, -2001, "Not found"); } private static int getQueryNum(final Map query, final String key, final int defaultValue) { diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/operations/ZeppOsAgpsUpdateOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/operations/ZeppOsAgpsUpdateOperation.java index e84e704dd..0d36bee16 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/operations/ZeppOsAgpsUpdateOperation.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/operations/ZeppOsAgpsUpdateOperation.java @@ -25,7 +25,7 @@ import nodomain.freeyourgadget.gadgetbridge.R; import nodomain.freeyourgadget.gadgetbridge.service.btle.AbstractBTLEOperation; import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder; import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetProgressAction; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021Support; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsSupport; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services.ZeppOsAgpsService; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services.ZeppOsConfigService; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services.ZeppOsFileTransferService; @@ -40,7 +40,7 @@ import nodomain.freeyourgadget.gadgetbridge.util.GB; * 4. After successful ack from 3, update is finished. Trigger an AGPS config request from {@link ZeppOsConfigService} * to reload the AGPS update and expiration timestamps. */ -public class ZeppOsAgpsUpdateOperation extends AbstractBTLEOperation +public class ZeppOsAgpsUpdateOperation extends AbstractBTLEOperation implements ZeppOsFileTransferService.Callback, ZeppOsAgpsService.Callback { private static final Logger LOG = LoggerFactory.getLogger(ZeppOsAgpsUpdateOperation.class); @@ -54,7 +54,7 @@ public class ZeppOsAgpsUpdateOperation extends AbstractBTLEOperation +public class ZeppOsGpxRouteUploadOperation extends AbstractBTLEOperation implements ZeppOsFileTransferService.Callback { private static final Logger LOG = LoggerFactory.getLogger(ZeppOsGpxRouteUploadOperation.class); @@ -39,7 +39,7 @@ public class ZeppOsGpxRouteUploadOperation extends AbstractBTLEOperation apps = new ArrayList<>(); - public ZeppOsAppsService(final Huami2021Support support) { + public ZeppOsAppsService(final ZeppOsSupport support) { super(support, false); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsCalendarService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsCalendarService.java index 00dfd1637..3b03779c4 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsCalendarService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsCalendarService.java @@ -27,7 +27,7 @@ import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdatePref import nodomain.freeyourgadget.gadgetbridge.model.CalendarEventSpec; import nodomain.freeyourgadget.gadgetbridge.service.btle.BLETypeConversions; import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021Support; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsSupport; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsService; import nodomain.freeyourgadget.gadgetbridge.util.StringUtils; @@ -49,7 +49,7 @@ public class ZeppOsCalendarService extends AbstractZeppOsService { private int version = -1; - public ZeppOsCalendarService(final Huami2021Support support) { + public ZeppOsCalendarService(final ZeppOsSupport support) { super(support, false); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsCannedMessagesService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsCannedMessagesService.java index ff765cb37..877d43435 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsCannedMessagesService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsCannedMessagesService.java @@ -36,7 +36,7 @@ import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdatePref import nodomain.freeyourgadget.gadgetbridge.model.CannedMessagesSpec; import nodomain.freeyourgadget.gadgetbridge.service.btle.BLETypeConversions; import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021Support; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsSupport; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsService; import nodomain.freeyourgadget.gadgetbridge.util.StringUtils; @@ -58,7 +58,7 @@ public class ZeppOsCannedMessagesService extends AbstractZeppOsService { public static final byte CMD_REPLY_SMS_CHECK = 0x0d; public static final byte CMD_REPLY_SMS_ALLOW = 0x0e; - public ZeppOsCannedMessagesService(final Huami2021Support support) { + public ZeppOsCannedMessagesService(final ZeppOsSupport support) { super(support, false); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsConfigService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsConfigService.java index b338d9784..2171b0aeb 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsConfigService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsConfigService.java @@ -68,13 +68,12 @@ import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdatePref import nodomain.freeyourgadget.gadgetbridge.devices.huami.ActivateDisplayOnLift; import nodomain.freeyourgadget.gadgetbridge.devices.huami.ActivateDisplayOnLiftSensitivity; import nodomain.freeyourgadget.gadgetbridge.devices.huami.AlwaysOnDisplay; -import nodomain.freeyourgadget.gadgetbridge.devices.huami.Huami2021Coordinator; import nodomain.freeyourgadget.gadgetbridge.devices.miband.DoNotDisturb; import nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst; import nodomain.freeyourgadget.gadgetbridge.service.btle.BLETypeConversions; import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021MenuType; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021Support; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsMenuType; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsSupport; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.HuamiLanguageType; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsService; import nodomain.freeyourgadget.gadgetbridge.util.GB; @@ -96,7 +95,7 @@ public class ZeppOsConfigService extends AbstractZeppOsService { private final Map mGroupVersions = new HashMap<>(); - public ZeppOsConfigService(final Huami2021Support support) { + public ZeppOsConfigService(final ZeppOsSupport support) { super(support, true); } @@ -571,7 +570,7 @@ public class ZeppOsConfigService extends AbstractZeppOsService { switch (configArg) { case UPPER_BUTTON_LONG_PRESS: case LOWER_BUTTON_PRESS: - final String itemHex = MapUtils.reverse(Huami2021MenuType.displayItemNameLookup).get(value); + final String itemHex = MapUtils.reverse(ZeppOsMenuType.displayItemNameLookup).get(value); if (itemHex != null) { return itemHex; } @@ -1049,7 +1048,7 @@ public class ZeppOsConfigService extends AbstractZeppOsService { switch (configArg) { case UPPER_BUTTON_LONG_PRESS: case LOWER_BUTTON_PRESS: - decoder = Huami2021MenuType.displayItemNameLookup::get; + decoder = ZeppOsMenuType.displayItemNameLookup::get; break; default: decoder = a -> a; // passthrough diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsContactsService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsContactsService.java index 300e088e4..da40d1289 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsContactsService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsContactsService.java @@ -27,7 +27,7 @@ import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdatePref import nodomain.freeyourgadget.gadgetbridge.model.Contact; import nodomain.freeyourgadget.gadgetbridge.service.btle.BLETypeConversions; import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021Support; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsSupport; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsService; import nodomain.freeyourgadget.gadgetbridge.util.StringUtils; @@ -46,7 +46,7 @@ public class ZeppOsContactsService extends AbstractZeppOsService { public static final String PREF_CONTACTS_SLOT_COUNT = "zepp_os_contacts_slot_count"; - public ZeppOsContactsService(final Huami2021Support support) { + public ZeppOsContactsService(final ZeppOsSupport support) { super(support, true); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsDisplayItemsService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsDisplayItemsService.java index 989d137de..5a2771d02 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsDisplayItemsService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsDisplayItemsService.java @@ -34,11 +34,10 @@ import java.util.regex.Pattern; import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsUtils; import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdatePreferences; -import nodomain.freeyourgadget.gadgetbridge.devices.huami.Huami2021Coordinator; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst; import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021MenuType; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021Support; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsMenuType; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsSupport; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsService; import nodomain.freeyourgadget.gadgetbridge.util.MapUtils; import nodomain.freeyourgadget.gadgetbridge.util.Prefs; @@ -64,7 +63,7 @@ public class ZeppOsDisplayItemsService extends AbstractZeppOsService { public static final byte DISPLAY_ITEMS_SECTION_MORE = 0x02; public static final byte DISPLAY_ITEMS_SECTION_DISABLED = 0x03; - public ZeppOsDisplayItemsService(final Huami2021Support support) { + public ZeppOsDisplayItemsService(final ZeppOsSupport support) { super(support, true); } @@ -149,17 +148,17 @@ public class ZeppOsDisplayItemsService extends AbstractZeppOsService { case DISPLAY_ITEMS_MENU: LOG.info("Got {} display items", numberScreens); prefKey = HuamiConst.PREF_DISPLAY_ITEMS_SORTABLE; - idMap = Huami2021MenuType.displayItemNameLookup; + idMap = ZeppOsMenuType.displayItemNameLookup; break; case DISPLAY_ITEMS_SHORTCUTS: LOG.info("Got {} shortcuts", numberScreens); prefKey = HuamiConst.PREF_SHORTCUTS_SORTABLE; - idMap = Huami2021MenuType.shortcutsNameLookup; + idMap = ZeppOsMenuType.shortcutsNameLookup; break; case DISPLAY_ITEMS_CONTROL_CENTER: LOG.info("Got {} control center", numberScreens); prefKey = HuamiConst.PREF_CONTROL_CENTER_SORTABLE; - idMap = Huami2021MenuType.controlCenterNameLookup; + idMap = ZeppOsMenuType.controlCenterNameLookup; break; default: LOG.error("Unknown display items type {}", String.format("0x%x", payload[1])); @@ -262,17 +261,17 @@ public class ZeppOsDisplayItemsService extends AbstractZeppOsService { case DISPLAY_ITEMS_MENU: LOG.info("Setting menu items"); hasMoreSection = getCoordinator().mainMenuHasMoreSection(); - idMap = MapUtils.reverse(Huami2021MenuType.displayItemNameLookup); + idMap = MapUtils.reverse(ZeppOsMenuType.displayItemNameLookup); break; case DISPLAY_ITEMS_SHORTCUTS: LOG.info("Setting shortcuts"); hasMoreSection = false; - idMap = MapUtils.reverse(Huami2021MenuType.shortcutsNameLookup); + idMap = MapUtils.reverse(ZeppOsMenuType.shortcutsNameLookup); break; case DISPLAY_ITEMS_CONTROL_CENTER: LOG.info("Setting control center"); hasMoreSection = false; - idMap = MapUtils.reverse(Huami2021MenuType.controlCenterNameLookup); + idMap = MapUtils.reverse(ZeppOsMenuType.controlCenterNameLookup); break; default: LOG.warn("Unknown menu type {}", menuType); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsFileTransferService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsFileTransferService.java index ff9c0386a..5052b3844 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsFileTransferService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsFileTransferService.java @@ -26,12 +26,11 @@ import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; import java.util.zip.DataFormatException; -import java.util.zip.Deflater; import java.util.zip.Inflater; import nodomain.freeyourgadget.gadgetbridge.service.btle.BLETypeConversions; import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021Support; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsSupport; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsService; import nodomain.freeyourgadget.gadgetbridge.util.CheckSums; import nodomain.freeyourgadget.gadgetbridge.util.StringUtils; @@ -55,7 +54,7 @@ public class ZeppOsFileTransferService extends AbstractZeppOsService { private int mChunkSize = -1; - public ZeppOsFileTransferService(final Huami2021Support support) { + public ZeppOsFileTransferService(final ZeppOsSupport support) { super(support, false); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsFtpServerService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsFtpServerService.java index a03776493..30331611f 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsFtpServerService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsFtpServerService.java @@ -27,7 +27,7 @@ import java.nio.charset.StandardCharsets; import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst; import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdatePreferences; import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021Support; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsSupport; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsService; import nodomain.freeyourgadget.gadgetbridge.util.GB; import nodomain.freeyourgadget.gadgetbridge.util.Prefs; @@ -46,7 +46,7 @@ public class ZeppOsFtpServerService extends AbstractZeppOsService { private Callback mCallback = null; - public ZeppOsFtpServerService(final Huami2021Support support) { + public ZeppOsFtpServerService(final ZeppOsSupport support) { super(support, true); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsHttpService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsHttpService.java index 444a40199..39ee9ffaa 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsHttpService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsHttpService.java @@ -28,8 +28,8 @@ import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021Support; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021Weather; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsSupport; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsWeather; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsService; import nodomain.freeyourgadget.gadgetbridge.util.StringUtils; @@ -44,7 +44,7 @@ public class ZeppOsHttpService extends AbstractZeppOsService { public static final byte RESPONSE_SUCCESS = 0x01; public static final byte RESPONSE_NO_INTERNET = 0x02; - public ZeppOsHttpService(final Huami2021Support support) { + public ZeppOsHttpService(final ZeppOsSupport support) { super(support, true); } @@ -102,7 +102,7 @@ public class ZeppOsHttpService extends AbstractZeppOsService { final Map query = urlQueryParameters(url); if (path.startsWith("/weather/")) { - final Huami2021Weather.Response response = Huami2021Weather.handleHttpRequest(path, query); + final ZeppOsWeather.Response response = ZeppOsWeather.handleHttpRequest(path, query); replyHttpSuccess(requestId, response.getHttpStatusCode(), response.toJson()); return; } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsLogsService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsLogsService.java index 4579ac2c6..ae286becd 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsLogsService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsLogsService.java @@ -33,7 +33,7 @@ import java.util.Set; import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst; import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdatePreferences; import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021Support; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsSupport; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsService; import nodomain.freeyourgadget.gadgetbridge.util.GB; import nodomain.freeyourgadget.gadgetbridge.util.Prefs; @@ -62,7 +62,7 @@ public class ZeppOsLogsService extends AbstractZeppOsService { @SuppressLint("SimpleDateFormat") private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss"); - public ZeppOsLogsService(final Huami2021Support support) { + public ZeppOsLogsService(final ZeppOsSupport support) { super(support, false); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsLoyaltyCardService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsLoyaltyCardService.java index 545fc09c4..519b97f5c 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsLoyaltyCardService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsLoyaltyCardService.java @@ -31,7 +31,7 @@ import nodomain.freeyourgadget.gadgetbridge.capabilities.loyaltycards.BarcodeFor import nodomain.freeyourgadget.gadgetbridge.capabilities.loyaltycards.LoyaltyCard; import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdatePreferences; import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021Support; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsSupport; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsService; import nodomain.freeyourgadget.gadgetbridge.util.MapUtils; import nodomain.freeyourgadget.gadgetbridge.util.Prefs; @@ -57,7 +57,7 @@ public class ZeppOsLoyaltyCardService extends AbstractZeppOsService { public static final String PREF_VERSION = "zepp_os_loyalty_cards_version"; - public ZeppOsLoyaltyCardService(final Huami2021Support support) { + public ZeppOsLoyaltyCardService(final ZeppOsSupport support) { super(support, false); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsMorningUpdatesService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsMorningUpdatesService.java index 4da6d92e6..9a255d433 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsMorningUpdatesService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsMorningUpdatesService.java @@ -32,9 +32,8 @@ import java.util.regex.Pattern; import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst; import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsUtils; import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdatePreferences; -import nodomain.freeyourgadget.gadgetbridge.devices.huami.Huami2021Coordinator; import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021Support; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsSupport; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsService; import nodomain.freeyourgadget.gadgetbridge.util.MapUtils; import nodomain.freeyourgadget.gadgetbridge.util.Prefs; @@ -65,7 +64,7 @@ public class ZeppOsMorningUpdatesService extends AbstractZeppOsService { put((byte) 0x0a, "cycle_tracking"); }}; - public ZeppOsMorningUpdatesService(Huami2021Support support) { + public ZeppOsMorningUpdatesService(ZeppOsSupport support) { super(support, false); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsMusicService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsMusicService.java index 9530a1067..ae87beae2 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsMusicService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsMusicService.java @@ -23,7 +23,7 @@ import org.slf4j.LoggerFactory; import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventMusicControl; import nodomain.freeyourgadget.gadgetbridge.model.MusicSpec; import nodomain.freeyourgadget.gadgetbridge.model.MusicStateSpec; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021Support; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsSupport; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.HuamiSupport; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsService; @@ -44,7 +44,7 @@ public class ZeppOsMusicService extends AbstractZeppOsService { private static final byte BUTTON_VOLUME_UP = 0x05; private static final byte BUTTON_VOLUME_DOWN = 0x06; - public ZeppOsMusicService(final Huami2021Support support) { + public ZeppOsMusicService(final ZeppOsSupport support) { super(support, false); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsNotificationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsNotificationService.java index c1dda744f..c010bd006 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsNotificationService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsNotificationService.java @@ -39,7 +39,7 @@ import nodomain.freeyourgadget.gadgetbridge.model.NotificationSpec; import nodomain.freeyourgadget.gadgetbridge.model.NotificationType; import nodomain.freeyourgadget.gadgetbridge.service.btle.BLETypeConversions; import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021Support; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsSupport; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsService; import nodomain.freeyourgadget.gadgetbridge.util.BitmapUtil; import nodomain.freeyourgadget.gadgetbridge.util.LimitedQueue; @@ -74,7 +74,7 @@ public class ZeppOsNotificationService extends AbstractZeppOsService { private final ZeppOsFileTransferService fileTransferService; - public ZeppOsNotificationService(final Huami2021Support support, final ZeppOsFileTransferService fileTransferService) { + public ZeppOsNotificationService(final ZeppOsSupport support, final ZeppOsFileTransferService fileTransferService) { super(support, true); this.fileTransferService = fileTransferService; } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsPhoneService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsPhoneService.java index ece61b2a3..d481ef157 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsPhoneService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsPhoneService.java @@ -17,7 +17,6 @@ package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services; import android.bluetooth.BluetoothAdapter; -import android.widget.Toast; import androidx.annotation.Nullable; @@ -31,7 +30,7 @@ import java.nio.charset.StandardCharsets; import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst; import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdatePreferences; import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021Support; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsSupport; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsService; import nodomain.freeyourgadget.gadgetbridge.util.Prefs; @@ -54,7 +53,7 @@ public class ZeppOsPhoneService extends AbstractZeppOsService { private int version = 0; - public ZeppOsPhoneService(final Huami2021Support support) { + public ZeppOsPhoneService(final ZeppOsSupport support) { super(support, true); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsRemindersService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsRemindersService.java index 8250eab40..b973a4afb 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsRemindersService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsRemindersService.java @@ -32,7 +32,7 @@ import nodomain.freeyourgadget.gadgetbridge.devices.DeviceCoordinator; import nodomain.freeyourgadget.gadgetbridge.model.Reminder; import nodomain.freeyourgadget.gadgetbridge.service.btle.BLETypeConversions; import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021Support; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsSupport; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsService; import nodomain.freeyourgadget.gadgetbridge.util.Prefs; import nodomain.freeyourgadget.gadgetbridge.util.StringUtils; @@ -60,7 +60,7 @@ public class ZeppOsRemindersService extends AbstractZeppOsService { private static final String PREF_CAPABILITY = "huami_2021_capability_reminders"; - public ZeppOsRemindersService(final Huami2021Support support) { + public ZeppOsRemindersService(final ZeppOsSupport support) { super(support, false); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsServicesService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsServicesService.java index d1e729d19..f059b4ec0 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsServicesService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsServicesService.java @@ -23,7 +23,7 @@ import java.nio.ByteBuffer; import java.nio.ByteOrder; import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021Support; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsSupport; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsService; public class ZeppOsServicesService extends AbstractZeppOsService { @@ -34,7 +34,7 @@ public class ZeppOsServicesService extends AbstractZeppOsService { public static final byte CMD_GET_LIST = 0x03; public static final byte CMD_RET_LIST = 0x04; - public ZeppOsServicesService(final Huami2021Support support) { + public ZeppOsServicesService(final ZeppOsSupport support) { super(support, false); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsShortcutCardsService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsShortcutCardsService.java index 285d30f10..606a030e5 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsShortcutCardsService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsShortcutCardsService.java @@ -38,9 +38,8 @@ import java.util.regex.Pattern; import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst; import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsUtils; import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdatePreferences; -import nodomain.freeyourgadget.gadgetbridge.devices.huami.Huami2021Coordinator; import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021Support; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsSupport; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsService; import nodomain.freeyourgadget.gadgetbridge.util.Prefs; import nodomain.freeyourgadget.gadgetbridge.util.StringUtils; @@ -123,7 +122,7 @@ public class ZeppOsShortcutCardsService extends AbstractZeppOsService { private int version = 0; private int maxCards = 0; - public ZeppOsShortcutCardsService(final Huami2021Support support) { + public ZeppOsShortcutCardsService(final ZeppOsSupport support) { super(support, true); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsWatchfaceService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsWatchfaceService.java index 0603cb2cb..c19679be8 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsWatchfaceService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsWatchfaceService.java @@ -37,11 +37,10 @@ import nodomain.freeyourgadget.gadgetbridge.R; import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst; import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsUtils; import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdatePreferences; -import nodomain.freeyourgadget.gadgetbridge.devices.huami.Huami2021Coordinator; import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceApp; import nodomain.freeyourgadget.gadgetbridge.service.btle.BLETypeConversions; import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021Support; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsSupport; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsService; import nodomain.freeyourgadget.gadgetbridge.util.Prefs; @@ -111,7 +110,7 @@ public class ZeppOsWatchfaceService extends AbstractZeppOsService { final List watchfaces = new ArrayList<>(); - public ZeppOsWatchfaceService(final Huami2021Support support) { + public ZeppOsWatchfaceService(final ZeppOsSupport support) { super(support, true); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsWifiService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsWifiService.java index da1ecf211..b2b2b060f 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsWifiService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsWifiService.java @@ -29,7 +29,7 @@ import java.util.Locale; import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst; import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdatePreferences; import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder; -import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021Support; +import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsSupport; import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsService; import nodomain.freeyourgadget.gadgetbridge.util.GB; import nodomain.freeyourgadget.gadgetbridge.util.Prefs; @@ -46,7 +46,7 @@ public class ZeppOsWifiService extends AbstractZeppOsService { private Callback mCallback = null; - public ZeppOsWifiService(final Huami2021Support support) { + public ZeppOsWifiService(final ZeppOsSupport support) { super(support, true); } diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021SupportTest.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsSupportTest.java similarity index 93% rename from app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021SupportTest.java rename to app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsSupportTest.java index 4850c4db5..ae64b1916 100644 --- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021SupportTest.java +++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsSupportTest.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . */ -package nodomain.freeyourgadget.gadgetbridge.service.devices.huami; +package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos; import android.bluetooth.BluetoothGattCharacteristic; import android.content.Context; @@ -35,10 +35,10 @@ import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper; import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder; import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.WriteAction; -public class Huami2021SupportTest { +public class ZeppOsSupportTest { @Test public void testSetCurrentTimeWithService() { - final Huami2021Support support = createSupport(); + final ZeppOsSupport support = createSupport(); final TransactionBuilder testTransactionBuilder = new TransactionBuilder("test"); support.setCurrentTimeWithService(testTransactionBuilder); @@ -47,8 +47,8 @@ public class Huami2021SupportTest { Assert.assertArrayEquals(new byte[]{-26, 7, 12, 15, 20, 38, 53, 4, 0, 8, 4}, action.getValue()); } - private Huami2021Support createSupport() { - return new Huami2021Support() { + private ZeppOsSupport createSupport() { + return new ZeppOsSupport() { @Override public BluetoothGattCharacteristic getCharacteristic(final UUID uuid) { return new BluetoothGattCharacteristic(null, 0, 0);