From 2a47dc863aa1a18f4f45f9342a372a43c0dfbd71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= Date: Sun, 6 Nov 2022 12:13:33 +0000 Subject: [PATCH] Huami: Allow activity fetch timestamps to be sent in seconds --- .../amazfitband5/AmazfitBand5Coordinator.java | 1 + .../amazfitbip/AmazfitBipCoordinator.java | 1 + .../amazfitbip/AmazfitBipLiteCoordinator.java | 1 + .../amazfitbips/AmazfitBipSCoordinator.java | 1 + .../amazfitbipu/AmazfitBipUCoordinator.java | 1 + .../AmazfitBipUProCoordinator.java | 1 + .../amazfitcor/AmazfitCorCoordinator.java | 1 + .../amazfitcor2/AmazfitCor2Coordinator.java | 1 + .../amazfitgtr/AmazfitGTRCoordinator.java | 1 + .../amazfitgtr/AmazfitGTRLiteCoordinator.java | 1 + .../amazfitgtr2/AmazfitGTR2Coordinator.java | 1 + .../amazfitgtr2/AmazfitGTR2eCoordinator.java | 1 + .../amazfitgts/AmazfitGTSCoordinator.java | 1 + .../amazfitgts2/AmazfitGTS2Coordinator.java | 1 + .../AmazfitGTS2MiniCoordinator.java | 1 + .../amazfitgts2/AmazfitGTS2eCoordinator.java | 1 + .../amazfitneo/AmazfitNeoCoordinator.java | 1 + .../amazfittrex/AmazfitTRexCoordinator.java | 1 + .../AmazfitTRexProCoordinator.java | 1 + .../AmazfitVergeLCoordinator.java | 1 + .../huami/amazfitx/AmazfitXCoordinator.java | 1 + .../huami/miband2/MiBand2Coordinator.java | 1 + .../huami/miband2/MiBand2HRXCoordinator.java | 1 + .../huami/miband3/MiBand3Coordinator.java | 1 + .../huami/miband4/MiBand4Coordinator.java | 1 + .../huami/miband5/MiBand5Coordinator.java | 1 + .../huami/miband6/MiBand6Coordinator.java | 1 + .../devices/huami/zeppe/ZeppECoordinator.java | 1 + .../devices/huami/Huami2021Support.java | 21 ---------- .../service/devices/huami/HuamiSupport.java | 41 ++++++++----------- 30 files changed, 45 insertions(+), 45 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband5/AmazfitBand5Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband5/AmazfitBand5Coordinator.java index 0a565c71b..577bb30d6 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband5/AmazfitBand5Coordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband5/AmazfitBand5Coordinator.java @@ -120,6 +120,7 @@ public class AmazfitBand5Coordinator extends HuamiCoordinator { R.xml.devicesettings_device_actions, R.xml.devicesettings_high_mtu, R.xml.devicesettings_overwrite_settings_on_connection, + R.xml.devicesettings_huami2021_fetch_operation_time_unit, R.xml.devicesettings_transliteration }; } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipCoordinator.java index 15b9a7c69..86efecd25 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipCoordinator.java @@ -95,6 +95,7 @@ public class AmazfitBipCoordinator extends HuamiCoordinator { R.xml.devicesettings_buttonactions_with_longpress, R.xml.devicesettings_device_actions, R.xml.devicesettings_overwrite_settings_on_connection, + R.xml.devicesettings_huami2021_fetch_operation_time_unit, R.xml.devicesettings_transliteration }; } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipLiteCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipLiteCoordinator.java index a0e0211bb..5a7fdb07d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipLiteCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipLiteCoordinator.java @@ -85,6 +85,7 @@ public class AmazfitBipLiteCoordinator extends AmazfitBipCoordinator { R.xml.devicesettings_device_actions, R.xml.devicesettings_relax_firmware_checks, R.xml.devicesettings_overwrite_settings_on_connection, + R.xml.devicesettings_huami2021_fetch_operation_time_unit, R.xml.devicesettings_transliteration }; } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbips/AmazfitBipSCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbips/AmazfitBipSCoordinator.java index f49dfb514..3de13dd19 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbips/AmazfitBipSCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbips/AmazfitBipSCoordinator.java @@ -111,6 +111,7 @@ public class AmazfitBipSCoordinator extends HuamiCoordinator { R.xml.devicesettings_high_mtu, R.xml.devicesettings_device_actions, R.xml.devicesettings_overwrite_settings_on_connection, + R.xml.devicesettings_huami2021_fetch_operation_time_unit, R.xml.devicesettings_transliteration }; } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipu/AmazfitBipUCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipu/AmazfitBipUCoordinator.java index dbbafe74e..a7a6c4ff5 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipu/AmazfitBipUCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipu/AmazfitBipUCoordinator.java @@ -126,6 +126,7 @@ public class AmazfitBipUCoordinator extends HuamiCoordinator { R.xml.devicesettings_high_mtu, R.xml.devicesettings_device_actions, R.xml.devicesettings_overwrite_settings_on_connection, + R.xml.devicesettings_huami2021_fetch_operation_time_unit, R.xml.devicesettings_transliteration }; } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipupro/AmazfitBipUProCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipupro/AmazfitBipUProCoordinator.java index e7b1829a6..4fd7875a8 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipupro/AmazfitBipUProCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipupro/AmazfitBipUProCoordinator.java @@ -123,6 +123,7 @@ public class AmazfitBipUProCoordinator extends HuamiCoordinator { R.xml.devicesettings_high_mtu, R.xml.devicesettings_device_actions, R.xml.devicesettings_overwrite_settings_on_connection, + R.xml.devicesettings_huami2021_fetch_operation_time_unit, R.xml.devicesettings_transliteration }; } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor/AmazfitCorCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor/AmazfitCorCoordinator.java index 34a9329c1..adb0d0f67 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor/AmazfitCorCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor/AmazfitCorCoordinator.java @@ -103,6 +103,7 @@ public class AmazfitCorCoordinator extends HuamiCoordinator { R.xml.devicesettings_bt_connected_advertisement, R.xml.devicesettings_device_actions, R.xml.devicesettings_overwrite_settings_on_connection, + R.xml.devicesettings_huami2021_fetch_operation_time_unit, R.xml.devicesettings_transliteration }; } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor2/AmazfitCor2Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor2/AmazfitCor2Coordinator.java index d8a670a5f..83a75afb9 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor2/AmazfitCor2Coordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor2/AmazfitCor2Coordinator.java @@ -105,6 +105,7 @@ public class AmazfitCor2Coordinator extends HuamiCoordinator { R.xml.devicesettings_bt_connected_advertisement, R.xml.devicesettings_device_actions, R.xml.devicesettings_overwrite_settings_on_connection, + R.xml.devicesettings_huami2021_fetch_operation_time_unit, R.xml.devicesettings_transliteration }; } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr/AmazfitGTRCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr/AmazfitGTRCoordinator.java index 1ce22e204..ba1df88de 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr/AmazfitGTRCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr/AmazfitGTRCoordinator.java @@ -105,6 +105,7 @@ public class AmazfitGTRCoordinator extends HuamiCoordinator { R.xml.devicesettings_device_actions, R.xml.devicesettings_high_mtu, R.xml.devicesettings_overwrite_settings_on_connection, + R.xml.devicesettings_huami2021_fetch_operation_time_unit, R.xml.devicesettings_transliteration }; } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr/AmazfitGTRLiteCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr/AmazfitGTRLiteCoordinator.java index 77d6cb892..fe692a1b2 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr/AmazfitGTRLiteCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr/AmazfitGTRLiteCoordinator.java @@ -103,6 +103,7 @@ public class AmazfitGTRLiteCoordinator extends HuamiCoordinator { R.xml.devicesettings_expose_hr_thirdparty, R.xml.devicesettings_bt_connected_advertisement, R.xml.devicesettings_overwrite_settings_on_connection, + R.xml.devicesettings_huami2021_fetch_operation_time_unit, R.xml.devicesettings_transliteration }; } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr2/AmazfitGTR2Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr2/AmazfitGTR2Coordinator.java index 8702a2ffd..af1f31bbc 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr2/AmazfitGTR2Coordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr2/AmazfitGTR2Coordinator.java @@ -110,6 +110,7 @@ public class AmazfitGTR2Coordinator extends HuamiCoordinator { R.xml.devicesettings_device_actions, R.xml.devicesettings_high_mtu, R.xml.devicesettings_overwrite_settings_on_connection, + R.xml.devicesettings_huami2021_fetch_operation_time_unit, R.xml.devicesettings_transliteration }; } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr2/AmazfitGTR2eCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr2/AmazfitGTR2eCoordinator.java index 1f3186712..df8a2c63d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr2/AmazfitGTR2eCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr2/AmazfitGTR2eCoordinator.java @@ -110,6 +110,7 @@ public class AmazfitGTR2eCoordinator extends HuamiCoordinator { R.xml.devicesettings_device_actions, R.xml.devicesettings_high_mtu, R.xml.devicesettings_overwrite_settings_on_connection, + R.xml.devicesettings_huami2021_fetch_operation_time_unit, R.xml.devicesettings_transliteration }; } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts/AmazfitGTSCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts/AmazfitGTSCoordinator.java index 1a2874a7b..4082fe347 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts/AmazfitGTSCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts/AmazfitGTSCoordinator.java @@ -104,6 +104,7 @@ public class AmazfitGTSCoordinator extends HuamiCoordinator { R.xml.devicesettings_device_actions, R.xml.devicesettings_high_mtu, R.xml.devicesettings_overwrite_settings_on_connection, + R.xml.devicesettings_huami2021_fetch_operation_time_unit, R.xml.devicesettings_transliteration }; } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2Coordinator.java index dfde1558b..32ee2761d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2Coordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2Coordinator.java @@ -110,6 +110,7 @@ public class AmazfitGTS2Coordinator extends HuamiCoordinator { R.xml.devicesettings_device_actions, R.xml.devicesettings_high_mtu, R.xml.devicesettings_overwrite_settings_on_connection, + R.xml.devicesettings_huami2021_fetch_operation_time_unit, R.xml.devicesettings_transliteration }; } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2MiniCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2MiniCoordinator.java index c6f3d745a..2cd15a6ee 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2MiniCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2MiniCoordinator.java @@ -79,6 +79,7 @@ public class AmazfitGTS2MiniCoordinator extends AmazfitGTS2Coordinator { R.xml.devicesettings_device_actions, R.xml.devicesettings_high_mtu, R.xml.devicesettings_overwrite_settings_on_connection, + R.xml.devicesettings_huami2021_fetch_operation_time_unit, R.xml.devicesettings_transliteration }; } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2eCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2eCoordinator.java index ef1c4132b..1c6afd609 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2eCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2eCoordinator.java @@ -110,6 +110,7 @@ public class AmazfitGTS2eCoordinator extends HuamiCoordinator { R.xml.devicesettings_device_actions, R.xml.devicesettings_high_mtu, R.xml.devicesettings_overwrite_settings_on_connection, + R.xml.devicesettings_huami2021_fetch_operation_time_unit, R.xml.devicesettings_transliteration }; } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitneo/AmazfitNeoCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitneo/AmazfitNeoCoordinator.java index 6d43ffa6d..ee02e05cc 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitneo/AmazfitNeoCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitneo/AmazfitNeoCoordinator.java @@ -109,6 +109,7 @@ public class AmazfitNeoCoordinator extends HuamiCoordinator { R.xml.devicesettings_device_actions, R.xml.devicesettings_high_mtu, R.xml.devicesettings_overwrite_settings_on_connection, + R.xml.devicesettings_huami2021_fetch_operation_time_unit, R.xml.devicesettings_transliteration }; } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrex/AmazfitTRexCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrex/AmazfitTRexCoordinator.java index 6d3c1f64a..fa5234c2c 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrex/AmazfitTRexCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrex/AmazfitTRexCoordinator.java @@ -104,6 +104,7 @@ public class AmazfitTRexCoordinator extends HuamiCoordinator { R.xml.devicesettings_device_actions, R.xml.devicesettings_high_mtu, R.xml.devicesettings_overwrite_settings_on_connection, + R.xml.devicesettings_huami2021_fetch_operation_time_unit, R.xml.devicesettings_transliteration }; } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrexpro/AmazfitTRexProCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrexpro/AmazfitTRexProCoordinator.java index d280e30ea..bdc22e4ca 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrexpro/AmazfitTRexProCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrexpro/AmazfitTRexProCoordinator.java @@ -104,6 +104,7 @@ public class AmazfitTRexProCoordinator extends HuamiCoordinator { R.xml.devicesettings_device_actions, R.xml.devicesettings_high_mtu, R.xml.devicesettings_overwrite_settings_on_connection, + R.xml.devicesettings_huami2021_fetch_operation_time_unit, R.xml.devicesettings_transliteration }; } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitvergel/AmazfitVergeLCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitvergel/AmazfitVergeLCoordinator.java index 53b7c3314..a5b5737b8 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitvergel/AmazfitVergeLCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitvergel/AmazfitVergeLCoordinator.java @@ -104,6 +104,7 @@ public class AmazfitVergeLCoordinator extends HuamiCoordinator { R.xml.devicesettings_bt_connected_advertisement, R.xml.devicesettings_buttonactions_with_longpress, R.xml.devicesettings_overwrite_settings_on_connection, + R.xml.devicesettings_huami2021_fetch_operation_time_unit, R.xml.devicesettings_transliteration }; } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitx/AmazfitXCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitx/AmazfitXCoordinator.java index 0fd325b8c..84e430eba 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitx/AmazfitXCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitx/AmazfitXCoordinator.java @@ -110,6 +110,7 @@ public class AmazfitXCoordinator extends HuamiCoordinator { R.xml.devicesettings_device_actions, R.xml.devicesettings_high_mtu, R.xml.devicesettings_overwrite_settings_on_connection, + R.xml.devicesettings_huami2021_fetch_operation_time_unit, R.xml.devicesettings_transliteration }; } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2Coordinator.java index 99fbd4958..446cf4dc2 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2Coordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2Coordinator.java @@ -95,6 +95,7 @@ public class MiBand2Coordinator extends HuamiCoordinator { R.xml.devicesettings_reserve_alarms_calendar, R.xml.devicesettings_bt_connected_advertisement, R.xml.devicesettings_overwrite_settings_on_connection, + R.xml.devicesettings_huami2021_fetch_operation_time_unit, R.xml.devicesettings_transliteration }; } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2HRXCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2HRXCoordinator.java index 9e130f1f2..a39e23e54 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2HRXCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2HRXCoordinator.java @@ -97,6 +97,7 @@ public class MiBand2HRXCoordinator extends HuamiCoordinator { R.xml.devicesettings_inactivity_dnd, R.xml.devicesettings_rotatewrist_cycleinfo, R.xml.devicesettings_overwrite_settings_on_connection, + R.xml.devicesettings_huami2021_fetch_operation_time_unit, R.xml.devicesettings_transliteration }; } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband3/MiBand3Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband3/MiBand3Coordinator.java index b0cbdfea4..f7ab7fc39 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband3/MiBand3Coordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband3/MiBand3Coordinator.java @@ -119,6 +119,7 @@ public class MiBand3Coordinator extends HuamiCoordinator { R.xml.devicesettings_bt_connected_advertisement, R.xml.devicesettings_device_actions, R.xml.devicesettings_overwrite_settings_on_connection, + R.xml.devicesettings_huami2021_fetch_operation_time_unit, R.xml.devicesettings_transliteration }; } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband4/MiBand4Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband4/MiBand4Coordinator.java index 533f836b9..62794e75d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband4/MiBand4Coordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband4/MiBand4Coordinator.java @@ -115,6 +115,7 @@ public class MiBand4Coordinator extends HuamiCoordinator { R.xml.devicesettings_device_actions, R.xml.devicesettings_high_mtu, R.xml.devicesettings_overwrite_settings_on_connection, + R.xml.devicesettings_huami2021_fetch_operation_time_unit, R.xml.devicesettings_transliteration }; } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5Coordinator.java index 9936eac30..645e63384 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5Coordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5Coordinator.java @@ -129,6 +129,7 @@ public class MiBand5Coordinator extends HuamiCoordinator { R.xml.devicesettings_device_actions, R.xml.devicesettings_high_mtu, R.xml.devicesettings_overwrite_settings_on_connection, + R.xml.devicesettings_huami2021_fetch_operation_time_unit, R.xml.devicesettings_transliteration }; } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband6/MiBand6Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband6/MiBand6Coordinator.java index 2f870cbc0..4bec1b40b 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband6/MiBand6Coordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband6/MiBand6Coordinator.java @@ -110,6 +110,7 @@ public class MiBand6Coordinator extends HuamiCoordinator { R.xml.devicesettings_expose_hr_thirdparty, R.xml.devicesettings_high_mtu, R.xml.devicesettings_overwrite_settings_on_connection, + R.xml.devicesettings_huami2021_fetch_operation_time_unit, R.xml.devicesettings_transliteration }; } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppe/ZeppECoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppe/ZeppECoordinator.java index 325b7bf48..ac1d688f4 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppe/ZeppECoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppe/ZeppECoordinator.java @@ -103,6 +103,7 @@ public class ZeppECoordinator extends HuamiCoordinator { R.xml.devicesettings_device_actions, R.xml.devicesettings_high_mtu, R.xml.devicesettings_overwrite_settings_on_connection, + R.xml.devicesettings_huami2021_fetch_operation_time_unit, R.xml.devicesettings_transliteration }; } 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/Huami2021Support.java index 67678c1c3..e8f473bc9 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/Huami2021Support.java @@ -910,18 +910,6 @@ public abstract class Huami2021Support extends HuamiSupport { return this; } - @Override - public byte[] getTimeBytes(final Calendar calendar, final TimeUnit precision) { - final byte[] bytes = BLETypeConversions.shortCalendarToRawBytes(calendar); - - if (precision != TimeUnit.MINUTES && precision != TimeUnit.SECONDS) { - throw new IllegalArgumentException("Unsupported precision, only MINUTES and SECONDS are supported"); - } - final byte seconds = precision == TimeUnit.SECONDS ? fromUint8(calendar.get(Calendar.SECOND)) : 0; - final byte tz = BLETypeConversions.mapTimeZone(calendar, BLETypeConversions.TZ_FLAG_INCLUDE_DST_IN_TZ); - return BLETypeConversions.join(bytes, new byte[]{seconds, tz}); - } - @Override public Huami2021Support setCurrentTimeWithService(TransactionBuilder builder) { // It seems that the format sent to the Current Time characteristic changed in newer devices @@ -1398,15 +1386,6 @@ public abstract class Huami2021Support extends HuamiSupport { return 8; } - @Override - public TimeUnit getFetchOperationsTimeUnit() { - // This is configurable because using seconds was causing issues on Amazfit GTR 3 - // However, using minutes can cause issues while fetching workouts shorter than 1 minute - final Prefs devicePrefs = getDevicePrefs(); - final boolean truncate = devicePrefs.getBoolean("huami_truncate_fetch_operation_timestamps", true); - return truncate ? TimeUnit.MINUTES : TimeUnit.SECONDS; - } - @Override public boolean force2021Protocol() { return true; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java index 628c6ca68..c794cddba 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java @@ -275,6 +275,7 @@ import static nodomain.freeyourgadget.gadgetbridge.model.ActivityUser.PREF_USER_ import static nodomain.freeyourgadget.gadgetbridge.model.ActivityUser.PREF_USER_NAME; import static nodomain.freeyourgadget.gadgetbridge.model.ActivityUser.PREF_USER_WEIGHT_KG; import static nodomain.freeyourgadget.gadgetbridge.model.ActivityUser.PREF_USER_YEAR_OF_BIRTH; +import static nodomain.freeyourgadget.gadgetbridge.service.btle.BLETypeConversions.fromUint8; import static nodomain.freeyourgadget.gadgetbridge.service.btle.GattCharacteristic.UUID_CHARACTERISTIC_ALERT_LEVEL; public abstract class HuamiSupport extends AbstractBTLEDeviceSupport implements Huami2021Handler { @@ -402,29 +403,15 @@ public abstract class HuamiSupport extends AbstractBTLEDeviceSupport implements return weatherSpec.windSpeedAsBeaufort() + ""; // cast to string } - /** - * Returns the given date/time (calendar) as a byte sequence, suitable for sending to the - * Mi Band 2 (or derivative). The band appears to not handle DST offsets, so we simply add this - * to the timezone. - * - * @param calendar - * @param precision - * @return - */ - public byte[] getTimeBytes(Calendar calendar, TimeUnit precision) { - byte[] bytes; - if (precision == TimeUnit.MINUTES) { - bytes = BLETypeConversions.shortCalendarToRawBytes(calendar); - } else if (precision == TimeUnit.SECONDS) { - bytes = BLETypeConversions.calendarToRawBytes(calendar); - } else { - throw new IllegalArgumentException("Unsupported precision, only MINUTES and SECONDS are supported till now"); + public byte[] getTimeBytes(final Calendar calendar, final TimeUnit precision) { + final byte[] bytes = BLETypeConversions.shortCalendarToRawBytes(calendar); + + if (precision != TimeUnit.MINUTES && precision != TimeUnit.SECONDS) { + throw new IllegalArgumentException("Unsupported precision, only MINUTES and SECONDS are supported"); } - byte[] tail = new byte[] { 0, BLETypeConversions.mapTimeZone(calendar, BLETypeConversions.TZ_FLAG_INCLUDE_DST_IN_TZ) }; - // 0 = adjust reason bitflags? or DST offset?? , timezone -// byte[] tail = new byte[] { 0x2 }; // reason - byte[] all = BLETypeConversions.join(bytes, tail); - return all; + final byte seconds = precision == TimeUnit.SECONDS ? fromUint8(calendar.get(Calendar.SECOND)) : 0; + final byte tz = BLETypeConversions.mapTimeZone(calendar, BLETypeConversions.TZ_FLAG_INCLUDE_DST_IN_TZ); + return BLETypeConversions.join(bytes, new byte[]{seconds, tz}); } public Calendar fromTimeBytes(byte[] bytes) { @@ -434,7 +421,9 @@ public abstract class HuamiSupport extends AbstractBTLEDeviceSupport implements public HuamiSupport setCurrentTimeWithService(TransactionBuilder builder) { GregorianCalendar now = BLETypeConversions.createCalendar(); - byte[] bytes = getTimeBytes(now, TimeUnit.SECONDS); + byte[] head = BLETypeConversions.calendarToRawBytes(now); + byte[] tail = new byte[] { 0, BLETypeConversions.mapTimeZone(now, BLETypeConversions.TZ_FLAG_INCLUDE_DST_IN_TZ) }; + byte[] bytes = BLETypeConversions.join(head, tail); builder.write(getCharacteristic(GattCharacteristic.UUID_CHARACTERISTIC_CURRENT_TIME), bytes); return this; } @@ -4107,7 +4096,11 @@ public abstract class HuamiSupport extends AbstractBTLEDeviceSupport implements } public TimeUnit getFetchOperationsTimeUnit() { - return TimeUnit.MINUTES; + // This is configurable because using seconds was causing issues on Amazfit GTR 3 + // However, using minutes can cause issues while fetching workouts shorter than 1 minute + final Prefs devicePrefs = getDevicePrefs(); + final boolean truncate = devicePrefs.getBoolean("huami_truncate_fetch_operation_timestamps", true); + return truncate ? TimeUnit.MINUTES : TimeUnit.SECONDS; } public boolean force2021Protocol() {