From 3d543db24f552c8bebb1c03ecbeb7fb53bacf8b1 Mon Sep 17 00:00:00 2001
From: Arjan Schrijver <a_gadgetbridge@anymore.nl>
Date: Thu, 2 Nov 2023 16:33:21 +0100
Subject: [PATCH 001/595] Fossil/Skagen Hybrids: Update navigationApp to
 version 1.0

---
 .../main/assets/fossil_hr/navigationApp.wapp  | Bin 38077 -> 39486 bytes
 .../devices/qhybrid/QHybridConstants.java     |   1 +
 external/fossil-hr-gbapps                     |   2 +-
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/assets/fossil_hr/navigationApp.wapp b/app/src/main/assets/fossil_hr/navigationApp.wapp
index 4510dd019830a4617ecea6c963342f61d86180c7..6c48401d25a187a7e14b700182c8032c49ab05ba 100644
GIT binary patch
delta 1589
zcmb_cOHUL*5bmB?wt+5bAQCnbBkx@V)*uk#E0K^0F&^9(?D9tBqGmN3(2GohiqC{>
zHb&#cqw%~Pyy(S)7mxl9|A2}3RnMTC6=F<)Onvp$S5wnf)$sAX^J&{T`LoFt{1bm8
zgd?qMO&0c?5#swxAzGmEbJ{+I(dNSC>cVAJ$Qtvl?qV{Tiv;hzF02*h`BJSs7N$WV
zMVnBL6OKlU!|L9V=%NtsI)xZt5<*?UQzgU~;P`U!v-;ZK8agA|M#3?9c%q|yq-MBw
zxbtdNL#^-0P^>G`IT7kExfl3br4Q9(;YK6!OKS_O`Rn<cck}VvH&#UHN8Q^yUVUXa
zUA4WvL*>62a*U%xs?K$ls~xjtxm0bgqokJR5jarwxzh6cB#|%G5V&Jj!B{=(a_+5w
zjoRF6<oV(R#Faq0#FAO2gvBLFxza3B+Om1dSe&CNL}w`rJ3~3xX_|)3u~j*mLA@-^
zA~HpDu#;@{B+bLmu+<q_fS>jlbegS7(;`ACwmL<vw!0eJ$pF+8weY9We}g^f3FIaz
z!Z8!Ek$xL#!rRgu<%sHqpQJ{c(@s(!hnJ*!o6&`g9@pc*A)C;HgdR6Z+Oj^9Du#jy
zs<Awdbe}8B2cSo-9)=x+>a&n7KIC(qAjf8pAiEn%0w~R?fW08;*)SZ<GLX5c#OJmg
zq6Vr8ROLsd25SEJGw3llV9IAwKSk7U1s=DgfM`^jCs0CgRB?U1*)yA<7?@(jRl>EB
zx(xM0TgYBA^T7H%aQ5PVPzQV$RlpfF^3eUpo*pjZZ`pbkg?0-X97FMkfqXm^<bzdu
ze0bh|(3E}*j_orVM)b}zz%1Be79Ip13J-_(jPdb)G30>pes@Q1{2^lzyf$7)`TF)<
zW3aft*2{nF#m$X+Z-+YexdHpVdZ2L+eIIDS|ExE**WLfufy)0=?$BK6)kb?`NKf`|
F{Q}JP&7lAQ

delta 201
zcmdnDg=z0fCZm6%%nTr~b_xRn6NCxoM*vA>eg=lz2@DLgfN~(b6O1Q1icbvSm>9r5
zF@m3e7oS&9P^1J{3j@Q1iDi=+EjDv8%CqqpF)%VHGO#l-v8ky|Hf666Tdu;upq{|M
z@EnNQSs56XCj$9NlaI5X(UfPgW>7F^(_j?wP*ODKH03f?PGJ?~g0L7_G*l#%Jy=vX
cGrMg*z~RicS(JZ%@n-1`c_EgYY<rdf0Bd6^;Q#;t

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridConstants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridConstants.java
index f54f40fda..24189411d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridConstants.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridConstants.java
@@ -39,6 +39,7 @@ public final class QHybridConstants {
             put("weatherApp", "3.11");
             put("wellnessApp", "3.16");
             put("AlexaApp", "3.11");
+            put("navigationApp", "1.0");
         }
     };
 
diff --git a/external/fossil-hr-gbapps b/external/fossil-hr-gbapps
index 0d8312b39..1675b3898 160000
--- a/external/fossil-hr-gbapps
+++ b/external/fossil-hr-gbapps
@@ -1 +1 @@
-Subproject commit 0d8312b39771e08aa7bd1a23c114beaffae0ef11
+Subproject commit 1675b38983b78ac306b0ee860806b754230d9f55

From 59b83b92c7f753b76eac8364539522c803e8b2fb Mon Sep 17 00:00:00 2001
From: rany <ranygh@riseup.net>
Date: Sun, 29 Oct 2023 23:26:50 +0200
Subject: [PATCH 002/595] Update protobuf to 3.21.7

Required for building on M1 Macs.

Signed-off-by: rany <ranygh@riseup.net>
---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 2e33435bb..68ae3f83e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -289,7 +289,7 @@ dependencies {
     implementation 'com.jaredrummler:colorpicker:1.0.2'
 //    implementation project(":DaoCore")
     implementation 'com.github.wax911:android-emojify:0.1.7'
-    implementation 'com.google.protobuf:protobuf-javalite:3.10.0'
+    implementation 'com.google.protobuf:protobuf-javalite:3.21.7'
     implementation 'com.android.volley:volley:1.2.1'
 
 // NON-FOSS dependencies
@@ -399,7 +399,7 @@ tasks.clean.dependsOn(tasks.cleanGenerated)
 
 protobuf {
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.10.0'
+        artifact = 'com.google.protobuf:protoc:3.21.7'
     }
     generateProtoTasks {
         all().each { task ->

From e6a035019706a24034c5d54b1cfb3c440e9be42d Mon Sep 17 00:00:00 2001
From: Davis Mosenkovs <davikovs@gmail.com>
Date: Wed, 1 Nov 2023 21:38:45 +0200
Subject: [PATCH 003/595] Mijia LYWSD02: Fix battery drain on Mijia

---
 .../devices/mijia_lywsd02/MijiaLywsd02Support.java       | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/mijia_lywsd02/MijiaLywsd02Support.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/mijia_lywsd02/MijiaLywsd02Support.java
index 590cd1bd1..d4709ba2a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/mijia_lywsd02/MijiaLywsd02Support.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/mijia_lywsd02/MijiaLywsd02Support.java
@@ -60,6 +60,7 @@ public class MijiaLywsd02Support extends AbstractBTLEDeviceSupport {
     private static final UUID UUID_TIME = UUID.fromString("ebe0ccb7-7a0a-4b0c-8a1a-6ff2997da3a6");
     private static final UUID UUID_BATTERY = UUID.fromString("ebe0ccc4-7a0a-4b0c-8a1a-6ff2997da3a6");
     private static final UUID UUID_SCALE = UUID.fromString("ebe0ccbe-7a0a-4b0c-8a1a-6ff2997da3a6");
+    private static final UUID UUID_CONN_INTERVAL = UUID.fromString("ebe0ccd8-7a0a-4b0c-8a1a-6ff2997da3a6");
     private final DeviceInfoProfile<MijiaLywsd02Support> deviceInfoProfile;
     private final GBDeviceEventVersionInfo versionCmd = new GBDeviceEventVersionInfo();
     private final GBDeviceEventBatteryInfo batteryCmd = new GBDeviceEventBatteryInfo();
@@ -94,6 +95,7 @@ public class MijiaLywsd02Support extends AbstractBTLEDeviceSupport {
         }
 
         getBatteryInfo(builder);
+        setConnectionInterval(builder);
         setInitialized(builder);
         return builder;
     }
@@ -102,7 +104,7 @@ public class MijiaLywsd02Support extends AbstractBTLEDeviceSupport {
         BluetoothGattCharacteristic timeCharacteristc = getCharacteristic(MijiaLywsd02Support.UUID_TIME);
         long ts = System.currentTimeMillis();
         byte offsetHours = (byte) (SimpleTimeZone.getDefault().getOffset(ts) / (1000 * 60 * 60));
-        ts /= 1000;
+        ts = ( ts + 250 + 500 ) / 1000; // round to seconds with +250 ms to compensate for BLE connection interval
         builder.write(timeCharacteristc, new byte[]{
                 (byte) (ts & 0xff),
                 (byte) ((ts >> 8) & 0xff),
@@ -111,6 +113,11 @@ public class MijiaLywsd02Support extends AbstractBTLEDeviceSupport {
                 offsetHours});
     }
 
+    private void setConnectionInterval(TransactionBuilder builder) {
+        BluetoothGattCharacteristic intervalCharacteristc = getCharacteristic(MijiaLywsd02Support.UUID_CONN_INTERVAL);
+        builder.write(intervalCharacteristc, new byte[]{ (byte) 0xf4, (byte) 0x01 }); // maximum interval of 500 ms
+    }
+
     private void getBatteryInfo(TransactionBuilder builder) {
         BluetoothGattCharacteristic batteryCharacteristc = getCharacteristic(MijiaLywsd02Support.UUID_BATTERY);
         builder.read(batteryCharacteristc);

From 4c4e18560f8588eaf8d36293fa221852a1d35b38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 3 Nov 2023 20:53:01 +0000
Subject: [PATCH 004/595] Amazfit Bip 5: Remove experimental

---
 .../devices/huami/amazfitbip5/AmazfitBip5Coordinator.java    | 5 -----
 1 file changed, 5 deletions(-)

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 838615d89..c15ba5b03 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
@@ -39,11 +39,6 @@ import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitbip5.Am
 public class AmazfitBip5Coordinator extends Huami2021Coordinator {
     private static final Logger LOG = LoggerFactory.getLogger(AmazfitBip5Coordinator.class);
 
-    @Override
-    public boolean isExperimental() {
-        return true;
-    }
-
     @NonNull
     @Override
     public Class<? extends DeviceSupport> getDeviceSupportClass() {

From 340171e0bb24de9da8037fd1331407346b7083d3 Mon Sep 17 00:00:00 2001
From: rany <ranygh@riseup.net>
Date: Mon, 30 Oct 2023 13:37:56 +0200
Subject: [PATCH 005/595] Zepp OS: Fix sunrise and moon dates being off by
 local time + UTC offset

Fixes #3400

Signed-off-by: rany <ranygh@riseup.net>
---
 .../gadgetbridge/service/devices/huami/Huami2021Weather.java   | 3 +++
 1 file changed, 3 insertions(+)

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/Huami2021Weather.java
index 7d8180d40..75810373b 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/Huami2021Weather.java
@@ -43,6 +43,7 @@ import java.util.GregorianCalendar;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.TimeZone;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiWeatherConditions;
 import nodomain.freeyourgadget.gadgetbridge.model.Weather;
@@ -255,6 +256,7 @@ public class Huami2021Weather {
 
         private Range getSunriseSunset(final Date sunRise, final Date sunSet) {
             final SimpleDateFormat sunRiseSetSdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.ROOT);
+            sunRiseSetSdf.setTimeZone(TimeZone.getTimeZone("UTC"));
 
             final String from = sunRiseSetSdf.format(sunRise);
             final String to = sunRiseSetSdf.format(sunSet);
@@ -298,6 +300,7 @@ public class Huami2021Weather {
             moonPhaseValue.add(String.valueOf(phase));
 
             final SimpleDateFormat moonRiseSetSdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.ROOT);
+            moonRiseSetSdf.setTimeZone(TimeZone.getTimeZone("UTC"));
 
             final String from = moonRiseSetSdf.format(new Date(rise * 1000L));
             final String to = moonRiseSetSdf.format(new Date(set * 1000L));

From a2a145f8d20f58f00be481a46c1e3a9433887ca8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sat, 4 Nov 2023 16:33:57 +0000
Subject: [PATCH 006/595] Update changelog

---
 CHANGELOG.md | 10 ++++++++++
 README.md    |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8cea7cb0e..8e3a18886 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@
 * Initial support for Mijia LYWSD02MMC variant
 * Initial support for Sony Wena 3
 * Experimental support for Sony WF-1000XM5
+* Experimental support for Amazfit Active
+* Experimental support for Amazfit Active Edge
 * Amazfit Band 7: Add alexa menu entries
 * Amazfit GTR 3 Pro: Fix firmware and watchface upload
 * Amazfit T-Rex: Fix activity summary parsing
@@ -15,21 +17,29 @@
 * Bangle.js: Add loyalty cards integration with Catima
 * Bangle.js: Lower threshold for low battery warning
 * Casio GBX100/GBD-200: Fix first connect
+* Fossil/Skagen Hybrids: Add new navigation app
+* Fossil/Skagen Hybrids: Allow configuring call rejection method
 * Fossil/Skagen Hybrids: Fix some preference crashes on the nightly
 * Fossil/Skagen Hybrids: Reduce toasts on release builds
+* Fossil/Skagen Hybrids: Show device specific settings in more logical order
 * Message privacy: Add mode Hide only body
 * Mijia LYWSD02: Add battery
 * Mijia LYWSD02: Set temperature unit
+* Mijia LYWSD02: Fix battery drain while connected
 * PineTime: Display app name for VoIP app calls
 * PineTime: Reduce weather memory usage
 * Withings Steel HR: Fix crash when calibrating hands on the nightly
+* Zepp OS: Add blood oxygen graph
 * Zepp OS: Add workout codes for hiking and outdoor swimming
+* Zepp OS: Display swimming activity data
 * Zepp OS: Fix health settings on older Zepp OS versions
 * Zepp OS: Fix setting of unknown button press apps
+* Zepp OS: Fix sunrise and moon dates being off by local time + UTC offset
 * Zepp OS: Map hiking, outdoor swimming, climbing and table tennis activity types
 * Add transliteration for Latvian and Common Symbols
 * Allow ignore notifications from work profile apps
 * Fix emoji when a transliterator is enabled
+* Fix UV Index and rain probability for some weather apps
 * Improve device discovery stability and fix freezes
 * Improve Telegram and COL Reminder notifications
 * Replace old-style preference switch with Material 3 switch
diff --git a/README.md b/README.md
index 8582f4561..aeeb78d31 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ vendor's servers.
 **(WARNING: Some of them WIP and some of them without maintainer)**
 
 - Amazfit
-	- [Amazfit Active](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Amazfit-Active), [Amazfit Active Edge](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Amazfit-Active-Edge) [**\[!\]**](#special-pairing-procedures)
+	- [Active](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Amazfit-Active), [Active Edge](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Amazfit-Active-Edge) [**\[!\]**](#special-pairing-procedures)
 	- [Balance](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Amazfit-Balance) [**\[!\]**](#special-pairing-procedures)
 	- [Band 5](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Amazfit-Band-5), [Band 7](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Amazfit-Band-7) [**\[!\]**](#special-pairing-procedures)
 	- [Bip](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Amazfit-Bip)

From 1aadc04fd74929fa12ca9c873792a0c5f499b516 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Mon, 6 Nov 2023 14:42:24 +0000
Subject: [PATCH 007/595] Bangle.js: add more non-ascii characters which can be
 converted to ASCII equivalents. This helps for Chinese where words would
 normally break on these chars anyway - based on
 https://forum.espruino.com/conversations/391391

---
 .../service/devices/banglejs/BangleJSDeviceSupport.java         | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java
index b6e98ac13..d1f02bc74 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java
@@ -1146,6 +1146,8 @@ public class BangleJSDeviceSupport extends AbstractBTLEDeviceSupport {
             // Special cases where we can just use a built-in character...
             // Based on https://op.europa.eu/en/web/eu-vocabularies/formex/physical-specifications/character-encoding
             if (ch=='–' || ch=='‐' || ch=='—') ch='-';
+            else if (ch =='‚' || ch=='，') ch=',';
+            else if (ch =='。') ch='.';
             else if (ch=='‘' || ch=='’' || ch =='‚' || ch=='‛' || ch=='′' || ch=='ʹ') ch='\'';
             else if (ch=='“' || ch=='”' || ch =='„' || ch=='‟' || ch=='″') ch='"';
             // chars which break words up

From f4707c15f43753256b689fe66248f3502119dc6b Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Wed, 8 Nov 2023 10:51:00 +0000
Subject: [PATCH 008/595] Bangle.js - mention 'Android Integration' app for
 Bangle, not 'Gadgetbridge', add extra character conversions

---
 .../service/devices/banglejs/BangleJSDeviceSupport.java   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java
index d1f02bc74..490a4f089 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java
@@ -478,7 +478,7 @@ public class BangleJSDeviceSupport extends AbstractBTLEDeviceSupport {
         LOG.info("UART RX LINE: " + line);
         if (line.length()==0) return;
         if (">Uncaught ReferenceError: \"GB\" is not defined".equals(line))
-          GB.toast(getContext(), "Gadgetbridge plugin not installed on Bangle.js", Toast.LENGTH_LONG, GB.ERROR);
+          GB.toast(getContext(), "'Android Integration' plugin not installed on Bangle.js", Toast.LENGTH_LONG, GB.ERROR);
         else if (line.charAt(0)=='{') {
             // JSON - we hope!
             try {
@@ -1146,12 +1146,14 @@ public class BangleJSDeviceSupport extends AbstractBTLEDeviceSupport {
             // Special cases where we can just use a built-in character...
             // Based on https://op.europa.eu/en/web/eu-vocabularies/formex/physical-specifications/character-encoding
             if (ch=='–' || ch=='‐' || ch=='—') ch='-';
-            else if (ch =='‚' || ch=='，') ch=',';
+            else if (ch =='‚' || ch=='，' || ch=='、') ch=',';
             else if (ch =='。') ch='.';
+            else if (ch =='【') ch='[';
+            else if (ch =='】') ch=']';
             else if (ch=='‘' || ch=='’' || ch =='‚' || ch=='‛' || ch=='′' || ch=='ʹ') ch='\'';
             else if (ch=='“' || ch=='”' || ch =='„' || ch=='‟' || ch=='″') ch='"';
             // chars which break words up
-            if (" -_/:.,?!'\"&*()".indexOf(ch)>=0) {
+            if (" -_/:.,?!'\"&*()[]".indexOf(ch)>=0) {
                 // word split
                 if (needsTranslate) { // convert word
                     LOG.info("renderUnicodeAsImage converting " + word);

From cb0962e0f649f294a9375fb298fddb6411c8e753 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Thu, 9 Nov 2023 15:12:59 +0000
Subject: [PATCH 009/595] Bangle.js: Ensure we split Chinese words every 2
 chars when converting them to bitmaps to give us the opportunity to wrap text
 better Also make sure we never create a bitmap >255 width/height as this
 wouldn't work on Espruino

---
 .../banglejs/BangleJSDeviceSupport.java       | 40 +++++++++++++++++--
 1 file changed, 36 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java
index 490a4f089..0d9b27326 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java
@@ -1114,18 +1114,42 @@ public class BangleJSDeviceSupport extends AbstractBTLEDeviceSupport {
         return true;
     }
 
-    private String renderUnicodeWordAsImage(String word) {
+    private String renderUnicodeWordPartAsImage(String word) {
         // check for emoji
         boolean hasEmoji = false;
-        if (EmojiUtils.getAllEmojis()==null)
+        if (EmojiUtils.getAllEmojis() == null)
             EmojiManager.initEmojiData(GBApplication.getContext());
-        for(Emoji emoji : EmojiUtils.getAllEmojis())
+        for (Emoji emoji : EmojiUtils.getAllEmojis())
             if (word.contains(emoji.getEmoji())) {
                 hasEmoji = true;
                 break;
             }
         // if we had emoji, ensure we create 3 bit color (not 1 bit B&W)
-        return "\0"+bitmapToEspruinoString(textToBitmap(word), hasEmoji ? BangleJSBitmapStyle.RGB_3BPP_TRANSPARENT : BangleJSBitmapStyle.MONOCHROME_TRANSPARENT);
+        BangleJSBitmapStyle style = hasEmoji ? BangleJSBitmapStyle.RGB_3BPP_TRANSPARENT : BangleJSBitmapStyle.MONOCHROME_TRANSPARENT;
+        return "\0"+bitmapToEspruinoString(textToBitmap(word), style);
+    }
+
+    private String renderUnicodeWordAsImage(String word) {
+        // if we have Chinese/Japanese/Korean chars, split into 2 char chunks to allow easier text wrapping
+        // it's not perfect but better than nothing
+        boolean hasCJK = false;
+        for (int i=0;i<word.length();i++) {
+            char ch = word.charAt(i);
+            hasCJK |= ch>=0x4E00 && ch<=0x9FFF; // "CJK Unified Ideographs" block
+        }
+        if (hasCJK) {
+            // split every 2 chars
+            String result = "";
+            for (int i=0;i<word.length();i+=2) {
+                int len = 2;
+                if (i+len > word.length())
+                    len = word.length()-i;
+                result += renderUnicodeWordPartAsImage(word.substring(i, i+len));
+            }
+            return result;
+        }
+        // else just render the word as-is
+        return renderUnicodeWordPartAsImage(word);
     }
 
     public String renderUnicodeAsImage(String txt) {
@@ -1596,6 +1620,14 @@ public class BangleJSDeviceSupport extends AbstractBTLEDeviceSupport {
     public static byte[] bitmapToEspruinoArray(Bitmap bitmap, BangleJSBitmapStyle style) {
         int width = bitmap.getWidth();
         int height = bitmap.getHeight();
+        if (width>255) {
+            LOG.warn("bitmapToEspruinoArray width of "+width+" > 255 (Espruino max) - cropping");
+            width = 255;
+        }
+        if (height>255) {
+            LOG.warn("bitmapToEspruinoArray height of "+height+" > 255 (Espruino max) - cropping");
+            height = 255;
+        }
         int bpp = (style==BangleJSBitmapStyle.RGB_3BPP ||
                    style==BangleJSBitmapStyle.RGB_3BPP_TRANSPARENT) ? 3 : 1;
         byte[] pixels = new byte[width * height];

From 5abd46d7ba394f695685378f3a78642d467a985b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Thu, 9 Nov 2023 21:52:14 +0000
Subject: [PATCH 010/595] Amazfit T-Rex Ultra: Remove experimental

---
 README.md                                                    | 2 +-
 .../huami/amazfittrexultra/AmazfitTRexUltraCoordinator.java  | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/README.md b/README.md
index aeeb78d31..65ec748cd 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ vendor's servers.
 	- [GTS](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Amazfit-GTS), [GTS 2/2e](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Amazfit-GTS), [GTS 3](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Amazfit-GTS-3), [GTS 4](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Amazfit-GTS-4), [GTS 4 Mini](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Amazfit-GTS-4-Mini) [**\[!\]**](#special-pairing-procedures)
 	- [Neo](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Amazfit-Neo) [**\[!\]**](#special-pairing-procedures)
 	- T-Rex, T-Rex Pro, [T-Rex 2](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Amazfit-T-Rex-2) [**\[!\]**](#special-pairing-procedures)
-	- [T-Rex Ultra (experimental)](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Amazfit-T-Rex-Ultra) [**\[!\]**](#special-pairing-procedures)
+	- [T-Rex Ultra](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Amazfit-T-Rex-Ultra) [**\[!\]**](#special-pairing-procedures)
 	- [Cheetah (Round/Square) (experimental)](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Amazfit-Cheetah) [**\[!\]**](#special-pairing-procedures)
 	- [Cheetah Pro](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Amazfit-Cheetah-Pro) [**\[!\]**](#special-pairing-procedures)
 	- Verge Lite [**\[!\]**](#special-pairing-procedures)
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 fe34e0192..751203345 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
@@ -39,11 +39,6 @@ import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfittrexult
 public class AmazfitTRexUltraCoordinator extends Huami2021Coordinator {
     private static final Logger LOG = LoggerFactory.getLogger(AmazfitTRexUltraCoordinator.class);
 
-    @Override
-    public boolean isExperimental() {
-        return true;
-    }
-
     @NonNull
     @Override
     public Class<? extends DeviceSupport> getDeviceSupportClass() {

From 20850858d261c70cc792b2de50732a95b80d908d Mon Sep 17 00:00:00 2001
From: Davis Mosenkovs <davikovs@gmail.com>
Date: Thu, 9 Nov 2023 23:56:33 +0200
Subject: [PATCH 011/595] Mijia LYWSD02: Add low battery notification

---
 .../service/devices/mijia_lywsd02/MijiaLywsd02Support.java      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/mijia_lywsd02/MijiaLywsd02Support.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/mijia_lywsd02/MijiaLywsd02Support.java
index d4709ba2a..01a6ee7de 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/mijia_lywsd02/MijiaLywsd02Support.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/mijia_lywsd02/MijiaLywsd02Support.java
@@ -38,6 +38,7 @@ import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventBatteryInf
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventVersionInfo;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.model.Alarm;
+import nodomain.freeyourgadget.gadgetbridge.model.BatteryState;
 import nodomain.freeyourgadget.gadgetbridge.model.CalendarEventSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.CallSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.CannedMessagesSpec;
@@ -131,6 +132,7 @@ public class MijiaLywsd02Support extends AbstractBTLEDeviceSupport {
     private void handleBatteryInfo(byte[] value, int status) {
         if (status == BluetoothGatt.GATT_SUCCESS) {
             batteryCmd.level = ((short) value[0]);
+            batteryCmd.state = (batteryCmd.level > 20) ? BatteryState.BATTERY_NORMAL : BatteryState.BATTERY_LOW;
             handleGBDeviceEvent(batteryCmd);
         }
     }

From 5b2eb62a72942fd64a5fc6d07ecc23dba7d7b167 Mon Sep 17 00:00:00 2001
From: InternalErrorX <internalerrorx@noreply.codeberg.org>
Date: Sun, 5 Nov 2023 00:53:26 +0000
Subject: [PATCH 012/595] Update README.md

Fix typo
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 65ec748cd..8fbef8cd7 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ vendor's servers.
 
 ## Code Licenses
 
-* Gadgetbrige is licensed under the AGPLv3
+* Gadgetbridge is licensed under the AGPLv3
 * Files in app/src/main/java/net/osmand/ and app/src/main/aidl/net/osmand/ are licensed under the GPLv3 by OsmAnd BV
 
 

From 176e81f1c078c839bad4b473fb434d2f18f96bd2 Mon Sep 17 00:00:00 2001
From: Davis Mosenkovs <davikovs@gmail.com>
Date: Fri, 10 Nov 2023 01:14:38 +0200
Subject: [PATCH 013/595] Display alias in low battery notification

---
 .../gadgetbridge/service/AbstractDeviceSupport.java       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java
index e966254ed..244b40949 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java
@@ -487,9 +487,9 @@ public abstract class AbstractDeviceSupport implements DeviceSupport {
         if (deviceEvent.level == GBDevice.BATTERY_UNKNOWN) {
             // no level available, just "high" or "low"
             if (BatteryState.BATTERY_LOW.equals(deviceEvent.state)) {
-                GB.updateBatteryNotification(context.getString(R.string.notif_battery_low, gbDevice.getName()),
+                GB.updateBatteryNotification(context.getString(R.string.notif_battery_low, gbDevice.getAliasOrName()),
                         deviceEvent.extendedInfoAvailable() ?
-                                context.getString(R.string.notif_battery_low_extended, gbDevice.getName(),
+                                context.getString(R.string.notif_battery_low_extended, gbDevice.getAliasOrName(),
                                         context.getString(R.string.notif_battery_low_bigtext_last_charge_time, DateFormat.getDateTimeInstance().format(deviceEvent.lastChargeTime.getTime())) +
                                         context.getString(R.string.notif_battery_low_bigtext_number_of_charges, String.valueOf(deviceEvent.numCharges)))
                                 : ""
@@ -505,9 +505,9 @@ public abstract class AbstractDeviceSupport implements DeviceSupport {
                     (BatteryState.BATTERY_LOW.equals(deviceEvent.state) ||
                             BatteryState.BATTERY_NORMAL.equals(deviceEvent.state))
                     ) {
-                GB.updateBatteryNotification(context.getString(R.string.notif_battery_low_percent, gbDevice.getName(), String.valueOf(deviceEvent.level)),
+                GB.updateBatteryNotification(context.getString(R.string.notif_battery_low_percent, gbDevice.getAliasOrName(), String.valueOf(deviceEvent.level)),
                         deviceEvent.extendedInfoAvailable() ?
-                                context.getString(R.string.notif_battery_low_percent, gbDevice.getName(), String.valueOf(deviceEvent.level)) + "\n" +
+                                context.getString(R.string.notif_battery_low_percent, gbDevice.getAliasOrName(), String.valueOf(deviceEvent.level)) + "\n" +
                                         context.getString(R.string.notif_battery_low_bigtext_last_charge_time, DateFormat.getDateTimeInstance().format(deviceEvent.lastChargeTime.getTime())) +
                                         context.getString(R.string.notif_battery_low_bigtext_number_of_charges, String.valueOf(deviceEvent.numCharges))
                                 : ""

From e9e6c7fb50867a50e13f79b2441341a429ef8149 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B0=91=E4=B8=BE?= <oshirisu.red@gmail.com>
Date: Mon, 30 Oct 2023 00:43:00 +0000
Subject: [PATCH 014/595] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (2323 of 2323 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/zh_Hans/
---
 app/src/main/res/values-zh-rCN/strings.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 880bdb1e2..36fc2afdf 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -2530,4 +2530,7 @@
     <string name="busy_task_fetch_statistics">正在获取统计数据</string>
     <string name="pref_call_rejection_method_summary">拒接手表来电时采取什么操作</string>
     <string name="busy_task_fetch_temperature">正在获取温度数据</string>
+    <string name="devicetype_amazfit_active_edge">跃我活动边界</string>
+    <string name="charts_legend_spo2_average">血氧平均值</string>
+    <string name="devicetype_amazfit_active">跃我活动</string>
 </resources>
\ No newline at end of file

From b3a5cd6edadf0ba172af7b44aef13259612c3631 Mon Sep 17 00:00:00 2001
From: Manuel-Senpai <senpai99@hotmail.com>
Date: Tue, 31 Oct 2023 17:03:02 +0000
Subject: [PATCH 015/595] Translated using Weblate (Spanish)

Currently translated at 100.0% (2323 of 2323 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/es/
---
 app/src/main/res/values-es/strings.xml | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 94fb52682..0d5add5cc 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1042,7 +1042,7 @@
     <string name="calories_unit">kcal</string>
     <string name="laps_unit">vueltas</string>
     <string name="swim_style">estilo de natación</string>
-    <string name="swolfIndex">índice swolf</string>
+    <string name="swolfIndex">SWOLF</string>
     <string name="swolf_index">índice swolf</string>
     <string name="seconds">seg</string>
     <string name="strokes_unit">p</string>
@@ -1053,7 +1053,7 @@
     <string name="cm">cm</string>
     <string name="meters">m</string>
     <string name="laps">Vueltas</string>
-    <string name="swimStyle">estilo de natación</string>
+    <string name="swimStyle">Estilo de natación</string>
     <string name="maxPace">Ritmo más rápido</string>
     <string name="minPace">Ritmo más lento</string>
     <string name="maxSpeed">Máximo</string>
@@ -2519,4 +2519,17 @@
     <string name="devicetype_femometer_vinca2">Femometer Vinca II</string>
     <string name="busy_task_fetch_statistics">Obtener las estadísticas</string>
     <string name="busy_task_fetch_temperature">Obtener los datos de la temperatura</string>
+    <string name="call_rejection_method_ignore">Ignorar (silencio)</string>
+    <string name="avgStrokeRate">Tasa media de carrera</string>
+    <string name="zepp_os_watchface_city_of_speed">Velocidad en ciudad</string>
+    <string name="call_rejection_method_reject">Rechazar</string>
+    <string name="pref_call_rejection_method_title">Método de rechazo de llamadas</string>
+    <string name="fossil_hr_nav_app_not_installed_notify_text">Se ha iniciado la navegación pero la aplicación de navegación no está instalada en el reloj. Por favor, instálela desde App Manager.</string>
+    <string name="yard">yarda</string>
+    <string name="strokes_minute">serie/min</string>
+    <string name="pref_call_rejection_method_summary">Qué acción se realiza cuando se rechaza una llamada entrante desde el reloj</string>
+    <string name="maxStrokeRate">Frecuencia máxima de carrera</string>
+    <string name="laneLength">Longitud de la pista</string>
+    <string name="strokes">Total de carreras</string>
+    <string name="fossil_hr_nav_app_not_installed_notify_title">La aplicación de navegación no está instalada en el reloj</string>
 </resources>
\ No newline at end of file

From 2c8af993130237317a0ed3f810a3d837896ee7e0 Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Tue, 31 Oct 2023 13:59:44 +0000
Subject: [PATCH 016/595] Translated using Weblate (Spanish)

Currently translated at 100.0% (2323 of 2323 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/es/
---
 app/src/main/res/values-es/strings.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 0d5add5cc..ae666d130 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -2532,4 +2532,7 @@
     <string name="laneLength">Longitud de la pista</string>
     <string name="strokes">Total de carreras</string>
     <string name="fossil_hr_nav_app_not_installed_notify_title">La aplicación de navegación no está instalada en el reloj</string>
+    <string name="devicetype_amazfit_active_edge">Amazfit Active Edge</string>
+    <string name="charts_legend_spo2_average">Promedio de oxígeno en sangre</string>
+    <string name="devicetype_amazfit_active">Amazfit Active</string>
 </resources>
\ No newline at end of file

From ff11f8bf5f00171f38b8bd13c273e585ef902bf2 Mon Sep 17 00:00:00 2001
From: arjan-s <a_gitlab@anymore.nl>
Date: Tue, 31 Oct 2023 08:44:46 +0000
Subject: [PATCH 017/595] Translated using Weblate (Dutch)

Currently translated at 100.0% (2323 of 2323 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/nl/
---
 app/src/main/res/values-nl/strings.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 4fcf9544d..d00f3f355 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -2530,4 +2530,7 @@
     <string name="menuitem_thermometer">Thermometer</string>
     <string name="devicetype_femometer_vinca2">Femometer Vinca II</string>
     <string name="fossil_hr_nav_app_not_installed_notify_title">Navigatie-app niet geïnstalleerd op horloge</string>
+    <string name="devicetype_amazfit_active_edge">Amazfit Active Edge</string>
+    <string name="charts_legend_spo2_average">Zuurstofsaturatie</string>
+    <string name="devicetype_amazfit_active">Amazfit Active</string>
 </resources>
\ No newline at end of file

From 3e26390a9cc43b70d421ad1c07fa353b5574417e Mon Sep 17 00:00:00 2001
From: Ihor Hordiichuk <igor_ck@outlook.com>
Date: Wed, 1 Nov 2023 17:34:29 +0000
Subject: [PATCH 018/595] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (2323 of 2323 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/uk/
---
 app/src/main/res/values-uk/strings.xml | 40 +++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 130456033..33f968611 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -900,7 +900,7 @@
     <string name="devicetype_sg2">Lemfo SG2</string>
     <string name="devicetype_amazfit_trex">Amazfit T-Rex</string>
     <string name="devicetype_miband5">Mi Band 5</string>
-    <string name="swolfIndex">swolf індекс</string>
+    <string name="swolfIndex">SWOLF</string>
     <string name="swimStyle">Стиль плавання</string>
     <string name="pref_title_weather_summary">Застосовується для постачальника погоди LineageOS, інші версії Android мають використовувати застосунки як-от \"Weather notification\". Шукайте більше відомостей у вікі Gadgetbridge.</string>
     <string name="prefs_events_forwarding_summary">Використовувати події пристрою для запуску дій і трансляцій Android</string>
@@ -2503,4 +2503,42 @@
     <string name="common_symbols">Часті символи</string>
     <string name="pref_title_notifications_ignore_work_profile">Ігнорувати сповіщення робочого профілю</string>
     <string name="pref_summary_notifications_ignore_work_profile">Не надсилати сповіщення із застосунків з робочого профілю на годинник</string>
+    <string name="zepp_os_watchface_pure_white">Чистий білий</string>
+    <string name="call_rejection_method_ignore">Ігнорувати (тиша)</string>
+    <string name="avgStrokeRate">Середня частота махів</string>
+    <string name="zepp_os_watchface_the_ultima">Рішучість</string>
+    <string name="zepp_os_watchface_city_of_speed">Місто швидкості</string>
+    <string name="menuitem_headphone">Навушники</string>
+    <string name="femometer_measurement_mode_normal">Звичайний (60 -90с)</string>
+    <string name="call_rejection_method_reject">Відхилити</string>
+    <string name="zepp_os_watchface_free_combination">Вільне поєднання</string>
+    <string name="menuitem_body_composition">Склад тіла</string>
+    <string name="menuitem_zepp_pay">Zepp Pay</string>
+    <string name="pref_call_rejection_method_title">Спосіб відхилення виклику</string>
+    <string name="busy_task_fetch_statistics">Отримання статистики</string>
+    <string name="femometer_measurement_mode_quick">Швидкий (30с)</string>
+    <string name="zepp_os_watchface_starry_sky">Зоряне небо</string>
+    <string name="devicetype_amazfit_balance">Amazfit Balance</string>
+    <string name="fossil_hr_nav_app_not_installed_notify_text">Навігацію запущено, але застосунок навігації не встановлено на годиннику. Установіть його з Менеджера застосунків.</string>
+    <string name="yard">ярди</string>
+    <string name="strokes_minute">мах/хв</string>
+    <string name="femometer_measurement_mode_title">Режим вимірювання</string>
+    <string name="pref_call_rejection_method_summary">Яка дія виконується, коли вхідний виклик відхиляється з годинника</string>
+    <string name="devicetype_amazfit_active_edge">Amazfit Active Edge</string>
+    <string name="busy_task_fetch_temperature">Отримання даних про температуру</string>
+    <string name="femometer_measurement_mode_precise">Точний (3 хв)</string>
+    <string name="zepp_os_watchface_vast_sky">Безкрає небо</string>
+    <string name="menuitem_workout_shortcuts">Ярлики тренувань</string>
+    <string name="maxStrokeRate">Максимальна частота махів</string>
+    <string name="zepp_os_watchface_lightning_flash">Спалах блискавки</string>
+    <string name="laneLength">Довжина доріжки</string>
+    <string name="charts_legend_spo2_average">Середній рівень кисню в крові</string>
+    <string name="strokes">Усього махів</string>
+    <string name="menuitem_apps_shortcuts">Ярлики застосунків</string>
+    <string name="zepp_os_watchface_guider">Поводир</string>
+    <string name="menuitem_readiness">Готовність</string>
+    <string name="devicetype_amazfit_active">Amazfit Active</string>
+    <string name="menuitem_thermometer">Термометр</string>
+    <string name="devicetype_femometer_vinca2">Femometer Vinca II</string>
+    <string name="fossil_hr_nav_app_not_installed_notify_title">На годиннику не встановлено навігаційний застосунок</string>
 </resources>
\ No newline at end of file

From d37df89572de68089e09973b1a1010960e3dc604 Mon Sep 17 00:00:00 2001
From: Rex_sa <rex.sa@pm.me>
Date: Wed, 1 Nov 2023 03:04:52 +0000
Subject: [PATCH 019/595] Translated using Weblate (Arabic)

Currently translated at 100.0% (2323 of 2323 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ar/
---
 app/src/main/res/values-ar/strings.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index e823d41ac..7539da684 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -2515,4 +2515,7 @@
     <string name="call_rejection_method_reject">رفض</string>
     <string name="pref_call_rejection_method_title">طريقة رفض المكالمات</string>
     <string name="pref_call_rejection_method_summary">ما هو الإجراء الذي يتم اتخاذه عند رفض مكالمة واردة من الساعة</string>
+    <string name="devicetype_amazfit_active_edge">Amazfit Active Edge</string>
+    <string name="charts_legend_spo2_average">متوسط أكسجين الدم</string>
+    <string name="devicetype_amazfit_active">Amazfit Active</string>
 </resources>
\ No newline at end of file

From 6e49bde33919c630d22539b067a75aa9a5b4c572 Mon Sep 17 00:00:00 2001
From: Xtremo3 <a.lewicki95@gmail.com>
Date: Wed, 8 Nov 2023 19:28:41 +0000
Subject: [PATCH 020/595] Translated using Weblate (Polish)

Currently translated at 100.0% (2323 of 2323 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/pl/
---
 app/src/main/res/values-pl/strings.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index a630980b4..821e8fac6 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -2539,4 +2539,7 @@
     <string name="menuitem_thermometer">Termometr</string>
     <string name="devicetype_femometer_vinca2">Femometer Vinca II</string>
     <string name="fossil_hr_nav_app_not_installed_notify_title">Aplikacja do nawigacji nie jest zainstalowana na zegarku</string>
+    <string name="devicetype_amazfit_active_edge">Amazfit Active Edge</string>
+    <string name="charts_legend_spo2_average">Średnia zawartość tlenu we krwi</string>
+    <string name="devicetype_amazfit_active">Amazfit Active</string>
 </resources>
\ No newline at end of file

From af724dbbb4d259dd2c77f987fea23dfd96c10341 Mon Sep 17 00:00:00 2001
From: 0que <0que@users.noreply.hosted.weblate.org>
Date: Thu, 9 Nov 2023 14:10:28 +0000
Subject: [PATCH 021/595] Translated using Weblate (Russian)

Currently translated at 99.4% (2311 of 2323 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ru/
---
 app/src/main/res/values-ru/strings.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 374d3b065..32e850233 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -2523,4 +2523,7 @@
     <string name="pref_call_rejection_method_summary">Какое действие необходимо совершить при отклонении вызова с часов</string>
     <string name="busy_task_fetch_temperature">Получение температуры</string>
     <string name="laneLength">Длина полосы</string>
+    <string name="devicetype_amazfit_active_edge">Amazfit Active Edge</string>
+    <string name="charts_legend_spo2_average">Средний уровень кислорода в крови</string>
+    <string name="devicetype_amazfit_active">Amazfit Active</string>
 </resources>
\ No newline at end of file

From 5859bda7398b3b1f1c26e3ff660c868bc78459f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vinc=C3=A8n=20PUJOL?= <vincen@vincen.org>
Date: Sun, 12 Nov 2023 11:53:38 +0000
Subject: [PATCH 022/595] Translated using Weblate (French)

Currently translated at 100.0% (2323 of 2323 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/fr/
---
 app/src/main/res/values-fr/strings.xml | 40 +++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 8810a5221..b892ce970 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -968,7 +968,7 @@ Temps de sommeil préféré en heures</string>
     <string name="flatSeconds">Plat</string>
     <string name="ascentSeconds">Ascendant</string>
     <string name="swimStyle">Type de nage</string>
-    <string name="swolfIndex">index swolf</string>
+    <string name="swolfIndex">SWOLF</string>
     <string name="averageLapPace">Moyenne de pause</string>
     <string name="averageStrokesPerSecond">Foulées moyennes</string>
     <string name="averageStrokeDistance">Distance moyenne de foulée</string>
@@ -2499,4 +2499,42 @@ Temps de sommeil préféré en heures</string>
     <string name="common_symbols">Symboles communs</string>
     <string name="pref_title_notifications_ignore_work_profile">Ignorer les notifications en profil travail</string>
     <string name="pref_summary_notifications_ignore_work_profile">Ne pas envoyer les notifications des apps dans le profil travail à la montre</string>
+    <string name="zepp_os_watchface_pure_white">Blanc pur</string>
+    <string name="call_rejection_method_ignore">Ignorer (silence)</string>
+    <string name="avgStrokeRate">Rythme moyen de course</string>
+    <string name="zepp_os_watchface_the_ultima">L\'ultima</string>
+    <string name="zepp_os_watchface_city_of_speed">Vitesse urbaine</string>
+    <string name="menuitem_headphone">Écouteur</string>
+    <string name="femometer_measurement_mode_normal">Mode normal (60s - 90s)</string>
+    <string name="call_rejection_method_reject">Rejet</string>
+    <string name="zepp_os_watchface_free_combination">Combinaison libre</string>
+    <string name="menuitem_body_composition">Composition corporelle</string>
+    <string name="menuitem_zepp_pay">Zepp Pay</string>
+    <string name="pref_call_rejection_method_title">Méthode de rejet d\'appel</string>
+    <string name="busy_task_fetch_statistics">Récupération des statistiques</string>
+    <string name="femometer_measurement_mode_quick">Mode Rapide (30s)</string>
+    <string name="zepp_os_watchface_starry_sky">Ciel étoilé</string>
+    <string name="devicetype_amazfit_balance">Balance Amazfit</string>
+    <string name="fossil_hr_nav_app_not_installed_notify_text">La navigation a démarrée mais pas d\'app de navigation installée dans la montre. Merci d\'en installer une depuis le Gestionnaire d\'App.</string>
+    <string name="yard">yard</string>
+    <string name="strokes_minute">str/min</string>
+    <string name="femometer_measurement_mode_title">Méthode de mesure</string>
+    <string name="pref_call_rejection_method_summary">Quelle action à faire quand un appel entrant est rejeté depuis la montre</string>
+    <string name="devicetype_amazfit_active_edge">Amazfit Active Edge</string>
+    <string name="busy_task_fetch_temperature">Récupération des données de température</string>
+    <string name="femometer_measurement_mode_precise">Mode Précis (3 min)</string>
+    <string name="zepp_os_watchface_vast_sky">Ciel clair</string>
+    <string name="menuitem_workout_shortcuts">Raccourcis Exercice</string>
+    <string name="maxStrokeRate">Vitesse maximale de course</string>
+    <string name="zepp_os_watchface_lightning_flash">Flash lumineux</string>
+    <string name="laneLength">Longueur de ligne</string>
+    <string name="charts_legend_spo2_average">Moyenne de l\'oxygène dans le sang</string>
+    <string name="strokes">Vitesse totale</string>
+    <string name="menuitem_apps_shortcuts">Raccourcis Apps</string>
+    <string name="zepp_os_watchface_guider">Guide</string>
+    <string name="menuitem_readiness">Préparation</string>
+    <string name="devicetype_amazfit_active">Amazfit Active</string>
+    <string name="menuitem_thermometer">Thermomètre</string>
+    <string name="devicetype_femometer_vinca2">Femometer Vinca II</string>
+    <string name="fossil_hr_nav_app_not_installed_notify_title">App de navigation non installée sur le téléphone</string>
 </resources>
\ No newline at end of file

From ec843b544707feeb0a794a358f30ac0452da36b6 Mon Sep 17 00:00:00 2001
From: bowornsin <bowornsin@gmail.com>
Date: Fri, 17 Nov 2023 12:05:54 +0000
Subject: [PATCH 023/595] Translated using Weblate (Thai)

Currently translated at 0.5% (12 of 2323 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/th/
---
 app/src/main/res/values-th/strings.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index a6b3daec9..495d44502 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources>
+    <string name="about_activity_title_generic">เกี่ยวกับ Gadgetbridge</string>
+</resources>
\ No newline at end of file

From 140c62ac55a910181d4d7d5a5a150f1216921349 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Mon, 20 Nov 2023 11:02:16 +0000
Subject: [PATCH 024/595] Bangle.js: Fix #2996 - force a reconnect when rx/tx
 characteristics can't be found

---
 .../service/devices/banglejs/BangleJSDeviceSupport.java    | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java
index 0d9b27326..ee816e6c3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java
@@ -131,6 +131,7 @@ import nodomain.freeyourgadget.gadgetbridge.service.btle.AbstractBTLEDeviceSuppo
 import nodomain.freeyourgadget.gadgetbridge.service.btle.BLETypeConversions;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.BtLEQueue;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetDeviceStateAction;
 import nodomain.freeyourgadget.gadgetbridge.util.EmojiConverter;
 import nodomain.freeyourgadget.gadgetbridge.util.FileUtils;
 import nodomain.freeyourgadget.gadgetbridge.util.GB;
@@ -318,6 +319,12 @@ public class BangleJSDeviceSupport extends AbstractBTLEDeviceSupport {
 
         rxCharacteristic = getCharacteristic(BangleJSConstants.UUID_CHARACTERISTIC_NORDIC_UART_RX);
         txCharacteristic = getCharacteristic(BangleJSConstants.UUID_CHARACTERISTIC_NORDIC_UART_TX);
+        if (rxCharacteristic==null || txCharacteristic==null) {
+            // https://codeberg.org/Freeyourgadget/Gadgetbridge/issues/2996 - sometimes we get
+            // initializeDevice called but no characteristics have been fetched - try and reconnect in that case
+            LOG.warn("RX/TX characteristics are null, will attempt to reconnect");
+            builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.WAITING_FOR_RECONNECT, getContext()));
+        }
         builder.setCallback(this);
         builder.notify(rxCharacteristic, true);
 

From 66b36564ab382812adbf35b5732b65dae8b8c837 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Mon, 20 Nov 2023 11:42:41 +0000
Subject: [PATCH 025/595] Bangle.js: Attempt to fix some of the warnings
 generated by Android Studio - some addec null checks, and appending using
 StringBuilder

---
 .../banglejs/BangleJSDeviceSupport.java       | 74 ++++++++++---------
 1 file changed, 38 insertions(+), 36 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java
index ee816e6c3..8c0ef65f4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java
@@ -306,7 +306,7 @@ public class BangleJSDeviceSupport extends AbstractBTLEDeviceSupport {
                 }
             }
         };
-        GBApplication.getContext().registerReceiver(globalUartReceiver, commandFilter);
+        GBApplication.getContext().registerReceiver(globalUartReceiver, commandFilter); // should be RECEIVER_EXPORTED
     }
 
     @Override
@@ -374,7 +374,7 @@ public class BangleJSDeviceSupport extends AbstractBTLEDeviceSupport {
         if (v instanceof String) {
             /* Convert a string, escaping chars we can't send over out UART connection */
             String s = (String)v;
-            String json = "\"";
+            StringBuilder json = new StringBuilder("\"");
             //String rawString = "";
             for (int i=0;i<s.length();i++) {
                 int ch = (int)s.charAt(i); // 0..255
@@ -383,21 +383,21 @@ public class BangleJSDeviceSupport extends AbstractBTLEDeviceSupport {
                 if (ch<8) {
                     // if the next character is a digit, it'd be interpreted
                     // as a 2 digit octal character, so we can't use `\0` to escape it
-                    if (nextCh>='0' && nextCh<='7') json += "\\x0" + ch;
-                    else json += "\\" + ch;
-                } else if (ch==8) json += "\\b";
-                else if (ch==9) json += "\\t";
-                else if (ch==10) json += "\\n";
-                else if (ch==11) json += "\\v";
-                else if (ch==12) json += "\\f";
-                else if (ch==34) json += "\\\""; // quote
-                else if (ch==92) json += "\\\\"; // slash
+                    if (nextCh>='0' && nextCh<='7') json.append("\\x0").append(ch);
+                    else json.append("\\").append(ch);
+                } else if (ch==8) json.append("\\b");
+                else if (ch==9) json.append("\\t");
+                else if (ch==10) json.append("\\n");
+                else if (ch==11) json.append("\\v");
+                else if (ch==12) json.append("\\f");
+                else if (ch==34) json.append("\\\""); // quote
+                else if (ch==92) json.append("\\\\"); // slash
                 else if (ch<32 || ch==127 || ch==173 ||
                          ((ch>=0xC2) && (ch<=0xF4))) // unicode start char range
-                    json += "\\x"+Integer.toHexString((ch&255)|256).substring(1);
+                    json.append("\\x").append(Integer.toHexString((ch & 255) | 256).substring(1));
                 else if (ch>255)
-                    json += "\\u"+Integer.toHexString((ch&65535)|65536).substring(1);
-                else json += s.charAt(i);
+                    json.append("\\u").append(Integer.toHexString((ch & 65535) | 65536).substring(1));
+                else json.append(s.charAt(i));
             }
             // if it was less characters to send base64, do that!
             if (json.length() > 5+(s.length()*4/3)) {
@@ -406,24 +406,24 @@ public class BangleJSDeviceSupport extends AbstractBTLEDeviceSupport {
             }
             // for debugging...
             //addReceiveHistory("\n---------------------\n"+rawString+"\n---------------------\n");
-            return json + "\"";
+            return json.append("\"").toString();
         } else if (v instanceof JSONArray) {
             JSONArray a = (JSONArray)v;
-            String json = "[";
+            StringBuilder json = new StringBuilder("[");
             for (int i=0;i<a.length();i++) {
-                if (i>0) json += ",";
+                if (i>0) json.append(",");
                 Object o = null;
                 try {
                     o = a.get(i);
                 } catch (JSONException e) {
                     LOG.warn("jsonToString array error: " + e.getLocalizedMessage());
                 }
-                json += jsonToStringInternal(o);
+                json.append(jsonToStringInternal(o));
             }
-            return json+"]";
+            return json.append("]").toString();
         } else if (v instanceof JSONObject) {
             JSONObject obj = (JSONObject)v;
-            String json = "{";
+            StringBuilder json = new StringBuilder("{");
             Iterator<String> iter = obj.keys();
             while (iter.hasNext()) {
                 String key = iter.next();
@@ -433,10 +433,10 @@ public class BangleJSDeviceSupport extends AbstractBTLEDeviceSupport {
                 } catch (JSONException e) {
                     LOG.warn("jsonToString object error: " + e.getLocalizedMessage());
                 }
-                json += "\""+key+"\":"+jsonToStringInternal(o);
-                if (iter.hasNext()) json+=",";
+                json.append("\"").append(key).append("\":").append(jsonToStringInternal(o));
+                if (iter.hasNext()) json.append(",");
             }
-            return json+"}";
+            return json.append("}").toString();
         } else if (v==null) {
             // else int/double/null
             return "null";
@@ -652,7 +652,7 @@ public class BangleJSDeviceSupport extends AbstractBTLEDeviceSupport {
     /**
      * Handle "act" packet, used to send activity reports
      */
-    private void handleActivity(JSONObject json) throws JSONException {
+    private void handleActivity(JSONObject json) {
         BangleJSActivitySample sample = new BangleJSActivitySample();
         int timestamp = (int) (json.optLong("ts", System.currentTimeMillis()) / 1000);
         int hrm = json.optInt("hrm", 0);
@@ -1146,14 +1146,14 @@ public class BangleJSDeviceSupport extends AbstractBTLEDeviceSupport {
         }
         if (hasCJK) {
             // split every 2 chars
-            String result = "";
+            StringBuilder result = new StringBuilder();
             for (int i=0;i<word.length();i+=2) {
                 int len = 2;
                 if (i+len > word.length())
                     len = word.length()-i;
-                result += renderUnicodeWordPartAsImage(word.substring(i, i+len));
+                result.append(renderUnicodeWordPartAsImage(word.substring(i, i + len)));
             }
-            return result;
+            return result.toString();
         }
         // else just render the word as-is
         return renderUnicodeWordPartAsImage(word);
@@ -1170,7 +1170,8 @@ public class BangleJSDeviceSupport extends AbstractBTLEDeviceSupport {
         if (!devicePrefs.getBoolean(PREF_BANGLEJS_TEXT_BITMAP, false))
             return EmojiConverter.convertUnicodeEmojiToAscii(txt, GBApplication.getContext());
          // Otherwise split up and check each word
-        String word = "", result = "";
+        String word = "";
+        StringBuilder result = new StringBuilder();
         boolean needsTranslate = false;
         for (int i=0;i<txt.length();i++) {
             char ch = txt.charAt(i);
@@ -1181,16 +1182,16 @@ public class BangleJSDeviceSupport extends AbstractBTLEDeviceSupport {
             else if (ch =='。') ch='.';
             else if (ch =='【') ch='[';
             else if (ch =='】') ch=']';
-            else if (ch=='‘' || ch=='’' || ch =='‚' || ch=='‛' || ch=='′' || ch=='ʹ') ch='\'';
+            else if (ch=='‘' || ch=='’' || ch=='‛' || ch=='′' || ch=='ʹ') ch='\'';
             else if (ch=='“' || ch=='”' || ch =='„' || ch=='‟' || ch=='″') ch='"';
             // chars which break words up
             if (" -_/:.,?!'\"&*()[]".indexOf(ch)>=0) {
                 // word split
                 if (needsTranslate) { // convert word
                     LOG.info("renderUnicodeAsImage converting " + word);
-                    result += renderUnicodeWordAsImage(word)+ch;
+                    result.append(renderUnicodeWordAsImage(word)).append(ch);
                 } else { // or just copy across
-                    result += word+ch;
+                    result.append(word).append(ch);
                 }
                 word = "";
                 needsTranslate = false;
@@ -1202,11 +1203,11 @@ public class BangleJSDeviceSupport extends AbstractBTLEDeviceSupport {
         }
         if (needsTranslate) { // convert word
             LOG.info("renderUnicodeAsImage converting " + word);
-            result += renderUnicodeWordAsImage(word);
+            result.append(renderUnicodeWordAsImage(word));
         } else { // or just copy across
-            result += word;
+            result.append(word);
         }
-        return result;
+        return result.toString();
     }
 
     /// Crop a text string to ensure it's not longer than requested
@@ -1492,7 +1493,8 @@ public class BangleJSDeviceSupport extends AbstractBTLEDeviceSupport {
                 } else {
                     o.put("value", card.getCardId());
                 }
-                o.put("type", card.getBarcodeFormat().toString());
+                if (card.getBarcodeFormat() != null)
+                    o.put("type", card.getBarcodeFormat().toString());
                 if (card.getExpiry() != null)
                     o.put("expiration", card.getExpiry().getTime()/1000);
                 o.put("color", card.getColor());
@@ -1505,7 +1507,7 @@ public class BangleJSDeviceSupport extends AbstractBTLEDeviceSupport {
                     o.put("balance", renderUnicodeAsImage(cropToLength(card.getBalance() +
                                     " " + balanceType, 20)));
                 }
-                if (card.getNote() != "")
+                if (card.getNote() != null)
                     o.put("note", renderUnicodeAsImage(cropToLength(card.getNote(),200)));
                 a.put(o);
             }

From 88d553771d4347ffed20125303625c9710130a47 Mon Sep 17 00:00:00 2001
From: Davis Mosenkovs <davikovs@gmail.com>
Date: Mon, 2 Oct 2023 01:04:43 +0300
Subject: [PATCH 026/595] PineTime: Honor Sync time setting on connect

---
 .../service/devices/pinetime/PineTimeJFSupport.java           | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pinetime/PineTimeJFSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pinetime/PineTimeJFSupport.java
index f76c5cfb0..b683e6114 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pinetime/PineTimeJFSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pinetime/PineTimeJFSupport.java
@@ -473,7 +473,9 @@ public class PineTimeJFSupport extends AbstractBTLEDeviceSupport implements DfuL
     protected TransactionBuilder initializeDevice(TransactionBuilder builder) {
         builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.INITIALIZING, getContext()));
         requestDeviceInfo(builder);
-        onSetTime();
+        if (GBApplication.getPrefs().getBoolean("datetime_synconconnect", true)) {
+            onSetTime();
+        }
         setWorldClocks();
         builder.notify(getCharacteristic(PineTimeJFConstants.UUID_CHARACTERISTICS_MUSIC_EVENT), true);
         BluetoothGattCharacteristic alertNotificationEventCharacteristic = getCharacteristic(PineTimeJFConstants.UUID_CHARACTERISTIC_ALERT_NOTIFICATION_EVENT);

From 2ef44e766e2234d461855dfc90330fb19174c646 Mon Sep 17 00:00:00 2001
From: Davis Mosenkovs <davikovs@gmail.com>
Date: Mon, 2 Oct 2023 21:48:46 +0300
Subject: [PATCH 027/595] PineTime: Improve notification handling

* If setting enabled, add source application (or SMS)
* Fallback to using notification subject if body is unavailable
* Trim/cut sender or title at 25+ chars if necessary
* Better support for notifications without body or subject
---
 .../DeviceSettingsPreferenceConst.java        |  2 ++
 .../DeviceSpecificSettingsFragment.java       |  2 ++
 .../pinetime/PineTimeJFCoordinator.java       |  3 +-
 .../devices/pinetime/PineTimeJFSupport.java   | 34 +++++++++++++++----
 app/src/main/res/values/strings.xml           |  3 ++
 ...esettings_prefix_notification_with_app.xml |  9 +++++
 6 files changed, 46 insertions(+), 7 deletions(-)
 create mode 100644 app/src/main/res/xml/devicesettings_prefix_notification_with_app.xml

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
index 4d5b514f5..a13986ae8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
@@ -364,4 +364,6 @@ public class DeviceSettingsPreferenceConst {
 
     public static final String PREF_TEMPERATURE_SCALE_CF = "temperature_scale_cf";
     public static final String PREF_FEMOMETER_MEASUREMENT_MODE = "femometer_measurement_mode";
+
+    public static final String PREF_PREFIX_NOTIFICATION_WITH_APP = "pref_prefix_notification_with_app";
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
index c9e8ef028..f986a930a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
@@ -549,6 +549,8 @@ public class DeviceSpecificSettingsFragment extends AbstractPreferenceFragment i
 
         addPreferenceHandlerFor(PREF_TEMPERATURE_SCALE_CF);
 
+        addPreferenceHandlerFor(PREF_PREFIX_NOTIFICATION_WITH_APP);
+
         addPreferenceHandlerFor("lock");
 
         String sleepTimeState = prefs.getString(PREF_SLEEP_TIME, PREF_DO_NOT_DISTURB_OFF);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/PineTimeJFCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/PineTimeJFCoordinator.java
index 716795d51..5574bf5ca 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/PineTimeJFCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/PineTimeJFCoordinator.java
@@ -166,7 +166,8 @@ public class PineTimeJFCoordinator extends AbstractBLEDeviceCoordinator {
     public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
         return new int[]{
                 R.xml.devicesettings_transliteration,
-                R.xml.devicesettings_world_clocks
+                R.xml.devicesettings_world_clocks,
+                R.xml.devicesettings_prefix_notification_with_app
         };
     }
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pinetime/PineTimeJFSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pinetime/PineTimeJFSupport.java
index b683e6114..e7ed1f60b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pinetime/PineTimeJFSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pinetime/PineTimeJFSupport.java
@@ -91,6 +91,7 @@ import nodomain.freeyourgadget.gadgetbridge.model.MusicSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.MusicStateSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.NavigationInfoSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.NotificationSpec;
+import nodomain.freeyourgadget.gadgetbridge.model.NotificationType;
 import nodomain.freeyourgadget.gadgetbridge.model.WeatherSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.WorldClock;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.AbstractBTLEDeviceSupport;
@@ -118,6 +119,7 @@ public class PineTimeJFSupport extends AbstractBTLEDeviceSupport implements DfuL
     private final BatteryInfoProfile<PineTimeJFSupport> batteryInfoProfile;
 
     private final int MaxNotificationLength = 100;
+    private final int CutNotificationTitleMinAt = 25;
     private int firmwareVersionMajor = 0;
     private int firmwareVersionMinor = 0;
     private int firmwareVersionPatch = 0;
@@ -306,15 +308,35 @@ public class PineTimeJFSupport extends AbstractBTLEDeviceSupport implements DfuL
         TransactionBuilder builder = new TransactionBuilder("notification");
 
         String message;
-        if (notificationSpec.body == null) {
-            notificationSpec.body = "";
+        String source = null;
+        String bodyOrSubject = nodomain.freeyourgadget.gadgetbridge.util.StringUtils.getFirstOf(notificationSpec.body, notificationSpec.subject);
+        String senderOrTitle = nodomain.freeyourgadget.gadgetbridge.util.StringUtils.getFirstOf(notificationSpec.sender, notificationSpec.title);
+        if (!nodomain.freeyourgadget.gadgetbridge.util.StringUtils.isNullOrEmpty(notificationSpec.sourceName)) {
+            source = notificationSpec.sourceName;
+        } else if (notificationSpec.type == NotificationType.GENERIC_SMS) {
+            source = getContext().getString(R.string.pref_title_notifications_sms);
         }
 
-        if (isFirmwareAtLeastVersion0_15()) {
-            String senderOrTitle = nodomain.freeyourgadget.gadgetbridge.util.StringUtils.getFirstOf(notificationSpec.sender, notificationSpec.title);
-            message = senderOrTitle + "\0" + notificationSpec.body;
+        if (bodyOrSubject.length() > 0){
+            if (isFirmwareAtLeastVersion0_15()) {
+                if (!GBApplication.getDeviceSpecificSharedPrefs(gbDevice.getAddress()).getBoolean(DeviceSettingsPreferenceConst.PREF_PREFIX_NOTIFICATION_WITH_APP, true)) {
+                    source = null;
+                }
+                int cutLength = Math.max(CutNotificationTitleMinAt, MaxNotificationLength - 3 - bodyOrSubject.length() - (source != null ? source.length() + 2 : 0));
+                if (cutLength < senderOrTitle.length() - 1) {
+                    for (; cutLength > 0 && senderOrTitle.charAt(cutLength - 1) == ' '; cutLength--);
+                    senderOrTitle = senderOrTitle.substring(0, cutLength) + ">";
+                }
+                message = nodomain.freeyourgadget.gadgetbridge.util.StringUtils.join(": ", source, senderOrTitle) + "\0" + bodyOrSubject;
+            } else {
+                message = bodyOrSubject;
+            }
         } else {
-            message = notificationSpec.body;
+            if (isFirmwareAtLeastVersion0_15()) {
+                message = (source != null ? source : "") + "\0" + senderOrTitle;
+            } else {
+                message = senderOrTitle;
+            }
         }
 
         NewAlert alert = new NewAlert(AlertCategory.CustomHuami, 1, message);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a137f4739..2d7151688 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2397,4 +2397,7 @@
     <string name="call_rejection_method_ignore">Ignore (silence)</string>
     <string name="pref_call_rejection_method_title">Call rejection method</string>
     <string name="pref_call_rejection_method_summary">Which action is taken when an incoming call is rejected from the watch</string>
+
+    <string name="pref_title_prefix_notification_with_app">App name in notification</string>
+    <string name="pref_summary_prefix_notification_with_app">Prefix notification title with name of source application</string>
 </resources>
diff --git a/app/src/main/res/xml/devicesettings_prefix_notification_with_app.xml b/app/src/main/res/xml/devicesettings_prefix_notification_with_app.xml
new file mode 100644
index 000000000..4398bb873
--- /dev/null
+++ b/app/src/main/res/xml/devicesettings_prefix_notification_with_app.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <SwitchPreferenceCompat
+        android:defaultValue="true"
+        android:icon="@drawable/ic_notifications"
+        android:key="pref_prefix_notification_with_app"
+        android:title="@string/pref_title_prefix_notification_with_app"
+        android:summary="@string/pref_summary_prefix_notification_with_app" />
+</androidx.preference.PreferenceScreen>

From 8add6c4da94e56256ed5ed1de1d3dfa4f43bfe42 Mon Sep 17 00:00:00 2001
From: Arjan Schrijver <a_gadgetbridge@anymore.nl>
Date: Thu, 2 Nov 2023 17:33:01 +0100
Subject: [PATCH 028/595] Autodetect OsmAnd package name and make it
 configurable

---
 .../externalevents/OsmandEventReceiver.java   | 76 ++++++++++++-------
 app/src/main/res/values/arrays.xml            | 13 ++++
 app/src/main/res/values/strings.xml           |  4 +-
 app/src/main/res/xml/preferences.xml          |  8 ++
 4 files changed, 73 insertions(+), 28 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/OsmandEventReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/OsmandEventReceiver.java
index dcb9ada87..5dbb2c8d4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/OsmandEventReceiver.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/OsmandEventReceiver.java
@@ -5,11 +5,11 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
+import android.content.pm.PackageManager;
 import android.os.IBinder;
 import android.os.PowerManager;
 import android.os.RemoteException;
 import android.view.KeyEvent;
-import android.widget.Toast;
 
 import net.osmand.aidlapi.IOsmAndAidlCallback;
 import net.osmand.aidlapi.IOsmAndAidlInterface;
@@ -23,19 +23,17 @@ import net.osmand.aidlapi.search.SearchResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.model.NavigationInfoSpec;
-import nodomain.freeyourgadget.gadgetbridge.util.GB;
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 
 public class OsmandEventReceiver {
     private static final Logger LOG = LoggerFactory.getLogger(OsmandEventReceiver.class);
 
-    private static final String OSMAND_PLUS_PACKAGE_NAME = "net.osmand.plus";
-    private static final String OSMAND_PACKAGE_NAME = OSMAND_PLUS_PACKAGE_NAME;
-
     private final Application app;
     private IOsmAndAidlInterface mIOsmAndAidlInterface;
 
@@ -117,14 +115,22 @@ public class OsmandEventReceiver {
 
     private boolean bindService() {
         if (mIOsmAndAidlInterface == null) {
+            List<CharSequence> installedOsmandPackages = findInstalledOsmandPackages();
+            if (installedOsmandPackages.isEmpty()) {
+                LOG.warn("OsmAnd is not installed");
+                return false;
+            }
+            Prefs prefs = GBApplication.getPrefs();
+            String packageName = prefs.getString("pref_key_osmand_packagename", "autodetect");
+            if (packageName.equals("autodetect")) packageName = installedOsmandPackages.get(0).toString();
             Intent intent = new Intent("net.osmand.aidl.OsmandAidlServiceV2");
-            intent.setPackage(OSMAND_PACKAGE_NAME);
+            intent.setPackage(packageName);
             boolean res = app.bindService(intent, mConnection, Context.BIND_AUTO_CREATE);
             if (res) {
-                LOG.info("Bound to OsmAnd service");
+                LOG.info("Bound to OsmAnd service (package "+packageName+")");
                 return true;
             } else {
-                LOG.warn("Could not bind to OsmAnd service");
+                LOG.warn("Could not bind to OsmAnd service (package "+packageName+")");
                 return false;
             }
         } else {
@@ -147,7 +153,7 @@ public class OsmandEventReceiver {
 
                 return mIOsmAndAidlInterface.registerForNavigationUpdates(params, mIOsmAndAidlCallback);
             } catch (RemoteException e) {
-                LOG.error("could not subscribe to navication updates", e);
+                LOG.error("could not subscribe to navigation updates", e);
             }
         }
         return -1L;
@@ -173,23 +179,41 @@ public class OsmandEventReceiver {
         return true;
     }
 
-        /**
-         * Method to register for Voice Router voice messages during navigation. Notifies user about voice messages.
-         *
-         * @param subscribeToUpdates (boolean) - boolean flag to subscribe or unsubscribe from messages
-         * @param callbackId         (long) - id of callback, needed to unsubscribe from messages
-         */
-        public long registerForVoiceRouterMessages(boolean subscribeToUpdates, long callbackId) {
-            ANavigationVoiceRouterMessageParams params = new ANavigationVoiceRouterMessageParams();
-            params.setCallbackId(callbackId);
-            params.setSubscribeToUpdates(subscribeToUpdates);
-            if (mIOsmAndAidlInterface != null) {
-                try {
-                    return mIOsmAndAidlInterface.registerForVoiceRouterMessages(params, mIOsmAndAidlCallback);
-                } catch (RemoteException e) {
-                    e.printStackTrace();
-                }
+    /**
+     * Method to register for Voice Router voice messages during navigation. Notifies user about voice messages.
+     *
+     * @param subscribeToUpdates (boolean) - boolean flag to subscribe or unsubscribe from messages
+     * @param callbackId         (long) - id of callback, needed to unsubscribe from messages
+     */
+    public long registerForVoiceRouterMessages(boolean subscribeToUpdates, long callbackId) {
+        ANavigationVoiceRouterMessageParams params = new ANavigationVoiceRouterMessageParams();
+        params.setCallbackId(callbackId);
+        params.setSubscribeToUpdates(subscribeToUpdates);
+        if (mIOsmAndAidlInterface != null) {
+            try {
+                return mIOsmAndAidlInterface.registerForVoiceRouterMessages(params, mIOsmAndAidlCallback);
+            } catch (RemoteException e) {
+                LOG.error("could not register for voice router messages", e);
             }
-            return -1L;
         }
+        return -1L;
+    }
+
+    public List<CharSequence> findInstalledOsmandPackages() {
+        List<CharSequence> installedPackages = new ArrayList<>();
+        for (String knownPackage : app.getBaseContext().getResources().getStringArray(R.array.osmand_package_names)) {
+            if (isPackageInstalled(knownPackage)) {
+                installedPackages.add(knownPackage);
+            }
+        }
+        return installedPackages;
+    }
+
+    private boolean isPackageInstalled(final String packageName) {
+        try {
+            return app.getBaseContext().getPackageManager().getApplicationInfo(packageName, 0).enabled;
+        } catch (PackageManager.NameNotFoundException e) {
+            return false;
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 9f0cb3fcb..f832b4e14 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -3116,6 +3116,19 @@
         <item>de.dennisguse.opentracks.nightly</item>
     </string-array>
 
+    <string-array name="osmand_package_names">
+        <item>@string/automatic</item>
+        <item>net.osmand.plus</item>
+        <item>net.osmand</item>
+        <item>net.osmand.dev</item>
+    </string-array>
+    <string-array name="osmand_package_names_values">
+        <item>autodetect</item>
+        <item>net.osmand.plus</item>
+        <item>net.osmand</item>
+        <item>net.osmand.dev</item>
+    </string-array>
+
     <string-array name="pref_transliteration_languages">
         <item>@string/arabic</item>
         <item>@string/bengali</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2d7151688..ac6b5a32e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2386,7 +2386,6 @@
     <string name="prefs_wena3_vibration_siren">Siren</string>
     <string name="prefs_wena3_vibration_short">Short</string>
     <string name="prefs_wena3_led_none">No LED</string>
-
     <string name="temperature_scale_cf">Temperature scale</string>
     <string name="temperature_scale_cf_summary">Select whether device uses Celsius or Fahrenheit scale.</string>
     <string name="temperature_scale_celsius">Celsius</string>
@@ -2397,7 +2396,8 @@
     <string name="call_rejection_method_ignore">Ignore (silence)</string>
     <string name="pref_call_rejection_method_title">Call rejection method</string>
     <string name="pref_call_rejection_method_summary">Which action is taken when an incoming call is rejected from the watch</string>
-
     <string name="pref_title_prefix_notification_with_app">App name in notification</string>
     <string name="pref_summary_prefix_notification_with_app">Prefix notification title with name of source application</string>
+    <string name="pref_title_osmand_packagename">OsmAnd package name</string>
+    <string name="pref_summary_osmand_packagename">Used for selecting the version of OsmAnd to connect to</string>
 </resources>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index c6f9a2b05..4d9be5373 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -218,6 +218,14 @@
             android:layout="@layout/preference_checkbox"
             android:title="@string/pref_title_whenscreenon"
             app:iconSpaceReserved="false" />
+        <ListPreference
+            android:defaultValue="autodetect"
+            android:entries="@array/osmand_package_names"
+            android:entryValues="@array/osmand_package_names_values"
+            android:key="pref_key_osmand_packagename"
+            android:summary="@string/pref_summary_osmand_packagename"
+            android:title="@string/pref_title_osmand_packagename"
+            app:iconSpaceReserved="false" />
     </PreferenceCategory>
     <PreferenceCategory
         android:title="@string/preferences_category_device_specific_settings"

From 70acf47a2e40789ed03c57e7b3bd84ccb5e6b4c6 Mon Sep 17 00:00:00 2001
From: Arjan Schrijver <a_gadgetbridge@anymore.nl>
Date: Tue, 14 Nov 2023 12:59:29 +0100
Subject: [PATCH 029/595] Make GMaps navigation handler follow the "navigation
 forwarding" setting

---
 .../externalevents/NotificationListener.java  |  4 +--
 .../GoogleMapsNotificationHandler.java        | 29 +++++++++++++++++++
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
index 4b8fb7c5e..db1c3cdc8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
@@ -731,8 +731,6 @@ public class NotificationListener extends NotificationListenerService {
 
         notificationStack.remove(sbn.getPackageName());
 
-        googleMapsNotificationHandler.handleRemove(sbn);
-
         if (isServiceNotRunningAndShouldIgnoreNotifications()) return;
 
         final Prefs prefs = GBApplication.getPrefs();
@@ -750,6 +748,8 @@ public class NotificationListener extends NotificationListenerService {
 
         if (shouldIgnoreSource(sbn)) return;
 
+        googleMapsNotificationHandler.handleRemove(sbn);
+
         // If media notifications do NOT ignore app list, check them after
         if (!mediaIgnoresAppList && handleMediaSessionNotification(sbn)) return;
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/notifications/GoogleMapsNotificationHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/notifications/GoogleMapsNotificationHandler.java
index 7e0e2f3c4..0417c53cb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/notifications/GoogleMapsNotificationHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/notifications/GoogleMapsNotificationHandler.java
@@ -6,6 +6,7 @@ import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.Icon;
+import android.os.PowerManager;
 import android.service.notification.StatusBarNotification;
 
 import androidx.core.app.NotificationCompat;
@@ -18,11 +19,14 @@ import java.util.List;
 
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 import nodomain.freeyourgadget.gadgetbridge.model.NavigationInfoSpec;
+import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 
 public class GoogleMapsNotificationHandler {
 
     private static final Logger LOG = LoggerFactory.getLogger(GoogleMapsNotificationHandler.class);
 
+    private boolean shouldSendNavigation = false;
+
     static class IconType {
         int[] icon;
         int iconType;
@@ -891,6 +895,8 @@ public class GoogleMapsNotificationHandler {
 
     public boolean handle(Context context, StatusBarNotification sbn) {
         if (sbn.getPackageName().equals("com.google.android.apps.maps")) {
+            checkShouldSendNavigation(context);
+            if (!shouldSendNavigation) return false;
             Notification notification = sbn.getNotification();
             if (!NotificationCompat.getLocalOnly(notification))
                 return false; // ignore non-local notifications
@@ -971,6 +977,7 @@ public class GoogleMapsNotificationHandler {
 
     public boolean handleRemove(StatusBarNotification sbn) {
         if (sbn.getPackageName().equals("com.google.android.apps.maps")) {
+            if (!shouldSendNavigation) return false;
             Notification notification = sbn.getNotification();
             if (!NotificationCompat.getLocalOnly(notification))
                 return false; // ignore non-local notifications
@@ -980,4 +987,26 @@ public class GoogleMapsNotificationHandler {
         }
         return false;
     }
+
+    private void checkShouldSendNavigation(Context context) {
+        Prefs prefs = GBApplication.getPrefs();
+
+        boolean navigationForward = prefs.getBoolean("navigation_forward", true);
+        if (!navigationForward) {
+            shouldSendNavigation = false;
+            return;
+        }
+
+        boolean navigationScreenOn = prefs.getBoolean("nagivation_screen_on", true);
+        if (!navigationScreenOn) {
+            PowerManager powermanager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
+            if (powermanager != null && powermanager.isScreenOn()) {
+                LOG.info("Not forwarding navigation instructions, screen seems to be on and settings do not allow this");
+                shouldSendNavigation = false;
+                return;
+            }
+        }
+
+        shouldSendNavigation = true;
+    }
 }

From fac566c7da73d1ff923e7edaad6690e8324e6471 Mon Sep 17 00:00:00 2001
From: Arjan Schrijver <a_gadgetbridge@anymore.nl>
Date: Sun, 19 Nov 2023 21:08:22 +0100
Subject: [PATCH 030/595] Support selecting enabled navigation apps

---
 .../externalevents/OsmandEventReceiver.java   | 11 ++--
 .../GoogleMapsNotificationHandler.java        |  3 +-
 app/src/main/res/values/strings.xml           |  4 ++
 app/src/main/res/xml/preferences.xml          | 66 ++++++++++++-------
 4 files changed, 56 insertions(+), 28 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/OsmandEventReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/OsmandEventReceiver.java
index 5dbb2c8d4..87db2ddc2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/OsmandEventReceiver.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/OsmandEventReceiver.java
@@ -160,16 +160,17 @@ public class OsmandEventReceiver {
     }
 
     private boolean shouldSendNavigation() {
-        final Prefs prefs = GBApplication.getPrefs();
+        Prefs prefs = GBApplication.getPrefs();
 
-        final boolean navigationForward = prefs.getBoolean("navigation_forward", true);
-        if (!navigationForward) {
+        boolean navigationForward = prefs.getBoolean("navigation_forward", true);
+        boolean navigationOsmAnd = prefs.getBoolean("navigation_app_osmand", true);
+        if (!navigationForward || !navigationOsmAnd) {
             return false;
         }
 
-        final boolean navigationScreenOn = prefs.getBoolean("nagivation_screen_on", true);
+        boolean navigationScreenOn = prefs.getBoolean("nagivation_screen_on", true);
         if (!navigationScreenOn) {
-            final PowerManager powermanager = (PowerManager) app.getSystemService(Context.POWER_SERVICE);
+            PowerManager powermanager = (PowerManager) app.getSystemService(Context.POWER_SERVICE);
             if (powermanager != null && powermanager.isScreenOn()) {
                 LOG.info("Not forwarding navigation instructions, screen seems to be on and settings do not allow this");
                 return false;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/notifications/GoogleMapsNotificationHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/notifications/GoogleMapsNotificationHandler.java
index 0417c53cb..74d68d36d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/notifications/GoogleMapsNotificationHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/notifications/GoogleMapsNotificationHandler.java
@@ -992,7 +992,8 @@ public class GoogleMapsNotificationHandler {
         Prefs prefs = GBApplication.getPrefs();
 
         boolean navigationForward = prefs.getBoolean("navigation_forward", true);
-        if (!navigationForward) {
+        boolean navigationGMaps = prefs.getBoolean("navigation_app_gmaps", true);
+        if (!navigationForward || !navigationGMaps) {
             shouldSendNavigation = false;
             return;
         }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ac6b5a32e..dbc2399cd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2400,4 +2400,8 @@
     <string name="pref_summary_prefix_notification_with_app">Prefix notification title with name of source application</string>
     <string name="pref_title_osmand_packagename">OsmAnd package name</string>
     <string name="pref_summary_osmand_packagename">Used for selecting the version of OsmAnd to connect to</string>
+    <string name="pref_title_navigation_prefs">Navigation preferences</string>
+    <string name="pref_title_navigation_apps">Navigation apps</string>
+    <string name="pref_navigation_app_osmand">OsmAnd(+)</string>
+    <string name="pref_navigation_app_gmaps">Google Maps</string>
 </resources>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 4d9be5373..f7525a9d3 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -204,28 +204,50 @@
     <PreferenceCategory
         android:title="@string/pref_header_navigation"
         app:iconSpaceReserved="false">
-        <SwitchPreferenceCompat
-            android:defaultValue="true"
-            android:key="navigation_forward"
-            android:layout="@layout/preference_checkbox"
-            android:summary="@string/pref_summary_navigation_forward"
-            android:title="@string/pref_title_navigation_forward"
-            app:iconSpaceReserved="false" />
-        <SwitchPreferenceCompat
-            android:defaultValue="true"
-            android:dependency="navigation_forward"
-            android:key="nagivation_screen_on"
-            android:layout="@layout/preference_checkbox"
-            android:title="@string/pref_title_whenscreenon"
-            app:iconSpaceReserved="false" />
-        <ListPreference
-            android:defaultValue="autodetect"
-            android:entries="@array/osmand_package_names"
-            android:entryValues="@array/osmand_package_names_values"
-            android:key="pref_key_osmand_packagename"
-            android:summary="@string/pref_summary_osmand_packagename"
-            android:title="@string/pref_title_osmand_packagename"
-            app:iconSpaceReserved="false" />
+        <PreferenceScreen
+            android:key="navigation_settings"
+            android:title="@string/pref_title_navigation_prefs"
+            app:iconSpaceReserved="false">
+            <SwitchPreferenceCompat
+                android:defaultValue="true"
+                android:key="navigation_forward"
+                android:layout="@layout/preference_checkbox"
+                android:summary="@string/pref_summary_navigation_forward"
+                android:title="@string/pref_title_navigation_forward"
+                app:iconSpaceReserved="false" />
+            <SwitchPreferenceCompat
+                android:defaultValue="true"
+                android:dependency="navigation_forward"
+                android:key="nagivation_screen_on"
+                android:layout="@layout/preference_checkbox"
+                android:title="@string/pref_title_whenscreenon"
+                app:iconSpaceReserved="false" />
+            <ListPreference
+                android:defaultValue="autodetect"
+                android:entries="@array/osmand_package_names"
+                android:entryValues="@array/osmand_package_names_values"
+                android:key="pref_key_osmand_packagename"
+                android:summary="@string/pref_summary_osmand_packagename"
+                android:title="@string/pref_title_osmand_packagename"
+                app:iconSpaceReserved="false" />
+            <PreferenceCategory
+                android:key="navigation_apps_selection"
+                android:title="@string/pref_title_navigation_apps"
+                app:iconSpaceReserved="false">
+                <SwitchPreferenceCompat
+                    android:defaultValue="true"
+                    android:key="navigation_app_osmand"
+                    android:layout="@layout/preference_checkbox"
+                    android:title="@string/pref_navigation_app_osmand"
+                    app:iconSpaceReserved="false" />
+                <SwitchPreferenceCompat
+                    android:defaultValue="true"
+                    android:key="navigation_app_gmaps"
+                    android:layout="@layout/preference_checkbox"
+                    android:title="@string/pref_navigation_app_gmaps"
+                    app:iconSpaceReserved="false" />
+            </PreferenceCategory>
+        </PreferenceScreen>
     </PreferenceCategory>
     <PreferenceCategory
         android:title="@string/preferences_category_device_specific_settings"

From fda3b536570feb16fb97bf4708b9104c85f5ab42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Mon, 2 Oct 2023 09:48:10 +0100
Subject: [PATCH 031/595] Mi Band 8: Initial support (WIP)

---
 app/build.gradle                              |   4 +
 .../devices/AbstractDeviceCoordinator.java    |   2 +-
 .../xiaomi/XiaomiActivitySummaryParser.java   |  28 +
 .../devices/xiaomi/XiaomiCoordinator.java     | 438 ++++++++++++
 .../devices/xiaomi/XiaomiSampleProvider.java  |  79 +++
 .../xiaomi/XiaomiSettingsCustomizer.java      |  64 ++
 .../xiaomi/miband8/MiBand8Coordinator.java    |  67 ++
 .../gadgetbridge/model/ActivityUser.java      |  10 +
 .../gadgetbridge/model/Alarm.java             |   2 +
 .../gadgetbridge/model/DeviceType.java        |   2 +
 .../service/devices/xiaomi/XiaomiCipher.java  | 307 +++++++++
 .../devices/xiaomi/XiaomiConstants.java       |  56 ++
 .../service/devices/xiaomi/XiaomiSupport.java | 565 ++++++++++++++++
 .../services/AbstractXiaomiService.java       |  56 ++
 .../xiaomi/services/XiaomiHealthService.java  | 110 +++
 .../xiaomi/services/XiaomiMusicService.java   | 158 +++++
 .../services/XiaomiNotificationService.java   |  57 ++
 .../services/XiaomiScheduleService.java       | 248 +++++++
 .../xiaomi/services/XiaomiSystemService.java  |  38 ++
 .../xiaomi/services/XiaomiWeatherService.java |  43 ++
 app/src/main/proto/xiaomi.proto               | 625 ++++++++++++++++++
 app/src/main/res/values/strings.xml           |   3 +
 22 files changed, 2961 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiActivitySummaryParser.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSampleProvider.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSettingsCustomizer.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/MiBand8Coordinator.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCipher.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiConstants.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/AbstractXiaomiService.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiMusicService.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java
 create mode 100644 app/src/main/proto/xiaomi.proto

diff --git a/app/build.gradle b/app/build.gradle
index 68ae3f83e..37842e998 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -292,6 +292,10 @@ dependencies {
     implementation 'com.google.protobuf:protobuf-javalite:3.21.7'
     implementation 'com.android.volley:volley:1.2.1'
 
+    // TODO pull just the needed classes into GB?
+    implementation 'org.bouncycastle:bcpkix-jdk15to18:1.71'
+    implementation 'org.bouncycastle:bcprov-jdk15to18:1.71'
+
 // NON-FOSS dependencies
 //    implementation('androidx.core:core-google-shortcuts:1.0.1') {
 //        exclude group:'com.google.android.gms'
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java
index 4624e0420..2a686ae67 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java
@@ -125,7 +125,7 @@ public abstract class AbstractDeviceCoordinator implements DeviceCoordinator {
     }
 
     @Override
-    public void deleteDevice(final GBDevice gbDevice) throws GBException {
+    public final void deleteDevice(final GBDevice gbDevice) throws GBException {
         LOG.info("will try to delete device: " + gbDevice.getName());
         if (gbDevice.isConnected() || gbDevice.isConnecting()) {
             GBApplication.deviceService(gbDevice).disconnect();
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiActivitySummaryParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiActivitySummaryParser.java
new file mode 100644
index 000000000..dbb782df1
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiActivitySummaryParser.java
@@ -0,0 +1,28 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi;
+
+import nodomain.freeyourgadget.gadgetbridge.entities.BaseActivitySummary;
+import nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryParser;
+
+public class XiaomiActivitySummaryParser implements ActivitySummaryParser  {
+    @Override
+    public BaseActivitySummary parseBinaryData(final BaseActivitySummary summary) {
+        // TODO parse it
+        return summary;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
new file mode 100644
index 000000000..c9ee32ab7
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
@@ -0,0 +1,438 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi;
+
+import android.app.Activity;
+import android.bluetooth.le.ScanFilter;
+import android.content.Context;
+import android.net.Uri;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.apache.commons.lang3.ArrayUtils;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.GBException;
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSpecificSettingsCustomizer;
+import nodomain.freeyourgadget.gadgetbridge.capabilities.HeartRateCapability;
+import nodomain.freeyourgadget.gadgetbridge.capabilities.password.PasswordCapabilityImpl;
+import nodomain.freeyourgadget.gadgetbridge.devices.AbstractBLEDeviceCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
+import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.devices.TimeSampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandPairingActivity;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.entities.Device;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.model.AbstractNotificationPattern;
+import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
+import nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryParser;
+import nodomain.freeyourgadget.gadgetbridge.model.HeartRateSample;
+import nodomain.freeyourgadget.gadgetbridge.model.PaiSample;
+import nodomain.freeyourgadget.gadgetbridge.model.SleepRespiratoryRateSample;
+import nodomain.freeyourgadget.gadgetbridge.model.Spo2Sample;
+import nodomain.freeyourgadget.gadgetbridge.model.StressSample;
+import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.HuamiLanguageType;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
+
+public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
+    @NonNull
+    @Override
+    public Collection<? extends ScanFilter> createBLEScanFilters() {
+        return super.createBLEScanFilters();
+    }
+
+    @Override
+    protected void deleteDevice(@NonNull final GBDevice gbDevice,
+                                @NonNull final Device device,
+                                @NonNull final DaoSession session) throws GBException {
+        // TODO, and fix on zepp
+    }
+
+    @Override
+    public SampleProvider<? extends ActivitySample> getSampleProvider(final GBDevice device, DaoSession session) {
+        return new XiaomiSampleProvider(device, session);
+    }
+
+    @Override
+    public TimeSampleProvider<? extends StressSample> getStressSampleProvider(final GBDevice device, final DaoSession session) {
+        // TODO XiaomiStressSampleProvider
+        return super.getStressSampleProvider(device, session);
+    }
+
+    @Override
+    public TimeSampleProvider<? extends Spo2Sample> getSpo2SampleProvider(final GBDevice device, final DaoSession session) {
+        // TODO XiaomiSpo2SampleProvider
+        return super.getSpo2SampleProvider(device, session);
+    }
+
+    @Override
+    public TimeSampleProvider<? extends HeartRateSample> getHeartRateMaxSampleProvider(final GBDevice device, final DaoSession session) {
+        // TODO XiaomiHeartRateMaxSampleProvider
+        return super.getHeartRateMaxSampleProvider(device, session);
+    }
+
+    @Override
+    public TimeSampleProvider<? extends HeartRateSample> getHeartRateRestingSampleProvider(final GBDevice device, final DaoSession session) {
+        // TODO XiaomiHeartRateRestingSampleProvider
+        return super.getHeartRateRestingSampleProvider(device, session);
+    }
+
+    @Override
+    public TimeSampleProvider<? extends HeartRateSample> getHeartRateManualSampleProvider(final GBDevice device, final DaoSession session) {
+        // TODO XiaomiHeartRateManualSampleProvider
+        return super.getHeartRateManualSampleProvider(device, session);
+    }
+
+    @Override
+    public TimeSampleProvider<? extends PaiSample> getPaiSampleProvider(final GBDevice device, final DaoSession session) {
+        // TODO XiaomiPaiSampleProvider
+        return super.getPaiSampleProvider(device, session);
+    }
+
+    @Override
+    public TimeSampleProvider<? extends SleepRespiratoryRateSample> getSleepRespiratoryRateSampleProvider(final GBDevice device, final DaoSession session) {
+        // TODO XiaomiSleepRespiratoryRateSampleProvider
+        return super.getSleepRespiratoryRateSampleProvider(device, session);
+    }
+
+    @Nullable
+    @Override
+    public ActivitySummaryParser getActivitySummaryParser(final GBDevice device) {
+        return new XiaomiActivitySummaryParser();
+    }
+
+    @Override
+    public boolean supportsFlashing() {
+        return true;
+    }
+
+    @Override
+    public int getAlarmSlotCount(final GBDevice device) {
+        // TODO the watch returns the slot count
+        return 10;
+    }
+
+    @Override
+    public boolean supportsSmartWakeup(final GBDevice device) {
+        return true;
+    }
+
+    @Override
+    public boolean supportsAppsManagement(final GBDevice device) {
+        // TODO maybe for watchfaces or widgets?
+        return super.supportsAppsManagement(device);
+    }
+
+    @Override
+    public int getBondingStyle() {
+        return BONDING_STYLE_REQUIRE_KEY;
+    }
+
+    @Override
+    public boolean supportsCalendarEvents() {
+        return true;
+    }
+
+    @Override
+    public boolean supportsActivityDataFetching() {
+        return true;
+    }
+
+    @Override
+    public boolean supportsActivityTracking() {
+        return true;
+    }
+
+    @Override
+    public boolean supportsActivityTracks() {
+        return true;
+    }
+
+    @Override
+    public boolean supportsStressMeasurement() {
+        return true;
+    }
+
+    @Override
+    public boolean supportsSpo2() {
+        return true;
+    }
+
+    @Override
+    public boolean supportsHeartRateStats() {
+        // TODO does it?
+        return true;
+    }
+
+    @Override
+    public boolean supportsPai() {
+        // TODO does it?
+        return true;
+    }
+
+    @Override
+    public boolean supportsSleepRespiratoryRate() {
+        // TODO does it?
+        return true;
+    }
+
+    @Override
+    public boolean supportsAlarmSnoozing() {
+        // TODO does it?
+        return false;
+    }
+
+    @Override
+    public boolean supportsAlarmDescription(final GBDevice device) {
+        // TODO does it?
+        return false;
+    }
+
+    @Override
+    public boolean supportsMusicInfo() {
+        return true;
+    }
+
+    @Override
+    public int getMaximumReminderMessageLength() {
+        // TODO does it?
+        return 0;
+    }
+
+    @Override
+    public int getReminderSlotCount(final GBDevice device) {
+        // TODO Does it?
+        return 0;
+    }
+
+    @Override
+    public int getWorldClocksSlotCount() {
+        // TODO how many?
+        return 5;
+    }
+
+    @Override
+    public int getWorldClocksLabelLength() {
+        // TODO how much?
+        return 5;
+    }
+
+    @Override
+    public boolean supportsDisabledWorldClocks() {
+        // TODO does it?
+        return false;
+    }
+
+    @Override
+    public boolean supportsHeartRateMeasurement(final GBDevice device) {
+        return true;
+    }
+
+    @Override
+    public boolean supportsManualHeartRateMeasurement(final GBDevice device) {
+        // TODO orchestrate
+        return true;
+    }
+
+    @Override
+    public String getManufacturer() {
+        return "Xiaomi";
+    }
+
+    @Override
+    public boolean supportsRealtimeData() {
+        // TODO supports steps?
+        return true;
+    }
+
+    @Override
+    public boolean supportsRemSleep() {
+        return true;
+    }
+
+    @Override
+    public boolean supportsWeather() {
+        return true;
+    }
+
+    @Override
+    public boolean supportsFindDevice() {
+        return true;
+    }
+
+    @Override
+    public boolean supportsUnicodeEmojis() {
+        return true;
+    }
+
+    @Override
+    public int[] getSupportedDeviceSpecificSettings(final GBDevice device) {
+        final List<Integer> settings = new ArrayList<>();
+
+        // TODO review this
+        
+        //
+        // Time
+        //
+        settings.add(R.xml.devicesettings_header_time);
+        settings.add(R.xml.devicesettings_timeformat);
+        settings.add(R.xml.devicesettings_dateformat_2);
+        if (getWorldClocksSlotCount() > 0) {
+            settings.add(R.xml.devicesettings_world_clocks);
+        }
+
+        //
+        // Display
+        //
+        settings.add(R.xml.devicesettings_header_display);
+        settings.add(R.xml.devicesettings_huami2021_displayitems);
+        settings.add(R.xml.devicesettings_huami2021_shortcuts);
+        settings.add(R.xml.devicesettings_nightmode);
+        settings.add(R.xml.devicesettings_sleep_mode);
+        settings.add(R.xml.devicesettings_liftwrist_display_sensitivity_with_smart);
+        settings.add(R.xml.devicesettings_password);
+        settings.add(R.xml.devicesettings_always_on_display);
+        settings.add(R.xml.devicesettings_screen_timeout);
+
+        //
+        // Health
+        //
+        settings.add(R.xml.devicesettings_header_health);
+        settings.add(R.xml.devicesettings_heartrate_sleep_alert_activity_stress_spo2);
+        settings.add(R.xml.devicesettings_inactivity_dnd_no_threshold);
+        settings.add(R.xml.devicesettings_goal_notification);
+
+        //
+        // Workout
+        //
+        settings.add(R.xml.devicesettings_header_workout);
+        settings.add(R.xml.devicesettings_workout_start_on_phone);
+        settings.add(R.xml.devicesettings_workout_send_gps_to_band);
+
+        //
+        // Notifications
+        //
+        settings.add(R.xml.devicesettings_header_notifications);
+        settings.add(R.xml.devicesettings_display_caller);
+        settings.add(R.xml.devicesettings_vibrationpatterns);
+        settings.add(R.xml.devicesettings_donotdisturb_withauto_and_always);
+        settings.add(R.xml.devicesettings_screen_on_on_notifications);
+        settings.add(R.xml.devicesettings_autoremove_notifications);
+        settings.add(R.xml.devicesettings_canned_reply_16);
+
+        //
+        // Calendar
+        //
+        settings.add(R.xml.devicesettings_header_calendar);
+        settings.add(R.xml.devicesettings_sync_calendar);
+
+        //
+        // Other
+        //
+        settings.add(R.xml.devicesettings_header_other);
+        settings.add(R.xml.devicesettings_camera_remote);
+
+        return ArrayUtils.toPrimitive(settings.toArray(new Integer[0]));
+    }
+
+    @Override
+    public int[] getSupportedDeviceSpecificAuthenticationSettings() {
+        return new int[]{R.xml.devicesettings_pairingkey};
+    }
+
+    @Override
+    public DeviceSpecificSettingsCustomizer getDeviceSpecificSettingsCustomizer(final GBDevice device) {
+        return new XiaomiSettingsCustomizer();
+    }
+
+    @Override
+    public String[] getSupportedLanguageSettings(final GBDevice device) {
+        // TODO check which are supported
+        final List<String> allLanguages = new ArrayList<>(HuamiLanguageType.idLookup.keySet());
+        allLanguages.add(0, "auto");
+        return allLanguages.toArray(new String[0]);
+    }
+
+    @Override
+    public Class<? extends Activity> getPairingActivity() {
+        return MiBandPairingActivity.class;
+    }
+
+    @Override
+    public PasswordCapabilityImpl.Mode getPasswordCapability() {
+        return PasswordCapabilityImpl.Mode.NUMBERS_6;
+    }
+
+    @Override
+    public List<HeartRateCapability.MeasurementInterval> getHeartRateMeasurementIntervals() {
+        return Arrays.asList(
+                HeartRateCapability.MeasurementInterval.OFF,
+                HeartRateCapability.MeasurementInterval.SMART,
+                HeartRateCapability.MeasurementInterval.MINUTES_1,
+                HeartRateCapability.MeasurementInterval.MINUTES_10,
+                HeartRateCapability.MeasurementInterval.MINUTES_30
+        );
+    }
+
+    @Override
+    public boolean supportsNotificationVibrationPatterns() {
+        // TODO maybe can used this
+        return true;
+    }
+
+    @Override
+    public boolean supportsNotificationVibrationRepetitionPatterns() {
+        // TODO maybe can used this
+        return true;
+    }
+
+    @Override
+    public boolean supportsNotificationLedPatterns() {
+        return false;
+    }
+
+    @Override
+    public AbstractNotificationPattern[] getNotificationVibrationPatterns() {
+        // TODO maybe can used this
+        return new AbstractNotificationPattern[0];
+    }
+
+    @Override
+    public AbstractNotificationPattern[] getNotificationVibrationRepetitionPatterns() {
+        // TODO maybe can used this
+        return new AbstractNotificationPattern[0];
+    }
+
+    @Override
+    public AbstractNotificationPattern[] getNotificationLedPatterns() {
+        return new AbstractNotificationPattern[0];
+    }
+
+    @NonNull
+    @Override
+    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+        return XiaomiSupport.class;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSampleProvider.java
new file mode 100644
index 000000000..736317bf4
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSampleProvider.java
@@ -0,0 +1,79 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import de.greenrobot.dao.AbstractDao;
+import de.greenrobot.dao.Property;
+import nodomain.freeyourgadget.gadgetbridge.devices.AbstractSampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.entities.HuamiExtendedActivitySample;
+import nodomain.freeyourgadget.gadgetbridge.entities.HuamiExtendedActivitySampleDao;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+
+// TODO s/HuamiExtendedActivitySample/XiaomiActivitySample/g
+public class XiaomiSampleProvider extends AbstractSampleProvider<HuamiExtendedActivitySample> {
+    protected XiaomiSampleProvider(final GBDevice device, final DaoSession session) {
+        super(device, session);
+    }
+
+    @Override
+    public AbstractDao<HuamiExtendedActivitySample, ?> getSampleDao() {
+        return getSession().getHuamiExtendedActivitySampleDao();
+    }
+
+    @Nullable
+    @Override
+    protected Property getRawKindSampleProperty() {
+        return HuamiExtendedActivitySampleDao.Properties.RawKind;
+    }
+
+    @NonNull
+    @Override
+    protected Property getTimestampSampleProperty() {
+        return HuamiExtendedActivitySampleDao.Properties.Timestamp;
+    }
+
+    @NonNull
+    @Override
+    protected Property getDeviceIdentifierSampleProperty() {
+        return HuamiExtendedActivitySampleDao.Properties.DeviceId;
+    }
+
+    @Override
+    public int normalizeType(final int rawType) {
+        // TODO
+        return rawType;
+    }
+
+    @Override
+    public int toRawActivityKind(final int activityKind) {
+        return activityKind;
+    }
+
+    @Override
+    public float normalizeIntensity(final int rawIntensity) {
+        return rawIntensity;
+    }
+
+    @Override
+    public HuamiExtendedActivitySample createActivitySample() {
+        return new HuamiExtendedActivitySample();
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSettingsCustomizer.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSettingsCustomizer.java
new file mode 100644
index 000000000..185ea8392
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSettingsCustomizer.java
@@ -0,0 +1,64 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi;
+
+import android.os.Parcel;
+
+import androidx.preference.Preference;
+
+import java.util.Collections;
+import java.util.Set;
+
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSpecificSettingsCustomizer;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSpecificSettingsHandler;
+import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
+
+public class XiaomiSettingsCustomizer implements DeviceSpecificSettingsCustomizer {
+    @Override
+    public void onPreferenceChange(final Preference preference, final DeviceSpecificSettingsHandler handler) {
+    }
+
+    @Override
+    public void customizeSettings(final DeviceSpecificSettingsHandler handler, final Prefs prefs) {
+    }
+
+    @Override
+    public Set<String> getPreferenceKeysWithSummary() {
+        return Collections.emptySet();
+    }
+
+    public static final Creator<XiaomiSettingsCustomizer> CREATOR = new Creator<XiaomiSettingsCustomizer>() {
+        @Override
+        public XiaomiSettingsCustomizer createFromParcel(final Parcel in) {
+            return new XiaomiSettingsCustomizer();
+        }
+
+        @Override
+        public XiaomiSettingsCustomizer[] newArray(final int size) {
+            return new XiaomiSettingsCustomizer[size];
+        }
+    };
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(final Parcel dest, final int flags) {
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/MiBand8Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/MiBand8Coordinator.java
new file mode 100644
index 000000000..271fa0c5b
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/MiBand8Coordinator.java
@@ -0,0 +1,67 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.miband8;
+
+import android.content.Context;
+import android.net.Uri;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.util.regex.Pattern;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
+import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
+
+public class MiBand8Coordinator extends XiaomiCoordinator {
+    private final Pattern NAME_PATTTERN = Pattern.compile("^Xiaomi Smart Band 8 [A-Z0-9]{4}$");
+
+    @NonNull
+    @Override
+    public DeviceType getSupportedType(final GBDeviceCandidate candidate) {
+        if (NAME_PATTTERN.matcher(candidate.getName()).matches()) {
+            return DeviceType.MIBAND8;
+        }
+
+        return DeviceType.UNKNOWN;
+    }
+
+    @Nullable
+    @Override
+    public InstallHandler findInstallHandler(final Uri uri, final Context context) {
+        // TODO implement this
+        return super.findInstallHandler(uri, context);
+    }
+
+    @Override
+    public int getDeviceNameResource() {
+        return R.string.devicetype_miband8;
+    }
+
+    @Override
+    public int getDefaultIconResource() {
+        return R.drawable.ic_device_miband6;
+    }
+
+    @Override
+    public int getDisabledIconResource() {
+        return R.drawable.ic_device_miband6_disabled;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityUser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityUser.java
index 5d2d3ed5e..138eb7302 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityUser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityUser.java
@@ -44,6 +44,7 @@ public class ActivityUser {
     private int activityUserCaloriesBurntGoal;
     private int activityUserDistanceGoalMeters;
     private int activityUserActiveTimeGoalMinutes;
+    private int activityUserStandingTimeGoalHours;
     private int activityUserStepLengthCm;
 
     private static final String defaultUserName = "gadgetbridge-user";
@@ -167,6 +168,7 @@ public class ActivityUser {
         activityUserCaloriesBurntGoal = prefs.getInt(PREF_USER_CALORIES_BURNT, defaultUserCaloriesBurntGoal);
         activityUserDistanceGoalMeters = prefs.getInt(PREF_USER_DISTANCE_METERS, defaultUserDistanceGoalMeters);
         activityUserActiveTimeGoalMinutes = prefs.getInt(PREF_USER_ACTIVETIME_MINUTES, defaultUserActiveTimeGoalMinutes);
+        activityUserStandingTimeGoalHours = prefs.getInt(PREF_USER_GOAL_STANDING_TIME_HOURS, defaultUserGoalStandingTimeHours);
         activityUserStepLengthCm = prefs.getInt(PREF_USER_STEP_LENGTH_CM, defaultUserStepLengthCm);
     }
 
@@ -199,4 +201,12 @@ public class ActivityUser {
         }
         return activityUserActiveTimeGoalMinutes;
     }
+
+    public int getStandingTimeGoalHours()
+    {
+        if (activityUserStandingTimeGoalHours < 1) {
+            activityUserStandingTimeGoalHours = defaultUserGoalStandingTimeHours;
+        }
+        return activityUserStandingTimeGoalHours;
+    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/Alarm.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/Alarm.java
index 824441dac..29cb6faaa 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/Alarm.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/Alarm.java
@@ -33,6 +33,8 @@ public interface Alarm extends Serializable {
     byte ALARM_SAT = 32;
     byte ALARM_SUN = 64;
 
+    byte ALARM_DAILY = Alarm.ALARM_MON | Alarm.ALARM_TUE | Alarm.ALARM_WED | Alarm.ALARM_THU | Alarm.ALARM_FRI | Alarm.ALARM_SAT | Alarm.ALARM_SUN;
+
     int getPosition();
 
     boolean getEnabled();
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
index 05b9a747e..b55711ab3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
@@ -140,6 +140,7 @@ import nodomain.freeyourgadget.gadgetbridge.devices.vivomovehr.VivomoveHrCoordin
 import nodomain.freeyourgadget.gadgetbridge.devices.waspos.WaspOSCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.watch9.Watch9DeviceCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.withingssteelhr.WithingsSteelHRDeviceCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.miband8.MiBand8Coordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xwatch.XWatchCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.zetime.ZeTimeCoordinator;
 
@@ -192,6 +193,7 @@ public enum DeviceType {
     AMAZFITPOP(AmazfitPopCoordinator.class),
     AMAZFITPOPPRO(AmazfitPopProCoordinator.class),
     MIBAND7(MiBand7Coordinator.class),
+    MIBAND8(MiBand8Coordinator.class),
     AMAZFITGTS3(AmazfitGTS3Coordinator.class),
     AMAZFITGTR3(AmazfitGTR3Coordinator.class),
     AMAZFITGTR4(AmazfitGTR4Coordinator.class),
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCipher.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCipher.java
new file mode 100644
index 000000000..cd418bcd0
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCipher.java
@@ -0,0 +1,307 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi;
+
+import static nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiConstants.UUID_CHARACTERISTIC_XIAOMI_COMMAND_WRITE;
+
+import android.content.SharedPreferences;
+import android.os.Build;
+
+import androidx.annotation.Nullable;
+
+import com.google.protobuf.ByteString;
+
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.bouncycastle.crypto.CryptoException;
+import org.bouncycastle.crypto.engines.AESEngine;
+import org.bouncycastle.crypto.modes.CCMBlockCipher;
+import org.bouncycastle.crypto.params.AEADParameters;
+import org.bouncycastle.crypto.params.KeyParameter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.util.Arrays;
+import java.util.Locale;
+
+import javax.crypto.Mac;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.SecretKeySpec;
+
+import nodomain.freeyourgadget.gadgetbridge.BuildConfig;
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetDeviceStateAction;
+import nodomain.freeyourgadget.gadgetbridge.util.GB;
+
+public class XiaomiCipher {
+    private static final Logger LOG = LoggerFactory.getLogger(XiaomiCipher.class);
+
+    private final XiaomiSupport mSupport;
+
+    private final byte[] secretKey = new byte[16];
+    private final byte[] nonce = new byte[16];
+    private final byte[] encryptionKey = new byte[16];
+    private final byte[] decryptionKey = new byte[16];
+    private final byte[] encryptionNonce = new byte[4];
+    private final byte[] decryptionNonce = new byte[4];
+
+    public XiaomiCipher(final XiaomiSupport support) {
+        this.mSupport = support;
+    }
+
+    protected void startAuthentication(final TransactionBuilder builder) {
+        builder.add(new SetDeviceStateAction(mSupport.getDevice(), GBDevice.State.AUTHENTICATING, mSupport.getContext()));
+
+        System.arraycopy(getSecretKey(mSupport.getDevice()), 0, secretKey, 0, 16);
+        new SecureRandom().nextBytes(nonce);
+
+        builder.write(
+                mSupport.getCharacteristic(UUID_CHARACTERISTIC_XIAOMI_COMMAND_WRITE),
+                ArrayUtils.addAll(XiaomiConstants.PAYLOAD_HEADER_AUTH, buildNonceCommand(nonce))
+        );
+    }
+
+    protected void handleAuthCommand(final XiaomiProto.Command cmd) {
+        if (cmd.getType() != XiaomiConstants.CMD_TYPE_AUTH) {
+            throw new IllegalArgumentException("Not an auth command");
+        }
+
+        switch (cmd.getSubtype()) {
+            case XiaomiConstants.CMD_AUTH_NONCE: {
+                LOG.debug("Got watch nonce");
+
+                // Watch nonce
+                final XiaomiProto.Command reply = handleWatchNonce(cmd.getAuth().getWatchNonce());
+                if (reply == null) {
+                    mSupport.disconnect();
+                    return;
+                }
+
+                final TransactionBuilder builder = mSupport.createTransactionBuilder("auth step 2");
+                // TODO maybe move these writes to support class?
+                builder.write(
+                        mSupport.getCharacteristic(UUID_CHARACTERISTIC_XIAOMI_COMMAND_WRITE),
+                        ArrayUtils.addAll(XiaomiConstants.PAYLOAD_HEADER_AUTH, reply.toByteArray())
+                );
+                builder.queue(mSupport.getQueue());
+                break;
+            }
+
+            case XiaomiConstants.CMD_AUTH_AUTH: {
+                LOG.info("Authenticated!");
+
+                final TransactionBuilder builder = mSupport.createTransactionBuilder("phase 2 initialize");
+                builder.add(new SetDeviceStateAction(mSupport.getDevice(), GBDevice.State.INITIALIZED, mSupport.getContext()));
+                mSupport.phase2Initialize(builder);
+                builder.queue(mSupport.getQueue());
+                break;
+            }
+
+            default:
+                LOG.warn("Unknown auth payload subtype {}", cmd.getSubtype());
+        }
+    }
+
+    public byte[] encrypt(final byte[] arr, final short i) {
+        final ByteBuffer packetNonce = ByteBuffer.allocate(12).order(ByteOrder.LITTLE_ENDIAN)
+                .put(encryptionNonce)
+                .putInt(0)
+                .putShort(i) // TODO what happens once this overflows?
+                .putShort((short) 0);
+
+        try {
+            return encrypt(encryptionKey, packetNonce.array(), arr);
+        } catch (final CryptoException e) {
+            throw new RuntimeException("failed to encrypt", e);
+        }
+    }
+
+    public byte[] decrypt(final byte[] arr) {
+        final ByteBuffer packetNonce = ByteBuffer.allocate(12).order(ByteOrder.LITTLE_ENDIAN);
+        packetNonce.put(decryptionNonce);
+        packetNonce.putInt(0);
+        packetNonce.putInt(0);
+
+        try {
+            return decrypt(decryptionKey, packetNonce.array(), arr);
+        } catch (final CryptoException e) {
+            throw new RuntimeException("failed to decrypt", e);
+        }
+    }
+
+    @Nullable
+    private XiaomiProto.Command handleWatchNonce(final XiaomiProto.WatchNonce watchNonce) {
+        final byte[] step2hmac = computeAuthStep3Hmac(secretKey, nonce, watchNonce.getNonce().toByteArray());
+
+        System.arraycopy(step2hmac, 0, decryptionKey, 0, 16);
+        System.arraycopy(step2hmac, 16, encryptionKey, 0, 16);
+        System.arraycopy(step2hmac, 32, decryptionNonce, 0, 4);
+        System.arraycopy(step2hmac, 36, encryptionNonce, 0, 4);
+
+        if (BuildConfig.DEBUG) {
+            LOG.debug("decryptionKey: {}", GB.hexdump(decryptionKey));
+            LOG.debug("encryptionKey: {}", GB.hexdump(encryptionKey));
+            LOG.debug("decryptionNonce: {}", GB.hexdump(decryptionNonce));
+            LOG.debug("encryptionNonce: {}", GB.hexdump(encryptionNonce));
+        }
+
+        final byte[] decryptionConfirmation = hmacSHA256(decryptionKey, ArrayUtils.addAll(watchNonce.getNonce().toByteArray(), nonce));
+        if (!Arrays.equals(decryptionConfirmation, watchNonce.getHmac().toByteArray())) {
+            LOG.warn("Watch hmac mismatch");
+            return null;
+        }
+
+        final XiaomiProto.AuthDeviceInfo authDeviceInfo = XiaomiProto.AuthDeviceInfo.newBuilder()
+                .setUnknown1(0) // TODO ?
+                .setPhoneApiLevel(Build.VERSION.SDK_INT)
+                .setPhoneName(Build.MODEL)
+                .setUnknown3(224) // TODO ?
+                // TODO region should be actual device region?
+                .setRegion(Locale.getDefault().getLanguage().substring(0, 2).toUpperCase(Locale.ROOT))
+                .build();
+
+        final byte[] encryptedNonces = hmacSHA256(encryptionKey, ArrayUtils.addAll(nonce, watchNonce.getNonce().toByteArray()));
+        final byte[] encryptedDeviceInfo = encrypt(authDeviceInfo.toByteArray(), (short) 0);
+        final XiaomiProto.AuthStep3 authStep3 = XiaomiProto.AuthStep3.newBuilder()
+                .setEncryptedNonces(ByteString.copyFrom(encryptedNonces))
+                .setEncryptedDeviceInfo(ByteString.copyFrom(encryptedDeviceInfo))
+                .build();
+
+        final XiaomiProto.Command.Builder cmd = XiaomiProto.Command.newBuilder();
+        cmd.setType(XiaomiConstants.CMD_TYPE_AUTH);
+        cmd.setSubtype(XiaomiConstants.CMD_AUTH_AUTH);
+
+        final XiaomiProto.Auth.Builder auth = XiaomiProto.Auth.newBuilder();
+        auth.setAuthStep3(authStep3);
+
+        return cmd.setAuth(auth.build()).build();
+    }
+
+    public static byte[] buildNonceCommand(final byte[] nonce) {
+        final XiaomiProto.PhoneNonce.Builder phoneNonce = XiaomiProto.PhoneNonce.newBuilder();
+        phoneNonce.setNonce(ByteString.copyFrom(nonce));
+
+        final XiaomiProto.Auth.Builder auth = XiaomiProto.Auth.newBuilder();
+        auth.setPhoneNonce(phoneNonce.build());
+
+        final XiaomiProto.Command.Builder command = XiaomiProto.Command.newBuilder();
+        command.setType(XiaomiConstants.CMD_TYPE_AUTH);
+        command.setSubtype(XiaomiConstants.CMD_AUTH_NONCE);
+        command.setAuth(auth.build());
+        return command.build().toByteArray();
+    }
+
+    public static byte[] computeAuthStep3Hmac(final byte[] secretKey,
+                                              final byte[] phoneNonce,
+                                              final byte[] watchNonce) {
+        final byte[] miwearAuthBytes = "miwear-auth".getBytes();
+
+        final Mac mac;
+        try {
+            mac = Mac.getInstance("HmacSHA256");
+            // Compute the actual key and re-initialize the mac
+            mac.init(new SecretKeySpec(ArrayUtils.addAll(phoneNonce, watchNonce), "HmacSHA256"));
+            final byte[] hmacKeyBytes = mac.doFinal(secretKey);
+            final SecretKeySpec key = new SecretKeySpec(hmacKeyBytes, "HmacSHA256");
+            mac.init(key);
+        } catch (final NoSuchAlgorithmException | InvalidKeyException e) {
+            throw new IllegalStateException("Failed to initialize hmac for auth step 2", e);
+        }
+
+        final byte[] output = new byte[64];
+        byte[] tmp = new byte[0];
+        byte b = 1;
+        int i = 0;
+        while (i < output.length) {
+            mac.update(tmp);
+            mac.update(miwearAuthBytes);
+            mac.update(b);
+            tmp = mac.doFinal();
+            for (int j = 0; j < tmp.length && i < output.length; j++, i++) {
+                output[i] = tmp[j];
+            }
+            b++;
+        }
+        return output;
+    }
+
+    protected static byte[] getSecretKey(final GBDevice device) {
+        final byte[] authKeyBytes = new byte[16];
+
+        final SharedPreferences sharedPrefs = GBApplication.getDeviceSpecificSharedPrefs(device.getAddress());
+
+        final String authKey = sharedPrefs.getString("authkey", null);
+        if (StringUtils.isNotBlank(authKey)) {
+            final byte[] srcBytes;
+            // Allow both with and without 0x, to avoid user mistakes
+            if (authKey.length() == 34 && authKey.startsWith("0x")) {
+                srcBytes = GB.hexStringToByteArray(authKey.trim().substring(2));
+            } else {
+                srcBytes = GB.hexStringToByteArray(authKey.trim());
+            }
+            System.arraycopy(srcBytes, 0, authKeyBytes, 0, Math.min(srcBytes.length, 16));
+        }
+
+        return authKeyBytes;
+    }
+
+    protected static byte[] hmacSHA256(final byte[] key, final byte[] input) {
+        try {
+            final Mac mac = Mac.getInstance("HmacSHA256");
+            mac.init(new SecretKeySpec(key, "HmacSHA256"));
+            return mac.doFinal(input);
+        } catch (final Exception e) {
+            throw new RuntimeException("Failed to hmac", e);
+        }
+    }
+
+    public static byte[] encrypt(final byte[] key, final byte[] nonce, final byte[] payload) throws
+            CryptoException {
+        final CCMBlockCipher cipher = createBlockCipher(true, new SecretKeySpec(key, "AES"), nonce);
+        final byte[] out = new byte[cipher.getOutputSize(payload.length)];
+        final int outBytes = cipher.processBytes(payload, 0, payload.length, out, 0);
+        cipher.doFinal(out, outBytes);
+        return out;
+    }
+
+    public static byte[] decrypt(final byte[] key,
+                                 final byte[] nonce,
+                                 final byte[] encryptedPayload) throws CryptoException {
+        final CCMBlockCipher cipher = createBlockCipher(false, new SecretKeySpec(key, "AES"), nonce);
+        final byte[] decrypted = new byte[cipher.getOutputSize(encryptedPayload.length)];
+        cipher.doFinal(decrypted, cipher.processBytes(encryptedPayload, 0, encryptedPayload.length, decrypted, 0));
+        return decrypted;
+    }
+
+    public static CCMBlockCipher createBlockCipher(final boolean forEncrypt,
+                                                   final SecretKey secretKey,
+                                                   final byte[] nonce) {
+        final AESEngine aesFastEngine = new AESEngine();
+        aesFastEngine.init(forEncrypt, new KeyParameter(secretKey.getEncoded()));
+        final CCMBlockCipher blockCipher = new CCMBlockCipher(aesFastEngine);
+        blockCipher.init(forEncrypt, new AEADParameters(new KeyParameter(secretKey.getEncoded()), 32, nonce, null));
+        return blockCipher;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiConstants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiConstants.java
new file mode 100644
index 000000000..37864a3f8
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiConstants.java
@@ -0,0 +1,56 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi;
+
+import java.util.UUID;
+
+public class XiaomiConstants {
+    public static final String BASE_UUID = "0000%s-0000-1000-8000-00805f9b34fb";
+
+    public static final UUID UUID_SERVICE_XIAOMI_FE95 = UUID.fromString((String.format(BASE_UUID, "fe95")));
+    public static final UUID UUID_CHARACTERISTIC_XIAOMI_UNKNOWN_0050 = UUID.fromString((String.format(BASE_UUID, "0050")));
+    public static final UUID UUID_CHARACTERISTIC_XIAOMI_COMMAND_READ = UUID.fromString((String.format(BASE_UUID, "0051")));
+    public static final UUID UUID_CHARACTERISTIC_XIAOMI_COMMAND_WRITE = UUID.fromString((String.format(BASE_UUID, "0052")));
+    public static final UUID UUID_CHARACTERISTIC_XIAOMI_ACTIVITY_DATA = UUID.fromString((String.format(BASE_UUID, "0053")));
+    public static final UUID UUID_CHARACTERISTIC_XIAOMI_UNKNOWN_0054 = UUID.fromString((String.format(BASE_UUID, "0054")));
+    public static final UUID UUID_CHARACTERISTIC_XIAOMI_WATCHFACE = UUID.fromString((String.format(BASE_UUID, "0055")));
+    public static final UUID UUID_CHARACTERISTIC_XIAOMI_UNKNOWN_0056 = UUID.fromString((String.format(BASE_UUID, "0056")));
+    public static final UUID UUID_CHARACTERISTIC_XIAOMI_UNKNOWN_0057 = UUID.fromString((String.format(BASE_UUID, "0057")));
+    public static final UUID UUID_CHARACTERISTIC_XIAOMI_UNKNOWN_0058 = UUID.fromString((String.format(BASE_UUID, "0058")));
+    public static final UUID UUID_CHARACTERISTIC_XIAOMI_UNKNOWN_0059 = UUID.fromString((String.format(BASE_UUID, "0059")));
+    public static final UUID UUID_CHARACTERISTIC_XIAOMI_UNKNOWN_005A = UUID.fromString((String.format(BASE_UUID, "005a")));
+
+    public static final UUID UUID_SERVICE_XIAOMI_FDAB = UUID.fromString((String.format(BASE_UUID, "fdab")));
+    public static final UUID UUID_CHARACTERISTIC_XIAOMI_UNKNOWN_0001 = UUID.fromString((String.format(BASE_UUID, "0001")));
+    public static final UUID UUID_CHARACTERISTIC_XIAOMI_UNKNOWN_0002 = UUID.fromString((String.format(BASE_UUID, "0002")));
+    public static final UUID UUID_CHARACTERISTIC_XIAOMI_UNKNOWN_0003 = UUID.fromString((String.format(BASE_UUID, "0003")));
+
+    public static final int CMD_TYPE_AUTH = 1;
+    public static final int CMD_TYPE_SYSTEM = 2;
+
+    public static final int CMD_AUTH_NONCE = 26;
+    public static final int CMD_AUTH_AUTH = 27;
+
+    public static final int CMD_SYSTEM_BATTERY = 1;
+    public static final int CMD_SYSTEM_DEVICE_INFO = 2;
+    public static final int CMD_SYSTEM_CLOCK = 3;
+    public static final int CMD_SYSTEM_CHARGER = 79;
+
+    // TODO not like this
+    public static final byte[] PAYLOAD_ACK = new byte[]{0, 0, 3, 0};
+    public static final byte[] PAYLOAD_HEADER_AUTH = new byte[]{0, 0, 2, 2};
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
new file mode 100644
index 000000000..138ed62f3
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
@@ -0,0 +1,565 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi;
+
+import static nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiConstants.*;
+
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothGatt;
+import android.bluetooth.BluetoothGattCharacteristic;
+import android.content.Context;
+import android.location.Location;
+import android.net.Uri;
+import android.widget.Toast;
+
+import org.apache.commons.lang3.ArrayUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.TimeZone;
+import java.util.UUID;
+
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
+import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventBatteryInfo;
+import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdateDeviceInfo;
+import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventVersionInfo;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.model.Alarm;
+import nodomain.freeyourgadget.gadgetbridge.model.BatteryState;
+import nodomain.freeyourgadget.gadgetbridge.model.CalendarEventSpec;
+import nodomain.freeyourgadget.gadgetbridge.model.CallSpec;
+import nodomain.freeyourgadget.gadgetbridge.model.CannedMessagesSpec;
+import nodomain.freeyourgadget.gadgetbridge.model.MusicSpec;
+import nodomain.freeyourgadget.gadgetbridge.model.MusicStateSpec;
+import nodomain.freeyourgadget.gadgetbridge.model.NotificationSpec;
+import nodomain.freeyourgadget.gadgetbridge.model.Reminder;
+import nodomain.freeyourgadget.gadgetbridge.model.WeatherSpec;
+import nodomain.freeyourgadget.gadgetbridge.model.WorldClock;
+import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.AbstractBTLEDeviceSupport;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.BLETypeConversions;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.GattService;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetDeviceStateAction;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.AbstractXiaomiService;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.XiaomiHealthService;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.XiaomiMusicService;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.XiaomiNotificationService;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.XiaomiScheduleService;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.XiaomiSystemService;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.XiaomiWeatherService;
+import nodomain.freeyourgadget.gadgetbridge.util.GB;
+import nodomain.freeyourgadget.gadgetbridge.util.GBPrefs;
+import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
+
+public class XiaomiSupport extends AbstractBTLEDeviceSupport {
+    private static final Logger LOG = LoggerFactory.getLogger(XiaomiSupport.class);
+
+    private final XiaomiCipher cipher = new XiaomiCipher(this);
+
+    private final XiaomiMusicService musicService = new XiaomiMusicService(this);
+    private final XiaomiHealthService healthService = new XiaomiHealthService(this);
+    private final XiaomiNotificationService notificationService = new XiaomiNotificationService(this);
+    private final XiaomiScheduleService scheduleService = new XiaomiScheduleService(this);
+    private final XiaomiWeatherService weatherService = new XiaomiWeatherService(this);
+    private final XiaomiSystemService systemService = new XiaomiSystemService(this);
+
+    private final Map<Integer, AbstractXiaomiService> mServiceMap = new LinkedHashMap<Integer, AbstractXiaomiService>() {{
+        put(XiaomiMusicService.COMMAND_TYPE, musicService);
+        put(XiaomiHealthService.COMMAND_TYPE, healthService);
+        put(XiaomiNotificationService.COMMAND_TYPE, notificationService);
+        put(XiaomiScheduleService.COMMAND_TYPE, scheduleService);
+        put(XiaomiWeatherService.COMMAND_TYPE, weatherService);
+        put(XiaomiSystemService.COMMAND_TYPE, systemService);
+    }};
+
+    public XiaomiSupport() {
+        super(LOG);
+        addSupportedService(GattService.UUID_SERVICE_GENERIC_ACCESS);
+        addSupportedService(GattService.UUID_SERVICE_GENERIC_ATTRIBUTE);
+        addSupportedService(GattService.UUID_SERVICE_DEVICE_INFORMATION);
+        addSupportedService(GattService.UUID_SERVICE_HUMAN_INTERFACE_DEVICE);
+        addSupportedService(UUID_SERVICE_XIAOMI_FE95);
+        addSupportedService(UUID_SERVICE_XIAOMI_FDAB);
+    }
+
+    @Override
+    public boolean useAutoConnect() {
+        return true;
+    }
+
+    @Override
+    public boolean getImplicitCallbackModify() {
+        return false;
+    }
+
+    @Override
+    public void setContext(final GBDevice gbDevice, final BluetoothAdapter btAdapter, final Context context) {
+        super.setContext(gbDevice, btAdapter, context);
+        for (final AbstractXiaomiService service : mServiceMap.values()) {
+            service.setContext(context);
+        }
+    }
+
+    @Override
+    protected TransactionBuilder initializeDevice(final TransactionBuilder builder) {
+        final BluetoothGattCharacteristic characteristicCommandWrite = getCharacteristic(UUID_CHARACTERISTIC_XIAOMI_COMMAND_WRITE);
+        final BluetoothGattCharacteristic characteristicCommandRead = getCharacteristic(UUID_CHARACTERISTIC_XIAOMI_COMMAND_READ);
+
+        if (characteristicCommandWrite == null || characteristicCommandRead == null) {
+            LOG.warn("Command characteristics are null, will attempt to reconnect");
+            builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.WAITING_FOR_RECONNECT, getContext()));
+            return builder;
+        }
+
+        // FIXME why is this needed?
+        getDevice().setFirmwareVersion("...");
+        //getDevice().setFirmwareVersion2("...");
+
+        builder.notify(getCharacteristic(UUID_CHARACTERISTIC_XIAOMI_COMMAND_READ), true);
+        builder.notify(getCharacteristic(UUID_CHARACTERISTIC_XIAOMI_COMMAND_WRITE), true);
+        builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.INITIALIZING, getContext()));
+        cipher.startAuthentication(builder);
+
+        return builder;
+    }
+
+    @Override
+    public boolean onCharacteristicChanged(final BluetoothGatt gatt, final BluetoothGattCharacteristic characteristic) {
+        if (super.onCharacteristicChanged(gatt, characteristic)) {
+            return true;
+        }
+
+        final UUID characteristicUUID = characteristic.getUuid();
+        final byte[] value = characteristic.getValue();
+
+        if (UUID_CHARACTERISTIC_XIAOMI_COMMAND_WRITE.equals(characteristicUUID)) {
+            if (Arrays.equals(value, PAYLOAD_ACK)) {
+                LOG.debug("Got command write ack");
+            } else {
+                LOG.warn("Unexpected notification from command write: {}", GB.hexdump(value));
+            }
+
+            return true;
+        }
+
+        if (UUID_CHARACTERISTIC_XIAOMI_COMMAND_READ.equals(characteristicUUID)) {
+            sendAck(characteristic);
+
+            final int header = BLETypeConversions.toUint16(value, 0);
+            final int type = BLETypeConversions.toUnsigned(value, 2);
+            final int encryption = BLETypeConversions.toUnsigned(value, 3);
+
+            if (header != 0) {
+                LOG.warn("Non-zero header not supported");
+                return true;
+            }
+            if (type != 2) {
+                LOG.warn("Unsupported type {}", type);
+                return true;
+            }
+
+            final byte[] plainValue;
+            if (encryption == 1) {
+                plainValue = cipher.decrypt(ArrayUtils.subarray(value, 4, value.length));
+            } else {
+                plainValue = ArrayUtils.subarray(value, 4, value.length);
+            }
+
+            LOG.debug("Got command: {}", GB.hexdump(plainValue));
+
+            final XiaomiProto.Command cmd;
+            try {
+                cmd = XiaomiProto.Command.parseFrom(plainValue);
+            } catch (final Exception e) {
+                LOG.error("Failed to parse bytes as protobuf command payload", e);
+                return true;
+            }
+
+            final AbstractXiaomiService service = mServiceMap.get(cmd.getType());
+            if (service != null) {
+                service.handleCommand(cmd);
+                return true;
+            }
+
+            if (cmd.getType() == CMD_TYPE_AUTH) {
+                cipher.handleAuthCommand(cmd);
+                return true;
+            }
+
+            LOG.warn("Unexpected watch command type {}", cmd.getType());
+            return true;
+        }
+
+        LOG.warn("Unhandled characteristic changed: {} {}", characteristicUUID, GB.hexdump(value));
+        return false;
+    }
+
+    @Override
+    public void onSendConfiguration(final String config) {
+        // TODO
+        // TODO user info
+        // TODO 24h
+        GB.toast("Error setting configuration", Toast.LENGTH_LONG, GB.ERROR);
+    }
+
+    @Override
+    public void onSetTime() {
+        final TransactionBuilder builder;
+        try {
+            builder = performInitialized("set time");
+        } catch (final IOException e) {
+            LOG.error("Failed to initialize transaction builder", e);
+            return;
+        }
+        setCurrentTime(builder);
+        builder.queue(getQueue());
+    }
+
+    public void setCurrentTime(final TransactionBuilder builder) {
+        final Calendar now = GregorianCalendar.getInstance();
+        final TimeZone tz = TimeZone.getDefault();
+
+        final GBPrefs gbPrefs = new GBPrefs(new Prefs(GBApplication.getDeviceSpecificSharedPrefs(gbDevice.getAddress())));
+        final String timeFormat = gbPrefs.getTimeFormat();
+        final boolean is24hour = DeviceSettingsPreferenceConst.PREF_TIMEFORMAT_24H.equals(timeFormat);
+
+        final XiaomiProto.Clock clock = XiaomiProto.Clock.newBuilder()
+                .setTime(XiaomiProto.Time.newBuilder()
+                        .setHour(now.get(Calendar.HOUR_OF_DAY))
+                        .setMinute(now.get(Calendar.MINUTE))
+                        .setSecond(now.get(Calendar.SECOND))
+                        .setMillisecond(now.get(Calendar.MILLISECOND))
+                        .build())
+                .setDate(XiaomiProto.Date.newBuilder()
+                        .setYear(now.get(Calendar.YEAR))
+                        .setMonth(now.get(Calendar.MONTH) + 1)
+                        .setDay(now.get(Calendar.DATE))
+                        .build())
+                .setTimezone(XiaomiProto.TimeZone.newBuilder()
+                        .setZoneOffset(((now.get(Calendar.ZONE_OFFSET) / 1000) / 60) / 15)
+                        .setDstOffset(((now.get(Calendar.DST_OFFSET) / 1000) / 60) / 15)
+                        .setName(tz.getID())
+                        .build())
+                .setIsNot24Hour(!is24hour)
+                .build();
+
+        sendCommand(
+                builder,
+                XiaomiProto.Command.newBuilder()
+                        .setType(CMD_TYPE_SYSTEM)
+                        .setSubtype(CMD_SYSTEM_CLOCK)
+                        .setSystem(XiaomiProto.System.newBuilder().setClock(clock).build())
+                        .build()
+        );
+    }
+
+    @Override
+    public void onTestNewFunction() {
+        final TransactionBuilder builder = createTransactionBuilder("test new function");
+        sendCommand(
+                builder,
+                XiaomiProto.Command.newBuilder()
+                        .setType(CMD_TYPE_SYSTEM)
+                        .setSubtype(CMD_SYSTEM_DEVICE_INFO)
+                        .build()
+        );
+        builder.queue(getQueue());
+    }
+
+    @Override
+    public void onFindPhone(final boolean start) {
+        // TODO possible to notify watch?
+        super.onFindPhone(start);
+    }
+
+    @Override
+    public void onFindDevice(final boolean start) {
+        // TODO onFindDevice
+        super.onFindDevice(start);
+    }
+
+    @Override
+    public void onSetPhoneVolume(final float volume) {
+        musicService.onSetPhoneVolume(volume);
+    }
+
+    @Override
+    public void onSetGpsLocation(final Location location) {
+        // TODO onSetGpsLocation
+        super.onSetGpsLocation(location);
+    }
+
+    @Override
+    public void onSetReminders(final ArrayList<? extends Reminder> reminders) {
+        scheduleService.onSetReminders(reminders);
+    }
+
+    @Override
+    public void onSetWorldClocks(final ArrayList<? extends WorldClock> clocks) {
+        scheduleService.onSetWorldClocks(clocks);
+    }
+
+    @Override
+    public void onNotification(final NotificationSpec notificationSpec) {
+        notificationService.onNotification(notificationSpec);
+    }
+
+    @Override
+    public void onDeleteNotification(final int id) {
+        notificationService.onDeleteNotification(id);
+    }
+
+    @Override
+    public void onSetAlarms(final ArrayList<? extends Alarm> alarms) {
+        scheduleService.onSetAlarms(alarms);
+    }
+
+    @Override
+    public void onSetCallState(final CallSpec callSpec) {
+        notificationService.onSetCallState(callSpec);
+    }
+
+    @Override
+    public void onSetCannedMessages(final CannedMessagesSpec cannedMessagesSpec) {
+        notificationService.onSetCannedMessages(cannedMessagesSpec);
+    }
+
+    @Override
+    public void onSetMusicState(final MusicStateSpec stateSpec) {
+        musicService.onSetMusicState(stateSpec);
+    }
+
+    @Override
+    public void onSetMusicInfo(final MusicSpec musicSpec) {
+        musicService.onSetMusicInfo(musicSpec);
+    }
+
+    @Override
+    public void onInstallApp(final Uri uri) {
+        // TODO
+        super.onInstallApp(uri);
+    }
+
+    @Override
+    public void onAppInfoReq() {
+        // TODO
+        super.onAppInfoReq();
+    }
+
+    @Override
+    public void onAppStart(final UUID uuid, boolean start) {
+        // TODO
+        super.onAppStart(uuid, start);
+    }
+
+    @Override
+    public void onAppDownload(final UUID uuid) {
+        // TODO
+        super.onAppDownload(uuid);
+    }
+
+    @Override
+    public void onAppDelete(final UUID uuid) {
+        // TODO
+        super.onAppDelete(uuid);
+    }
+
+    @Override
+    public void onAppConfiguration(final UUID appUuid, String config, Integer id) {
+        // TODO
+        super.onAppConfiguration(appUuid, config, id);
+    }
+
+    @Override
+    public void onAppReorder(final UUID[] uuids) {
+        // TODO
+        super.onAppReorder(uuids);
+    }
+
+    @Override
+    public void onFetchRecordedData(final int dataTypes) {
+        // TODO
+        super.onFetchRecordedData(dataTypes);
+    }
+
+    @Override
+    public void onReset(final int flags) {
+        // TODO
+        super.onReset(flags);
+    }
+
+    @Override
+    public void onHeartRateTest() {
+        healthService.onHeartRateTest();
+    }
+
+    @Override
+    public void onEnableRealtimeHeartRateMeasurement(final boolean enable) {
+        healthService.onEnableRealtimeHeartRateMeasurement(enable);
+    }
+
+    @Override
+    public void onEnableRealtimeSteps(final boolean enable) {
+        healthService.onEnableRealtimeSteps(enable);
+    }
+
+    @Override
+    public void onScreenshotReq() {
+        // TODO
+        super.onScreenshotReq();
+    }
+
+    @Override
+    public void onEnableHeartRateSleepSupport(final boolean enable) {
+        // TODO
+        super.onEnableHeartRateSleepSupport(enable);
+    }
+
+    @Override
+    public void onSetHeartRateMeasurementInterval(final int seconds) {
+        // TODO
+        super.onSetHeartRateMeasurementInterval(seconds);
+    }
+
+    @Override
+    public void onAddCalendarEvent(final CalendarEventSpec calendarEventSpec) {
+        scheduleService.onAddCalendarEvent(calendarEventSpec);
+    }
+
+    @Override
+    public void onDeleteCalendarEvent(final byte type, long id) {
+        scheduleService.onDeleteCalendarEvent(type, id);
+    }
+
+    @Override
+    public void onSendWeather(final WeatherSpec weatherSpec) {
+        weatherService.onSendWeather(weatherSpec);
+    }
+
+    protected void phase2Initialize(final TransactionBuilder builder) {
+        LOG.info("phase2Initialize");
+        encryptedIndex = 1; // TODO not here
+
+        if (GBApplication.getPrefs().getBoolean("datetime_synconconnect", true)) {
+            setCurrentTime(builder);
+        }
+
+        for (final AbstractXiaomiService service : mServiceMap.values()) {
+            service.initialize(builder);
+        }
+
+        // request device info
+        sendCommand(builder, CMD_TYPE_SYSTEM, CMD_SYSTEM_DEVICE_INFO);
+
+        // request battery status
+        sendCommand(builder, CMD_TYPE_SYSTEM, CMD_SYSTEM_BATTERY);
+    }
+
+    private void sendAck(final BluetoothGattCharacteristic characteristic) {
+        final TransactionBuilder builder = createTransactionBuilder("send ack");
+        builder.write(characteristic, PAYLOAD_ACK);
+        builder.queue(getQueue());
+    }
+
+    protected void handleConfigCommand(final XiaomiProto.Command cmd) {
+        switch (cmd.getSubtype()) {
+            case CMD_SYSTEM_DEVICE_INFO:
+                final XiaomiProto.DeviceInfo deviceInfo = cmd.getSystem().getDeviceInfo();
+                final GBDeviceEventVersionInfo gbDeviceEventVersionInfo = new GBDeviceEventVersionInfo();
+                gbDeviceEventVersionInfo.fwVersion = deviceInfo.getFirmware();
+                //gbDeviceEventVersionInfo.fwVersion2 = "N/A";
+                gbDeviceEventVersionInfo.hwVersion = deviceInfo.getModel();
+                final GBDeviceEventUpdateDeviceInfo gbDeviceEventUpdateDeviceInfo = new GBDeviceEventUpdateDeviceInfo("SERIAL: ", deviceInfo.getSerialNumber());
+
+                evaluateGBDeviceEvent(gbDeviceEventVersionInfo);
+                evaluateGBDeviceEvent(gbDeviceEventUpdateDeviceInfo);
+                return;
+            case CMD_SYSTEM_BATTERY:
+                final XiaomiProto.Battery battery = cmd.getSystem().getPower().getBattery();
+                final GBDeviceEventBatteryInfo batteryInfo = new GBDeviceEventBatteryInfo();
+                batteryInfo.batteryIndex = 0;
+                batteryInfo.level = battery.getLevel();
+                switch (battery.getState()) {
+                    case 1:
+                        batteryInfo.state = BatteryState.BATTERY_CHARGING;
+                        break;
+                    case 2:
+                        batteryInfo.state = BatteryState.BATTERY_NORMAL;
+                        break;
+                    default:
+                        batteryInfo.state = BatteryState.UNKNOWN;
+                        LOG.warn("Unknown battery state {}", battery.getState());
+                }
+                evaluateGBDeviceEvent(batteryInfo);
+                return;
+            case CMD_SYSTEM_CHARGER:
+                // charger event, request battery state
+                sendCommand(
+                        "request battery state",
+                        XiaomiProto.Command.newBuilder()
+                                .setType(CMD_TYPE_SYSTEM)
+                                .setSubtype(CMD_SYSTEM_BATTERY)
+                                .build()
+                );
+                return;
+            default:
+                LOG.warn("Unknown config command {}", cmd.getSubtype());
+        }
+    }
+
+    private short encryptedIndex = 0;
+
+    public void sendCommand(final String taskName, final XiaomiProto.Command command) {
+        final TransactionBuilder builder = createTransactionBuilder(taskName);
+        sendCommand(builder, command);
+        builder.queue(getQueue());
+    }
+
+    public void sendCommand(final TransactionBuilder builder, final XiaomiProto.Command command) {
+        final byte[] commandBytes = command.toByteArray();
+        final byte[] encryptedCommandBytes = cipher.encrypt(commandBytes, encryptedIndex);
+        final ByteBuffer buf = ByteBuffer.allocate(6 + encryptedCommandBytes.length).order(ByteOrder.LITTLE_ENDIAN);
+        buf.putShort((short) 0);
+        buf.put((byte) 2); // 2 for command
+        buf.put((byte) 1); // 1 for encrypted
+        buf.putShort(encryptedIndex++);
+        buf.put(encryptedCommandBytes);
+        LOG.debug("Sending command {} as {}", GB.hexdump(commandBytes), GB.hexdump(buf.array()));
+        builder.write(getCharacteristic(UUID_CHARACTERISTIC_XIAOMI_COMMAND_WRITE), buf.array());
+    }
+
+    public void sendCommand(final TransactionBuilder builder, final int type, final int subtype) {
+        sendCommand(
+                builder,
+                XiaomiProto.Command.newBuilder()
+                        .setType(type)
+                        .setSubtype(subtype)
+                        .build()
+        );
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/AbstractXiaomiService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/AbstractXiaomiService.java
new file mode 100644
index 000000000..7f8b9ca12
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/AbstractXiaomiService.java
@@ -0,0 +1,56 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services;
+
+import android.content.Context;
+
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
+import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
+
+public abstract class AbstractXiaomiService {
+    private final XiaomiSupport mSupport;
+
+    public AbstractXiaomiService(final XiaomiSupport support) {
+        this.mSupport = support;
+    }
+
+    public void setContext(final Context context) {
+
+    }
+
+    public abstract void handleCommand(final XiaomiProto.Command cmd);
+
+    public void initialize(final TransactionBuilder builder) {
+
+    }
+
+    protected XiaomiSupport getSupport() {
+        return mSupport;
+    }
+
+    protected XiaomiCoordinator getCoordinator() {
+        return (XiaomiCoordinator) getSupport().getDevice().getDeviceCoordinator();
+    }
+
+    protected Prefs getDevicePrefs() {
+        return new Prefs(GBApplication.getDeviceSpecificSharedPrefs(getSupport().getDevice().getAddress()));
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
new file mode 100644
index 000000000..639555605
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
@@ -0,0 +1,110 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+import java.util.Locale;
+
+import nodomain.freeyourgadget.gadgetbridge.model.ActivityUser;
+import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
+
+public class XiaomiHealthService extends AbstractXiaomiService {
+    private static final Logger LOG = LoggerFactory.getLogger(XiaomiHealthService.class);
+
+    public static final int COMMAND_TYPE = 8;
+
+    private static final int CMD_SET_USER_INFO = 0;
+
+    private static final int GENDER_MALE = 1;
+    private static final int GENDER_FEMALE = 2;
+
+    public XiaomiHealthService(final XiaomiSupport support) {
+        super(support);
+    }
+
+    @Override
+    public void handleCommand(final XiaomiProto.Command cmd) {
+        // TODO
+        LOG.warn("Unhandled health command");
+    }
+
+    @Override
+    public void initialize(TransactionBuilder builder) {
+        setUserInfo(builder);
+    }
+
+    public void setUserInfo(final TransactionBuilder builder) {
+        final ActivityUser activityUser = new ActivityUser();
+        final int birthYear = activityUser.getYearOfBirth();
+        final byte birthMonth = 7; // not in user attributes
+        final byte birthDay = 1; // not in user attributes
+
+        final int genderInt = activityUser.getGender() != ActivityUser.GENDER_FEMALE ? GENDER_MALE : GENDER_FEMALE;  // TODO other gender?
+
+        final Calendar now = GregorianCalendar.getInstance();
+        final int age = now.get(Calendar.YEAR) - birthYear;
+        // Compute the approximate max heart rate from the user age
+        // TODO max heart rate should be input by the user
+        int maxHeartRate = (int) Math.round(age <= 40 ? 220 - age : 207 - 0.7 * age);
+        if (maxHeartRate < 100 || maxHeartRate > 220) {
+            maxHeartRate  = 175;
+        }
+
+        final XiaomiProto.UserInfo userInfo = XiaomiProto.UserInfo.newBuilder()
+                .setHeight(activityUser.getHeightCm())
+                .setWeight(activityUser.getWeightKg())
+                .setBirthday(Integer.parseInt(String.format(Locale.ROOT, "%02d%02d%02d", birthYear, birthMonth, birthDay)))
+                .setGender(genderInt)
+                .setMaxHeartRate(maxHeartRate)
+                .setGoalCalories(activityUser.getCaloriesBurntGoal())
+                .setGoalSteps(activityUser.getStepsGoal())
+                .setGoalStanding(activityUser.getStandingTimeGoalHours())
+                .setGoalMoving(activityUser.getActiveTimeGoalMinutes())
+                .build();
+
+        final XiaomiProto.Health health = XiaomiProto.Health.newBuilder()
+                .setUserInfo(userInfo)
+                .build();
+
+        getSupport().sendCommand(
+                builder,
+                XiaomiProto.Command.newBuilder()
+                        .setType(COMMAND_TYPE)
+                        .setSubtype(CMD_SET_USER_INFO)
+                        .setHealth(health)
+                        .build()
+        );
+    }
+
+    public void onHeartRateTest() {
+        // TODO
+    }
+
+    public void onEnableRealtimeHeartRateMeasurement(final boolean enable) {
+        // TODO
+    }
+
+    public void onEnableRealtimeSteps(final boolean enable) {
+        // TODO
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiMusicService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiMusicService.java
new file mode 100644
index 000000000..ee71faece
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiMusicService.java
@@ -0,0 +1,158 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services;
+
+import android.content.Context;
+
+import org.slf4j.Logger;
+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.proto.xiaomi.XiaomiProto;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
+import nodomain.freeyourgadget.gadgetbridge.util.MediaManager;
+
+public class XiaomiMusicService extends AbstractXiaomiService {
+    private static final Logger LOG = LoggerFactory.getLogger(XiaomiMusicService.class);
+
+    public static final int COMMAND_TYPE = 18;
+
+    private static final int CMD_MUSIC_GET = 0;
+    private static final int CMD_MUSIC_SEND = 1;
+    private static final int CMD_MUSIC_BUTTON = 1;
+
+    private static final byte BUTTON_PLAY = 0x00;
+    private static final byte BUTTON_PAUSE = 0x01;
+    private static final byte BUTTON_PREVIOUS = 0x03;
+    private static final byte BUTTON_NEXT = 0x04;
+    private static final byte BUTTON_VOLUME = 0x05;
+
+    private static final byte STATE_NOTHING = 0x00;
+    private static final byte STATE_PLAYING = 0x01;
+    private static final byte STATE_PAUSED = 0x02;
+
+    protected MediaManager mediaManager = null;
+    protected boolean isMusicAppStarted = false;
+
+    public XiaomiMusicService(final XiaomiSupport support) {
+        super(support);
+    }
+
+    @Override
+    public void setContext(Context context) {
+        super.setContext(context);
+        this.mediaManager = new MediaManager(context);
+    }
+
+    @Override
+    public void handleCommand(final XiaomiProto.Command cmd) {
+        final XiaomiProto.Music music = cmd.getMusic();
+
+        switch (cmd.getSubtype()) {
+            case CMD_MUSIC_GET:
+                mediaManager.refresh();
+                sendMusicStateToDevice();
+                break;
+            case CMD_MUSIC_BUTTON:
+                final GBDeviceEventMusicControl deviceEventMusicControl = new GBDeviceEventMusicControl();
+                switch (music.getMediaKey().getKey()) {
+                    case BUTTON_PLAY:
+                        deviceEventMusicControl.event = GBDeviceEventMusicControl.Event.PLAY;
+                        break;
+                    case BUTTON_PAUSE:
+                        deviceEventMusicControl.event = GBDeviceEventMusicControl.Event.PAUSE;
+                        break;
+                    case BUTTON_PREVIOUS:
+                        deviceEventMusicControl.event = GBDeviceEventMusicControl.Event.PREVIOUS;
+                        break;
+                    case BUTTON_NEXT:
+                        deviceEventMusicControl.event = GBDeviceEventMusicControl.Event.NEXT;
+                        break;
+                    case BUTTON_VOLUME:
+                        if (music.getMediaKey().getVolume() > 0) {
+                            deviceEventMusicControl.event = GBDeviceEventMusicControl.Event.VOLUMEUP;
+                        } else {
+                            deviceEventMusicControl.event = GBDeviceEventMusicControl.Event.VOLUMEDOWN;
+                        }
+                        break;
+                    default:
+                        LOG.warn("Unexpected media button key {}", music.getMediaKey().getKey());
+                        return;
+                }
+                // FIXME sometimes this is not triggering a device update?
+                getSupport().evaluateGBDeviceEvent(deviceEventMusicControl);
+                break;
+            default:
+                LOG.warn("Unhandled music command {}", cmd.getSubtype());
+        }
+    }
+
+    public void onSetMusicState(final MusicStateSpec stateSpec) {
+        if (mediaManager.onSetMusicState(stateSpec) && isMusicAppStarted) {
+            sendMusicStateToDevice();
+        }
+    }
+
+    public void onSetPhoneVolume(final float ignoredVolume) {
+        sendMusicStateToDevice();
+    }
+
+    public void onSetMusicInfo(final MusicSpec musicSpec) {
+        if (mediaManager.onSetMusicInfo(musicSpec) && isMusicAppStarted) {
+            sendMusicStateToDevice();
+        }
+    }
+
+    private void sendMusicStateToDevice() {
+        final MusicSpec musicSpec = mediaManager.getBufferMusicSpec();
+        final MusicStateSpec musicStateSpec = mediaManager.getBufferMusicStateSpec();
+
+        final XiaomiProto.MusicInfo.Builder musicInfo = XiaomiProto.MusicInfo.newBuilder()
+                .setVolume(mediaManager.getPhoneVolume());
+
+        if (musicSpec == null || musicStateSpec == null) {
+            musicInfo.setState(STATE_NOTHING);
+        } else {
+            if (musicStateSpec.state == MusicStateSpec.STATE_PLAYING) {
+                musicInfo.setState(STATE_PLAYING);
+            } else {
+                musicInfo.setState(STATE_PAUSED);
+            }
+
+            musicInfo.setVolume(mediaManager.getPhoneVolume())
+                    .setTrack(musicSpec.track)
+                    .setArtist(musicSpec.artist)
+                    .setPosition(musicStateSpec.position)
+                    .setDuration(musicSpec.duration);
+        }
+
+        final XiaomiProto.Music music = XiaomiProto.Music.newBuilder()
+                .setMusicInfo(musicInfo.build())
+                .build();
+
+        getSupport().sendCommand(
+                "send music",
+                XiaomiProto.Command.newBuilder()
+                        .setType(COMMAND_TYPE)
+                        .setSubtype(CMD_MUSIC_SEND)
+                        .setMusic(music)
+                        .build()
+        );
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
new file mode 100644
index 000000000..8fa404d83
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
@@ -0,0 +1,57 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import nodomain.freeyourgadget.gadgetbridge.model.CallSpec;
+import nodomain.freeyourgadget.gadgetbridge.model.CannedMessagesSpec;
+import nodomain.freeyourgadget.gadgetbridge.model.NotificationSpec;
+import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
+
+public class XiaomiNotificationService extends AbstractXiaomiService {
+    private static final Logger LOG = LoggerFactory.getLogger(XiaomiNotificationService.class);
+
+    public static final int COMMAND_TYPE = 7;
+
+    public XiaomiNotificationService(final XiaomiSupport support) {
+        super(support);
+    }
+
+    @Override
+    public void handleCommand(final XiaomiProto.Command cmd) {
+        // TODO
+    }
+
+    public void onNotification(final NotificationSpec notificationSpec) {
+        // TODO
+    }
+
+    public void onDeleteNotification(final int id) {
+        // TODO
+    }
+
+    public void onSetCallState(final CallSpec callSpec) {
+        // TODO
+    }
+
+    public void onSetCannedMessages(final CannedMessagesSpec cannedMessagesSpec) {
+        // TODO
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java
new file mode 100644
index 000000000..81dd91d44
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java
@@ -0,0 +1,248 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services;
+
+import android.content.Intent;
+
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import nodomain.freeyourgadget.gadgetbridge.database.DBHelper;
+import nodomain.freeyourgadget.gadgetbridge.model.Alarm;
+import nodomain.freeyourgadget.gadgetbridge.model.CalendarEventSpec;
+import nodomain.freeyourgadget.gadgetbridge.model.DeviceService;
+import nodomain.freeyourgadget.gadgetbridge.model.Reminder;
+import nodomain.freeyourgadget.gadgetbridge.model.WorldClock;
+import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
+
+public class XiaomiScheduleService extends AbstractXiaomiService {
+    private static final Logger LOG = LoggerFactory.getLogger(XiaomiScheduleService.class);
+
+    public static final int COMMAND_TYPE = 17;
+
+    private static final int CMD_ALARMS_GET = 0;
+    private static final int CMD_ALARMS_CREATE = 1;
+    private static final int CMD_ALARMS_EDIT = 3;
+    private static final int CMD_ALARMS_DELETE = 4;
+
+    private static final int REPETITION_ONCE = 0;
+    private static final int REPETITION_DAILY = 1;
+    private static final int REPETITION_WEEKLY = 5;
+    private static final int REPETITION_MONTHLY = 7;
+    private static final int REPETITION_YEARLY = 8;
+
+    private static final int ALARM_SMART = 1;
+    private static final int ALARM_NORMAL = 2;
+
+    // Map of alarm position to Alarm, as returned by the band
+    private final Map<Integer, Alarm> watchAlarms = new HashMap<>();
+
+    public XiaomiScheduleService(final XiaomiSupport support) {
+        super(support);
+    }
+
+    @Override
+    public void handleCommand(final XiaomiProto.Command cmd) {
+        switch (cmd.getSubtype()) {
+            case CMD_ALARMS_GET:
+                handleAlarms(cmd.getSchedule().getAlarms());
+                break;
+        }
+    }
+
+    @Override
+    public void initialize(final TransactionBuilder builder) {
+        requestAlarms(builder);
+    }
+
+    public void onSetReminders(final ArrayList<? extends Reminder> reminders) {
+        // TODO
+    }
+
+    public void onSetWorldClocks(final ArrayList<? extends WorldClock> clocks) {
+        // TODO
+    }
+
+    public void onSetAlarms(final ArrayList<? extends Alarm> alarms) {
+        final List<Integer> alarmsToDelete = new ArrayList<>();
+
+        // TODO this is flaky, since it's the watch that defines the IDs...
+
+        for (final Alarm alarm : alarms) {
+            final Alarm watchAlarm = watchAlarms.get(alarm.getPosition());
+
+            if (alarm.getUnused() && watchAlarm == null) {
+                // Disabled on both
+                continue;
+            }
+
+            if (alarm.getUnused() && watchAlarm != null) {
+                // Delete from watch
+                alarmsToDelete.add(watchAlarm.getPosition() + 1);
+                continue;
+            }
+
+            final XiaomiProto.HourMinute hourMinute = XiaomiProto.HourMinute.newBuilder()
+                    .setHour(alarm.getHour())
+                    .setMinute(alarm.getMinute())
+                    .build();
+
+            final XiaomiProto.AlarmDetails.Builder alarmDetails = XiaomiProto.AlarmDetails.newBuilder()
+                    .setTime(hourMinute)
+                    .setEnabled(alarm.getEnabled())
+                    .setSmart(alarm.getSmartWakeup() ? ALARM_SMART : ALARM_NORMAL);
+
+            switch (alarm.getRepetition()) {
+                case Alarm.ALARM_ONCE:
+                    alarmDetails.setRepeatMode(REPETITION_ONCE);
+                    break;
+                case Alarm.ALARM_DAILY:
+                    alarmDetails.setRepeatMode(REPETITION_DAILY);
+                    break;
+                default:
+                    alarmDetails.setRepeatMode(REPETITION_WEEKLY);
+                    alarmDetails.setRepeatFlags(alarm.getRepetition());
+                    break;
+            }
+
+            final XiaomiProto.Schedule.Builder schedule = XiaomiProto.Schedule.newBuilder();
+
+            if (watchAlarm != null) {
+                // update existing alarm
+                schedule.setEditAlarm(
+                        XiaomiProto.Alarm.newBuilder()
+                                .setId(alarm.getPosition() + 1)
+                                .setAlarmDetails(alarmDetails)
+                                .build()
+                );
+            } else {
+                schedule.setCreateAlarm(alarmDetails);
+            }
+
+            getSupport().sendCommand(
+                    (watchAlarm == null ? "create" : "update") + " alarm " + alarm.getPosition(),
+                    XiaomiProto.Command.newBuilder()
+                            .setType(COMMAND_TYPE)
+                            .setSubtype(watchAlarm == null ? CMD_ALARMS_CREATE : CMD_ALARMS_EDIT)
+                            .setSchedule(schedule)
+                            .build()
+            );
+        }
+
+        if (!alarmsToDelete.isEmpty()) {
+            final XiaomiProto.AlarmDelete alarmDelete = XiaomiProto.AlarmDelete.newBuilder()
+                    .addAllId(alarmsToDelete)
+                    .build();
+
+            final XiaomiProto.Schedule schedule = XiaomiProto.Schedule.newBuilder()
+                    .setDeleteAlarm(alarmDelete)
+                    .build();
+
+            getSupport().sendCommand(
+                    "delete unused alarms",
+                    XiaomiProto.Command.newBuilder()
+                            .setType(COMMAND_TYPE)
+                            .setSubtype(CMD_ALARMS_DELETE)
+                            .setSchedule(schedule)
+                            .build()
+            );
+        }
+    }
+
+    public void requestAlarms(final TransactionBuilder builder) {
+        getSupport().sendCommand(builder, COMMAND_TYPE, CMD_ALARMS_GET);
+    }
+
+    public void handleAlarms(final XiaomiProto.Alarms alarms) {
+        LOG.debug("Got {} alarms", alarms.getAlarmCount());
+
+        watchAlarms.clear();
+        for (final XiaomiProto.Alarm alarm : alarms.getAlarmList()) {
+            final nodomain.freeyourgadget.gadgetbridge.entities.Alarm gbAlarm = new nodomain.freeyourgadget.gadgetbridge.entities.Alarm();
+            gbAlarm.setUnused(false); // If the band sent it, it's not unused
+            gbAlarm.setPosition(alarm.getId() - 1); // band id starts at 1
+            gbAlarm.setEnabled(alarm.getAlarmDetails().getEnabled());
+            gbAlarm.setSmartWakeup(alarm.getAlarmDetails().getSmart() == ALARM_SMART);
+            gbAlarm.setHour(alarm.getAlarmDetails().getTime().getHour());
+            gbAlarm.setMinute(alarm.getAlarmDetails().getTime().getMinute());
+            switch (alarm.getAlarmDetails().getRepeatMode()) {
+                case REPETITION_ONCE:
+                    gbAlarm.setRepetition(Alarm.ALARM_ONCE);
+                    break;
+                case REPETITION_DAILY:
+                    gbAlarm.setRepetition(Alarm.ALARM_DAILY);
+                    break;
+                case REPETITION_WEEKLY:
+                    gbAlarm.setRepetition(alarm.getAlarmDetails().getRepeatFlags());
+                    break;
+            }
+
+            watchAlarms.put(gbAlarm.getPosition(), gbAlarm);
+        }
+
+        final List<nodomain.freeyourgadget.gadgetbridge.entities.Alarm> dbAlarms = DBHelper.getAlarms(getSupport().getDevice());
+        int numUpdatedAlarms = 0;
+
+        for (nodomain.freeyourgadget.gadgetbridge.entities.Alarm alarm : dbAlarms) {
+            final int pos = alarm.getPosition();
+            final Alarm updatedAlarm = watchAlarms.get(pos);
+            final boolean alarmNeedsUpdate = updatedAlarm == null ||
+                    alarm.getUnused() != updatedAlarm.getUnused() ||
+                    alarm.getEnabled() != updatedAlarm.getEnabled() ||
+                    alarm.getSmartWakeup() != updatedAlarm.getSmartWakeup() ||
+                    alarm.getHour() != updatedAlarm.getHour() ||
+                    alarm.getMinute() != updatedAlarm.getMinute() ||
+                    alarm.getRepetition() != updatedAlarm.getRepetition();
+
+            if (alarmNeedsUpdate) {
+                numUpdatedAlarms++;
+                LOG.info("Updating alarm index={}, unused={}", pos, updatedAlarm == null);
+                alarm.setUnused(updatedAlarm == null);
+                if (updatedAlarm != null) {
+                    alarm.setEnabled(updatedAlarm.getEnabled());
+                    alarm.setSmartWakeup(updatedAlarm.getSmartWakeup());
+                    alarm.setHour(updatedAlarm.getHour());
+                    alarm.setMinute(updatedAlarm.getMinute());
+                    alarm.setRepetition(updatedAlarm.getRepetition());
+                }
+                DBHelper.store(alarm);
+            }
+        }
+
+        if (numUpdatedAlarms > 0) {
+            final Intent intent = new Intent(DeviceService.ACTION_SAVE_ALARMS);
+            LocalBroadcastManager.getInstance(getSupport().getContext()).sendBroadcast(intent);
+        }
+    }
+
+    public void onAddCalendarEvent(final CalendarEventSpec calendarEventSpec) {
+        // TODO
+    }
+
+    public void onDeleteCalendarEvent(final byte type, long id) {
+        // TODO
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
new file mode 100644
index 000000000..4b0074376
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
@@ -0,0 +1,38 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
+
+public class XiaomiSystemService extends AbstractXiaomiService {
+    private static final Logger LOG = LoggerFactory.getLogger(XiaomiSystemService.class);
+
+    public static final int COMMAND_TYPE = 2;
+
+    public XiaomiSystemService(final XiaomiSupport support) {
+        super(support);
+    }
+
+    @Override
+    public void handleCommand(final XiaomiProto.Command cmd) {
+        // TODO
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java
new file mode 100644
index 000000000..6254fdf77
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java
@@ -0,0 +1,43 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import nodomain.freeyourgadget.gadgetbridge.model.WeatherSpec;
+import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
+
+public class XiaomiWeatherService extends AbstractXiaomiService {
+    private static final Logger LOG = LoggerFactory.getLogger(XiaomiWeatherService.class);
+
+    public static final int COMMAND_TYPE = 10;
+
+    public XiaomiWeatherService(final XiaomiSupport support) {
+        super(support);
+    }
+
+    @Override
+    public void handleCommand(final XiaomiProto.Command cmd) {
+        // TODO
+    }
+
+    public void onSendWeather(final WeatherSpec weatherSpec) {
+        // TODO
+    }
+}
diff --git a/app/src/main/proto/xiaomi.proto b/app/src/main/proto/xiaomi.proto
new file mode 100644
index 000000000..71dddfac0
--- /dev/null
+++ b/app/src/main/proto/xiaomi.proto
@@ -0,0 +1,625 @@
+syntax = "proto2"; // we must use proto2 to serialize default values on the wire
+
+package xiaomi;
+
+option java_package = "nodomain.freeyourgadget.gadgetbridge.proto.xiaomi";
+option java_outer_classname = "XiaomiProto";
+
+message Command {
+  required uint32 type = 1;
+  optional uint32 subtype = 2;
+
+  optional Auth auth = 3;
+  optional System system = 4;
+  optional Health health = 10;
+  optional Music music = 20;
+  optional Notification notification = 9;
+  optional Weather weather = 12;
+  optional Schedule schedule = 19;
+
+  optional uint32 status = 100; // 0 on success on some
+}
+
+//
+// Auth
+//
+
+message Auth {
+  // 1, 26
+  optional PhoneNonce phoneNonce = 30;
+  optional WatchNonce watchNonce = 31;
+  // 1, 27
+  optional AuthStep3 authStep3 = 32;
+  optional AuthStep4 authStep4 = 33;
+}
+
+message PhoneNonce {
+  required bytes nonce = 1;
+}
+
+message WatchNonce {
+  required bytes nonce = 1;
+  required bytes hmac = 2;
+}
+
+message AuthStep3 {
+  required bytes encryptedNonces = 1;
+  required bytes encryptedDeviceInfo = 2;  // AuthDeviceInfo
+}
+
+message AuthStep4 {
+  required uint32 unknown1 = 1;
+  required uint32 unknown2 = 2;
+}
+
+message AuthDeviceInfo {
+  required uint32 unknown1 = 1; // 0 - needs to be serialized explicitly
+  required float phoneApiLevel = 2;
+  required string phoneName = 3; // phone model
+  required uint32 unknown3 = 4; // 224
+  required string region = 5; // 2-letter, upper case
+}
+
+//
+// System
+//
+
+message System {
+  // 2, 1
+  optional Power power = 2;
+  // 2, 2
+  optional DeviceInfo deviceInfo = 3;
+  // 2, 3
+  optional Clock clock = 4;
+
+  // 2, 18
+  optional uint32 findDevice = 5; // 0
+
+  // 2, 29
+  optional DisplayItems displayItems = 10;
+
+  // 2, 34
+  optional DoNotDisturb dndStatus = 11;
+
+  // 2, 9 get | 2, 21 set
+  optional Password password = 19;
+
+  // 2, 7 get | 2, 8 set
+  optional Camera camera = 15;
+
+  // 2, 51
+  optional Widgets widgets = 28;
+  // 2, 53
+  optional WidgetsSingle widgetsSingle = 29;
+
+  // 2, 14
+  optional DoNotDisturb dnd2 = 34;
+  // 2, 15
+  optional DndSync dndSync = 35;
+
+  // 2, 46
+  optional VibrationPatterns vibrationPatterns = 38;
+
+  // 2, 47
+  optional VibrationNotificationType vibrationSetPreset = 39;
+
+  // 2, 58
+  optional CustomVibrationPattern vibrationPatternCreate = 40;
+
+  // 2, 59
+  optional VibrationTest vibrationTestCustom = 41;
+
+  // 2, 47
+  optional VibrationPatternAck vibrationPatternAck = 43;
+
+  // 2, 79
+  optional Charger charger = 49;
+}
+
+message Power {
+  optional Battery battery = 1;
+}
+
+message Battery {
+  optional uint32 level = 1;
+  optional uint32 state = 2;
+  optional LastCharge lastCharge = 3;
+}
+
+message LastCharge {
+  optional uint32 state = 1; // 2
+  optional uint32 timestampSeconds = 2;
+}
+
+message DeviceInfo {
+  required string serialNumber = 1;
+  required string firmware = 2;
+  optional string unknown3 = 3; // "" ?
+  required string model = 4;
+}
+
+message Clock {
+  required Date date = 1;
+  required Time time = 2;
+  required TimeZone timezone = 3;
+  required bool isNot24hour = 4;
+}
+
+message Date {
+  required uint32 year = 1;
+  required uint32 month = 2;
+  required uint32 day = 3;
+}
+
+message Time {
+  required uint32 hour = 1;
+  required uint32 minute = 2;
+  optional uint32 second = 3;
+  optional uint32 millisecond = 4;
+}
+
+message TimeZone {
+  // offsets are in blocks of 15 min
+  optional sint32 zoneOffset = 1;
+  optional sint32 dstOffset = 2;
+  required string name = 3;
+}
+
+message DisplayItems {
+  repeated DisplayItem displayItem = 1;
+}
+
+message DisplayItem {
+  optional string code = 1;
+  optional string name = 2;
+  optional bool disabled = 3;
+  optional uint32 isSettings = 4;
+  optional uint32 unknown5 = 5; // 1
+  optional bool rarelyUsed = 6;
+}
+
+message Camera {
+  required bool enabled = 1;
+}
+
+message Widgets {
+  repeated Widget widget = 1;
+}
+
+message Widget {
+  optional uint32 unknown1 = 1;
+  optional uint32 unknown2 = 2;
+  repeated WidgetPart widgetPart = 3;
+}
+
+message WidgetPart {
+  optional uint32 unknown1 = 1;
+  optional uint32 unknown2 = 2;
+  optional uint32 unknown3 = 3;
+}
+
+message WidgetsSingle {
+  repeated SingleWidget widget = 1;
+}
+
+message SingleWidget {
+  optional uint32 unknown1 = 1;
+  optional uint32 unknown2 = 2;
+  optional uint32 unknown3 = 3;
+  optional string title = 4;
+  optional uint32 unknown5 = 5;
+}
+
+message DoNotDisturb {
+  optional uint32 status = 1; // 0 enabled, 2 disabled
+}
+
+message DoNotDisturb2 {
+}
+
+message DndSync {
+}
+
+message Password {
+  optional uint32 state = 1; // 1 disabled, 2 enabled
+  optional string password = 2;
+}
+
+message VibrationPatterns {
+  repeated VibrationNotificationType notificationType = 1;
+  optional uint32 unknown2 = 2; // 50, max patterns?
+  repeated CustomVibrationPattern customVibrationPattern = 3;
+}
+
+message CustomVibrationPattern {
+  optional uint32 id = 1;
+  optional string name = 2;
+  repeated Vibration vibration = 3;
+  optional uint32 unknown4 = 4; // 1 on creation
+}
+
+message VibrationNotificationType {
+  // 1 incoming calls
+  // 2 events
+  // 3 alarms
+  // 4 notifications
+  // 5 standing reminder
+  // 6 sms
+  // 7 goal
+  // 8 events
+  optional uint32 notificationType = 1;
+  optional uint32 preset = 2;
+}
+
+message VibrationTest {
+  repeated Vibration vibration = 1;
+}
+
+message VibrationPatternAck {
+  optional uint32 status = 1; // 0
+}
+
+message Vibration {
+  optional uint32 vibrate = 1; // 0/1
+  optional uint32 ms = 2;
+}
+
+message Charger {
+  optional uint32 state = 1; // 1 charging, 2 not charging
+}
+
+//
+// Health
+//
+
+message Health {
+  optional UserInfo userInfo = 1;
+  optional SpO2 spo2 = 7;
+  optional HeartRate heartRate = 8;
+  // 8, 12 get | 8, 13 set
+  optional StandingReminder standingReminder = 9;
+  optional Stress stress = 10;
+  optional AchievementReminders achievementReminders = 13;
+
+  // 8, 35 get | 8, 36 set
+  optional VitalityScore vitalityScore = 14;
+
+  // 8, 26
+  optional WorkoutStatusWatch workoutStatusWatch = 20;
+
+  // 8, 30
+  optional WorkoutOpenWatch workoutOpenWatch = 25;
+  optional WorkoutOpenReply workoutOpenReply = 26;
+
+  // 7, 48
+  optional WorkoutLocation workoutLocation = 40;
+
+  // 8,45 enable | 8, 46 disable | 8, 47 periodic
+  optional RealTimeStats realTimeStats = 39;
+}
+
+message UserInfo {
+  optional uint32 height = 1; // cm
+  optional float weight = 2; // kg
+  optional uint32 birthday = 3; // YYYYMMDD
+  optional uint32 gender = 4; // 1 male, 2 female
+  optional uint32 maxHeartRate = 5;
+  optional uint32 goalCalories = 6;
+  optional uint32 goalSteps = 7;
+  optional uint32 goalStanding = 9; // hours
+  optional uint32 goalMoving = 11; // minutes
+}
+
+message SpO2 {
+  optional uint32 unknown1 = 1; // 1
+  optional bool allDayTracking = 2;
+  optional Spo2AlarmLow alarmLow = 4;
+}
+
+message Spo2AlarmLow {
+  optional bool alarmLowEnabled = 1;
+  optional uint32 alarmLowThreshold = 2; // 90, 85, 80
+}
+
+message HeartRate {
+  optional bool disabled = 1; // 0 enabled 1 disabled
+  optional uint32 interval = 2; // 0 smart 1 10 30
+  optional bool alarmHighEnabled = 3;
+  optional uint32 alarmHighThreshold = 4; // 100, 110, ... 150
+  optional AdvancedMonitoring advancedMonitoring = 5;
+  optional uint32 unknown7 = 7; // 1
+  optional HeartRateAlarmLow heartRateAlarmLow = 8;
+  required uint32 breathingScore = 9; // 1 on, 2 off
+}
+
+message AdvancedMonitoring {
+  required bool enabled = 1;
+}
+
+message HeartRateAlarmLow {
+  optional bool alarmLowEnabled = 1;
+  optional uint32 alarmLowThreshold = 2; // 40, 45, 50
+}
+
+message StandingReminder {
+  optional bool enabled = 1;
+  optional HourMinute start = 2;
+  optional HourMinute end = 3;
+  optional bool dnd = 4;
+  optional HourMinute dndStart = 6;
+  optional HourMinute dndEnd = 7;
+}
+
+message Stress {
+  optional bool allDayTracking = 1;
+  optional RelaxReminder relaxReminder = 2;
+}
+
+message AchievementReminders {
+  optional bool enabled = 1;
+  optional uint32 suggested = 2; // 0 moving, 1 standing
+}
+
+message RelaxReminder {
+  optional bool enabled = 1;
+  optional uint32 unknown2 = 2; // 0
+}
+
+message VitalityScore {
+  optional bool sevenDay = 1;
+  optional bool dailyProgress = 2;
+}
+
+message WorkoutStatusWatch {
+  optional uint32 timestamp = 1; // seconds
+  optional uint32 unknown2 = 2;
+}
+
+message WorkoutOpenWatch {
+  optional uint32 unknown1 = 1; // 2
+  optional uint32 unknown2 = 2; // 2
+}
+
+message WorkoutOpenReply {
+  // 3 2 10
+  // ...
+  // 0 2 10
+  // 0 2 2
+  optional uint32 unknown1 = 1;
+  optional uint32 unknown2 = 2;
+  optional uint32 unknown3 = 3;
+}
+
+message WorkoutLocation {
+  optional uint32 unknown1 = 1; // 10, sometimes 2
+  optional uint32 timestamp = 2; // seconds
+  optional double longitude = 3;
+  optional double latitude = 4;
+  optional float unknown6 = 6; // ?
+  optional float unknown7 = 7; // altitude?
+  optional float unknown8 = 8; // ?
+  optional float unknown9 = 9; // ?
+}
+
+message RealTimeStats {
+  optional uint32 steps = 1;
+  optional uint32 calories = 2;
+  optional uint32 unknown3 = 3; // increases during activity
+  optional uint32 heartRate = 4;
+  optional uint32 unknown5 = 5; // 0 probably moving time
+  optional uint32 standingHours = 6;
+}
+
+//
+// Music
+//
+
+message Music {
+  // 18, 1
+  optional MusicInfo musicInfo = 1;
+  // 18, 2
+  optional MediaKey mediaKey = 2;
+}
+
+message MusicInfo {
+  required uint32 state = 1; // 0 not playing, 1 playing, 2 paused
+  optional uint32 volume = 2;
+  optional string track = 4;
+  optional string artist = 5;
+  optional uint32 position = 6;
+  optional uint32 duration = 7;
+}
+
+message MediaKey {
+  required uint32 key = 1; // 0 play, 1 pause, 3 prev, 4 next, 5 vol
+  optional uint32 volume = 2; // 100 vol+, 0 vol-
+}
+
+//
+// Notification
+//
+
+message Notification {
+  optional Notification2 notification2 = 3;
+  optional Notification4 notification4 = 4;
+  // 7, 12
+  optional CannedReplies cannedReplies = 9;
+}
+
+message Notification2 {
+  optional Notification3 notification3 = 1;
+}
+
+message Notification3 {
+  optional string package = 1;
+  optional string appName = 2;
+  optional string title = 3;
+  optional string timestamp = 6;
+  optional string unknown4 = 4;
+  optional string body = 5;
+  optional uint32 id = 7;
+  optional string unknown12 = 12;
+  optional uint32 hasReply = 13;
+}
+
+message Notification4 {
+  optional Notification5 notification5 = 1;
+}
+
+message CannedReplies {
+  optional uint32 minReplies = 1;
+  repeated string reply = 2;
+  optional uint32 maxReplies = 3;
+}
+
+message Notification5 {
+  optional uint32 id = 1;
+  optional string package = 2;
+  optional string unknown4 = 4;
+}
+
+//
+// Weather
+//
+
+message Weather {
+  optional WeatherCurrent current = 1;
+  optional WeatherDaily daily = 2;
+
+  // 10, 6 request without payload?
+
+  // 10, 5 set current | 10, 7 create | 10, 8 delete
+  optional WeatherCurrentLocation currentLocation = 4;
+  // 10, 7 create
+  optional WeatherLocation create = 5;
+
+  // 10, 10
+  optional WeatherTemperatureUnit temperatureUnit = 6;
+}
+
+message WeatherCurrent {
+}
+
+message WeatherDaily {
+}
+
+message WeatherCurrentLocation {
+  optional WeatherLocation location = 1;
+}
+
+message WeatherLocation {
+  optional string code = 1;
+  optional string name = 2;
+}
+
+message WeatherUnknown1 {
+  optional float unknown12 = 12;
+}
+
+message WeatherTemperatureUnit {
+  optional uint32 unit = 1; // 1 celsius 2 fahrenheit
+}
+
+//
+// Schedule
+//
+
+message Schedule {
+  // 17, 0 get
+  optional Alarms alarms = 1;
+  // 17, 1
+  optional AlarmDetails createAlarm = 2;
+  // 17, 3 -> returns 17, 5
+  optional Alarm editAlarm = 3;
+
+  optional uint32 ackId = 4; // id of created or edited alarm and event
+
+  // 17, 4
+  optional AlarmDelete deleteAlarm = 5;
+
+  // 17, 8 get | 17, 9 set
+  optional SleepMode sleepMode = 9;
+
+  // 17, 14 get: 10 -> 2: 50 // max events?
+  optional Events events = 10;
+
+  // 17,10 get/ret | 17,11 create | 17,13 delete
+  optional WorldClocks worldClocks = 11;
+
+  optional uint32 worldClockStatus = 13; // 0 on edit and create
+
+  // 17, 15
+  optional EventDetails createEvent = 14;
+
+  // 17, 17
+  optional Event editEvent = 15;
+
+  // 17, 18
+  optional EventDelete deleteEvent = 17;
+}
+
+message Alarms {
+  optional uint32 maxAlarms = 2; // 10
+  optional uint32 unknown3 = 3; // 0
+  optional uint32 unknown4 = 4; // 1
+  repeated Alarm alarm = 1;
+}
+
+message Alarm {
+  optional uint32 id = 1; // starts at 1
+  optional AlarmDetails alarmDetails = 2;
+}
+
+message AlarmDetails {
+  optional HourMinute time = 2;
+  optional uint32 repeatMode = 3; // 0 once, 1 daily, 5 weekly
+  optional uint32 repeatFlags = 4; // only if weekly: 31 during week, 1 monday, 2 tuesday, 3 mon tue
+  optional bool enabled = 5;
+  optional uint32 smart = 7; // 1 smart, 2 normal
+}
+
+message AlarmDelete {
+  repeated uint32 id = 1;
+}
+
+message SleepMode {
+  required bool enabled = 1;
+  optional SleepModeSchedule schedule = 2;
+}
+
+message SleepModeSchedule {
+  optional HourMinute start = 1;
+  optional HourMinute end = 2;
+  optional uint32 unknown3 = 3; // 0
+}
+
+message Events {
+  repeated Event event = 1;
+  optional uint32 unknown2 = 2; // 50, max events?
+}
+
+message Event {
+  optional uint32 id = 1;
+  optional EventDetails eventDetails = 2;
+}
+
+message EventDetails {
+  optional Date date = 1;
+  optional Time time = 2;
+  optional uint32 repeatMode = 3; // 0 once, 1 daily, weekly (every monday), 7 monthly, 8 yearly
+  optional uint32 repeatFlags = 4; // 64 for unset, day flags on weekly
+  optional string title = 5;
+}
+
+message EventDelete {
+  repeated uint32 id = 1;
+}
+
+message WorldClocks {
+  repeated string worldClock = 1;
+}
+
+message HourMinute {
+  required uint32 hour = 1;
+  required uint32 minute = 2;
+}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dbc2399cd..f4d8495e9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1296,6 +1296,7 @@
     <string name="devicetype_miband5">Mi Band 5</string>
     <string name="devicetype_miband6">Mi Band 6</string>
     <string name="devicetype_miband7">Xiaomi Smart Band 7</string>
+    <string name="devicetype_miband8">Xiaomi Smart Band 8</string>
     <string name="devicetype_amazfit_balance">Amazfit Balance</string>
     <string name="devicetype_amazfit_active">Amazfit Active</string>
     <string name="devicetype_amazfit_active_edge">Amazfit Active Edge</string>
@@ -2390,6 +2391,7 @@
     <string name="temperature_scale_cf_summary">Select whether device uses Celsius or Fahrenheit scale.</string>
     <string name="temperature_scale_celsius">Celsius</string>
     <string name="temperature_scale_fahrenheit">Fahrenheit</string>
+
     <string name="fossil_hr_nav_app_not_installed_notify_title">Navigation app not installed on watch</string>
     <string name="fossil_hr_nav_app_not_installed_notify_text">Navigation started but navigationApp not installed on watch. Please install it from the App Manager.</string>
     <string name="call_rejection_method_reject">Reject</string>
@@ -2404,4 +2406,5 @@
     <string name="pref_title_navigation_apps">Navigation apps</string>
     <string name="pref_navigation_app_osmand">OsmAnd(+)</string>
     <string name="pref_navigation_app_gmaps">Google Maps</string>
+    <string name="serial_number">Serial Number</string>
 </resources>

From 7af155281c298258187d420277002dcf80de32af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Tue, 3 Oct 2023 22:52:20 +0100
Subject: [PATCH 032/595] Mi Band 8: Remove custom pairing activity

Does not seem to be needed (or work, actually)
---
 .../gadgetbridge/devices/xiaomi/XiaomiCoordinator.java | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
index c9ee32ab7..2b8cef3bf 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
@@ -16,10 +16,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi;
 
-import android.app.Activity;
 import android.bluetooth.le.ScanFilter;
-import android.content.Context;
-import android.net.Uri;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -37,10 +34,8 @@ import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSpec
 import nodomain.freeyourgadget.gadgetbridge.capabilities.HeartRateCapability;
 import nodomain.freeyourgadget.gadgetbridge.capabilities.password.PasswordCapabilityImpl;
 import nodomain.freeyourgadget.gadgetbridge.devices.AbstractBLEDeviceCoordinator;
-import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
 import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.devices.TimeSampleProvider;
-import nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandPairingActivity;
 import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
@@ -375,11 +370,6 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
         return allLanguages.toArray(new String[0]);
     }
 
-    @Override
-    public Class<? extends Activity> getPairingActivity() {
-        return MiBandPairingActivity.class;
-    }
-
     @Override
     public PasswordCapabilityImpl.Mode getPasswordCapability() {
         return PasswordCapabilityImpl.Mode.NUMBERS_6;

From 290383627e14b9531eb1996631eef783747c5a94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Tue, 3 Oct 2023 23:18:03 +0100
Subject: [PATCH 033/595] Mi Band 8: Fix system service

---
 .../devices/xiaomi/XiaomiConstants.java       |   6 -
 .../service/devices/xiaomi/XiaomiSupport.java | 102 +----------------
 .../xiaomi/services/XiaomiSystemService.java  | 108 ++++++++++++++++++
 3 files changed, 111 insertions(+), 105 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiConstants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiConstants.java
index 37864a3f8..b002988aa 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiConstants.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiConstants.java
@@ -40,16 +40,10 @@ public class XiaomiConstants {
     public static final UUID UUID_CHARACTERISTIC_XIAOMI_UNKNOWN_0003 = UUID.fromString((String.format(BASE_UUID, "0003")));
 
     public static final int CMD_TYPE_AUTH = 1;
-    public static final int CMD_TYPE_SYSTEM = 2;
 
     public static final int CMD_AUTH_NONCE = 26;
     public static final int CMD_AUTH_AUTH = 27;
 
-    public static final int CMD_SYSTEM_BATTERY = 1;
-    public static final int CMD_SYSTEM_DEVICE_INFO = 2;
-    public static final int CMD_SYSTEM_CLOCK = 3;
-    public static final int CMD_SYSTEM_CHARGER = 79;
-
     // TODO not like this
     public static final byte[] PAYLOAD_ACK = new byte[]{0, 0, 3, 0};
     public static final byte[] PAYLOAD_HEADER_AUTH = new byte[]{0, 0, 2, 2};
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
index 138ed62f3..3ff37301b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
@@ -236,58 +236,14 @@ public class XiaomiSupport extends AbstractBTLEDeviceSupport {
             LOG.error("Failed to initialize transaction builder", e);
             return;
         }
-        setCurrentTime(builder);
+        systemService.setCurrentTime(builder);
         builder.queue(getQueue());
     }
 
-    public void setCurrentTime(final TransactionBuilder builder) {
-        final Calendar now = GregorianCalendar.getInstance();
-        final TimeZone tz = TimeZone.getDefault();
-
-        final GBPrefs gbPrefs = new GBPrefs(new Prefs(GBApplication.getDeviceSpecificSharedPrefs(gbDevice.getAddress())));
-        final String timeFormat = gbPrefs.getTimeFormat();
-        final boolean is24hour = DeviceSettingsPreferenceConst.PREF_TIMEFORMAT_24H.equals(timeFormat);
-
-        final XiaomiProto.Clock clock = XiaomiProto.Clock.newBuilder()
-                .setTime(XiaomiProto.Time.newBuilder()
-                        .setHour(now.get(Calendar.HOUR_OF_DAY))
-                        .setMinute(now.get(Calendar.MINUTE))
-                        .setSecond(now.get(Calendar.SECOND))
-                        .setMillisecond(now.get(Calendar.MILLISECOND))
-                        .build())
-                .setDate(XiaomiProto.Date.newBuilder()
-                        .setYear(now.get(Calendar.YEAR))
-                        .setMonth(now.get(Calendar.MONTH) + 1)
-                        .setDay(now.get(Calendar.DATE))
-                        .build())
-                .setTimezone(XiaomiProto.TimeZone.newBuilder()
-                        .setZoneOffset(((now.get(Calendar.ZONE_OFFSET) / 1000) / 60) / 15)
-                        .setDstOffset(((now.get(Calendar.DST_OFFSET) / 1000) / 60) / 15)
-                        .setName(tz.getID())
-                        .build())
-                .setIsNot24Hour(!is24hour)
-                .build();
-
-        sendCommand(
-                builder,
-                XiaomiProto.Command.newBuilder()
-                        .setType(CMD_TYPE_SYSTEM)
-                        .setSubtype(CMD_SYSTEM_CLOCK)
-                        .setSystem(XiaomiProto.System.newBuilder().setClock(clock).build())
-                        .build()
-        );
-    }
-
     @Override
     public void onTestNewFunction() {
         final TransactionBuilder builder = createTransactionBuilder("test new function");
-        sendCommand(
-                builder,
-                XiaomiProto.Command.newBuilder()
-                        .setType(CMD_TYPE_SYSTEM)
-                        .setSubtype(CMD_SYSTEM_DEVICE_INFO)
-                        .build()
-        );
+
         builder.queue(getQueue());
     }
 
@@ -466,18 +422,12 @@ public class XiaomiSupport extends AbstractBTLEDeviceSupport {
         encryptedIndex = 1; // TODO not here
 
         if (GBApplication.getPrefs().getBoolean("datetime_synconconnect", true)) {
-            setCurrentTime(builder);
+            systemService.setCurrentTime(builder);
         }
 
         for (final AbstractXiaomiService service : mServiceMap.values()) {
             service.initialize(builder);
         }
-
-        // request device info
-        sendCommand(builder, CMD_TYPE_SYSTEM, CMD_SYSTEM_DEVICE_INFO);
-
-        // request battery status
-        sendCommand(builder, CMD_TYPE_SYSTEM, CMD_SYSTEM_BATTERY);
     }
 
     private void sendAck(final BluetoothGattCharacteristic characteristic) {
@@ -486,52 +436,6 @@ public class XiaomiSupport extends AbstractBTLEDeviceSupport {
         builder.queue(getQueue());
     }
 
-    protected void handleConfigCommand(final XiaomiProto.Command cmd) {
-        switch (cmd.getSubtype()) {
-            case CMD_SYSTEM_DEVICE_INFO:
-                final XiaomiProto.DeviceInfo deviceInfo = cmd.getSystem().getDeviceInfo();
-                final GBDeviceEventVersionInfo gbDeviceEventVersionInfo = new GBDeviceEventVersionInfo();
-                gbDeviceEventVersionInfo.fwVersion = deviceInfo.getFirmware();
-                //gbDeviceEventVersionInfo.fwVersion2 = "N/A";
-                gbDeviceEventVersionInfo.hwVersion = deviceInfo.getModel();
-                final GBDeviceEventUpdateDeviceInfo gbDeviceEventUpdateDeviceInfo = new GBDeviceEventUpdateDeviceInfo("SERIAL: ", deviceInfo.getSerialNumber());
-
-                evaluateGBDeviceEvent(gbDeviceEventVersionInfo);
-                evaluateGBDeviceEvent(gbDeviceEventUpdateDeviceInfo);
-                return;
-            case CMD_SYSTEM_BATTERY:
-                final XiaomiProto.Battery battery = cmd.getSystem().getPower().getBattery();
-                final GBDeviceEventBatteryInfo batteryInfo = new GBDeviceEventBatteryInfo();
-                batteryInfo.batteryIndex = 0;
-                batteryInfo.level = battery.getLevel();
-                switch (battery.getState()) {
-                    case 1:
-                        batteryInfo.state = BatteryState.BATTERY_CHARGING;
-                        break;
-                    case 2:
-                        batteryInfo.state = BatteryState.BATTERY_NORMAL;
-                        break;
-                    default:
-                        batteryInfo.state = BatteryState.UNKNOWN;
-                        LOG.warn("Unknown battery state {}", battery.getState());
-                }
-                evaluateGBDeviceEvent(batteryInfo);
-                return;
-            case CMD_SYSTEM_CHARGER:
-                // charger event, request battery state
-                sendCommand(
-                        "request battery state",
-                        XiaomiProto.Command.newBuilder()
-                                .setType(CMD_TYPE_SYSTEM)
-                                .setSubtype(CMD_SYSTEM_BATTERY)
-                                .build()
-                );
-                return;
-            default:
-                LOG.warn("Unknown config command {}", cmd.getSubtype());
-        }
-    }
-
     private short encryptedIndex = 0;
 
     public void sendCommand(final String taskName, final XiaomiProto.Command command) {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
index 4b0074376..6f1359dbd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
@@ -19,20 +19,128 @@ package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+import java.util.TimeZone;
+
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
+import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventBatteryInfo;
+import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdateDeviceInfo;
+import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventVersionInfo;
+import nodomain.freeyourgadget.gadgetbridge.model.BatteryState;
 import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
+import nodomain.freeyourgadget.gadgetbridge.util.GBPrefs;
+import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 
 public class XiaomiSystemService extends AbstractXiaomiService {
     private static final Logger LOG = LoggerFactory.getLogger(XiaomiSystemService.class);
 
     public static final int COMMAND_TYPE = 2;
 
+    public static final int CMD_BATTERY = 1;
+    public static final int CMD_DEVICE_INFO = 2;
+    public static final int CMD_CLOCK = 3;
+    public static final int CMD_CHARGER = 79;
+
     public XiaomiSystemService(final XiaomiSupport support) {
         super(support);
     }
 
+    @Override
+    public void initialize(final TransactionBuilder builder) {
+        // request device info
+        getSupport().sendCommand(builder, COMMAND_TYPE, CMD_DEVICE_INFO);
+
+        // request battery status
+        getSupport().sendCommand(builder, COMMAND_TYPE, CMD_BATTERY);
+    }
+
     @Override
     public void handleCommand(final XiaomiProto.Command cmd) {
         // TODO
+        switch (cmd.getSubtype()) {
+            case CMD_DEVICE_INFO:
+                final XiaomiProto.DeviceInfo deviceInfo = cmd.getSystem().getDeviceInfo();
+                final GBDeviceEventVersionInfo gbDeviceEventVersionInfo = new GBDeviceEventVersionInfo();
+                gbDeviceEventVersionInfo.fwVersion = deviceInfo.getFirmware();
+                //gbDeviceEventVersionInfo.fwVersion2 = "N/A";
+                gbDeviceEventVersionInfo.hwVersion = deviceInfo.getModel();
+                final GBDeviceEventUpdateDeviceInfo gbDeviceEventUpdateDeviceInfo = new GBDeviceEventUpdateDeviceInfo("SERIAL: ", deviceInfo.getSerialNumber());
+
+                getSupport().evaluateGBDeviceEvent(gbDeviceEventVersionInfo);
+                getSupport().evaluateGBDeviceEvent(gbDeviceEventUpdateDeviceInfo);
+                return;
+            case CMD_BATTERY:
+                final XiaomiProto.Battery battery = cmd.getSystem().getPower().getBattery();
+                final GBDeviceEventBatteryInfo batteryInfo = new GBDeviceEventBatteryInfo();
+                batteryInfo.batteryIndex = 0;
+                batteryInfo.level = battery.getLevel();
+                switch (battery.getState()) {
+                    case 1:
+                        batteryInfo.state = BatteryState.BATTERY_CHARGING;
+                        break;
+                    case 2:
+                        batteryInfo.state = BatteryState.BATTERY_NORMAL;
+                        break;
+                    default:
+                        batteryInfo.state = BatteryState.UNKNOWN;
+                        LOG.warn("Unknown battery state {}", battery.getState());
+                }
+                getSupport().evaluateGBDeviceEvent(batteryInfo);
+                return;
+            case CMD_CHARGER:
+                // charger event, request battery state
+                getSupport().sendCommand(
+                        "request battery state",
+                        XiaomiProto.Command.newBuilder()
+                                .setType(COMMAND_TYPE)
+                                .setSubtype(CMD_BATTERY)
+                                .build()
+                );
+                return;
+            default:
+                LOG.warn("Unknown config command {}", cmd.getSubtype());
+        }
+    }
+
+    public void setCurrentTime(final TransactionBuilder builder) {
+        final Calendar now = GregorianCalendar.getInstance();
+        final TimeZone tz = TimeZone.getDefault();
+
+        final GBPrefs gbPrefs = new GBPrefs(new Prefs(GBApplication.getDeviceSpecificSharedPrefs(getSupport().getDevice().getAddress())));
+        final String timeFormat = gbPrefs.getTimeFormat();
+        final boolean is24hour = DeviceSettingsPreferenceConst.PREF_TIMEFORMAT_24H.equals(timeFormat);
+
+        final XiaomiProto.Clock clock = XiaomiProto.Clock.newBuilder()
+                .setTime(XiaomiProto.Time.newBuilder()
+                        .setHour(now.get(Calendar.HOUR_OF_DAY))
+                        .setMinute(now.get(Calendar.MINUTE))
+                        .setSecond(now.get(Calendar.SECOND))
+                        .setMillisecond(now.get(Calendar.MILLISECOND))
+                        .build())
+                .setDate(XiaomiProto.Date.newBuilder()
+                        .setYear(now.get(Calendar.YEAR))
+                        .setMonth(now.get(Calendar.MONTH) + 1)
+                        .setDay(now.get(Calendar.DATE))
+                        .build())
+                .setTimezone(XiaomiProto.TimeZone.newBuilder()
+                        .setZoneOffset(((now.get(Calendar.ZONE_OFFSET) / 1000) / 60) / 15)
+                        .setDstOffset(((now.get(Calendar.DST_OFFSET) / 1000) / 60) / 15)
+                        .setName(tz.getID())
+                        .build())
+                .setIsNot24Hour(!is24hour)
+                .build();
+
+        getSupport().sendCommand(
+                builder,
+                XiaomiProto.Command.newBuilder()
+                        .setType(COMMAND_TYPE)
+                        .setSubtype(CMD_CLOCK)
+                        .setSystem(XiaomiProto.System.newBuilder().setClock(clock).build())
+                        .build()
+        );
     }
 }

From f23347c47dc26c0a0dd684440a1fbdeceeca0e3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Tue, 3 Oct 2023 23:44:39 +0100
Subject: [PATCH 034/595] Mi Band 8: Add broken notifications

---
 .../services/XiaomiNotificationService.java   | 66 ++++++++++++++++++-
 app/src/main/proto/xiaomi.proto               |  2 +
 2 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
index 8fa404d83..acbb3a6ff 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
@@ -19,17 +19,28 @@ package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.nio.charset.StandardCharsets;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+
+import nodomain.freeyourgadget.gadgetbridge.BuildConfig;
 import nodomain.freeyourgadget.gadgetbridge.model.CallSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.CannedMessagesSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.NotificationSpec;
 import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
+import nodomain.freeyourgadget.gadgetbridge.util.StringUtils;
 
 public class XiaomiNotificationService extends AbstractXiaomiService {
     private static final Logger LOG = LoggerFactory.getLogger(XiaomiNotificationService.class);
 
+    private static final SimpleDateFormat TIMESTAMP_SDF = new SimpleDateFormat("yyyyMMdd'T'HHmmss", Locale.ROOT);
+
     public static final int COMMAND_TYPE = 7;
 
+    public static final int CMD_NOTIFICATION_SEND = 0;
+
     public XiaomiNotificationService(final XiaomiSupport support) {
         super(support);
     }
@@ -40,7 +51,60 @@ public class XiaomiNotificationService extends AbstractXiaomiService {
     }
 
     public void onNotification(final NotificationSpec notificationSpec) {
-        // TODO
+        // TODO this is not working
+        if (true) {
+            LOG.warn("Notifications disabled, they're not working");
+            return;
+        }
+
+        final XiaomiProto.Notification3.Builder notification3 = XiaomiProto.Notification3.newBuilder()
+                .setId(notificationSpec.getId())
+                .setTimestamp(TIMESTAMP_SDF.format(new Date(notificationSpec.when)));
+
+        if (notificationSpec.sourceAppId != null) {
+            notification3.setPackage(notificationSpec.sourceAppId);
+        } else {
+            notification3.setPackage(BuildConfig.APPLICATION_ID);
+        }
+
+        final String senderOrTitle = StringUtils.getFirstOf(notificationSpec.sender, notificationSpec.title);
+        if (!senderOrTitle.isEmpty()) {
+            notification3.setTitle(senderOrTitle);
+        }
+
+        if (notificationSpec.body != null) {
+            notification3.setBody(notificationSpec.body);
+        }
+
+        if (notificationSpec.sourceName != null) {
+            notification3.setAppName(notificationSpec.sourceName);
+        }
+
+        // TODO what is this?
+        final String unknown12 = String.format(
+                Locale.ROOT,
+                "0|%s|%d|null|12345",
+                notification3.getPackage(),
+                notification3.getId() // i think this needs to be converted to unsigned
+        );
+        notification3.setUnknown12(unknown12);
+
+        final XiaomiProto.Notification2 notification2 = XiaomiProto.Notification2.newBuilder()
+                .setNotification3(notification3)
+                .build();
+
+        final XiaomiProto.Notification notification = XiaomiProto.Notification.newBuilder()
+                .setNotification2(notification2)
+                .build();
+
+        getSupport().sendCommand(
+                "send notification",
+                XiaomiProto.Command.newBuilder()
+                        .setType(COMMAND_TYPE)
+                        .setSubtype(CMD_NOTIFICATION_SEND)
+                        .setNotification(notification)
+                        .build()
+        );
     }
 
     public void onDeleteNotification(final int id) {
diff --git a/app/src/main/proto/xiaomi.proto b/app/src/main/proto/xiaomi.proto
index 71dddfac0..c50c28fe5 100644
--- a/app/src/main/proto/xiaomi.proto
+++ b/app/src/main/proto/xiaomi.proto
@@ -458,6 +458,8 @@ message Notification3 {
   optional string unknown4 = 4;
   optional string body = 5;
   optional uint32 id = 7;
+  optional string unknown8 = 8;
+  optional string unknown11 = 11;
   optional string unknown12 = 12;
   optional uint32 hasReply = 13;
 }

From 4ede29d1f121122d5009ee293569c5788f12049b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Wed, 4 Oct 2023 23:21:08 +0100
Subject: [PATCH 035/595] Mi Band 8: Toggle realtime stats (wip)

---
 .../devices/xiaomi/XiaomiSampleProvider.java  |   2 +-
 .../service/devices/xiaomi/XiaomiSupport.java |  14 +--
 .../xiaomi/services/XiaomiHealthService.java  | 100 +++++++++++++++++-
 3 files changed, 98 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSampleProvider.java
index 736317bf4..a4ba4e6ab 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSampleProvider.java
@@ -29,7 +29,7 @@ import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 
 // TODO s/HuamiExtendedActivitySample/XiaomiActivitySample/g
 public class XiaomiSampleProvider extends AbstractSampleProvider<HuamiExtendedActivitySample> {
-    protected XiaomiSampleProvider(final GBDevice device, final DaoSession session) {
+    public XiaomiSampleProvider(final GBDevice device, final DaoSession session) {
         super(device, session);
     }
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
index 3ff37301b..7ef36c5e3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
@@ -35,21 +35,13 @@ import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Calendar;
-import java.util.GregorianCalendar;
 import java.util.LinkedHashMap;
 import java.util.Map;
-import java.util.TimeZone;
 import java.util.UUID;
 
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
-import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
-import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventBatteryInfo;
-import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdateDeviceInfo;
-import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventVersionInfo;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.model.Alarm;
-import nodomain.freeyourgadget.gadgetbridge.model.BatteryState;
 import nodomain.freeyourgadget.gadgetbridge.model.CalendarEventSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.CallSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.CannedMessagesSpec;
@@ -73,8 +65,6 @@ import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.Xiao
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.XiaomiSystemService;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.XiaomiWeatherService;
 import nodomain.freeyourgadget.gadgetbridge.util.GB;
-import nodomain.freeyourgadget.gadgetbridge.util.GBPrefs;
-import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 
 public class XiaomiSupport extends AbstractBTLEDeviceSupport {
     private static final Logger LOG = LoggerFactory.getLogger(XiaomiSupport.class);
@@ -376,12 +366,12 @@ public class XiaomiSupport extends AbstractBTLEDeviceSupport {
 
     @Override
     public void onEnableRealtimeHeartRateMeasurement(final boolean enable) {
-        healthService.onEnableRealtimeHeartRateMeasurement(enable);
+        healthService.enableRealtimeStats(enable);
     }
 
     @Override
     public void onEnableRealtimeSteps(final boolean enable) {
-        healthService.onEnableRealtimeSteps(enable);
+        healthService.enableRealtimeStats(enable);
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
index 639555605..91c56f69b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
@@ -16,6 +16,10 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services;
 
+import android.content.Intent;
+
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -23,7 +27,19 @@ import java.util.Calendar;
 import java.util.GregorianCalendar;
 import java.util.Locale;
 
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.database.DBHandler;
+import nodomain.freeyourgadget.gadgetbridge.database.DBHelper;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiSampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.entities.Device;
+import nodomain.freeyourgadget.gadgetbridge.entities.HuamiExtendedActivitySample;
+import nodomain.freeyourgadget.gadgetbridge.entities.User;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.model.ActivityKind;
+import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
 import nodomain.freeyourgadget.gadgetbridge.model.ActivityUser;
+import nodomain.freeyourgadget.gadgetbridge.model.DeviceService;
 import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
@@ -34,16 +50,29 @@ public class XiaomiHealthService extends AbstractXiaomiService {
     public static final int COMMAND_TYPE = 8;
 
     private static final int CMD_SET_USER_INFO = 0;
+    private static final int CMD_REALTIME_STATS_START = 45;
+    private static final int CMD_REALTIME_STATS_STOP = 46;
+    private static final int CMD_REALTIME_STATS_EVENT = 47;
 
     private static final int GENDER_MALE = 1;
     private static final int GENDER_FEMALE = 2;
 
+    private boolean realtimeStarted = false;
+    private boolean realtimeOneShot = false;
+    private int previousSteps = -1;
+
     public XiaomiHealthService(final XiaomiSupport support) {
         super(support);
     }
 
     @Override
     public void handleCommand(final XiaomiProto.Command cmd) {
+        switch (cmd.getSubtype()) {
+            case CMD_REALTIME_STATS_EVENT:
+                handleRealtimeStats(cmd.getHealth().getRealTimeStats());
+                return;
+        }
+
         // TODO
         LOG.warn("Unhandled health command");
     }
@@ -97,14 +126,75 @@ public class XiaomiHealthService extends AbstractXiaomiService {
     }
 
     public void onHeartRateTest() {
-        // TODO
+        realtimeStarted = true;
+        realtimeOneShot = true;
+
+        getSupport().sendCommand(
+                "heart rate test",
+                XiaomiProto.Command.newBuilder()
+                        .setType(COMMAND_TYPE)
+                        .setSubtype(CMD_REALTIME_STATS_START)
+                        .build()
+        );
     }
 
-    public void onEnableRealtimeHeartRateMeasurement(final boolean enable) {
-        // TODO
+    public void enableRealtimeStats(final boolean enable) {
+        if (realtimeStarted == enable) {
+            // same state, ignore
+            return;
+        }
+
+        realtimeStarted = enable;
+        realtimeOneShot = false;
+        previousSteps = -1;
+
+        getSupport().sendCommand(
+                "realtime data",
+                XiaomiProto.Command.newBuilder()
+                        .setType(COMMAND_TYPE)
+                        .setSubtype(enable ? CMD_REALTIME_STATS_START : CMD_REALTIME_STATS_STOP)
+                        .build()
+        );
     }
 
-    public void onEnableRealtimeSteps(final boolean enable) {
-        // TODO
+    private void handleRealtimeStats(final XiaomiProto.RealTimeStats realTimeStats) {
+        if (realtimeOneShot) {
+            enableRealtimeStats(false);
+        }
+
+        if (previousSteps == -1) {
+            previousSteps = realTimeStats.getSteps();
+        }
+
+        final HuamiExtendedActivitySample sample;
+        try (final DBHandler dbHandler = GBApplication.acquireDB()) {
+            final DaoSession session = dbHandler.getDaoSession();
+
+            final GBDevice gbDevice = getSupport().getDevice();
+            final Device device = DBHelper.getDevice(gbDevice, session);
+            final User user = DBHelper.getUser(session);
+            final int ts = (int) (System.currentTimeMillis() / 1000);
+            final XiaomiSampleProvider provider = new XiaomiSampleProvider(gbDevice, session);
+            sample = provider.createActivitySample();
+
+            sample.setDeviceId(device.getId());
+            sample.setUserId(user.getId());
+            sample.setTimestamp(ts);
+            sample.setHeartRate(realTimeStats.getHeartRate());
+            sample.setSteps(realTimeStats.getSteps() - previousSteps);
+            sample.setRawKind(ActivityKind.TYPE_UNKNOWN);
+            sample.setHeartRate(realTimeStats.getHeartRate());
+            sample.setRawIntensity(ActivitySample.NOT_MEASURED);
+            sample.setRawKind(ActivityKind.TYPE_UNKNOWN);
+        } catch (final Exception e) {
+            LOG.error("Error creating activity sample", e);
+            return;
+        }
+
+        previousSteps = realTimeStats.getSteps();
+
+        final Intent intent = new Intent(DeviceService.ACTION_REALTIME_SAMPLES)
+                .putExtra(DeviceService.EXTRA_REALTIME_SAMPLE, sample);
+        LocalBroadcastManager.getInstance(getSupport().getContext()).sendBroadcast(intent);
     }
 }

From 08eb22b4cbe9460b3629c84b733f5107f904c221 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Thu, 5 Oct 2023 10:40:49 +0100
Subject: [PATCH 036/595] Mi Band 8: Import Bouncy Castle 1.76 classes

---
 README.md                                     |    2 +-
 app/build.gradle                              |    6 +-
 .../org/bouncycastle/crypto/BlockCipher.java  |   56 +
 .../bouncycastle/crypto/CipherParameters.java |    8 +
 .../bouncycastle/crypto/CryptoException.java  |   48 +
 .../crypto/DataLengthException.java           |   29 +
 .../crypto/DefaultMultiBlockCipher.java       |   33 +
 .../crypto/InvalidCipherTextException.java    |   40 +
 .../java/org/bouncycastle/crypto/Mac.java     |   71 +
 .../bouncycastle/crypto/MultiBlockCipher.java |   31 +
 .../crypto/OutputLengthException.java         |   10 +
 .../crypto/RuntimeCryptoException.java        |   26 +
 .../bouncycastle/crypto/SkippingCipher.java   |   31 +
 .../crypto/SkippingStreamCipher.java          |    9 +
 .../crypto/StreamBlockCipher.java             |   58 +
 .../org/bouncycastle/crypto/StreamCipher.java |   54 +
 .../crypto/engines/AESEngine.java             |  609 ++++++++
 .../crypto/macs/CBCBlockCipherMac.java        |  229 +++
 .../crypto/modes/AEADBlockCipher.java         |   17 +
 .../bouncycastle/crypto/modes/AEADCipher.java |  138 ++
 .../crypto/modes/CBCBlockCipher.java          |  266 ++++
 .../crypto/modes/CBCModeCipher.java           |   15 +
 .../crypto/modes/CCMBlockCipher.java          |  480 +++++++
 .../crypto/modes/CCMModeCipher.java           |    6 +
 .../crypto/modes/CTRModeCipher.java           |   16 +
 .../crypto/modes/SICBlockCipher.java          |  381 +++++
 .../crypto/paddings/BlockCipherPadding.java   |   48 +
 .../crypto/params/AEADParameters.java         |   61 +
 .../crypto/params/KeyParameter.java           |   56 +
 .../crypto/params/ParametersWithIV.java       |   39 +
 .../java/org/bouncycastle/util/Arrays.java    | 1227 +++++++++++++++++
 .../java/org/bouncycastle/util/Objects.java   |   14 +
 .../main/java/org/bouncycastle/util/Pack.java |   40 +
 .../java/org/bouncycastle/util/Strings.java   |   38 +
 34 files changed, 4188 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/java/org/bouncycastle/crypto/BlockCipher.java
 create mode 100644 app/src/main/java/org/bouncycastle/crypto/CipherParameters.java
 create mode 100644 app/src/main/java/org/bouncycastle/crypto/CryptoException.java
 create mode 100644 app/src/main/java/org/bouncycastle/crypto/DataLengthException.java
 create mode 100644 app/src/main/java/org/bouncycastle/crypto/DefaultMultiBlockCipher.java
 create mode 100644 app/src/main/java/org/bouncycastle/crypto/InvalidCipherTextException.java
 create mode 100644 app/src/main/java/org/bouncycastle/crypto/Mac.java
 create mode 100644 app/src/main/java/org/bouncycastle/crypto/MultiBlockCipher.java
 create mode 100644 app/src/main/java/org/bouncycastle/crypto/OutputLengthException.java
 create mode 100644 app/src/main/java/org/bouncycastle/crypto/RuntimeCryptoException.java
 create mode 100644 app/src/main/java/org/bouncycastle/crypto/SkippingCipher.java
 create mode 100644 app/src/main/java/org/bouncycastle/crypto/SkippingStreamCipher.java
 create mode 100644 app/src/main/java/org/bouncycastle/crypto/StreamBlockCipher.java
 create mode 100644 app/src/main/java/org/bouncycastle/crypto/StreamCipher.java
 create mode 100644 app/src/main/java/org/bouncycastle/crypto/engines/AESEngine.java
 create mode 100644 app/src/main/java/org/bouncycastle/crypto/macs/CBCBlockCipherMac.java
 create mode 100644 app/src/main/java/org/bouncycastle/crypto/modes/AEADBlockCipher.java
 create mode 100644 app/src/main/java/org/bouncycastle/crypto/modes/AEADCipher.java
 create mode 100644 app/src/main/java/org/bouncycastle/crypto/modes/CBCBlockCipher.java
 create mode 100644 app/src/main/java/org/bouncycastle/crypto/modes/CBCModeCipher.java
 create mode 100644 app/src/main/java/org/bouncycastle/crypto/modes/CCMBlockCipher.java
 create mode 100644 app/src/main/java/org/bouncycastle/crypto/modes/CCMModeCipher.java
 create mode 100644 app/src/main/java/org/bouncycastle/crypto/modes/CTRModeCipher.java
 create mode 100644 app/src/main/java/org/bouncycastle/crypto/modes/SICBlockCipher.java
 create mode 100644 app/src/main/java/org/bouncycastle/crypto/paddings/BlockCipherPadding.java
 create mode 100644 app/src/main/java/org/bouncycastle/crypto/params/AEADParameters.java
 create mode 100644 app/src/main/java/org/bouncycastle/crypto/params/KeyParameter.java
 create mode 100644 app/src/main/java/org/bouncycastle/crypto/params/ParametersWithIV.java
 create mode 100644 app/src/main/java/org/bouncycastle/util/Arrays.java
 create mode 100644 app/src/main/java/org/bouncycastle/util/Objects.java
 create mode 100644 app/src/main/java/org/bouncycastle/util/Pack.java
 create mode 100644 app/src/main/java/org/bouncycastle/util/Strings.java

diff --git a/README.md b/README.md
index 8fbef8cd7..af4612f27 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ vendor's servers.
 
 * Gadgetbridge is licensed under the AGPLv3
 * Files in app/src/main/java/net/osmand/ and app/src/main/aidl/net/osmand/ are licensed under the GPLv3 by OsmAnd BV
-
+* Files in app/src/main/java/org/bouncycastle are licensed under the MIT license by The Legion of the Bouncy Castle Inc.
 
 ## Download
 
diff --git a/app/build.gradle b/app/build.gradle
index 37842e998..e7cd7c641 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -292,9 +292,9 @@ dependencies {
     implementation 'com.google.protobuf:protobuf-javalite:3.21.7'
     implementation 'com.android.volley:volley:1.2.1'
 
-    // TODO pull just the needed classes into GB?
-    implementation 'org.bouncycastle:bcpkix-jdk15to18:1.71'
-    implementation 'org.bouncycastle:bcprov-jdk15to18:1.71'
+    // Bouncy Castle is included directly in GB, to avoid pulling the entire dependency
+    //implementation 'org.bouncycastle:bcpkix-jdk15to18:1.76'
+    //implementation 'org.bouncycastle:bcprov-jdk15to18:1.76'
 
 // NON-FOSS dependencies
 //    implementation('androidx.core:core-google-shortcuts:1.0.1') {
diff --git a/app/src/main/java/org/bouncycastle/crypto/BlockCipher.java b/app/src/main/java/org/bouncycastle/crypto/BlockCipher.java
new file mode 100644
index 000000000..370225f65
--- /dev/null
+++ b/app/src/main/java/org/bouncycastle/crypto/BlockCipher.java
@@ -0,0 +1,56 @@
+package org.bouncycastle.crypto;
+
+
+/**
+ * Block cipher engines are expected to conform to this interface.
+ */
+public interface BlockCipher
+{
+    /**
+     * Initialise the cipher.
+     *
+     * @param forEncryption if true the cipher is initialised for
+     *  encryption, if false for decryption.
+     * @param params the key and other data required by the cipher.
+     * @exception IllegalArgumentException if the params argument is
+     * inappropriate.
+     */
+    public void init(boolean forEncryption, CipherParameters params)
+        throws IllegalArgumentException;
+
+    /**
+     * Return the name of the algorithm the cipher implements.
+     *
+     * @return the name of the algorithm the cipher implements.
+     */
+    public String getAlgorithmName();
+
+    /**
+     * Return the block size for this cipher (in bytes).
+     *
+     * @return the block size for this cipher in bytes.
+     */
+    public int getBlockSize();
+
+    /**
+     * Process one block of input from the array in and write it to
+     * the out array.
+     *
+     * @param input the array containing the input data.
+     * @param inOff offset into the in array the data starts at.
+     * @param output the array the output data will be copied into.
+     * @param outOff the offset into the out array the output will start at.
+     * @exception DataLengthException if there isn't enough data in input , or
+     * space in out.
+     * @exception IllegalStateException if the cipher isn't initialised.
+     * @return the number of bytes processed and produced.
+     */
+    public int processBlock(byte[] input, int inOff, byte[] output, int outOff)
+        throws DataLengthException, IllegalStateException;
+
+    /**
+     * Reset the cipher. After resetting the cipher is in the same state
+     * as it was after the last init (if there was one).
+     */
+    public void reset();
+}
diff --git a/app/src/main/java/org/bouncycastle/crypto/CipherParameters.java b/app/src/main/java/org/bouncycastle/crypto/CipherParameters.java
new file mode 100644
index 000000000..5be873047
--- /dev/null
+++ b/app/src/main/java/org/bouncycastle/crypto/CipherParameters.java
@@ -0,0 +1,8 @@
+package org.bouncycastle.crypto;
+
+/**
+ * all parameter classes implement this.
+ */
+public interface CipherParameters
+{
+}
diff --git a/app/src/main/java/org/bouncycastle/crypto/CryptoException.java b/app/src/main/java/org/bouncycastle/crypto/CryptoException.java
new file mode 100644
index 000000000..352c5569b
--- /dev/null
+++ b/app/src/main/java/org/bouncycastle/crypto/CryptoException.java
@@ -0,0 +1,48 @@
+package org.bouncycastle.crypto;
+
+/**
+ * the foundation class for the hard exceptions thrown by the crypto packages.
+ */
+public class CryptoException 
+    extends Exception
+{
+    private Throwable cause;
+
+    /**
+     * base constructor.
+     */
+    public CryptoException()
+    {
+    }
+
+    /**
+     * create a CryptoException with the given message.
+     *
+     * @param message the message to be carried with the exception.
+     */
+    public CryptoException(
+        String  message)
+    {
+        super(message);
+    }
+
+    /**
+     * Create a CryptoException with the given message and underlying cause.
+     *
+     * @param message message describing exception.
+     * @param cause the throwable that was the underlying cause.
+     */
+    public CryptoException(
+        String  message,
+        Throwable cause)
+    {
+        super(message);
+
+        this.cause = cause;
+    }
+
+    public Throwable getCause()
+    {
+        return cause;
+    }
+}
diff --git a/app/src/main/java/org/bouncycastle/crypto/DataLengthException.java b/app/src/main/java/org/bouncycastle/crypto/DataLengthException.java
new file mode 100644
index 000000000..fbf047cf5
--- /dev/null
+++ b/app/src/main/java/org/bouncycastle/crypto/DataLengthException.java
@@ -0,0 +1,29 @@
+package org.bouncycastle.crypto;
+
+/**
+ * this exception is thrown if a buffer that is meant to have output
+ * copied into it turns out to be too short, or if we've been given 
+ * insufficient input. In general this exception will get thrown rather
+ * than an ArrayOutOfBounds exception.
+ */
+public class DataLengthException 
+    extends RuntimeCryptoException
+{
+    /**
+     * base constructor.
+     */
+    public DataLengthException()
+    {
+    }
+
+    /**
+     * create a DataLengthException with the given message.
+     *
+     * @param message the message to be carried with the exception.
+     */
+    public DataLengthException(
+        String  message)
+    {
+        super(message);
+    }
+}
diff --git a/app/src/main/java/org/bouncycastle/crypto/DefaultMultiBlockCipher.java b/app/src/main/java/org/bouncycastle/crypto/DefaultMultiBlockCipher.java
new file mode 100644
index 000000000..3bc565cf0
--- /dev/null
+++ b/app/src/main/java/org/bouncycastle/crypto/DefaultMultiBlockCipher.java
@@ -0,0 +1,33 @@
+package org.bouncycastle.crypto;
+
+public abstract class DefaultMultiBlockCipher
+    implements MultiBlockCipher
+{
+    protected DefaultMultiBlockCipher()
+    {
+    }
+
+    public int getMultiBlockSize()
+    {
+        return this.getBlockSize();
+    }
+
+    public int processBlocks(byte[] in, int inOff, int blockCount, byte[] out, int outOff)
+        throws DataLengthException, IllegalStateException
+    {
+
+        // TODO check if the underlying cipher supports the multiblock interface and call it directly?
+
+        int resultLen = 0;
+        int blockSize = this.getMultiBlockSize();
+        
+        for (int i = 0; i != blockCount; i++)
+        {
+            resultLen += this.processBlock(in, inOff, out, outOff + resultLen);
+
+            inOff += blockSize;
+        }
+
+        return resultLen;
+    }
+}
diff --git a/app/src/main/java/org/bouncycastle/crypto/InvalidCipherTextException.java b/app/src/main/java/org/bouncycastle/crypto/InvalidCipherTextException.java
new file mode 100644
index 000000000..21c150d96
--- /dev/null
+++ b/app/src/main/java/org/bouncycastle/crypto/InvalidCipherTextException.java
@@ -0,0 +1,40 @@
+package org.bouncycastle.crypto;
+
+/**
+ * this exception is thrown whenever we find something we don't expect in a
+ * message.
+ */
+public class InvalidCipherTextException 
+    extends CryptoException
+{
+    /**
+     * base constructor.
+     */
+    public InvalidCipherTextException()
+    {
+    }
+
+    /**
+     * create a InvalidCipherTextException with the given message.
+     *
+     * @param message the message to be carried with the exception.
+     */
+    public InvalidCipherTextException(
+        String  message)
+    {
+        super(message);
+    }
+
+    /**
+     * create a InvalidCipherTextException with the given message.
+     *
+     * @param message the message to be carried with the exception.
+     * @param cause the root cause of the exception.
+     */
+    public InvalidCipherTextException(
+        String  message,
+        Throwable cause)
+    {
+        super(message, cause);
+    }
+}
diff --git a/app/src/main/java/org/bouncycastle/crypto/Mac.java b/app/src/main/java/org/bouncycastle/crypto/Mac.java
new file mode 100644
index 000000000..c00cd58cc
--- /dev/null
+++ b/app/src/main/java/org/bouncycastle/crypto/Mac.java
@@ -0,0 +1,71 @@
+package org.bouncycastle.crypto;
+
+
+/**
+ * The base interface for implementations of message authentication codes (MACs).
+ */
+public interface Mac
+{
+    /**
+     * Initialise the MAC.
+     *
+     * @param params the key and other data required by the MAC.
+     * @exception IllegalArgumentException if the params argument is
+     * inappropriate.
+     */
+    public void init(CipherParameters params)
+        throws IllegalArgumentException;
+
+    /**
+     * Return the name of the algorithm the MAC implements.
+     *
+     * @return the name of the algorithm the MAC implements.
+     */
+    public String getAlgorithmName();
+
+    /**
+     * Return the block size for this MAC (in bytes).
+     *
+     * @return the block size for this MAC in bytes.
+     */
+    public int getMacSize();
+
+    /**
+     * add a single byte to the mac for processing.
+     *
+     * @param in the byte to be processed.
+     * @exception IllegalStateException if the MAC is not initialised.
+     */
+    public void update(byte in)
+        throws IllegalStateException;
+
+    /**
+     * @param in the array containing the input.
+     * @param inOff the index in the array the data begins at.
+     * @param len the length of the input starting at inOff.
+     * @exception IllegalStateException if the MAC is not initialised.
+     * @exception DataLengthException if there isn't enough data in in.
+     */
+    public void update(byte[] in, int inOff, int len)
+        throws DataLengthException, IllegalStateException;
+
+    /**
+     * Compute the final stage of the MAC writing the output to the out
+     * parameter.
+     * <p>
+     * doFinal leaves the MAC in the same state it was after the last init.
+     *
+     * @param out the array the MAC is to be output to.
+     * @param outOff the offset into the out buffer the output is to start at.
+     * @exception DataLengthException if there isn't enough space in out.
+     * @exception IllegalStateException if the MAC is not initialised.
+     */
+    public int doFinal(byte[] out, int outOff)
+        throws DataLengthException, IllegalStateException;
+
+    /**
+     * Reset the MAC. At the end of resetting the MAC should be in the
+     * in the same state it was after the last init (if there was one).
+     */
+    public void reset();
+}
diff --git a/app/src/main/java/org/bouncycastle/crypto/MultiBlockCipher.java b/app/src/main/java/org/bouncycastle/crypto/MultiBlockCipher.java
new file mode 100644
index 000000000..dad402036
--- /dev/null
+++ b/app/src/main/java/org/bouncycastle/crypto/MultiBlockCipher.java
@@ -0,0 +1,31 @@
+package org.bouncycastle.crypto;
+
+/**
+ * Base interface for a cipher engine capable of processing multiple blocks at a time.
+ */
+public interface MultiBlockCipher
+    extends BlockCipher
+{
+    /**
+     * Return the multi-block size for this cipher (in bytes).
+     *
+     * @return the multi-block size for this cipher in bytes.
+     */
+    int getMultiBlockSize();
+
+    /**
+     * Process blockCount blocks from input in offset inOff and place the output in
+     * out from offset outOff.
+     *
+     * @param in input data array.
+     * @param inOff start of input data in in.
+     * @param blockCount number of blocks to be processed.
+     * @param out output data array.
+     * @param outOff start position for output data.
+     * @return number of bytes written to out.
+     * @throws DataLengthException
+     * @throws IllegalStateException
+     */
+    int processBlocks(byte[] in, int inOff, int blockCount, byte[] out, int outOff)
+        throws DataLengthException, IllegalStateException;
+}
diff --git a/app/src/main/java/org/bouncycastle/crypto/OutputLengthException.java b/app/src/main/java/org/bouncycastle/crypto/OutputLengthException.java
new file mode 100644
index 000000000..62811a2b5
--- /dev/null
+++ b/app/src/main/java/org/bouncycastle/crypto/OutputLengthException.java
@@ -0,0 +1,10 @@
+package org.bouncycastle.crypto;
+
+public class OutputLengthException
+    extends DataLengthException
+{
+    public OutputLengthException(String msg)
+    {
+        super(msg);
+    }
+}
diff --git a/app/src/main/java/org/bouncycastle/crypto/RuntimeCryptoException.java b/app/src/main/java/org/bouncycastle/crypto/RuntimeCryptoException.java
new file mode 100644
index 000000000..c1572020b
--- /dev/null
+++ b/app/src/main/java/org/bouncycastle/crypto/RuntimeCryptoException.java
@@ -0,0 +1,26 @@
+package org.bouncycastle.crypto;
+
+/**
+ * the foundation class for the exceptions thrown by the crypto packages.
+ */
+public class RuntimeCryptoException 
+    extends RuntimeException
+{
+    /**
+     * base constructor.
+     */
+    public RuntimeCryptoException()
+    {
+    }
+
+    /**
+     * create a RuntimeCryptoException with the given message.
+     *
+     * @param message the message to be carried with the exception.
+     */
+    public RuntimeCryptoException(
+        String  message)
+    {
+        super(message);
+    }
+}
diff --git a/app/src/main/java/org/bouncycastle/crypto/SkippingCipher.java b/app/src/main/java/org/bouncycastle/crypto/SkippingCipher.java
new file mode 100644
index 000000000..f8cc648eb
--- /dev/null
+++ b/app/src/main/java/org/bouncycastle/crypto/SkippingCipher.java
@@ -0,0 +1,31 @@
+package org.bouncycastle.crypto;
+
+/**
+ * Ciphers producing a key stream which can be reset to particular points in the stream implement this.
+ */
+public interface SkippingCipher
+{
+    /**
+     * Skip numberOfBytes forwards, or backwards.
+     *
+     * @param numberOfBytes the number of bytes to skip (positive forward, negative backwards).
+     * @return the number of bytes actually skipped.
+     * @throws java.lang.IllegalArgumentException if numberOfBytes is an invalid value.
+     */
+    long skip(long numberOfBytes);
+
+    /**
+     * Reset the cipher and then skip forward to a given position.
+     *
+     * @param position the number of bytes in to set the cipher state to.
+     * @return the byte position moved to.
+     */
+    long seekTo(long position);
+
+    /**
+     * Return the current "position" of the cipher
+     *
+     * @return the current byte position.
+     */
+    long getPosition();
+}
diff --git a/app/src/main/java/org/bouncycastle/crypto/SkippingStreamCipher.java b/app/src/main/java/org/bouncycastle/crypto/SkippingStreamCipher.java
new file mode 100644
index 000000000..a707a8108
--- /dev/null
+++ b/app/src/main/java/org/bouncycastle/crypto/SkippingStreamCipher.java
@@ -0,0 +1,9 @@
+package org.bouncycastle.crypto;
+
+/**
+ * General interface for a stream cipher that supports skipping.
+ */
+public interface SkippingStreamCipher
+    extends StreamCipher, SkippingCipher
+{
+}
diff --git a/app/src/main/java/org/bouncycastle/crypto/StreamBlockCipher.java b/app/src/main/java/org/bouncycastle/crypto/StreamBlockCipher.java
new file mode 100644
index 000000000..b1702fe7f
--- /dev/null
+++ b/app/src/main/java/org/bouncycastle/crypto/StreamBlockCipher.java
@@ -0,0 +1,58 @@
+package org.bouncycastle.crypto;
+
+/**
+ * A parent class for block cipher modes that do not require block aligned data to be processed, but can function in
+ * a streaming mode.
+ */
+public abstract class StreamBlockCipher
+    extends DefaultMultiBlockCipher
+    implements StreamCipher
+{
+    private final BlockCipher cipher;
+
+    protected StreamBlockCipher(BlockCipher cipher)
+    {
+        this.cipher = cipher;
+    }
+
+    /**
+     * return the underlying block cipher that we are wrapping.
+     *
+     * @return the underlying block cipher that we are wrapping.
+     */
+    public BlockCipher getUnderlyingCipher()
+    {
+        return cipher;
+    }
+
+    public final byte returnByte(byte in)
+    {
+        return calculateByte(in);
+    }
+
+    public int processBytes(byte[] in, int inOff, int len, byte[] out, int outOff)
+        throws DataLengthException
+    {
+        if (inOff + len > in.length)
+        {
+            throw new DataLengthException("input buffer too small");
+        }
+        if (outOff + len > out.length)
+        {
+            throw new OutputLengthException("output buffer too short");
+        }
+
+        int inStart = inOff;
+        int inEnd = inOff + len;
+        int outStart = outOff;
+
+        while (inStart < inEnd)
+        {
+             out[outStart++] = calculateByte(in[inStart++]);
+        }
+
+        return len;
+    }
+
+    protected abstract byte calculateByte(byte b);
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/bouncycastle/crypto/StreamCipher.java b/app/src/main/java/org/bouncycastle/crypto/StreamCipher.java
new file mode 100644
index 000000000..c1255e941
--- /dev/null
+++ b/app/src/main/java/org/bouncycastle/crypto/StreamCipher.java
@@ -0,0 +1,54 @@
+package org.bouncycastle.crypto;
+
+/**
+ * the interface stream ciphers conform to.
+ */
+public interface StreamCipher
+{
+    /**
+     * Initialise the cipher.
+     *
+     * @param forEncryption if true the cipher is initialised for
+     *  encryption, if false for decryption.
+     * @param params the key and other data required by the cipher.
+     * @exception IllegalArgumentException if the params argument is
+     * inappropriate.
+     */
+    public void init(boolean forEncryption, CipherParameters params)
+        throws IllegalArgumentException;
+
+    /**
+     * Return the name of the algorithm the cipher implements.
+     *
+     * @return the name of the algorithm the cipher implements.
+     */
+    public String getAlgorithmName();
+
+    /**
+     * encrypt/decrypt a single byte returning the result.
+     *
+     * @param in the byte to be processed.
+     * @return the result of processing the input byte.
+     */
+    public byte returnByte(byte in);
+
+    /**
+     * process a block of bytes from in putting the result into out.
+     *
+     * @param in the input byte array.
+     * @param inOff the offset into the in array where the data to be processed starts.
+     * @param len the number of bytes to be processed.
+     * @param out the output buffer the processed bytes go into.
+     * @param outOff the offset into the output byte array the processed data starts at.
+     * @return the number of bytes produced - should always be len.
+     * @exception DataLengthException if the output buffer is too small.
+     */
+    public int processBytes(byte[] in, int inOff, int len, byte[] out, int outOff)
+        throws DataLengthException;
+
+    /**
+     * reset the cipher. This leaves it in the same state
+     * it was at after the last init (if there was one).
+     */
+    public void reset();
+}
diff --git a/app/src/main/java/org/bouncycastle/crypto/engines/AESEngine.java b/app/src/main/java/org/bouncycastle/crypto/engines/AESEngine.java
new file mode 100644
index 000000000..6b3690732
--- /dev/null
+++ b/app/src/main/java/org/bouncycastle/crypto/engines/AESEngine.java
@@ -0,0 +1,609 @@
+package org.bouncycastle.crypto.engines;
+
+import org.bouncycastle.crypto.CipherParameters;
+import org.bouncycastle.crypto.DataLengthException;
+import org.bouncycastle.crypto.DefaultMultiBlockCipher;
+import org.bouncycastle.crypto.MultiBlockCipher;
+import org.bouncycastle.crypto.OutputLengthException;
+import org.bouncycastle.crypto.params.KeyParameter;
+import org.bouncycastle.util.Arrays;
+import org.bouncycastle.util.Pack;
+
+/**
+ * an implementation of the AES (Rijndael), from FIPS-197.
+ * <p>
+ * For further details see: <a href="https://csrc.nist.gov/encryption/aes/">https://csrc.nist.gov/encryption/aes/</a>.
+ *
+ * This implementation is based on optimizations from Dr. Brian Gladman's paper and C code at
+ * <a href="https://fp.gladman.plus.com/cryptography_technology/rijndael/">https://fp.gladman.plus.com/cryptography_technology/rijndael/</a>
+ *
+ * There are three levels of tradeoff of speed vs memory
+ * Because java has no preprocessor, they are written as three separate classes from which to choose
+ *
+ * The fastest uses 8Kbytes of static tables to precompute round calculations, 4 256 word tables for encryption
+ * and 4 for decryption.
+ *
+ * The middle performance version uses only one 256 word table for each, for a total of 2Kbytes,
+ * adding 12 rotate operations per round to compute the values contained in the other tables from
+ * the contents of the first.
+ *
+ * The slowest version uses no static tables at all and computes the values in each round.
+ * <p>
+ * This file contains the middle performance version with 2Kbytes of static tables for round precomputation.
+ *
+ */
+public class AESEngine
+    extends DefaultMultiBlockCipher
+{
+    // The S box
+    private static final byte[] S = {
+        (byte)99, (byte)124, (byte)119, (byte)123, (byte)242, (byte)107, (byte)111, (byte)197,
+        (byte)48,   (byte)1, (byte)103,  (byte)43, (byte)254, (byte)215, (byte)171, (byte)118,
+        (byte)202, (byte)130, (byte)201, (byte)125, (byte)250,  (byte)89,  (byte)71, (byte)240,
+        (byte)173, (byte)212, (byte)162, (byte)175, (byte)156, (byte)164, (byte)114, (byte)192,
+        (byte)183, (byte)253, (byte)147,  (byte)38,  (byte)54,  (byte)63, (byte)247, (byte)204,
+        (byte)52, (byte)165, (byte)229, (byte)241, (byte)113, (byte)216,  (byte)49,  (byte)21,
+        (byte)4, (byte)199,  (byte)35, (byte)195,  (byte)24, (byte)150,   (byte)5, (byte)154,
+        (byte)7,  (byte)18, (byte)128, (byte)226, (byte)235,  (byte)39, (byte)178, (byte)117,
+        (byte)9, (byte)131,  (byte)44,  (byte)26,  (byte)27, (byte)110,  (byte)90, (byte)160,
+        (byte)82,  (byte)59, (byte)214, (byte)179,  (byte)41, (byte)227,  (byte)47, (byte)132,
+        (byte)83, (byte)209,   (byte)0, (byte)237,  (byte)32, (byte)252, (byte)177,  (byte)91,
+        (byte)106, (byte)203, (byte)190,  (byte)57,  (byte)74,  (byte)76,  (byte)88, (byte)207,
+        (byte)208, (byte)239, (byte)170, (byte)251,  (byte)67,  (byte)77,  (byte)51, (byte)133,
+        (byte)69, (byte)249,   (byte)2, (byte)127,  (byte)80,  (byte)60, (byte)159, (byte)168,
+        (byte)81, (byte)163,  (byte)64, (byte)143, (byte)146, (byte)157,  (byte)56, (byte)245,
+        (byte)188, (byte)182, (byte)218,  (byte)33,  (byte)16, (byte)255, (byte)243, (byte)210,
+        (byte)205,  (byte)12,  (byte)19, (byte)236,  (byte)95, (byte)151,  (byte)68,  (byte)23,
+        (byte)196, (byte)167, (byte)126,  (byte)61, (byte)100,  (byte)93,  (byte)25, (byte)115,
+        (byte)96, (byte)129,  (byte)79, (byte)220,  (byte)34,  (byte)42, (byte)144, (byte)136,
+        (byte)70, (byte)238, (byte)184,  (byte)20, (byte)222,  (byte)94,  (byte)11, (byte)219,
+        (byte)224,  (byte)50,  (byte)58,  (byte)10,  (byte)73,   (byte)6,  (byte)36,  (byte)92,
+        (byte)194, (byte)211, (byte)172,  (byte)98, (byte)145, (byte)149, (byte)228, (byte)121,
+        (byte)231, (byte)200,  (byte)55, (byte)109, (byte)141, (byte)213,  (byte)78, (byte)169,
+        (byte)108,  (byte)86, (byte)244, (byte)234, (byte)101, (byte)122, (byte)174,   (byte)8,
+        (byte)186, (byte)120,  (byte)37,  (byte)46,  (byte)28, (byte)166, (byte)180, (byte)198,
+        (byte)232, (byte)221, (byte)116,  (byte)31,  (byte)75, (byte)189, (byte)139, (byte)138,
+        (byte)112,  (byte)62, (byte)181, (byte)102,  (byte)72,   (byte)3, (byte)246,  (byte)14,
+        (byte)97,  (byte)53,  (byte)87, (byte)185, (byte)134, (byte)193,  (byte)29, (byte)158,
+        (byte)225, (byte)248, (byte)152,  (byte)17, (byte)105, (byte)217, (byte)142, (byte)148,
+        (byte)155,  (byte)30, (byte)135, (byte)233, (byte)206,  (byte)85,  (byte)40, (byte)223,
+        (byte)140, (byte)161, (byte)137,  (byte)13, (byte)191, (byte)230,  (byte)66, (byte)104,
+        (byte)65, (byte)153,  (byte)45,  (byte)15, (byte)176,  (byte)84, (byte)187,  (byte)22,
+    };
+
+    // The inverse S-box
+    private static final byte[] Si = {
+        (byte)82,   (byte)9, (byte)106, (byte)213,  (byte)48,  (byte)54, (byte)165,  (byte)56,
+        (byte)191,  (byte)64, (byte)163, (byte)158, (byte)129, (byte)243, (byte)215, (byte)251,
+        (byte)124, (byte)227,  (byte)57, (byte)130, (byte)155,  (byte)47, (byte)255, (byte)135,
+        (byte)52, (byte)142,  (byte)67,  (byte)68, (byte)196, (byte)222, (byte)233, (byte)203,
+        (byte)84, (byte)123, (byte)148,  (byte)50, (byte)166, (byte)194,  (byte)35,  (byte)61,
+        (byte)238,  (byte)76, (byte)149,  (byte)11,  (byte)66, (byte)250, (byte)195,  (byte)78,
+        (byte)8,  (byte)46, (byte)161, (byte)102,  (byte)40, (byte)217,  (byte)36, (byte)178,
+        (byte)118,  (byte)91, (byte)162,  (byte)73, (byte)109, (byte)139, (byte)209,  (byte)37,
+        (byte)114, (byte)248, (byte)246, (byte)100, (byte)134, (byte)104, (byte)152,  (byte)22,
+        (byte)212, (byte)164,  (byte)92, (byte)204,  (byte)93, (byte)101, (byte)182, (byte)146,
+        (byte)108, (byte)112,  (byte)72,  (byte)80, (byte)253, (byte)237, (byte)185, (byte)218,
+        (byte)94,  (byte)21,  (byte)70,  (byte)87, (byte)167, (byte)141, (byte)157, (byte)132,
+        (byte)144, (byte)216, (byte)171,   (byte)0, (byte)140, (byte)188, (byte)211,  (byte)10,
+        (byte)247, (byte)228,  (byte)88,   (byte)5, (byte)184, (byte)179,  (byte)69,   (byte)6,
+        (byte)208,  (byte)44,  (byte)30, (byte)143, (byte)202,  (byte)63,  (byte)15,   (byte)2,
+        (byte)193, (byte)175, (byte)189,   (byte)3,   (byte)1,  (byte)19, (byte)138, (byte)107,
+        (byte)58, (byte)145,  (byte)17,  (byte)65,  (byte)79, (byte)103, (byte)220, (byte)234,
+        (byte)151, (byte)242, (byte)207, (byte)206, (byte)240, (byte)180, (byte)230, (byte)115,
+        (byte)150, (byte)172, (byte)116,  (byte)34, (byte)231, (byte)173,  (byte)53, (byte)133,
+        (byte)226, (byte)249,  (byte)55, (byte)232,  (byte)28, (byte)117, (byte)223, (byte)110,
+        (byte)71, (byte)241,  (byte)26, (byte)113,  (byte)29,  (byte)41, (byte)197, (byte)137,
+        (byte)111, (byte)183,  (byte)98,  (byte)14, (byte)170,  (byte)24, (byte)190,  (byte)27,
+        (byte)252,  (byte)86,  (byte)62,  (byte)75, (byte)198, (byte)210, (byte)121,  (byte)32,
+        (byte)154, (byte)219, (byte)192, (byte)254, (byte)120, (byte)205,  (byte)90, (byte)244,
+        (byte)31, (byte)221, (byte)168,  (byte)51, (byte)136,   (byte)7, (byte)199,  (byte)49,
+        (byte)177,  (byte)18,  (byte)16,  (byte)89,  (byte)39, (byte)128, (byte)236,  (byte)95,
+        (byte)96,  (byte)81, (byte)127, (byte)169,  (byte)25, (byte)181,  (byte)74,  (byte)13,
+        (byte)45, (byte)229, (byte)122, (byte)159, (byte)147, (byte)201, (byte)156, (byte)239,
+        (byte)160, (byte)224,  (byte)59,  (byte)77, (byte)174,  (byte)42, (byte)245, (byte)176,
+        (byte)200, (byte)235, (byte)187,  (byte)60, (byte)131,  (byte)83, (byte)153,  (byte)97,
+        (byte)23,  (byte)43,   (byte)4, (byte)126, (byte)186, (byte)119, (byte)214,  (byte)38,
+        (byte)225, (byte)105,  (byte)20,  (byte)99,  (byte)85,  (byte)33,  (byte)12, (byte)125,
+        };
+
+    // vector used in calculating key schedule (powers of x in GF(256))
+    private static final int[] rcon = {
+         0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d, 0x9a,
+         0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91 };
+
+    // precomputation tables of calculations for rounds
+    private static final int[] T0 =
+    {
+     0xa56363c6, 0x847c7cf8, 0x997777ee, 0x8d7b7bf6, 0x0df2f2ff, 
+     0xbd6b6bd6, 0xb16f6fde, 0x54c5c591, 0x50303060, 0x03010102, 
+     0xa96767ce, 0x7d2b2b56, 0x19fefee7, 0x62d7d7b5, 0xe6abab4d, 
+     0x9a7676ec, 0x45caca8f, 0x9d82821f, 0x40c9c989, 0x877d7dfa, 
+     0x15fafaef, 0xeb5959b2, 0xc947478e, 0x0bf0f0fb, 0xecadad41, 
+     0x67d4d4b3, 0xfda2a25f, 0xeaafaf45, 0xbf9c9c23, 0xf7a4a453, 
+     0x967272e4, 0x5bc0c09b, 0xc2b7b775, 0x1cfdfde1, 0xae93933d, 
+     0x6a26264c, 0x5a36366c, 0x413f3f7e, 0x02f7f7f5, 0x4fcccc83, 
+     0x5c343468, 0xf4a5a551, 0x34e5e5d1, 0x08f1f1f9, 0x937171e2, 
+     0x73d8d8ab, 0x53313162, 0x3f15152a, 0x0c040408, 0x52c7c795, 
+     0x65232346, 0x5ec3c39d, 0x28181830, 0xa1969637, 0x0f05050a, 
+     0xb59a9a2f, 0x0907070e, 0x36121224, 0x9b80801b, 0x3de2e2df, 
+     0x26ebebcd, 0x6927274e, 0xcdb2b27f, 0x9f7575ea, 0x1b090912, 
+     0x9e83831d, 0x742c2c58, 0x2e1a1a34, 0x2d1b1b36, 0xb26e6edc, 
+     0xee5a5ab4, 0xfba0a05b, 0xf65252a4, 0x4d3b3b76, 0x61d6d6b7, 
+     0xceb3b37d, 0x7b292952, 0x3ee3e3dd, 0x712f2f5e, 0x97848413, 
+     0xf55353a6, 0x68d1d1b9, 0x00000000, 0x2cededc1, 0x60202040, 
+     0x1ffcfce3, 0xc8b1b179, 0xed5b5bb6, 0xbe6a6ad4, 0x46cbcb8d, 
+     0xd9bebe67, 0x4b393972, 0xde4a4a94, 0xd44c4c98, 0xe85858b0, 
+     0x4acfcf85, 0x6bd0d0bb, 0x2aefefc5, 0xe5aaaa4f, 0x16fbfbed, 
+     0xc5434386, 0xd74d4d9a, 0x55333366, 0x94858511, 0xcf45458a, 
+     0x10f9f9e9, 0x06020204, 0x817f7ffe, 0xf05050a0, 0x443c3c78, 
+     0xba9f9f25, 0xe3a8a84b, 0xf35151a2, 0xfea3a35d, 0xc0404080, 
+     0x8a8f8f05, 0xad92923f, 0xbc9d9d21, 0x48383870, 0x04f5f5f1, 
+     0xdfbcbc63, 0xc1b6b677, 0x75dadaaf, 0x63212142, 0x30101020, 
+     0x1affffe5, 0x0ef3f3fd, 0x6dd2d2bf, 0x4ccdcd81, 0x140c0c18, 
+     0x35131326, 0x2fececc3, 0xe15f5fbe, 0xa2979735, 0xcc444488, 
+     0x3917172e, 0x57c4c493, 0xf2a7a755, 0x827e7efc, 0x473d3d7a, 
+     0xac6464c8, 0xe75d5dba, 0x2b191932, 0x957373e6, 0xa06060c0, 
+     0x98818119, 0xd14f4f9e, 0x7fdcdca3, 0x66222244, 0x7e2a2a54, 
+     0xab90903b, 0x8388880b, 0xca46468c, 0x29eeeec7, 0xd3b8b86b, 
+     0x3c141428, 0x79dedea7, 0xe25e5ebc, 0x1d0b0b16, 0x76dbdbad, 
+     0x3be0e0db, 0x56323264, 0x4e3a3a74, 0x1e0a0a14, 0xdb494992, 
+     0x0a06060c, 0x6c242448, 0xe45c5cb8, 0x5dc2c29f, 0x6ed3d3bd, 
+     0xefacac43, 0xa66262c4, 0xa8919139, 0xa4959531, 0x37e4e4d3, 
+     0x8b7979f2, 0x32e7e7d5, 0x43c8c88b, 0x5937376e, 0xb76d6dda, 
+     0x8c8d8d01, 0x64d5d5b1, 0xd24e4e9c, 0xe0a9a949, 0xb46c6cd8, 
+     0xfa5656ac, 0x07f4f4f3, 0x25eaeacf, 0xaf6565ca, 0x8e7a7af4, 
+     0xe9aeae47, 0x18080810, 0xd5baba6f, 0x887878f0, 0x6f25254a, 
+     0x722e2e5c, 0x241c1c38, 0xf1a6a657, 0xc7b4b473, 0x51c6c697, 
+     0x23e8e8cb, 0x7cdddda1, 0x9c7474e8, 0x211f1f3e, 0xdd4b4b96, 
+     0xdcbdbd61, 0x868b8b0d, 0x858a8a0f, 0x907070e0, 0x423e3e7c, 
+     0xc4b5b571, 0xaa6666cc, 0xd8484890, 0x05030306, 0x01f6f6f7, 
+     0x120e0e1c, 0xa36161c2, 0x5f35356a, 0xf95757ae, 0xd0b9b969, 
+     0x91868617, 0x58c1c199, 0x271d1d3a, 0xb99e9e27, 0x38e1e1d9, 
+     0x13f8f8eb, 0xb398982b, 0x33111122, 0xbb6969d2, 0x70d9d9a9, 
+     0x898e8e07, 0xa7949433, 0xb69b9b2d, 0x221e1e3c, 0x92878715, 
+     0x20e9e9c9, 0x49cece87, 0xff5555aa, 0x78282850, 0x7adfdfa5, 
+     0x8f8c8c03, 0xf8a1a159, 0x80898909, 0x170d0d1a, 0xdabfbf65, 
+     0x31e6e6d7, 0xc6424284, 0xb86868d0, 0xc3414182, 0xb0999929, 
+     0x772d2d5a, 0x110f0f1e, 0xcbb0b07b, 0xfc5454a8, 0xd6bbbb6d, 
+     0x3a16162c};
+
+private static final int[] Tinv0 =
+    {
+     0x50a7f451, 0x5365417e, 0xc3a4171a, 0x965e273a, 0xcb6bab3b, 
+     0xf1459d1f, 0xab58faac, 0x9303e34b, 0x55fa3020, 0xf66d76ad, 
+     0x9176cc88, 0x254c02f5, 0xfcd7e54f, 0xd7cb2ac5, 0x80443526, 
+     0x8fa362b5, 0x495ab1de, 0x671bba25, 0x980eea45, 0xe1c0fe5d, 
+     0x02752fc3, 0x12f04c81, 0xa397468d, 0xc6f9d36b, 0xe75f8f03, 
+     0x959c9215, 0xeb7a6dbf, 0xda595295, 0x2d83bed4, 0xd3217458, 
+     0x2969e049, 0x44c8c98e, 0x6a89c275, 0x78798ef4, 0x6b3e5899, 
+     0xdd71b927, 0xb64fe1be, 0x17ad88f0, 0x66ac20c9, 0xb43ace7d, 
+     0x184adf63, 0x82311ae5, 0x60335197, 0x457f5362, 0xe07764b1, 
+     0x84ae6bbb, 0x1ca081fe, 0x942b08f9, 0x58684870, 0x19fd458f, 
+     0x876cde94, 0xb7f87b52, 0x23d373ab, 0xe2024b72, 0x578f1fe3, 
+     0x2aab5566, 0x0728ebb2, 0x03c2b52f, 0x9a7bc586, 0xa50837d3, 
+     0xf2872830, 0xb2a5bf23, 0xba6a0302, 0x5c8216ed, 0x2b1ccf8a, 
+     0x92b479a7, 0xf0f207f3, 0xa1e2694e, 0xcdf4da65, 0xd5be0506, 
+     0x1f6234d1, 0x8afea6c4, 0x9d532e34, 0xa055f3a2, 0x32e18a05, 
+     0x75ebf6a4, 0x39ec830b, 0xaaef6040, 0x069f715e, 0x51106ebd, 
+     0xf98a213e, 0x3d06dd96, 0xae053edd, 0x46bde64d, 0xb58d5491, 
+     0x055dc471, 0x6fd40604, 0xff155060, 0x24fb9819, 0x97e9bdd6, 
+     0xcc434089, 0x779ed967, 0xbd42e8b0, 0x888b8907, 0x385b19e7, 
+     0xdbeec879, 0x470a7ca1, 0xe90f427c, 0xc91e84f8, 0x00000000, 
+     0x83868009, 0x48ed2b32, 0xac70111e, 0x4e725a6c, 0xfbff0efd, 
+     0x5638850f, 0x1ed5ae3d, 0x27392d36, 0x64d90f0a, 0x21a65c68, 
+     0xd1545b9b, 0x3a2e3624, 0xb1670a0c, 0x0fe75793, 0xd296eeb4, 
+     0x9e919b1b, 0x4fc5c080, 0xa220dc61, 0x694b775a, 0x161a121c, 
+     0x0aba93e2, 0xe52aa0c0, 0x43e0223c, 0x1d171b12, 0x0b0d090e, 
+     0xadc78bf2, 0xb9a8b62d, 0xc8a91e14, 0x8519f157, 0x4c0775af, 
+     0xbbdd99ee, 0xfd607fa3, 0x9f2601f7, 0xbcf5725c, 0xc53b6644, 
+     0x347efb5b, 0x7629438b, 0xdcc623cb, 0x68fcedb6, 0x63f1e4b8, 
+     0xcadc31d7, 0x10856342, 0x40229713, 0x2011c684, 0x7d244a85, 
+     0xf83dbbd2, 0x1132f9ae, 0x6da129c7, 0x4b2f9e1d, 0xf330b2dc, 
+     0xec52860d, 0xd0e3c177, 0x6c16b32b, 0x99b970a9, 0xfa489411, 
+     0x2264e947, 0xc48cfca8, 0x1a3ff0a0, 0xd82c7d56, 0xef903322, 
+     0xc74e4987, 0xc1d138d9, 0xfea2ca8c, 0x360bd498, 0xcf81f5a6, 
+     0x28de7aa5, 0x268eb7da, 0xa4bfad3f, 0xe49d3a2c, 0x0d927850, 
+     0x9bcc5f6a, 0x62467e54, 0xc2138df6, 0xe8b8d890, 0x5ef7392e, 
+     0xf5afc382, 0xbe805d9f, 0x7c93d069, 0xa92dd56f, 0xb31225cf, 
+     0x3b99acc8, 0xa77d1810, 0x6e639ce8, 0x7bbb3bdb, 0x097826cd, 
+     0xf418596e, 0x01b79aec, 0xa89a4f83, 0x656e95e6, 0x7ee6ffaa, 
+     0x08cfbc21, 0xe6e815ef, 0xd99be7ba, 0xce366f4a, 0xd4099fea, 
+     0xd67cb029, 0xafb2a431, 0x31233f2a, 0x3094a5c6, 0xc066a235, 
+     0x37bc4e74, 0xa6ca82fc, 0xb0d090e0, 0x15d8a733, 0x4a9804f1, 
+     0xf7daec41, 0x0e50cd7f, 0x2ff69117, 0x8dd64d76, 0x4db0ef43, 
+     0x544daacc, 0xdf0496e4, 0xe3b5d19e, 0x1b886a4c, 0xb81f2cc1, 
+     0x7f516546, 0x04ea5e9d, 0x5d358c01, 0x737487fa, 0x2e410bfb, 
+     0x5a1d67b3, 0x52d2db92, 0x335610e9, 0x1347d66d, 0x8c61d79a, 
+     0x7a0ca137, 0x8e14f859, 0x893c13eb, 0xee27a9ce, 0x35c961b7, 
+     0xede51ce1, 0x3cb1477a, 0x59dfd29c, 0x3f73f255, 0x79ce1418, 
+     0xbf37c773, 0xeacdf753, 0x5baafd5f, 0x146f3ddf, 0x86db4478, 
+     0x81f3afca, 0x3ec468b9, 0x2c342438, 0x5f40a3c2, 0x72c31d16, 
+     0x0c25e2bc, 0x8b493c28, 0x41950dff, 0x7101a839, 0xdeb30c08, 
+     0x9ce4b4d8, 0x90c15664, 0x6184cb7b, 0x70b632d5, 0x745c6c48, 
+     0x4257b8d0};
+
+    private static int shift(int r, int shift)
+    {
+        return (r >>> shift) | (r << -shift);
+    }
+
+    /* multiply four bytes in GF(2^8) by 'x' {02} in parallel */
+
+    private static final int m1 = 0x80808080;
+    private static final int m2 = 0x7f7f7f7f;
+    private static final int m3 = 0x0000001b;
+    private static final int m4 = 0xC0C0C0C0;
+    private static final int m5 = 0x3f3f3f3f;
+
+    private static int FFmulX(int x)
+    {
+        return (((x & m2) << 1) ^ (((x & m1) >>> 7) * m3));
+    }
+
+    private static int FFmulX2(int x)
+    {
+        int t0  = (x & m5) << 2;
+        int t1  = (x & m4);
+            t1 ^= (t1 >>> 1);
+        return t0 ^ (t1 >>> 2) ^ (t1 >>> 5);
+    }
+
+    /* 
+       The following defines provide alternative definitions of FFmulX that might
+       give improved performance if a fast 32-bit multiply is not available.
+       
+       private int FFmulX(int x) { int u = x & m1; u |= (u >> 1); return ((x & m2) << 1) ^ ((u >>> 3) | (u >>> 6)); } 
+       private static final int  m4 = 0x1b1b1b1b;
+       private int FFmulX(int x) { int u = x & m1; return ((x & m2) << 1) ^ ((u - (u >>> 7)) & m4); } 
+
+    */
+
+    private static int inv_mcol(int x)
+    {
+        int t0, t1;
+        t0  = x;
+        t1  = t0 ^ shift(t0, 8);
+        t0 ^= FFmulX(t1);
+        t1 ^= FFmulX2(t0);
+        t0 ^= t1 ^ shift(t1, 16);
+        return t0;
+    }
+
+    private static int subWord(int x)
+    {
+        return (S[x&255]&255 | ((S[(x>>8)&255]&255)<<8) | ((S[(x>>16)&255]&255)<<16) | S[(x>>24)&255]<<24);
+    }
+
+    /**
+     * Calculate the necessary round keys
+     * The number of calculations depends on key size and block size
+     * AES specified a fixed block size of 128 bits and key sizes 128/192/256 bits
+     * This code is written assuming those are the only possible values
+     */
+    private int[][] generateWorkingKey(byte[] key, boolean forEncryption)
+    {
+        int keyLen = key.length;
+        if (keyLen < 16 || keyLen > 32 || (keyLen & 7) != 0)
+        {
+            throw new IllegalArgumentException("Key length not 128/192/256 bits.");
+        }
+
+        int KC = keyLen >>> 2;
+        ROUNDS = KC + 6;  // This is not always true for the generalized Rijndael that allows larger block sizes
+        int[][] W = new int[ROUNDS+1][4];   // 4 words in a block
+
+        switch (KC)
+        {
+        case 4:
+        {
+            int col0 = Pack.littleEndianToInt(key,  0);     W[0][0] = col0;
+            int col1 = Pack.littleEndianToInt(key,  4);     W[0][1] = col1;
+            int col2 = Pack.littleEndianToInt(key,  8);     W[0][2] = col2;
+            int col3 = Pack.littleEndianToInt(key, 12);     W[0][3] = col3;
+
+            for (int i = 1; i <= 10; ++i)
+            {
+                int colx = subWord(shift(col3, 8)) ^ rcon[i - 1];
+                col0 ^= colx;       W[i][0] = col0;
+                col1 ^= col0;       W[i][1] = col1;
+                col2 ^= col1;       W[i][2] = col2;
+                col3 ^= col2;       W[i][3] = col3;
+            }
+
+            break;
+        }
+        case 6:
+        {
+            int col0 = Pack.littleEndianToInt(key,  0);     W[0][0] = col0;
+            int col1 = Pack.littleEndianToInt(key,  4);     W[0][1] = col1;
+            int col2 = Pack.littleEndianToInt(key,  8);     W[0][2] = col2;
+            int col3 = Pack.littleEndianToInt(key, 12);     W[0][3] = col3;
+
+            int col4 = Pack.littleEndianToInt(key, 16);
+            int col5 = Pack.littleEndianToInt(key, 20);
+
+            int i = 1, rcon = 1, colx;
+            for (;;)
+            {
+                                    W[i    ][0] = col4;
+                                    W[i    ][1] = col5;
+                colx = subWord(shift(col5, 8)) ^ rcon; rcon <<= 1;
+                col0 ^= colx;       W[i    ][2] = col0;
+                col1 ^= col0;       W[i    ][3] = col1;
+
+                col2 ^= col1;       W[i + 1][0] = col2;
+                col3 ^= col2;       W[i + 1][1] = col3;
+                col4 ^= col3;       W[i + 1][2] = col4;
+                col5 ^= col4;       W[i + 1][3] = col5;
+
+                colx = subWord(shift(col5, 8)) ^ rcon; rcon <<= 1;
+                col0 ^= colx;       W[i + 2][0] = col0;
+                col1 ^= col0;       W[i + 2][1] = col1;
+                col2 ^= col1;       W[i + 2][2] = col2;
+                col3 ^= col2;       W[i + 2][3] = col3;
+
+                if ((i += 3) >= 13)
+                {
+                    break;
+                }
+
+                col4 ^= col3;
+                col5 ^= col4;
+            }
+
+            break;
+        }
+        case 8:
+        {
+            int col0 = Pack.littleEndianToInt(key,  0);     W[0][0] = col0;
+            int col1 = Pack.littleEndianToInt(key,  4);     W[0][1] = col1;
+            int col2 = Pack.littleEndianToInt(key,  8);     W[0][2] = col2;
+            int col3 = Pack.littleEndianToInt(key, 12);     W[0][3] = col3;
+
+            int col4 = Pack.littleEndianToInt(key, 16);     W[1][0] = col4;
+            int col5 = Pack.littleEndianToInt(key, 20);     W[1][1] = col5;
+            int col6 = Pack.littleEndianToInt(key, 24);     W[1][2] = col6;
+            int col7 = Pack.littleEndianToInt(key, 28);     W[1][3] = col7;
+
+            int i = 2, rcon = 1, colx;
+            for (;;)
+            {
+                colx = subWord(shift(col7, 8)) ^ rcon; rcon <<= 1;
+                col0 ^= colx;       W[i][0] = col0;
+                col1 ^= col0;       W[i][1] = col1;
+                col2 ^= col1;       W[i][2] = col2;
+                col3 ^= col2;       W[i][3] = col3;
+                ++i;
+
+                if (i >= 15)
+                {
+                    break;
+                }
+
+                colx = subWord(col3);
+                col4 ^= colx;       W[i][0] = col4;
+                col5 ^= col4;       W[i][1] = col5;
+                col6 ^= col5;       W[i][2] = col6;
+                col7 ^= col6;       W[i][3] = col7;
+                ++i;
+            }
+
+            break;
+        }
+        default:
+        {
+            throw new IllegalStateException("Should never get here");
+        }
+        }
+
+        if (!forEncryption)
+        {
+            for (int j = 1; j < ROUNDS; j++)
+            {
+                for (int i = 0; i < 4; i++)
+                {
+                    W[j][i] = inv_mcol(W[j][i]);
+                }
+            }
+        }
+
+        return W;
+    }
+
+    private int         ROUNDS;
+    private int[][]     WorkingKey = null;
+    private boolean     forEncryption;
+
+    private byte[]      s;
+
+    private static final int BLOCK_SIZE = 16;
+
+    /**
+      * Return an AESEngine.
+      *
+      * @return an AES ECB mode cipher.
+      */
+     public static MultiBlockCipher newInstance()
+     {
+         return new AESEngine();
+     }
+
+    /**
+     * default constructor - 128 bit block size.
+     * @deprecated use AESEngine.newInstance()
+     */
+    public AESEngine()
+    {
+        // CryptoServicesRegistrar.checkConstraints(new DefaultServiceProperties(getAlgorithmName(), 256));
+    }
+
+    /**
+     * initialise an AES cipher.
+     *
+     * @param forEncryption whether or not we are for encryption.
+     * @param params the parameters required to set up the cipher.
+     * @exception IllegalArgumentException if the params argument is
+     * inappropriate.
+     */
+    public void init(
+        boolean           forEncryption,
+        CipherParameters  params)
+    {
+        if (params instanceof KeyParameter)
+        {
+            WorkingKey = generateWorkingKey(((KeyParameter)params).getKey(), forEncryption);
+            this.forEncryption = forEncryption;
+            if (forEncryption)
+            {
+                s = Arrays.clone(S);
+            }
+            else
+            {
+                s = Arrays.clone(Si);
+            }
+
+            //CryptoServicesRegistrar.checkConstraints(new DefaultServiceProperties(getAlgorithmName(), bitsOfSecurity(), params, Utils.getPurpose(forEncryption)));
+
+            return;
+        }
+
+        throw new IllegalArgumentException("invalid parameter passed to AES init - " + params.getClass().getName());
+    }
+
+    public String getAlgorithmName()
+    {
+        return "AES";
+    }
+
+    public int getBlockSize()
+    {
+        return BLOCK_SIZE;
+    }
+
+    public int processBlock(byte[] in, int inOff, byte[] out, int outOff)
+    {
+        if (WorkingKey == null)
+        {
+            throw new IllegalStateException("AES engine not initialised");
+        }
+
+        if (inOff > (in.length - BLOCK_SIZE))
+        {
+            throw new DataLengthException("input buffer too short");
+        }
+
+        if (outOff > (out.length - BLOCK_SIZE))
+        {
+            throw new OutputLengthException("output buffer too short");
+        }
+
+        if (forEncryption)
+        {
+            encryptBlock(in, inOff, out, outOff, WorkingKey);
+        }
+        else
+        {
+            decryptBlock(in, inOff, out, outOff, WorkingKey);
+        }
+
+        return BLOCK_SIZE;
+    }
+
+    public void reset()
+    {
+    }
+
+    private void encryptBlock(byte[] in, int inOff, byte[] out, int outOff, int[][] KW)
+    {
+        int C0 = Pack.littleEndianToInt(in, inOff +  0);
+        int C1 = Pack.littleEndianToInt(in, inOff +  4);
+        int C2 = Pack.littleEndianToInt(in, inOff +  8);
+        int C3 = Pack.littleEndianToInt(in, inOff + 12);
+
+        int t0 = C0 ^ KW[0][0];
+        int t1 = C1 ^ KW[0][1];
+        int t2 = C2 ^ KW[0][2];
+
+        int r = 1, r0, r1, r2, r3 = C3 ^ KW[0][3];
+        while (r < ROUNDS - 1)
+        {
+            r0 = T0[t0&255] ^ shift(T0[(t1>>8)&255], 24) ^ shift(T0[(t2>>16)&255], 16) ^ shift(T0[(r3>>24)&255], 8) ^ KW[r][0];
+            r1 = T0[t1&255] ^ shift(T0[(t2>>8)&255], 24) ^ shift(T0[(r3>>16)&255], 16) ^ shift(T0[(t0>>24)&255], 8) ^ KW[r][1];
+            r2 = T0[t2&255] ^ shift(T0[(r3>>8)&255], 24) ^ shift(T0[(t0>>16)&255], 16) ^ shift(T0[(t1>>24)&255], 8) ^ KW[r][2];
+            r3 = T0[r3&255] ^ shift(T0[(t0>>8)&255], 24) ^ shift(T0[(t1>>16)&255], 16) ^ shift(T0[(t2>>24)&255], 8) ^ KW[r++][3];
+            t0 = T0[r0&255] ^ shift(T0[(r1>>8)&255], 24) ^ shift(T0[(r2>>16)&255], 16) ^ shift(T0[(r3>>24)&255], 8) ^ KW[r][0];
+            t1 = T0[r1&255] ^ shift(T0[(r2>>8)&255], 24) ^ shift(T0[(r3>>16)&255], 16) ^ shift(T0[(r0>>24)&255], 8) ^ KW[r][1];
+            t2 = T0[r2&255] ^ shift(T0[(r3>>8)&255], 24) ^ shift(T0[(r0>>16)&255], 16) ^ shift(T0[(r1>>24)&255], 8) ^ KW[r][2];
+            r3 = T0[r3&255] ^ shift(T0[(r0>>8)&255], 24) ^ shift(T0[(r1>>16)&255], 16) ^ shift(T0[(r2>>24)&255], 8) ^ KW[r++][3];
+        }
+
+        r0 = T0[t0&255] ^ shift(T0[(t1>>8)&255], 24) ^ shift(T0[(t2>>16)&255], 16) ^ shift(T0[(r3>>24)&255], 8) ^ KW[r][0];
+        r1 = T0[t1&255] ^ shift(T0[(t2>>8)&255], 24) ^ shift(T0[(r3>>16)&255], 16) ^ shift(T0[(t0>>24)&255], 8) ^ KW[r][1];
+        r2 = T0[t2&255] ^ shift(T0[(r3>>8)&255], 24) ^ shift(T0[(t0>>16)&255], 16) ^ shift(T0[(t1>>24)&255], 8) ^ KW[r][2];
+        r3 = T0[r3&255] ^ shift(T0[(t0>>8)&255], 24) ^ shift(T0[(t1>>16)&255], 16) ^ shift(T0[(t2>>24)&255], 8) ^ KW[r++][3];
+
+        // the final round's table is a simple function of S so we don't use a whole other four tables for it
+
+        C0 = (S[r0&255]&255) ^ ((S[(r1>>8)&255]&255)<<8) ^ ((s[(r2>>16)&255]&255)<<16) ^ (s[(r3>>24)&255]<<24) ^ KW[r][0];
+        C1 = (s[r1&255]&255) ^ ((S[(r2>>8)&255]&255)<<8) ^ ((S[(r3>>16)&255]&255)<<16) ^ (s[(r0>>24)&255]<<24) ^ KW[r][1];
+        C2 = (s[r2&255]&255) ^ ((S[(r3>>8)&255]&255)<<8) ^ ((S[(r0>>16)&255]&255)<<16) ^ (S[(r1>>24)&255]<<24) ^ KW[r][2];
+        C3 = (s[r3&255]&255) ^ ((s[(r0>>8)&255]&255)<<8) ^ ((s[(r1>>16)&255]&255)<<16) ^ (S[(r2>>24)&255]<<24) ^ KW[r][3];
+
+        Pack.intToLittleEndian(C0, out, outOff +  0);
+        Pack.intToLittleEndian(C1, out, outOff +  4);
+        Pack.intToLittleEndian(C2, out, outOff +  8);
+        Pack.intToLittleEndian(C3, out, outOff + 12);
+    }
+
+    private void decryptBlock(byte[] in, int inOff, byte[] out, int outOff, int[][] KW)
+    {
+        int C0 = Pack.littleEndianToInt(in, inOff +  0);
+        int C1 = Pack.littleEndianToInt(in, inOff +  4);
+        int C2 = Pack.littleEndianToInt(in, inOff +  8);
+        int C3 = Pack.littleEndianToInt(in, inOff + 12);
+
+        int t0 = C0 ^ KW[ROUNDS][0];
+        int t1 = C1 ^ KW[ROUNDS][1];
+        int t2 = C2 ^ KW[ROUNDS][2];
+
+        int r = ROUNDS - 1, r0, r1, r2, r3 = C3 ^ KW[ROUNDS][3];
+        while (r > 1)
+        {
+            r0 = Tinv0[t0&255] ^ shift(Tinv0[(r3>>8)&255], 24) ^ shift(Tinv0[(t2>>16)&255], 16) ^ shift(Tinv0[(t1>>24)&255], 8) ^ KW[r][0];
+            r1 = Tinv0[t1&255] ^ shift(Tinv0[(t0>>8)&255], 24) ^ shift(Tinv0[(r3>>16)&255], 16) ^ shift(Tinv0[(t2>>24)&255], 8) ^ KW[r][1];
+            r2 = Tinv0[t2&255] ^ shift(Tinv0[(t1>>8)&255], 24) ^ shift(Tinv0[(t0>>16)&255], 16) ^ shift(Tinv0[(r3>>24)&255], 8) ^ KW[r][2];
+            r3 = Tinv0[r3&255] ^ shift(Tinv0[(t2>>8)&255], 24) ^ shift(Tinv0[(t1>>16)&255], 16) ^ shift(Tinv0[(t0>>24)&255], 8) ^ KW[r--][3];
+            t0 = Tinv0[r0&255] ^ shift(Tinv0[(r3>>8)&255], 24) ^ shift(Tinv0[(r2>>16)&255], 16) ^ shift(Tinv0[(r1>>24)&255], 8) ^ KW[r][0];
+            t1 = Tinv0[r1&255] ^ shift(Tinv0[(r0>>8)&255], 24) ^ shift(Tinv0[(r3>>16)&255], 16) ^ shift(Tinv0[(r2>>24)&255], 8) ^ KW[r][1];
+            t2 = Tinv0[r2&255] ^ shift(Tinv0[(r1>>8)&255], 24) ^ shift(Tinv0[(r0>>16)&255], 16) ^ shift(Tinv0[(r3>>24)&255], 8) ^ KW[r][2];
+            r3 = Tinv0[r3&255] ^ shift(Tinv0[(r2>>8)&255], 24) ^ shift(Tinv0[(r1>>16)&255], 16) ^ shift(Tinv0[(r0>>24)&255], 8) ^ KW[r--][3];
+        }
+
+        r0 = Tinv0[t0&255] ^ shift(Tinv0[(r3>>8)&255], 24) ^ shift(Tinv0[(t2>>16)&255], 16) ^ shift(Tinv0[(t1>>24)&255], 8) ^ KW[r][0];
+        r1 = Tinv0[t1&255] ^ shift(Tinv0[(t0>>8)&255], 24) ^ shift(Tinv0[(r3>>16)&255], 16) ^ shift(Tinv0[(t2>>24)&255], 8) ^ KW[r][1];
+        r2 = Tinv0[t2&255] ^ shift(Tinv0[(t1>>8)&255], 24) ^ shift(Tinv0[(t0>>16)&255], 16) ^ shift(Tinv0[(r3>>24)&255], 8) ^ KW[r][2];
+        r3 = Tinv0[r3&255] ^ shift(Tinv0[(t2>>8)&255], 24) ^ shift(Tinv0[(t1>>16)&255], 16) ^ shift(Tinv0[(t0>>24)&255], 8) ^ KW[r][3];
+        
+        // the final round's table is a simple function of Si so we don't use a whole other four tables for it
+
+        C0 = (Si[r0&255]&255) ^ ((s[(r3>>8)&255]&255)<<8) ^ ((s[(r2>>16)&255]&255)<<16) ^ (Si[(r1>>24)&255]<<24) ^ KW[0][0];
+        C1 = (s[r1&255]&255) ^ ((s[(r0>>8)&255]&255)<<8) ^ ((Si[(r3>>16)&255]&255)<<16) ^ (s[(r2>>24)&255]<<24) ^ KW[0][1];
+        C2 = (s[r2&255]&255) ^ ((Si[(r1>>8)&255]&255)<<8) ^ ((Si[(r0>>16)&255]&255)<<16) ^ (s[(r3>>24)&255]<<24) ^ KW[0][2];
+        C3 = (Si[r3&255]&255) ^ ((s[(r2>>8)&255]&255)<<8) ^ ((s[(r1>>16)&255]&255)<<16) ^ (s[(r0>>24)&255]<<24) ^ KW[0][3];
+
+        Pack.intToLittleEndian(C0, out, outOff +  0);
+        Pack.intToLittleEndian(C1, out, outOff +  4);
+        Pack.intToLittleEndian(C2, out, outOff +  8);
+        Pack.intToLittleEndian(C3, out, outOff + 12);
+    }
+
+    private int bitsOfSecurity()
+    {
+        if (WorkingKey == null)
+        {
+            return 256;
+        }
+        return (WorkingKey.length - 7) << 5;
+    }
+}
diff --git a/app/src/main/java/org/bouncycastle/crypto/macs/CBCBlockCipherMac.java b/app/src/main/java/org/bouncycastle/crypto/macs/CBCBlockCipherMac.java
new file mode 100644
index 000000000..908780735
--- /dev/null
+++ b/app/src/main/java/org/bouncycastle/crypto/macs/CBCBlockCipherMac.java
@@ -0,0 +1,229 @@
+package org.bouncycastle.crypto.macs;
+
+import org.bouncycastle.crypto.BlockCipher;
+import org.bouncycastle.crypto.CipherParameters;
+import org.bouncycastle.crypto.Mac;
+import org.bouncycastle.crypto.modes.CBCBlockCipher;
+import org.bouncycastle.crypto.paddings.BlockCipherPadding;
+
+/**
+ * standard CBC Block Cipher MAC - if no padding is specified the default of
+ * pad of zeroes is used.
+ */
+public class CBCBlockCipherMac
+    implements Mac
+{
+    private byte[]              mac;
+
+    private byte[]              buf;
+    private int                 bufOff;
+    private BlockCipher         cipher;
+    private BlockCipherPadding  padding;
+
+    private int                 macSize;
+
+    /**
+     * create a standard MAC based on a CBC block cipher. This will produce an
+     * authentication code half the length of the block size of the cipher.
+     *
+     * @param cipher the cipher to be used as the basis of the MAC generation.
+     */
+    public CBCBlockCipherMac(
+        BlockCipher     cipher)
+    {
+        this(cipher, (cipher.getBlockSize() * 8) / 2, null);
+    }
+
+    /**
+     * create a standard MAC based on a CBC block cipher. This will produce an
+     * authentication code half the length of the block size of the cipher.
+     *
+     * @param cipher the cipher to be used as the basis of the MAC generation.
+     * @param padding the padding to be used to complete the last block.
+     */
+    public CBCBlockCipherMac(
+        BlockCipher         cipher,
+        BlockCipherPadding  padding)
+    {
+        this(cipher, (cipher.getBlockSize() * 8) / 2, padding);
+    }
+
+    /**
+     * create a standard MAC based on a block cipher with the size of the
+     * MAC been given in bits. This class uses CBC mode as the basis for the
+     * MAC generation.
+     * <p>
+     * Note: the size of the MAC must be at least 24 bits (FIPS Publication 81),
+     * or 16 bits if being used as a data authenticator (FIPS Publication 113),
+     * and in general should be less than the size of the block cipher as it reduces
+     * the chance of an exhaustive attack (see Handbook of Applied Cryptography).
+     *
+     * @param cipher the cipher to be used as the basis of the MAC generation.
+     * @param macSizeInBits the size of the MAC in bits, must be a multiple of 8.
+     */
+    public CBCBlockCipherMac(
+        BlockCipher     cipher,
+        int             macSizeInBits)
+    {
+        this(cipher, macSizeInBits, null);
+    }
+
+    /**
+     * create a standard MAC based on a block cipher with the size of the
+     * MAC been given in bits. This class uses CBC mode as the basis for the
+     * MAC generation.
+     * <p>
+     * Note: the size of the MAC must be at least 24 bits (FIPS Publication 81),
+     * or 16 bits if being used as a data authenticator (FIPS Publication 113),
+     * and in general should be less than the size of the block cipher as it reduces
+     * the chance of an exhaustive attack (see Handbook of Applied Cryptography).
+     *
+     * @param cipher the cipher to be used as the basis of the MAC generation.
+     * @param macSizeInBits the size of the MAC in bits, must be a multiple of 8.
+     * @param padding the padding to be used to complete the last block.
+     */
+    public CBCBlockCipherMac(
+        BlockCipher         cipher,
+        int                 macSizeInBits,
+        BlockCipherPadding  padding)
+    {
+        if ((macSizeInBits % 8) != 0)
+        {
+            throw new IllegalArgumentException("MAC size must be multiple of 8");
+        }
+
+        this.cipher = CBCBlockCipher.newInstance(cipher);
+        this.padding = padding;
+        this.macSize = macSizeInBits / 8;
+
+        mac = new byte[cipher.getBlockSize()];
+
+        buf = new byte[cipher.getBlockSize()];
+        bufOff = 0;
+    }
+
+    public String getAlgorithmName()
+    {
+        return cipher.getAlgorithmName();
+    }
+
+    public void init(
+        CipherParameters    params)
+    {
+        reset();
+
+        cipher.init(true, params);
+    }
+
+    public int getMacSize()
+    {
+        return macSize;
+    }
+
+    public void update(
+        byte        in)
+    {
+        if (bufOff == buf.length)
+        {
+            cipher.processBlock(buf, 0, mac, 0);
+            bufOff = 0;
+        }
+
+        buf[bufOff++] = in;
+    }
+
+    public void update(
+        byte[]      in,
+        int         inOff,
+        int         len)
+    {
+        if (len < 0)
+        {
+            throw new IllegalArgumentException("Can't have a negative input length!");
+        }
+
+        int blockSize = cipher.getBlockSize();
+        int gapLen = blockSize - bufOff;
+
+        if (len > gapLen)
+        {
+            System.arraycopy(in, inOff, buf, bufOff, gapLen);
+
+            cipher.processBlock(buf, 0, mac, 0);
+
+            bufOff = 0;
+            len -= gapLen;
+            inOff += gapLen;
+
+            while (len > blockSize)
+            {
+                cipher.processBlock(in, inOff, mac, 0);
+
+                len -= blockSize;
+                inOff += blockSize;
+            }
+        }
+
+        System.arraycopy(in, inOff, buf, bufOff, len);
+
+        bufOff += len;
+    }
+
+    public int doFinal(
+        byte[]  out,
+        int     outOff)
+    {
+        int blockSize = cipher.getBlockSize();
+
+        if (padding == null)
+        {
+            //
+            // pad with zeroes
+            //
+            while (bufOff < blockSize)
+            {
+                buf[bufOff] = 0;
+                bufOff++;
+            }
+        }
+        else
+        {
+            if (bufOff == blockSize)
+            {
+                cipher.processBlock(buf, 0, mac, 0);
+                bufOff = 0;
+            }
+
+            padding.addPadding(buf, bufOff);
+        }
+
+        cipher.processBlock(buf, 0, mac, 0);
+
+        System.arraycopy(mac, 0, out, outOff, macSize);
+
+        reset();
+
+        return macSize;
+    }
+
+    /**
+     * Reset the mac generator.
+     */
+    public void reset()
+    {
+        /*
+         * clean the buffer.
+         */
+        for (int i = 0; i < buf.length; i++)
+        {
+            buf[i] = 0;
+        }
+
+        bufOff = 0;
+
+        /*
+         * reset the underlying cipher.
+         */
+        cipher.reset();
+    }
+}
diff --git a/app/src/main/java/org/bouncycastle/crypto/modes/AEADBlockCipher.java b/app/src/main/java/org/bouncycastle/crypto/modes/AEADBlockCipher.java
new file mode 100644
index 000000000..b8c7ad512
--- /dev/null
+++ b/app/src/main/java/org/bouncycastle/crypto/modes/AEADBlockCipher.java
@@ -0,0 +1,17 @@
+package org.bouncycastle.crypto.modes;
+
+import org.bouncycastle.crypto.BlockCipher;
+
+/**
+ * An {@link AEADCipher} based on a {@link BlockCipher}.
+ */
+public interface AEADBlockCipher
+    extends AEADCipher
+{
+    /**
+     * return the {@link BlockCipher} this object wraps.
+     *
+     * @return the {@link BlockCipher} this object wraps.
+     */
+    public BlockCipher getUnderlyingCipher();
+}
diff --git a/app/src/main/java/org/bouncycastle/crypto/modes/AEADCipher.java b/app/src/main/java/org/bouncycastle/crypto/modes/AEADCipher.java
new file mode 100644
index 000000000..4e49a5a98
--- /dev/null
+++ b/app/src/main/java/org/bouncycastle/crypto/modes/AEADCipher.java
@@ -0,0 +1,138 @@
+package org.bouncycastle.crypto.modes;
+
+import org.bouncycastle.crypto.CipherParameters;
+import org.bouncycastle.crypto.DataLengthException;
+import org.bouncycastle.crypto.InvalidCipherTextException;
+
+/**
+ * A cipher mode that includes authenticated encryption with a streaming mode and optional associated data.
+ * <p>
+ * Implementations of this interface may operate in a packet mode (where all input data is buffered and 
+ * processed during the call to {@link #doFinal(byte[], int)}), or in a streaming mode (where output data is
+ * incrementally produced with each call to {@link #processByte(byte, byte[], int)} or 
+ * {@link #processBytes(byte[], int, int, byte[], int)}.
+ * </p>
+ * This is important to consider during decryption: in a streaming mode, unauthenticated plaintext data
+ * may be output prior to the call to {@link #doFinal(byte[], int)} that results in an authentication
+ * failure. The higher level protocol utilising this cipher must ensure the plaintext data is handled 
+ * appropriately until the end of data is reached and the entire ciphertext is authenticated.
+ * @see org.bouncycastle.crypto.params.AEADParameters
+ */
+public interface AEADCipher
+{
+    /**
+     * initialise the underlying cipher. Parameter can either be an AEADParameters or a ParametersWithIV object.
+     *
+     * @param forEncryption true if we are setting up for encryption, false otherwise.
+     * @param params the necessary parameters for the underlying cipher to be initialised.
+     * @exception IllegalArgumentException if the params argument is inappropriate.
+     */
+    public void init(boolean forEncryption, CipherParameters params)
+        throws IllegalArgumentException;
+
+    /**
+     * Return the name of the algorithm.
+     * 
+     * @return the algorithm name.
+     */
+    public String getAlgorithmName();
+
+    /**
+     * Add a single byte to the associated data check.
+     * <br>If the implementation supports it, this will be an online operation and will not retain the associated data.
+     *
+     * @param in the byte to be processed.
+     */
+    public void processAADByte(byte in);
+
+    /**
+     * Add a sequence of bytes to the associated data check.
+     * <br>If the implementation supports it, this will be an online operation and will not retain the associated data.
+     *
+     * @param in the input byte array.
+     * @param inOff the offset into the in array where the data to be processed starts.
+     * @param len the number of bytes to be processed.
+     */
+    public void processAADBytes(byte[] in, int inOff, int len);
+
+    /**
+     * encrypt/decrypt a single byte.
+     *
+     * @param in the byte to be processed.
+     * @param out the output buffer the processed byte goes into.
+     * @param outOff the offset into the output byte array the processed data starts at.
+     * @return the number of bytes written to out.
+     * @exception DataLengthException if the output buffer is too small.
+     */
+    public int processByte(byte in, byte[] out, int outOff)
+        throws DataLengthException;
+
+    /**
+     * process a block of bytes from in putting the result into out.
+     *
+     * @param in the input byte array.
+     * @param inOff the offset into the in array where the data to be processed starts.
+     * @param len the number of bytes to be processed.
+     * @param out the output buffer the processed bytes go into.
+     * @param outOff the offset into the output byte array the processed data starts at.
+     * @return the number of bytes written to out.
+     * @exception DataLengthException if the output buffer is too small.
+     */
+    public int processBytes(byte[] in, int inOff, int len, byte[] out, int outOff)
+        throws DataLengthException;
+
+    /**
+     * Finish the operation either appending or verifying the MAC at the end of the data.
+     *
+     * @param out space for any resulting output data.
+     * @param outOff offset into out to start copying the data at.
+     * @return number of bytes written into out.
+     * @throws IllegalStateException if the cipher is in an inappropriate state.
+     * @throws org.bouncycastle.crypto.InvalidCipherTextException if the MAC fails to match.
+     */
+    public int doFinal(byte[] out, int outOff)
+        throws IllegalStateException, InvalidCipherTextException;
+
+    /**
+     * Return the value of the MAC associated with the last stream processed.
+     *
+     * @return MAC for plaintext data.
+     */
+    public byte[] getMac();
+
+    /**
+     * return the size of the output buffer required for a processBytes
+     * an input of len bytes.
+     * <p>
+     * The returned size may be dependent on the initialisation of this cipher
+     * and may not be accurate once subsequent input data is processed - this method
+     * should be invoked immediately prior to input data being processed.
+     * </p>
+     *
+     * @param len the length of the input.
+     * @return the space required to accommodate a call to processBytes
+     * with len bytes of input.
+     */
+    public int getUpdateOutputSize(int len);
+
+    /**
+     * return the size of the output buffer required for a processBytes plus a
+     * doFinal with an input of len bytes.
+     * <p>
+     * The returned size may be dependent on the initialisation of this cipher
+     * and may not be accurate once subsequent input data is processed - this method
+     * should be invoked immediately prior to a call to final processing of input data
+     * and a call to {@link #doFinal(byte[], int)}.
+     * </p>
+     * @param len the length of the input.
+     * @return the space required to accommodate a call to processBytes and doFinal
+     * with len bytes of input.
+     */
+    public int getOutputSize(int len);
+
+    /**
+     * Reset the cipher. After resetting the cipher is in the same state
+     * as it was after the last init (if there was one).
+     */
+    public void reset();
+}
diff --git a/app/src/main/java/org/bouncycastle/crypto/modes/CBCBlockCipher.java b/app/src/main/java/org/bouncycastle/crypto/modes/CBCBlockCipher.java
new file mode 100644
index 000000000..42cf511bc
--- /dev/null
+++ b/app/src/main/java/org/bouncycastle/crypto/modes/CBCBlockCipher.java
@@ -0,0 +1,266 @@
+package org.bouncycastle.crypto.modes;
+
+import org.bouncycastle.crypto.BlockCipher;
+import org.bouncycastle.crypto.CipherParameters;
+import org.bouncycastle.crypto.DataLengthException;
+import org.bouncycastle.crypto.DefaultMultiBlockCipher;
+import org.bouncycastle.crypto.params.ParametersWithIV;
+import org.bouncycastle.util.Arrays;
+
+/**
+ * implements Cipher-Block-Chaining (CBC) mode on top of a simple cipher.
+ */
+public class CBCBlockCipher
+    extends DefaultMultiBlockCipher
+    implements CBCModeCipher
+{
+    private byte[]          IV;
+    private byte[]          cbcV;
+    private byte[]          cbcNextV;
+
+    private int             blockSize;
+    private BlockCipher     cipher = null;
+    private boolean         encrypting;
+
+    /**
+     * Return a new CBC mode cipher based on the passed in base cipher
+     *
+     * @param cipher the base cipher for the CBC mode.
+     */
+    public static CBCModeCipher newInstance(BlockCipher cipher)
+    {
+        return new CBCBlockCipher(cipher);
+    }
+
+    /**
+     * Basic constructor.
+     *
+     * @param cipher the block cipher to be used as the basis of chaining.
+     * @deprecated use the CBCBlockCipher.newInstance() static method.
+     */
+    public CBCBlockCipher(
+        BlockCipher cipher)
+    {
+        this.cipher = cipher;
+        this.blockSize = cipher.getBlockSize();
+
+        this.IV = new byte[blockSize];
+        this.cbcV = new byte[blockSize];
+        this.cbcNextV = new byte[blockSize];
+    }
+
+    /**
+     * return the underlying block cipher that we are wrapping.
+     *
+     * @return the underlying block cipher that we are wrapping.
+     */
+    public BlockCipher getUnderlyingCipher()
+    {
+        return cipher;
+    }
+
+    /**
+     * Initialise the cipher and, possibly, the initialisation vector (IV).
+     * If an IV isn't passed as part of the parameter, the IV will be all zeros.
+     *
+     * @param encrypting if true the cipher is initialised for
+     *  encryption, if false for decryption.
+     * @param params the key and other data required by the cipher.
+     * @exception IllegalArgumentException if the params argument is
+     * inappropriate.
+     */
+    public void init(
+        boolean             encrypting,
+        CipherParameters    params)
+        throws IllegalArgumentException
+    {
+        boolean oldEncrypting = this.encrypting;
+
+        this.encrypting = encrypting;
+
+        if (params instanceof ParametersWithIV)
+        {
+            ParametersWithIV ivParam = (ParametersWithIV)params;
+            byte[] iv = ivParam.getIV();
+
+            if (iv.length != blockSize)
+            {
+                throw new IllegalArgumentException("initialisation vector must be the same length as block size");
+            }
+
+            System.arraycopy(iv, 0, IV, 0, iv.length);
+
+            reset();
+
+            // if null it's an IV changed only.
+            if (ivParam.getParameters() != null)
+            {
+                cipher.init(encrypting, ivParam.getParameters());
+            }
+            else if (oldEncrypting != encrypting)
+            {
+                throw new IllegalArgumentException("cannot change encrypting state without providing key.");
+            }
+        }
+        else
+        {
+            reset();
+
+            // if it's null, key is to be reused.
+            if (params != null)
+            {
+                cipher.init(encrypting, params);
+            }
+            else if (oldEncrypting != encrypting)
+            {
+                throw new IllegalArgumentException("cannot change encrypting state without providing key.");
+            }
+        }
+    }
+
+    /**
+     * return the algorithm name and mode.
+     *
+     * @return the name of the underlying algorithm followed by "/CBC".
+     */
+    public String getAlgorithmName()
+    {
+        return cipher.getAlgorithmName() + "/CBC";
+    }
+
+    /**
+     * return the block size of the underlying cipher.
+     *
+     * @return the block size of the underlying cipher.
+     */
+    public int getBlockSize()
+    {
+        return cipher.getBlockSize();
+    }
+
+    /**
+     * Process one block of input from the array in and write it to
+     * the out array.
+     *
+     * @param in the array containing the input data.
+     * @param inOff offset into the in array the data starts at.
+     * @param out the array the output data will be copied into.
+     * @param outOff the offset into the out array the output will start at.
+     * @exception DataLengthException if there isn't enough data in in, or
+     * space in out.
+     * @exception IllegalStateException if the cipher isn't initialised.
+     * @return the number of bytes processed and produced.
+     */
+    public int processBlock(
+        byte[]      in,
+        int         inOff,
+        byte[]      out,
+        int         outOff)
+        throws DataLengthException, IllegalStateException
+    {
+        return (encrypting) ? encryptBlock(in, inOff, out, outOff) : decryptBlock(in, inOff, out, outOff);
+    }
+
+    /**
+     * reset the chaining vector back to the IV and reset the underlying
+     * cipher.
+     */
+    public void reset()
+    {
+        System.arraycopy(IV, 0, cbcV, 0, IV.length);
+        Arrays.fill(cbcNextV, (byte)0);
+
+        cipher.reset();
+    }
+
+    /**
+     * Do the appropriate chaining step for CBC mode encryption.
+     *
+     * @param in the array containing the data to be encrypted.
+     * @param inOff offset into the in array the data starts at.
+     * @param out the array the encrypted data will be copied into.
+     * @param outOff the offset into the out array the output will start at.
+     * @exception DataLengthException if there isn't enough data in in, or
+     * space in out.
+     * @exception IllegalStateException if the cipher isn't initialised.
+     * @return the number of bytes processed and produced.
+     */
+    private int encryptBlock(
+        byte[]      in,
+        int         inOff,
+        byte[]      out,
+        int         outOff)
+        throws DataLengthException, IllegalStateException
+    {
+        if ((inOff + blockSize) > in.length)
+        {
+            throw new DataLengthException("input buffer too short");
+        }
+
+        /*
+         * XOR the cbcV and the input,
+         * then encrypt the cbcV
+         */
+        for (int i = 0; i < blockSize; i++)
+        {
+            cbcV[i] ^= in[inOff + i];
+        }
+
+        int length = cipher.processBlock(cbcV, 0, out, outOff);
+
+        /*
+         * copy ciphertext to cbcV
+         */
+        System.arraycopy(out, outOff, cbcV, 0, cbcV.length);
+
+        return length;
+    }
+
+    /**
+     * Do the appropriate chaining step for CBC mode decryption.
+     *
+     * @param in the array containing the data to be decrypted.
+     * @param inOff offset into the in array the data starts at.
+     * @param out the array the decrypted data will be copied into.
+     * @param outOff the offset into the out array the output will start at.
+     * @exception DataLengthException if there isn't enough data in in, or
+     * space in out.
+     * @exception IllegalStateException if the cipher isn't initialised.
+     * @return the number of bytes processed and produced.
+     */
+    private int decryptBlock(
+        byte[]      in,
+        int         inOff,
+        byte[]      out,
+        int         outOff)
+        throws DataLengthException, IllegalStateException
+    {
+        if ((inOff + blockSize) > in.length)
+        {
+            throw new DataLengthException("input buffer too short");
+        }
+
+        System.arraycopy(in, inOff, cbcNextV, 0, blockSize);
+
+        int length = cipher.processBlock(in, inOff, out, outOff);
+
+        /*
+         * XOR the cbcV and the output
+         */
+        for (int i = 0; i < blockSize; i++)
+        {
+            out[outOff + i] ^= cbcV[i];
+        }
+
+        /*
+         * swap the back up buffer into next position
+         */
+        byte[]  tmp;
+
+        tmp = cbcV;
+        cbcV = cbcNextV;
+        cbcNextV = tmp;
+
+        return length;
+    }
+}
diff --git a/app/src/main/java/org/bouncycastle/crypto/modes/CBCModeCipher.java b/app/src/main/java/org/bouncycastle/crypto/modes/CBCModeCipher.java
new file mode 100644
index 000000000..682b5807c
--- /dev/null
+++ b/app/src/main/java/org/bouncycastle/crypto/modes/CBCModeCipher.java
@@ -0,0 +1,15 @@
+package org.bouncycastle.crypto.modes;
+
+import org.bouncycastle.crypto.BlockCipher;
+import org.bouncycastle.crypto.MultiBlockCipher;
+
+public interface CBCModeCipher
+    extends MultiBlockCipher
+{
+    /**
+     * return the underlying block cipher that we are wrapping.
+     *
+     * @return the underlying block cipher that we are wrapping.
+     */
+    BlockCipher getUnderlyingCipher();
+}
diff --git a/app/src/main/java/org/bouncycastle/crypto/modes/CCMBlockCipher.java b/app/src/main/java/org/bouncycastle/crypto/modes/CCMBlockCipher.java
new file mode 100644
index 000000000..1ac255bb8
--- /dev/null
+++ b/app/src/main/java/org/bouncycastle/crypto/modes/CCMBlockCipher.java
@@ -0,0 +1,480 @@
+package org.bouncycastle.crypto.modes;
+
+import java.io.ByteArrayOutputStream;
+
+import org.bouncycastle.crypto.BlockCipher;
+import org.bouncycastle.crypto.CipherParameters;
+import org.bouncycastle.crypto.DataLengthException;
+import org.bouncycastle.crypto.InvalidCipherTextException;
+import org.bouncycastle.crypto.Mac;
+import org.bouncycastle.crypto.OutputLengthException;
+import org.bouncycastle.crypto.macs.CBCBlockCipherMac;
+import org.bouncycastle.crypto.params.AEADParameters;
+import org.bouncycastle.crypto.params.ParametersWithIV;
+import org.bouncycastle.util.Arrays;
+
+/**
+ * Implements the Counter with Cipher Block Chaining mode (CCM) detailed in
+ * NIST Special Publication 800-38C.
+ * <p>
+ * <b>Note</b>: this mode is a packet mode - it needs all the data up front.
+ */
+public class CCMBlockCipher
+    implements CCMModeCipher
+{
+    private BlockCipher           cipher;
+    private int                   blockSize;
+    private boolean               forEncryption;
+    private byte[]                nonce;
+    private byte[]                initialAssociatedText;
+    private int                   macSize;
+    private CipherParameters      keyParam;
+    private byte[]                macBlock;
+    private ExposedByteArrayOutputStream associatedText = new ExposedByteArrayOutputStream();
+    private ExposedByteArrayOutputStream data = new ExposedByteArrayOutputStream();
+
+    /**
+     * Return a new CCM mode cipher based on the passed in base cipher
+     *
+     * @param cipher the base cipher for the CCM mode.
+     */
+    public static CCMModeCipher newInstance(BlockCipher cipher)
+    {
+        return new CCMBlockCipher(cipher);
+    }
+
+    /**
+     * Basic constructor.
+     *
+     * @param c the block cipher to be used.
+     * @deprecated use the CCMBlockCipher.newInstance() static method.
+     */
+    public CCMBlockCipher(BlockCipher c)
+    {
+        this.cipher = c;
+        this.blockSize = c.getBlockSize();
+        this.macBlock = new byte[blockSize];
+
+        if (blockSize != 16)
+        {
+            throw new IllegalArgumentException("cipher required with a block size of 16.");
+        }
+    }
+
+    /**
+     * return the underlying block cipher that we are wrapping.
+     *
+     * @return the underlying block cipher that we are wrapping.
+     */
+    public BlockCipher getUnderlyingCipher()
+    {
+        return cipher;
+    }
+
+
+    public void init(boolean forEncryption, CipherParameters params)
+          throws IllegalArgumentException
+    {
+        this.forEncryption = forEncryption;
+
+        CipherParameters cipherParameters;
+        if (params instanceof AEADParameters)
+        {
+            AEADParameters param = (AEADParameters)params;
+
+            nonce = param.getNonce();
+            initialAssociatedText = param.getAssociatedText();
+            macSize = getMacSize(forEncryption, param.getMacSize());
+            cipherParameters = param.getKey();
+        }
+        else if (params instanceof ParametersWithIV)
+        {
+            ParametersWithIV param = (ParametersWithIV)params;
+
+            nonce = param.getIV();
+            initialAssociatedText = null;
+            macSize = getMacSize(forEncryption, 64);
+            cipherParameters = param.getParameters();
+        }
+        else
+        {
+            throw new IllegalArgumentException("invalid parameters passed to CCM: " + params.getClass().getName());
+        }
+
+        // NOTE: Very basic support for key re-use, but no performance gain from it
+        if (cipherParameters != null)
+        {
+            keyParam = cipherParameters;
+        }
+
+        if (nonce == null || nonce.length < 7 || nonce.length > 13)
+        {
+            throw new IllegalArgumentException("nonce must have length from 7 to 13 octets");
+        }
+
+        reset();
+    }
+
+    public String getAlgorithmName()
+    {
+        return cipher.getAlgorithmName() + "/CCM";
+    }
+
+    public void processAADByte(byte in)
+    {
+        associatedText.write(in);
+    }
+
+    public void processAADBytes(byte[] in, int inOff, int len)
+    {
+        // TODO: Process AAD online
+        associatedText.write(in, inOff, len);
+    }
+
+    public int processByte(byte in, byte[] out, int outOff)
+        throws DataLengthException, IllegalStateException
+    {
+        data.write(in);
+
+        return 0;
+    }
+
+    public int processBytes(byte[] in, int inOff, int inLen, byte[] out, int outOff)
+        throws DataLengthException, IllegalStateException
+    {
+        if (in.length < (inOff + inLen))
+        {
+            throw new DataLengthException("Input buffer too short");
+        }
+        data.write(in, inOff, inLen);
+
+        return 0;
+    }
+
+    public int doFinal(byte[] out, int outOff)
+        throws IllegalStateException, InvalidCipherTextException
+    {
+        int len = processPacket(data.getBuffer(), 0, data.size(), out, outOff);
+
+        reset();
+
+        return len;
+    }
+
+    public void reset()
+    {
+        cipher.reset();
+        associatedText.reset();
+        data.reset();
+    }
+
+    /**
+     * Returns a byte array containing the mac calculated as part of the
+     * last encrypt or decrypt operation.
+     *
+     * @return the last mac calculated.
+     */
+    public byte[] getMac()
+    {
+        byte[] mac = new byte[macSize];
+
+        System.arraycopy(macBlock, 0, mac, 0, mac.length);
+
+        return mac;
+    }
+
+    public int getUpdateOutputSize(int len)
+    {
+        return 0;
+    }
+
+    public int getOutputSize(int len)
+    {
+        int totalData = len + data.size();
+
+        if (forEncryption)
+        {
+             return totalData + macSize;
+        }
+
+        return totalData < macSize ? 0 : totalData - macSize;
+    }
+
+    /**
+     * Process a packet of data for either CCM decryption or encryption.
+     *
+     * @param in data for processing.
+     * @param inOff offset at which data starts in the input array.
+     * @param inLen length of the data in the input array.
+     * @return a byte array containing the processed input..
+     * @throws IllegalStateException if the cipher is not appropriately set up.
+     * @throws InvalidCipherTextException if the input data is truncated or the mac check fails.
+     */
+    public byte[] processPacket(byte[] in, int inOff, int inLen)
+        throws IllegalStateException, InvalidCipherTextException
+    {
+        byte[] output;
+
+        if (forEncryption)
+        {
+            output = new byte[inLen + macSize];
+        }
+        else
+        {
+            if (inLen < macSize)
+            {
+                throw new InvalidCipherTextException("data too short");
+            }
+            output = new byte[inLen - macSize];
+        }
+
+        processPacket(in, inOff, inLen, output, 0);
+
+        return output;
+    }
+
+    /**
+     * Process a packet of data for either CCM decryption or encryption.
+     *
+     * @param in data for processing.
+     * @param inOff offset at which data starts in the input array.
+     * @param inLen length of the data in the input array.
+     * @param output output array.
+     * @param outOff offset into output array to start putting processed bytes.
+     * @return the number of bytes added to output.
+     * @throws IllegalStateException if the cipher is not appropriately set up.
+     * @throws InvalidCipherTextException if the input data is truncated or the mac check fails.
+     * @throws DataLengthException if output buffer too short.
+     */
+    public int processPacket(byte[] in, int inOff, int inLen, byte[] output, int outOff)
+        throws IllegalStateException, InvalidCipherTextException, DataLengthException
+    {
+        // TODO: handle null keyParam (e.g. via RepeatedKeySpec)
+        // Need to keep the CTR and CBC Mac parts around and reset
+        if (keyParam == null)
+        {
+            throw new IllegalStateException("CCM cipher unitialized.");
+        }
+
+        int n = nonce.length;
+        int q = 15 - n;
+        if (q < 4)
+        {
+            int limitLen = 1 << (8 * q);
+            if (inLen >= limitLen)
+            {
+                throw new IllegalStateException("CCM packet too large for choice of q.");
+            }
+        }
+
+        byte[] iv = new byte[blockSize];
+        iv[0] = (byte)((q - 1) & 0x7);
+        System.arraycopy(nonce, 0, iv, 1, nonce.length);
+
+        BlockCipher ctrCipher = SICBlockCipher.newInstance(cipher);
+        ctrCipher.init(forEncryption, new ParametersWithIV(keyParam, iv));
+
+        int outputLen;
+        int inIndex = inOff;
+        int outIndex = outOff;
+
+        if (forEncryption)
+        {
+            outputLen = inLen + macSize;
+            if (output.length < (outputLen + outOff))
+            {
+                throw new OutputLengthException("Output buffer too short.");
+            }
+
+            calculateMac(in, inOff, inLen, macBlock);
+
+            byte[] encMac = new byte[blockSize];
+
+            ctrCipher.processBlock(macBlock, 0, encMac, 0);   // S0
+
+            while (inIndex < (inOff + inLen - blockSize))                 // S1...
+            {
+                ctrCipher.processBlock(in, inIndex, output, outIndex);
+                outIndex += blockSize;
+                inIndex += blockSize;
+            }
+
+            byte[] block = new byte[blockSize];
+
+            System.arraycopy(in, inIndex, block, 0, inLen + inOff - inIndex);
+
+            ctrCipher.processBlock(block, 0, block, 0);
+
+            System.arraycopy(block, 0, output, outIndex, inLen + inOff - inIndex);
+
+            System.arraycopy(encMac, 0, output, outOff + inLen, macSize);
+        }
+        else
+        {
+            if (inLen < macSize)
+            {
+                throw new InvalidCipherTextException("data too short");
+            }
+            outputLen = inLen - macSize;
+            if (output.length < (outputLen + outOff))
+            {
+                throw new OutputLengthException("Output buffer too short.");
+            }
+
+            System.arraycopy(in, inOff + outputLen, macBlock, 0, macSize);
+
+            ctrCipher.processBlock(macBlock, 0, macBlock, 0);
+
+            for (int i = macSize; i != macBlock.length; i++)
+            {
+                macBlock[i] = 0;
+            }
+
+            while (inIndex < (inOff + outputLen - blockSize))
+            {
+                ctrCipher.processBlock(in, inIndex, output, outIndex);
+                outIndex += blockSize;
+                inIndex += blockSize;
+            }
+
+            byte[] block = new byte[blockSize];
+
+            System.arraycopy(in, inIndex, block, 0, outputLen - (inIndex - inOff));
+
+            ctrCipher.processBlock(block, 0, block, 0);
+
+            System.arraycopy(block, 0, output, outIndex, outputLen - (inIndex - inOff));
+
+            byte[] calculatedMacBlock = new byte[blockSize];
+
+            calculateMac(output, outOff, outputLen, calculatedMacBlock);
+
+            if (!Arrays.constantTimeAreEqual(macBlock, calculatedMacBlock))
+            {
+                throw new InvalidCipherTextException("mac check in CCM failed");
+            }
+        }
+
+        return outputLen;
+    }
+
+    private int calculateMac(byte[] data, int dataOff, int dataLen, byte[] macBlock)
+    {
+        Mac cMac = new CBCBlockCipherMac(cipher, macSize * 8);
+
+        cMac.init(keyParam);
+
+        //
+        // build b0
+        //
+        byte[] b0 = new byte[16];
+
+        if (hasAssociatedText())
+        {
+            b0[0] |= 0x40;
+        }
+
+        b0[0] |= (((cMac.getMacSize() - 2) / 2) & 0x7) << 3;
+
+        b0[0] |= ((15 - nonce.length) - 1) & 0x7;
+
+        System.arraycopy(nonce, 0, b0, 1, nonce.length);
+
+        int q = dataLen;
+        int count = 1;
+        while (q > 0)
+        {
+            b0[b0.length - count] = (byte)(q & 0xff);
+            q >>>= 8;
+            count++;
+        }
+
+        cMac.update(b0, 0, b0.length);
+
+        //
+        // process associated text
+        //
+        if (hasAssociatedText())
+        {
+            int extra;
+
+            int textLength = getAssociatedTextLength();
+            if (textLength < ((1 << 16) - (1 << 8)))
+            {
+                cMac.update((byte)(textLength >> 8));
+                cMac.update((byte)textLength);
+
+                extra = 2;
+            }
+            else // can't go any higher than 2^32
+            {
+                cMac.update((byte)0xff);
+                cMac.update((byte)0xfe);
+                cMac.update((byte)(textLength >> 24));
+                cMac.update((byte)(textLength >> 16));
+                cMac.update((byte)(textLength >> 8));
+                cMac.update((byte)textLength);
+
+                extra = 6;
+            }
+
+            if (initialAssociatedText != null)
+            {
+                cMac.update(initialAssociatedText, 0, initialAssociatedText.length);
+            }
+            if (associatedText.size() > 0)
+            {
+                cMac.update(associatedText.getBuffer(), 0, associatedText.size());
+            }
+
+            extra = (extra + textLength) % 16;
+            if (extra != 0)
+            {
+                for (int i = extra; i != 16; i++)
+                {
+                    cMac.update((byte)0x00);
+                }
+            }
+        }
+
+        //
+        // add the text
+        //
+        cMac.update(data, dataOff, dataLen);
+
+        return cMac.doFinal(macBlock, 0);
+    }
+
+    private int getMacSize(boolean forEncryption, int requestedMacBits)
+    {
+        if (forEncryption && (requestedMacBits < 32 || requestedMacBits > 128 || 0 != (requestedMacBits & 15)))
+        {
+            throw new IllegalArgumentException("tag length in octets must be one of {4,6,8,10,12,14,16}");
+        }
+
+        return requestedMacBits >>> 3;
+    }
+
+    private int getAssociatedTextLength()
+    {
+        return associatedText.size() + ((initialAssociatedText == null) ? 0 : initialAssociatedText.length);
+    }
+
+    private boolean hasAssociatedText()
+    {
+        return getAssociatedTextLength() > 0;
+    }
+
+    private static class ExposedByteArrayOutputStream
+        extends ByteArrayOutputStream
+    {
+        public ExposedByteArrayOutputStream()
+        {
+        }
+
+        public byte[] getBuffer()
+        {
+            return this.buf;
+        }
+    }
+}
diff --git a/app/src/main/java/org/bouncycastle/crypto/modes/CCMModeCipher.java b/app/src/main/java/org/bouncycastle/crypto/modes/CCMModeCipher.java
new file mode 100644
index 000000000..d96ac05ae
--- /dev/null
+++ b/app/src/main/java/org/bouncycastle/crypto/modes/CCMModeCipher.java
@@ -0,0 +1,6 @@
+package org.bouncycastle.crypto.modes;
+
+public interface CCMModeCipher
+    extends AEADBlockCipher
+{
+}
diff --git a/app/src/main/java/org/bouncycastle/crypto/modes/CTRModeCipher.java b/app/src/main/java/org/bouncycastle/crypto/modes/CTRModeCipher.java
new file mode 100644
index 000000000..13fd97e74
--- /dev/null
+++ b/app/src/main/java/org/bouncycastle/crypto/modes/CTRModeCipher.java
@@ -0,0 +1,16 @@
+package org.bouncycastle.crypto.modes;
+
+import org.bouncycastle.crypto.BlockCipher;
+import org.bouncycastle.crypto.MultiBlockCipher;
+import org.bouncycastle.crypto.SkippingStreamCipher;
+
+public interface CTRModeCipher
+    extends MultiBlockCipher, SkippingStreamCipher
+{
+    /**
+     * return the underlying block cipher that we are wrapping.
+     *
+     * @return the underlying block cipher that we are wrapping.
+     */
+    BlockCipher getUnderlyingCipher();
+}
diff --git a/app/src/main/java/org/bouncycastle/crypto/modes/SICBlockCipher.java b/app/src/main/java/org/bouncycastle/crypto/modes/SICBlockCipher.java
new file mode 100644
index 000000000..8b2013635
--- /dev/null
+++ b/app/src/main/java/org/bouncycastle/crypto/modes/SICBlockCipher.java
@@ -0,0 +1,381 @@
+package org.bouncycastle.crypto.modes;
+
+import org.bouncycastle.crypto.BlockCipher;
+import org.bouncycastle.crypto.CipherParameters;
+import org.bouncycastle.crypto.DataLengthException;
+import org.bouncycastle.crypto.OutputLengthException;
+import org.bouncycastle.crypto.StreamBlockCipher;
+import org.bouncycastle.crypto.params.ParametersWithIV;
+import org.bouncycastle.util.Arrays;
+import org.bouncycastle.util.Pack;
+
+/**
+ * Implements the Segmented Integer Counter (SIC) mode on top of a simple
+ * block cipher. This mode is also known as CTR mode.
+ */
+public class SICBlockCipher
+    extends StreamBlockCipher
+    implements CTRModeCipher
+{
+    private final BlockCipher     cipher;
+    private final int             blockSize;
+
+    private byte[]          IV;
+    private byte[]          counter;
+    private byte[]          counterOut;
+    private int             byteCount;
+
+    /**
+     * Return a new SIC/CTR mode cipher based on the passed in base cipher
+     *
+     * @param cipher the base cipher for the SIC/CTR mode.
+     */
+    public static CTRModeCipher newInstance(BlockCipher cipher)
+    {
+        return new SICBlockCipher(cipher);
+    }
+
+    /**
+     * Basic constructor.
+     *
+     * @param c the block cipher to be used.
+     * @deprecated use newInstance() method.
+     */
+    public SICBlockCipher(BlockCipher c)
+    {
+        super(c);
+
+        this.cipher = c;
+        this.blockSize = cipher.getBlockSize();
+        this.IV = new byte[blockSize];
+        this.counter = new byte[blockSize];
+        this.counterOut = new byte[blockSize];
+        this.byteCount = 0;
+    }
+
+    public void init(
+        boolean             forEncryption, //ignored by this CTR mode
+        CipherParameters    params)
+        throws IllegalArgumentException
+    {
+        if (params instanceof ParametersWithIV)
+        {
+            ParametersWithIV ivParam = (ParametersWithIV)params;
+            this.IV = Arrays.clone(ivParam.getIV());
+
+            if (blockSize < IV.length)
+            {
+                throw new IllegalArgumentException("CTR/SIC mode requires IV no greater than: " + blockSize + " bytes.");
+            }
+
+            int maxCounterSize = (8 > blockSize / 2) ? blockSize / 2 : 8;
+
+            if (blockSize - IV.length > maxCounterSize)
+            {
+                throw new IllegalArgumentException("CTR/SIC mode requires IV of at least: " + (blockSize - maxCounterSize) + " bytes.");
+            }
+
+            // if null it's an IV changed only.
+            if (ivParam.getParameters() != null)
+            {
+                cipher.init(true, ivParam.getParameters());
+            }
+
+            reset();
+        }
+        else
+        {
+            throw new IllegalArgumentException("CTR/SIC mode requires ParametersWithIV");
+        }
+    }
+
+    public String getAlgorithmName()
+    {
+        return cipher.getAlgorithmName() + "/SIC";
+    }
+
+    public int getBlockSize()
+    {
+        return cipher.getBlockSize();
+    }
+
+    public int processBlock(byte[] in, int inOff, byte[] out, int outOff)
+          throws DataLengthException, IllegalStateException
+    {
+        if (byteCount != 0)
+        {
+            processBytes(in, inOff, blockSize, out, outOff);
+            return blockSize;
+        }
+
+        if (inOff + blockSize > in.length)
+        {
+            throw new DataLengthException("input buffer too small");
+        }
+        if (outOff + blockSize > out.length)
+        {
+            throw new OutputLengthException("output buffer too short");
+        }
+
+        cipher.processBlock(counter, 0, counterOut, 0);
+        for (int i = 0; i < blockSize; ++i)
+        {
+            out[outOff + i] = (byte)(in[inOff + i] ^ counterOut[i]);
+        }
+        incrementCounter();
+        return blockSize;
+    }
+
+    public int processBytes(byte[] in, int inOff, int len, byte[] out, int outOff)
+        throws DataLengthException
+    {
+        if (inOff + len > in.length)
+        {
+            throw new DataLengthException("input buffer too small");
+        }
+        if (outOff + len > out.length)
+        {
+            throw new OutputLengthException("output buffer too short");
+        }
+
+        for (int i = 0; i < len; ++i)
+        {
+            byte next;
+
+            if (byteCount == 0)
+            {
+                checkLastIncrement();
+
+                cipher.processBlock(counter, 0, counterOut, 0);
+                next = (byte)(in[inOff + i] ^ counterOut[byteCount++]);
+            }
+            else
+            {
+                next = (byte)(in[inOff + i] ^ counterOut[byteCount++]);
+                if (byteCount == counter.length)
+                {
+                    byteCount = 0;
+                    incrementCounter();
+                }
+            }
+            out[outOff + i] = next;
+        }
+
+        return len;
+    }
+
+    protected byte calculateByte(byte in)
+          throws DataLengthException, IllegalStateException
+    {
+        if (byteCount == 0)
+        {
+            checkLastIncrement();
+
+            cipher.processBlock(counter, 0, counterOut, 0);
+
+            return (byte)(counterOut[byteCount++] ^ in);
+        }
+
+        byte rv = (byte)(counterOut[byteCount++] ^ in);
+
+        if (byteCount == counter.length)
+        {
+            byteCount = 0;
+            incrementCounter();
+        }
+
+        return rv;
+    }
+
+    private void checkCounter()
+    {
+        // if the IV is the same as the blocksize we assume the user knows what they are doing
+        if (IV.length < blockSize)
+        {
+            for (int i = IV.length - 1; i >= 0; i--)
+            {
+                if (counter[i] != IV[i])
+                {
+                    throw new IllegalStateException("Counter in CTR/SIC mode out of range.");
+                }
+            }
+        }
+    }
+
+    private void checkLastIncrement()
+    {
+        // if the IV is the same as the blocksize we assume the user knows what they are doing
+        if (IV.length < blockSize)
+        {
+            if (counter[IV.length - 1] != IV[IV.length - 1])
+            {
+                throw new IllegalStateException("Counter in CTR/SIC mode out of range.");
+            }
+        }
+    }
+
+    private void incrementCounter()
+    {
+        int i = counter.length;
+        while (--i >= 0)
+        {
+            if (++counter[i] != 0)
+            {
+                break;
+            }
+        }
+    }
+
+    private void incrementCounterAt(int pos)
+    {
+        int i = counter.length - pos;
+        while (--i >= 0)
+        {
+            if (++counter[i] != 0)
+            {
+                break;
+            }
+        }
+    }
+
+    private void incrementCounter(int offSet)
+    {
+        byte old = counter[counter.length - 1];
+
+        counter[counter.length - 1] += offSet;
+
+        if (old != 0 && counter[counter.length - 1] < old)
+        {
+            incrementCounterAt(1);
+        }
+    }
+
+    private void decrementCounterAt(int pos)
+    {
+        int i = counter.length - pos;
+        while (--i >= 0)
+        {
+            if (--counter[i] != -1)
+            {
+                return;
+            }
+        }
+    }
+
+    private void adjustCounter(long n)
+    {
+        if (n >= 0)
+        {
+            long numBlocks = (n + byteCount) / blockSize;
+
+            long rem = numBlocks;
+            if (rem > 255)
+            {
+                for (int i = 5; i >= 1; i--)
+                {
+                    long diff = 1L << (8 * i);
+                    while (rem >= diff)
+                    {
+                        incrementCounterAt(i);
+                        rem -= diff;
+                    }
+                }
+            }
+
+            incrementCounter((int)rem);
+
+            byteCount = (int)((n + byteCount) - (blockSize * numBlocks));
+        }
+        else
+        {
+            long numBlocks = (-n - byteCount) / blockSize;
+
+            long rem = numBlocks;
+            if (rem > 255)
+            {
+                for (int i = 5; i >= 1; i--)
+                {
+                    long diff = 1L << (8 * i);
+                    while (rem > diff)
+                    {
+                        decrementCounterAt(i);
+                        rem -= diff;
+                    }
+                }
+            }
+
+            for (long i = 0; i != rem; i++)
+            {
+                decrementCounterAt(0);
+            }
+
+            int gap = (int)(byteCount + n + (blockSize * numBlocks));
+
+            if (gap >= 0)
+            {
+                byteCount = 0;
+            }
+            else
+            {
+                decrementCounterAt(0);
+                byteCount =  blockSize + gap;
+            }
+        }
+    }
+
+    public void reset()
+    {
+        Arrays.fill(counter, (byte)0);
+        System.arraycopy(IV, 0, counter, 0, IV.length);
+        cipher.reset();
+        this.byteCount = 0;
+    }
+
+    public long skip(long numberOfBytes)
+    {
+        adjustCounter(numberOfBytes);
+
+        checkCounter();
+
+        cipher.processBlock(counter, 0, counterOut, 0);
+
+        return numberOfBytes;
+    }
+
+    public long seekTo(long position)
+    {
+        reset();
+
+        return skip(position);
+    }
+
+    public long getPosition()
+    {
+        byte[] res = new byte[counter.length];
+
+        System.arraycopy(counter, 0, res, 0, res.length);
+
+        for (int i = res.length - 1; i >= 1; i--)
+        {
+            int v;
+            if (i < IV.length)
+            {
+                v = (res[i] & 0xff) - (IV[i] & 0xff);
+            }
+            else
+            {
+                v = (res[i] & 0xff);
+            }
+
+            if (v < 0)
+            {
+               res[i - 1]--;
+               v += 256;
+            }
+
+            res[i] = (byte)v;
+        }
+
+        return Pack.bigEndianToLong(res, res.length - 8) * blockSize + byteCount;
+    }
+}
diff --git a/app/src/main/java/org/bouncycastle/crypto/paddings/BlockCipherPadding.java b/app/src/main/java/org/bouncycastle/crypto/paddings/BlockCipherPadding.java
new file mode 100644
index 000000000..7c4f0aee3
--- /dev/null
+++ b/app/src/main/java/org/bouncycastle/crypto/paddings/BlockCipherPadding.java
@@ -0,0 +1,48 @@
+package org.bouncycastle.crypto.paddings;
+
+import java.security.SecureRandom;
+
+import org.bouncycastle.crypto.InvalidCipherTextException;
+
+/**
+ * Block cipher padders are expected to conform to this interface
+ */
+public interface BlockCipherPadding
+{
+    /**
+     * Initialise the padder.
+     *
+     * @param random the source of randomness for the padding, if required.
+     */
+    public void init(SecureRandom random)
+        throws IllegalArgumentException;
+
+    /**
+     * Return the name of the algorithm the cipher implements.
+     *
+     * @return the name of the algorithm the cipher implements.
+     */
+    public String getPaddingName();
+
+    /**
+     * add the pad bytes to the passed in block, returning the
+     * number of bytes added.
+     * <p>
+     * Note: this assumes that the last block of plain text is always 
+     * passed to it inside in. i.e. if inOff is zero, indicating the
+     * entire block is to be overwritten with padding the value of in
+     * should be the same as the last block of plain text. The reason
+     * for this is that some modes such as "trailing bit compliment"
+     * base the padding on the last byte of plain text.
+     * </p>
+     */
+    public int addPadding(byte[] in, int inOff);
+
+    /**
+     * return the number of pad bytes present in the block.
+     * @exception InvalidCipherTextException if the padding is badly formed
+     * or invalid.
+     */
+    public int padCount(byte[] in)
+        throws InvalidCipherTextException;
+}
diff --git a/app/src/main/java/org/bouncycastle/crypto/params/AEADParameters.java b/app/src/main/java/org/bouncycastle/crypto/params/AEADParameters.java
new file mode 100644
index 000000000..c06481591
--- /dev/null
+++ b/app/src/main/java/org/bouncycastle/crypto/params/AEADParameters.java
@@ -0,0 +1,61 @@
+package org.bouncycastle.crypto.params;
+
+import org.bouncycastle.crypto.CipherParameters;
+import org.bouncycastle.util.Arrays;
+
+public class AEADParameters
+    implements CipherParameters
+{
+    private byte[] associatedText;
+    private byte[] nonce;
+    private KeyParameter key;
+    private int macSize;
+
+    /**
+     * Base constructor.
+     *
+     * @param key key to be used by underlying cipher
+     * @param macSize macSize in bits
+     * @param nonce nonce to be used
+     */
+   public AEADParameters(KeyParameter key, int macSize, byte[] nonce)
+    {
+       this(key, macSize, nonce, null);
+    }
+
+    /**
+     * Base constructor.
+     *
+     * @param key key to be used by underlying cipher
+     * @param macSize macSize in bits
+     * @param nonce nonce to be used
+     * @param associatedText initial associated text, if any
+     */
+    public AEADParameters(KeyParameter key, int macSize, byte[] nonce, byte[] associatedText)
+    {
+        this.key = key;
+        this.nonce = Arrays.clone(nonce);
+        this.macSize = macSize;
+        this.associatedText = Arrays.clone(associatedText);
+    }
+
+    public KeyParameter getKey()
+    {
+        return key;
+    }
+
+    public int getMacSize()
+    {
+        return macSize;
+    }
+
+    public byte[] getAssociatedText()
+    {
+        return Arrays.clone(associatedText);
+    }
+
+    public byte[] getNonce()
+    {
+        return Arrays.clone(nonce);
+    }
+}
diff --git a/app/src/main/java/org/bouncycastle/crypto/params/KeyParameter.java b/app/src/main/java/org/bouncycastle/crypto/params/KeyParameter.java
new file mode 100644
index 000000000..e16399595
--- /dev/null
+++ b/app/src/main/java/org/bouncycastle/crypto/params/KeyParameter.java
@@ -0,0 +1,56 @@
+package org.bouncycastle.crypto.params;
+
+import org.bouncycastle.crypto.CipherParameters;
+import org.bouncycastle.util.Arrays;
+
+public class KeyParameter
+    implements CipherParameters
+{
+    private byte[]  key;
+
+    public KeyParameter(
+        byte[]  key)
+    {
+        this(key, 0, key.length);
+    }
+
+    public KeyParameter(
+        byte[]  key,
+        int     keyOff,
+        int     keyLen)
+    {
+        this(keyLen);
+
+        System.arraycopy(key, keyOff, this.key, 0, keyLen);
+    }
+
+    private KeyParameter(int length)
+    {
+        this.key = new byte[length];
+    }
+
+    public void copyTo(byte[] buf, int off, int len)
+    {
+        if (key.length != len)
+            throw new IllegalArgumentException("len");
+
+        System.arraycopy(key, 0, buf, off, len);
+    }
+
+    public byte[] getKey()
+    {
+        return key;
+    }
+
+    public int getKeyLength()
+    {
+        return key.length;
+    }
+
+    public KeyParameter reverse()
+    {
+        KeyParameter reversed = new KeyParameter(key.length);
+        Arrays.reverse(this.key, reversed.key);
+        return reversed;
+    }
+}
diff --git a/app/src/main/java/org/bouncycastle/crypto/params/ParametersWithIV.java b/app/src/main/java/org/bouncycastle/crypto/params/ParametersWithIV.java
new file mode 100644
index 000000000..4a1e6e9a3
--- /dev/null
+++ b/app/src/main/java/org/bouncycastle/crypto/params/ParametersWithIV.java
@@ -0,0 +1,39 @@
+package org.bouncycastle.crypto.params;
+
+import org.bouncycastle.crypto.CipherParameters;
+
+public class ParametersWithIV
+    implements CipherParameters
+{
+    private byte[]              iv;
+    private CipherParameters    parameters;
+
+    public ParametersWithIV(
+        CipherParameters    parameters,
+        byte[]              iv)
+    {
+        this(parameters, iv, 0, iv.length);
+    }
+
+    public ParametersWithIV(
+        CipherParameters    parameters,
+        byte[]              iv,
+        int                 ivOff,
+        int                 ivLen)
+    {
+        this.iv = new byte[ivLen];
+        this.parameters = parameters;
+
+        System.arraycopy(iv, ivOff, this.iv, 0, ivLen);
+    }
+
+    public byte[] getIV()
+    {
+        return iv;
+    }
+
+    public CipherParameters getParameters()
+    {
+        return parameters;
+    }
+}
diff --git a/app/src/main/java/org/bouncycastle/util/Arrays.java b/app/src/main/java/org/bouncycastle/util/Arrays.java
new file mode 100644
index 000000000..230520eaf
--- /dev/null
+++ b/app/src/main/java/org/bouncycastle/util/Arrays.java
@@ -0,0 +1,1227 @@
+package org.bouncycastle.util;
+
+import java.math.BigInteger;
+import java.util.NoSuchElementException;
+
+/**
+ * General array utilities.
+ */
+public final class Arrays
+{
+    private Arrays()
+    {
+        // static class, hide constructor
+    }
+
+    public static boolean areAllZeroes(byte[] buf, int off, int len)
+    {
+        int bits = 0;
+        for (int i = 0; i < len; ++i)
+        {
+            bits |= buf[off + i];
+        }
+        return bits == 0;
+    }
+
+    public static boolean areEqual(boolean[] a, boolean[] b)
+    {
+        return java.util.Arrays.equals(a, b);
+    }
+
+    public static boolean areEqual(byte[] a, byte[] b)
+    {
+        return java.util.Arrays.equals(a, b);
+    }
+
+    public static boolean areEqual(byte[] a, int aFromIndex, int aToIndex, byte[] b, int bFromIndex, int bToIndex)
+    {
+        int aLength = aToIndex - aFromIndex;
+        int bLength = bToIndex - bFromIndex;
+
+        if (aLength != bLength)
+        {
+            return false;
+        }
+
+        for (int i = 0; i < aLength; ++i)
+        {
+            if (a[aFromIndex + i] != b[bFromIndex + i])
+            {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    public static boolean areEqual(char[] a, char[] b)
+    {
+        return java.util.Arrays.equals(a, b);
+    }
+
+    public static boolean areEqual(int[] a, int[] b)
+    {
+        return java.util.Arrays.equals(a, b);
+    }
+
+    public static boolean areEqual(long[] a, long[] b)
+    {
+        return java.util.Arrays.equals(a, b);
+    }
+
+    public static boolean areEqual(Object[] a, Object[] b)
+    {
+        return java.util.Arrays.equals(a, b);
+    }
+
+    public static boolean areEqual(short[] a, short[] b)
+    {
+        return java.util.Arrays.equals(a, b);
+    }
+
+    /**
+     * A constant time equals comparison - does not terminate early if
+     * test will fail. For best results always pass the expected value
+     * as the first parameter.
+     *
+     * @param expected first array
+     * @param supplied second array
+     * @return true if arrays equal, false otherwise.
+     */
+    public static boolean constantTimeAreEqual(
+            byte[]  expected,
+            byte[]  supplied)
+    {
+        if (expected == null || supplied == null)
+        {
+            return false;
+        }
+
+        if (expected == supplied)
+        {
+            return true;
+        }
+
+        int len = (expected.length < supplied.length) ? expected.length : supplied.length;
+
+        int nonEqual = expected.length ^ supplied.length;
+
+        for (int i = 0; i != len; i++)
+        {
+            nonEqual |= (expected[i] ^ supplied[i]);
+        }
+        for (int i = len; i < supplied.length; i++)
+        {
+            nonEqual |= (supplied[i] ^ ~supplied[i]);
+        }
+
+        return nonEqual == 0;
+    }
+
+    public static boolean constantTimeAreEqual(int len, byte[] a, int aOff, byte[] b, int bOff)
+    {
+        if (null == a)
+        {
+            throw new NullPointerException("'a' cannot be null");
+        }
+        if (null == b)
+        {
+            throw new NullPointerException("'b' cannot be null");
+        }
+        if (len < 0)
+        {
+            throw new IllegalArgumentException("'len' cannot be negative");
+        }
+        if (aOff > (a.length - len))
+        {
+            throw new IndexOutOfBoundsException("'aOff' value invalid for specified length");
+        }
+        if (bOff > (b.length - len))
+        {
+            throw new IndexOutOfBoundsException("'bOff' value invalid for specified length");
+        }
+
+        int d = 0;
+        for (int i = 0; i < len; ++i)
+        {
+            d |= (a[aOff + i] ^ b[bOff + i]);
+        }
+        return 0 == d;
+    }
+
+    /**
+     * A constant time equals comparison - does not terminate early if
+     * comparison fails. For best results always pass the expected value
+     * as the first parameter.
+     *
+     * @param expected first array
+     * @param supplied second array
+     * @return true if arrays equal, false otherwise.
+     */
+    public static boolean constantTimeAreEqual(
+            char[] expected,
+            char[] supplied)
+    {
+        if (expected == null || supplied == null)
+        {
+            return false;
+        }
+
+        if (expected == supplied)
+        {
+            return true;
+        }
+
+        int len = Math.min(expected.length, supplied.length);
+
+        int nonEqual = expected.length ^ supplied.length;
+
+        // do the char-wise comparison
+        for (int i = 0; i != len; i++)
+        {
+            nonEqual |= (expected[i] ^ supplied[i]);
+        }
+        // If supplied is longer than expected, iterate over rest of supplied with NOPs
+        for (int i = len; i < supplied.length; i++)
+        {
+            nonEqual |= ((byte)supplied[i] ^ (byte)~supplied[i]);
+        }
+
+        return nonEqual == 0;
+    }
+
+    public static int compareUnsigned(byte[] a, byte[] b)
+    {
+        if (a == b)
+        {
+            return 0;
+        }
+        if (a == null)
+        {
+            return -1;
+        }
+        if (b == null)
+        {
+            return 1;
+        }
+        int minLen = Math.min(a.length, b.length);
+        for (int i = 0; i < minLen; ++i)
+        {
+            int aVal = a[i] & 0xFF, bVal = b[i] & 0xFF;
+            if (aVal < bVal)
+            {
+                return -1;
+            }
+            if (aVal > bVal)
+            {
+                return 1;
+            }
+        }
+        if (a.length < b.length)
+        {
+            return -1;
+        }
+        if (a.length > b.length)
+        {
+            return 1;
+        }
+        return 0;
+    }
+
+    public static boolean contains(boolean[] a, boolean val)
+    {
+        for (int i = 0; i < a.length; ++i)
+        {
+            if (a[i] == val)
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static boolean contains(byte[] a, byte val)
+    {
+        for (int i = 0; i < a.length; ++i)
+        {
+            if (a[i] == val)
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static boolean contains(char[] a, char val)
+    {
+        for (int i = 0; i < a.length; ++i)
+        {
+            if (a[i] == val)
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static boolean contains(int[] a, int val)
+    {
+        for (int i = 0; i < a.length; ++i)
+        {
+            if (a[i] == val)
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static boolean contains(long[] a, long val)
+    {
+        for (int i = 0; i < a.length; ++i)
+        {
+            if (a[i] == val)
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static boolean contains(short[] a, short val)
+    {
+        for (int i = 0; i < a.length; ++i)
+        {
+            if (a[i] == val)
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static void fill(boolean[] a, boolean val)
+    {
+        java.util.Arrays.fill(a, val);
+    }
+
+    public static void fill(boolean[] a, int fromIndex, int toIndex, boolean val)
+    {
+        java.util.Arrays.fill(a, fromIndex, toIndex, val);
+    }
+
+    public static void fill(byte[] a, byte val)
+    {
+        java.util.Arrays.fill(a, val);
+    }
+
+    public static void fill(byte[] a, int fromIndex, int toIndex, byte val)
+    {
+        java.util.Arrays.fill(a, fromIndex, toIndex, val);
+    }
+
+    public static void fill(char[] a, char val)
+    {
+        java.util.Arrays.fill(a, val);
+    }
+
+    public static void fill(char[] a, int fromIndex, int toIndex, char val)
+    {
+        java.util.Arrays.fill(a, fromIndex, toIndex, val);
+    }
+
+    public static void fill(int[] a, int val)
+    {
+        java.util.Arrays.fill(a, val);
+    }
+
+    public static void fill(int[] a, int fromIndex, int toIndex, int val)
+    {
+        java.util.Arrays.fill(a, fromIndex, toIndex, val);
+    }
+
+    public static void fill(long[] a, long val)
+    {
+        java.util.Arrays.fill(a, val);
+    }
+
+    public static void fill(long[] a, int fromIndex, int toIndex, long val)
+    {
+        java.util.Arrays.fill(a, fromIndex, toIndex, val);
+    }
+
+    public static void fill(Object[] a, Object val)
+    {
+        java.util.Arrays.fill(a, val);
+    }
+
+    public static void fill(Object[] a, int fromIndex, int toIndex, Object val)
+    {
+        java.util.Arrays.fill(a, fromIndex, toIndex, val);
+    }
+
+    public static void fill(short[] a, short val)
+    {
+        java.util.Arrays.fill(a, val);
+    }
+
+    public static void fill(short[] a, int fromIndex, int toIndex, short val)
+    {
+        java.util.Arrays.fill(a, fromIndex, toIndex, val);
+    }
+
+    public static int hashCode(byte[] data)
+    {
+        if (data == null)
+        {
+            return 0;
+        }
+
+        int i = data.length;
+        int hc = i + 1;
+
+        while (--i >= 0)
+        {
+            hc *= 257;
+            hc ^= data[i];
+        }
+
+        return hc;
+    }
+
+    public static int hashCode(byte[] data, int off, int len)
+    {
+        if (data == null)
+        {
+            return 0;
+        }
+
+        int i = len;
+        int hc = i + 1;
+
+        while (--i >= 0)
+        {
+            hc *= 257;
+            hc ^= data[off + i];
+        }
+
+        return hc;
+    }
+
+    public static int hashCode(char[] data)
+    {
+        if (data == null)
+        {
+            return 0;
+        }
+
+        int i = data.length;
+        int hc = i + 1;
+
+        while (--i >= 0)
+        {
+            hc *= 257;
+            hc ^= data[i];
+        }
+
+        return hc;
+    }
+
+    public static int hashCode(int[][] ints)
+    {
+        int hc = 0;
+
+        for (int i = 0; i != ints.length; i++)
+        {
+            hc = hc * 257 + hashCode(ints[i]);
+        }
+
+        return hc;
+    }
+
+    public static int hashCode(int[] data)
+    {
+        if (data == null)
+        {
+            return 0;
+        }
+
+        int i = data.length;
+        int hc = i + 1;
+
+        while (--i >= 0)
+        {
+            hc *= 257;
+            hc ^= data[i];
+        }
+
+        return hc;
+    }
+
+    public static int hashCode(int[] data, int off, int len)
+    {
+        if (data == null)
+        {
+            return 0;
+        }
+
+        int i = len;
+        int hc = i + 1;
+
+        while (--i >= 0)
+        {
+            hc *= 257;
+            hc ^= data[off + i];
+        }
+
+        return hc;
+    }
+
+    public static int hashCode(long[] data)
+    {
+        if (data == null)
+        {
+            return 0;
+        }
+
+        int i = data.length;
+        int hc = i + 1;
+
+        while (--i >= 0)
+        {
+            long di = data[i];
+            hc *= 257;
+            hc ^= (int)di;
+            hc *= 257;
+            hc ^= (int)(di >>> 32);
+        }
+
+        return hc;
+    }
+
+    public static int hashCode(long[] data, int off, int len)
+    {
+        if (data == null)
+        {
+            return 0;
+        }
+
+        int i = len;
+        int hc = i + 1;
+
+        while (--i >= 0)
+        {
+            long di = data[off + i];
+            hc *= 257;
+            hc ^= (int)di;
+            hc *= 257;
+            hc ^= (int)(di >>> 32);
+        }
+
+        return hc;
+    }
+
+    public static int hashCode(short[][][] shorts)
+    {
+        int hc = 0;
+
+        for (int i = 0; i != shorts.length; i++)
+        {
+            hc = hc * 257 + hashCode(shorts[i]);
+        }
+
+        return hc;
+    }
+
+    public static int hashCode(short[][] shorts)
+    {
+        int hc = 0;
+
+        for (int i = 0; i != shorts.length; i++)
+        {
+            hc = hc * 257 + hashCode(shorts[i]);
+        }
+
+        return hc;
+    }
+
+    public static int hashCode(short[] data)
+    {
+        if (data == null)
+        {
+            return 0;
+        }
+
+        int i = data.length;
+        int hc = i + 1;
+
+        while (--i >= 0)
+        {
+            hc *= 257;
+            hc ^= (data[i] & 0xff);
+        }
+
+        return hc;
+    }
+
+    public static int hashCode(Object[] data)
+    {
+        if (data == null)
+        {
+            return 0;
+        }
+
+        int i = data.length;
+        int hc = i + 1;
+
+        while (--i >= 0)
+        {
+            hc *= 257;
+            hc ^= Objects.hashCode(data[i]);
+        }
+
+        return hc;
+    }
+
+    public static boolean[] clone(boolean[] data)
+    {
+        return null == data ? null : data.clone();
+    }
+
+    public static byte[] clone(byte[] data)
+    {
+        return null == data ? null : data.clone();
+    }
+
+    public static char[] clone(char[] data)
+    {
+        return null == data ? null : data.clone();
+    }
+
+    public static int[] clone(int[] data)
+    {
+        return null == data ? null : data.clone();
+    }
+
+    public static long[] clone(long[] data)
+    {
+        return null == data ? null : data.clone();
+    }
+
+    public static short[] clone(short[] data)
+    {
+        return null == data ? null : data.clone();
+    }
+
+    public static BigInteger[] clone(BigInteger[] data)
+    {
+        return null == data ? null : data.clone();
+    }
+
+    public static byte[] clone(byte[] data, byte[] existing)
+    {
+        if (data == null)
+        {
+            return null;
+        }
+        if ((existing == null) || (existing.length != data.length))
+        {
+            return clone(data);
+        }
+        System.arraycopy(data, 0, existing, 0, existing.length);
+        return existing;
+    }
+
+    public static long[] clone(long[] data, long[] existing)
+    {
+        if (data == null)
+        {
+            return null;
+        }
+        if ((existing == null) || (existing.length != data.length))
+        {
+            return clone(data);
+        }
+        System.arraycopy(data, 0, existing, 0, existing.length);
+        return existing;
+    }
+
+    public static byte[][] clone(byte[][] data)
+    {
+        if (data == null)
+        {
+            return null;
+        }
+
+        byte[][] copy = new byte[data.length][];
+
+        for (int i = 0; i != copy.length; i++)
+        {
+            copy[i] = clone(data[i]);
+        }
+
+        return copy;
+    }
+
+    public static byte[][][] clone(byte[][][] data)
+    {
+        if (data == null)
+        {
+            return null;
+        }
+
+        byte[][][] copy = new byte[data.length][][];
+
+        for (int i = 0; i != copy.length; i++)
+        {
+            copy[i] = clone(data[i]);
+        }
+
+        return copy;
+    }
+
+    public static boolean[] copyOf(boolean[] original, int newLength)
+    {
+        boolean[] copy = new boolean[newLength];
+        System.arraycopy(original, 0, copy, 0, Math.min(original.length, newLength));
+        return copy;
+    }
+
+    public static byte[] copyOf(byte[] original, int newLength)
+    {
+        byte[] copy = new byte[newLength];
+        System.arraycopy(original, 0, copy, 0, Math.min(original.length, newLength));
+        return copy;
+    }
+
+    public static char[] copyOf(char[] original, int newLength)
+    {
+        char[] copy = new char[newLength];
+        System.arraycopy(original, 0, copy, 0, Math.min(original.length, newLength));
+        return copy;
+    }
+
+    public static int[] copyOf(int[] original, int newLength)
+    {
+        int[] copy = new int[newLength];
+        System.arraycopy(original, 0, copy, 0, Math.min(original.length, newLength));
+        return copy;
+    }
+
+    public static long[] copyOf(long[] original, int newLength)
+    {
+        long[] copy = new long[newLength];
+        System.arraycopy(original, 0, copy, 0, Math.min(original.length, newLength));
+        return copy;
+    }
+
+    public static short[] copyOf(short[] original, int newLength)
+    {
+        short[] copy = new short[newLength];
+        System.arraycopy(original, 0, copy, 0, Math.min(original.length, newLength));
+        return copy;
+    }
+
+    public static BigInteger[] copyOf(BigInteger[] original, int newLength)
+    {
+        BigInteger[] copy = new BigInteger[newLength];
+        System.arraycopy(original, 0, copy, 0, Math.min(original.length, newLength));
+        return copy;
+    }
+
+    public static boolean[] copyOfRange(boolean[] original, int from, int to)
+    {
+        int newLength = getLength(from, to);
+        boolean[] copy = new boolean[newLength];
+        System.arraycopy(original, from, copy, 0, Math.min(original.length - from, newLength));
+        return copy;
+    }
+
+    /**
+     * Make a copy of a range of bytes from the passed in array. The range can extend beyond the end
+     * of the input array, in which case the returned array will be padded with zeroes.
+     *
+     * @param original
+     *            the array from which the data is to be copied.
+     * @param from
+     *            the start index at which the copying should take place.
+     * @param to
+     *            the final index of the range (exclusive).
+     *
+     * @return a new byte array containing the range given.
+     */
+    public static byte[] copyOfRange(byte[] original, int from, int to)
+    {
+        int newLength = getLength(from, to);
+        byte[] copy = new byte[newLength];
+        System.arraycopy(original, from, copy, 0, Math.min(original.length - from, newLength));
+        return copy;
+    }
+
+    public static char[] copyOfRange(char[] original, int from, int to)
+    {
+        int newLength = getLength(from, to);
+        char[] copy = new char[newLength];
+        System.arraycopy(original, from, copy, 0, Math.min(original.length - from, newLength));
+        return copy;
+    }
+
+    public static int[] copyOfRange(int[] original, int from, int to)
+    {
+        int newLength = getLength(from, to);
+        int[] copy = new int[newLength];
+        System.arraycopy(original, from, copy, 0, Math.min(original.length - from, newLength));
+        return copy;
+    }
+
+    public static long[] copyOfRange(long[] original, int from, int to)
+    {
+        int newLength = getLength(from, to);
+        long[] copy = new long[newLength];
+        System.arraycopy(original, from, copy, 0, Math.min(original.length - from, newLength));
+        return copy;
+    }
+
+    public static short[] copyOfRange(short[] original, int from, int to)
+    {
+        int newLength = getLength(from, to);
+        short[] copy = new short[newLength];
+        System.arraycopy(original, from, copy, 0, Math.min(original.length - from, newLength));
+        return copy;
+    }
+
+    public static BigInteger[] copyOfRange(BigInteger[] original, int from, int to)
+    {
+        int newLength = getLength(from, to);
+        BigInteger[] copy = new BigInteger[newLength];
+        System.arraycopy(original, from, copy, 0, Math.min(original.length - from, newLength));
+        return copy;
+    }
+
+    private static int getLength(int from, int to)
+    {
+        int newLength = to - from;
+        if (newLength < 0)
+        {
+            StringBuffer sb = new StringBuffer(from);
+            sb.append(" > ").append(to);
+            throw new IllegalArgumentException(sb.toString());
+        }
+        return newLength;
+    }
+
+    public static byte[] append(byte[] a, byte b)
+    {
+        if (a == null)
+        {
+            return new byte[]{ b };
+        }
+
+        int length = a.length;
+        byte[] result = new byte[length + 1];
+        System.arraycopy(a, 0, result, 0, length);
+        result[length] = b;
+        return result;
+    }
+
+    public static short[] append(short[] a, short b)
+    {
+        if (a == null)
+        {
+            return new short[]{ b };
+        }
+
+        int length = a.length;
+        short[] result = new short[length + 1];
+        System.arraycopy(a, 0, result, 0, length);
+        result[length] = b;
+        return result;
+    }
+
+    public static int[] append(int[] a, int b)
+    {
+        if (a == null)
+        {
+            return new int[]{ b };
+        }
+
+        int length = a.length;
+        int[] result = new int[length + 1];
+        System.arraycopy(a, 0, result, 0, length);
+        result[length] = b;
+        return result;
+    }
+
+    public static String[] append(String[] a, String b)
+    {
+        if (a == null)
+        {
+            return new String[]{ b };
+        }
+
+        int length = a.length;
+        String[] result = new String[length + 1];
+        System.arraycopy(a, 0, result, 0, length);
+        result[length] = b;
+        return result;
+    }
+
+    public static byte[] concatenate(byte[] a, byte[] b)
+    {
+        if (null == a)
+        {
+            // b might also be null
+            return clone(b);
+        }
+        if (null == b)
+        {
+            // a might also be null
+            return clone(a);
+        }
+
+        byte[] r = new byte[a.length + b.length];
+        System.arraycopy(a, 0, r, 0, a.length);
+        System.arraycopy(b, 0, r, a.length, b.length);
+        return r;
+    }
+
+    public static short[] concatenate(short[] a, short[] b)
+    {
+        if (null == a)
+        {
+            // b might also be null
+            return clone(b);
+        }
+        if (null == b)
+        {
+            // a might also be null
+            return clone(a);
+        }
+
+        short[] r = new short[a.length + b.length];
+        System.arraycopy(a, 0, r, 0, a.length);
+        System.arraycopy(b, 0, r, a.length, b.length);
+        return r;
+    }
+
+    public static byte[] concatenate(byte[] a, byte[] b, byte[] c)
+    {
+        if (null == a)
+        {
+            return concatenate(b, c);
+        }
+        if (null == b)
+        {
+            return concatenate(a, c);
+        }
+        if (null == c)
+        {
+            return concatenate(a, b);
+        }
+
+        byte[] r = new byte[a.length + b.length + c.length];
+        int pos = 0;
+        System.arraycopy(a, 0, r, pos, a.length);       pos += a.length;
+        System.arraycopy(b, 0, r, pos, b.length);       pos += b.length;
+        System.arraycopy(c, 0, r, pos, c.length);
+        return r;
+    }
+
+    public static byte[] concatenate(byte[] a, byte[] b, byte[] c, byte[] d)
+    {
+        if (null == a)
+        {
+            return concatenate(b, c, d);
+        }
+        if (null == b)
+        {
+            return concatenate(a, c, d);
+        }
+        if (null == c)
+        {
+            return concatenate(a, b, d);
+        }
+        if (null == d)
+        {
+            return concatenate(a, b, c);
+        }
+
+        byte[] r = new byte[a.length + b.length + c.length + d.length];
+        int pos = 0;
+        System.arraycopy(a, 0, r, pos, a.length);       pos += a.length;
+        System.arraycopy(b, 0, r, pos, b.length);       pos += b.length;
+        System.arraycopy(c, 0, r, pos, c.length);       pos += c.length;
+        System.arraycopy(d, 0, r, pos, d.length);
+        return r;
+    }
+
+    public static byte[] concatenate(byte[][] arrays)
+    {
+        int size = 0;
+        for (int i = 0; i != arrays.length; i++)
+        {
+            size += arrays[i].length;
+        }
+
+        byte[] rv = new byte[size];
+
+        int offSet = 0;
+        for (int i = 0; i != arrays.length; i++)
+        {
+            System.arraycopy(arrays[i], 0, rv, offSet, arrays[i].length);
+            offSet += arrays[i].length;
+        }
+
+        return rv;
+    }
+
+    public static int[] concatenate(int[] a, int[] b)
+    {
+        if (null == a)
+        {
+            // b might also be null
+            return clone(b);
+        }
+        if (null == b)
+        {
+            // a might also be null
+            return clone(a);
+        }
+
+        int[] r = new int[a.length + b.length];
+        System.arraycopy(a, 0, r, 0, a.length);
+        System.arraycopy(b, 0, r, a.length, b.length);
+        return r;
+    }
+
+    public static byte[] prepend(byte[] a, byte b)
+    {
+        if (a == null)
+        {
+            return new byte[]{ b };
+        }
+
+        int length = a.length;
+        byte[] result = new byte[length + 1];
+        System.arraycopy(a, 0, result, 1, length);
+        result[0] = b;
+        return result;
+    }
+
+    public static short[] prepend(short[] a, short b)
+    {
+        if (a == null)
+        {
+            return new short[]{ b };
+        }
+
+        int length = a.length;
+        short[] result = new short[length + 1];
+        System.arraycopy(a, 0, result, 1, length);
+        result[0] = b;
+        return result;
+    }
+
+    public static int[] prepend(int[] a, int b)
+    {
+        if (a == null)
+        {
+            return new int[]{ b };
+        }
+
+        int length = a.length;
+        int[] result = new int[length + 1];
+        System.arraycopy(a, 0, result, 1, length);
+        result[0] = b;
+        return result;
+    }
+
+    public static byte[] reverse(byte[] a)
+    {
+        if (a == null)
+        {
+            return null;
+        }
+
+        int p1 = 0, p2 = a.length;
+        byte[] result = new byte[p2];
+
+        while (--p2 >= 0)
+        {
+            result[p2] = a[p1++];
+        }
+
+        return result;
+    }
+
+    public static int[] reverse(int[] a)
+    {
+        if (a == null)
+        {
+            return null;
+        }
+
+        int p1 = 0, p2 = a.length;
+        int[] result = new int[p2];
+
+        while (--p2 >= 0)
+        {
+            result[p2] = a[p1++];
+        }
+
+        return result;
+    }
+
+    public static void reverse(byte[] input, byte[] output)
+    {
+        int last = input.length - 1;
+        for (int i = 0; i <= last; ++i)
+        {
+            output[i] = input[last - i];
+        }
+    }
+
+    public static byte[] reverseInPlace(byte[] a)
+    {
+        if (null == a)
+        {
+            return null;
+        }
+
+        int p1 = 0, p2 = a.length - 1;
+        while (p1 < p2)
+        {
+            byte t1 = a[p1], t2 = a[p2];
+            a[p1++] = t2;
+            a[p2--] = t1;
+        }
+
+        return a;
+    }
+
+    public static void reverseInPlace(byte[] a, int aOff, int aLen)
+    {
+        int p1 = aOff, p2 = aOff + aLen - 1;
+        while (p1 < p2)
+        {
+            byte t1 = a[p1], t2 = a[p2];
+            a[p1++] = t2;
+            a[p2--] = t1;
+        }
+    }
+
+    public static int[] reverseInPlace(int[] a)
+    {
+        if (null == a)
+        {
+            return null;
+        }
+
+        int p1 = 0, p2 = a.length - 1;
+        while (p1 < p2)
+        {
+            int t1 = a[p1], t2 = a[p2];
+            a[p1++] = t2;
+            a[p2--] = t1;
+        }
+
+        return a;
+    }
+
+    /**
+     * Iterator backed by a specific array.
+     */
+    public static class Iterator<T>
+            implements java.util.Iterator<T>
+    {
+        private final T[] dataArray;
+
+        private int position = 0;
+
+        /**
+         * Base constructor.
+         * <p>
+         * Note: the array is not cloned, changes to it will affect the values returned by next().
+         * </p>
+         *
+         * @param dataArray array backing the iterator.
+         */
+        public Iterator(T[] dataArray)
+        {
+            this.dataArray = dataArray;
+        }
+
+        public boolean hasNext()
+        {
+            return position < dataArray.length;
+        }
+
+        public T next()
+        {
+            if (position == dataArray.length)
+            {
+                throw new NoSuchElementException("Out of elements: " + position);
+            }
+
+            return dataArray[position++];
+        }
+
+        public void remove()
+        {
+            throw new UnsupportedOperationException("Cannot remove element from an Array.");
+        }
+    }
+
+    /**
+     * Fill input array by zeros
+     *
+     * @param data input array
+     */
+    public static void clear(byte[] data)
+    {
+        if (null != data)
+        {
+            java.util.Arrays.fill(data, (byte)0x00);
+        }
+    }
+
+    public static void clear(int[] data)
+    {
+        if (null != data)
+        {
+            java.util.Arrays.fill(data, 0);
+        }
+    }
+
+    public static boolean isNullOrContainsNull(Object[] array)
+    {
+        if (null == array)
+        {
+            return true;
+        }
+        int count = array.length;
+        for (int i = 0; i < count; ++i)
+        {
+            if (null == array[i])
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static boolean isNullOrEmpty(byte[] array)
+    {
+        return null == array || array.length < 1;
+    }
+
+    public static boolean isNullOrEmpty(int[] array)
+    {
+        return null == array || array.length < 1;
+    }
+
+    public static boolean isNullOrEmpty(Object[] array)
+    {
+        return null == array || array.length < 1;
+    }
+}
diff --git a/app/src/main/java/org/bouncycastle/util/Objects.java b/app/src/main/java/org/bouncycastle/util/Objects.java
new file mode 100644
index 000000000..9ea2ff36c
--- /dev/null
+++ b/app/src/main/java/org/bouncycastle/util/Objects.java
@@ -0,0 +1,14 @@
+package org.bouncycastle.util;
+
+public class Objects
+{
+    public static boolean areEqual(Object a, Object b)
+    {
+        return a == b || (null != a && null != b && a.equals(b));
+    }
+
+    public static int hashCode(Object obj)
+    {
+        return null == obj ? 0 : obj.hashCode();
+    }
+}
diff --git a/app/src/main/java/org/bouncycastle/util/Pack.java b/app/src/main/java/org/bouncycastle/util/Pack.java
new file mode 100644
index 000000000..525f1e940
--- /dev/null
+++ b/app/src/main/java/org/bouncycastle/util/Pack.java
@@ -0,0 +1,40 @@
+package org.bouncycastle.util;
+
+/**
+ * Utility methods for converting byte arrays into ints and longs, and back again.
+ */
+public abstract class Pack
+{
+    public static int bigEndianToInt(byte[] bs, int off)
+    {
+        int n = bs[  off] << 24;
+        n |= (bs[++off] & 0xff) << 16;
+        n |= (bs[++off] & 0xff) << 8;
+        n |= (bs[++off] & 0xff);
+        return n;
+    }
+
+    public static long bigEndianToLong(byte[] bs, int off)
+    {
+        int hi = bigEndianToInt(bs, off);
+        int lo = bigEndianToInt(bs, off + 4);
+        return ((long)(hi & 0xffffffffL) << 32) | (long)(lo & 0xffffffffL);
+    }
+
+    public static int littleEndianToInt(byte[] bs, int off)
+    {
+        int n = bs[off] & 0xff;
+        n |= (bs[++off] & 0xff) << 8;
+        n |= (bs[++off] & 0xff) << 16;
+        n |= bs[++off] << 24;
+        return n;
+    }
+
+    public static void intToLittleEndian(int n, byte[] bs, int off)
+    {
+        bs[off] = (byte)(n);
+        bs[++off] = (byte)(n >>> 8);
+        bs[++off] = (byte)(n >>> 16);
+        bs[++off] = (byte)(n >>> 24);
+    }
+}
diff --git a/app/src/main/java/org/bouncycastle/util/Strings.java b/app/src/main/java/org/bouncycastle/util/Strings.java
new file mode 100644
index 000000000..7f2d81b66
--- /dev/null
+++ b/app/src/main/java/org/bouncycastle/util/Strings.java
@@ -0,0 +1,38 @@
+package org.bouncycastle.util;
+
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+/* loaded from: classes.dex */
+public final class Strings {
+    private static String LINE_SEPARATOR;
+
+    static {
+        try {
+            LINE_SEPARATOR = (String) AccessController.doPrivileged(new PrivilegedAction<String>() { // from class: org.bouncycastle.util.Strings.1
+                @Override // java.security.PrivilegedAction
+                public String run() {
+                    return System.getProperty("line.separator");
+                }
+            });
+        } catch (Exception e) {
+            try {
+                LINE_SEPARATOR = String.format("%n", new Object[0]);
+            } catch (Exception e2) {
+                LINE_SEPARATOR = "\n";
+            }
+        }
+    }
+
+    public static String toLowerCase(String str) {
+        char[] charArray = str.toCharArray();
+        boolean z = false;
+        for (int i = 0; i != charArray.length; i++) {
+            char c = charArray[i];
+            if ('A' <= c && 'Z' >= c) {
+                charArray[i] = (char) ((c - 'A') + 97);
+                z = true;
+            }
+        }
+        return z ? new String(charArray) : str;
+    }
+}

From 241486f7c339d4abdee5ebbb9d8eb119e4bfcc52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Thu, 5 Oct 2023 21:58:46 +0100
Subject: [PATCH 037/595] Mi Band 8: Update to use getSupportedDeviceName

---
 .../devices/xiaomi/miband8/MiBand8Coordinator.java | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/MiBand8Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/MiBand8Coordinator.java
index 271fa0c5b..c83797132 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/MiBand8Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/MiBand8Coordinator.java
@@ -19,7 +19,6 @@ package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.miband8;
 import android.content.Context;
 import android.net.Uri;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import java.util.regex.Pattern;
@@ -27,20 +26,11 @@ import java.util.regex.Pattern;
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiCoordinator;
-import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
-import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
 
 public class MiBand8Coordinator extends XiaomiCoordinator {
-    private final Pattern NAME_PATTTERN = Pattern.compile("^Xiaomi Smart Band 8 [A-Z0-9]{4}$");
-
-    @NonNull
     @Override
-    public DeviceType getSupportedType(final GBDeviceCandidate candidate) {
-        if (NAME_PATTTERN.matcher(candidate.getName()).matches()) {
-            return DeviceType.MIBAND8;
-        }
-
-        return DeviceType.UNKNOWN;
+    protected Pattern getSupportedDeviceName() {
+        return Pattern.compile("^Xiaomi Smart Band 8 [A-Z0-9]{4}$");
     }
 
     @Nullable

From 28bd9eeed63ea0468c2f2d4c0ccc4d87044c94f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Thu, 5 Oct 2023 22:50:07 +0100
Subject: [PATCH 038/595] Mi Band 8: Fix heart rate one-shot measurements

---
 .../service/devices/xiaomi/services/XiaomiHealthService.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
index 91c56f69b..c1b02ec00 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
@@ -159,6 +159,9 @@ public class XiaomiHealthService extends AbstractXiaomiService {
 
     private void handleRealtimeStats(final XiaomiProto.RealTimeStats realTimeStats) {
         if (realtimeOneShot) {
+            if (realTimeStats.getHeartRate() <= 10) {
+                return;
+            }
             enableRealtimeStats(false);
         }
 

From b27c75c09a7eb6cf12fff192e21caf9b1cda7151 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Thu, 5 Oct 2023 23:23:33 +0100
Subject: [PATCH 039/595] Mi Band 8: World clocks (wip)

---
 .../devices/xiaomi/XiaomiCoordinator.java     |  3 +-
 .../services/XiaomiScheduleService.java       | 45 ++++++++++++++++++-
 2 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
index 2b8cef3bf..71be9dd5a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
@@ -230,7 +230,8 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
 
     @Override
     public int getWorldClocksLabelLength() {
-        // TODO how much?
+        // TODO no labels
+        // TODO list of supported timezones
         return 5;
     }
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java
index 81dd91d44..ba1f99a4e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java
@@ -47,6 +47,8 @@ public class XiaomiScheduleService extends AbstractXiaomiService {
     private static final int CMD_ALARMS_CREATE = 1;
     private static final int CMD_ALARMS_EDIT = 3;
     private static final int CMD_ALARMS_DELETE = 4;
+    private static final int CMD_WORLD_CLOCKS_GET = 10;
+    private static final int CMD_WORLD_CLOCKS_SET = 11;
 
     private static final int REPETITION_ONCE = 0;
     private static final int REPETITION_DAILY = 1;
@@ -57,6 +59,12 @@ public class XiaomiScheduleService extends AbstractXiaomiService {
     private static final int ALARM_SMART = 1;
     private static final int ALARM_NORMAL = 2;
 
+    private static final Map<String, String> WORLD_CLOCK_CODES = new HashMap<String, String>() {{
+        put("Europe/Lisbon", "C173");
+        put("Australia/Sydney", "C151");
+        // TODO map everything
+    }};
+
     // Map of alarm position to Alarm, as returned by the band
     private final Map<Integer, Alarm> watchAlarms = new HashMap<>();
 
@@ -70,12 +78,16 @@ public class XiaomiScheduleService extends AbstractXiaomiService {
             case CMD_ALARMS_GET:
                 handleAlarms(cmd.getSchedule().getAlarms());
                 break;
+            case CMD_WORLD_CLOCKS_GET:
+                handleWorldClocks(cmd.getSchedule().getWorldClocks());
+                break;
         }
     }
 
     @Override
     public void initialize(final TransactionBuilder builder) {
         requestAlarms(builder);
+        requestWorldClocks(builder);
     }
 
     public void onSetReminders(final ArrayList<? extends Reminder> reminders) {
@@ -83,7 +95,38 @@ public class XiaomiScheduleService extends AbstractXiaomiService {
     }
 
     public void onSetWorldClocks(final ArrayList<? extends WorldClock> clocks) {
-        // TODO
+        final XiaomiProto.WorldClocks.Builder worldClocksBuilder = XiaomiProto.WorldClocks.newBuilder();
+
+        for (final WorldClock clock : clocks) {
+            final String clockCode = WORLD_CLOCK_CODES.get(clock.getTimeZoneId());
+            if (clockCode != null) {
+                worldClocksBuilder.addWorldClock(clockCode);
+            } else {
+                LOG.warn("Unknown timezone code for {}", clock.getTimeZoneId());
+            }
+        }
+
+        final XiaomiProto.Schedule schedule = XiaomiProto.Schedule.newBuilder()
+                .setWorldClocks(worldClocksBuilder.build())
+                .build();
+
+        getSupport().sendCommand(
+                "send world clocks",
+                XiaomiProto.Command.newBuilder()
+                        .setType(COMMAND_TYPE)
+                        .setSubtype(CMD_WORLD_CLOCKS_SET)
+                        .setSchedule(schedule)
+                        .build()
+        );
+    }
+
+    public void requestWorldClocks(final TransactionBuilder builder) {
+        getSupport().sendCommand(builder, COMMAND_TYPE, CMD_WORLD_CLOCKS_GET);
+    }
+
+    public void handleWorldClocks(final XiaomiProto.WorldClocks worldClocks) {
+        LOG.info("Got {} world clocks: {}", worldClocks.getWorldClockCount(), worldClocks.getWorldClockList());
+        // TODO map the world clock codes
     }
 
     public void onSetAlarms(final ArrayList<? extends Alarm> alarms) {

From fd76c7b13bad978dd6078d434c31ce3502dfa782 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Thu, 5 Oct 2023 23:30:59 +0100
Subject: [PATCH 040/595] Mi Band 8: Find phone

---
 .../service/devices/xiaomi/XiaomiSupport.java |  3 +--
 .../xiaomi/services/XiaomiSystemService.java  | 25 +++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
index 7ef36c5e3..48e9523da 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
@@ -239,8 +239,7 @@ public class XiaomiSupport extends AbstractBTLEDeviceSupport {
 
     @Override
     public void onFindPhone(final boolean start) {
-        // TODO possible to notify watch?
-        super.onFindPhone(start);
+        systemService.onFindPhone(start);
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
index 6f1359dbd..8fa898e67 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
@@ -26,6 +26,7 @@ import java.util.TimeZone;
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventBatteryInfo;
+import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventFindPhone;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdateDeviceInfo;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventVersionInfo;
 import nodomain.freeyourgadget.gadgetbridge.model.BatteryState;
@@ -43,6 +44,7 @@ public class XiaomiSystemService extends AbstractXiaomiService {
     public static final int CMD_BATTERY = 1;
     public static final int CMD_DEVICE_INFO = 2;
     public static final int CMD_CLOCK = 3;
+    public static final int CMD_FIND_PHONE = 17;
     public static final int CMD_CHARGER = 79;
 
     public XiaomiSystemService(final XiaomiSupport support) {
@@ -91,6 +93,15 @@ public class XiaomiSystemService extends AbstractXiaomiService {
                 }
                 getSupport().evaluateGBDeviceEvent(batteryInfo);
                 return;
+            case CMD_FIND_PHONE:
+                final GBDeviceEventFindPhone findPhoneEvent = new GBDeviceEventFindPhone();
+                if (cmd.getSystem().getFindDevice() == 0) {
+                    findPhoneEvent.event = GBDeviceEventFindPhone.Event.START;
+                } else {
+                    findPhoneEvent.event = GBDeviceEventFindPhone.Event.STOP;
+                }
+                getSupport().evaluateGBDeviceEvent(findPhoneEvent);
+                return;
             case CMD_CHARGER:
                 // charger event, request battery state
                 getSupport().sendCommand(
@@ -143,4 +154,18 @@ public class XiaomiSystemService extends AbstractXiaomiService {
                         .build()
         );
     }
+
+    public void onFindPhone(final boolean start) {
+        if (!start) {
+            // Stop on watch
+            getSupport().sendCommand(
+                "find phone stop",
+                XiaomiProto.Command.newBuilder()
+                        .setType(COMMAND_TYPE)
+                        .setSubtype(CMD_FIND_PHONE)
+                        .setSystem(XiaomiProto.System.newBuilder().setFindDevice(1).build())
+                        .build()
+            );
+        }
+    }
 }

From e68d6dd7b776c8fd672019a57fe2056cc6936514 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Thu, 5 Oct 2023 23:59:16 +0100
Subject: [PATCH 041/595] Mi Band 8: Canned messages (wip)

---
 .../services/XiaomiNotificationService.java   | 61 ++++++++++++++++++-
 app/src/main/proto/xiaomi.proto               |  8 ++-
 2 files changed, 65 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
index acbb3a6ff..7fbef5bf6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
@@ -25,10 +25,12 @@ import java.util.Date;
 import java.util.Locale;
 
 import nodomain.freeyourgadget.gadgetbridge.BuildConfig;
+import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdatePreferences;
 import nodomain.freeyourgadget.gadgetbridge.model.CallSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.CannedMessagesSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.NotificationSpec;
 import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
 import nodomain.freeyourgadget.gadgetbridge.util.StringUtils;
 
@@ -40,14 +42,29 @@ public class XiaomiNotificationService extends AbstractXiaomiService {
     public static final int COMMAND_TYPE = 7;
 
     public static final int CMD_NOTIFICATION_SEND = 0;
+    public static final int CMD_CANNED_MESSAGES_GET = 9;
+    public static final int CMD_CANNED_MESSAGES_SET = 12;
 
     public XiaomiNotificationService(final XiaomiSupport support) {
         super(support);
     }
 
+    @Override
+    public void initialize(final TransactionBuilder builder) {
+        requestCannedMessages(builder);
+    }
+
     @Override
     public void handleCommand(final XiaomiProto.Command cmd) {
+        switch (cmd.getSubtype()) {
+            case CMD_CANNED_MESSAGES_GET:
+                handleCannedMessages(cmd.getNotification().getCannedMessages());
+                break;
+        }
+
         // TODO
+
+        LOG.warn("Unhandled notification command {}", cmd.getSubtype());
     }
 
     public void onNotification(final NotificationSpec notificationSpec) {
@@ -116,6 +133,48 @@ public class XiaomiNotificationService extends AbstractXiaomiService {
     }
 
     public void onSetCannedMessages(final CannedMessagesSpec cannedMessagesSpec) {
-        // TODO
+        if (cannedMessagesSpec.type != CannedMessagesSpec.TYPE_GENERIC) {
+            LOG.warn("Got unsupported canned messages type: {}", cannedMessagesSpec.type);
+            return;
+        }
+
+        final XiaomiProto.CannedMessages.Builder cannedMessagesBuilder = XiaomiProto.CannedMessages.newBuilder()
+                // TODO get those from wathc
+                // TODO enforce these
+                .setMinReplies(1)
+                .setMaxReplies(10);
+        for (final String cannedMessage : cannedMessagesSpec.cannedMessages) {
+            cannedMessagesBuilder.addReply(cannedMessage);
+        }
+
+        final XiaomiProto.Notification.Builder notificationBuilder = XiaomiProto.Notification.newBuilder()
+                .setCannedMessages(cannedMessagesBuilder);
+
+        getSupport().sendCommand(
+                "set canned messages",
+                XiaomiProto.Command.newBuilder()
+                        .setType(COMMAND_TYPE)
+                        .setSubtype(CMD_CANNED_MESSAGES_SET)
+                        .setNotification(notificationBuilder)
+                        .build()
+        );
+    }
+
+    public void requestCannedMessages(final TransactionBuilder builder) {
+        getSupport().sendCommand(
+                builder,
+                XiaomiProto.Command.newBuilder()
+                        .setType(COMMAND_TYPE)
+                        .setSubtype(CMD_CANNED_MESSAGES_GET)
+                        .setNotification(XiaomiProto.Notification.newBuilder().setUnknown8(1))
+                        .build()
+        );
+    }
+
+    public void handleCannedMessages(final XiaomiProto.CannedMessages cannedMessages) {
+        // TODO save them
+        //final GBDeviceEventUpdatePreferences gbDeviceEventUpdatePreferences = new GBDeviceEventUpdatePreferences();
+        //gbDeviceEventUpdatePreferences.withPreference("canned_reply_" + i, message);
+        //getSupport().evaluateGBDeviceEvent(gbDeviceEventUpdatePreferences);
     }
 }
diff --git a/app/src/main/proto/xiaomi.proto b/app/src/main/proto/xiaomi.proto
index c50c28fe5..1141f8c47 100644
--- a/app/src/main/proto/xiaomi.proto
+++ b/app/src/main/proto/xiaomi.proto
@@ -442,8 +442,10 @@ message MediaKey {
 message Notification {
   optional Notification2 notification2 = 3;
   optional Notification4 notification4 = 4;
-  // 7, 12
-  optional CannedReplies cannedReplies = 9;
+
+  optional uint32 unknown8 = 8; // 1 on canned replies request?
+  // 7, 9 get | 7, 12 set
+  optional CannedMessages cannedMessages = 9;
 }
 
 message Notification2 {
@@ -468,7 +470,7 @@ message Notification4 {
   optional Notification5 notification5 = 1;
 }
 
-message CannedReplies {
+message CannedMessages {
   optional uint32 minReplies = 1;
   repeated string reply = 2;
   optional uint32 maxReplies = 3;

From 8531cfb0a1d9cce894bcc2c5ee9417d7fafa2dc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 6 Oct 2023 09:32:22 +0100
Subject: [PATCH 042/595] Mi Band 8: Start handling config changes

---
 .../service/AbstractDeviceSupport.java        |  6 ++
 .../service/devices/xiaomi/XiaomiSupport.java | 26 ++++--
 .../services/AbstractXiaomiService.java       | 10 +++
 .../xiaomi/services/XiaomiHealthService.java  | 32 ++++++-
 .../xiaomi/services/XiaomiMusicService.java   | 10 ++-
 .../xiaomi/services/XiaomiSystemService.java  | 90 ++++++++++++-------
 6 files changed, 129 insertions(+), 45 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java
index 244b40949..78b1c1d87 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java
@@ -97,6 +97,7 @@ import nodomain.freeyourgadget.gadgetbridge.service.receivers.GBCallControlRecei
 import nodomain.freeyourgadget.gadgetbridge.service.receivers.GBMusicControlReceiver;
 import nodomain.freeyourgadget.gadgetbridge.util.GB;
 import nodomain.freeyourgadget.gadgetbridge.util.PendingIntentUtils;
+import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 
 import static nodomain.freeyourgadget.gadgetbridge.util.GB.NOTIFICATION_CHANNEL_HIGH_PRIORITY_ID;
 import static nodomain.freeyourgadget.gadgetbridge.util.GB.NOTIFICATION_CHANNEL_ID;
@@ -558,6 +559,11 @@ public abstract class AbstractDeviceSupport implements DeviceSupport {
         LocalBroadcastManager.getInstance(context).sendBroadcast(messageIntent);
     }
 
+    protected Prefs getDevicePrefs() {
+        return new Prefs(GBApplication.getDeviceSpecificSharedPrefs(gbDevice.getAddress()));
+    }
+
+    @Override
     public String customStringFilter(String inputString) {
         return inputString;
     }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
index 48e9523da..be4583572 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
@@ -24,7 +24,6 @@ import android.bluetooth.BluetoothGattCharacteristic;
 import android.content.Context;
 import android.location.Location;
 import android.net.Uri;
-import android.widget.Toast;
 
 import org.apache.commons.lang3.ArrayUtils;
 import org.slf4j.Logger;
@@ -65,6 +64,7 @@ import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.Xiao
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.XiaomiSystemService;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.XiaomiWeatherService;
 import nodomain.freeyourgadget.gadgetbridge.util.GB;
+import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 
 public class XiaomiSupport extends AbstractBTLEDeviceSupport {
     private static final Logger LOG = LoggerFactory.getLogger(XiaomiSupport.class);
@@ -211,10 +211,16 @@ public class XiaomiSupport extends AbstractBTLEDeviceSupport {
 
     @Override
     public void onSendConfiguration(final String config) {
-        // TODO
-        // TODO user info
-        // TODO 24h
-        GB.toast("Error setting configuration", Toast.LENGTH_LONG, GB.ERROR);
+        final Prefs prefs = getDevicePrefs();
+
+        // Check if any of the services handles this config
+        for (final AbstractXiaomiService service : mServiceMap.values()) {
+            if (service.onSendConfiguration(config, prefs)) {
+                return;
+            }
+        }
+
+        LOG.warn("Unhandled config changed: {}", config);
     }
 
     @Override
@@ -455,4 +461,14 @@ public class XiaomiSupport extends AbstractBTLEDeviceSupport {
                         .build()
         );
     }
+
+    public void sendCommand(final String taskName, final int type, final int subtype) {
+        sendCommand(
+                taskName,
+                XiaomiProto.Command.newBuilder()
+                        .setType(type)
+                        .setSubtype(subtype)
+                        .build()
+        );
+    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/AbstractXiaomiService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/AbstractXiaomiService.java
index 7f8b9ca12..3a1d73b3a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/AbstractXiaomiService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/AbstractXiaomiService.java
@@ -42,6 +42,16 @@ public abstract class AbstractXiaomiService {
 
     }
 
+    /**
+     * Handle a preference change.
+     * @param config the preference key
+     * @param prefs the device preferences
+     * @return true if the preference was handled, false otherwise
+     */
+    public boolean onSendConfiguration(final String config, final Prefs prefs) {
+        return false;
+    }
+
     protected XiaomiSupport getSupport() {
         return mSupport;
     }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
index c1b02ec00..fa701bef4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
@@ -43,6 +43,7 @@ import nodomain.freeyourgadget.gadgetbridge.model.DeviceService;
 import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
+import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 
 public class XiaomiHealthService extends AbstractXiaomiService {
     private static final Logger LOG = LoggerFactory.getLogger(XiaomiHealthService.class);
@@ -73,8 +74,7 @@ public class XiaomiHealthService extends AbstractXiaomiService {
                 return;
         }
 
-        // TODO
-        LOG.warn("Unhandled health command");
+        LOG.warn("Unknown health command {}", cmd.getSubtype());
     }
 
     @Override
@@ -82,7 +82,29 @@ public class XiaomiHealthService extends AbstractXiaomiService {
         setUserInfo(builder);
     }
 
+    @Override
+    public boolean onSendConfiguration(final String config, final Prefs prefs) {
+        switch (config) {
+            case ActivityUser.PREF_USER_HEIGHT_CM:
+            case ActivityUser.PREF_USER_WEIGHT_KG:
+            case ActivityUser.PREF_USER_YEAR_OF_BIRTH:
+            case ActivityUser.PREF_USER_GENDER:
+            case ActivityUser.PREF_USER_CALORIES_BURNT:
+            case ActivityUser.PREF_USER_STEPS_GOAL:
+            case ActivityUser.PREF_USER_GOAL_STANDING_TIME_HOURS:
+            case ActivityUser.PREF_USER_ACTIVETIME_MINUTES:
+                final TransactionBuilder builder = getSupport().createTransactionBuilder("set user info");
+                setUserInfo(builder);
+                builder.queue(getSupport().getQueue());
+                return true;
+        }
+
+        return false;
+    }
+
     public void setUserInfo(final TransactionBuilder builder) {
+        LOG.debug("Setting user info");
+
         final ActivityUser activityUser = new ActivityUser();
         final int birthYear = activityUser.getYearOfBirth();
         final byte birthMonth = 7; // not in user attributes
@@ -126,6 +148,8 @@ public class XiaomiHealthService extends AbstractXiaomiService {
     }
 
     public void onHeartRateTest() {
+        LOG.debug("Trigger heart rate one-shot test");
+
         realtimeStarted = true;
         realtimeOneShot = true;
 
@@ -139,6 +163,8 @@ public class XiaomiHealthService extends AbstractXiaomiService {
     }
 
     public void enableRealtimeStats(final boolean enable) {
+        LOG.debug("Enable realtime stats: {}", enable);
+
         if (realtimeStarted == enable) {
             // same state, ignore
             return;
@@ -158,6 +184,8 @@ public class XiaomiHealthService extends AbstractXiaomiService {
     }
 
     private void handleRealtimeStats(final XiaomiProto.RealTimeStats realTimeStats) {
+        LOG.debug("Got realtime stats");
+
         if (realtimeOneShot) {
             if (realTimeStats.getHeartRate() <= 10) {
                 return;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiMusicService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiMusicService.java
index ee71faece..cdb03c89f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiMusicService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiMusicService.java
@@ -66,10 +66,12 @@ public class XiaomiMusicService extends AbstractXiaomiService {
 
         switch (cmd.getSubtype()) {
             case CMD_MUSIC_GET:
+                LOG.debug("Got music request from watch");
                 mediaManager.refresh();
                 sendMusicStateToDevice();
-                break;
+                return;
             case CMD_MUSIC_BUTTON:
+                LOG.debug("Got music button from watch: {}", music.getMediaKey().getKey());
                 final GBDeviceEventMusicControl deviceEventMusicControl = new GBDeviceEventMusicControl();
                 switch (music.getMediaKey().getKey()) {
                     case BUTTON_PLAY:
@@ -97,10 +99,10 @@ public class XiaomiMusicService extends AbstractXiaomiService {
                 }
                 // FIXME sometimes this is not triggering a device update?
                 getSupport().evaluateGBDeviceEvent(deviceEventMusicControl);
-                break;
-            default:
-                LOG.warn("Unhandled music command {}", cmd.getSubtype());
+                return;
         }
+
+        LOG.warn("Unknown music command {}", cmd.getSubtype());
     }
 
     public void onSetMusicState(final MusicStateSpec stateSpec) {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
index 8fa898e67..46852e5ac 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
@@ -65,35 +65,13 @@ public class XiaomiSystemService extends AbstractXiaomiService {
         // TODO
         switch (cmd.getSubtype()) {
             case CMD_DEVICE_INFO:
-                final XiaomiProto.DeviceInfo deviceInfo = cmd.getSystem().getDeviceInfo();
-                final GBDeviceEventVersionInfo gbDeviceEventVersionInfo = new GBDeviceEventVersionInfo();
-                gbDeviceEventVersionInfo.fwVersion = deviceInfo.getFirmware();
-                //gbDeviceEventVersionInfo.fwVersion2 = "N/A";
-                gbDeviceEventVersionInfo.hwVersion = deviceInfo.getModel();
-                final GBDeviceEventUpdateDeviceInfo gbDeviceEventUpdateDeviceInfo = new GBDeviceEventUpdateDeviceInfo("SERIAL: ", deviceInfo.getSerialNumber());
-
-                getSupport().evaluateGBDeviceEvent(gbDeviceEventVersionInfo);
-                getSupport().evaluateGBDeviceEvent(gbDeviceEventUpdateDeviceInfo);
+                handleDeviceInfo(cmd.getSystem().getDeviceInfo());
                 return;
             case CMD_BATTERY:
-                final XiaomiProto.Battery battery = cmd.getSystem().getPower().getBattery();
-                final GBDeviceEventBatteryInfo batteryInfo = new GBDeviceEventBatteryInfo();
-                batteryInfo.batteryIndex = 0;
-                batteryInfo.level = battery.getLevel();
-                switch (battery.getState()) {
-                    case 1:
-                        batteryInfo.state = BatteryState.BATTERY_CHARGING;
-                        break;
-                    case 2:
-                        batteryInfo.state = BatteryState.BATTERY_NORMAL;
-                        break;
-                    default:
-                        batteryInfo.state = BatteryState.UNKNOWN;
-                        LOG.warn("Unknown battery state {}", battery.getState());
-                }
-                getSupport().evaluateGBDeviceEvent(batteryInfo);
+                handleBattery(cmd.getSystem().getPower().getBattery());
                 return;
             case CMD_FIND_PHONE:
+                LOG.debug("Got find phone: {}", cmd.getSystem().getFindDevice());
                 final GBDeviceEventFindPhone findPhoneEvent = new GBDeviceEventFindPhone();
                 if (cmd.getSystem().getFindDevice() == 0) {
                     findPhoneEvent.event = GBDeviceEventFindPhone.Event.START;
@@ -104,20 +82,29 @@ public class XiaomiSystemService extends AbstractXiaomiService {
                 return;
             case CMD_CHARGER:
                 // charger event, request battery state
-                getSupport().sendCommand(
-                        "request battery state",
-                        XiaomiProto.Command.newBuilder()
-                                .setType(COMMAND_TYPE)
-                                .setSubtype(CMD_BATTERY)
-                                .build()
-                );
+                getSupport().sendCommand("request battery state", COMMAND_TYPE, CMD_BATTERY);
                 return;
-            default:
-                LOG.warn("Unknown config command {}", cmd.getSubtype());
         }
+
+        LOG.warn("Unknown config command {}", cmd.getSubtype());
+    }
+
+    @Override
+    public boolean onSendConfiguration(final String config, final Prefs prefs) {
+        switch (config) {
+            case DeviceSettingsPreferenceConst.PREF_TIMEFORMAT:
+                final TransactionBuilder builder = getSupport().createTransactionBuilder("set time format");
+                setCurrentTime(builder);
+                builder.queue(getSupport().getQueue());
+                return true;
+        }
+
+        return super.onSendConfiguration(config, prefs);
     }
 
     public void setCurrentTime(final TransactionBuilder builder) {
+        LOG.debug("Setting current time");
+
         final Calendar now = GregorianCalendar.getInstance();
         final TimeZone tz = TimeZone.getDefault();
 
@@ -155,7 +142,42 @@ public class XiaomiSystemService extends AbstractXiaomiService {
         );
     }
 
+    private void handleDeviceInfo(final XiaomiProto.DeviceInfo deviceInfo) {
+        LOG.debug("Got device info: fw={} hw={} sn={}", deviceInfo.getFirmware(), deviceInfo.getModel(), deviceInfo.getSerialNumber());
+
+        final GBDeviceEventVersionInfo gbDeviceEventVersionInfo = new GBDeviceEventVersionInfo();
+        gbDeviceEventVersionInfo.fwVersion = deviceInfo.getFirmware();
+        //gbDeviceEventVersionInfo.fwVersion2 = "N/A";
+        gbDeviceEventVersionInfo.hwVersion = deviceInfo.getModel();
+        final GBDeviceEventUpdateDeviceInfo gbDeviceEventUpdateDeviceInfo = new GBDeviceEventUpdateDeviceInfo("SERIAL: ", deviceInfo.getSerialNumber());
+
+        getSupport().evaluateGBDeviceEvent(gbDeviceEventVersionInfo);
+        getSupport().evaluateGBDeviceEvent(gbDeviceEventUpdateDeviceInfo);
+    }
+
+    private void handleBattery(final XiaomiProto.Battery battery) {
+        LOG.debug("Got battery: {}", battery.getLevel());
+
+        final GBDeviceEventBatteryInfo batteryInfo = new GBDeviceEventBatteryInfo();
+        batteryInfo.batteryIndex = 0;
+        batteryInfo.level = battery.getLevel();
+        switch (battery.getState()) {
+            case 1:
+                batteryInfo.state = BatteryState.BATTERY_CHARGING;
+                break;
+            case 2:
+                batteryInfo.state = BatteryState.BATTERY_NORMAL;
+                break;
+            default:
+                batteryInfo.state = BatteryState.UNKNOWN;
+                LOG.warn("Unknown battery state {}", battery.getState());
+        }
+        getSupport().evaluateGBDeviceEvent(batteryInfo);
+    }
+
     public void onFindPhone(final boolean start) {
+        LOG.debug("Find phone: {}", start);
+
         if (!start) {
             // Stop on watch
             getSupport().sendCommand(

From 8a7e6649b7dadd44671892026e29ebd1fa40b7a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 6 Oct 2023 09:58:20 +0100
Subject: [PATCH 043/595] Mi Band 8: Password (untested)

---
 .../xiaomi/services/XiaomiSystemService.java  | 72 ++++++++++++++++---
 app/src/main/proto/xiaomi.proto               |  1 +
 2 files changed, 63 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
index 46852e5ac..dcb6a9272 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
@@ -25,10 +25,13 @@ import java.util.TimeZone;
 
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
+import nodomain.freeyourgadget.gadgetbridge.capabilities.password.PasswordCapabilityImpl;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventBatteryInfo;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventFindPhone;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdateDeviceInfo;
+import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdatePreferences;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventVersionInfo;
+import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.model.BatteryState;
 import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
@@ -44,7 +47,9 @@ public class XiaomiSystemService extends AbstractXiaomiService {
     public static final int CMD_BATTERY = 1;
     public static final int CMD_DEVICE_INFO = 2;
     public static final int CMD_CLOCK = 3;
+    public static final int CMD_PASSWORD_GET = 9;
     public static final int CMD_FIND_PHONE = 17;
+    public static final int CMD_PASSWORD_SET = 21;
     public static final int CMD_CHARGER = 79;
 
     public XiaomiSystemService(final XiaomiSupport support) {
@@ -53,11 +58,10 @@ public class XiaomiSystemService extends AbstractXiaomiService {
 
     @Override
     public void initialize(final TransactionBuilder builder) {
-        // request device info
+        // Request device info and configs
         getSupport().sendCommand(builder, COMMAND_TYPE, CMD_DEVICE_INFO);
-
-        // request battery status
         getSupport().sendCommand(builder, COMMAND_TYPE, CMD_BATTERY);
+        getSupport().sendCommand(builder, COMMAND_TYPE, CMD_PASSWORD_GET);
     }
 
     @Override
@@ -70,6 +74,9 @@ public class XiaomiSystemService extends AbstractXiaomiService {
             case CMD_BATTERY:
                 handleBattery(cmd.getSystem().getPower().getBattery());
                 return;
+            case CMD_PASSWORD_GET:
+                handlePassword(cmd.getSystem().getPassword());
+                return;
             case CMD_FIND_PHONE:
                 LOG.debug("Got find phone: {}", cmd.getSystem().getFindDevice());
                 final GBDeviceEventFindPhone findPhoneEvent = new GBDeviceEventFindPhone();
@@ -91,12 +98,17 @@ public class XiaomiSystemService extends AbstractXiaomiService {
 
     @Override
     public boolean onSendConfiguration(final String config, final Prefs prefs) {
+        final TransactionBuilder builder = getSupport().createTransactionBuilder("set " + config);
+
         switch (config) {
             case DeviceSettingsPreferenceConst.PREF_TIMEFORMAT:
-                final TransactionBuilder builder = getSupport().createTransactionBuilder("set time format");
                 setCurrentTime(builder);
                 builder.queue(getSupport().getQueue());
                 return true;
+            case PasswordCapabilityImpl.PREF_PASSWORD_ENABLED:
+            case PasswordCapabilityImpl.PREF_PASSWORD:
+                setPassword(builder);
+                return true;
         }
 
         return super.onSendConfiguration(config, prefs);
@@ -175,18 +187,58 @@ public class XiaomiSystemService extends AbstractXiaomiService {
         getSupport().evaluateGBDeviceEvent(batteryInfo);
     }
 
+    private void setPassword(final TransactionBuilder builder) {
+        final boolean passwordEnabled = HuamiCoordinator.getPasswordEnabled(getSupport().getDevice().getAddress());
+        final String password = HuamiCoordinator.getPassword(getSupport().getDevice().getAddress());
+
+        LOG.info("Setting password: {}, {}", passwordEnabled, password);
+
+        if (password == null || password.isEmpty()) {
+            LOG.warn("Invalid password: {}", password);
+            return;
+        }
+
+        final XiaomiProto.Password.Builder passwordBuilder = XiaomiProto.Password.newBuilder()
+                .setState(passwordEnabled ? 2 : 1)
+                .setPassword(password);
+
+        getSupport().sendCommand(
+                builder,
+                XiaomiProto.Command.newBuilder()
+                        .setType(COMMAND_TYPE)
+                        .setSubtype(CMD_PASSWORD_SET)
+                        .setSystem(XiaomiProto.System.newBuilder().setPassword(passwordBuilder).build())
+                        .build()
+        );
+    }
+
+    private void handlePassword(final XiaomiProto.Password password) {
+        LOG.debug("Got device password");
+        final GBDeviceEventUpdatePreferences eventUpdatePreferences = new GBDeviceEventUpdatePreferences(
+                PasswordCapabilityImpl.PREF_PASSWORD_ENABLED,
+                password.getState() == 2
+        );
+        if (password.hasPassword()) {
+            eventUpdatePreferences.withPreference(
+                    PasswordCapabilityImpl.PREF_PASSWORD,
+                    password.getPassword()
+            );
+        }
+        getSupport().evaluateGBDeviceEvent(eventUpdatePreferences);
+    }
+
     public void onFindPhone(final boolean start) {
         LOG.debug("Find phone: {}", start);
 
         if (!start) {
             // Stop on watch
             getSupport().sendCommand(
-                "find phone stop",
-                XiaomiProto.Command.newBuilder()
-                        .setType(COMMAND_TYPE)
-                        .setSubtype(CMD_FIND_PHONE)
-                        .setSystem(XiaomiProto.System.newBuilder().setFindDevice(1).build())
-                        .build()
+                    "find phone stop",
+                    XiaomiProto.Command.newBuilder()
+                            .setType(COMMAND_TYPE)
+                            .setSubtype(CMD_FIND_PHONE)
+                            .setSystem(XiaomiProto.System.newBuilder().setFindDevice(1).build())
+                            .build()
             );
         }
     }
diff --git a/app/src/main/proto/xiaomi.proto b/app/src/main/proto/xiaomi.proto
index 1141f8c47..1eacc3eb2 100644
--- a/app/src/main/proto/xiaomi.proto
+++ b/app/src/main/proto/xiaomi.proto
@@ -223,6 +223,7 @@ message DndSync {
 message Password {
   optional uint32 state = 1; // 1 disabled, 2 enabled
   optional string password = 2;
+  optional uint32 unknown3 = 3; // 0 when set on ret
 }
 
 message VibrationPatterns {

From 54e31a1521a63bde0f7fbdb1d27fd7e9de46e576 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 6 Oct 2023 12:48:40 +0100
Subject: [PATCH 044/595] Mi Band 8: HR, SpO2, Stress settings (untested, wip)

---
 .../devices/xiaomi/XiaomiCoordinator.java     |   6 -
 .../xiaomi/XiaomiSettingsCustomizer.java      |   5 +
 .../devices/xiaomi/XiaomiPreferences.java     |  44 ++++
 .../xiaomi/services/XiaomiHealthService.java  | 240 +++++++++++++++++-
 .../xiaomi/services/XiaomiSystemService.java  |   7 +-
 5 files changed, 291 insertions(+), 11 deletions(-)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPreferences.java

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
index 71be9dd5a..2b1b5cc19 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
@@ -304,13 +304,7 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
         //
         settings.add(R.xml.devicesettings_header_display);
         settings.add(R.xml.devicesettings_huami2021_displayitems);
-        settings.add(R.xml.devicesettings_huami2021_shortcuts);
-        settings.add(R.xml.devicesettings_nightmode);
-        settings.add(R.xml.devicesettings_sleep_mode);
-        settings.add(R.xml.devicesettings_liftwrist_display_sensitivity_with_smart);
         settings.add(R.xml.devicesettings_password);
-        settings.add(R.xml.devicesettings_always_on_display);
-        settings.add(R.xml.devicesettings_screen_timeout);
 
         //
         // Health
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSettingsCustomizer.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSettingsCustomizer.java
index 185ea8392..c973e197f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSettingsCustomizer.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSettingsCustomizer.java
@@ -23,6 +23,7 @@ import androidx.preference.Preference;
 import java.util.Collections;
 import java.util.Set;
 
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
 import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSpecificSettingsCustomizer;
 import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSpecificSettingsHandler;
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
@@ -34,6 +35,10 @@ public class XiaomiSettingsCustomizer implements DeviceSpecificSettingsCustomize
 
     @Override
     public void customizeSettings(final DeviceSpecificSettingsHandler handler, final Prefs prefs) {
+        final Preference activityMonitoringPref = handler.findPreference(DeviceSettingsPreferenceConst.PREF_HEARTRATE_ACTIVITY_MONITORING);
+        if (activityMonitoringPref != null) {
+            activityMonitoringPref.setVisible(false);
+        }
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPreferences.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPreferences.java
new file mode 100644
index 000000000..76fbccf0f
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPreferences.java
@@ -0,0 +1,44 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Locale;
+
+import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
+
+public final class XiaomiPreferences {
+    private XiaomiPreferences() {
+        // util class
+    }
+
+    public static String prefFromHourMin(final XiaomiProto.HourMinute hourMinute) {
+        return String.format(Locale.ROOT, "%02d:%02d", hourMinute.getHour(), hourMinute.getMinute());
+    }
+
+    public static XiaomiProto.HourMinute prefToHourMin(final Date date) {
+        final Calendar calendar = GregorianCalendar.getInstance();
+        calendar.setTime(date);
+
+        return XiaomiProto.HourMinute.newBuilder()
+                .setHour(calendar.get(Calendar.HOUR_OF_DAY))
+                .setMinute(calendar.get(Calendar.MINUTE))
+                .build();
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
index fa701bef4..8eece42a9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
@@ -24,12 +24,15 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.Calendar;
+import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.Locale;
 
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
 import nodomain.freeyourgadget.gadgetbridge.database.DBHandler;
 import nodomain.freeyourgadget.gadgetbridge.database.DBHelper;
+import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdatePreferences;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiSampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.Device;
@@ -42,6 +45,7 @@ import nodomain.freeyourgadget.gadgetbridge.model.ActivityUser;
 import nodomain.freeyourgadget.gadgetbridge.model.DeviceService;
 import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiPreferences;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 
@@ -51,6 +55,14 @@ public class XiaomiHealthService extends AbstractXiaomiService {
     public static final int COMMAND_TYPE = 8;
 
     private static final int CMD_SET_USER_INFO = 0;
+    private static final int CMD_CONFIG_SPO2_GET = 8;
+    private static final int CMD_CONFIG_SPO2_SET = 9;
+    private static final int CMD_CONFIG_HEART_RATE_GET = 10;
+    private static final int CMD_CONFIG_HEART_RATE_SET = 11;
+    private static final int CMD_CONFIG_STANDING_REMINDER_GET = 12;
+    private static final int CMD_CONFIG_STANDING_REMINDER_SET = 13;
+    private static final int CMD_CONFIG_STRESS_GET = 14;
+    private static final int CMD_CONFIG_STRESS_SET = 15;
     private static final int CMD_REALTIME_STATS_START = 45;
     private static final int CMD_REALTIME_STATS_STOP = 46;
     private static final int CMD_REALTIME_STATS_EVENT = 47;
@@ -69,6 +81,18 @@ public class XiaomiHealthService extends AbstractXiaomiService {
     @Override
     public void handleCommand(final XiaomiProto.Command cmd) {
         switch (cmd.getSubtype()) {
+            case CMD_CONFIG_SPO2_GET:
+                handleSpo2Config(cmd.getHealth().getSpo2());
+                return;
+            case CMD_CONFIG_HEART_RATE_GET:
+                handleHeartRateConfig(cmd.getHealth().getHeartRate());
+                return;
+            case CMD_CONFIG_STANDING_REMINDER_GET:
+                handleStandingReminderConfig(cmd.getHealth().getStandingReminder());
+                return;
+            case CMD_CONFIG_STRESS_GET:
+                handleStressConfig(cmd.getHealth().getStress());
+                return;
             case CMD_REALTIME_STATS_EVENT:
                 handleRealtimeStats(cmd.getHealth().getRealTimeStats());
                 return;
@@ -78,12 +102,18 @@ public class XiaomiHealthService extends AbstractXiaomiService {
     }
 
     @Override
-    public void initialize(TransactionBuilder builder) {
+    public void initialize(final TransactionBuilder builder) {
         setUserInfo(builder);
+        getSupport().sendCommand(builder, COMMAND_TYPE, CMD_CONFIG_SPO2_GET);
+        getSupport().sendCommand(builder, COMMAND_TYPE, CMD_CONFIG_HEART_RATE_GET);
+        getSupport().sendCommand(builder, COMMAND_TYPE, CMD_CONFIG_STANDING_REMINDER_GET);
+        getSupport().sendCommand(builder, COMMAND_TYPE, CMD_CONFIG_STRESS_GET);
     }
 
     @Override
     public boolean onSendConfiguration(final String config, final Prefs prefs) {
+        final TransactionBuilder builder = getSupport().createTransactionBuilder("set " + config);
+
         switch (config) {
             case ActivityUser.PREF_USER_HEIGHT_CM:
             case ActivityUser.PREF_USER_WEIGHT_KG:
@@ -93,10 +123,33 @@ public class XiaomiHealthService extends AbstractXiaomiService {
             case ActivityUser.PREF_USER_STEPS_GOAL:
             case ActivityUser.PREF_USER_GOAL_STANDING_TIME_HOURS:
             case ActivityUser.PREF_USER_ACTIVETIME_MINUTES:
-                final TransactionBuilder builder = getSupport().createTransactionBuilder("set user info");
                 setUserInfo(builder);
                 builder.queue(getSupport().getQueue());
                 return true;
+            case DeviceSettingsPreferenceConst.PREF_HEARTRATE_USE_FOR_SLEEP_DETECTION:
+            case DeviceSettingsPreferenceConst.PREF_HEARTRATE_SLEEP_BREATHING_QUALITY_MONITORING:
+            case DeviceSettingsPreferenceConst.PREF_HEARTRATE_MEASUREMENT_INTERVAL:
+            case DeviceSettingsPreferenceConst.PREF_HEARTRATE_ALERT_ENABLED:
+            case DeviceSettingsPreferenceConst.PREF_HEARTRATE_ALERT_HIGH_THRESHOLD:
+            case DeviceSettingsPreferenceConst.PREF_HEARTRATE_ALERT_LOW_THRESHOLD:
+                setHeartRateConfig(builder);
+                return true;
+            case DeviceSettingsPreferenceConst.PREF_SPO2_ALL_DAY_MONITORING:
+            case DeviceSettingsPreferenceConst.PREF_SPO2_LOW_ALERT_THRESHOLD:
+                setSpo2Config(builder);
+                return true;
+            case DeviceSettingsPreferenceConst.PREF_INACTIVITY_ENABLE:
+            case DeviceSettingsPreferenceConst.PREF_INACTIVITY_START:
+            case DeviceSettingsPreferenceConst.PREF_INACTIVITY_END:
+            case DeviceSettingsPreferenceConst.PREF_INACTIVITY_DND:
+            case DeviceSettingsPreferenceConst.PREF_INACTIVITY_DND_START:
+            case DeviceSettingsPreferenceConst.PREF_INACTIVITY_DND_END:
+                setStandingReminderConfig(builder);
+                return true;
+            case DeviceSettingsPreferenceConst.PREF_HEARTRATE_STRESS_MONITORING:
+            case DeviceSettingsPreferenceConst.PREF_HEARTRATE_STRESS_RELAXATION_REMINDER:
+                setStressConfig(builder);
+                return true;
         }
 
         return false;
@@ -147,6 +200,189 @@ public class XiaomiHealthService extends AbstractXiaomiService {
         );
     }
 
+    private void handleSpo2Config(final XiaomiProto.SpO2 spo2) {
+        LOG.debug("Got SpO2 config");
+
+        final GBDeviceEventUpdatePreferences eventUpdatePreferences = new GBDeviceEventUpdatePreferences()
+                .withPreference(DeviceSettingsPreferenceConst.PREF_SPO2_ALL_DAY_MONITORING, spo2.getAllDayTracking())
+                .withPreference(
+                        DeviceSettingsPreferenceConst.PREF_SPO2_LOW_ALERT_THRESHOLD,
+                        spo2.getAlarmLow().getAlarmLowEnabled() ? spo2.getAlarmLow().getAlarmLowThreshold() : 0
+                );
+
+        getSupport().evaluateGBDeviceEvent(eventUpdatePreferences);
+    }
+
+    private void setSpo2Config(final TransactionBuilder builder) {
+        LOG.debug("Set SpO2 config");
+
+        final Prefs prefs = getDevicePrefs();
+        final boolean allDayMonitoring = prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_SPO2_ALL_DAY_MONITORING, false);
+        final int lowAlertThreshold = prefs.getInt(DeviceSettingsPreferenceConst.PREF_SPO2_LOW_ALERT_THRESHOLD, 0);
+
+        final XiaomiProto.Spo2AlarmLow.Builder spo2alarmLowBuilder = XiaomiProto.Spo2AlarmLow.newBuilder()
+                .setAlarmLowEnabled(lowAlertThreshold != 0);
+
+        if (lowAlertThreshold != 0) {
+            spo2alarmLowBuilder.setAlarmLowThreshold(lowAlertThreshold);
+        }
+
+        final XiaomiProto.SpO2.Builder spo2 = XiaomiProto.SpO2.newBuilder()
+                .setUnknown1(1)
+                .setAllDayTracking(allDayMonitoring)
+                .setAlarmLow(spo2alarmLowBuilder);
+
+        getSupport().sendCommand(
+                builder,
+                XiaomiProto.Command.newBuilder()
+                        .setType(COMMAND_TYPE)
+                        .setSubtype(CMD_CONFIG_SPO2_SET)
+                        .setHealth(XiaomiProto.Health.newBuilder().setSpo2(spo2))
+                        .build()
+        );
+    }
+
+    private void handleHeartRateConfig(final XiaomiProto.HeartRate heartRate) {
+        LOG.debug("Got heart rate config");
+
+        final GBDeviceEventUpdatePreferences eventUpdatePreferences = new GBDeviceEventUpdatePreferences();
+        if (heartRate.getDisabled()) {
+            eventUpdatePreferences.withPreference(DeviceSettingsPreferenceConst.PREF_HEARTRATE_MEASUREMENT_INTERVAL, 0);
+        } else if (heartRate.getInterval() == 0) {
+            // smart
+            eventUpdatePreferences.withPreference(DeviceSettingsPreferenceConst.PREF_HEARTRATE_MEASUREMENT_INTERVAL, -1);
+        } else {
+            eventUpdatePreferences.withPreference(DeviceSettingsPreferenceConst.PREF_HEARTRATE_MEASUREMENT_INTERVAL, heartRate.getInterval());
+        }
+
+        eventUpdatePreferences.withPreference(DeviceSettingsPreferenceConst.PREF_HEARTRATE_USE_FOR_SLEEP_DETECTION, heartRate.getAdvancedMonitoring().getEnabled());
+        eventUpdatePreferences.withPreference(DeviceSettingsPreferenceConst.PREF_HEARTRATE_SLEEP_BREATHING_QUALITY_MONITORING, heartRate.getBreathingScore() == 1);
+
+        eventUpdatePreferences.withPreference(
+                DeviceSettingsPreferenceConst.PREF_HEARTRATE_ALERT_HIGH_THRESHOLD,
+                heartRate.getAlarmHighEnabled() ? heartRate.getAlarmHighThreshold() : 0
+        );
+
+        eventUpdatePreferences.withPreference(
+                DeviceSettingsPreferenceConst.PREF_HEARTRATE_ALERT_LOW_THRESHOLD,
+                heartRate.getHeartRateAlarmLow().getAlarmLowEnabled() ? heartRate.getHeartRateAlarmLow().getAlarmLowThreshold() : 0
+        );
+
+        getSupport().evaluateGBDeviceEvent(eventUpdatePreferences);
+    }
+
+    private void setHeartRateConfig(final TransactionBuilder builder) {
+        final Prefs prefs = getDevicePrefs();
+
+        final boolean sleepDetection = prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_HEARTRATE_USE_FOR_SLEEP_DETECTION, false);
+        final boolean sleepBreathingQuality = prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_HEARTRATE_SLEEP_BREATHING_QUALITY_MONITORING, false);
+        final int intervalMin = prefs.getInt(DeviceSettingsPreferenceConst.PREF_HEARTRATE_MEASUREMENT_INTERVAL, 0);
+        final int alertHigh = prefs.getInt(DeviceSettingsPreferenceConst.PREF_HEARTRATE_ALERT_HIGH_THRESHOLD, 0);
+        final int alertLow = prefs.getInt(DeviceSettingsPreferenceConst.PREF_HEARTRATE_ALERT_LOW_THRESHOLD, 0);
+
+        final XiaomiProto.HeartRate.Builder heartRate = XiaomiProto.HeartRate.newBuilder()
+                .setDisabled(intervalMin == 0)
+                .setInterval(Math.max(intervalMin, 0)) // smart will be -1 from pref
+                .setAdvancedMonitoring(XiaomiProto.AdvancedMonitoring.newBuilder()
+                        .setEnabled(sleepDetection))
+                .setBreathingScore(sleepBreathingQuality ? 1 : 2)
+                .setAlarmHighEnabled(alertHigh > 0)
+                .setAlarmHighThreshold(alertHigh)
+                .setHeartRateAlarmLow(XiaomiProto.HeartRateAlarmLow.newBuilder()
+                        .setAlarmLowEnabled(alertLow > 0)
+                        .setAlarmLowThreshold(alertLow))
+                .setUnknown7(1);
+
+        getSupport().sendCommand(
+                builder,
+                XiaomiProto.Command.newBuilder()
+                        .setType(COMMAND_TYPE)
+                        .setSubtype(CMD_CONFIG_HEART_RATE_SET)
+                        .setHealth(XiaomiProto.Health.newBuilder().setHeartRate(heartRate))
+                        .build()
+        );
+    }
+
+    private void handleStandingReminderConfig(final XiaomiProto.StandingReminder standingReminder) {
+        LOG.debug("Got standing reminder config");
+
+        final String start = XiaomiPreferences.prefFromHourMin(standingReminder.getStart());
+        final String end = XiaomiPreferences.prefFromHourMin(standingReminder.getEnd());
+        final String dndStart = XiaomiPreferences.prefFromHourMin(standingReminder.getDndStart());
+        final String dndEnd = XiaomiPreferences.prefFromHourMin(standingReminder.getDndEnd());
+
+        final GBDeviceEventUpdatePreferences eventUpdatePreferences = new GBDeviceEventUpdatePreferences()
+                .withPreference(DeviceSettingsPreferenceConst.PREF_INACTIVITY_ENABLE, standingReminder.getEnabled())
+                .withPreference(DeviceSettingsPreferenceConst.PREF_INACTIVITY_START, start)
+                .withPreference(DeviceSettingsPreferenceConst.PREF_INACTIVITY_END, end)
+                .withPreference(DeviceSettingsPreferenceConst.PREF_INACTIVITY_DND, standingReminder.getDnd())
+                .withPreference(DeviceSettingsPreferenceConst.PREF_INACTIVITY_DND_START, dndStart)
+                .withPreference(DeviceSettingsPreferenceConst.PREF_INACTIVITY_DND_END, dndEnd);
+
+        getSupport().evaluateGBDeviceEvent(eventUpdatePreferences);
+    }
+
+    private void setStandingReminderConfig(final TransactionBuilder builder) {
+        LOG.debug("Set standing reminder config");
+
+        final Prefs prefs = getDevicePrefs();
+        final boolean enabled = prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_INACTIVITY_ENABLE, false);
+        final Date start = prefs.getTimePreference(DeviceSettingsPreferenceConst.PREF_INACTIVITY_START, "06:00");
+        final Date end = prefs.getTimePreference(DeviceSettingsPreferenceConst.PREF_INACTIVITY_END, "22:00");
+        final boolean dnd = prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_INACTIVITY_DND, false);
+        final Date dndStart = prefs.getTimePreference(DeviceSettingsPreferenceConst.PREF_INACTIVITY_DND_START, "12:00");
+        final Date dndEnd = prefs.getTimePreference(DeviceSettingsPreferenceConst.PREF_INACTIVITY_DND_END, "14:00");
+
+        final XiaomiProto.StandingReminder standingReminder = XiaomiProto.StandingReminder.newBuilder()
+                .setEnabled(enabled)
+                .setStart(XiaomiPreferences.prefToHourMin(start))
+                .setEnd(XiaomiPreferences.prefToHourMin(end))
+                .setDnd(dnd)
+                .setDndStart(XiaomiPreferences.prefToHourMin(dndStart))
+                .setDndEnd(XiaomiPreferences.prefToHourMin(dndEnd))
+                .build();
+
+        getSupport().sendCommand(
+                builder,
+                XiaomiProto.Command.newBuilder()
+                        .setType(COMMAND_TYPE)
+                        .setSubtype(CMD_CONFIG_STANDING_REMINDER_SET)
+                        .setHealth(XiaomiProto.Health.newBuilder().setStandingReminder(standingReminder))
+                        .build()
+        );
+    }
+
+    private void handleStressConfig(final XiaomiProto.Stress stress) {
+        LOG.debug("Got stress config");
+
+        final GBDeviceEventUpdatePreferences eventUpdatePreferences = new GBDeviceEventUpdatePreferences()
+                .withPreference(DeviceSettingsPreferenceConst.PREF_HEARTRATE_STRESS_MONITORING, stress.getAllDayTracking())
+                .withPreference(DeviceSettingsPreferenceConst.PREF_HEARTRATE_STRESS_RELAXATION_REMINDER, stress.getRelaxReminder());
+
+        getSupport().evaluateGBDeviceEvent(eventUpdatePreferences);
+    }
+
+    private void setStressConfig(final TransactionBuilder builder) {
+        LOG.debug("Set stress config");
+
+        final Prefs prefs = getDevicePrefs();
+        final boolean enabled = prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_HEARTRATE_STRESS_MONITORING, false);
+        final boolean relaxReminder = prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_HEARTRATE_STRESS_RELAXATION_REMINDER, false);
+
+        final XiaomiProto.Stress.Builder stress = XiaomiProto.Stress.newBuilder()
+                .setAllDayTracking(enabled)
+                .setRelaxReminder(XiaomiProto.RelaxReminder.newBuilder().setEnabled(relaxReminder).setUnknown2(0));
+
+        getSupport().sendCommand(
+                builder,
+                XiaomiProto.Command.newBuilder()
+                        .setType(COMMAND_TYPE)
+                        .setSubtype(CMD_CONFIG_STRESS_SET)
+                        .setHealth(XiaomiProto.Health.newBuilder().setStress(stress))
+                        .build()
+        );
+    }
+
     public void onHeartRateTest() {
         LOG.debug("Trigger heart rate one-shot test");
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
index dcb6a9272..81f666d13 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
@@ -31,7 +31,6 @@ import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventFindPhone;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdateDeviceInfo;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdatePreferences;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventVersionInfo;
-import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.model.BatteryState;
 import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
@@ -188,8 +187,10 @@ public class XiaomiSystemService extends AbstractXiaomiService {
     }
 
     private void setPassword(final TransactionBuilder builder) {
-        final boolean passwordEnabled = HuamiCoordinator.getPasswordEnabled(getSupport().getDevice().getAddress());
-        final String password = HuamiCoordinator.getPassword(getSupport().getDevice().getAddress());
+        final Prefs prefs = getDevicePrefs();
+
+        final boolean passwordEnabled = prefs.getBoolean(PasswordCapabilityImpl.PREF_PASSWORD_ENABLED, false);
+        final String password = prefs.getString(PasswordCapabilityImpl.PREF_PASSWORD, null);
 
         LOG.info("Setting password: {}, {}", passwordEnabled, password);
 

From e8695a5792dbd0ecbffe14885c8774fbba2c2575 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 6 Oct 2023 13:23:46 +0100
Subject: [PATCH 045/595] Mi Band 8: Fix stress relaxation reminder

---
 .../service/devices/xiaomi/services/XiaomiHealthService.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
index 8eece42a9..c09bf4ebb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
@@ -357,7 +357,7 @@ public class XiaomiHealthService extends AbstractXiaomiService {
 
         final GBDeviceEventUpdatePreferences eventUpdatePreferences = new GBDeviceEventUpdatePreferences()
                 .withPreference(DeviceSettingsPreferenceConst.PREF_HEARTRATE_STRESS_MONITORING, stress.getAllDayTracking())
-                .withPreference(DeviceSettingsPreferenceConst.PREF_HEARTRATE_STRESS_RELAXATION_REMINDER, stress.getRelaxReminder());
+                .withPreference(DeviceSettingsPreferenceConst.PREF_HEARTRATE_STRESS_RELAXATION_REMINDER, stress.getRelaxReminder().getEnabled());
 
         getSupport().evaluateGBDeviceEvent(eventUpdatePreferences);
     }

From eb2a2ca742de6aa6eec7376c680e9a462867e642 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 6 Oct 2023 13:26:57 +0100
Subject: [PATCH 046/595] Mi Band 8: Display items (wip)

---
 .../devices/xiaomi/services/XiaomiSystemService.java     | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
index 81f666d13..172cfba12 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
@@ -49,6 +49,7 @@ public class XiaomiSystemService extends AbstractXiaomiService {
     public static final int CMD_PASSWORD_GET = 9;
     public static final int CMD_FIND_PHONE = 17;
     public static final int CMD_PASSWORD_SET = 21;
+    public static final int CMD_DISPLAY_ITEMS_GET = 29;
     public static final int CMD_CHARGER = 79;
 
     public XiaomiSystemService(final XiaomiSupport support) {
@@ -61,6 +62,7 @@ public class XiaomiSystemService extends AbstractXiaomiService {
         getSupport().sendCommand(builder, COMMAND_TYPE, CMD_DEVICE_INFO);
         getSupport().sendCommand(builder, COMMAND_TYPE, CMD_BATTERY);
         getSupport().sendCommand(builder, COMMAND_TYPE, CMD_PASSWORD_GET);
+        getSupport().sendCommand(builder, COMMAND_TYPE, CMD_DISPLAY_ITEMS_GET);
     }
 
     @Override
@@ -86,6 +88,9 @@ public class XiaomiSystemService extends AbstractXiaomiService {
                 }
                 getSupport().evaluateGBDeviceEvent(findPhoneEvent);
                 return;
+            case CMD_DISPLAY_ITEMS_GET:
+                handleDisplayItems(cmd.getSystem().getDisplayItems());
+                return;
             case CMD_CHARGER:
                 // charger event, request battery state
                 getSupport().sendCommand("request battery state", COMMAND_TYPE, CMD_BATTERY);
@@ -228,6 +233,10 @@ public class XiaomiSystemService extends AbstractXiaomiService {
         getSupport().evaluateGBDeviceEvent(eventUpdatePreferences);
     }
 
+    private void handleDisplayItems(final XiaomiProto.DisplayItems displayItems) {
+        LOG.debug("Got {} display items", displayItems.getDisplayItemCount());
+    }
+
     public void onFindPhone(final boolean start) {
         LOG.debug("Find phone: {}", start);
 

From 8f89acbb252ef30a087d7756faf142f0dab74906 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 6 Oct 2023 13:35:26 +0100
Subject: [PATCH 047/595] Mi Band 8: Fix crash due to preference type mismatch

---
 .../devices/xiaomi/services/XiaomiHealthService.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
index c09bf4ebb..9df4d72a6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
@@ -207,7 +207,7 @@ public class XiaomiHealthService extends AbstractXiaomiService {
                 .withPreference(DeviceSettingsPreferenceConst.PREF_SPO2_ALL_DAY_MONITORING, spo2.getAllDayTracking())
                 .withPreference(
                         DeviceSettingsPreferenceConst.PREF_SPO2_LOW_ALERT_THRESHOLD,
-                        spo2.getAlarmLow().getAlarmLowEnabled() ? spo2.getAlarmLow().getAlarmLowThreshold() : 0
+                        String.valueOf(spo2.getAlarmLow().getAlarmLowEnabled() ? spo2.getAlarmLow().getAlarmLowThreshold() : 0)
                 );
 
         getSupport().evaluateGBDeviceEvent(eventUpdatePreferences);
@@ -247,12 +247,12 @@ public class XiaomiHealthService extends AbstractXiaomiService {
 
         final GBDeviceEventUpdatePreferences eventUpdatePreferences = new GBDeviceEventUpdatePreferences();
         if (heartRate.getDisabled()) {
-            eventUpdatePreferences.withPreference(DeviceSettingsPreferenceConst.PREF_HEARTRATE_MEASUREMENT_INTERVAL, 0);
+            eventUpdatePreferences.withPreference(DeviceSettingsPreferenceConst.PREF_HEARTRATE_MEASUREMENT_INTERVAL, "0");
         } else if (heartRate.getInterval() == 0) {
             // smart
-            eventUpdatePreferences.withPreference(DeviceSettingsPreferenceConst.PREF_HEARTRATE_MEASUREMENT_INTERVAL, -1);
+            eventUpdatePreferences.withPreference(DeviceSettingsPreferenceConst.PREF_HEARTRATE_MEASUREMENT_INTERVAL, "-1");
         } else {
-            eventUpdatePreferences.withPreference(DeviceSettingsPreferenceConst.PREF_HEARTRATE_MEASUREMENT_INTERVAL, heartRate.getInterval());
+            eventUpdatePreferences.withPreference(DeviceSettingsPreferenceConst.PREF_HEARTRATE_MEASUREMENT_INTERVAL, String.valueOf(heartRate.getInterval()));
         }
 
         eventUpdatePreferences.withPreference(DeviceSettingsPreferenceConst.PREF_HEARTRATE_USE_FOR_SLEEP_DETECTION, heartRate.getAdvancedMonitoring().getEnabled());
@@ -260,12 +260,12 @@ public class XiaomiHealthService extends AbstractXiaomiService {
 
         eventUpdatePreferences.withPreference(
                 DeviceSettingsPreferenceConst.PREF_HEARTRATE_ALERT_HIGH_THRESHOLD,
-                heartRate.getAlarmHighEnabled() ? heartRate.getAlarmHighThreshold() : 0
+                String.valueOf(heartRate.getAlarmHighEnabled() ? heartRate.getAlarmHighThreshold() : 0)
         );
 
         eventUpdatePreferences.withPreference(
                 DeviceSettingsPreferenceConst.PREF_HEARTRATE_ALERT_LOW_THRESHOLD,
-                heartRate.getHeartRateAlarmLow().getAlarmLowEnabled() ? heartRate.getHeartRateAlarmLow().getAlarmLowThreshold() : 0
+                String.valueOf(heartRate.getHeartRateAlarmLow().getAlarmLowEnabled() ? heartRate.getHeartRateAlarmLow().getAlarmLowThreshold() : 0)
         );
 
         getSupport().evaluateGBDeviceEvent(eventUpdatePreferences);

From 94cde94fbc54da45bf0ee1e942740f42d959e73f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 6 Oct 2023 14:31:09 +0100
Subject: [PATCH 048/595] Mi Band 8: Display items more section

---
 app/src/main/proto/xiaomi.proto | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/proto/xiaomi.proto b/app/src/main/proto/xiaomi.proto
index 1eacc3eb2..97df3c54d 100644
--- a/app/src/main/proto/xiaomi.proto
+++ b/app/src/main/proto/xiaomi.proto
@@ -75,7 +75,7 @@ message System {
   // 2, 18
   optional uint32 findDevice = 5; // 0
 
-  // 2, 29
+  // 2, 29 get | 2, 39 set
   optional DisplayItems displayItems = 10;
 
   // 2, 34
@@ -175,7 +175,7 @@ message DisplayItem {
   optional bool disabled = 3;
   optional uint32 isSettings = 4;
   optional uint32 unknown5 = 5; // 1
-  optional bool rarelyUsed = 6;
+  optional bool inMoreSection = 6; // rarely used in official app
 }
 
 message Camera {

From f286df9ecf6246e4589c332f951e88fa1167f549 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 6 Oct 2023 15:59:18 +0100
Subject: [PATCH 049/595] Mi Band 8: Notification and calls (working, but wip)

---
 .../services/XiaomiNotificationService.java   | 101 ++++++++++++++----
 app/src/main/proto/xiaomi.proto               |  28 ++---
 2 files changed, 96 insertions(+), 33 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
index 7fbef5bf6..c9ec83a46 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
@@ -16,16 +16,18 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services;
 
+import android.Manifest;
+import android.content.pm.PackageManager;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
 
 import nodomain.freeyourgadget.gadgetbridge.BuildConfig;
-import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdatePreferences;
+import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventCallControl;
 import nodomain.freeyourgadget.gadgetbridge.model.CallSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.CannedMessagesSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.NotificationSpec;
@@ -42,8 +44,10 @@ public class XiaomiNotificationService extends AbstractXiaomiService {
     public static final int COMMAND_TYPE = 7;
 
     public static final int CMD_NOTIFICATION_SEND = 0;
+    public static final int CMD_CALL_REJECT = 2;
+    public static final int CMD_CALL_IGNORE = 5;
     public static final int CMD_CANNED_MESSAGES_GET = 9;
-    public static final int CMD_CANNED_MESSAGES_SET = 12;
+    public static final int CMD_CANNED_MESSAGES_SET = 12; // also canned message reply
 
     public XiaomiNotificationService(final XiaomiSupport support) {
         super(support);
@@ -56,10 +60,22 @@ public class XiaomiNotificationService extends AbstractXiaomiService {
 
     @Override
     public void handleCommand(final XiaomiProto.Command cmd) {
+        final GBDeviceEventCallControl deviceEvtCallControl = new GBDeviceEventCallControl();
+
         switch (cmd.getSubtype()) {
+            case CMD_CALL_REJECT:
+                LOG.debug("Reject call");
+                deviceEvtCallControl.event = GBDeviceEventCallControl.Event.REJECT;
+                getSupport().evaluateGBDeviceEvent(deviceEvtCallControl);
+                return;
+            case CMD_CALL_IGNORE:
+                LOG.debug("Ignore call");
+                deviceEvtCallControl.event = GBDeviceEventCallControl.Event.IGNORE;
+                getSupport().evaluateGBDeviceEvent(deviceEvtCallControl);
+                return;
             case CMD_CANNED_MESSAGES_GET:
                 handleCannedMessages(cmd.getNotification().getCannedMessages());
-                break;
+                return;
         }
 
         // TODO
@@ -68,14 +84,9 @@ public class XiaomiNotificationService extends AbstractXiaomiService {
     }
 
     public void onNotification(final NotificationSpec notificationSpec) {
-        // TODO this is not working
-        if (true) {
-            LOG.warn("Notifications disabled, they're not working");
-            return;
-        }
-
         final XiaomiProto.Notification3.Builder notification3 = XiaomiProto.Notification3.newBuilder()
                 .setId(notificationSpec.getId())
+                .setUnknown4("") // ?
                 .setTimestamp(TIMESTAMP_SDF.format(new Date(notificationSpec.when)));
 
         if (notificationSpec.sourceAppId != null) {
@@ -97,14 +108,15 @@ public class XiaomiNotificationService extends AbstractXiaomiService {
             notification3.setAppName(notificationSpec.sourceName);
         }
 
-        // TODO what is this?
-        final String unknown12 = String.format(
-                Locale.ROOT,
-                "0|%s|%d|null|12345",
-                notification3.getPackage(),
-                notification3.getId() // i think this needs to be converted to unsigned
-        );
-        notification3.setUnknown12(unknown12);
+        // TODO Open on phone
+        //final String unknown12 = String.format(
+        //        Locale.ROOT,
+        //        "0|%s|%d|null|12345",
+        //        notification3.getPackage(),
+        //        notification3.getId() // i think this needs to be converted to unsigned
+        //);
+        //notification3.setUnknown12(unknown12);
+        //notification3.setOpenOnPhone(1);
 
         final XiaomiProto.Notification2 notification2 = XiaomiProto.Notification2.newBuilder()
                 .setNotification3(notification3)
@@ -129,7 +141,50 @@ public class XiaomiNotificationService extends AbstractXiaomiService {
     }
 
     public void onSetCallState(final CallSpec callSpec) {
-        // TODO
+        // TODO handle callSpec.command
+        if (callSpec.command != CallSpec.CALL_INCOMING) {
+            return;
+        }
+
+        final XiaomiProto.Notification3.Builder notification3 = XiaomiProto.Notification3.newBuilder()
+                .setId(12345) // ?
+                .setUnknown4("") // ?
+                .setIsCall(true)
+                .setRepliesAllowed(canSendSms())
+                .setTimestamp(TIMESTAMP_SDF.format(new Date()));
+
+        notification3.setPackage(BuildConfig.APPLICATION_ID);
+        notification3.setAppName("Phone");
+
+        if (callSpec.name != null) {
+            notification3.setTitle(callSpec.name);
+        } else {
+            notification3.setTitle("?");
+        }
+        if (callSpec.number != null) {
+            notification3.setBody(callSpec.number);
+        } else {
+            notification3.setBody("?");
+        }
+
+        // TODO unknown caller i18n
+
+        final XiaomiProto.Notification2 notification2 = XiaomiProto.Notification2.newBuilder()
+                .setNotification3(notification3)
+                .build();
+
+        final XiaomiProto.Notification notification = XiaomiProto.Notification.newBuilder()
+                .setNotification2(notification2)
+                .build();
+
+        getSupport().sendCommand(
+                "send call",
+                XiaomiProto.Command.newBuilder()
+                        .setType(COMMAND_TYPE)
+                        .setSubtype(CMD_NOTIFICATION_SEND)
+                        .setNotification(notification)
+                        .build()
+        );
     }
 
     public void onSetCannedMessages(final CannedMessagesSpec cannedMessagesSpec) {
@@ -177,4 +232,12 @@ public class XiaomiNotificationService extends AbstractXiaomiService {
         //gbDeviceEventUpdatePreferences.withPreference("canned_reply_" + i, message);
         //getSupport().evaluateGBDeviceEvent(gbDeviceEventUpdatePreferences);
     }
+
+    public boolean canSendSms() {
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
+            return getSupport().getContext().checkSelfPermission(Manifest.permission.SEND_SMS) == PackageManager.PERMISSION_GRANTED;
+        } else {
+            return true;
+        }
+    }
 }
diff --git a/app/src/main/proto/xiaomi.proto b/app/src/main/proto/xiaomi.proto
index 97df3c54d..b9f5bd2f1 100644
--- a/app/src/main/proto/xiaomi.proto
+++ b/app/src/main/proto/xiaomi.proto
@@ -442,7 +442,7 @@ message MediaKey {
 
 message Notification {
   optional Notification2 notification2 = 3;
-  optional Notification4 notification4 = 4;
+  optional NotificationDismiss notification4 = 4;
 
   optional uint32 unknown8 = 8; // 1 on canned replies request?
   // 7, 9 get | 7, 12 set
@@ -457,18 +457,24 @@ message Notification3 {
   optional string package = 1;
   optional string appName = 2;
   optional string title = 3;
-  optional string timestamp = 6;
   optional string unknown4 = 4;
   optional string body = 5;
+  optional string timestamp = 6;
   optional uint32 id = 7;
-  optional string unknown8 = 8;
-  optional string unknown11 = 11;
-  optional string unknown12 = 12;
-  optional uint32 hasReply = 13;
+  optional bool isCall = 8;
+  optional bool repliesAllowed = 11; // only for calls?
+  optional string unknown12 = 12; // "0|<package>|<id 2 complement>|null|12345"
+  optional uint32 openOnPhone = 13; // 1 to show "Open on phone", needs unknown12
 }
 
-message Notification4 {
-  optional Notification5 notification5 = 1;
+message NotificationDismiss {
+  optional NotificationId notificationId = 1;
+}
+
+message NotificationId {
+  optional uint32 id = 1;
+  optional string package = 2; // truncated
+  optional string unknown4 = 4; // ""
 }
 
 message CannedMessages {
@@ -477,12 +483,6 @@ message CannedMessages {
   optional uint32 maxReplies = 3;
 }
 
-message Notification5 {
-  optional uint32 id = 1;
-  optional string package = 2;
-  optional string unknown4 = 4;
-}
-
 //
 // Weather
 //

From 5cc40f554e22905af6a0fe779a55177dabf20c04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 6 Oct 2023 15:59:28 +0100
Subject: [PATCH 050/595] Mi Band 8: Widgets proto

---
 app/src/main/proto/xiaomi.proto | 42 ++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/app/src/main/proto/xiaomi.proto b/app/src/main/proto/xiaomi.proto
index b9f5bd2f1..188bdcffc 100644
--- a/app/src/main/proto/xiaomi.proto
+++ b/app/src/main/proto/xiaomi.proto
@@ -87,10 +87,10 @@ message System {
   // 2, 7 get | 2, 8 set
   optional Camera camera = 15;
 
-  // 2, 51
+  // 2, 51 get | 2, 52 create
   optional Widgets widgets = 28;
   // 2, 53
-  optional WidgetsSingle widgetsSingle = 29;
+  optional WidgetParts widgetsSingle = 29;
 
   // 2, 14
   optional DoNotDisturb dnd2 = 34;
@@ -184,30 +184,32 @@ message Camera {
 
 message Widgets {
   repeated Widget widget = 1;
+  optional uint32 unknown2 = 2; // 1
+  optional WidgetsCapabilities widget3 = 3;
+}
+
+message WidgetsCapabilities {
+  optional uint32 minWidgets = 1; // 1
+  optional uint32 maxWidgets = 2; // 7
+  optional uint32 unknown3 = 3; // 768
 }
 
 message Widget {
-  optional uint32 unknown1 = 1;
-  optional uint32 unknown2 = 2;
+  optional uint32 id = 1; // starts at 1
+  optional uint32 type = 2; // 256 for split, 512 for tall
   repeated WidgetPart widgetPart = 3;
 }
 
+message WidgetParts {
+  repeated WidgetPart widgetPart = 1;
+}
+
 message WidgetPart {
-  optional uint32 unknown1 = 1;
-  optional uint32 unknown2 = 2;
-  optional uint32 unknown3 = 3;
-}
-
-message WidgetsSingle {
-  repeated SingleWidget widget = 1;
-}
-
-message SingleWidget {
-  optional uint32 unknown1 = 1;
-  optional uint32 unknown2 = 2;
-  optional uint32 unknown3 = 3;
-  optional string title = 4;
-  optional uint32 unknown5 = 5;
+  optional uint32 partType = 1; // 1 for small, 3 for tall
+  optional uint32 app = 2; // matches command type
+  optional uint32 partId = 3; // they all seem unique
+  optional string title = 4; // not set on create
+  optional uint32 unknown5 = 5; // 0, not set on create
 }
 
 message DoNotDisturb {
@@ -275,6 +277,8 @@ message Charger {
 
 message Health {
   optional UserInfo userInfo = 1;
+  // 8, 1 get | 8, 3 set
+  optional bytes unknownActivity2 = 2;
   optional SpO2 spo2 = 7;
   optional HeartRate heartRate = 8;
   // 8, 12 get | 8, 13 set

From f9783297113b3a384d0162e09930da06a7dab722 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 6 Oct 2023 17:07:15 +0100
Subject: [PATCH 051/595] Mi Band 8: Display items (wip, needs chunked)

---
 .../devices/xiaomi/XiaomiCoordinator.java     |  2 +-
 .../devices/xiaomi/XiaomiPreferences.java     |  7 +++
 .../service/devices/xiaomi/XiaomiSupport.java |  2 +-
 .../xiaomi/services/XiaomiSystemService.java  | 53 +++++++++++++++-
 app/src/main/res/values/arrays.xml            | 60 +++++++++++++++++++
 app/src/main/res/values/strings.xml           |  4 ++
 .../devicesettings_xiaomi_displayitems.xml    | 13 ++++
 7 files changed, 137 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/res/xml/devicesettings_xiaomi_displayitems.xml

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
index 2b1b5cc19..ab59df635 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
@@ -303,7 +303,7 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
         // Display
         //
         settings.add(R.xml.devicesettings_header_display);
-        settings.add(R.xml.devicesettings_huami2021_displayitems);
+        settings.add(R.xml.devicesettings_xiaomi_displayitems);
         settings.add(R.xml.devicesettings_password);
 
         //
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPreferences.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPreferences.java
index 76fbccf0f..2f7a3122a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPreferences.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPreferences.java
@@ -41,4 +41,11 @@ public final class XiaomiPreferences {
                 .setMinute(calendar.get(Calendar.MINUTE))
                 .build();
     }
+
+    /**
+     * Returns the preference key where to save the list of possible value for a preference, comma-separated.
+     */
+    public static String getPrefPossibleValuesKey(final String key) {
+        return String.format(Locale.ROOT, "%s_possible_values", key);
+    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
index be4583572..5fe46e649 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
@@ -239,7 +239,7 @@ public class XiaomiSupport extends AbstractBTLEDeviceSupport {
     @Override
     public void onTestNewFunction() {
         final TransactionBuilder builder = createTransactionBuilder("test new function");
-
+        sendCommand(builder, 2, 29);
         builder.queue(getQueue());
     }
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
index 172cfba12..b33e35f9f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
@@ -19,8 +19,11 @@ package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Collections;
 import java.util.GregorianCalendar;
+import java.util.List;
 import java.util.TimeZone;
 
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
@@ -31,12 +34,16 @@ import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventFindPhone;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdateDeviceInfo;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdatePreferences;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventVersionInfo;
+import nodomain.freeyourgadget.gadgetbridge.devices.huami.Huami2021Coordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
 import nodomain.freeyourgadget.gadgetbridge.model.BatteryState;
 import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiPreferences;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
 import nodomain.freeyourgadget.gadgetbridge.util.GBPrefs;
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
+import nodomain.freeyourgadget.gadgetbridge.util.StringUtils;
 
 public class XiaomiSystemService extends AbstractXiaomiService {
     private static final Logger LOG = LoggerFactory.getLogger(XiaomiSystemService.class);
@@ -62,7 +69,7 @@ public class XiaomiSystemService extends AbstractXiaomiService {
         getSupport().sendCommand(builder, COMMAND_TYPE, CMD_DEVICE_INFO);
         getSupport().sendCommand(builder, COMMAND_TYPE, CMD_BATTERY);
         getSupport().sendCommand(builder, COMMAND_TYPE, CMD_PASSWORD_GET);
-        getSupport().sendCommand(builder, COMMAND_TYPE, CMD_DISPLAY_ITEMS_GET);
+        // FIXME i think this needs chunked getSupport().sendCommand(builder, COMMAND_TYPE, CMD_DISPLAY_ITEMS_GET);
     }
 
     @Override
@@ -97,7 +104,7 @@ public class XiaomiSystemService extends AbstractXiaomiService {
                 return;
         }
 
-        LOG.warn("Unknown config command {}", cmd.getSubtype());
+        LOG.warn("Unknown system command {}", cmd.getSubtype());
     }
 
     @Override
@@ -233,8 +240,50 @@ public class XiaomiSystemService extends AbstractXiaomiService {
         getSupport().evaluateGBDeviceEvent(eventUpdatePreferences);
     }
 
+    private void setDisplayItems(final TransactionBuilder builder) {
+        final Prefs prefs = getDevicePrefs();
+        final ArrayList<String> allScreens = new ArrayList<>(prefs.getList(XiaomiPreferences.getPrefPossibleValuesKey(HuamiConst.PREF_DISPLAY_ITEMS_SORTABLE), Collections.emptyList()));
+        final ArrayList<String> enabledScreens = new ArrayList<>(prefs.getList(HuamiConst.PREF_DISPLAY_ITEMS_SORTABLE, Collections.emptyList()));
+        if (allScreens.isEmpty()) {
+            LOG.warn("No list of all screens");
+            return;
+        }
+        if (!enabledScreens.contains("setting")) {
+            enabledScreens.add("setting");
+        }
+        // TODO i think this needs chunked
+    }
+
     private void handleDisplayItems(final XiaomiProto.DisplayItems displayItems) {
         LOG.debug("Got {} display items", displayItems.getDisplayItemCount());
+        final List<String> allScreens = new ArrayList<>();
+        final List<String> mainScreens = new ArrayList<>();
+        final List<String> moreScreens = new ArrayList<>();
+        for (final XiaomiProto.DisplayItem displayItem : displayItems.getDisplayItemList()) {
+            allScreens.add(displayItem.getCode());
+            if (!displayItem.getDisabled()) {
+                if (displayItem.getInMoreSection()) {
+                    moreScreens.add(displayItem.getCode());
+                } else {
+                    mainScreens.add(displayItem.getCode());
+                }
+            }
+        }
+
+        final List<String> enabledScreens = new ArrayList<>(mainScreens);
+        if (!moreScreens.isEmpty()) {
+            enabledScreens.add("more");
+            enabledScreens.addAll(moreScreens);
+        }
+
+        final String allScreensPrefValue = StringUtils.join(",", allScreens.toArray(new String[0])).toString();
+        final String prefValue = StringUtils.join(",", enabledScreens.toArray(new String[0])).toString();
+
+        final GBDeviceEventUpdatePreferences eventUpdatePreferences = new GBDeviceEventUpdatePreferences()
+                .withPreference(XiaomiPreferences.getPrefPossibleValuesKey(HuamiConst.PREF_DISPLAY_ITEMS_SORTABLE), allScreensPrefValue)
+                .withPreference(HuamiConst.PREF_DISPLAY_ITEMS_SORTABLE, prefValue);
+
+        getSupport().evaluateGBDeviceEvent(eventUpdatePreferences);
     }
 
     public void onFindPhone(final boolean start) {
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index f832b4e14..f273c9bf3 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -1022,6 +1022,66 @@
         <item>headphone</item>
     </string-array>
 
+    <string-array name="pref_xiaomi_apps">
+        <item>@string/menuitem_stats</item>
+        <item>@string/menuitem_workout</item>
+        <item>@string/menuitem_activity</item>
+        <item>@string/menuitem_running</item>
+        <item>@string/menuitem_status</item>
+        <item>@string/menuitem_hr</item>
+        <item>@string/menuitem_pai</item>
+        <item>@string/menuitem_spo2</item>
+        <item>@string/menuitem_sleep</item>
+        <item>@string/menuitem_stress</item>
+        <item>@string/menuitem_weather</item>
+        <item>@string/menuitem_alarm</item>
+        <item>@string/menuitem_settings</item>
+        <item>@string/menuitem_more</item>  <!-- dummy item -->
+        <item>@string/menuitem_alerts</item>
+        <item>@string/menuitem_events</item>
+        <item>@string/menuitem_breathing</item>
+        <item>@string/menuitem_female_health</item>
+        <item>@string/menuitem_stopwatch</item>
+        <item>@string/menuitem_music</item>
+        <item>@string/menuitem_findphone</item>
+        <item>@string/menuitem_worldclock</item>
+        <item>@string/menuitem_mutephone</item>
+        <item>@string/menuitem_takephoto</item>
+        <item>@string/menuitem_timer</item>
+        <item>@string/menuitem_flashlight</item>
+        <item>@string/menuitem_pomodoro</item>
+    </string-array>
+
+    <string-array name="pref_xiaomi_apps_values">
+        <item>today_act</item>
+        <item>sport</item>
+        <item>sport_record</item>
+        <item>sport_course</item>
+        <item>sport_state</item>
+        <item>heart</item>
+        <item>pai</item>
+        <item>blood_ox</item>
+        <item>sleep</item>
+        <item>press</item>
+        <item>weather</item>
+        <item>alarm</item>
+        <item>setting</item>
+        <item>more</item>  <!-- dummy item -->
+        <item>schedule</item>
+        <item>event_reminder</item>
+        <item>breath</item>
+        <item>fm_health</item>
+        <item>stopwatch</item>
+        <item>music</item>
+        <item>find_phone</item>
+        <item>world_clock</item>
+        <item>phone_mute</item>
+        <item>phone_remote</item>
+        <item>count_down</item>
+        <item>flash_light</item>
+        <item>focus</item>
+    </string-array>
+
     <string-array name="pref_miband5_workout_activity_types">
         <item>@string/activity_type_outdoor_running</item>
         <item>@string/activity_type_walking</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f4d8495e9..e79b237aa 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2407,4 +2407,8 @@
     <string name="pref_navigation_app_osmand">OsmAnd(+)</string>
     <string name="pref_navigation_app_gmaps">Google Maps</string>
     <string name="serial_number">Serial Number</string>
+    <string name="menuitem_stats">Stats</string>
+    <string name="menuitem_running">Running</string>
+    <string name="menuitem_alerts">Alerts</string>
+    <string name="menuitem_focus">Focus</string>
 </resources>
diff --git a/app/src/main/res/xml/devicesettings_xiaomi_displayitems.xml b/app/src/main/res/xml/devicesettings_xiaomi_displayitems.xml
new file mode 100644
index 000000000..08ad3f301
--- /dev/null
+++ b/app/src/main/res/xml/devicesettings_xiaomi_displayitems.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <com.mobeta.android.dslv.DragSortListPreference
+        android:defaultValue="@array/pref_huami2021_empty_array"
+        android:dialogTitle="@string/mi2_prefs_display_items"
+        android:entries="@array/pref_xiaomi_apps"
+        android:entryValues="@array/pref_xiaomi_apps_values"
+        android:icon="@drawable/ic_widgets"
+        android:key="display_items_sortable"
+        android:persistent="true"
+        android:summary="@string/mi2_prefs_display_items_summary"
+        android:title="@string/mi2_prefs_display_items" />
+</androidx.preference.PreferenceScreen>

From e21b35981b48e2ee2cd46a0cdcf5e54b6a3061d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 6 Oct 2023 17:18:23 +0100
Subject: [PATCH 052/595] Mi Band 8: Weather temperature unit

---
 .../xiaomi/services/XiaomiWeatherService.java | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java
index 6254fdf77..95a68a7b4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java
@@ -19,15 +19,25 @@ package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.activities.SettingsActivity;
+import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst;
 import nodomain.freeyourgadget.gadgetbridge.model.WeatherSpec;
 import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
+import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 
 public class XiaomiWeatherService extends AbstractXiaomiService {
     private static final Logger LOG = LoggerFactory.getLogger(XiaomiWeatherService.class);
 
     public static final int COMMAND_TYPE = 10;
 
+    private static final int CMD_TEMPERATURE_UNIT_GET = 9;
+    private static final int CMD_TEMPERATURE_UNIT_SET = 10;
+
     public XiaomiWeatherService(final XiaomiSupport support) {
         super(support);
     }
@@ -37,7 +47,42 @@ public class XiaomiWeatherService extends AbstractXiaomiService {
         // TODO
     }
 
+    @Override
+    public void initialize(final TransactionBuilder builder) {
+        // TODO setMeasurementSystem();, or request
+    }
+
+    @Override
+    public boolean onSendConfiguration(final String config, final Prefs prefs) {
+        switch (config) {
+            case SettingsActivity.PREF_MEASUREMENT_SYSTEM:
+                setMeasurementSystem();
+                return true;
+        }
+
+        return false;
+    }
+
     public void onSendWeather(final WeatherSpec weatherSpec) {
         // TODO
     }
+
+    private void setMeasurementSystem() {
+        final Prefs prefs = getDevicePrefs();
+        final String measurementSystem = prefs.getString(SettingsActivity.PREF_MEASUREMENT_SYSTEM, "metric");
+        LOG.info("Setting measurement system to {}", measurementSystem);
+
+        final int unitValue = "metric".equals(measurementSystem) ? 1 : 2;
+
+        getSupport().sendCommand(
+                "set temperature unit",
+                XiaomiProto.Command.newBuilder()
+                        .setType(COMMAND_TYPE)
+                        .setSubtype(CMD_TEMPERATURE_UNIT_SET)
+                        .setWeather(XiaomiProto.Weather.newBuilder().setTemperatureUnit(
+                                XiaomiProto.WeatherTemperatureUnit.newBuilder().setUnit(unitValue)
+                        ))
+                        .build()
+        );
+    }
 }

From f0188f3499a5ca766815609c0e910b88c9e45990 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 6 Oct 2023 19:24:38 +0100
Subject: [PATCH 053/595] Mi Band 8: Refactor cipher to auth service

---
 ...aomiCipher.java => XiaomiAuthService.java} | 53 ++++++++++---------
 .../devices/xiaomi/XiaomiConstants.java       | 13 +++--
 .../service/devices/xiaomi/XiaomiSupport.java | 18 +++----
 3 files changed, 43 insertions(+), 41 deletions(-)
 rename app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/{XiaomiCipher.java => XiaomiAuthService.java} (87%)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCipher.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java
similarity index 87%
rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCipher.java
rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java
index cd418bcd0..34798c038 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCipher.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java
@@ -53,12 +53,16 @@ import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetDeviceStateAction;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.AbstractXiaomiService;
 import nodomain.freeyourgadget.gadgetbridge.util.GB;
 
-public class XiaomiCipher {
-    private static final Logger LOG = LoggerFactory.getLogger(XiaomiCipher.class);
+public class XiaomiAuthService extends AbstractXiaomiService {
+    private static final Logger LOG = LoggerFactory.getLogger(XiaomiAuthService.class);
 
-    private final XiaomiSupport mSupport;
+    public static final int COMMAND_TYPE = 1;
+
+    public static final int CMD_NONCE = 26;
+    public static final int CMD_AUTH = 27;
 
     private final byte[] secretKey = new byte[16];
     private final byte[] nonce = new byte[16];
@@ -67,55 +71,56 @@ public class XiaomiCipher {
     private final byte[] encryptionNonce = new byte[4];
     private final byte[] decryptionNonce = new byte[4];
 
-    public XiaomiCipher(final XiaomiSupport support) {
-        this.mSupport = support;
+    public XiaomiAuthService(final XiaomiSupport support) {
+        super(support);
     }
 
     protected void startAuthentication(final TransactionBuilder builder) {
-        builder.add(new SetDeviceStateAction(mSupport.getDevice(), GBDevice.State.AUTHENTICATING, mSupport.getContext()));
+        builder.add(new SetDeviceStateAction(getSupport().getDevice(), GBDevice.State.AUTHENTICATING, getSupport().getContext()));
 
-        System.arraycopy(getSecretKey(mSupport.getDevice()), 0, secretKey, 0, 16);
+        System.arraycopy(getSecretKey(getSupport().getDevice()), 0, secretKey, 0, 16);
         new SecureRandom().nextBytes(nonce);
 
         builder.write(
-                mSupport.getCharacteristic(UUID_CHARACTERISTIC_XIAOMI_COMMAND_WRITE),
+                getSupport().getCharacteristic(UUID_CHARACTERISTIC_XIAOMI_COMMAND_WRITE),
                 ArrayUtils.addAll(XiaomiConstants.PAYLOAD_HEADER_AUTH, buildNonceCommand(nonce))
         );
     }
 
-    protected void handleAuthCommand(final XiaomiProto.Command cmd) {
-        if (cmd.getType() != XiaomiConstants.CMD_TYPE_AUTH) {
+    @Override
+    public void handleCommand(final XiaomiProto.Command cmd) {
+        if (cmd.getType() != COMMAND_TYPE) {
             throw new IllegalArgumentException("Not an auth command");
         }
 
         switch (cmd.getSubtype()) {
-            case XiaomiConstants.CMD_AUTH_NONCE: {
+            case CMD_NONCE: {
                 LOG.debug("Got watch nonce");
 
                 // Watch nonce
                 final XiaomiProto.Command reply = handleWatchNonce(cmd.getAuth().getWatchNonce());
                 if (reply == null) {
-                    mSupport.disconnect();
+                    getSupport().disconnect();
                     return;
                 }
 
-                final TransactionBuilder builder = mSupport.createTransactionBuilder("auth step 2");
+                final TransactionBuilder builder = getSupport().createTransactionBuilder("auth step 2");
                 // TODO maybe move these writes to support class?
                 builder.write(
-                        mSupport.getCharacteristic(UUID_CHARACTERISTIC_XIAOMI_COMMAND_WRITE),
+                        getSupport().getCharacteristic(UUID_CHARACTERISTIC_XIAOMI_COMMAND_WRITE),
                         ArrayUtils.addAll(XiaomiConstants.PAYLOAD_HEADER_AUTH, reply.toByteArray())
                 );
-                builder.queue(mSupport.getQueue());
+                builder.queue(getSupport().getQueue());
                 break;
             }
 
-            case XiaomiConstants.CMD_AUTH_AUTH: {
+            case CMD_AUTH: {
                 LOG.info("Authenticated!");
 
-                final TransactionBuilder builder = mSupport.createTransactionBuilder("phase 2 initialize");
-                builder.add(new SetDeviceStateAction(mSupport.getDevice(), GBDevice.State.INITIALIZED, mSupport.getContext()));
-                mSupport.phase2Initialize(builder);
-                builder.queue(mSupport.getQueue());
+                final TransactionBuilder builder = getSupport().createTransactionBuilder("phase 2 initialize");
+                builder.add(new SetDeviceStateAction(getSupport().getDevice(), GBDevice.State.INITIALIZED, getSupport().getContext()));
+                getSupport().phase2Initialize(builder);
+                builder.queue(getSupport().getQueue());
                 break;
             }
 
@@ -190,8 +195,8 @@ public class XiaomiCipher {
                 .build();
 
         final XiaomiProto.Command.Builder cmd = XiaomiProto.Command.newBuilder();
-        cmd.setType(XiaomiConstants.CMD_TYPE_AUTH);
-        cmd.setSubtype(XiaomiConstants.CMD_AUTH_AUTH);
+        cmd.setType(COMMAND_TYPE);
+        cmd.setSubtype(CMD_AUTH);
 
         final XiaomiProto.Auth.Builder auth = XiaomiProto.Auth.newBuilder();
         auth.setAuthStep3(authStep3);
@@ -207,8 +212,8 @@ public class XiaomiCipher {
         auth.setPhoneNonce(phoneNonce.build());
 
         final XiaomiProto.Command.Builder command = XiaomiProto.Command.newBuilder();
-        command.setType(XiaomiConstants.CMD_TYPE_AUTH);
-        command.setSubtype(XiaomiConstants.CMD_AUTH_NONCE);
+        command.setType(COMMAND_TYPE);
+        command.setSubtype(CMD_NONCE);
         command.setAuth(auth.build());
         return command.build().toByteArray();
     }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiConstants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiConstants.java
index b002988aa..146bdcebc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiConstants.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiConstants.java
@@ -39,12 +39,11 @@ public class XiaomiConstants {
     public static final UUID UUID_CHARACTERISTIC_XIAOMI_UNKNOWN_0002 = UUID.fromString((String.format(BASE_UUID, "0002")));
     public static final UUID UUID_CHARACTERISTIC_XIAOMI_UNKNOWN_0003 = UUID.fromString((String.format(BASE_UUID, "0003")));
 
-    public static final int CMD_TYPE_AUTH = 1;
-
-    public static final int CMD_AUTH_NONCE = 26;
-    public static final int CMD_AUTH_AUTH = 27;
-
     // TODO not like this
-    public static final byte[] PAYLOAD_ACK = new byte[]{0, 0, 3, 0};
-    public static final byte[] PAYLOAD_HEADER_AUTH = new byte[]{0, 0, 2, 2};
+    public static final byte[] PAYLOAD_CHUNKED_START =     new byte[]{0, 0, 0, 1};
+    public static final byte[] PAYLOAD_CHUNKED_START_ACK = new byte[]{0, 0, 1, 1};
+    public static final byte[] PAYLOAD_CHUNKED_END_ACK =   new byte[]{0, 0, 1, 0};
+    public static final byte[] PAYLOAD_HEADER_AUTH =       new byte[]{0, 0, 2, 2};
+    public static final byte[] PAYLOAD_HEADER_CMD =        new byte[]{0, 0, 2, 1};
+    public static final byte[] PAYLOAD_ACK =               new byte[]{0, 0, 3, 0};
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
index 5fe46e649..3fdc8facd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
@@ -69,8 +69,7 @@ import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 public class XiaomiSupport extends AbstractBTLEDeviceSupport {
     private static final Logger LOG = LoggerFactory.getLogger(XiaomiSupport.class);
 
-    private final XiaomiCipher cipher = new XiaomiCipher(this);
-
+    private final XiaomiAuthService authService = new XiaomiAuthService(this);
     private final XiaomiMusicService musicService = new XiaomiMusicService(this);
     private final XiaomiHealthService healthService = new XiaomiHealthService(this);
     private final XiaomiNotificationService notificationService = new XiaomiNotificationService(this);
@@ -79,6 +78,7 @@ public class XiaomiSupport extends AbstractBTLEDeviceSupport {
     private final XiaomiSystemService systemService = new XiaomiSystemService(this);
 
     private final Map<Integer, AbstractXiaomiService> mServiceMap = new LinkedHashMap<Integer, AbstractXiaomiService>() {{
+        put(XiaomiAuthService.COMMAND_TYPE, authService);
         put(XiaomiMusicService.COMMAND_TYPE, musicService);
         put(XiaomiHealthService.COMMAND_TYPE, healthService);
         put(XiaomiNotificationService.COMMAND_TYPE, notificationService);
@@ -133,7 +133,7 @@ public class XiaomiSupport extends AbstractBTLEDeviceSupport {
         builder.notify(getCharacteristic(UUID_CHARACTERISTIC_XIAOMI_COMMAND_READ), true);
         builder.notify(getCharacteristic(UUID_CHARACTERISTIC_XIAOMI_COMMAND_WRITE), true);
         builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.INITIALIZING, getContext()));
-        cipher.startAuthentication(builder);
+        authService.startAuthentication(builder);
 
         return builder;
     }
@@ -168,6 +168,9 @@ public class XiaomiSupport extends AbstractBTLEDeviceSupport {
                 LOG.warn("Non-zero header not supported");
                 return true;
             }
+            if (type == 0) {
+                // Chunked
+            }
             if (type != 2) {
                 LOG.warn("Unsupported type {}", type);
                 return true;
@@ -175,7 +178,7 @@ public class XiaomiSupport extends AbstractBTLEDeviceSupport {
 
             final byte[] plainValue;
             if (encryption == 1) {
-                plainValue = cipher.decrypt(ArrayUtils.subarray(value, 4, value.length));
+                plainValue = authService.decrypt(ArrayUtils.subarray(value, 4, value.length));
             } else {
                 plainValue = ArrayUtils.subarray(value, 4, value.length);
             }
@@ -196,11 +199,6 @@ public class XiaomiSupport extends AbstractBTLEDeviceSupport {
                 return true;
             }
 
-            if (cmd.getType() == CMD_TYPE_AUTH) {
-                cipher.handleAuthCommand(cmd);
-                return true;
-            }
-
             LOG.warn("Unexpected watch command type {}", cmd.getType());
             return true;
         }
@@ -441,7 +439,7 @@ public class XiaomiSupport extends AbstractBTLEDeviceSupport {
 
     public void sendCommand(final TransactionBuilder builder, final XiaomiProto.Command command) {
         final byte[] commandBytes = command.toByteArray();
-        final byte[] encryptedCommandBytes = cipher.encrypt(commandBytes, encryptedIndex);
+        final byte[] encryptedCommandBytes = authService.encrypt(commandBytes, encryptedIndex);
         final ByteBuffer buf = ByteBuffer.allocate(6 + encryptedCommandBytes.length).order(ByteOrder.LITTLE_ENDIAN);
         buf.putShort((short) 0);
         buf.put((byte) 2); // 2 for command

From 44be081e862a54a19fe497b65fd8525f81216ec6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 6 Oct 2023 20:10:11 +0100
Subject: [PATCH 054/595] Mi Band 8: Handle incoming chunked packets

---
 .../btle/AbstractBTLEDeviceSupport.java       |  11 +-
 .../devices/xiaomi/XiaomiChunkedHandler.java  |  59 ++++++++
 .../devices/xiaomi/XiaomiConstants.java       |  10 +-
 .../service/devices/xiaomi/XiaomiSupport.java | 143 +++++++++++++-----
 4 files changed, 179 insertions(+), 44 deletions(-)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiChunkedHandler.java

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEDeviceSupport.java
index 0ef82d27e..a07643e9d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEDeviceSupport.java
@@ -56,6 +56,7 @@ import nodomain.freeyourgadget.gadgetbridge.service.btle.profiles.AbstractBlePro
 public abstract class AbstractBTLEDeviceSupport extends AbstractDeviceSupport implements GattCallback, GattServerCallback {
     private static final Logger LOG = LoggerFactory.getLogger(AbstractBTLEDeviceSupport.class);
 
+    private int mMTU = 0;
     private BtLEQueue mQueue;
     private Map<UUID, BluetoothGattCharacteristic> mAvailableCharacteristics;
     private final Set<UUID> mSupportedServices = new HashSet<>(4);
@@ -380,7 +381,7 @@ public abstract class AbstractBTLEDeviceSupport extends AbstractDeviceSupport im
 
     @Override
     public void onMtuChanged(BluetoothGatt gatt, int mtu, int status) {
-
+        this.mMTU = mtu;
     }
 
     @Override
@@ -407,4 +408,12 @@ public abstract class AbstractBTLEDeviceSupport extends AbstractDeviceSupport im
     public boolean onDescriptorWriteRequest(BluetoothDevice device, int requestId, BluetoothGattDescriptor descriptor, boolean preparedWrite, boolean responseNeeded, int offset, byte[] value) {
         return false;
     }
+
+    /**
+     * Gets the current MTU, or 0 if unknown
+     * @return the current MTU, 0 if unknown
+     */
+    public int getMTU() {
+        return mMTU;
+    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiChunkedHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiChunkedHandler.java
new file mode 100644
index 000000000..458e80feb
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiChunkedHandler.java
@@ -0,0 +1,59 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+
+public class XiaomiChunkedHandler {
+    private int numChunks = 0;
+    private int currentChunk = 0;
+    private final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+
+    public XiaomiChunkedHandler() {
+
+    }
+
+    public void setNumChunks(final int numChunks) {
+        this.numChunks = numChunks;
+        this.currentChunk = 0;
+        this.baos.reset();
+    }
+
+    public void addChunk(final byte[] chunk) {
+        try {
+            baos.write(chunk);
+        } catch (final IOException e) {
+            throw new RuntimeException(e);
+        }
+
+        currentChunk++;
+    }
+
+    public int getNumChunks() {
+        return numChunks;
+    }
+
+    public int getCurrentChunk() {
+        return currentChunk;
+    }
+
+    public byte[] getArray() {
+        return baos.toByteArray();
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiConstants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiConstants.java
index 146bdcebc..b1bb6553b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiConstants.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiConstants.java
@@ -40,10 +40,10 @@ public class XiaomiConstants {
     public static final UUID UUID_CHARACTERISTIC_XIAOMI_UNKNOWN_0003 = UUID.fromString((String.format(BASE_UUID, "0003")));
 
     // TODO not like this
-    public static final byte[] PAYLOAD_CHUNKED_START =     new byte[]{0, 0, 0, 1};
+    public static final byte[] PAYLOAD_CHUNKED_START = new byte[]{0, 0, 0, 1};
     public static final byte[] PAYLOAD_CHUNKED_START_ACK = new byte[]{0, 0, 1, 1};
-    public static final byte[] PAYLOAD_CHUNKED_END_ACK =   new byte[]{0, 0, 1, 0};
-    public static final byte[] PAYLOAD_HEADER_AUTH =       new byte[]{0, 0, 2, 2};
-    public static final byte[] PAYLOAD_HEADER_CMD =        new byte[]{0, 0, 2, 1};
-    public static final byte[] PAYLOAD_ACK =               new byte[]{0, 0, 3, 0};
+    public static final byte[] PAYLOAD_CHUNKED_END_ACK = new byte[]{0, 0, 1, 0};
+    public static final byte[] PAYLOAD_HEADER_AUTH = new byte[]{0, 0, 2, 2};
+    public static final byte[] PAYLOAD_HEADER_CMD = new byte[]{0, 0, 2, 1};
+    public static final byte[] PAYLOAD_ACK = new byte[]{0, 0, 3, 0};
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
index 3fdc8facd..a61aed003 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
@@ -25,7 +25,6 @@ import android.content.Context;
 import android.location.Location;
 import android.net.Uri;
 
-import org.apache.commons.lang3.ArrayUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -34,6 +33,7 @@ import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.UUID;
@@ -52,7 +52,6 @@ import nodomain.freeyourgadget.gadgetbridge.model.WeatherSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.WorldClock;
 import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.AbstractBTLEDeviceSupport;
-import nodomain.freeyourgadget.gadgetbridge.service.btle.BLETypeConversions;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.GattService;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetDeviceStateAction;
@@ -138,6 +137,8 @@ public class XiaomiSupport extends AbstractBTLEDeviceSupport {
         return builder;
     }
 
+    private final Map<UUID, XiaomiChunkedHandler> mChunkedHandlers = new HashMap<>();
+
     @Override
     public boolean onCharacteristicChanged(final BluetoothGatt gatt, final BluetoothGattCharacteristic characteristic) {
         if (super.onCharacteristicChanged(gatt, characteristic)) {
@@ -147,6 +148,10 @@ public class XiaomiSupport extends AbstractBTLEDeviceSupport {
         final UUID characteristicUUID = characteristic.getUuid();
         final byte[] value = characteristic.getValue();
 
+        if (Arrays.equals(value, PAYLOAD_ACK)) {
+
+        }
+
         if (UUID_CHARACTERISTIC_XIAOMI_COMMAND_WRITE.equals(characteristicUUID)) {
             if (Arrays.equals(value, PAYLOAD_ACK)) {
                 LOG.debug("Got command write ack");
@@ -158,48 +163,78 @@ public class XiaomiSupport extends AbstractBTLEDeviceSupport {
         }
 
         if (UUID_CHARACTERISTIC_XIAOMI_COMMAND_READ.equals(characteristicUUID)) {
-            sendAck(characteristic);
+            final ByteBuffer buf = ByteBuffer.wrap(characteristic.getValue())
+                    .order(ByteOrder.LITTLE_ENDIAN);
 
-            final int header = BLETypeConversions.toUint16(value, 0);
-            final int type = BLETypeConversions.toUnsigned(value, 2);
-            final int encryption = BLETypeConversions.toUnsigned(value, 3);
+            final int chunk = buf.getShort();
+            if (chunk != 0) {
+                // Chunked packet
+                final XiaomiChunkedHandler chunkedHandler = mChunkedHandlers.get(characteristicUUID);
+                if (chunkedHandler == null) {
+                    LOG.warn("No chunked handler initialized for {}", characteristicUUID);
+                    return true;
+                }
+                final byte[] chunkBytes = new byte[buf.limit() - buf.position()];
+                buf.get(chunkBytes);
+                chunkedHandler.addChunk(chunkBytes);
+                if (chunk == chunkedHandler.getNumChunks()) {
+                    // TODO handle reassembled chunk
+                    final byte[] plainValue = authService.decrypt(chunkedHandler.getArray());
+                    handleCommandBytes(plainValue);
+                }
 
-            if (header != 0) {
-                LOG.warn("Non-zero header not supported");
                 return true;
-            }
-            if (type == 0) {
-                // Chunked
-            }
-            if (type != 2) {
-                LOG.warn("Unsupported type {}", type);
-                return true;
-            }
-
-            final byte[] plainValue;
-            if (encryption == 1) {
-                plainValue = authService.decrypt(ArrayUtils.subarray(value, 4, value.length));
             } else {
-                plainValue = ArrayUtils.subarray(value, 4, value.length);
+                // Not a chunk / single-packet
+                final byte type = buf.get();
+
+                switch (type) {
+                    case 0:
+                        // Chunked start request
+                        final byte one = buf.get(); // ?
+                        if (one != 1) {
+                            LOG.warn("Chunked start request: expected 1, got {}", one);
+                            return true;
+                        }
+                        final short numChunks = buf.getShort();
+                        LOG.debug("Got chunked start request for {} chunks", numChunks);
+                        XiaomiChunkedHandler chunkedHandler = mChunkedHandlers.get(characteristicUUID);
+                        if (chunkedHandler == null) {
+                            chunkedHandler = new XiaomiChunkedHandler();
+                            mChunkedHandlers.put(UUID_CHARACTERISTIC_XIAOMI_COMMAND_READ, chunkedHandler);
+                        }
+                        chunkedHandler.setNumChunks(numChunks);
+                        sendChunkStartAck(characteristic);
+                        return true;
+                    case 1:
+                        // Chunked start ack
+                        LOG.debug("Got chunked start ack");
+                        return true;
+                    case 2:
+                        // Single command
+                        sendAck(characteristic);
+
+                        final byte encryption = buf.get();
+                        final byte[] plainValue;
+                        if (encryption == 1) {
+                            final byte[] encryptedValue = new byte[buf.limit() - buf.position()];
+                            buf.get(encryptedValue);
+                            plainValue = authService.decrypt(encryptedValue);
+                        } else {
+                            plainValue = new byte[buf.limit() - buf.position()];
+                            buf.get(plainValue);
+                        }
+
+                        handleCommandBytes(plainValue);
+
+                        return true;
+                    case 3:
+                        // ack
+                        LOG.debug("Got ack");
+                        return true;
+                }
             }
 
-            LOG.debug("Got command: {}", GB.hexdump(plainValue));
-
-            final XiaomiProto.Command cmd;
-            try {
-                cmd = XiaomiProto.Command.parseFrom(plainValue);
-            } catch (final Exception e) {
-                LOG.error("Failed to parse bytes as protobuf command payload", e);
-                return true;
-            }
-
-            final AbstractXiaomiService service = mServiceMap.get(cmd.getType());
-            if (service != null) {
-                service.handleCommand(cmd);
-                return true;
-            }
-
-            LOG.warn("Unexpected watch command type {}", cmd.getType());
             return true;
         }
 
@@ -207,6 +242,26 @@ public class XiaomiSupport extends AbstractBTLEDeviceSupport {
         return false;
     }
 
+    public void handleCommandBytes(final byte[] plainValue) {
+        LOG.debug("Got command: {}", GB.hexdump(plainValue));
+
+        final XiaomiProto.Command cmd;
+        try {
+            cmd = XiaomiProto.Command.parseFrom(plainValue);
+        } catch (final Exception e) {
+            LOG.error("Failed to parse bytes as protobuf command payload", e);
+            return;
+        }
+
+        final AbstractXiaomiService service = mServiceMap.get(cmd.getType());
+        if (service != null) {
+            service.handleCommand(cmd);
+            return;
+        }
+
+        LOG.warn("Unexpected watch command type {}", cmd.getType());
+    }
+
     @Override
     public void onSendConfiguration(final String config) {
         final Prefs prefs = getDevicePrefs();
@@ -429,6 +484,18 @@ public class XiaomiSupport extends AbstractBTLEDeviceSupport {
         builder.queue(getQueue());
     }
 
+    private void sendChunkStartAck(final BluetoothGattCharacteristic characteristic) {
+        final TransactionBuilder builder = createTransactionBuilder("send chunked start ack");
+        builder.write(characteristic, PAYLOAD_CHUNKED_START_ACK);
+        builder.queue(getQueue());
+    }
+
+    private void sendChunkEndAck(final BluetoothGattCharacteristic characteristic) {
+        final TransactionBuilder builder = createTransactionBuilder("send chunked end ack");
+        builder.write(characteristic, PAYLOAD_CHUNKED_END_ACK);
+        builder.queue(getQueue());
+    }
+
     private short encryptedIndex = 0;
 
     public void sendCommand(final String taskName, final XiaomiProto.Command command) {

From becb10e9f8eb4be38c77818924e63832af705470 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 6 Oct 2023 21:37:35 +0100
Subject: [PATCH 055/595] Mi Band 8: Handle user info ack

---
 .../service/devices/xiaomi/services/XiaomiHealthService.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
index 9df4d72a6..6735cffe6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
@@ -81,6 +81,9 @@ public class XiaomiHealthService extends AbstractXiaomiService {
     @Override
     public void handleCommand(final XiaomiProto.Command cmd) {
         switch (cmd.getSubtype()) {
+            case CMD_SET_USER_INFO:
+                LOG.debug("Got user info set ack, status={}", cmd.getStatus());
+                return;
             case CMD_CONFIG_SPO2_GET:
                 handleSpo2Config(cmd.getHealth().getSpo2());
                 return;

From d9c3a8de9065718a85b3d33f616ccbbd983ba179 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 6 Oct 2023 23:34:34 +0100
Subject: [PATCH 056/595] Mi Band 8: Fix music

---
 .../devices/xiaomi/services/XiaomiMusicService.java       | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiMusicService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiMusicService.java
index cdb03c89f..ab91d047f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiMusicService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiMusicService.java
@@ -35,7 +35,7 @@ public class XiaomiMusicService extends AbstractXiaomiService {
 
     private static final int CMD_MUSIC_GET = 0;
     private static final int CMD_MUSIC_SEND = 1;
-    private static final int CMD_MUSIC_BUTTON = 1;
+    private static final int CMD_MUSIC_BUTTON = 2;
 
     private static final byte BUTTON_PLAY = 0x00;
     private static final byte BUTTON_PAUSE = 0x01;
@@ -48,7 +48,6 @@ public class XiaomiMusicService extends AbstractXiaomiService {
     private static final byte STATE_PAUSED = 0x02;
 
     protected MediaManager mediaManager = null;
-    protected boolean isMusicAppStarted = false;
 
     public XiaomiMusicService(final XiaomiSupport support) {
         super(support);
@@ -97,7 +96,6 @@ public class XiaomiMusicService extends AbstractXiaomiService {
                         LOG.warn("Unexpected media button key {}", music.getMediaKey().getKey());
                         return;
                 }
-                // FIXME sometimes this is not triggering a device update?
                 getSupport().evaluateGBDeviceEvent(deviceEventMusicControl);
                 return;
         }
@@ -106,7 +104,7 @@ public class XiaomiMusicService extends AbstractXiaomiService {
     }
 
     public void onSetMusicState(final MusicStateSpec stateSpec) {
-        if (mediaManager.onSetMusicState(stateSpec) && isMusicAppStarted) {
+        if (mediaManager.onSetMusicState(stateSpec)) {
             sendMusicStateToDevice();
         }
     }
@@ -116,7 +114,7 @@ public class XiaomiMusicService extends AbstractXiaomiService {
     }
 
     public void onSetMusicInfo(final MusicSpec musicSpec) {
-        if (mediaManager.onSetMusicInfo(musicSpec) && isMusicAppStarted) {
+        if (mediaManager.onSetMusicInfo(musicSpec)) {
             sendMusicStateToDevice();
         }
     }

From 29fe3bc6ae6056feafe631ea5de3ef58ba025552 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 6 Oct 2023 23:48:53 +0100
Subject: [PATCH 057/595] Mi Band 8: Sleep mode schedule

---
 .../devices/xiaomi/XiaomiCoordinator.java     |  1 +
 .../services/XiaomiScheduleService.java       | 66 +++++++++++++++++++
 2 files changed, 67 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
index ab59df635..6c0f1ab49 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
@@ -312,6 +312,7 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
         settings.add(R.xml.devicesettings_header_health);
         settings.add(R.xml.devicesettings_heartrate_sleep_alert_activity_stress_spo2);
         settings.add(R.xml.devicesettings_inactivity_dnd_no_threshold);
+        settings.add(R.xml.devicesettings_sleep_time); // TODO replace with sleep mode schedule
         settings.add(R.xml.devicesettings_goal_notification);
 
         //
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java
index ba1f99a4e..7f353b64f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java
@@ -24,11 +24,14 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
 import nodomain.freeyourgadget.gadgetbridge.database.DBHelper;
+import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdatePreferences;
 import nodomain.freeyourgadget.gadgetbridge.model.Alarm;
 import nodomain.freeyourgadget.gadgetbridge.model.CalendarEventSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.DeviceService;
@@ -36,7 +39,9 @@ import nodomain.freeyourgadget.gadgetbridge.model.Reminder;
 import nodomain.freeyourgadget.gadgetbridge.model.WorldClock;
 import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiPreferences;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
+import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 
 public class XiaomiScheduleService extends AbstractXiaomiService {
     private static final Logger LOG = LoggerFactory.getLogger(XiaomiScheduleService.class);
@@ -47,6 +52,8 @@ public class XiaomiScheduleService extends AbstractXiaomiService {
     private static final int CMD_ALARMS_CREATE = 1;
     private static final int CMD_ALARMS_EDIT = 3;
     private static final int CMD_ALARMS_DELETE = 4;
+    private static final int CMD_SLEEP_MODE_GET = 8;
+    private static final int CMD_SLEEP_MODE_SET = 9;
     private static final int CMD_WORLD_CLOCKS_GET = 10;
     private static final int CMD_WORLD_CLOCKS_SET = 11;
 
@@ -81,6 +88,9 @@ public class XiaomiScheduleService extends AbstractXiaomiService {
             case CMD_WORLD_CLOCKS_GET:
                 handleWorldClocks(cmd.getSchedule().getWorldClocks());
                 break;
+            case CMD_SLEEP_MODE_GET:
+                handleSleepModeConfig(cmd.getSchedule().getSleepMode());
+                break;
         }
     }
 
@@ -88,6 +98,22 @@ public class XiaomiScheduleService extends AbstractXiaomiService {
     public void initialize(final TransactionBuilder builder) {
         requestAlarms(builder);
         requestWorldClocks(builder);
+        getSupport().sendCommand(builder, COMMAND_TYPE, CMD_SLEEP_MODE_GET);
+    }
+
+    @Override
+    public boolean onSendConfiguration(final String config, final Prefs prefs) {
+        final TransactionBuilder builder = getSupport().createTransactionBuilder("set " + config);
+
+        switch (config) {
+            case DeviceSettingsPreferenceConst.PREF_SLEEP_TIME:
+            case DeviceSettingsPreferenceConst.PREF_SLEEP_TIME_START:
+            case DeviceSettingsPreferenceConst.PREF_SLEEP_TIME_END:
+                setSleepModeConfig(builder);
+                return true;
+        }
+
+        return false;
     }
 
     public void onSetReminders(final ArrayList<? extends Reminder> reminders) {
@@ -281,6 +307,46 @@ public class XiaomiScheduleService extends AbstractXiaomiService {
         }
     }
 
+    private void handleSleepModeConfig(final XiaomiProto.SleepMode sleepMode) {
+        LOG.debug("Got sleep mode config");
+
+        final String start = XiaomiPreferences.prefFromHourMin(sleepMode.getSchedule().getStart());
+        final String end = XiaomiPreferences.prefFromHourMin(sleepMode.getSchedule().getEnd());
+
+        final GBDeviceEventUpdatePreferences eventUpdatePreferences = new GBDeviceEventUpdatePreferences()
+                .withPreference(DeviceSettingsPreferenceConst.PREF_SLEEP_TIME, sleepMode.getEnabled())
+                .withPreference(DeviceSettingsPreferenceConst.PREF_SLEEP_TIME_START, start)
+                .withPreference(DeviceSettingsPreferenceConst.PREF_SLEEP_TIME_END, end);
+
+        getSupport().evaluateGBDeviceEvent(eventUpdatePreferences);
+    }
+
+    private void setSleepModeConfig(final TransactionBuilder builder) {
+        LOG.debug("Set sleep mode config");
+
+        final Prefs prefs = getDevicePrefs();
+        final boolean enabled = prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_SLEEP_TIME, false);
+        final Date start = prefs.getTimePreference(DeviceSettingsPreferenceConst.PREF_SLEEP_TIME_START, "22:00");
+        final Date end = prefs.getTimePreference(DeviceSettingsPreferenceConst.PREF_SLEEP_TIME_END, "06:00");
+
+        final XiaomiProto.SleepMode sleepMode = XiaomiProto.SleepMode.newBuilder()
+                .setEnabled(enabled)
+                .setSchedule(XiaomiProto.SleepModeSchedule.newBuilder()
+                        .setUnknown3(0)
+                        .setStart(XiaomiPreferences.prefToHourMin(start))
+                        .setEnd(XiaomiPreferences.prefToHourMin(end)))
+                .build();
+
+        getSupport().sendCommand(
+                builder,
+                XiaomiProto.Command.newBuilder()
+                        .setType(COMMAND_TYPE)
+                        .setSubtype(CMD_SLEEP_MODE_SET)
+                        .setSchedule(XiaomiProto.Schedule.newBuilder().setSleepMode(sleepMode))
+                        .build()
+        );
+    }
+
     public void onAddCalendarEvent(final CalendarEventSpec calendarEventSpec) {
         // TODO
     }

From 18fc29fae7185e80d5203343ca492bcda7c598a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 6 Oct 2023 23:57:14 +0100
Subject: [PATCH 058/595] Mi Band 8: Save number of pending alarm acks (wip)

---
 .../xiaomi/services/XiaomiScheduleService.java        | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java
index 7f353b64f..a10e757ff 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java
@@ -75,6 +75,8 @@ public class XiaomiScheduleService extends AbstractXiaomiService {
     // Map of alarm position to Alarm, as returned by the band
     private final Map<Integer, Alarm> watchAlarms = new HashMap<>();
 
+    private int pendingAlarmAcks = 0;
+
     public XiaomiScheduleService(final XiaomiSupport support) {
         super(support);
     }
@@ -85,6 +87,14 @@ public class XiaomiScheduleService extends AbstractXiaomiService {
             case CMD_ALARMS_GET:
                 handleAlarms(cmd.getSchedule().getAlarms());
                 break;
+            case CMD_ALARMS_CREATE:
+                pendingAlarmAcks--;
+                if (pendingAlarmAcks <= 0) {
+                    final TransactionBuilder builder = getSupport().createTransactionBuilder("request alarms after all acks");
+                    requestAlarms(builder);
+                    builder.queue(getSupport().getQueue());
+                }
+                break;
             case CMD_WORLD_CLOCKS_GET:
                 handleWorldClocks(cmd.getSchedule().getWorldClocks());
                 break;
@@ -208,6 +218,7 @@ public class XiaomiScheduleService extends AbstractXiaomiService {
                                 .build()
                 );
             } else {
+                pendingAlarmAcks++;
                 schedule.setCreateAlarm(alarmDetails);
             }
 

From fcf680f79993d621051c830293155c6e6018286e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sun, 8 Oct 2023 13:46:26 +0100
Subject: [PATCH 059/595] Mi Band 8: Add find watch

---
 .../service/devices/xiaomi/XiaomiSupport.java      |  3 +--
 .../xiaomi/services/XiaomiSystemService.java       | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
index a61aed003..a71dff193 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
@@ -303,8 +303,7 @@ public class XiaomiSupport extends AbstractBTLEDeviceSupport {
 
     @Override
     public void onFindDevice(final boolean start) {
-        // TODO onFindDevice
-        super.onFindDevice(start);
+        systemService.onFindWatch(start);
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
index b33e35f9f..a42d00732 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
@@ -55,6 +55,7 @@ public class XiaomiSystemService extends AbstractXiaomiService {
     public static final int CMD_CLOCK = 3;
     public static final int CMD_PASSWORD_GET = 9;
     public static final int CMD_FIND_PHONE = 17;
+    public static final int CMD_FIND_WATCH = 18;
     public static final int CMD_PASSWORD_SET = 21;
     public static final int CMD_DISPLAY_ITEMS_GET = 29;
     public static final int CMD_CHARGER = 79;
@@ -301,4 +302,17 @@ public class XiaomiSystemService extends AbstractXiaomiService {
             );
         }
     }
+
+    public void onFindWatch(final boolean start) {
+        LOG.debug("Find watch: {}", start);
+
+        getSupport().sendCommand(
+                "find watch " + start,
+                XiaomiProto.Command.newBuilder()
+                        .setType(COMMAND_TYPE)
+                        .setSubtype(CMD_FIND_WATCH)
+                        .setSystem(XiaomiProto.System.newBuilder().setFindDevice(start ? 0 : 1).build())
+                        .build()
+        );
+    }
 }

From 76c2a18af51c2efb9c9868ad5cd0f3d83cc956c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sun, 8 Oct 2023 13:49:16 +0100
Subject: [PATCH 060/595] Mi Band 8: Add realtime stats failsafe

---
 .../devices/xiaomi/services/XiaomiHealthService.java        | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
index 6735cffe6..70f2cd1fd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
@@ -425,6 +425,12 @@ public class XiaomiHealthService extends AbstractXiaomiService {
     private void handleRealtimeStats(final XiaomiProto.RealTimeStats realTimeStats) {
         LOG.debug("Got realtime stats");
 
+        if (!realtimeOneShot && !realtimeStarted) {
+            // Failsafe in case it gets out of sync, stop it
+            enableRealtimeStats(false);
+            return;
+        }
+
         if (realtimeOneShot) {
             if (realTimeStats.getHeartRate() <= 10) {
                 return;

From 809a80908227b134be751252065c6abea9f8ee2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sun, 8 Oct 2023 14:08:43 +0100
Subject: [PATCH 061/595] Mi Band 8: Replace sleep time with sleep mode
 schedule (fix crash)

---
 .../DeviceSettingsPreferenceConst.java        |  3 +++
 .../DeviceSpecificSettingsFragment.java       |  4 +++
 .../devices/xiaomi/XiaomiCoordinator.java     |  2 +-
 .../services/XiaomiScheduleService.java       | 13 +++++-----
 app/src/main/res/values/strings.xml           |  4 +++
 .../devicesettings_sleep_mode_schedule.xml    | 26 +++++++++++++++++++
 6 files changed, 45 insertions(+), 7 deletions(-)
 create mode 100644 app/src/main/res/xml/devicesettings_sleep_mode_schedule.xml

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
index a13986ae8..cfe235889 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
@@ -141,6 +141,9 @@ public class DeviceSettingsPreferenceConst {
     public static final String PREF_SLEEP_TIME = "prefs_enable_sleep_time";
     public static final String PREF_SLEEP_TIME_START = "prefs_sleep_time_start";
     public static final String PREF_SLEEP_TIME_END = "prefs_sleep_time_end";
+    public static final String PREF_SLEEP_MODE_SCHEDULE_ENABLED = "sleep_mode_schedule_enabled";
+    public static final String PREF_SLEEP_MODE_SCHEDULE_START = "sleep_mode_schedule_start";
+    public static final String PREF_SLEEP_MODE_SCHEDULE_END = "sleep_mode_schedule_end";
     public static final String PREF_SLEEP_MODE_SLEEP_SCREEN = "pref_sleep_mode_sleep_screen";
     public static final String PREF_SLEEP_MODE_SMART_ENABLE = "pref_sleep_mode_smart_enable";
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
index f986a930a..243c67a78 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
@@ -551,6 +551,10 @@ public class DeviceSpecificSettingsFragment extends AbstractPreferenceFragment i
 
         addPreferenceHandlerFor(PREF_PREFIX_NOTIFICATION_WITH_APP);
 
+        addPreferenceHandlerFor(PREF_SLEEP_MODE_SCHEDULE_ENABLED);
+        addPreferenceHandlerFor(PREF_SLEEP_MODE_SCHEDULE_START);
+        addPreferenceHandlerFor(PREF_SLEEP_MODE_SCHEDULE_END);
+
         addPreferenceHandlerFor("lock");
 
         String sleepTimeState = prefs.getString(PREF_SLEEP_TIME, PREF_DO_NOT_DISTURB_OFF);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
index 6c0f1ab49..03907ab6e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
@@ -312,7 +312,7 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
         settings.add(R.xml.devicesettings_header_health);
         settings.add(R.xml.devicesettings_heartrate_sleep_alert_activity_stress_spo2);
         settings.add(R.xml.devicesettings_inactivity_dnd_no_threshold);
-        settings.add(R.xml.devicesettings_sleep_time); // TODO replace with sleep mode schedule
+        settings.add(R.xml.devicesettings_sleep_mode_schedule);
         settings.add(R.xml.devicesettings_goal_notification);
 
         //
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java
index a10e757ff..cf2b7d8af 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java
@@ -325,9 +325,10 @@ public class XiaomiScheduleService extends AbstractXiaomiService {
         final String end = XiaomiPreferences.prefFromHourMin(sleepMode.getSchedule().getEnd());
 
         final GBDeviceEventUpdatePreferences eventUpdatePreferences = new GBDeviceEventUpdatePreferences()
-                .withPreference(DeviceSettingsPreferenceConst.PREF_SLEEP_TIME, sleepMode.getEnabled())
-                .withPreference(DeviceSettingsPreferenceConst.PREF_SLEEP_TIME_START, start)
-                .withPreference(DeviceSettingsPreferenceConst.PREF_SLEEP_TIME_END, end);
+                .withPreference("prefs_enable_sleep_time", null)
+                .withPreference(DeviceSettingsPreferenceConst.PREF_SLEEP_MODE_SCHEDULE_ENABLED, sleepMode.getEnabled())
+                .withPreference(DeviceSettingsPreferenceConst.PREF_SLEEP_MODE_SCHEDULE_START, start)
+                .withPreference(DeviceSettingsPreferenceConst.PREF_SLEEP_MODE_SCHEDULE_END, end);
 
         getSupport().evaluateGBDeviceEvent(eventUpdatePreferences);
     }
@@ -336,9 +337,9 @@ public class XiaomiScheduleService extends AbstractXiaomiService {
         LOG.debug("Set sleep mode config");
 
         final Prefs prefs = getDevicePrefs();
-        final boolean enabled = prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_SLEEP_TIME, false);
-        final Date start = prefs.getTimePreference(DeviceSettingsPreferenceConst.PREF_SLEEP_TIME_START, "22:00");
-        final Date end = prefs.getTimePreference(DeviceSettingsPreferenceConst.PREF_SLEEP_TIME_END, "06:00");
+        final boolean enabled = prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_SLEEP_MODE_SCHEDULE_ENABLED, false);
+        final Date start = prefs.getTimePreference(DeviceSettingsPreferenceConst.PREF_SLEEP_MODE_SCHEDULE_START, "22:00");
+        final Date end = prefs.getTimePreference(DeviceSettingsPreferenceConst.PREF_SLEEP_MODE_SCHEDULE_END, "06:00");
 
         final XiaomiProto.SleepMode sleepMode = XiaomiProto.SleepMode.newBuilder()
                 .setEnabled(enabled)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e79b237aa..c27511017 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2411,4 +2411,8 @@
     <string name="menuitem_running">Running</string>
     <string name="menuitem_alerts">Alerts</string>
     <string name="menuitem_focus">Focus</string>
+    <string name="bedtime">Bedtime</string>
+    <string name="wake_up_time">Wake Up</string>
+    <string name="pref_sleep_mode_schedule_title">Sleep Mode Schedule</string>
+    <string name="pref_sleep_mode_schedule_summary">Send a reminder and enter sleep mode at bedtime. At the scheduled wake-up time, the wake-up alarm will sound.</string>
 </resources>
diff --git a/app/src/main/res/xml/devicesettings_sleep_mode_schedule.xml b/app/src/main/res/xml/devicesettings_sleep_mode_schedule.xml
new file mode 100644
index 000000000..a746b4afb
--- /dev/null
+++ b/app/src/main/res/xml/devicesettings_sleep_mode_schedule.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <PreferenceScreen
+        android:icon="@drawable/ic_activity_sleep"
+        android:key="prefs_sleep_mode_schedule"
+        android:persistent="false"
+        android:title="@string/pref_sleep_mode_title">
+
+        <SwitchPreference
+            android:defaultValue="false"
+            android:icon="@drawable/ic_activity_sleep"
+            android:key="sleep_mode_schedule_enabled"
+            android:summary="@string/pref_sleep_mode_schedule_summary"
+            android:title="@string/pref_sleep_mode_schedule_title" />
+
+        <nodomain.freeyourgadget.gadgetbridge.util.XTimePreference
+            android:defaultValue="22:00"
+            android:key="sleep_mode_schedule_start"
+            android:title="@string/bedtime" />
+
+        <nodomain.freeyourgadget.gadgetbridge.util.XTimePreference
+            android:defaultValue="06:00"
+            android:key="sleep_mode_schedule_end"
+            android:title="@string/wake_up_time" />
+    </PreferenceScreen>
+</androidx.preference.PreferenceScreen>

From 905dfc3323142b51b46802e2d325f25389c6ef6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sun, 8 Oct 2023 15:19:46 +0100
Subject: [PATCH 062/595] Mi Band 8 proto: Start mapping DataUpload

---
 app/src/main/proto/xiaomi.proto | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/app/src/main/proto/xiaomi.proto b/app/src/main/proto/xiaomi.proto
index 188bdcffc..c7aadf728 100644
--- a/app/src/main/proto/xiaomi.proto
+++ b/app/src/main/proto/xiaomi.proto
@@ -17,6 +17,9 @@ message Command {
   optional Weather weather = 12;
   optional Schedule schedule = 19;
 
+  // type 22
+  optional DataUpload dataUpload = 24;
+
   optional uint32 status = 100; // 0 on success on some
 }
 
@@ -632,3 +635,25 @@ message HourMinute {
   required uint32 hour = 1;
   required uint32 minute = 2;
 }
+
+//
+// Data Upload (watchface, notification icons, firmware)
+//
+
+message DataUpload {
+  // 22, 0
+  optional DataUploadRequest dataUploadRequest = 1;
+  optional DataUploadAck dataUploadAck = 2;
+}
+
+message DataUploadRequest {
+  optional uint32 unknown1 = 1; // 16 for watchface, 50 for notification icons, 32 for firmware?
+  optional bytes md5sum = 2;
+  optional uint32 size = 3;
+}
+
+message DataUploadAck {
+  optional bytes md5sum = 1;
+  optional uint32 unknown2 = 2; // 0
+  optional uint32 unknown4 = 4; // 0
+}

From a9b481d72df77f1a8f69f8b3b6b3d68358e263d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sun, 8 Oct 2023 17:24:47 +0100
Subject: [PATCH 063/595] Mi Band 8: Sync calendar events

---
 .../service/devices/xiaomi/XiaomiSupport.java |  11 +-
 .../services/XiaomiCalendarService.java       | 149 ++++++++++++++++++
 .../services/XiaomiScheduleService.java       |   8 -
 app/src/main/proto/xiaomi.proto               |  52 ++++--
 4 files changed, 196 insertions(+), 24 deletions(-)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiCalendarService.java

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
index a71dff193..849d15df1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
@@ -56,6 +56,7 @@ import nodomain.freeyourgadget.gadgetbridge.service.btle.GattService;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetDeviceStateAction;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.AbstractXiaomiService;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.XiaomiCalendarService;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.XiaomiHealthService;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.XiaomiMusicService;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.XiaomiNotificationService;
@@ -75,6 +76,7 @@ public class XiaomiSupport extends AbstractBTLEDeviceSupport {
     private final XiaomiScheduleService scheduleService = new XiaomiScheduleService(this);
     private final XiaomiWeatherService weatherService = new XiaomiWeatherService(this);
     private final XiaomiSystemService systemService = new XiaomiSystemService(this);
+    private final XiaomiCalendarService calendarService = new XiaomiCalendarService(this);
 
     private final Map<Integer, AbstractXiaomiService> mServiceMap = new LinkedHashMap<Integer, AbstractXiaomiService>() {{
         put(XiaomiAuthService.COMMAND_TYPE, authService);
@@ -84,6 +86,7 @@ public class XiaomiSupport extends AbstractBTLEDeviceSupport {
         put(XiaomiScheduleService.COMMAND_TYPE, scheduleService);
         put(XiaomiWeatherService.COMMAND_TYPE, weatherService);
         put(XiaomiSystemService.COMMAND_TYPE, systemService);
+        put(XiaomiCalendarService.COMMAND_TYPE, calendarService);
     }};
 
     public XiaomiSupport() {
@@ -286,6 +289,10 @@ public class XiaomiSupport extends AbstractBTLEDeviceSupport {
             return;
         }
         systemService.setCurrentTime(builder);
+
+        // TODO this should not be done here
+        calendarService.syncCalendar(builder);
+
         builder.queue(getQueue());
     }
 
@@ -451,12 +458,12 @@ public class XiaomiSupport extends AbstractBTLEDeviceSupport {
 
     @Override
     public void onAddCalendarEvent(final CalendarEventSpec calendarEventSpec) {
-        scheduleService.onAddCalendarEvent(calendarEventSpec);
+        calendarService.onAddCalendarEvent(calendarEventSpec);
     }
 
     @Override
     public void onDeleteCalendarEvent(final byte type, long id) {
-        scheduleService.onDeleteCalendarEvent(type, id);
+        calendarService.onDeleteCalendarEvent(type, id);
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiCalendarService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiCalendarService.java
new file mode 100644
index 000000000..aec0c79d5
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiCalendarService.java
@@ -0,0 +1,149 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services;
+
+import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_SYNC_CALENDAR;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
+import nodomain.freeyourgadget.gadgetbridge.model.CalendarEventSpec;
+import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
+import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
+import nodomain.freeyourgadget.gadgetbridge.util.StringUtils;
+import nodomain.freeyourgadget.gadgetbridge.util.calendar.CalendarEvent;
+import nodomain.freeyourgadget.gadgetbridge.util.calendar.CalendarManager;
+
+public class XiaomiCalendarService extends AbstractXiaomiService {
+    private static final Logger LOG = LoggerFactory.getLogger(XiaomiCalendarService.class);
+
+    public static final int COMMAND_TYPE = 12;
+
+    private static final int CMD_CALENDAR_SET = 1;
+
+    private static final int MAX_EVENTS = 50; // TODO confirm actual limit
+
+    private final Set<CalendarEvent> lastSync = new HashSet<>();
+
+    public XiaomiCalendarService(final XiaomiSupport support) {
+        super(support);
+    }
+
+    @Override
+    public void handleCommand(final XiaomiProto.Command cmd) {
+        LOG.warn("Unknown calendar command {}", cmd.getSubtype());
+    }
+
+    @Override
+    public void initialize(final TransactionBuilder builder) {
+        syncCalendar(builder);
+    }
+
+    @Override
+    public boolean onSendConfiguration(final String config, final Prefs prefs) {
+        switch (config) {
+            case DeviceSettingsPreferenceConst.PREF_SYNC_CALENDAR:
+                syncCalendar();
+                return true;
+        }
+
+        return false;
+    }
+
+    public void onAddCalendarEvent(final CalendarEventSpec ignoredCalendarEventSpec) {
+        // we must sync everything
+        syncCalendar();
+    }
+
+    public void onDeleteCalendarEvent(final byte ignoredType, final long ignoredId) {
+        // we must sync everything
+        syncCalendar();
+    }
+
+    public void syncCalendar() {
+        final TransactionBuilder builder = getSupport().createTransactionBuilder("sync calendar");
+        syncCalendar(builder);
+        builder.queue(getSupport().getQueue());
+    }
+
+    public void syncCalendar(final TransactionBuilder builder) {
+        final boolean syncEnabled = GBApplication.getDeviceSpecificSharedPrefs(getSupport().getDevice().getAddress())
+                .getBoolean(PREF_SYNC_CALENDAR, false);
+
+        final XiaomiProto.CalendarSync.Builder calendarSync = XiaomiProto.CalendarSync.newBuilder();
+
+        if (!syncEnabled) {
+            LOG.debug("Calendar sync is disabled");
+            lastSync.clear();
+            calendarSync.setDisabled(true);
+        } else {
+            final CalendarManager upcomingEvents = new CalendarManager(getSupport().getContext(), getSupport().getDevice().getAddress());
+            final List<CalendarEvent> calendarEvents = upcomingEvents.getCalendarEventList();
+
+            final Set<CalendarEvent> thisSync = new HashSet<>();
+            int nEvents = 0;
+
+            for (final CalendarEvent calendarEvent : calendarEvents) {
+                if (nEvents++ > MAX_EVENTS) {
+                    LOG.warn("Syncing only first {} events of {}", MAX_EVENTS, calendarEvents.size());
+                    break;
+                }
+
+                thisSync.add(calendarEvent);
+
+                final XiaomiProto.CalendarEvent xiaomiCalendarEvent = XiaomiProto.CalendarEvent.newBuilder()
+                        .setTitle(calendarEvent.getTitle())
+                        .setDescription(StringUtils.ensureNotNull(calendarEvent.getDescription()))
+                        .setLocation(StringUtils.ensureNotNull(calendarEvent.getLocation()))
+                        .setStart(calendarEvent.getBeginSeconds())
+                        .setEnd((int) (calendarEvent.getEnd() / 1000))
+                        .setAllDay(calendarEvent.isAllDay())
+                        .setNotifyMinutesBefore(0) // TODO fetch from event
+                        .build();
+
+                calendarSync.addEvent(xiaomiCalendarEvent);
+            }
+
+            if (thisSync.equals(lastSync)) {
+                LOG.debug("Already synced this set of events, won't send to device");
+                return;
+            }
+
+            lastSync.clear();
+            lastSync.addAll(thisSync);
+        }
+
+        LOG.debug("Syncing {} calendar events", lastSync.size());
+
+        getSupport().sendCommand(
+                builder,
+                XiaomiProto.Command.newBuilder()
+                        .setType(COMMAND_TYPE)
+                        .setSubtype(CMD_CALENDAR_SET)
+                        .setCalendar(XiaomiProto.Calendar.newBuilder().setCalendarSync(calendarSync))
+                        .build()
+        );
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java
index cf2b7d8af..98746f814 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java
@@ -358,12 +358,4 @@ public class XiaomiScheduleService extends AbstractXiaomiService {
                         .build()
         );
     }
-
-    public void onAddCalendarEvent(final CalendarEventSpec calendarEventSpec) {
-        // TODO
-    }
-
-    public void onDeleteCalendarEvent(final byte type, long id) {
-        // TODO
-    }
 }
diff --git a/app/src/main/proto/xiaomi.proto b/app/src/main/proto/xiaomi.proto
index c7aadf728..16ae1d06d 100644
--- a/app/src/main/proto/xiaomi.proto
+++ b/app/src/main/proto/xiaomi.proto
@@ -12,6 +12,7 @@ message Command {
   optional Auth auth = 3;
   optional System system = 4;
   optional Health health = 10;
+  optional Calendar calendar = 14;
   optional Music music = 20;
   optional Notification notification = 9;
   optional Weather weather = 12;
@@ -145,7 +146,7 @@ message Clock {
   required Date date = 1;
   required Time time = 2;
   required TimeZone timezone = 3;
-  required bool isNot24hour = 4;
+  optional bool isNot24hour = 4;
 }
 
 message Date {
@@ -418,6 +419,29 @@ message RealTimeStats {
   optional uint32 standingHours = 6;
 }
 
+//
+// Calendar
+//
+
+message Calendar {
+  optional CalendarSync calendarSync = 2;
+}
+
+message CalendarSync {
+  repeated CalendarEvent event = 1;
+  optional bool disabled = 2;
+}
+
+message CalendarEvent {
+  optional string title = 1;
+  optional string description = 2;
+  optional string location = 3;
+  optional uint32 start = 4; // unix epoch sec
+  optional uint32 end = 5; // unix epoch sec
+  optional bool allDay = 6;
+  optional uint32 notifyMinutesBefore = 7;
+}
+
 //
 // Music
 //
@@ -544,7 +568,7 @@ message Schedule {
   // 17, 3 -> returns 17, 5
   optional Alarm editAlarm = 3;
 
-  optional uint32 ackId = 4; // id of created or edited alarm and event
+  optional uint32 ackId = 4; // id of created or edited alarm and reminder
 
   // 17, 4
   optional AlarmDelete deleteAlarm = 5;
@@ -552,8 +576,8 @@ message Schedule {
   // 17, 8 get | 17, 9 set
   optional SleepMode sleepMode = 9;
 
-  // 17, 14 get: 10 -> 2: 50 // max events?
-  optional Events events = 10;
+  // 17, 14 get: 10 -> 2: 50 // max reminders?
+  optional Reminders reminders = 10;
 
   // 17,10 get/ret | 17,11 create | 17,13 delete
   optional WorldClocks worldClocks = 11;
@@ -561,13 +585,13 @@ message Schedule {
   optional uint32 worldClockStatus = 13; // 0 on edit and create
 
   // 17, 15
-  optional EventDetails createEvent = 14;
+  optional ReminderDetails createReminder = 14;
 
   // 17, 17
-  optional Event editEvent = 15;
+  optional Reminder editReminder = 15;
 
   // 17, 18
-  optional EventDelete deleteEvent = 17;
+  optional ReminderDelete deleteReminder = 17;
 }
 
 message Alarms {
@@ -605,17 +629,17 @@ message SleepModeSchedule {
   optional uint32 unknown3 = 3; // 0
 }
 
-message Events {
-  repeated Event event = 1;
-  optional uint32 unknown2 = 2; // 50, max events?
+message Reminders {
+  repeated Reminder reminder = 1;
+  optional uint32 unknown2 = 2; // 50, max reminder?
 }
 
-message Event {
+message Reminder {
   optional uint32 id = 1;
-  optional EventDetails eventDetails = 2;
+  optional ReminderDetails reminderDetails = 2;
 }
 
-message EventDetails {
+message ReminderDetails {
   optional Date date = 1;
   optional Time time = 2;
   optional uint32 repeatMode = 3; // 0 once, 1 daily, weekly (every monday), 7 monthly, 8 yearly
@@ -623,7 +647,7 @@ message EventDetails {
   optional string title = 5;
 }
 
-message EventDelete {
+message ReminderDelete {
   repeated uint32 id = 1;
 }
 

From f56a4b9f0ca005612872b576c7836c100c68b18a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sun, 8 Oct 2023 17:28:13 +0100
Subject: [PATCH 064/595] Mi Band 8: Add MTU warn on sendCommand

---
 .../gadgetbridge/service/devices/xiaomi/XiaomiSupport.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
index 849d15df1..570b76ee8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
@@ -513,7 +513,12 @@ public class XiaomiSupport extends AbstractBTLEDeviceSupport {
     public void sendCommand(final TransactionBuilder builder, final XiaomiProto.Command command) {
         final byte[] commandBytes = command.toByteArray();
         final byte[] encryptedCommandBytes = authService.encrypt(commandBytes, encryptedIndex);
-        final ByteBuffer buf = ByteBuffer.allocate(6 + encryptedCommandBytes.length).order(ByteOrder.LITTLE_ENDIAN);
+        final int commandLength = 6 + encryptedCommandBytes.length;
+        if (commandLength > getMTU()) {
+            LOG.warn("Command with {} bytes is too large for MTU of {}", commandLength, getMTU());
+        }
+
+        final ByteBuffer buf = ByteBuffer.allocate(commandLength).order(ByteOrder.LITTLE_ENDIAN);
         buf.putShort((short) 0);
         buf.put((byte) 2); // 2 for command
         buf.put((byte) 1); // 1 for encrypted

From cca34af13bec5e1d5f6de90d93898babbda972f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sun, 8 Oct 2023 18:13:31 +0100
Subject: [PATCH 065/595] Mi Band 8: Fix alarms flakyness

---
 .../services/XiaomiScheduleService.java       | 48 +++++++++++++------
 1 file changed, 34 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java
index 98746f814..086a70e25 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java
@@ -33,7 +33,6 @@ import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSett
 import nodomain.freeyourgadget.gadgetbridge.database.DBHelper;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdatePreferences;
 import nodomain.freeyourgadget.gadgetbridge.model.Alarm;
-import nodomain.freeyourgadget.gadgetbridge.model.CalendarEventSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.DeviceService;
 import nodomain.freeyourgadget.gadgetbridge.model.Reminder;
 import nodomain.freeyourgadget.gadgetbridge.model.WorldClock;
@@ -50,7 +49,7 @@ public class XiaomiScheduleService extends AbstractXiaomiService {
 
     private static final int CMD_ALARMS_GET = 0;
     private static final int CMD_ALARMS_CREATE = 1;
-    private static final int CMD_ALARMS_EDIT = 3;
+    private static final int CMD_ALARMS_EDIT = 2;
     private static final int CMD_ALARMS_DELETE = 4;
     private static final int CMD_SLEEP_MODE_GET = 8;
     private static final int CMD_SLEEP_MODE_SET = 9;
@@ -72,7 +71,8 @@ public class XiaomiScheduleService extends AbstractXiaomiService {
         // TODO map everything
     }};
 
-    // Map of alarm position to Alarm, as returned by the band
+    // Map of alarm position to Alarm, as returned by the band, indexed by GB watch position (0-indexed),
+    // does NOT match watch ID
     private final Map<Integer, Alarm> watchAlarms = new HashMap<>();
 
     private int pendingAlarmAcks = 0;
@@ -168,19 +168,27 @@ public class XiaomiScheduleService extends AbstractXiaomiService {
     public void onSetAlarms(final ArrayList<? extends Alarm> alarms) {
         final List<Integer> alarmsToDelete = new ArrayList<>();
 
-        // TODO this is flaky, since it's the watch that defines the IDs...
+        pendingAlarmAcks = 0;
 
         for (final Alarm alarm : alarms) {
             final Alarm watchAlarm = watchAlarms.get(alarm.getPosition());
 
             if (alarm.getUnused() && watchAlarm == null) {
                 // Disabled on both
+                //LOG.debug("Alarm {} is unused on both", alarm.getPosition());
                 continue;
             }
 
             if (alarm.getUnused() && watchAlarm != null) {
                 // Delete from watch
-                alarmsToDelete.add(watchAlarm.getPosition() + 1);
+                alarmsToDelete.add(watchAlarm.getPosition() + 1); // watch positions, not GB
+                watchAlarms.remove(alarm.getPosition());
+                LOG.debug("Delete alarm {} from watch", alarm.getPosition());
+                continue;
+            }
+
+            if (watchAlarm != null && alarmsEqual(alarm, watchAlarm)) {
+                //LOG.debug("Alarm {} is already up-to-date on watch", alarm.getPosition());
                 continue;
             }
 
@@ -211,6 +219,8 @@ public class XiaomiScheduleService extends AbstractXiaomiService {
 
             if (watchAlarm != null) {
                 // update existing alarm
+                LOG.debug("Update alarm {}", alarm.getPosition());
+                watchAlarms.put(alarm.getPosition(), alarm);
                 schedule.setEditAlarm(
                         XiaomiProto.Alarm.newBuilder()
                                 .setId(alarm.getPosition() + 1)
@@ -218,6 +228,8 @@ public class XiaomiScheduleService extends AbstractXiaomiService {
                                 .build()
                 );
             } else {
+                LOG.debug("Create alarm {}", alarm.getPosition());
+                // watchAlarms will be updated later, since we don't know the correct ID here
                 pendingAlarmAcks++;
                 schedule.setCreateAlarm(alarmDetails);
             }
@@ -242,7 +254,7 @@ public class XiaomiScheduleService extends AbstractXiaomiService {
                     .build();
 
             getSupport().sendCommand(
-                    "delete unused alarms",
+                    "delete " + alarmsToDelete.size() + " unused alarms",
                     XiaomiProto.Command.newBuilder()
                             .setType(COMMAND_TYPE)
                             .setSubtype(CMD_ALARMS_DELETE)
@@ -257,7 +269,7 @@ public class XiaomiScheduleService extends AbstractXiaomiService {
     }
 
     public void handleAlarms(final XiaomiProto.Alarms alarms) {
-        LOG.debug("Got {} alarms", alarms.getAlarmCount());
+        LOG.debug("Got {} alarms from the watch", alarms.getAlarmCount());
 
         watchAlarms.clear();
         for (final XiaomiProto.Alarm alarm : alarms.getAlarmList()) {
@@ -289,14 +301,13 @@ public class XiaomiScheduleService extends AbstractXiaomiService {
         for (nodomain.freeyourgadget.gadgetbridge.entities.Alarm alarm : dbAlarms) {
             final int pos = alarm.getPosition();
             final Alarm updatedAlarm = watchAlarms.get(pos);
-            final boolean alarmNeedsUpdate = updatedAlarm == null ||
-                    alarm.getUnused() != updatedAlarm.getUnused() ||
-                    alarm.getEnabled() != updatedAlarm.getEnabled() ||
-                    alarm.getSmartWakeup() != updatedAlarm.getSmartWakeup() ||
-                    alarm.getHour() != updatedAlarm.getHour() ||
-                    alarm.getMinute() != updatedAlarm.getMinute() ||
-                    alarm.getRepetition() != updatedAlarm.getRepetition();
 
+            final boolean alarmNeedsUpdate;
+            if (updatedAlarm == null) {
+                alarmNeedsUpdate = !alarm.getUnused();
+            } else {
+                alarmNeedsUpdate = !alarmsEqual(alarm, updatedAlarm);
+            }
             if (alarmNeedsUpdate) {
                 numUpdatedAlarms++;
                 LOG.info("Updating alarm index={}, unused={}", pos, updatedAlarm == null);
@@ -318,6 +329,15 @@ public class XiaomiScheduleService extends AbstractXiaomiService {
         }
     }
 
+    private boolean alarmsEqual(final Alarm alarm1, final Alarm alarm2) {
+        return alarm1.getUnused() == alarm2.getUnused() &&
+                alarm1.getEnabled() == alarm2.getEnabled() &&
+                alarm1.getSmartWakeup() == alarm2.getSmartWakeup() &&
+                alarm1.getHour() == alarm2.getHour() &&
+                alarm1.getMinute() == alarm2.getMinute() &&
+                alarm1.getRepetition() == alarm2.getRepetition();
+    }
+
     private void handleSleepModeConfig(final XiaomiProto.SleepMode sleepMode) {
         LOG.debug("Got sleep mode config");
 

From 7124d337e11909d40b9dbad979954f0201880386 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sun, 8 Oct 2023 19:17:58 +0100
Subject: [PATCH 066/595] Mi Band 8: Implement reminders

---
 .../activities/ConfigureReminders.java        |  25 +-
 .../devices/xiaomi/XiaomiCoordinator.java     |   6 +-
 .../gadgetbridge/model/DeviceService.java     |   1 +
 .../devices/xiaomi/XiaomiPreferences.java     |  13 +
 .../services/XiaomiScheduleService.java       | 242 +++++++++++++++++-
 5 files changed, 280 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ConfigureReminders.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ConfigureReminders.java
index 56da54632..3630aeed6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ConfigureReminders.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ConfigureReminders.java
@@ -16,13 +16,17 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
+import android.content.BroadcastReceiver;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.os.Bundle;
 import android.view.MenuItem;
 import android.view.View;
 
 import androidx.annotation.NonNull;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -49,7 +53,7 @@ import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.entities.Reminder;
 import nodomain.freeyourgadget.gadgetbridge.entities.User;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.util.DeviceHelper;
+import nodomain.freeyourgadget.gadgetbridge.model.DeviceService;
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 
 
@@ -61,12 +65,25 @@ public class ConfigureReminders extends AbstractGBActivity {
     private GBReminderListAdapter mGBReminderListAdapter;
     private GBDevice gbDevice;
 
+    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(final Context context, final Intent intent) {
+            if (DeviceService.ACTION_SAVE_REMINDERS.equals(intent.getAction())) {
+                updateRemindersFromDB();
+            }
+        }
+    };
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         setContentView(R.layout.activity_configure_reminders);
 
+        IntentFilter filterLocal = new IntentFilter();
+        filterLocal.addAction(DeviceService.ACTION_SAVE_REMINDERS);
+        LocalBroadcastManager.getInstance(this).registerReceiver(mReceiver, filterLocal);
+
         gbDevice = getIntent().getParcelableExtra(GBDevice.EXTRA_DEVICE);
 
         mGBReminderListAdapter = new GBReminderListAdapter(this);
@@ -118,6 +135,12 @@ public class ConfigureReminders extends AbstractGBActivity {
         });
     }
 
+    @Override
+    protected void onDestroy() {
+        LocalBroadcastManager.getInstance(this).unregisterReceiver(mReceiver);
+        super.onDestroy();
+    }
+
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
index 03907ab6e..7849820df 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
@@ -213,13 +213,13 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
     @Override
     public int getMaximumReminderMessageLength() {
         // TODO does it?
-        return 0;
+        return 20;
     }
 
     @Override
     public int getReminderSlotCount(final GBDevice device) {
-        // TODO Does it?
-        return 0;
+        // TODO fetch from watch
+        return 50;
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceService.java
index 6198425e5..1ac8c8323 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceService.java
@@ -59,6 +59,7 @@ public interface DeviceService extends EventHandler {
     String ACTION_SET_CONSTANT_VIBRATION = PREFIX + ".action.set_constant_vibration";
     String ACTION_SET_ALARMS = PREFIX + ".action.set_alarms";
     String ACTION_SAVE_ALARMS = PREFIX + ".action.save_alarms";
+    String ACTION_SAVE_REMINDERS = PREFIX + ".action.save_reminders";
     String ACTION_SET_REMINDERS = PREFIX + ".action.set_reminders";
     String ACTION_SET_LOYALTY_CARDS = PREFIX + ".action.set_loyalty_cards";
     String ACTION_SET_WORLD_CLOCKS = PREFIX + ".action.set_world_clocks";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPreferences.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPreferences.java
index 2f7a3122a..e29017385 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPreferences.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPreferences.java
@@ -20,6 +20,7 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.Locale;
+import java.util.TimeZone;
 
 import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
 
@@ -42,6 +43,18 @@ public final class XiaomiPreferences {
                 .build();
     }
 
+    public static Date toDate(final XiaomiProto.Date date, final XiaomiProto.Time time) {
+        // For some reason, the watch expects those in UTC...
+        // TODO double-check with official app, this does not make sense
+        final Calendar calendar = GregorianCalendar.getInstance(TimeZone.getTimeZone("UTC"));
+        calendar.set(
+                date.getYear(), date.getMonth() - 1, date.getDay(),
+                time.getHour(), time.getMinute(), time.getSecond()
+        );
+
+        return calendar.getTime();
+    }
+
     /**
      * Returns the preference key where to save the list of possible value for a preference, comma-separated.
      */
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java
index 086a70e25..95402dd14 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java
@@ -24,14 +24,25 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Date;
+import java.util.GregorianCalendar;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.TimeZone;
 
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
+import nodomain.freeyourgadget.gadgetbridge.database.DBHandler;
 import nodomain.freeyourgadget.gadgetbridge.database.DBHelper;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdatePreferences;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.entities.Device;
+import nodomain.freeyourgadget.gadgetbridge.entities.User;
 import nodomain.freeyourgadget.gadgetbridge.model.Alarm;
 import nodomain.freeyourgadget.gadgetbridge.model.DeviceService;
 import nodomain.freeyourgadget.gadgetbridge.model.Reminder;
@@ -55,6 +66,10 @@ public class XiaomiScheduleService extends AbstractXiaomiService {
     private static final int CMD_SLEEP_MODE_SET = 9;
     private static final int CMD_WORLD_CLOCKS_GET = 10;
     private static final int CMD_WORLD_CLOCKS_SET = 11;
+    private static final int CMD_REMINDERS_GET = 14;
+    private static final int CMD_REMINDERS_CREATE = 15;
+    private static final int CMD_REMINDERS_EDIT = 17;
+    private static final int CMD_REMINDERS_DELETE = 18;
 
     private static final int REPETITION_ONCE = 0;
     private static final int REPETITION_DAILY = 1;
@@ -65,17 +80,22 @@ public class XiaomiScheduleService extends AbstractXiaomiService {
     private static final int ALARM_SMART = 1;
     private static final int ALARM_NORMAL = 2;
 
+    // Reminders created by this service will have this prefix
+    private static final String REMINDER_DB_PREFIX = "xiaomi_";
+
     private static final Map<String, String> WORLD_CLOCK_CODES = new HashMap<String, String>() {{
         put("Europe/Lisbon", "C173");
         put("Australia/Sydney", "C151");
         // TODO map everything
     }};
 
-    // Map of alarm position to Alarm, as returned by the band, indexed by GB watch position (0-indexed),
-    // does NOT match watch ID
+    // Map of alarm position to Alarm/Reminder, as returned by the watch, indexed by GB position (0-indexed),
+    // does NOT match the ID returned by the watch, but should be offset by 1
     private final Map<Integer, Alarm> watchAlarms = new HashMap<>();
+    private final Map<String, Reminder> watchReminders = new HashMap<>();
 
     private int pendingAlarmAcks = 0;
+    private int pendingReminderAcks = 0;
 
     public XiaomiScheduleService(final XiaomiSupport support) {
         super(support);
@@ -101,12 +121,26 @@ public class XiaomiScheduleService extends AbstractXiaomiService {
             case CMD_SLEEP_MODE_GET:
                 handleSleepModeConfig(cmd.getSchedule().getSleepMode());
                 break;
+            case CMD_REMINDERS_GET:
+                handleReminders(cmd.getSchedule().getReminders());
+                break;
+            case CMD_REMINDERS_CREATE:
+                pendingReminderAcks--;
+                if (pendingReminderAcks <= 0) {
+                    final TransactionBuilder builder = getSupport().createTransactionBuilder("request reminders after all acks");
+                    requestReminders(builder);
+                    builder.queue(getSupport().getQueue());
+                }
+                break;
         }
+
+        LOG.warn("Unknown schedule command {}", cmd.getSubtype());
     }
 
     @Override
     public void initialize(final TransactionBuilder builder) {
         requestAlarms(builder);
+        requestReminders(builder);
         requestWorldClocks(builder);
         getSupport().sendCommand(builder, COMMAND_TYPE, CMD_SLEEP_MODE_GET);
     }
@@ -126,8 +160,204 @@ public class XiaomiScheduleService extends AbstractXiaomiService {
         return false;
     }
 
+    public void requestReminders(final TransactionBuilder builder) {
+        getSupport().sendCommand(builder, COMMAND_TYPE, CMD_REMINDERS_GET);
+    }
+
+    public void handleReminders(final XiaomiProto.Reminders reminders) {
+        LOG.debug("Got {} reminders from the watch", reminders.getReminderCount());
+
+        watchReminders.clear();
+        for (final XiaomiProto.Reminder reminder : reminders.getReminderList()) {
+            final nodomain.freeyourgadget.gadgetbridge.entities.Reminder gbReminder = new nodomain.freeyourgadget.gadgetbridge.entities.Reminder();
+            gbReminder.setReminderId(REMINDER_DB_PREFIX + reminder.getId());
+            gbReminder.setMessage(reminder.getReminderDetails().getTitle());
+            gbReminder.setDate(XiaomiPreferences.toDate(reminder.getReminderDetails().getDate(), reminder.getReminderDetails().getTime()));
+
+            switch (reminder.getReminderDetails().getRepeatMode()) {
+                case REPETITION_ONCE:
+                    gbReminder.setRepetition(Alarm.ALARM_ONCE);
+                    break;
+                case REPETITION_DAILY:
+                    gbReminder.setRepetition(Alarm.ALARM_DAILY);
+                    break;
+                case REPETITION_WEEKLY:
+                    gbReminder.setRepetition(reminder.getReminderDetails().getRepeatFlags());
+                    break;
+            }
+
+            watchReminders.put(gbReminder.getReminderId(), gbReminder);
+        }
+
+        final List<nodomain.freeyourgadget.gadgetbridge.entities.Reminder> dbReminders = DBHelper.getReminders(getSupport().getDevice());
+
+        final Set<String> dbReminderIds = new HashSet<>();
+
+        int numUpdatedReminders = 0;
+
+        // Delete reminders that do not exist on the watch anymore
+        for (nodomain.freeyourgadget.gadgetbridge.entities.Reminder reminder : dbReminders) {
+            if (!reminder.getReminderId().startsWith(REMINDER_DB_PREFIX)) {
+                LOG.debug("Deleting reminder {}", reminder.getReminderId());
+                DBHelper.delete(reminder);
+                numUpdatedReminders++;
+                continue;
+            }
+
+            dbReminderIds.add(reminder.getReminderId());
+        }
+
+        // Persist unknown reminders
+        // We assume that reminders are not modifiable from the watch, unlike alarms
+        try (DBHandler db = GBApplication.acquireDB()) {
+            final DaoSession daoSession = db.getDaoSession();
+            final Device device = DBHelper.getDevice(getSupport().getDevice(), daoSession);
+            final User user = DBHelper.getUser(daoSession);
+
+            for (final Reminder watchReminder : watchReminders.values()) {
+                final String reminderId = watchReminder.getReminderId();
+                if (dbReminderIds.contains(reminderId)) {
+                    continue;
+                }
+
+                // Reminder not known - persist it to database
+                LOG.info("Persisting reminder {}", reminderId);
+
+                final nodomain.freeyourgadget.gadgetbridge.entities.Reminder reminder = new nodomain.freeyourgadget.gadgetbridge.entities.Reminder();
+                reminder.setReminderId(watchReminder.getReminderId());
+                reminder.setDate(watchReminder.getDate());
+                reminder.setMessage(watchReminder.getMessage());
+                reminder.setRepetition(watchReminder.getRepetition());
+                reminder.setDeviceId(device.getId());
+                reminder.setUserId(user.getId());
+
+                DBHelper.store(reminder);
+
+                numUpdatedReminders++;
+            }
+        } catch (final Exception e) {
+            LOG.error("Error accessing database", e);
+        }
+
+        if (numUpdatedReminders > 0) {
+            final Intent intent = new Intent(DeviceService.ACTION_SAVE_REMINDERS);
+            LocalBroadcastManager.getInstance(getSupport().getContext()).sendBroadcast(intent);
+        }
+    }
+
     public void onSetReminders(final ArrayList<? extends Reminder> reminders) {
-        // TODO
+        final List<Integer> remindersToDelete = new ArrayList<>();
+
+        pendingReminderAcks = 0;
+
+        final Set<String> newReminderIds = new HashSet<>();
+        for (final Reminder reminder : reminders) {
+            newReminderIds.add(reminder.getReminderId());
+        }
+
+        for (final Reminder watchReminder : watchReminders.values()) {
+            if (!newReminderIds.contains(watchReminder.getReminderId())) {
+                final Integer watchId = Integer.parseInt(watchReminder.getReminderId().replace(REMINDER_DB_PREFIX, ""));
+                remindersToDelete.add(watchId);
+            }
+        }
+
+        for (final Integer id : remindersToDelete) {
+            watchReminders.remove(REMINDER_DB_PREFIX + id);
+        }
+
+        for (final Reminder reminder : reminders) {
+            final boolean isCreateReminder;
+            if (reminder.getReminderId().startsWith(REMINDER_DB_PREFIX) && watchReminders.containsKey(reminder.getReminderId())) {
+                // Update reminder on the watch if needed
+                final Reminder watchReminder = watchReminders.get(reminder.getReminderId());
+                if (watchReminder != null && remindersEqual(reminder, watchReminder)) {
+                    LOG.debug("Reminder {} is already up-to-date on watch", watchReminder.getReminderId());
+                    continue;
+                }
+
+                isCreateReminder = (watchReminder == null);
+            } else {
+                isCreateReminder = true;
+            }
+
+            final Calendar reminderTime = GregorianCalendar.getInstance(TimeZone.getTimeZone("UTC"));
+            reminderTime.setTimeInMillis(reminder.getDate().getTime());
+
+            final XiaomiProto.ReminderDetails.Builder reminderDetails = XiaomiProto.ReminderDetails.newBuilder()
+                    .setTime(XiaomiProto.Time.newBuilder()
+                            .setHour(reminderTime.get(Calendar.HOUR_OF_DAY))
+                            .setMinute(reminderTime.get(Calendar.MINUTE))
+                            .setSecond(reminderTime.get(Calendar.SECOND))
+                            .setMillisecond(reminderTime.get(Calendar.MILLISECOND))
+                            .build())
+                    .setDate(XiaomiProto.Date.newBuilder()
+                            .setYear(reminderTime.get(Calendar.YEAR))
+                            .setMonth(reminderTime.get(Calendar.MONTH) + 1)
+                            .setDay(reminderTime.get(Calendar.DATE))
+                            .build())
+                    .setTitle(reminder.getMessage());
+
+            switch (reminder.getRepetition()) {
+                case Alarm.ALARM_ONCE:
+                    reminderDetails.setRepeatMode(REPETITION_ONCE);
+                    break;
+                case Alarm.ALARM_DAILY:
+                    reminderDetails.setRepeatMode(REPETITION_DAILY);
+                    break;
+                default:
+                    reminderDetails.setRepeatMode(REPETITION_WEEKLY);
+                    reminderDetails.setRepeatFlags(reminder.getRepetition());
+                    break;
+            }
+
+            final XiaomiProto.Schedule.Builder schedule = XiaomiProto.Schedule.newBuilder();
+
+            if (!isCreateReminder) {
+                // update existing alarm
+                LOG.debug("Update reminder {}", reminder.getReminderId());
+                watchReminders.put(reminder.getReminderId(), reminder);
+                schedule.setEditReminder(
+                        XiaomiProto.Reminder.newBuilder()
+                                .setId(Integer.parseInt(reminder.getReminderId().replace(REMINDER_DB_PREFIX, "")))
+                                .setReminderDetails(reminderDetails)
+                                .build()
+                );
+            } else {
+                LOG.debug("Create reminder {}", reminder.getReminderId());
+                // watchReminders will be updated later, since we don't know the correct ID here
+                pendingReminderAcks++;
+                schedule.setCreateReminder(reminderDetails);
+            }
+
+            getSupport().sendCommand(
+                    (isCreateReminder ? "create" : "update") + " reminder " + reminder.getReminderId(),
+                    XiaomiProto.Command.newBuilder()
+                            .setType(COMMAND_TYPE)
+                            .setSubtype(isCreateReminder ? CMD_REMINDERS_CREATE : CMD_REMINDERS_EDIT)
+                            .setSchedule(schedule)
+                            .build()
+            );
+        }
+
+        if (!remindersToDelete.isEmpty()) {
+            final XiaomiProto.ReminderDelete reminderDelete = XiaomiProto.ReminderDelete.newBuilder()
+                    .addAllId(remindersToDelete)
+                    .build();
+
+            final XiaomiProto.Schedule schedule = XiaomiProto.Schedule.newBuilder()
+                    .setDeleteReminder(reminderDelete)
+                    .build();
+
+            getSupport().sendCommand(
+                    "delete " + remindersToDelete.size() + " reminders",
+                    XiaomiProto.Command.newBuilder()
+                            .setType(COMMAND_TYPE)
+                            .setSubtype(CMD_REMINDERS_DELETE)
+                            .setSchedule(schedule)
+                            .build()
+            );
+        }
     }
 
     public void onSetWorldClocks(final ArrayList<? extends WorldClock> clocks) {
@@ -338,6 +568,12 @@ public class XiaomiScheduleService extends AbstractXiaomiService {
                 alarm1.getRepetition() == alarm2.getRepetition();
     }
 
+    private boolean remindersEqual(final Reminder reminder1, final Reminder reminder2) {
+        return Objects.equals(reminder1.getMessage(), reminder2.getMessage()) &&
+                Objects.equals(reminder1.getDate(), reminder2.getDate()) &&
+                reminder1.getRepetition() == reminder2.getRepetition();
+    }
+
     private void handleSleepModeConfig(final XiaomiProto.SleepMode sleepMode) {
         LOG.debug("Got sleep mode config");
 

From 6c710d594d2342cb2c3bf726125ffc8658962d8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Mon, 9 Oct 2023 13:28:57 +0100
Subject: [PATCH 067/595] Zepp OS: Attempt to fix repeating fetch operation
 getting stuck

---
 .../huami/operations/AbstractRepeatingFetchOperation.java       | 2 ++
 1 file changed, 2 insertions(+)

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 4fc3efd06..9f03477af 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
@@ -81,6 +81,8 @@ public abstract class AbstractRepeatingFetchOperation extends AbstractFetchOpera
         LOG.info("{} has finished round {}: {}, got {} bytes in buffer", getName(), fetchCount, success, byteStreamBuffer.size());
 
         if (!success) {
+            // We need to explicitly ack this, or the next operation will fail fetch will become stuck
+            sendAck2021(true);
             super.handleActivityFetchFinish(false);
             return false;
         }

From ae0a7bb8062bebd23cdb4e517abe7a743c187c5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 13 Oct 2023 22:57:35 +0100
Subject: [PATCH 068/595] Mi Band 8: Activity fetch base (wip)

---
 .../service/devices/xiaomi/XiaomiSupport.java |  8 +--
 .../xiaomi/activity/XiaomiActivityParser.java | 21 ++++++
 .../xiaomi/services/XiaomiHealthService.java  | 70 ++++++++++++++++++-
 app/src/main/proto/xiaomi.proto               | 20 ++++--
 4 files changed, 109 insertions(+), 10 deletions(-)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityParser.java

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
index 570b76ee8..825c2c68d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
@@ -413,8 +413,7 @@ public class XiaomiSupport extends AbstractBTLEDeviceSupport {
 
     @Override
     public void onFetchRecordedData(final int dataTypes) {
-        // TODO
-        super.onFetchRecordedData(dataTypes);
+        healthService.onFetchRecordedData(dataTypes);
     }
 
     @Override
@@ -514,7 +513,8 @@ public class XiaomiSupport extends AbstractBTLEDeviceSupport {
         final byte[] commandBytes = command.toByteArray();
         final byte[] encryptedCommandBytes = authService.encrypt(commandBytes, encryptedIndex);
         final int commandLength = 6 + encryptedCommandBytes.length;
-        if (commandLength > getMTU()) {
+        if (getMTU() != 0 && commandLength > getMTU()) {
+            // TODO MTU is 0 sometimes?
             LOG.warn("Command with {} bytes is too large for MTU of {}", commandLength, getMTU());
         }
 
@@ -524,7 +524,7 @@ public class XiaomiSupport extends AbstractBTLEDeviceSupport {
         buf.put((byte) 1); // 1 for encrypted
         buf.putShort(encryptedIndex++);
         buf.put(encryptedCommandBytes);
-        LOG.debug("Sending command {} as {}", GB.hexdump(commandBytes), GB.hexdump(buf.array()));
+        LOG.debug("Sending command {}", GB.hexdump(commandBytes));
         builder.write(getCharacteristic(UUID_CHARACTERISTIC_XIAOMI_COMMAND_WRITE), buf.array());
     }
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityParser.java
new file mode 100644
index 000000000..026172577
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityParser.java
@@ -0,0 +1,21 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity;
+
+public class XiaomiActivityParser {
+
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
index 70f2cd1fd..45aa6e760 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
@@ -23,6 +23,8 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
@@ -47,6 +49,7 @@ import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiPreferences;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
+import nodomain.freeyourgadget.gadgetbridge.util.GB;
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 
 public class XiaomiHealthService extends AbstractXiaomiService {
@@ -55,6 +58,8 @@ public class XiaomiHealthService extends AbstractXiaomiService {
     public static final int COMMAND_TYPE = 8;
 
     private static final int CMD_SET_USER_INFO = 0;
+    private static final int CMD_ACTIVITY_FETCH_1 = 1;
+    private static final int CMD_ACTIVITY_FETCH_2 = 2;
     private static final int CMD_CONFIG_SPO2_GET = 8;
     private static final int CMD_CONFIG_SPO2_SET = 9;
     private static final int CMD_CONFIG_HEART_RATE_GET = 10;
@@ -84,6 +89,10 @@ public class XiaomiHealthService extends AbstractXiaomiService {
             case CMD_SET_USER_INFO:
                 LOG.debug("Got user info set ack, status={}", cmd.getStatus());
                 return;
+            case CMD_ACTIVITY_FETCH_1:
+            case CMD_ACTIVITY_FETCH_2:
+                handleActivityFetchResponse(cmd.getHealth().getActivityRecordIds().toByteArray());
+                return;
             case CMD_CONFIG_SPO2_GET:
                 handleSpo2Config(cmd.getHealth().getSpo2());
                 return;
@@ -174,7 +183,7 @@ public class XiaomiHealthService extends AbstractXiaomiService {
         // TODO max heart rate should be input by the user
         int maxHeartRate = (int) Math.round(age <= 40 ? 220 - age : 207 - 0.7 * age);
         if (maxHeartRate < 100 || maxHeartRate > 220) {
-            maxHeartRate  = 175;
+            maxHeartRate = 175;
         }
 
         final XiaomiProto.UserInfo userInfo = XiaomiProto.UserInfo.newBuilder()
@@ -386,6 +395,65 @@ public class XiaomiHealthService extends AbstractXiaomiService {
         );
     }
 
+    public void onFetchRecordedData(final int dataTypes) {
+        LOG.debug("Fetch recorded data: {}", dataTypes);
+        final TransactionBuilder builder = getSupport().createTransactionBuilder("fetch recorded data step 1");
+
+        getSupport().sendCommand(
+                builder,
+                XiaomiProto.Command.newBuilder()
+                        .setType(COMMAND_TYPE)
+                        .setSubtype(CMD_ACTIVITY_FETCH_1)
+                        .setHealth(XiaomiProto.Health.newBuilder().setActivitySyncRequest1(
+                                // TODO official app sends 0, but doesn't work every time?
+                                XiaomiProto.ActivitySyncRequest1.newBuilder().setUnknown1(1)
+                        ))
+                        .build()
+        );
+
+        // TODO we need to wait for the reply from the previous before sending this one?
+        //getSupport().sendCommand(
+        //        builder,
+        //        XiaomiProto.Command.newBuilder()
+        //                .setType(COMMAND_TYPE)
+        //                .setSubtype(CMD_ACTIVITY_FETCH_2)
+        //                .build()
+        //);
+
+        builder.queue(getSupport().getQueue());
+    }
+
+    public void handleActivityFetchResponse(final byte[] recordIds) {
+        if ((recordIds.length % 7) != 0) {
+            LOG.warn("recordIds {} length = {}, not a multiple of 7, can't parse", GB.hexdump(recordIds), recordIds.length);
+            return;
+
+        }
+
+        LOG.debug("Got {} record IDs", recordIds.length / 7);
+
+        final ByteBuffer buf = ByteBuffer.wrap(recordIds).order(ByteOrder.LITTLE_ENDIAN);
+
+        while (buf.position() < buf.limit()) {
+            final int ts = buf.getInt();
+            final int tz = buf.get(); // 15 min blocks
+            final int version = buf.get();
+            final int flags = buf.get();
+            // bit 0 is type - 0 activity, 1 sports
+            final int type = (flags >> 7) & 1;
+            // bit 1 to 6 bits are subtype
+            //   for activity: activity, sleep, measurements, etc
+            //   for workout: workout type (8 freestyle)
+            final int subtype = (flags & 127) >> 2;
+            // bit 6 and 7 - 0/1 - summary vs details
+            final int detailType = flags & 3;
+            LOG.debug(
+                    "Activity Record: ts = {}, tz = {}, flags = {}, type = {}, subtype = {}, detailType = {}, version = {}",
+                    ts, tz, String.format("0x%02X", flags), type, subtype, detailType, version
+            );
+        }
+    }
+
     public void onHeartRateTest() {
         LOG.debug("Trigger heart rate one-shot test");
 
diff --git a/app/src/main/proto/xiaomi.proto b/app/src/main/proto/xiaomi.proto
index 16ae1d06d..8e87d23bb 100644
--- a/app/src/main/proto/xiaomi.proto
+++ b/app/src/main/proto/xiaomi.proto
@@ -281,8 +281,10 @@ message Charger {
 
 message Health {
   optional UserInfo userInfo = 1;
-  // 8, 1 get | 8, 3 set
-  optional bytes unknownActivity2 = 2;
+
+  optional bytes activityRecordIds = 2;
+  optional ActivitySyncRequest1 activitySyncRequest1 = 5;
+
   optional SpO2 spo2 = 7;
   optional HeartRate heartRate = 8;
   // 8, 12 get | 8, 13 set
@@ -319,6 +321,10 @@ message UserInfo {
   optional uint32 goalMoving = 11; // minutes
 }
 
+message ActivitySyncRequest1 {
+  optional uint32 unknown1 = 1; // 0/1
+}
+
 message SpO2 {
   optional uint32 unknown1 = 1; // 1
   optional bool allDayTracking = 2;
@@ -385,17 +391,21 @@ message WorkoutStatusWatch {
 }
 
 message WorkoutOpenWatch {
-  optional uint32 unknown1 = 1; // 2
+  // This is only called when gps is needed?
+  // 1 outdoor running, 2 walking, 3 hiking, 4 trekking, 5 trail run, 6 outdoor cycling
+  optional uint32 sport = 1;
   optional uint32 unknown2 = 2; // 2
 }
 
 message WorkoutOpenReply {
-  // 3 2 10
+  // 3 2 10 when no gps permissions at all
+  // 5 2 10 when no background permissions?
   // ...
+  // 0 * * when phone gps is working fine
   // 0 2 10
   // 0 2 2
   optional uint32 unknown1 = 1;
-  optional uint32 unknown2 = 2;
+  optional uint32 unknown2 = 2; // always 2?
   optional uint32 unknown3 = 3;
 }
 

From 0ed169c153ffa3b048f6180bf5931203538b266c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Mon, 16 Oct 2023 21:01:02 +0100
Subject: [PATCH 069/595] Xiaomi: Refactor characteristics (wip, chunked is
 broken)

---
 .../devices/xiaomi/XiaomiCoordinator.java     |   8 -
 .../xiaomi/miband8/MiBand8Coordinator.java    |   9 +
 .../devices/xiaomi/XiaomiAuthService.java     |  17 +-
 .../devices/xiaomi/XiaomiCharacteristic.java  | 311 ++++++++++++++++++
 .../devices/xiaomi/XiaomiChunkedHandler.java  |  59 ----
 .../devices/xiaomi/XiaomiConstants.java       |  49 ---
 .../xiaomi/XiaomiEncryptedSupport.java        | 102 ++++++
 .../service/devices/xiaomi/XiaomiSupport.java | 215 +++---------
 8 files changed, 476 insertions(+), 294 deletions(-)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiChunkedHandler.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiConstants.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiEncryptedSupport.java

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
index 7849820df..fdcb7109d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
@@ -47,9 +47,7 @@ import nodomain.freeyourgadget.gadgetbridge.model.PaiSample;
 import nodomain.freeyourgadget.gadgetbridge.model.SleepRespiratoryRateSample;
 import nodomain.freeyourgadget.gadgetbridge.model.Spo2Sample;
 import nodomain.freeyourgadget.gadgetbridge.model.StressSample;
-import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.HuamiLanguageType;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
 
 public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
     @NonNull
@@ -415,10 +413,4 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
     public AbstractNotificationPattern[] getNotificationLedPatterns() {
         return new AbstractNotificationPattern[0];
     }
-
-    @NonNull
-    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
-        return XiaomiSupport.class;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/MiBand8Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/MiBand8Coordinator.java
index c83797132..63afd1f52 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/MiBand8Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/MiBand8Coordinator.java
@@ -19,6 +19,7 @@ package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.miband8;
 import android.content.Context;
 import android.net.Uri;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import java.util.regex.Pattern;
@@ -26,6 +27,8 @@ import java.util.regex.Pattern;
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiEncryptedSupport;
 
 public class MiBand8Coordinator extends XiaomiCoordinator {
     @Override
@@ -54,4 +57,10 @@ public class MiBand8Coordinator extends XiaomiCoordinator {
     public int getDisabledIconResource() {
         return R.drawable.ic_device_miband6_disabled;
     }
+
+    @NonNull
+    @Override
+    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+        return XiaomiEncryptedSupport.class;
+    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java
index 34798c038..cf73f8664 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java
@@ -16,8 +16,6 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi;
 
-import static nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiConstants.UUID_CHARACTERISTIC_XIAOMI_COMMAND_WRITE;
-
 import android.content.SharedPreferences;
 import android.os.Build;
 
@@ -59,6 +57,8 @@ import nodomain.freeyourgadget.gadgetbridge.util.GB;
 public class XiaomiAuthService extends AbstractXiaomiService {
     private static final Logger LOG = LoggerFactory.getLogger(XiaomiAuthService.class);
 
+    public static final byte[] PAYLOAD_HEADER_AUTH = new byte[]{0, 0, 2, 2};
+
     public static final int COMMAND_TYPE = 1;
 
     public static final int CMD_NONCE = 26;
@@ -75,15 +75,16 @@ public class XiaomiAuthService extends AbstractXiaomiService {
         super(support);
     }
 
-    protected void startAuthentication(final TransactionBuilder builder) {
+    protected void startEncryptedHandshake(final TransactionBuilder builder) {
         builder.add(new SetDeviceStateAction(getSupport().getDevice(), GBDevice.State.AUTHENTICATING, getSupport().getContext()));
 
         System.arraycopy(getSecretKey(getSupport().getDevice()), 0, secretKey, 0, 16);
         new SecureRandom().nextBytes(nonce);
 
+        // TODO use sendCommand
         builder.write(
-                getSupport().getCharacteristic(UUID_CHARACTERISTIC_XIAOMI_COMMAND_WRITE),
-                ArrayUtils.addAll(XiaomiConstants.PAYLOAD_HEADER_AUTH, buildNonceCommand(nonce))
+                getSupport().getCharacteristic(XiaomiEncryptedSupport.UUID_CHARACTERISTIC_XIAOMI_COMMAND_WRITE),
+                ArrayUtils.addAll(PAYLOAD_HEADER_AUTH, buildNonceCommand(nonce))
         );
     }
 
@@ -105,10 +106,10 @@ public class XiaomiAuthService extends AbstractXiaomiService {
                 }
 
                 final TransactionBuilder builder = getSupport().createTransactionBuilder("auth step 2");
-                // TODO maybe move these writes to support class?
+                // TODO use sendCommand
                 builder.write(
-                        getSupport().getCharacteristic(UUID_CHARACTERISTIC_XIAOMI_COMMAND_WRITE),
-                        ArrayUtils.addAll(XiaomiConstants.PAYLOAD_HEADER_AUTH, reply.toByteArray())
+                        getSupport().getCharacteristic(XiaomiEncryptedSupport.UUID_CHARACTERISTIC_XIAOMI_COMMAND_WRITE),
+                        ArrayUtils.addAll(PAYLOAD_HEADER_AUTH, reply.toByteArray())
                 );
                 builder.queue(getSupport().getQueue());
                 break;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
new file mode 100644
index 000000000..6cb652056
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
@@ -0,0 +1,311 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi;
+
+
+import android.bluetooth.BluetoothGattCharacteristic;
+
+import androidx.annotation.Nullable;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.Queue;
+import java.util.UUID;
+
+import nodomain.freeyourgadget.gadgetbridge.service.btle.BLETypeConversions;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
+
+public class XiaomiCharacteristic {
+    public static final byte[] PAYLOAD_ACK = new byte[]{0, 0, 3, 0};
+    public static final byte[] PAYLOAD_CHUNKED_START_ACK = new byte[]{0, 0, 1, 1};
+    public static final byte[] PAYLOAD_CHUNKED_END_ACK = new byte[]{0, 0, 1, 0};
+
+    private final Logger LOG;
+
+    private final XiaomiSupport mSupport;
+
+    private final BluetoothGattCharacteristic bluetoothGattCharacteristic;
+    private final UUID characteristicUUID;
+
+    // Encryption
+    private XiaomiAuthService authService = null;
+    private boolean isEncrypted = false;
+    private short encryptedIndex = 0;
+
+    // Chunking
+    private int numChunks = 0;
+    private int currentChunk = 0;
+    private final ByteArrayOutputStream chunkBuffer = new ByteArrayOutputStream();
+
+    // Scheduling
+    // TODO timeouts
+    private final Queue<byte[]> payloadQueue = new LinkedList<>();
+    private boolean waitingAck = false;
+    private boolean sendingChunked = false;
+    private byte[] currentSending = null;
+
+    private Handler handler = null;
+
+    public XiaomiCharacteristic(final XiaomiSupport support,
+                                final BluetoothGattCharacteristic bluetoothGattCharacteristic,
+                                @Nullable final XiaomiAuthService authService) {
+        this.mSupport = support;
+        this.bluetoothGattCharacteristic = bluetoothGattCharacteristic;
+        this.authService = authService;
+        this.isEncrypted = authService != null;
+        this.LOG = LoggerFactory.getLogger("XiaomiCharacteristic [" + bluetoothGattCharacteristic.getUuid().toString() + "]");
+        this.characteristicUUID = bluetoothGattCharacteristic.getUuid();
+    }
+
+    public UUID getCharacteristicUUID() {
+        return characteristicUUID;
+    }
+
+    public void setHandler(final Handler handler) {
+        this.handler = handler;
+    }
+
+    public void setEncrypted(final boolean encrypted) {
+        this.isEncrypted = encrypted;
+    }
+
+    public void reset() {
+        this.numChunks = 0;
+        this.currentChunk = 0;
+        this.encryptedIndex = 1; // 0 is used by auth service
+        this.chunkBuffer.reset();
+        this.payloadQueue.clear();
+        this.waitingAck = false;
+        this.sendingChunked = false;
+        this.currentSending = null;
+    }
+
+    /**
+     * Write bytes to this characteristic, encrypting and splitting it into chunks if necessary.
+     */
+    public void write(final byte[] value) {
+        payloadQueue.add(value);
+        sendNext();
+    }
+
+    /**
+     * Write bytes to this characteristic directly.
+     */
+    public void writeDirect(final TransactionBuilder builder, final byte[] value) {
+        builder.write(bluetoothGattCharacteristic, value);
+    }
+
+    public void onCharacteristicChanged(final byte[] value) {
+        if (Arrays.equals(value, PAYLOAD_ACK)) {
+            LOG.debug("Got ack");
+            currentSending = null;
+            waitingAck = false;
+            sendNext();
+            return;
+        }
+
+        final ByteBuffer buf = ByteBuffer.wrap(value).order(ByteOrder.LITTLE_ENDIAN);
+
+        final int chunk = buf.getShort();
+        if (chunk != 0) {
+            // Chunked packet
+            final byte[] chunkBytes = new byte[buf.limit() - buf.position()];
+            buf.get(chunkBytes);
+            try {
+                chunkBuffer.write(chunkBytes);
+            } catch (final IOException e) {
+                throw new RuntimeException(e);
+            }
+            currentChunk++;
+            LOG.debug("Got chunk {} of {}", currentChunk, numChunks);
+            if (chunk == numChunks) {
+                sendChunkEndAck();
+
+                if (authService != null) {
+                    // chunks are always encrypted if an auth service is available
+                    handler.handle(authService.decrypt(chunkBuffer.toByteArray()));
+                } else {
+                    handler.handle(chunkBuffer.toByteArray());
+                }
+            }
+        } else {
+            // Not a chunk / single-packet
+            final byte type = buf.get();
+
+            switch (type) {
+                case 0:
+                    // Chunked start request
+                    final byte one = buf.get(); // ?
+                    if (one != 1) {
+                        LOG.warn("Chunked start request: expected 1, got {}", one);
+                        return;
+                    }
+                    numChunks = buf.getShort();
+                    LOG.debug("Got chunked start request for {} chunks", numChunks);
+                    sendChunkStartAck();
+                    return;
+                case 1:
+                    // Chunked ack
+                    final byte subtype = buf.get();
+                    switch (subtype) {
+                        case 0:
+                            LOG.debug("Got chunked ack end");
+                            currentSending = null;
+                            sendingChunked = false;
+                            sendNext();
+                            return;
+                        case 1:
+                            LOG.debug("Got chunked ack start");
+                            final TransactionBuilder builder = mSupport.createTransactionBuilder("send chunks");
+                            for (int i = 0; i * 242 < currentSending.length; i ++) {
+                                final int startIndex = i * 242;
+                                final int endIndex = Math.min((i + 1) * 242, currentSending.length);
+                                LOG.debug("Sending chunk {} from {} to {}", i, startIndex, endIndex);
+                                final byte[] chunkToSend = new byte[2 + endIndex - startIndex];
+                                BLETypeConversions.writeUint16(chunkToSend, 0, i + 1);
+                                System.arraycopy(currentSending, startIndex, chunkToSend, 2, endIndex - startIndex);
+                                builder.write(bluetoothGattCharacteristic, chunkToSend);
+                            }
+
+                            builder.queue(mSupport.getQueue());
+                            return;
+                    }
+
+                    LOG.warn("Unknown chunked ack subtype {}", subtype);
+
+                    return;
+                case 2:
+                    // Single command
+                    sendAck();
+
+                    final byte encryption = buf.get();
+                    final byte[] plainValue;
+                    if (encryption == 1) {
+                        final byte[] encryptedValue = new byte[buf.limit() - buf.position()];
+                        buf.get(encryptedValue);
+                        plainValue = authService.decrypt(encryptedValue);
+                    } else {
+                        plainValue = new byte[buf.limit() - buf.position()];
+                        buf.get(plainValue);
+                    }
+
+                    handler.handle(plainValue);
+
+                    return;
+                case 3:
+                    // ack
+                    LOG.debug("Got ack");
+            }
+        }
+    }
+
+    private void sendNext() {
+        if (waitingAck || sendingChunked) {
+            LOG.debug("Already sending something");
+            return;
+        }
+
+        final byte[] payload = payloadQueue.poll();
+        if (payload == null) {
+            LOG.debug("Nothing to send");
+            return;
+        }
+
+        if (isEncrypted) {
+            currentSending = authService.encrypt(payload, encryptedIndex);
+        } else {
+            currentSending = payload;
+        }
+
+        if (shouldWriteChunked(currentSending)) {
+            LOG.debug("Sending next - chunked");
+            // FIXME this is not efficient - re-encrypt with the correct key for chunked (assumes
+            //  final encrypted size is the same - need to check)
+            if (isEncrypted) {
+                currentSending = authService.encrypt(payload, (short) 0);
+            }
+
+            sendingChunked = true;
+
+            final ByteBuffer buf = ByteBuffer.allocate(6).order(ByteOrder.LITTLE_ENDIAN);
+            buf.putShort((short) 0);
+            buf.put((byte) 0);
+            buf.put((byte) 1);
+            buf.putShort((short) Math.round(currentSending.length / 247.0));
+
+            final TransactionBuilder builder = mSupport.createTransactionBuilder("send chunked start");
+            builder.write(bluetoothGattCharacteristic, buf.array());
+            builder.queue(mSupport.getQueue());
+        } else {
+            LOG.debug("Sending next - single");
+
+            // Encrypt single command
+            final int commandLength = 6 + currentSending.length;
+
+            final ByteBuffer buf = ByteBuffer.allocate(commandLength).order(ByteOrder.LITTLE_ENDIAN);
+            buf.putShort((short) 0);
+            buf.put((byte) 2); // 2 for command
+            buf.put((byte) 1); // 1 for encrypted
+            buf.putShort(encryptedIndex++);
+            buf.put(currentSending); // it's already encrypted
+
+            waitingAck = true;
+
+            final TransactionBuilder builder = mSupport.createTransactionBuilder("send single command");
+            builder.write(bluetoothGattCharacteristic, buf.array());
+            builder.queue(mSupport.getQueue());
+        }
+    }
+
+    private boolean shouldWriteChunked(final byte[] payload) {
+        if (!isEncrypted) {
+            // non-encrypted are always chunked
+            return true;
+        }
+
+        return payload.length + 6 > 244;
+    }
+
+    private void sendAck() {
+        final TransactionBuilder builder = mSupport.createTransactionBuilder("send ack");
+        builder.write(bluetoothGattCharacteristic, PAYLOAD_ACK);
+        builder.queue(mSupport.getQueue());
+    }
+
+    private void sendChunkStartAck() {
+        final TransactionBuilder builder = mSupport.createTransactionBuilder("send chunked start ack");
+        builder.write(bluetoothGattCharacteristic, PAYLOAD_CHUNKED_START_ACK);
+        builder.queue(mSupport.getQueue());
+    }
+
+    private void sendChunkEndAck() {
+        final TransactionBuilder builder = mSupport.createTransactionBuilder("send chunked end ack");
+        builder.write(bluetoothGattCharacteristic, PAYLOAD_CHUNKED_END_ACK);
+        builder.queue(mSupport.getQueue());
+    }
+
+    public interface Handler {
+        void handle(final byte[] payload);
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiChunkedHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiChunkedHandler.java
deleted file mode 100644
index 458e80feb..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiChunkedHandler.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*  Copyright (C) 2023 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-
-public class XiaomiChunkedHandler {
-    private int numChunks = 0;
-    private int currentChunk = 0;
-    private final ByteArrayOutputStream baos = new ByteArrayOutputStream();
-
-    public XiaomiChunkedHandler() {
-
-    }
-
-    public void setNumChunks(final int numChunks) {
-        this.numChunks = numChunks;
-        this.currentChunk = 0;
-        this.baos.reset();
-    }
-
-    public void addChunk(final byte[] chunk) {
-        try {
-            baos.write(chunk);
-        } catch (final IOException e) {
-            throw new RuntimeException(e);
-        }
-
-        currentChunk++;
-    }
-
-    public int getNumChunks() {
-        return numChunks;
-    }
-
-    public int getCurrentChunk() {
-        return currentChunk;
-    }
-
-    public byte[] getArray() {
-        return baos.toByteArray();
-    }
-}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiConstants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiConstants.java
deleted file mode 100644
index b1bb6553b..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiConstants.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*  Copyright (C) 2023 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi;
-
-import java.util.UUID;
-
-public class XiaomiConstants {
-    public static final String BASE_UUID = "0000%s-0000-1000-8000-00805f9b34fb";
-
-    public static final UUID UUID_SERVICE_XIAOMI_FE95 = UUID.fromString((String.format(BASE_UUID, "fe95")));
-    public static final UUID UUID_CHARACTERISTIC_XIAOMI_UNKNOWN_0050 = UUID.fromString((String.format(BASE_UUID, "0050")));
-    public static final UUID UUID_CHARACTERISTIC_XIAOMI_COMMAND_READ = UUID.fromString((String.format(BASE_UUID, "0051")));
-    public static final UUID UUID_CHARACTERISTIC_XIAOMI_COMMAND_WRITE = UUID.fromString((String.format(BASE_UUID, "0052")));
-    public static final UUID UUID_CHARACTERISTIC_XIAOMI_ACTIVITY_DATA = UUID.fromString((String.format(BASE_UUID, "0053")));
-    public static final UUID UUID_CHARACTERISTIC_XIAOMI_UNKNOWN_0054 = UUID.fromString((String.format(BASE_UUID, "0054")));
-    public static final UUID UUID_CHARACTERISTIC_XIAOMI_WATCHFACE = UUID.fromString((String.format(BASE_UUID, "0055")));
-    public static final UUID UUID_CHARACTERISTIC_XIAOMI_UNKNOWN_0056 = UUID.fromString((String.format(BASE_UUID, "0056")));
-    public static final UUID UUID_CHARACTERISTIC_XIAOMI_UNKNOWN_0057 = UUID.fromString((String.format(BASE_UUID, "0057")));
-    public static final UUID UUID_CHARACTERISTIC_XIAOMI_UNKNOWN_0058 = UUID.fromString((String.format(BASE_UUID, "0058")));
-    public static final UUID UUID_CHARACTERISTIC_XIAOMI_UNKNOWN_0059 = UUID.fromString((String.format(BASE_UUID, "0059")));
-    public static final UUID UUID_CHARACTERISTIC_XIAOMI_UNKNOWN_005A = UUID.fromString((String.format(BASE_UUID, "005a")));
-
-    public static final UUID UUID_SERVICE_XIAOMI_FDAB = UUID.fromString((String.format(BASE_UUID, "fdab")));
-    public static final UUID UUID_CHARACTERISTIC_XIAOMI_UNKNOWN_0001 = UUID.fromString((String.format(BASE_UUID, "0001")));
-    public static final UUID UUID_CHARACTERISTIC_XIAOMI_UNKNOWN_0002 = UUID.fromString((String.format(BASE_UUID, "0002")));
-    public static final UUID UUID_CHARACTERISTIC_XIAOMI_UNKNOWN_0003 = UUID.fromString((String.format(BASE_UUID, "0003")));
-
-    // TODO not like this
-    public static final byte[] PAYLOAD_CHUNKED_START = new byte[]{0, 0, 0, 1};
-    public static final byte[] PAYLOAD_CHUNKED_START_ACK = new byte[]{0, 0, 1, 1};
-    public static final byte[] PAYLOAD_CHUNKED_END_ACK = new byte[]{0, 0, 1, 0};
-    public static final byte[] PAYLOAD_HEADER_AUTH = new byte[]{0, 0, 2, 2};
-    public static final byte[] PAYLOAD_HEADER_CMD = new byte[]{0, 0, 2, 1};
-    public static final byte[] PAYLOAD_ACK = new byte[]{0, 0, 3, 0};
-}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiEncryptedSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiEncryptedSupport.java
new file mode 100644
index 000000000..008c72cac
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiEncryptedSupport.java
@@ -0,0 +1,102 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi;
+
+import android.bluetooth.BluetoothGattCharacteristic;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.UUID;
+
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.GattService;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetDeviceStateAction;
+
+public class XiaomiEncryptedSupport extends XiaomiSupport {
+    private static final Logger LOG = LoggerFactory.getLogger(XiaomiEncryptedSupport.class);
+
+    public static final String BASE_UUID = "0000%s-0000-1000-8000-00805f9b34fb";
+
+    public static final UUID UUID_SERVICE_XIAOMI_FE95 = UUID.fromString((String.format(BASE_UUID, "fe95")));
+    public static final UUID UUID_CHARACTERISTIC_XIAOMI_UNKNOWN_0050 = UUID.fromString((String.format(BASE_UUID, "0050")));
+    public static final UUID UUID_CHARACTERISTIC_XIAOMI_COMMAND_READ = UUID.fromString((String.format(BASE_UUID, "0051")));
+    public static final UUID UUID_CHARACTERISTIC_XIAOMI_COMMAND_WRITE = UUID.fromString((String.format(BASE_UUID, "0052")));
+    public static final UUID UUID_CHARACTERISTIC_XIAOMI_ACTIVITY_DATA = UUID.fromString((String.format(BASE_UUID, "0053")));
+    public static final UUID UUID_CHARACTERISTIC_XIAOMI_UNKNOWN_0054 = UUID.fromString((String.format(BASE_UUID, "0054")));
+    public static final UUID UUID_CHARACTERISTIC_XIAOMI_DATA_UPLOAD = UUID.fromString((String.format(BASE_UUID, "0055")));
+    public static final UUID UUID_CHARACTERISTIC_XIAOMI_UNKNOWN_0056 = UUID.fromString((String.format(BASE_UUID, "0056")));
+    public static final UUID UUID_CHARACTERISTIC_XIAOMI_UNKNOWN_0057 = UUID.fromString((String.format(BASE_UUID, "0057")));
+    public static final UUID UUID_CHARACTERISTIC_XIAOMI_UNKNOWN_0058 = UUID.fromString((String.format(BASE_UUID, "0058")));
+    public static final UUID UUID_CHARACTERISTIC_XIAOMI_UNKNOWN_0059 = UUID.fromString((String.format(BASE_UUID, "0059")));
+    public static final UUID UUID_CHARACTERISTIC_XIAOMI_UNKNOWN_005A = UUID.fromString((String.format(BASE_UUID, "005a")));
+
+    public static final UUID UUID_SERVICE_XIAOMI_FDAB = UUID.fromString((String.format(BASE_UUID, "fdab")));
+    public static final UUID UUID_CHARACTERISTIC_XIAOMI_UNKNOWN_0001 = UUID.fromString((String.format(BASE_UUID, "0001")));
+    public static final UUID UUID_CHARACTERISTIC_XIAOMI_UNKNOWN_0002 = UUID.fromString((String.format(BASE_UUID, "0002")));
+    public static final UUID UUID_CHARACTERISTIC_XIAOMI_UNKNOWN_0003 = UUID.fromString((String.format(BASE_UUID, "0003")));
+
+    public XiaomiEncryptedSupport() {
+        super();
+        addSupportedService(GattService.UUID_SERVICE_GENERIC_ACCESS);
+        addSupportedService(GattService.UUID_SERVICE_GENERIC_ATTRIBUTE);
+        addSupportedService(GattService.UUID_SERVICE_DEVICE_INFORMATION);
+        addSupportedService(GattService.UUID_SERVICE_HUMAN_INTERFACE_DEVICE);
+        addSupportedService(UUID_SERVICE_XIAOMI_FE95);
+        addSupportedService(UUID_SERVICE_XIAOMI_FDAB);
+    }
+
+    @Override
+    protected TransactionBuilder initializeDevice(final TransactionBuilder builder) {
+        final BluetoothGattCharacteristic btCharacteristicCommandRead = getCharacteristic(UUID_CHARACTERISTIC_XIAOMI_COMMAND_READ);
+        final BluetoothGattCharacteristic btCharacteristicCommandWrite = getCharacteristic(UUID_CHARACTERISTIC_XIAOMI_COMMAND_WRITE);
+        final BluetoothGattCharacteristic btCharacteristicActivityData = getCharacteristic(UUID_CHARACTERISTIC_XIAOMI_ACTIVITY_DATA);
+        final BluetoothGattCharacteristic btCharacteristicDataUpload = getCharacteristic(UUID_CHARACTERISTIC_XIAOMI_DATA_UPLOAD);
+
+        if (btCharacteristicCommandRead == null || btCharacteristicCommandWrite == null || btCharacteristicActivityData == null || btCharacteristicDataUpload == null) {
+            LOG.warn("Characteristics are null, will attempt to reconnect");
+            builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.WAITING_FOR_RECONNECT, getContext()));
+            return builder;
+        }
+
+        this.characteristicCommandRead = new XiaomiCharacteristic(this, btCharacteristicCommandRead, authService);
+        this.characteristicCommandRead.setEncrypted(true);
+        this.characteristicCommandRead.setHandler(this::handleCommandBytes);
+        this.characteristicCommandWrite = new XiaomiCharacteristic(this, btCharacteristicCommandWrite, authService);
+        this.characteristicCommandRead.setEncrypted(true);
+        this.characteristicActivityData = new XiaomiCharacteristic(this, btCharacteristicActivityData, authService);
+        this.characteristicCommandRead.setEncrypted(true);
+        this.characteristicDataUpload = new XiaomiCharacteristic(this, btCharacteristicDataUpload, authService);
+        this.characteristicCommandRead.setEncrypted(true);
+
+        // FIXME why is this needed?
+        getDevice().setFirmwareVersion("...");
+        //getDevice().setFirmwareVersion2("...");
+
+        builder.requestMtu(247);
+
+        builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.INITIALIZING, getContext()));
+        builder.notify(getCharacteristic(UUID_CHARACTERISTIC_XIAOMI_COMMAND_READ), true);
+        builder.notify(getCharacteristic(UUID_CHARACTERISTIC_XIAOMI_COMMAND_WRITE), true);
+        builder.notify(getCharacteristic(UUID_CHARACTERISTIC_XIAOMI_ACTIVITY_DATA), true);
+        builder.notify(getCharacteristic(UUID_CHARACTERISTIC_XIAOMI_DATA_UPLOAD), true);
+        authService.startEncryptedHandshake(builder);
+
+        return builder;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
index 825c2c68d..e3f8ae022 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
@@ -16,7 +16,6 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi;
 
-import static nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiConstants.*;
 
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothGatt;
@@ -29,16 +28,13 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.UUID;
 
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.model.Alarm;
 import nodomain.freeyourgadget.gadgetbridge.model.CalendarEventSpec;
@@ -52,9 +48,7 @@ import nodomain.freeyourgadget.gadgetbridge.model.WeatherSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.WorldClock;
 import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.AbstractBTLEDeviceSupport;
-import nodomain.freeyourgadget.gadgetbridge.service.btle.GattService;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
-import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetDeviceStateAction;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.AbstractXiaomiService;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.XiaomiCalendarService;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.XiaomiHealthService;
@@ -66,17 +60,22 @@ import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.Xiao
 import nodomain.freeyourgadget.gadgetbridge.util.GB;
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 
-public class XiaomiSupport extends AbstractBTLEDeviceSupport {
+public abstract class XiaomiSupport extends AbstractBTLEDeviceSupport {
     private static final Logger LOG = LoggerFactory.getLogger(XiaomiSupport.class);
 
-    private final XiaomiAuthService authService = new XiaomiAuthService(this);
-    private final XiaomiMusicService musicService = new XiaomiMusicService(this);
-    private final XiaomiHealthService healthService = new XiaomiHealthService(this);
-    private final XiaomiNotificationService notificationService = new XiaomiNotificationService(this);
-    private final XiaomiScheduleService scheduleService = new XiaomiScheduleService(this);
-    private final XiaomiWeatherService weatherService = new XiaomiWeatherService(this);
-    private final XiaomiSystemService systemService = new XiaomiSystemService(this);
-    private final XiaomiCalendarService calendarService = new XiaomiCalendarService(this);
+    protected XiaomiCharacteristic characteristicCommandRead;
+    protected XiaomiCharacteristic characteristicCommandWrite;
+    protected XiaomiCharacteristic characteristicActivityData;
+    protected XiaomiCharacteristic characteristicDataUpload;
+
+    protected final XiaomiAuthService authService = new XiaomiAuthService(this);
+    protected final XiaomiMusicService musicService = new XiaomiMusicService(this);
+    protected final XiaomiHealthService healthService = new XiaomiHealthService(this);
+    protected final XiaomiNotificationService notificationService = new XiaomiNotificationService(this);
+    protected final XiaomiScheduleService scheduleService = new XiaomiScheduleService(this);
+    protected final XiaomiWeatherService weatherService = new XiaomiWeatherService(this);
+    protected final XiaomiSystemService systemService = new XiaomiSystemService(this);
+    protected final XiaomiCalendarService calendarService = new XiaomiCalendarService(this);
 
     private final Map<Integer, AbstractXiaomiService> mServiceMap = new LinkedHashMap<Integer, AbstractXiaomiService>() {{
         put(XiaomiAuthService.COMMAND_TYPE, authService);
@@ -91,12 +90,6 @@ public class XiaomiSupport extends AbstractBTLEDeviceSupport {
 
     public XiaomiSupport() {
         super(LOG);
-        addSupportedService(GattService.UUID_SERVICE_GENERIC_ACCESS);
-        addSupportedService(GattService.UUID_SERVICE_GENERIC_ATTRIBUTE);
-        addSupportedService(GattService.UUID_SERVICE_DEVICE_INFORMATION);
-        addSupportedService(GattService.UUID_SERVICE_HUMAN_INTERFACE_DEVICE);
-        addSupportedService(UUID_SERVICE_XIAOMI_FE95);
-        addSupportedService(UUID_SERVICE_XIAOMI_FDAB);
     }
 
     @Override
@@ -117,31 +110,6 @@ public class XiaomiSupport extends AbstractBTLEDeviceSupport {
         }
     }
 
-    @Override
-    protected TransactionBuilder initializeDevice(final TransactionBuilder builder) {
-        final BluetoothGattCharacteristic characteristicCommandWrite = getCharacteristic(UUID_CHARACTERISTIC_XIAOMI_COMMAND_WRITE);
-        final BluetoothGattCharacteristic characteristicCommandRead = getCharacteristic(UUID_CHARACTERISTIC_XIAOMI_COMMAND_READ);
-
-        if (characteristicCommandWrite == null || characteristicCommandRead == null) {
-            LOG.warn("Command characteristics are null, will attempt to reconnect");
-            builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.WAITING_FOR_RECONNECT, getContext()));
-            return builder;
-        }
-
-        // FIXME why is this needed?
-        getDevice().setFirmwareVersion("...");
-        //getDevice().setFirmwareVersion2("...");
-
-        builder.notify(getCharacteristic(UUID_CHARACTERISTIC_XIAOMI_COMMAND_READ), true);
-        builder.notify(getCharacteristic(UUID_CHARACTERISTIC_XIAOMI_COMMAND_WRITE), true);
-        builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.INITIALIZING, getContext()));
-        authService.startAuthentication(builder);
-
-        return builder;
-    }
-
-    private final Map<UUID, XiaomiChunkedHandler> mChunkedHandlers = new HashMap<>();
-
     @Override
     public boolean onCharacteristicChanged(final BluetoothGatt gatt, final BluetoothGattCharacteristic characteristic) {
         if (super.onCharacteristicChanged(gatt, characteristic)) {
@@ -151,93 +119,17 @@ public class XiaomiSupport extends AbstractBTLEDeviceSupport {
         final UUID characteristicUUID = characteristic.getUuid();
         final byte[] value = characteristic.getValue();
 
-        if (Arrays.equals(value, PAYLOAD_ACK)) {
-
-        }
-
-        if (UUID_CHARACTERISTIC_XIAOMI_COMMAND_WRITE.equals(characteristicUUID)) {
-            if (Arrays.equals(value, PAYLOAD_ACK)) {
-                LOG.debug("Got command write ack");
-            } else {
-                LOG.warn("Unexpected notification from command write: {}", GB.hexdump(value));
-            }
-
+        if (characteristicCommandRead.getCharacteristicUUID().equals(characteristicUUID)) {
+            characteristicCommandRead.onCharacteristicChanged(value);
             return true;
-        }
-
-        if (UUID_CHARACTERISTIC_XIAOMI_COMMAND_READ.equals(characteristicUUID)) {
-            final ByteBuffer buf = ByteBuffer.wrap(characteristic.getValue())
-                    .order(ByteOrder.LITTLE_ENDIAN);
-
-            final int chunk = buf.getShort();
-            if (chunk != 0) {
-                // Chunked packet
-                final XiaomiChunkedHandler chunkedHandler = mChunkedHandlers.get(characteristicUUID);
-                if (chunkedHandler == null) {
-                    LOG.warn("No chunked handler initialized for {}", characteristicUUID);
-                    return true;
-                }
-                final byte[] chunkBytes = new byte[buf.limit() - buf.position()];
-                buf.get(chunkBytes);
-                chunkedHandler.addChunk(chunkBytes);
-                if (chunk == chunkedHandler.getNumChunks()) {
-                    // TODO handle reassembled chunk
-                    final byte[] plainValue = authService.decrypt(chunkedHandler.getArray());
-                    handleCommandBytes(plainValue);
-                }
-
-                return true;
-            } else {
-                // Not a chunk / single-packet
-                final byte type = buf.get();
-
-                switch (type) {
-                    case 0:
-                        // Chunked start request
-                        final byte one = buf.get(); // ?
-                        if (one != 1) {
-                            LOG.warn("Chunked start request: expected 1, got {}", one);
-                            return true;
-                        }
-                        final short numChunks = buf.getShort();
-                        LOG.debug("Got chunked start request for {} chunks", numChunks);
-                        XiaomiChunkedHandler chunkedHandler = mChunkedHandlers.get(characteristicUUID);
-                        if (chunkedHandler == null) {
-                            chunkedHandler = new XiaomiChunkedHandler();
-                            mChunkedHandlers.put(UUID_CHARACTERISTIC_XIAOMI_COMMAND_READ, chunkedHandler);
-                        }
-                        chunkedHandler.setNumChunks(numChunks);
-                        sendChunkStartAck(characteristic);
-                        return true;
-                    case 1:
-                        // Chunked start ack
-                        LOG.debug("Got chunked start ack");
-                        return true;
-                    case 2:
-                        // Single command
-                        sendAck(characteristic);
-
-                        final byte encryption = buf.get();
-                        final byte[] plainValue;
-                        if (encryption == 1) {
-                            final byte[] encryptedValue = new byte[buf.limit() - buf.position()];
-                            buf.get(encryptedValue);
-                            plainValue = authService.decrypt(encryptedValue);
-                        } else {
-                            plainValue = new byte[buf.limit() - buf.position()];
-                            buf.get(plainValue);
-                        }
-
-                        handleCommandBytes(plainValue);
-
-                        return true;
-                    case 3:
-                        // ack
-                        LOG.debug("Got ack");
-                        return true;
-                }
-            }
-
+        } else if (characteristicCommandWrite.getCharacteristicUUID().equals(characteristicUUID)) {
+            characteristicCommandWrite.onCharacteristicChanged(value);
+            return true;
+        } else if (characteristicActivityData.getCharacteristicUUID().equals(characteristicUUID)) {
+            characteristicActivityData.onCharacteristicChanged(value);
+            return true;
+        } else if (characteristicDataUpload.getCharacteristicUUID().equals(characteristicUUID)) {
+            characteristicDataUpload.onCharacteristicChanged(value);
             return true;
         }
 
@@ -290,8 +182,12 @@ public class XiaomiSupport extends AbstractBTLEDeviceSupport {
         }
         systemService.setCurrentTime(builder);
 
-        // TODO this should not be done here
-        calendarService.syncCalendar(builder);
+        final XiaomiCoordinator coordinator = getCoordinator();
+
+        if (coordinator.supportsCalendarEvents()) {
+            // TODO this should not be done here
+            calendarService.syncCalendar(builder);
+        }
 
         builder.queue(getQueue());
     }
@@ -470,9 +366,17 @@ public class XiaomiSupport extends AbstractBTLEDeviceSupport {
         weatherService.onSendWeather(weatherSpec);
     }
 
+    public XiaomiCoordinator getCoordinator() {
+        return (XiaomiCoordinator) gbDevice.getDeviceCoordinator();
+    }
+
     protected void phase2Initialize(final TransactionBuilder builder) {
         LOG.info("phase2Initialize");
-        encryptedIndex = 1; // TODO not here
+
+        characteristicCommandRead.reset();
+        characteristicCommandWrite.reset();
+        characteristicActivityData.reset();
+        characteristicDataUpload.reset();
 
         if (GBApplication.getPrefs().getBoolean("datetime_synconconnect", true)) {
             systemService.setCurrentTime(builder);
@@ -483,26 +387,6 @@ public class XiaomiSupport extends AbstractBTLEDeviceSupport {
         }
     }
 
-    private void sendAck(final BluetoothGattCharacteristic characteristic) {
-        final TransactionBuilder builder = createTransactionBuilder("send ack");
-        builder.write(characteristic, PAYLOAD_ACK);
-        builder.queue(getQueue());
-    }
-
-    private void sendChunkStartAck(final BluetoothGattCharacteristic characteristic) {
-        final TransactionBuilder builder = createTransactionBuilder("send chunked start ack");
-        builder.write(characteristic, PAYLOAD_CHUNKED_START_ACK);
-        builder.queue(getQueue());
-    }
-
-    private void sendChunkEndAck(final BluetoothGattCharacteristic characteristic) {
-        final TransactionBuilder builder = createTransactionBuilder("send chunked end ack");
-        builder.write(characteristic, PAYLOAD_CHUNKED_END_ACK);
-        builder.queue(getQueue());
-    }
-
-    private short encryptedIndex = 0;
-
     public void sendCommand(final String taskName, final XiaomiProto.Command command) {
         final TransactionBuilder builder = createTransactionBuilder(taskName);
         sendCommand(builder, command);
@@ -511,21 +395,12 @@ public class XiaomiSupport extends AbstractBTLEDeviceSupport {
 
     public void sendCommand(final TransactionBuilder builder, final XiaomiProto.Command command) {
         final byte[] commandBytes = command.toByteArray();
-        final byte[] encryptedCommandBytes = authService.encrypt(commandBytes, encryptedIndex);
-        final int commandLength = 6 + encryptedCommandBytes.length;
-        if (getMTU() != 0 && commandLength > getMTU()) {
-            // TODO MTU is 0 sometimes?
-            LOG.warn("Command with {} bytes is too large for MTU of {}", commandLength, getMTU());
-        }
-
-        final ByteBuffer buf = ByteBuffer.allocate(commandLength).order(ByteOrder.LITTLE_ENDIAN);
-        buf.putShort((short) 0);
-        buf.put((byte) 2); // 2 for command
-        buf.put((byte) 1); // 1 for encrypted
-        buf.putShort(encryptedIndex++);
-        buf.put(encryptedCommandBytes);
         LOG.debug("Sending command {}", GB.hexdump(commandBytes));
-        builder.write(getCharacteristic(UUID_CHARACTERISTIC_XIAOMI_COMMAND_WRITE), buf.array());
+        this.characteristicCommandWrite.write(commandBytes);
+    }
+
+    public void sendCommand(final TransactionBuilder builder, final byte[] commandBytes) {
+        this.characteristicCommandWrite.write(commandBytes);
     }
 
     public void sendCommand(final TransactionBuilder builder, final int type, final int subtype) {

From 57c7a083aa82f628e8194f0653e5f0ab640c7036 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Mon, 16 Oct 2023 21:34:46 +0100
Subject: [PATCH 070/595] Mi Band 8: Set display items (wip, chunked is broken)

---
 .../xiaomi/services/XiaomiSystemService.java  | 91 ++++++++++++++++++-
 1 file changed, 87 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
index a42d00732..f820dbd52 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
@@ -23,7 +23,9 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collections;
 import java.util.GregorianCalendar;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.TimeZone;
 
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
@@ -58,6 +60,7 @@ public class XiaomiSystemService extends AbstractXiaomiService {
     public static final int CMD_FIND_WATCH = 18;
     public static final int CMD_PASSWORD_SET = 21;
     public static final int CMD_DISPLAY_ITEMS_GET = 29;
+    public static final int CMD_DISPLAY_ITEMS_SET = 30;
     public static final int CMD_CHARGER = 79;
 
     public XiaomiSystemService(final XiaomiSupport support) {
@@ -70,7 +73,7 @@ public class XiaomiSystemService extends AbstractXiaomiService {
         getSupport().sendCommand(builder, COMMAND_TYPE, CMD_DEVICE_INFO);
         getSupport().sendCommand(builder, COMMAND_TYPE, CMD_BATTERY);
         getSupport().sendCommand(builder, COMMAND_TYPE, CMD_PASSWORD_GET);
-        // FIXME i think this needs chunked getSupport().sendCommand(builder, COMMAND_TYPE, CMD_DISPLAY_ITEMS_GET);
+        getSupport().sendCommand(builder, COMMAND_TYPE, CMD_DISPLAY_ITEMS_GET);
     }
 
     @Override
@@ -120,6 +123,8 @@ public class XiaomiSystemService extends AbstractXiaomiService {
             case PasswordCapabilityImpl.PREF_PASSWORD_ENABLED:
             case PasswordCapabilityImpl.PREF_PASSWORD:
                 setPassword(builder);
+            case HuamiConst.PREF_DISPLAY_ITEMS_SORTABLE:
+                setDisplayItems(builder);
                 return true;
         }
 
@@ -243,16 +248,65 @@ public class XiaomiSystemService extends AbstractXiaomiService {
 
     private void setDisplayItems(final TransactionBuilder builder) {
         final Prefs prefs = getDevicePrefs();
-        final ArrayList<String> allScreens = new ArrayList<>(prefs.getList(XiaomiPreferences.getPrefPossibleValuesKey(HuamiConst.PREF_DISPLAY_ITEMS_SORTABLE), Collections.emptyList()));
-        final ArrayList<String> enabledScreens = new ArrayList<>(prefs.getList(HuamiConst.PREF_DISPLAY_ITEMS_SORTABLE, Collections.emptyList()));
+        final List<String> allScreens = new ArrayList<>(prefs.getList(XiaomiPreferences.getPrefPossibleValuesKey(HuamiConst.PREF_DISPLAY_ITEMS_SORTABLE), Collections.emptyList()));
+        final List<String> enabledScreens = new ArrayList<>(prefs.getList(HuamiConst.PREF_DISPLAY_ITEMS_SORTABLE, Collections.emptyList()));
         if (allScreens.isEmpty()) {
             LOG.warn("No list of all screens");
             return;
         }
+
+        LOG.debug("Setting display items: {}", enabledScreens);
+
         if (!enabledScreens.contains("setting")) {
             enabledScreens.add("setting");
         }
-        // TODO i think this needs chunked
+
+        boolean inMoreSection = false;
+        final XiaomiProto.DisplayItems.Builder displayItems = XiaomiProto.DisplayItems.newBuilder();
+        for (final String enabledScreen : enabledScreens) {
+            if (enabledScreen.equals("more")) {
+                inMoreSection = true;
+                continue;
+            }
+
+            final XiaomiProto.DisplayItem.Builder displayItem = XiaomiProto.DisplayItem.newBuilder()
+                    .setCode(enabledScreen)
+                    .setName(DISPLAY_ITEM_NAMES.get(enabledScreen))
+                    .setUnknown5(1);
+
+            if (inMoreSection) {
+                displayItem.setInMoreSection(true);
+            }
+
+            if ("setting".equals(enabledScreen)) {
+                displayItem.setIsSettings(1);
+            }
+
+            displayItems.addDisplayItem(displayItem);
+        }
+
+        for (final String screen : allScreens) {
+            if (enabledScreens.contains(screen)) {
+                continue;
+            }
+
+            final XiaomiProto.DisplayItem.Builder displayItem = XiaomiProto.DisplayItem.newBuilder()
+                    .setCode(screen)
+                    .setName(DISPLAY_ITEM_NAMES.get(screen))
+                    .setDisabled(true)
+                    .setUnknown5(1);
+
+            displayItems.addDisplayItem(displayItem);
+        }
+
+        getSupport().sendCommand(
+                builder,
+                XiaomiProto.Command.newBuilder()
+                        .setType(COMMAND_TYPE)
+                        .setSubtype(CMD_DISPLAY_ITEMS_SET)
+                        .setSystem(XiaomiProto.System.newBuilder().setDisplayItems(displayItems))
+                        .build()
+        );
     }
 
     private void handleDisplayItems(final XiaomiProto.DisplayItems displayItems) {
@@ -315,4 +369,33 @@ public class XiaomiSystemService extends AbstractXiaomiService {
                         .build()
         );
     }
+
+    private static final Map<String, String> DISPLAY_ITEM_NAMES = new HashMap<String, String>() {{
+        put("today_act", "Stats");
+        put("sport", "Workout");
+        put("sport_record", "Activity");
+        put("sport_course", "Running");
+        put("sport_state", "Status");
+        put("heart", "Heart rate");
+        put("pai", "Vitality");
+        put("blood_ox", "SpO₂");
+        put("sleep", "Sleep");
+        put("press", "Stress");
+        put("weather", "Weather");
+        put("alarm", "Alarm");
+        put("setting", "Settings");
+        put("event_reminder", "Alerts");
+        put("schedule", "Events");
+        put("breath", "Breathing");
+        put("stopwatch", "Stopwatch");
+        put("music", "Music");
+        put("find_phone", "Find phone");
+        put("world_clock", "World clock");
+        put("phone_mute", "Silence phone");
+        put("phone_remote", "Camera");
+        put("count_down", "Timer");
+        put("focus", "Focus");
+        put("flash_light", "Flashlight");
+        put("fm_health", "Cycles");
+    }};
 }

From 4662da3b823b5d66385eedf27514f7d8a4117e39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Mon, 16 Oct 2023 21:35:02 +0100
Subject: [PATCH 071/595] Mi Band 8: Fix chunked receive decryption

---
 .../service/devices/xiaomi/XiaomiCharacteristic.java         | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
index 6cb652056..68c41c9f9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
@@ -148,6 +148,9 @@ public class XiaomiCharacteristic {
                 } else {
                     handler.handle(chunkBuffer.toByteArray());
                 }
+
+                currentChunk = 0;
+                chunkBuffer.reset();
             }
         } else {
             // Not a chunk / single-packet
@@ -162,6 +165,8 @@ public class XiaomiCharacteristic {
                         return;
                     }
                     numChunks = buf.getShort();
+                    currentChunk = 0;
+                    chunkBuffer.reset();
                     LOG.debug("Got chunked start request for {} chunks", numChunks);
                     sendChunkStartAck();
                     return;

From 544909a9708363b1cd311e31fc0eebc8d39eb2e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Mon, 16 Oct 2023 21:36:23 +0100
Subject: [PATCH 072/595] Mi Band 8: Activity fetching basics

---
 .../xiaomi/XiaomiEncryptedSupport.java        |   1 +
 .../activity/XiaomiActivityFileFetcher.java   | 145 ++++++++++++++++++
 .../xiaomi/activity/XiaomiActivityFileId.java | 125 +++++++++++++++
 .../xiaomi/activity/XiaomiActivityParser.java |  46 +++++-
 .../services/AbstractXiaomiService.java       |   2 +-
 .../xiaomi/services/XiaomiHealthService.java  | 125 ++++++++++-----
 app/src/main/proto/xiaomi.proto               |  11 +-
 .../activity/XiaomiActivityFileIdTest.java    |  55 +++++++
 8 files changed, 464 insertions(+), 46 deletions(-)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileFetcher.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java
 create mode 100644 app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileIdTest.java

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiEncryptedSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiEncryptedSupport.java
index 008c72cac..87c17cd91 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiEncryptedSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiEncryptedSupport.java
@@ -80,6 +80,7 @@ public class XiaomiEncryptedSupport extends XiaomiSupport {
         this.characteristicCommandWrite = new XiaomiCharacteristic(this, btCharacteristicCommandWrite, authService);
         this.characteristicCommandRead.setEncrypted(true);
         this.characteristicActivityData = new XiaomiCharacteristic(this, btCharacteristicActivityData, authService);
+        this.characteristicActivityData.setHandler(healthService.getActivityFetcher()::addChunk);
         this.characteristicCommandRead.setEncrypted(true);
         this.characteristicDataUpload = new XiaomiCharacteristic(this, btCharacteristicDataUpload, authService);
         this.characteristicCommandRead.setEncrypted(true);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileFetcher.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileFetcher.java
new file mode 100644
index 000000000..f996b4842
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileFetcher.java
@@ -0,0 +1,145 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity;
+
+import android.content.Context;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.ByteArrayOutputStream;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Queue;
+import java.util.Set;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.BLETypeConversions;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.XiaomiHealthService;
+import nodomain.freeyourgadget.gadgetbridge.util.CheckSums;
+import nodomain.freeyourgadget.gadgetbridge.util.GB;
+
+public class XiaomiActivityFileFetcher {
+    private static final Logger LOG = LoggerFactory.getLogger(XiaomiActivityFileFetcher.class);
+
+    private final XiaomiHealthService mHealthService;
+
+    private final Queue<List<XiaomiActivityFileId>> mFetchQueue = new LinkedList<>();
+    private ByteArrayOutputStream mBuffer = null;
+    private Set<XiaomiActivityFileId> pendingFiles = new HashSet<>();
+    private boolean isFetching = false;
+
+    public XiaomiActivityFileFetcher(final XiaomiHealthService healthService) {
+        this.mHealthService = healthService;
+    }
+
+    public void addChunk(final byte[] chunk) {
+        final int total = BLETypeConversions.toUint16(chunk, 0);
+        final int num = BLETypeConversions.toUint16(chunk, 2);
+
+        LOG.debug("Got activity chunk {}/{}", num, total);
+
+        if (num == 1) {
+            if (mBuffer == null) {
+                mBuffer = new ByteArrayOutputStream();
+            }
+            mBuffer.reset();
+            mBuffer.write(chunk, 4, chunk.length - 4);
+        }
+
+        if (num == total) {
+            final byte[] data = mBuffer.toByteArray();
+            mBuffer.reset();
+            mBuffer = null;
+
+            if (data.length < 13) {
+                LOG.warn("Activity data length of {} is too short", data.length);
+                // FIXME this may mess up the order.. maybe we should just abort
+                triggerNextFetch();
+                return;
+            }
+
+            if (!validChecksum(data)) {
+                LOG.warn("Invalid activity data checksum");
+                // FIXME this may mess up the order.. maybe we should just abort
+                triggerNextFetch();
+                return;
+            }
+
+            if (data[7] != 0) {
+                LOG.warn(
+                        "Unexpected activity payload byte {} at position 7 - parsing might fail",
+                        String.format("0x%02X", data[7])
+                );
+            }
+
+            final byte[] fileIdBytes = Arrays.copyOfRange(data, 0, 7);
+            final byte[] activityData = Arrays.copyOfRange(data, 8, data.length - 4);
+            final XiaomiActivityFileId fileId = XiaomiActivityFileId.from(fileIdBytes);
+
+            final XiaomiActivityParser activityParser = XiaomiActivityParser.create(fileId);
+            if (activityParser == null) {
+                LOG.warn("Failed to find activity parser for {}", fileId);
+                triggerNextFetch();
+                return;
+            }
+
+            if (activityParser.parse(fileId, activityData)) {
+                LOG.debug("Acking recorded data {}", fileId);
+                //mHealthService.ackRecordedData(fileId);
+            }
+
+            // FIXME only after receiving everything triggerNextFetch();
+        }
+    }
+
+    public void fetch(final List<XiaomiActivityFileId> fileIds) {
+        mFetchQueue.add(fileIds);
+        if (!isFetching) {
+            // Currently not fetching anything, fetch the next
+            final XiaomiSupport support = mHealthService.getSupport();
+            final Context context = support.getContext();
+            GB.updateTransferNotification(context.getString(R.string.busy_task_fetch_activity_data),"", true, 0, context);
+            support.getDevice().setBusyTask(context.getString(R.string.busy_task_fetch_activity_data));
+            triggerNextFetch();
+        }
+    }
+
+    private void triggerNextFetch() {
+        final List<XiaomiActivityFileId> fileIds = mFetchQueue.poll();
+
+        if (fileIds == null || fileIds.isEmpty()) {
+            mHealthService.getSupport().getDevice().unsetBusyTask();
+            GB.updateTransferNotification(null, "", false, 100, mHealthService.getSupport().getContext());
+            return;
+        }
+
+        mHealthService.requestRecordedData(fileIds);
+    }
+
+    public boolean validChecksum(final byte[] arr) {
+        final int arrCrc32 = CheckSums.getCRC32(arr, 0, arr.length - 4);
+        final int expectedCrc32 = BLETypeConversions.toUint32(arr, arr.length - 4);
+
+        return arrCrc32 == expectedCrc32;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java
new file mode 100644
index 000000000..18321edda
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java
@@ -0,0 +1,125 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity;
+
+import androidx.annotation.NonNull;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.Date;
+
+import nodomain.freeyourgadget.gadgetbridge.util.DateTimeUtils;
+
+public class XiaomiActivityFileId {
+    public static final int TYPE_ACTIVITY = 0;
+    public static final int TYPE_SPORTS = 1;
+
+    public static final int TYPE_DETAILS = 0;
+    public static final int TYPE_SUMMARY = 1;
+
+    private final Date timestamp;
+    private final int timezone;
+    private final int type;
+    private final int subtype;
+    private final int detailType;
+    private final int version;
+
+    public XiaomiActivityFileId(final Date timestamp,
+                                final int timezone,
+                                final int type,
+                                final int subtype,
+                                final int detailType,
+                                final int version) {
+        this.timestamp = timestamp;
+        this.timezone = timezone;
+        this.type = type;
+        this.subtype = subtype;
+        this.detailType = detailType;
+        this.version = version;
+    }
+
+    public Date getTimestamp() {
+        return timestamp;
+    }
+
+    public int getTimezone() {
+        return timezone;
+    }
+
+    public int getType() {
+        return type;
+    }
+
+    public int getSubtype() {
+        return subtype;
+    }
+
+    public int getDetailType() {
+        return detailType;
+    }
+
+    public int getVersion() {
+        return version;
+    }
+
+    public byte[] toBytes() {
+        final ByteBuffer buf = ByteBuffer.allocate(7).order(ByteOrder.LITTLE_ENDIAN);
+
+        buf.putInt((int) (timestamp.getTime() / 1000));
+        buf.put((byte) timezone);
+        buf.put((byte) version);
+        buf.put((byte) (type << 7 | subtype << 2 | detailType));
+
+        return buf.array();
+    }
+
+    public static XiaomiActivityFileId from(final byte[] bytes) {
+        assert bytes.length == 7;
+
+        return from(ByteBuffer.wrap(bytes).order(ByteOrder.LITTLE_ENDIAN));
+    }
+
+    public static XiaomiActivityFileId from(final ByteBuffer buf) {
+        final int ts = buf.getInt();
+        final int tz = buf.get(); // 15 min blocks
+        final int version = buf.get();
+        final int flags = buf.get();
+        // bit 0 is type - 0 activity, 1 sports
+        final int type = (flags >> 7) & 1;
+        // bit 1 to 6 bits are subtype
+        //   for activity: activity, sleep, measurements, etc
+        //   for workout: workout type (8 freestyle)
+        final int subtype = (flags & 127) >> 2;
+        // bit 6 and 7 - 0 details, 1 summary
+        final int detailType = flags & 3;
+
+        return new XiaomiActivityFileId(new Date(ts * 1000L), tz, version, type, subtype, detailType);
+    }
+
+    @NonNull
+    @Override
+    public String toString() {
+        return getClass().getSimpleName() + "{" +
+                "timestamp=" + DateTimeUtils.formatIso8601(timestamp) +
+                ", timezone=" + timezone +
+                ", type=" + type +
+                ", subtype=" + subtype +
+                ", detailType=" + detailType +
+                ", version=" + version +
+                "}";
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityParser.java
index 026172577..f1d5892d0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityParser.java
@@ -16,6 +16,50 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity;
 
-public class XiaomiActivityParser {
+import androidx.annotation.Nullable;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
+
+public abstract class XiaomiActivityParser {
+    private static final Logger LOG = LoggerFactory.getLogger(XiaomiActivityParser.class);
+
+    private final XiaomiSupport mSupport;
+
+    public XiaomiActivityParser(final XiaomiSupport support) {
+        this.mSupport = support;
+    }
+
+    public abstract boolean parse(final XiaomiActivityFileId fileId, final byte[] bytes);
+
+    public XiaomiSupport getSupport() {
+        return mSupport;
+    }
+
+    @Nullable
+    public static XiaomiActivityParser create(final XiaomiActivityFileId fileId) {
+        switch (fileId.getType()) {
+            case XiaomiActivityFileId.TYPE_ACTIVITY:
+                return createForActivity(fileId);
+            case XiaomiActivityFileId.TYPE_SPORTS:
+                return createForSports(fileId);
+        }
+
+        LOG.warn("Unknown file type for {}", fileId);
+        return null;
+    }
+
+    public static XiaomiActivityParser createForActivity(final XiaomiActivityFileId fileId) {
+        assert fileId.getType() == XiaomiActivityFileId.TYPE_ACTIVITY;
+
+        return null;
+    }
+
+    public static XiaomiActivityParser createForSports(final XiaomiActivityFileId fileId) {
+        assert fileId.getType() == XiaomiActivityFileId.TYPE_SPORTS;
+
+        return null;
+    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/AbstractXiaomiService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/AbstractXiaomiService.java
index 3a1d73b3a..18b2be35f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/AbstractXiaomiService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/AbstractXiaomiService.java
@@ -52,7 +52,7 @@ public abstract class AbstractXiaomiService {
         return false;
     }
 
-    protected XiaomiSupport getSupport() {
+    public XiaomiSupport getSupport() {
         return mSupport;
     }
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
index 45aa6e760..ebc5b4fef 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
@@ -20,14 +20,18 @@ import android.content.Intent;
 
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
+import com.google.protobuf.ByteString;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
+import java.util.List;
 import java.util.Locale;
 
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
@@ -49,6 +53,8 @@ import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiPreferences;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.XiaomiActivityFileFetcher;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.XiaomiActivityFileId;
 import nodomain.freeyourgadget.gadgetbridge.util.GB;
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 
@@ -58,8 +64,10 @@ public class XiaomiHealthService extends AbstractXiaomiService {
     public static final int COMMAND_TYPE = 8;
 
     private static final int CMD_SET_USER_INFO = 0;
-    private static final int CMD_ACTIVITY_FETCH_1 = 1;
-    private static final int CMD_ACTIVITY_FETCH_2 = 2;
+    private static final int CMD_ACTIVITY_FETCH_TODAY = 1;
+    private static final int CMD_ACTIVITY_FETCH_PAST = 2;
+    private static final int CMD_ACTIVITY_FETCH_REQUEST = 3;
+    private static final int CMD_ACTIVITY_FETCH_ACK = 5;
     private static final int CMD_CONFIG_SPO2_GET = 8;
     private static final int CMD_CONFIG_SPO2_SET = 9;
     private static final int CMD_CONFIG_HEART_RATE_GET = 10;
@@ -79,6 +87,8 @@ public class XiaomiHealthService extends AbstractXiaomiService {
     private boolean realtimeOneShot = false;
     private int previousSteps = -1;
 
+    private final XiaomiActivityFileFetcher activityFetcher = new XiaomiActivityFileFetcher(this);
+
     public XiaomiHealthService(final XiaomiSupport support) {
         super(support);
     }
@@ -89,9 +99,9 @@ public class XiaomiHealthService extends AbstractXiaomiService {
             case CMD_SET_USER_INFO:
                 LOG.debug("Got user info set ack, status={}", cmd.getStatus());
                 return;
-            case CMD_ACTIVITY_FETCH_1:
-            case CMD_ACTIVITY_FETCH_2:
-                handleActivityFetchResponse(cmd.getHealth().getActivityRecordIds().toByteArray());
+            case CMD_ACTIVITY_FETCH_TODAY:
+            case CMD_ACTIVITY_FETCH_PAST:
+                handleActivityFetchResponse(cmd.getSubtype(), cmd.getHealth().getActivityRequestFileIds().toByteArray());
                 return;
             case CMD_CONFIG_SPO2_GET:
                 handleSpo2Config(cmd.getHealth().getSpo2());
@@ -395,62 +405,97 @@ public class XiaomiHealthService extends AbstractXiaomiService {
         );
     }
 
+    public XiaomiActivityFileFetcher getActivityFetcher() {
+        return activityFetcher;
+    }
+
     public void onFetchRecordedData(final int dataTypes) {
         LOG.debug("Fetch recorded data: {}", dataTypes);
-        final TransactionBuilder builder = getSupport().createTransactionBuilder("fetch recorded data step 1");
 
+        fetchRecordedDataToday();
+    }
+
+    private void fetchRecordedDataToday() {
         getSupport().sendCommand(
-                builder,
+                "fetch recorded data today",
                 XiaomiProto.Command.newBuilder()
                         .setType(COMMAND_TYPE)
-                        .setSubtype(CMD_ACTIVITY_FETCH_1)
-                        .setHealth(XiaomiProto.Health.newBuilder().setActivitySyncRequest1(
-                                // TODO official app sends 0, but doesn't work every time?
-                                XiaomiProto.ActivitySyncRequest1.newBuilder().setUnknown1(1)
+                        .setSubtype(CMD_ACTIVITY_FETCH_TODAY)
+                        .setHealth(XiaomiProto.Health.newBuilder().setActivitySyncRequestToday(
+                                // TODO official app sends 0, but sometimes 1?
+                                XiaomiProto.ActivitySyncRequestToday.newBuilder().setUnknown1(0)
                         ))
                         .build()
         );
-
-        // TODO we need to wait for the reply from the previous before sending this one?
-        //getSupport().sendCommand(
-        //        builder,
-        //        XiaomiProto.Command.newBuilder()
-        //                .setType(COMMAND_TYPE)
-        //                .setSubtype(CMD_ACTIVITY_FETCH_2)
-        //                .build()
-        //);
-
-        builder.queue(getSupport().getQueue());
     }
 
-    public void handleActivityFetchResponse(final byte[] recordIds) {
+    private void fetchRecordedDataPast() {
+        getSupport().sendCommand(
+                "fetch recorded data past",
+                XiaomiProto.Command.newBuilder()
+                        .setType(COMMAND_TYPE)
+                        .setSubtype(CMD_ACTIVITY_FETCH_PAST)
+                        .build()
+        );
+    }
+
+    public void requestRecordedData(final List<XiaomiActivityFileId> fileIds) {
+        final ByteBuffer buf = ByteBuffer.allocate(7 * fileIds.size()).order(ByteOrder.LITTLE_ENDIAN);
+        for (final XiaomiActivityFileId fileId : fileIds) {
+            buf.put(fileId.toBytes());
+        }
+
+        getSupport().sendCommand(
+                "request recorded data",
+                XiaomiProto.Command.newBuilder()
+                        .setType(COMMAND_TYPE)
+                        .setSubtype(CMD_ACTIVITY_FETCH_REQUEST)
+                        .setHealth(XiaomiProto.Health.newBuilder().setActivityRequestFileIds(
+                                ByteString.copyFrom(buf.array())
+                        ))
+                        .build()
+        );
+    }
+
+    public void ackRecordedData(final XiaomiActivityFileId fileId) {
+        getSupport().sendCommand(
+                "ack recorded data",
+                XiaomiProto.Command.newBuilder()
+                        .setType(COMMAND_TYPE)
+                        .setSubtype(CMD_ACTIVITY_FETCH_ACK)
+                        .setHealth(XiaomiProto.Health.newBuilder().setActivitySyncAckFileIds(
+                                ByteString.copyFrom(fileId.toBytes())
+                        ))
+                        .build()
+        );
+    }
+
+    public void handleActivityFetchResponse(final int subtype, final byte[] recordIds) {
         if ((recordIds.length % 7) != 0) {
             LOG.warn("recordIds {} length = {}, not a multiple of 7, can't parse", GB.hexdump(recordIds), recordIds.length);
             return;
-
         }
 
         LOG.debug("Got {} record IDs", recordIds.length / 7);
 
         final ByteBuffer buf = ByteBuffer.wrap(recordIds).order(ByteOrder.LITTLE_ENDIAN);
 
+        final List<XiaomiActivityFileId> fileIds = new ArrayList<>();
+
         while (buf.position() < buf.limit()) {
-            final int ts = buf.getInt();
-            final int tz = buf.get(); // 15 min blocks
-            final int version = buf.get();
-            final int flags = buf.get();
-            // bit 0 is type - 0 activity, 1 sports
-            final int type = (flags >> 7) & 1;
-            // bit 1 to 6 bits are subtype
-            //   for activity: activity, sleep, measurements, etc
-            //   for workout: workout type (8 freestyle)
-            final int subtype = (flags & 127) >> 2;
-            // bit 6 and 7 - 0/1 - summary vs details
-            final int detailType = flags & 3;
-            LOG.debug(
-                    "Activity Record: ts = {}, tz = {}, flags = {}, type = {}, subtype = {}, detailType = {}, version = {}",
-                    ts, tz, String.format("0x%02X", flags), type, subtype, detailType, version
-            );
+            final XiaomiActivityFileId fileId = XiaomiActivityFileId.from(buf);
+            LOG.debug("Got activity to fetch: {}", fileId);
+            fileIds.add(fileId);
+        }
+
+        if (!fileIds.isEmpty()) {
+            LOG.debug("Fetching {} files", fileIds.size());
+            activityFetcher.fetch(fileIds);
+        }
+
+        if (subtype == CMD_ACTIVITY_FETCH_TODAY) {
+            LOG.debug("Fetch recorded data from the past");
+            // FIXME fix scheduling fetchRecordedDataPast();
         }
     }
 
diff --git a/app/src/main/proto/xiaomi.proto b/app/src/main/proto/xiaomi.proto
index 8e87d23bb..4daaa0f2c 100644
--- a/app/src/main/proto/xiaomi.proto
+++ b/app/src/main/proto/xiaomi.proto
@@ -282,8 +282,11 @@ message Charger {
 message Health {
   optional UserInfo userInfo = 1;
 
-  optional bytes activityRecordIds = 2;
-  optional ActivitySyncRequest1 activitySyncRequest1 = 5;
+  // 8, 2 get today | 8, 3 get past
+  optional bytes activityRequestFileIds = 2;
+  //
+  optional bytes activitySyncAckFileIds = 3;
+  optional ActivitySyncRequestToday activitySyncRequestToday = 5;
 
   optional SpO2 spo2 = 7;
   optional HeartRate heartRate = 8;
@@ -321,8 +324,8 @@ message UserInfo {
   optional uint32 goalMoving = 11; // minutes
 }
 
-message ActivitySyncRequest1 {
-  optional uint32 unknown1 = 1; // 0/1
+message ActivitySyncRequestToday {
+  optional uint32 unknown1 = 1; // 0 most of the time, sometimes 1
 }
 
 message SpO2 {
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileIdTest.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileIdTest.java
new file mode 100644
index 000000000..ca8d7e121
--- /dev/null
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileIdTest.java
@@ -0,0 +1,55 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+import java.util.Date;
+
+import nodomain.freeyourgadget.gadgetbridge.util.GB;
+
+public class XiaomiActivityFileIdTest {
+    @Test
+    public void testEncode() {
+        final byte[] bytes = GB.hexStringToByteArray("21F328650403A0");
+        final XiaomiActivityFileId xiaomiActivityFileId = new XiaomiActivityFileId(
+                new Date(1697182497000L),
+                4,
+                3,
+                1,
+                8,
+                0
+        );
+
+        assertArrayEquals(bytes, xiaomiActivityFileId.toBytes());
+    }
+
+    @Test
+    public void testDecode() {
+        final byte[] bytes = GB.hexStringToByteArray("21F328650403A0");
+        final XiaomiActivityFileId fileId = XiaomiActivityFileId.from(bytes);
+
+        assertEquals(1697182497000L, fileId.getTimestamp().getTime());
+        assertEquals(4, fileId.getTimezone());
+        assertEquals(3, fileId.getVersion());
+        assertEquals(1, fileId.getType());
+        assertEquals(8, fileId.getSubtype());
+        assertEquals(0, fileId.getDetailType());
+    }
+}

From b5a1846e49749b15af1dc01e06e30bcf7a544081 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Mon, 16 Oct 2023 22:00:13 +0100
Subject: [PATCH 073/595] Mi Band 8: Fix chunked encryption

---
 .../devices/xiaomi/XiaomiCharacteristic.java        | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
index 68c41c9f9..d2e4d3b95 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
@@ -183,7 +183,7 @@ public class XiaomiCharacteristic {
                         case 1:
                             LOG.debug("Got chunked ack start");
                             final TransactionBuilder builder = mSupport.createTransactionBuilder("send chunks");
-                            for (int i = 0; i * 242 < currentSending.length; i ++) {
+                            for (int i = 0; i * 242 < currentSending.length; i++) {
                                 final int startIndex = i * 242;
                                 final int endIndex = Math.min((i + 1) * 242, currentSending.length);
                                 LOG.debug("Sending chunk {} from {} to {}", i, startIndex, endIndex);
@@ -244,12 +244,13 @@ public class XiaomiCharacteristic {
         }
 
         if (shouldWriteChunked(currentSending)) {
+            // Prepend encrypted index
+            currentSending = ByteBuffer.allocate(2 + currentSending.length).order(ByteOrder.LITTLE_ENDIAN)
+                    .putShort(encryptedIndex++)
+                    .put(currentSending)
+                    .array();
+
             LOG.debug("Sending next - chunked");
-            // FIXME this is not efficient - re-encrypt with the correct key for chunked (assumes
-            //  final encrypted size is the same - need to check)
-            if (isEncrypted) {
-                currentSending = authService.encrypt(payload, (short) 0);
-            }
 
             sendingChunked = true;
 

From 7803581922809425fa608bc30fee968a4d2c7e6b Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Sun, 8 Oct 2023 19:56:03 +0200
Subject: [PATCH 074/595] Mi Watch Lite test based on miband 8 branch

very much wip
---
 .../miwatch/MiWatchLiteCoordinator.java       |  67 +++++++
 .../gadgetbridge/model/DeviceType.java        |   2 +
 .../service/DeviceSupportFactory.java         |   1 +
 .../devices/miwatch/MiWatchLiteSupport.java   | 165 ++++++++++++++++++
 app/src/main/res/values/strings.xml           |   1 +
 gradle/wrapper/gradle-wrapper.properties      |   6 +-
 6 files changed, 239 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miwatch/MiWatchLiteCoordinator.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miwatch/MiWatchLiteSupport.java

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miwatch/MiWatchLiteCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miwatch/MiWatchLiteCoordinator.java
new file mode 100644
index 000000000..8327d9b90
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miwatch/MiWatchLiteCoordinator.java
@@ -0,0 +1,67 @@
+/*  Copyright (C) 2023 Andreas Shimokawa
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.miwatch;
+
+import android.content.Context;
+import android.net.Uri;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.util.regex.Pattern;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.miwatch.MiWatchLiteSupport;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
+
+public class MiWatchLiteCoordinator extends XiaomiCoordinator {
+    @Override
+    protected Pattern getSupportedDeviceName() {
+        return Pattern.compile("^Mi Watch Lite_[A-Z0-9]{4}$");
+    }
+
+    @Nullable
+    @Override
+    public InstallHandler findInstallHandler(final Uri uri, final Context context) {
+        // TODO implement this
+        return super.findInstallHandler(uri, context);
+    }
+
+    @Override
+    public int getDeviceNameResource() {
+        return R.string.devicetype_xiaomi_watch_lite;
+    }
+
+    @Override
+    public int getDefaultIconResource() {
+        return R.drawable.ic_device_amazfit_bip;
+    }
+
+    @Override
+    public int getDisabledIconResource() {
+        return R.drawable.ic_device_amazfit_bip_disabled;
+    }
+
+    @NonNull
+    @Override
+    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+        return MiWatchLiteSupport.class;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
index b55711ab3..3d89a8c8d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
@@ -143,6 +143,7 @@ import nodomain.freeyourgadget.gadgetbridge.devices.withingssteelhr.WithingsStee
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.miband8.MiBand8Coordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xwatch.XWatchCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.zetime.ZeTimeCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.miwatch.MiWatchLiteCoordinator;
 
 /**
  * For every supported device, a device type constant must exist.
@@ -194,6 +195,7 @@ public enum DeviceType {
     AMAZFITPOPPRO(AmazfitPopProCoordinator.class),
     MIBAND7(MiBand7Coordinator.class),
     MIBAND8(MiBand8Coordinator.class),
+    MIWATCHLITE(MiWatchLiteCoordinator.class),
     AMAZFITGTS3(AmazfitGTS3Coordinator.class),
     AMAZFITGTR3(AmazfitGTR3Coordinator.class),
     AMAZFITGTR4(AmazfitGTR4Coordinator.class),
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceSupportFactory.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceSupportFactory.java
index d6edb830b..32d01343b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceSupportFactory.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceSupportFactory.java
@@ -22,6 +22,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service;
 
+import android.app.Service;
 import android.bluetooth.BluetoothAdapter;
 import android.content.Context;
 import android.util.Log;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miwatch/MiWatchLiteSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miwatch/MiWatchLiteSupport.java
new file mode 100644
index 000000000..ee0817c0e
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miwatch/MiWatchLiteSupport.java
@@ -0,0 +1,165 @@
+/*  Copyright (C) 2023 Andreas Shimokawa
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.miwatch;
+
+import android.bluetooth.BluetoothGatt;
+import android.bluetooth.BluetoothGattCharacteristic;
+import android.content.SharedPreferences;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.Arrays;
+import java.util.UUID;
+
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetDeviceStateAction;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
+import nodomain.freeyourgadget.gadgetbridge.util.ArrayUtils;
+import nodomain.freeyourgadget.gadgetbridge.util.GB;
+
+public class MiWatchLiteSupport extends XiaomiSupport {
+
+    private static final Logger LOG = LoggerFactory.getLogger(MiWatchLiteSupport.class);
+
+    private static final UUID UUID_CHARACTERISTIC_MAIN = UUID.fromString("16186f02-0000-1000-8000-00807f9b34fb");
+    private static final UUID UUID_CHARACTERISTIC_UNK1 = UUID.fromString("16186f01-0000-1000-8000-00807f9b34fb");
+    private static final UUID UUID_CHARACTERISTIC_UNK2 = UUID.fromString("16186f03-0000-1000-8000-00807f9b34fb");
+    private static final UUID UUID_CHARACTERISTIC_UNK3 = UUID.fromString("16186f04-0000-1000-8000-00807f9b34fb");
+    private static final UUID UUID_CHARACTERISTIC_UNK4 = UUID.fromString("16186f05-0000-1000-8000-00807f9b34fb");
+    private static boolean sendUserIdDone = false;
+
+    public MiWatchLiteSupport() {
+        super(); // FIXME: no we do not want to do this!! This adds supported characteristics which we do not have - but we have to.
+        addSupportedService(UUID.fromString("16186f00-0000-1000-8000-00807f9b34fb"));
+    }
+
+    @Override
+    protected TransactionBuilder initializeDevice(final TransactionBuilder builder) {
+
+        // FIXME why is this needed?
+        getDevice().setFirmwareVersion("...");
+        //getDevice().setFirmwareVersion2("...");
+        enableNotifications(builder, true);
+        builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.INITIALIZING, getContext()));
+        builder.requestMtu(247);
+        byte[] command = new byte[]{0, 0, 0, 0, 1, 0};
+        BluetoothGattCharacteristic characteristic = getCharacteristic(UUID_CHARACTERISTIC_MAIN);
+        builder.write(characteristic, command);
+
+        builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.INITIALIZED, getContext()));
+
+
+        return builder;
+    }
+
+    private void enableNotifications(TransactionBuilder builder, boolean enable) {
+        builder.notify(getCharacteristic(UUID_CHARACTERISTIC_MAIN), enable);
+        builder.notify(getCharacteristic(UUID_CHARACTERISTIC_UNK1), enable);
+        builder.notify(getCharacteristic(UUID_CHARACTERISTIC_UNK2), enable);
+        builder.notify(getCharacteristic(UUID_CHARACTERISTIC_UNK3), enable);
+        builder.notify(getCharacteristic(UUID_CHARACTERISTIC_UNK4), enable);
+    }
+
+    protected static byte[] getUserId(final GBDevice device) {
+        final byte[] userId = new byte[10];
+
+        final SharedPreferences sharedPrefs = GBApplication.getDeviceSpecificSharedPrefs(device.getAddress());
+
+        final String authKey = sharedPrefs.getString("authkey", null);
+        if (StringUtils.isNotBlank(authKey)) {
+            final byte[] srcBytes;
+            // Allow both with and without 0x, to avoid user mistakes
+            if (authKey.length() == 22 && authKey.startsWith("0x")) {
+                srcBytes = GB.hexStringToByteArray(authKey.trim().substring(2));
+            } else if (authKey.length() == 10) {
+                srcBytes = authKey.getBytes();
+            } else {
+                return null;
+            }
+            System.arraycopy(srcBytes, 0, userId, 0, 10);
+        }
+
+        return userId;
+    }
+
+    @Override
+    public void sendCommand(final TransactionBuilder builder, final nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto.Command command) {
+        final byte[] commandBytes = command.toByteArray();
+        final int commandLength = 2 + commandBytes.length;
+        if (commandLength > getMTU()) {
+            LOG.warn("Command with {} bytes is too large for MTU of {}", commandLength, getMTU());
+        }
+        builder.write(getCharacteristic(UUID_CHARACTERISTIC_MAIN), new byte[]{0x00, 0x00, 0x00, 0x00, 0x01, 0x00});
+        builder.wait(500);
+
+        final ByteBuffer buf = ByteBuffer.allocate(commandLength).order(ByteOrder.LITTLE_ENDIAN);
+        buf.put((byte) 1);
+        buf.put((byte) 0);
+        buf.put(commandBytes);
+        LOG.debug("Sending command {} as {}", GB.hexdump(commandBytes), GB.hexdump(buf.array()));
+        builder.write(getCharacteristic(UUID_CHARACTERISTIC_MAIN), buf.array());
+    }
+
+    @Override
+    public boolean onCharacteristicChanged(BluetoothGatt gatt,
+                                           BluetoothGattCharacteristic characteristic) {
+        if (super.onCharacteristicChanged(gatt, characteristic)) {
+            return true;
+        }
+
+        UUID characteristicUUID = characteristic.getUuid();
+
+        final byte[] success_bytes = new byte[]{0x00, 0x00, 0x01, 0x01, 0x00, 0x00};
+        final byte[] ping_request = new byte[]{0x00, 0x00, 0x00, 0x00, 0x01, 0x00};
+        if (characteristicUUID.equals(UUID_CHARACTERISTIC_MAIN)) {
+            if (Arrays.equals(success_bytes, characteristic.getValue()) && !sendUserIdDone) {
+                byte[] userId = getUserId(gbDevice);
+                if (userId == null) {
+                    LOG.warn("no user id, sending 0000000000, this won't work");
+                    userId = new byte[] {0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30};
+                }
+                sendUserIdDone = true;
+                TransactionBuilder builder = new TransactionBuilder("send user id");
+                builder.write(getCharacteristic(UUID_CHARACTERISTIC_MAIN), org.apache.commons.lang3.ArrayUtils.addAll(new byte[]{0x01, 0x00, 0x08, 0x01, 0x10, 0x05, 0x1a, 0x0c, 0x3a, 0x0a}, userId));
+                builder.queue(getQueue());
+                return true;
+            }
+        } else if (characteristicUUID.equals(UUID_CHARACTERISTIC_UNK1)) {
+            if (Arrays.equals(ping_request, characteristic.getValue())) {
+                TransactionBuilder builder = new TransactionBuilder("reply ping");
+                builder.write(getCharacteristic(UUID_CHARACTERISTIC_UNK1), new byte[]{0x00, 0x00, 0x01, 0x01});
+                builder.queue(getQueue());
+                return true;
+            }
+            if (ArrayUtils.startsWith(characteristic.getValue(), new byte[]{1, 0, 8})) {
+                TransactionBuilder builder = new TransactionBuilder("ack whatever");
+                builder.write(getCharacteristic(UUID_CHARACTERISTIC_UNK1), new byte[]{0x00, 0x00, 0x01, 0x00});
+                builder.queue(getQueue());
+                return true;
+            }
+
+        }
+        LOG.info("Unhandled characteristic changed: " + characteristicUUID);
+        return false;
+    }
+}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c27511017..515925d6a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1386,6 +1386,7 @@
     <string name="devicetype_sony_linkbuds_s">Sony LinkBuds S</string>
     <string name="devicetype_binary_sensor">Binary sensor</string>
     <string name="devicetype_femometer_vinca2">Femometer Vinca II</string>
+    <string name="devicetype_xiaomi_watch_lite">Xiaomi Watch Lite</string>
     <string name="choose_auto_export_location">Choose export location</string>
     <string name="notification_channel_name">General</string>
     <string name="notification_channel_high_priority_name">High-priority</string>
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a2e01c0df..99b91f965 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
+#Sun Oct 08 20:08:12 CEST 2023
 distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionSha256Sum=f581709a9c35e9cb92e16f585d2c4bc99b2b1a5f85d2badbd3dc6bff59e1e6dd
 distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
-zipStoreBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME

From d3fa3e2c050db0dd6038048cd8dee55a2ae3fb1e Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Sun, 15 Oct 2023 22:11:32 +0200
Subject: [PATCH 075/595] Xiaomi Protocol: Add userId auth command

---
 .../gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java  | 2 ++
 app/src/main/proto/xiaomi.proto                                 | 1 +
 2 files changed, 3 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java
index cf73f8664..350a74ccb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java
@@ -61,6 +61,8 @@ public class XiaomiAuthService extends AbstractXiaomiService {
 
     public static final int COMMAND_TYPE = 1;
 
+    public static final int CMD_SEND_USERID = 5;
+
     public static final int CMD_NONCE = 26;
     public static final int CMD_AUTH = 27;
 
diff --git a/app/src/main/proto/xiaomi.proto b/app/src/main/proto/xiaomi.proto
index 4daaa0f2c..f6fd63c1e 100644
--- a/app/src/main/proto/xiaomi.proto
+++ b/app/src/main/proto/xiaomi.proto
@@ -29,6 +29,7 @@ message Command {
 //
 
 message Auth {
+  optional string userId = 7;
   // 1, 26
   optional PhoneNonce phoneNonce = 30;
   optional WatchNonce watchNonce = 31;

From cdef620700a4863d2160134df8ccce4ce8fb63a6 Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Sun, 15 Oct 2023 22:12:17 +0200
Subject: [PATCH 076/595] Mi Watch Lite: use xiaomi protobuf for sending user
 id

---
 .../devices/miwatch/MiWatchLiteSupport.java   | 50 +++++++------------
 1 file changed, 18 insertions(+), 32 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miwatch/MiWatchLiteSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miwatch/MiWatchLiteSupport.java
index ee0817c0e..15a3d7027 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miwatch/MiWatchLiteSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miwatch/MiWatchLiteSupport.java
@@ -31,8 +31,10 @@ import java.util.UUID;
 
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetDeviceStateAction;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiAuthService;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
 import nodomain.freeyourgadget.gadgetbridge.util.ArrayUtils;
 import nodomain.freeyourgadget.gadgetbridge.util.GB;
@@ -46,7 +48,6 @@ public class MiWatchLiteSupport extends XiaomiSupport {
     private static final UUID UUID_CHARACTERISTIC_UNK2 = UUID.fromString("16186f03-0000-1000-8000-00807f9b34fb");
     private static final UUID UUID_CHARACTERISTIC_UNK3 = UUID.fromString("16186f04-0000-1000-8000-00807f9b34fb");
     private static final UUID UUID_CHARACTERISTIC_UNK4 = UUID.fromString("16186f05-0000-1000-8000-00807f9b34fb");
-    private static boolean sendUserIdDone = false;
 
     public MiWatchLiteSupport() {
         super(); // FIXME: no we do not want to do this!! This adds supported characteristics which we do not have - but we have to.
@@ -62,9 +63,18 @@ public class MiWatchLiteSupport extends XiaomiSupport {
         enableNotifications(builder, true);
         builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.INITIALIZING, getContext()));
         builder.requestMtu(247);
-        byte[] command = new byte[]{0, 0, 0, 0, 1, 0};
-        BluetoothGattCharacteristic characteristic = getCharacteristic(UUID_CHARACTERISTIC_MAIN);
-        builder.write(characteristic, command);
+        String userId = getUserId(gbDevice);
+
+        final XiaomiProto.Auth auth = XiaomiProto.Auth.newBuilder()
+                .setUserId(userId)
+                .build();
+
+        final XiaomiProto.Command command = XiaomiProto.Command.newBuilder()
+                .setType(XiaomiAuthService.COMMAND_TYPE)
+                .setSubtype(XiaomiAuthService.CMD_SEND_USERID)
+                .setAuth(auth)
+                .build();
+        sendCommand("send user id", command);
 
         builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.INITIALIZED, getContext()));
 
@@ -80,26 +90,15 @@ public class MiWatchLiteSupport extends XiaomiSupport {
         builder.notify(getCharacteristic(UUID_CHARACTERISTIC_UNK4), enable);
     }
 
-    protected static byte[] getUserId(final GBDevice device) {
-        final byte[] userId = new byte[10];
-
+    protected static String getUserId(final GBDevice device) {
         final SharedPreferences sharedPrefs = GBApplication.getDeviceSpecificSharedPrefs(device.getAddress());
 
         final String authKey = sharedPrefs.getString("authkey", null);
         if (StringUtils.isNotBlank(authKey)) {
-            final byte[] srcBytes;
-            // Allow both with and without 0x, to avoid user mistakes
-            if (authKey.length() == 22 && authKey.startsWith("0x")) {
-                srcBytes = GB.hexStringToByteArray(authKey.trim().substring(2));
-            } else if (authKey.length() == 10) {
-                srcBytes = authKey.getBytes();
-            } else {
-                return null;
-            }
-            System.arraycopy(srcBytes, 0, userId, 0, 10);
+            return authKey;
         }
 
-        return userId;
+        return "0000000000";
     }
 
     @Override
@@ -131,20 +130,7 @@ public class MiWatchLiteSupport extends XiaomiSupport {
 
         final byte[] success_bytes = new byte[]{0x00, 0x00, 0x01, 0x01, 0x00, 0x00};
         final byte[] ping_request = new byte[]{0x00, 0x00, 0x00, 0x00, 0x01, 0x00};
-        if (characteristicUUID.equals(UUID_CHARACTERISTIC_MAIN)) {
-            if (Arrays.equals(success_bytes, characteristic.getValue()) && !sendUserIdDone) {
-                byte[] userId = getUserId(gbDevice);
-                if (userId == null) {
-                    LOG.warn("no user id, sending 0000000000, this won't work");
-                    userId = new byte[] {0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30};
-                }
-                sendUserIdDone = true;
-                TransactionBuilder builder = new TransactionBuilder("send user id");
-                builder.write(getCharacteristic(UUID_CHARACTERISTIC_MAIN), org.apache.commons.lang3.ArrayUtils.addAll(new byte[]{0x01, 0x00, 0x08, 0x01, 0x10, 0x05, 0x1a, 0x0c, 0x3a, 0x0a}, userId));
-                builder.queue(getQueue());
-                return true;
-            }
-        } else if (characteristicUUID.equals(UUID_CHARACTERISTIC_UNK1)) {
+        if (characteristicUUID.equals(UUID_CHARACTERISTIC_UNK1)) {
             if (Arrays.equals(ping_request, characteristic.getValue())) {
                 TransactionBuilder builder = new TransactionBuilder("reply ping");
                 builder.write(getCharacteristic(UUID_CHARACTERISTIC_UNK1), new byte[]{0x00, 0x00, 0x01, 0x01});

From 84dff5b8dfc1e702acfdfbe23db56e7c56069e74 Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Sun, 15 Oct 2023 22:38:25 +0200
Subject: [PATCH 077/595] fix initialization

---
 .../service/devices/miwatch/MiWatchLiteSupport.java             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miwatch/MiWatchLiteSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miwatch/MiWatchLiteSupport.java
index 15a3d7027..f4356c5af 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miwatch/MiWatchLiteSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miwatch/MiWatchLiteSupport.java
@@ -74,7 +74,7 @@ public class MiWatchLiteSupport extends XiaomiSupport {
                 .setSubtype(XiaomiAuthService.CMD_SEND_USERID)
                 .setAuth(auth)
                 .build();
-        sendCommand("send user id", command);
+        sendCommand(builder, command);
 
         builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.INITIALIZED, getContext()));
 

From d953fd5b5bf427ccb4f08056a3129ca94a7d3336 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Mon, 16 Oct 2023 22:12:44 +0100
Subject: [PATCH 078/595] Mi Watch Lite: Refactor to use XiaomiCharacteristic

---
 .../miwatch/MiWatchLiteCoordinator.java       |   7 +-
 .../gadgetbridge/model/DeviceType.java        |   2 +-
 .../devices/miwatch/MiWatchLiteSupport.java   | 151 ------------------
 .../devices/xiaomi/XiaomiCharacteristic.java  |   6 +-
 .../xiaomi/XiaomiEncryptedSupport.java        |   4 +-
 .../xiaomi/XiaomiPlaintextSupport.java        | 122 ++++++++++++++
 .../service/devices/xiaomi/XiaomiSupport.java |   2 +
 7 files changed, 133 insertions(+), 161 deletions(-)
 rename app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/{ => xiaomi}/miwatch/MiWatchLiteCoordinator.java (90%)
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miwatch/MiWatchLiteSupport.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPlaintextSupport.java

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miwatch/MiWatchLiteCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatch/MiWatchLiteCoordinator.java
similarity index 90%
rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miwatch/MiWatchLiteCoordinator.java
rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatch/MiWatchLiteCoordinator.java
index 8327d9b90..51a9b17e6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miwatch/MiWatchLiteCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatch/MiWatchLiteCoordinator.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 <http://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.devices.miwatch;
+package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.miwatch;
 
 import android.content.Context;
 import android.net.Uri;
@@ -28,8 +28,7 @@ import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.miwatch.MiWatchLiteSupport;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiPlaintextSupport;
 
 public class MiWatchLiteCoordinator extends XiaomiCoordinator {
     @Override
@@ -62,6 +61,6 @@ public class MiWatchLiteCoordinator extends XiaomiCoordinator {
     @NonNull
     @Override
     public Class<? extends DeviceSupport> getDeviceSupportClass() {
-        return MiWatchLiteSupport.class;
+        return XiaomiPlaintextSupport.class;
     }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
index 3d89a8c8d..53f026eaa 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
@@ -143,7 +143,7 @@ import nodomain.freeyourgadget.gadgetbridge.devices.withingssteelhr.WithingsStee
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.miband8.MiBand8Coordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xwatch.XWatchCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.zetime.ZeTimeCoordinator;
-import nodomain.freeyourgadget.gadgetbridge.devices.miwatch.MiWatchLiteCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.miwatch.MiWatchLiteCoordinator;
 
 /**
  * For every supported device, a device type constant must exist.
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miwatch/MiWatchLiteSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miwatch/MiWatchLiteSupport.java
deleted file mode 100644
index f4356c5af..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miwatch/MiWatchLiteSupport.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*  Copyright (C) 2023 Andreas Shimokawa
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.service.devices.miwatch;
-
-import android.bluetooth.BluetoothGatt;
-import android.bluetooth.BluetoothGattCharacteristic;
-import android.content.SharedPreferences;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.util.Arrays;
-import java.util.UUID;
-
-import nodomain.freeyourgadget.gadgetbridge.GBApplication;
-import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
-import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
-import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetDeviceStateAction;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiAuthService;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
-import nodomain.freeyourgadget.gadgetbridge.util.ArrayUtils;
-import nodomain.freeyourgadget.gadgetbridge.util.GB;
-
-public class MiWatchLiteSupport extends XiaomiSupport {
-
-    private static final Logger LOG = LoggerFactory.getLogger(MiWatchLiteSupport.class);
-
-    private static final UUID UUID_CHARACTERISTIC_MAIN = UUID.fromString("16186f02-0000-1000-8000-00807f9b34fb");
-    private static final UUID UUID_CHARACTERISTIC_UNK1 = UUID.fromString("16186f01-0000-1000-8000-00807f9b34fb");
-    private static final UUID UUID_CHARACTERISTIC_UNK2 = UUID.fromString("16186f03-0000-1000-8000-00807f9b34fb");
-    private static final UUID UUID_CHARACTERISTIC_UNK3 = UUID.fromString("16186f04-0000-1000-8000-00807f9b34fb");
-    private static final UUID UUID_CHARACTERISTIC_UNK4 = UUID.fromString("16186f05-0000-1000-8000-00807f9b34fb");
-
-    public MiWatchLiteSupport() {
-        super(); // FIXME: no we do not want to do this!! This adds supported characteristics which we do not have - but we have to.
-        addSupportedService(UUID.fromString("16186f00-0000-1000-8000-00807f9b34fb"));
-    }
-
-    @Override
-    protected TransactionBuilder initializeDevice(final TransactionBuilder builder) {
-
-        // FIXME why is this needed?
-        getDevice().setFirmwareVersion("...");
-        //getDevice().setFirmwareVersion2("...");
-        enableNotifications(builder, true);
-        builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.INITIALIZING, getContext()));
-        builder.requestMtu(247);
-        String userId = getUserId(gbDevice);
-
-        final XiaomiProto.Auth auth = XiaomiProto.Auth.newBuilder()
-                .setUserId(userId)
-                .build();
-
-        final XiaomiProto.Command command = XiaomiProto.Command.newBuilder()
-                .setType(XiaomiAuthService.COMMAND_TYPE)
-                .setSubtype(XiaomiAuthService.CMD_SEND_USERID)
-                .setAuth(auth)
-                .build();
-        sendCommand(builder, command);
-
-        builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.INITIALIZED, getContext()));
-
-
-        return builder;
-    }
-
-    private void enableNotifications(TransactionBuilder builder, boolean enable) {
-        builder.notify(getCharacteristic(UUID_CHARACTERISTIC_MAIN), enable);
-        builder.notify(getCharacteristic(UUID_CHARACTERISTIC_UNK1), enable);
-        builder.notify(getCharacteristic(UUID_CHARACTERISTIC_UNK2), enable);
-        builder.notify(getCharacteristic(UUID_CHARACTERISTIC_UNK3), enable);
-        builder.notify(getCharacteristic(UUID_CHARACTERISTIC_UNK4), enable);
-    }
-
-    protected static String getUserId(final GBDevice device) {
-        final SharedPreferences sharedPrefs = GBApplication.getDeviceSpecificSharedPrefs(device.getAddress());
-
-        final String authKey = sharedPrefs.getString("authkey", null);
-        if (StringUtils.isNotBlank(authKey)) {
-            return authKey;
-        }
-
-        return "0000000000";
-    }
-
-    @Override
-    public void sendCommand(final TransactionBuilder builder, final nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto.Command command) {
-        final byte[] commandBytes = command.toByteArray();
-        final int commandLength = 2 + commandBytes.length;
-        if (commandLength > getMTU()) {
-            LOG.warn("Command with {} bytes is too large for MTU of {}", commandLength, getMTU());
-        }
-        builder.write(getCharacteristic(UUID_CHARACTERISTIC_MAIN), new byte[]{0x00, 0x00, 0x00, 0x00, 0x01, 0x00});
-        builder.wait(500);
-
-        final ByteBuffer buf = ByteBuffer.allocate(commandLength).order(ByteOrder.LITTLE_ENDIAN);
-        buf.put((byte) 1);
-        buf.put((byte) 0);
-        buf.put(commandBytes);
-        LOG.debug("Sending command {} as {}", GB.hexdump(commandBytes), GB.hexdump(buf.array()));
-        builder.write(getCharacteristic(UUID_CHARACTERISTIC_MAIN), buf.array());
-    }
-
-    @Override
-    public boolean onCharacteristicChanged(BluetoothGatt gatt,
-                                           BluetoothGattCharacteristic characteristic) {
-        if (super.onCharacteristicChanged(gatt, characteristic)) {
-            return true;
-        }
-
-        UUID characteristicUUID = characteristic.getUuid();
-
-        final byte[] success_bytes = new byte[]{0x00, 0x00, 0x01, 0x01, 0x00, 0x00};
-        final byte[] ping_request = new byte[]{0x00, 0x00, 0x00, 0x00, 0x01, 0x00};
-        if (characteristicUUID.equals(UUID_CHARACTERISTIC_UNK1)) {
-            if (Arrays.equals(ping_request, characteristic.getValue())) {
-                TransactionBuilder builder = new TransactionBuilder("reply ping");
-                builder.write(getCharacteristic(UUID_CHARACTERISTIC_UNK1), new byte[]{0x00, 0x00, 0x01, 0x01});
-                builder.queue(getQueue());
-                return true;
-            }
-            if (ArrayUtils.startsWith(characteristic.getValue(), new byte[]{1, 0, 8})) {
-                TransactionBuilder builder = new TransactionBuilder("ack whatever");
-                builder.write(getCharacteristic(UUID_CHARACTERISTIC_UNK1), new byte[]{0x00, 0x00, 0x01, 0x00});
-                builder.queue(getQueue());
-                return true;
-            }
-
-        }
-        LOG.info("Unhandled characteristic changed: " + characteristicUUID);
-        return false;
-    }
-}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
index d2e4d3b95..6c7f664db 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
@@ -38,8 +38,6 @@ import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
 
 public class XiaomiCharacteristic {
     public static final byte[] PAYLOAD_ACK = new byte[]{0, 0, 3, 0};
-    public static final byte[] PAYLOAD_CHUNKED_START_ACK = new byte[]{0, 0, 1, 1};
-    public static final byte[] PAYLOAD_CHUNKED_END_ACK = new byte[]{0, 0, 1, 0};
 
     private final Logger LOG;
 
@@ -301,13 +299,13 @@ public class XiaomiCharacteristic {
 
     private void sendChunkStartAck() {
         final TransactionBuilder builder = mSupport.createTransactionBuilder("send chunked start ack");
-        builder.write(bluetoothGattCharacteristic, PAYLOAD_CHUNKED_START_ACK);
+        builder.write(bluetoothGattCharacteristic, new byte[]{0x00, 0x00, 0x01, 0x01});
         builder.queue(mSupport.getQueue());
     }
 
     private void sendChunkEndAck() {
         final TransactionBuilder builder = mSupport.createTransactionBuilder("send chunked end ack");
-        builder.write(bluetoothGattCharacteristic, PAYLOAD_CHUNKED_END_ACK);
+        builder.write(bluetoothGattCharacteristic, new byte[]{0x00, 0x00, 0x01, 0x00});
         builder.queue(mSupport.getQueue());
     }
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiEncryptedSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiEncryptedSupport.java
index 87c17cd91..8e51887e1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiEncryptedSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiEncryptedSupport.java
@@ -68,12 +68,13 @@ public class XiaomiEncryptedSupport extends XiaomiSupport {
         final BluetoothGattCharacteristic btCharacteristicActivityData = getCharacteristic(UUID_CHARACTERISTIC_XIAOMI_ACTIVITY_DATA);
         final BluetoothGattCharacteristic btCharacteristicDataUpload = getCharacteristic(UUID_CHARACTERISTIC_XIAOMI_DATA_UPLOAD);
 
-        if (btCharacteristicCommandRead == null || btCharacteristicCommandWrite == null || btCharacteristicActivityData == null || btCharacteristicDataUpload == null) {
+        if (btCharacteristicCommandRead == null || btCharacteristicCommandWrite == null) {
             LOG.warn("Characteristics are null, will attempt to reconnect");
             builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.WAITING_FOR_RECONNECT, getContext()));
             return builder;
         }
 
+        // TODO move this initialization to upstream class
         this.characteristicCommandRead = new XiaomiCharacteristic(this, btCharacteristicCommandRead, authService);
         this.characteristicCommandRead.setEncrypted(true);
         this.characteristicCommandRead.setHandler(this::handleCommandBytes);
@@ -96,6 +97,7 @@ public class XiaomiEncryptedSupport extends XiaomiSupport {
         builder.notify(getCharacteristic(UUID_CHARACTERISTIC_XIAOMI_COMMAND_WRITE), true);
         builder.notify(getCharacteristic(UUID_CHARACTERISTIC_XIAOMI_ACTIVITY_DATA), true);
         builder.notify(getCharacteristic(UUID_CHARACTERISTIC_XIAOMI_DATA_UPLOAD), true);
+
         authService.startEncryptedHandshake(builder);
 
         return builder;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPlaintextSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPlaintextSupport.java
new file mode 100644
index 000000000..ff668849a
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPlaintextSupport.java
@@ -0,0 +1,122 @@
+/*  Copyright (C) 2023 Andreas Shimokawa
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi;
+
+import android.bluetooth.BluetoothGattCharacteristic;
+import android.content.SharedPreferences;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.UUID;
+
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetDeviceStateAction;
+import nodomain.freeyourgadget.gadgetbridge.util.GB;
+
+public class XiaomiPlaintextSupport extends XiaomiSupport {
+
+    private static final Logger LOG = LoggerFactory.getLogger(XiaomiPlaintextSupport.class);
+
+    private static final UUID UUID_CHARACTERISTIC_MAIN_READ = UUID.fromString("16186f01-0000-1000-8000-00807f9b34fb");
+    private static final UUID UUID_CHARACTERISTIC_MAIN_WRITE = UUID.fromString("16186f02-0000-1000-8000-00807f9b34fb");
+    private static final UUID UUID_CHARACTERISTIC_ACTIVITY_DATA = UUID.fromString("16186f03-0000-1000-8000-00807f9b34fb");
+    private static final UUID UUID_CHARACTERISTIC_DATA_UPLOAD = UUID.fromString("16186f04-0000-1000-8000-00807f9b34fb");
+    private static final UUID UUID_CHARACTERISTIC_UNK5 = UUID.fromString("16186f05-0000-1000-8000-00807f9b34fb");
+
+    public XiaomiPlaintextSupport() {
+        super();
+        addSupportedService(UUID.fromString("16186f00-0000-1000-8000-00807f9b34fb"));
+    }
+
+    @Override
+    protected TransactionBuilder initializeDevice(final TransactionBuilder builder) {
+        final BluetoothGattCharacteristic btCharacteristicCommandRead = getCharacteristic(UUID_CHARACTERISTIC_MAIN_READ);
+        final BluetoothGattCharacteristic btCharacteristicCommandWrite = getCharacteristic(UUID_CHARACTERISTIC_MAIN_WRITE);
+        final BluetoothGattCharacteristic btCharacteristicActivityData = getCharacteristic(UUID_CHARACTERISTIC_ACTIVITY_DATA);
+        final BluetoothGattCharacteristic btCharacteristicDataUpload = getCharacteristic(UUID_CHARACTERISTIC_DATA_UPLOAD);
+
+        if (btCharacteristicCommandRead == null || btCharacteristicCommandWrite == null) {
+            LOG.warn("Characteristics are null, will attempt to reconnect");
+            builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.WAITING_FOR_RECONNECT, getContext()));
+            return builder;
+        }
+
+        // TODO move this initialization to upstream class
+        this.characteristicCommandRead = new XiaomiCharacteristic(this, btCharacteristicCommandRead, authService);
+        this.characteristicCommandRead.setEncrypted(false);
+        this.characteristicCommandRead.setHandler(this::handleCommandBytes);
+        this.characteristicCommandWrite = new XiaomiCharacteristic(this, btCharacteristicCommandWrite, authService);
+        this.characteristicCommandRead.setEncrypted(false);
+        this.characteristicActivityData = new XiaomiCharacteristic(this, btCharacteristicActivityData, authService);
+        this.characteristicActivityData.setHandler(healthService.getActivityFetcher()::addChunk);
+        this.characteristicCommandRead.setEncrypted(false);
+        this.characteristicDataUpload = new XiaomiCharacteristic(this, btCharacteristicDataUpload, authService);
+        this.characteristicCommandRead.setEncrypted(false);
+
+        // FIXME why is this needed?
+        getDevice().setFirmwareVersion("...");
+        //getDevice().setFirmwareVersion2("...");
+
+        enableNotifications(builder, true);
+        builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.INITIALIZING, getContext()));
+        builder.requestMtu(247);
+        String userId = getUserId(gbDevice);
+
+        final XiaomiProto.Auth auth = XiaomiProto.Auth.newBuilder()
+                .setUserId(userId)
+                .build();
+
+        final XiaomiProto.Command command = XiaomiProto.Command.newBuilder()
+                .setType(XiaomiAuthService.COMMAND_TYPE)
+                .setSubtype(XiaomiAuthService.CMD_SEND_USERID)
+                .setAuth(auth)
+                .build();
+
+        sendCommand(builder, command);
+
+        builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.INITIALIZED, getContext()));
+
+
+        return builder;
+    }
+
+    private void enableNotifications(TransactionBuilder builder, boolean enable) {
+        builder.notify(getCharacteristic(UUID_CHARACTERISTIC_MAIN_WRITE), enable);
+        builder.notify(getCharacteristic(UUID_CHARACTERISTIC_MAIN_READ), enable);
+        builder.notify(getCharacteristic(UUID_CHARACTERISTIC_ACTIVITY_DATA), enable);
+        builder.notify(getCharacteristic(UUID_CHARACTERISTIC_DATA_UPLOAD), enable);
+        builder.notify(getCharacteristic(UUID_CHARACTERISTIC_UNK5), enable);
+    }
+
+    protected static String getUserId(final GBDevice device) {
+        final SharedPreferences sharedPrefs = GBApplication.getDeviceSpecificSharedPrefs(device.getAddress());
+
+        final String authKey = sharedPrefs.getString("authkey", null);
+        if (StringUtils.isNotBlank(authKey)) {
+            return authKey;
+        }
+
+        return "0000000000";
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
index e3f8ae022..1441ea584 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
@@ -394,12 +394,14 @@ public abstract class XiaomiSupport extends AbstractBTLEDeviceSupport {
     }
 
     public void sendCommand(final TransactionBuilder builder, final XiaomiProto.Command command) {
+        // FIXME builder is ignored
         final byte[] commandBytes = command.toByteArray();
         LOG.debug("Sending command {}", GB.hexdump(commandBytes));
         this.characteristicCommandWrite.write(commandBytes);
     }
 
     public void sendCommand(final TransactionBuilder builder, final byte[] commandBytes) {
+        // FIXME builder is ignored
         this.characteristicCommandWrite.write(commandBytes);
     }
 

From 1920968fba3912c1fbad12dac9b08094f4e35249 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Tue, 17 Oct 2023 13:14:35 +0100
Subject: [PATCH 079/595] Mi Watch Lite: Attempt to fix plaintext support

---
 .../devices/xiaomi/XiaomiCharacteristic.java       | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
index 6c7f664db..70a06ad35 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
@@ -242,11 +242,13 @@ public class XiaomiCharacteristic {
         }
 
         if (shouldWriteChunked(currentSending)) {
-            // Prepend encrypted index
-            currentSending = ByteBuffer.allocate(2 + currentSending.length).order(ByteOrder.LITTLE_ENDIAN)
-                    .putShort(encryptedIndex++)
-                    .put(currentSending)
-                    .array();
+            if (isEncrypted) {
+                // Prepend encrypted index for the nonce
+                currentSending = ByteBuffer.allocate(2 + currentSending.length).order(ByteOrder.LITTLE_ENDIAN)
+                        .putShort(encryptedIndex++)
+                        .put(currentSending)
+                        .array();
+            }
 
             LOG.debug("Sending next - chunked");
 
@@ -255,7 +257,7 @@ public class XiaomiCharacteristic {
             final ByteBuffer buf = ByteBuffer.allocate(6).order(ByteOrder.LITTLE_ENDIAN);
             buf.putShort((short) 0);
             buf.put((byte) 0);
-            buf.put((byte) 1);
+            buf.put((byte) (isEncrypted ? 1 : 0));
             buf.putShort((short) Math.round(currentSending.length / 247.0));
 
             final TransactionBuilder builder = mSupport.createTransactionBuilder("send chunked start");

From b103b4f3e46bd184809a0dcba1f56c70a8837878 Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Tue, 17 Oct 2023 15:20:20 +0200
Subject: [PATCH 080/595] Mi Watch Lite: fix unencrypted support after
 refactoring common Xiaomi code

---
 .../service/devices/xiaomi/XiaomiCharacteristic.java        | 2 +-
 .../service/devices/xiaomi/XiaomiPlaintextSupport.java      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
index 70a06ad35..0ce491bb4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
@@ -258,7 +258,7 @@ public class XiaomiCharacteristic {
             buf.putShort((short) 0);
             buf.put((byte) 0);
             buf.put((byte) (isEncrypted ? 1 : 0));
-            buf.putShort((short) Math.round(currentSending.length / 247.0));
+            buf.putShort((short) Math.max(1,Math.round(currentSending.length / 247.0)));
 
             final TransactionBuilder builder = mSupport.createTransactionBuilder("send chunked start");
             builder.write(bluetoothGattCharacteristic, buf.array());
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPlaintextSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPlaintextSupport.java
index ff668849a..422f3ec28 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPlaintextSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPlaintextSupport.java
@@ -67,12 +67,12 @@ public class XiaomiPlaintextSupport extends XiaomiSupport {
         this.characteristicCommandRead.setEncrypted(false);
         this.characteristicCommandRead.setHandler(this::handleCommandBytes);
         this.characteristicCommandWrite = new XiaomiCharacteristic(this, btCharacteristicCommandWrite, authService);
-        this.characteristicCommandRead.setEncrypted(false);
+        this.characteristicCommandWrite.setEncrypted(false);
         this.characteristicActivityData = new XiaomiCharacteristic(this, btCharacteristicActivityData, authService);
         this.characteristicActivityData.setHandler(healthService.getActivityFetcher()::addChunk);
-        this.characteristicCommandRead.setEncrypted(false);
+        this.characteristicActivityData.setEncrypted(false);
         this.characteristicDataUpload = new XiaomiCharacteristic(this, btCharacteristicDataUpload, authService);
-        this.characteristicCommandRead.setEncrypted(false);
+        this.characteristicDataUpload.setEncrypted(false);
 
         // FIXME why is this needed?
         getDevice().setFirmwareVersion("...");

From a19318c5bd081da15a55d2831e80f0d9ab3b5602 Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Tue, 17 Oct 2023 15:40:15 +0200
Subject: [PATCH 081/595] Mi Watch Lite: more small fixes for non-encrypted
 path

---
 .../service/devices/xiaomi/XiaomiCharacteristic.java  | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
index 0ce491bb4..3fa284499 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
@@ -140,7 +140,7 @@ public class XiaomiCharacteristic {
             if (chunk == numChunks) {
                 sendChunkEndAck();
 
-                if (authService != null) {
+                if (isEncrypted) {
                     // chunks are always encrypted if an auth service is available
                     handler.handle(authService.decrypt(chunkBuffer.toByteArray()));
                 } else {
@@ -157,9 +157,10 @@ public class XiaomiCharacteristic {
             switch (type) {
                 case 0:
                     // Chunked start request
-                    final byte one = buf.get(); // ?
-                    if (one != 1) {
-                        LOG.warn("Chunked start request: expected 1, got {}", one);
+                    final byte messageEncrypted = buf.get();
+                    byte expectedResult = (byte) (isEncrypted ? 1 : 0);
+                    if (messageEncrypted != expectedResult) {
+                        LOG.warn("Chunked start request: expected {}, got {}", expectedResult, messageEncrypted);
                         return;
                     }
                     numChunks = buf.getShort();
@@ -258,7 +259,7 @@ public class XiaomiCharacteristic {
             buf.putShort((short) 0);
             buf.put((byte) 0);
             buf.put((byte) (isEncrypted ? 1 : 0));
-            buf.putShort((short) Math.max(1,Math.round(currentSending.length / 247.0)));
+            buf.putShort((short) Math.max(1, Math.round(currentSending.length / 247.0)));
 
             final TransactionBuilder builder = mSupport.createTransactionBuilder("send chunked start");
             builder.write(bluetoothGattCharacteristic, buf.array());

From f3d6be2f96e2161e7383c3f99d902ab78380bf53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Tue, 17 Oct 2023 13:24:01 +0100
Subject: [PATCH 082/595] Xiaomi: Handle chunked nack

---
 .../service/devices/xiaomi/XiaomiCharacteristic.java        | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
index 3fa284499..fc28e43e8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
@@ -194,6 +194,12 @@ public class XiaomiCharacteristic {
 
                             builder.queue(mSupport.getQueue());
                             return;
+                        case 2:
+                            LOG.warn("Got chunked nack");
+                            currentSending = null;
+                            sendingChunked = false;
+                            sendNext();
+                            return;
                     }
 
                     LOG.warn("Unknown chunked ack subtype {}", subtype);

From 7de94432d0a8df51c9eba82f8b904fd17691cb24 Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Tue, 17 Oct 2023 22:12:06 +0200
Subject: [PATCH 083/595] Mi Watch Lite: authenticate via use
 XiaomiAuthService, handle subtype 5 send user id reply

This makes device info and battery status work since AuthService calls phase2Initialize()
---
 .../devices/xiaomi/XiaomiAuthService.java     | 34 +++++++++++++++----
 .../xiaomi/XiaomiPlaintextSupport.java        | 19 ++---------
 app/src/main/proto/xiaomi.proto               |  1 +
 3 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java
index 350a74ccb..a3e7ef5f4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java
@@ -90,6 +90,22 @@ public class XiaomiAuthService extends AbstractXiaomiService {
         );
     }
 
+    protected void startClearTextHandshake(final TransactionBuilder builder, String userId) {
+        builder.add(new SetDeviceStateAction(getSupport().getDevice(), GBDevice.State.AUTHENTICATING, getSupport().getContext()));
+
+        final XiaomiProto.Auth auth = XiaomiProto.Auth.newBuilder()
+                .setUserId(userId)
+                .build();
+
+        final XiaomiProto.Command command = XiaomiProto.Command.newBuilder()
+                .setType(XiaomiAuthService.COMMAND_TYPE)
+                .setSubtype(XiaomiAuthService.CMD_SEND_USERID)
+                .setAuth(auth)
+                .build();
+
+        getSupport().sendCommand(builder, command);
+    }
+
     @Override
     public void handleCommand(final XiaomiProto.Command cmd) {
         if (cmd.getType() != COMMAND_TYPE) {
@@ -117,16 +133,20 @@ public class XiaomiAuthService extends AbstractXiaomiService {
                 break;
             }
 
-            case CMD_AUTH: {
-                LOG.info("Authenticated!");
+            case CMD_AUTH:
+            case CMD_SEND_USERID: {
+                if (cmd.getSubtype() == CMD_AUTH || cmd.getAuth().getStatus() == 1) {
+                    LOG.info("Authenticated!");
 
-                final TransactionBuilder builder = getSupport().createTransactionBuilder("phase 2 initialize");
-                builder.add(new SetDeviceStateAction(getSupport().getDevice(), GBDevice.State.INITIALIZED, getSupport().getContext()));
-                getSupport().phase2Initialize(builder);
-                builder.queue(getSupport().getQueue());
+                    final TransactionBuilder builder = getSupport().createTransactionBuilder("phase 2 initialize");
+                    builder.add(new SetDeviceStateAction(getSupport().getDevice(), GBDevice.State.INITIALIZED, getSupport().getContext()));
+                    getSupport().phase2Initialize(builder);
+                    builder.queue(getSupport().getQueue());
+                } else {
+                    LOG.warn("could not authenticate");
+                }
                 break;
             }
-
             default:
                 LOG.warn("Unknown auth payload subtype {}", cmd.getSubtype());
         }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPlaintextSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPlaintextSupport.java
index 422f3ec28..9f20a8180 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPlaintextSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPlaintextSupport.java
@@ -78,25 +78,12 @@ public class XiaomiPlaintextSupport extends XiaomiSupport {
         getDevice().setFirmwareVersion("...");
         //getDevice().setFirmwareVersion2("...");
 
-        enableNotifications(builder, true);
         builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.INITIALIZING, getContext()));
+        enableNotifications(builder, true);
         builder.requestMtu(247);
+
         String userId = getUserId(gbDevice);
-
-        final XiaomiProto.Auth auth = XiaomiProto.Auth.newBuilder()
-                .setUserId(userId)
-                .build();
-
-        final XiaomiProto.Command command = XiaomiProto.Command.newBuilder()
-                .setType(XiaomiAuthService.COMMAND_TYPE)
-                .setSubtype(XiaomiAuthService.CMD_SEND_USERID)
-                .setAuth(auth)
-                .build();
-
-        sendCommand(builder, command);
-
-        builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.INITIALIZED, getContext()));
-
+        authService.startClearTextHandshake(builder, userId);
 
         return builder;
     }
diff --git a/app/src/main/proto/xiaomi.proto b/app/src/main/proto/xiaomi.proto
index f6fd63c1e..97650a7dc 100644
--- a/app/src/main/proto/xiaomi.proto
+++ b/app/src/main/proto/xiaomi.proto
@@ -30,6 +30,7 @@ message Command {
 
 message Auth {
   optional string userId = 7;
+  optional uint32 status = 8;
   // 1, 26
   optional PhoneNonce phoneNonce = 30;
   optional WatchNonce watchNonce = 31;

From 01a552e0f7a2c6da6665453fb7167bea8277edea Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Tue, 17 Oct 2023 22:25:31 +0200
Subject: [PATCH 084/595] Mi Watch Lite: Do not set firmware version to ...
 during connect

---
 .../service/devices/xiaomi/XiaomiPlaintextSupport.java        | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPlaintextSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPlaintextSupport.java
index 9f20a8180..8b5ff3788 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPlaintextSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPlaintextSupport.java
@@ -74,10 +74,6 @@ public class XiaomiPlaintextSupport extends XiaomiSupport {
         this.characteristicDataUpload = new XiaomiCharacteristic(this, btCharacteristicDataUpload, authService);
         this.characteristicDataUpload.setEncrypted(false);
 
-        // FIXME why is this needed?
-        getDevice().setFirmwareVersion("...");
-        //getDevice().setFirmwareVersion2("...");
-
         builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.INITIALIZING, getContext()));
         enableNotifications(builder, true);
         builder.requestMtu(247);

From d66de2f94f142c499fe69671414cee3c6b1db8c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Tue, 17 Oct 2023 21:25:16 +0100
Subject: [PATCH 085/595] Xiaomi: Fix activity file id encoding

---
 .../xiaomi/activity/XiaomiActivityFileId.java |  2 +-
 .../activity/XiaomiActivityFileIdTest.java    | 48 +++++++++++++++----
 2 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java
index 18321edda..ab327fef5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java
@@ -107,7 +107,7 @@ public class XiaomiActivityFileId {
         // bit 6 and 7 - 0 details, 1 summary
         final int detailType = flags & 3;
 
-        return new XiaomiActivityFileId(new Date(ts * 1000L), tz, version, type, subtype, detailType);
+        return new XiaomiActivityFileId(new Date(ts * 1000L), tz, type, subtype, detailType, version);
     }
 
     @NonNull
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileIdTest.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileIdTest.java
index ca8d7e121..576974cda 100644
--- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileIdTest.java
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileIdTest.java
@@ -16,18 +16,23 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 import nodomain.freeyourgadget.gadgetbridge.util.GB;
 
 public class XiaomiActivityFileIdTest {
     @Test
     public void testEncode() {
-        final byte[] bytes = GB.hexStringToByteArray("21F328650403A0");
+        final byte[] expectedEncoding = GB.hexStringToByteArray("21F3286504008C");
         final XiaomiActivityFileId xiaomiActivityFileId = new XiaomiActivityFileId(
                 new Date(1697182497000L),
                 4,
@@ -37,19 +42,42 @@ public class XiaomiActivityFileIdTest {
                 0
         );
 
-        assertArrayEquals(bytes, xiaomiActivityFileId.toBytes());
+        assertArrayEquals(expectedEncoding, xiaomiActivityFileId.toBytes());
     }
 
     @Test
     public void testDecode() {
         final byte[] bytes = GB.hexStringToByteArray("21F328650403A0");
-        final XiaomiActivityFileId fileId = XiaomiActivityFileId.from(bytes);
+        final XiaomiActivityFileId expectedFileId = XiaomiActivityFileId.from(bytes);
 
-        assertEquals(1697182497000L, fileId.getTimestamp().getTime());
-        assertEquals(4, fileId.getTimezone());
-        assertEquals(3, fileId.getVersion());
-        assertEquals(1, fileId.getType());
-        assertEquals(8, fileId.getSubtype());
-        assertEquals(0, fileId.getDetailType());
+        assertEquals(1697182497000L, expectedFileId.getTimestamp().getTime());
+        assertEquals(4, expectedFileId.getTimezone());
+        assertEquals(3, expectedFileId.getVersion());
+        assertEquals(1, expectedFileId.getType());
+        assertEquals(8, expectedFileId.getSubtype());
+        assertEquals(0, expectedFileId.getDetailType());
+    }
+
+    @Test
+    public void testDecodeEncode() {
+        final byte[] bytes = GB.hexStringToByteArray("21F328650403A021F3286504008C");
+
+        final ByteBuffer bufDecode = ByteBuffer.wrap(bytes).order(ByteOrder.LITTLE_ENDIAN);
+
+        final List<XiaomiActivityFileId> fileIds = new ArrayList<>();
+
+        while (bufDecode.position() < bufDecode.limit()) {
+            final XiaomiActivityFileId fileId = XiaomiActivityFileId.from(bufDecode);
+            fileIds.add(fileId);
+            System.out.println(fileId);
+        }
+
+        final ByteBuffer bufEncode = ByteBuffer.allocate(fileIds.size() * 7).order(ByteOrder.LITTLE_ENDIAN);
+
+        for (final XiaomiActivityFileId fileId : fileIds) {
+            bufEncode.put(fileId.toBytes());
+        }
+
+        assertArrayEquals(bytes, bufEncode.array());
     }
 }

From d35bcef4068575d6c2265cd78ef649376b8c99d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Tue, 17 Oct 2023 21:44:27 +0100
Subject: [PATCH 086/595] Mi Band 8: Fix activity fetching

---
 .../devices/xiaomi/XiaomiCoordinator.java     |  6 ++
 .../devices/xiaomi/XiaomiPreferences.java     |  8 +++
 .../activity/XiaomiActivityFileFetcher.java   | 56 +++++++++----------
 .../xiaomi/services/XiaomiHealthService.java  | 24 ++------
 4 files changed, 48 insertions(+), 46 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
index fdcb7109d..f7ae7caea 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
@@ -343,6 +343,12 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
         settings.add(R.xml.devicesettings_header_other);
         settings.add(R.xml.devicesettings_camera_remote);
 
+        //
+        // Developer
+        //
+        settings.add(R.xml.devicesettings_header_developer);
+        settings.add(R.xml.devicesettings_keep_activity_data_on_device);
+
         return ArrayUtils.toPrimitive(settings.toArray(new Integer[0]));
     }
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPreferences.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPreferences.java
index e29017385..86c17af4f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPreferences.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPreferences.java
@@ -22,7 +22,10 @@ import java.util.GregorianCalendar;
 import java.util.Locale;
 import java.util.TimeZone;
 
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
+import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 
 public final class XiaomiPreferences {
     private XiaomiPreferences() {
@@ -61,4 +64,9 @@ public final class XiaomiPreferences {
     public static String getPrefPossibleValuesKey(final String key) {
         return String.format(Locale.ROOT, "%s_possible_values", key);
     }
+
+    public static boolean keepActivityDataOnDevice(final GBDevice gbDevice) {
+        final Prefs prefs = new Prefs(GBApplication.getDeviceSpecificSharedPrefs(gbDevice.getAddress()));
+        return prefs.getBoolean("keep_activity_data_on_device", false);
+    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileFetcher.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileFetcher.java
index f996b4842..bbeefb2a0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileFetcher.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileFetcher.java
@@ -33,6 +33,7 @@ import java.util.Set;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.BLETypeConversions;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiPreferences;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.XiaomiHealthService;
 import nodomain.freeyourgadget.gadgetbridge.util.CheckSums;
@@ -43,9 +44,8 @@ public class XiaomiActivityFileFetcher {
 
     private final XiaomiHealthService mHealthService;
 
-    private final Queue<List<XiaomiActivityFileId>> mFetchQueue = new LinkedList<>();
-    private ByteArrayOutputStream mBuffer = null;
-    private Set<XiaomiActivityFileId> pendingFiles = new HashSet<>();
+    private final Queue<XiaomiActivityFileId> mFetchQueue = new LinkedList<>();
+    private ByteArrayOutputStream mBuffer = new ByteArrayOutputStream();
     private boolean isFetching = false;
 
     public XiaomiActivityFileFetcher(final XiaomiHealthService healthService) {
@@ -58,18 +58,11 @@ public class XiaomiActivityFileFetcher {
 
         LOG.debug("Got activity chunk {}/{}", num, total);
 
-        if (num == 1) {
-            if (mBuffer == null) {
-                mBuffer = new ByteArrayOutputStream();
-            }
-            mBuffer.reset();
-            mBuffer.write(chunk, 4, chunk.length - 4);
-        }
+        mBuffer.write(chunk, 4, chunk.length - 4);
 
         if (num == total) {
             final byte[] data = mBuffer.toByteArray();
-            mBuffer.reset();
-            mBuffer = null;
+            mBuffer = new ByteArrayOutputStream();
 
             if (data.length < 13) {
                 LOG.warn("Activity data length of {} is too short", data.length);
@@ -78,8 +71,15 @@ public class XiaomiActivityFileFetcher {
                 return;
             }
 
-            if (!validChecksum(data)) {
-                LOG.warn("Invalid activity data checksum");
+            final int arrCrc32 = CheckSums.getCRC32(data, 0, data.length - 4);
+            final int expectedCrc32 = BLETypeConversions.toUint32(data, data.length - 4);
+
+            if (arrCrc32 != expectedCrc32) {
+                LOG.warn(
+                        "Invalid activity data checksum: got {}, expected {}",
+                        String.format("%08X", arrCrc32),
+                        String.format("%08X", expectedCrc32)
+                );
                 // FIXME this may mess up the order.. maybe we should just abort
                 triggerNextFetch();
                 return;
@@ -104,18 +104,21 @@ public class XiaomiActivityFileFetcher {
             }
 
             if (activityParser.parse(fileId, activityData)) {
-                LOG.debug("Acking recorded data {}", fileId);
-                //mHealthService.ackRecordedData(fileId);
+                if (!XiaomiPreferences.keepActivityDataOnDevice(mHealthService.getSupport().getDevice())) {
+                    LOG.debug("Acking recorded data {}", fileId);
+                    mHealthService.ackRecordedData(fileId);
+                }
             }
 
-            // FIXME only after receiving everything triggerNextFetch();
+            triggerNextFetch();
         }
     }
 
-    public void fetch(final List<XiaomiActivityFileId> fileIds) {
-        mFetchQueue.add(fileIds);
+    public void fetch(final XiaomiActivityFileId fileId) {
+        mFetchQueue.add(fileId);
         if (!isFetching) {
             // Currently not fetching anything, fetch the next
+            isFetching = true;
             final XiaomiSupport support = mHealthService.getSupport();
             final Context context = support.getContext();
             GB.updateTransferNotification(context.getString(R.string.busy_task_fetch_activity_data),"", true, 0, context);
@@ -125,21 +128,18 @@ public class XiaomiActivityFileFetcher {
     }
 
     private void triggerNextFetch() {
-        final List<XiaomiActivityFileId> fileIds = mFetchQueue.poll();
+        final XiaomiActivityFileId fileId = mFetchQueue.poll();
 
-        if (fileIds == null || fileIds.isEmpty()) {
+        if (fileId == null) {
+            LOG.debug("Nothing more to fetch");
+            isFetching = false;
             mHealthService.getSupport().getDevice().unsetBusyTask();
             GB.updateTransferNotification(null, "", false, 100, mHealthService.getSupport().getContext());
             return;
         }
 
-        mHealthService.requestRecordedData(fileIds);
-    }
+        LOG.debug("Triggering next fetch for: {}", fileId);
 
-    public boolean validChecksum(final byte[] arr) {
-        final int arrCrc32 = CheckSums.getCRC32(arr, 0, arr.length - 4);
-        final int expectedCrc32 = BLETypeConversions.toUint32(arr, arr.length - 4);
-
-        return arrCrc32 == expectedCrc32;
+        mHealthService.requestRecordedData(fileId);
     }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
index ebc5b4fef..91cc82bea 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
@@ -410,7 +410,7 @@ public class XiaomiHealthService extends AbstractXiaomiService {
     }
 
     public void onFetchRecordedData(final int dataTypes) {
-        LOG.debug("Fetch recorded data: {}", dataTypes);
+        LOG.debug("Fetch recorded data: {}", String.format("0x%08X", dataTypes));
 
         fetchRecordedDataToday();
     }
@@ -439,19 +439,14 @@ public class XiaomiHealthService extends AbstractXiaomiService {
         );
     }
 
-    public void requestRecordedData(final List<XiaomiActivityFileId> fileIds) {
-        final ByteBuffer buf = ByteBuffer.allocate(7 * fileIds.size()).order(ByteOrder.LITTLE_ENDIAN);
-        for (final XiaomiActivityFileId fileId : fileIds) {
-            buf.put(fileId.toBytes());
-        }
-
+    public void requestRecordedData(final XiaomiActivityFileId fileId) {
         getSupport().sendCommand(
                 "request recorded data",
                 XiaomiProto.Command.newBuilder()
                         .setType(COMMAND_TYPE)
                         .setSubtype(CMD_ACTIVITY_FETCH_REQUEST)
                         .setHealth(XiaomiProto.Health.newBuilder().setActivityRequestFileIds(
-                                ByteString.copyFrom(buf.array())
+                                ByteString.copyFrom(fileId.toBytes())
                         ))
                         .build()
         );
@@ -476,26 +471,19 @@ public class XiaomiHealthService extends AbstractXiaomiService {
             return;
         }
 
-        LOG.debug("Got {} record IDs", recordIds.length / 7);
+        LOG.debug("Got {} activity file IDs", recordIds.length / 7);
 
         final ByteBuffer buf = ByteBuffer.wrap(recordIds).order(ByteOrder.LITTLE_ENDIAN);
 
-        final List<XiaomiActivityFileId> fileIds = new ArrayList<>();
-
         while (buf.position() < buf.limit()) {
             final XiaomiActivityFileId fileId = XiaomiActivityFileId.from(buf);
             LOG.debug("Got activity to fetch: {}", fileId);
-            fileIds.add(fileId);
-        }
-
-        if (!fileIds.isEmpty()) {
-            LOG.debug("Fetching {} files", fileIds.size());
-            activityFetcher.fetch(fileIds);
+            activityFetcher.fetch(fileId);
         }
 
         if (subtype == CMD_ACTIVITY_FETCH_TODAY) {
             LOG.debug("Fetch recorded data from the past");
-            // FIXME fix scheduling fetchRecordedDataPast();
+            fetchRecordedDataPast();
         }
     }
 

From 1b6bb20890dee0a68bd1fdfa2c63badbc4ec05ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Tue, 17 Oct 2023 22:39:49 +0100
Subject: [PATCH 087/595] Xiaomi: Move initialization logic to base class

---
 .../xiaomi/XiaomiEncryptedSupport.java        | 54 ++++++--------
 .../xiaomi/XiaomiPlaintextSupport.java        | 70 +++++++------------
 .../service/devices/xiaomi/XiaomiSupport.java | 46 ++++++++++++
 3 files changed, 93 insertions(+), 77 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiEncryptedSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiEncryptedSupport.java
index 8e51887e1..1da4fab33 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiEncryptedSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiEncryptedSupport.java
@@ -62,44 +62,32 @@ public class XiaomiEncryptedSupport extends XiaomiSupport {
     }
 
     @Override
-    protected TransactionBuilder initializeDevice(final TransactionBuilder builder) {
-        final BluetoothGattCharacteristic btCharacteristicCommandRead = getCharacteristic(UUID_CHARACTERISTIC_XIAOMI_COMMAND_READ);
-        final BluetoothGattCharacteristic btCharacteristicCommandWrite = getCharacteristic(UUID_CHARACTERISTIC_XIAOMI_COMMAND_WRITE);
-        final BluetoothGattCharacteristic btCharacteristicActivityData = getCharacteristic(UUID_CHARACTERISTIC_XIAOMI_ACTIVITY_DATA);
-        final BluetoothGattCharacteristic btCharacteristicDataUpload = getCharacteristic(UUID_CHARACTERISTIC_XIAOMI_DATA_UPLOAD);
+    protected boolean isEncrypted() {
+        return true;
+    }
 
-        if (btCharacteristicCommandRead == null || btCharacteristicCommandWrite == null) {
-            LOG.warn("Characteristics are null, will attempt to reconnect");
-            builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.WAITING_FOR_RECONNECT, getContext()));
-            return builder;
-        }
+    @Override
+    protected UUID getCharacteristicCommandRead() {
+        return UUID_CHARACTERISTIC_XIAOMI_COMMAND_READ;
+    }
 
-        // TODO move this initialization to upstream class
-        this.characteristicCommandRead = new XiaomiCharacteristic(this, btCharacteristicCommandRead, authService);
-        this.characteristicCommandRead.setEncrypted(true);
-        this.characteristicCommandRead.setHandler(this::handleCommandBytes);
-        this.characteristicCommandWrite = new XiaomiCharacteristic(this, btCharacteristicCommandWrite, authService);
-        this.characteristicCommandRead.setEncrypted(true);
-        this.characteristicActivityData = new XiaomiCharacteristic(this, btCharacteristicActivityData, authService);
-        this.characteristicActivityData.setHandler(healthService.getActivityFetcher()::addChunk);
-        this.characteristicCommandRead.setEncrypted(true);
-        this.characteristicDataUpload = new XiaomiCharacteristic(this, btCharacteristicDataUpload, authService);
-        this.characteristicCommandRead.setEncrypted(true);
+    @Override
+    protected UUID getCharacteristicCommandWrite() {
+        return UUID_CHARACTERISTIC_XIAOMI_COMMAND_WRITE;
+    }
 
-        // FIXME why is this needed?
-        getDevice().setFirmwareVersion("...");
-        //getDevice().setFirmwareVersion2("...");
+    @Override
+    protected UUID getCharacteristicActivityData() {
+        return UUID_CHARACTERISTIC_XIAOMI_ACTIVITY_DATA;
+    }
 
-        builder.requestMtu(247);
-
-        builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.INITIALIZING, getContext()));
-        builder.notify(getCharacteristic(UUID_CHARACTERISTIC_XIAOMI_COMMAND_READ), true);
-        builder.notify(getCharacteristic(UUID_CHARACTERISTIC_XIAOMI_COMMAND_WRITE), true);
-        builder.notify(getCharacteristic(UUID_CHARACTERISTIC_XIAOMI_ACTIVITY_DATA), true);
-        builder.notify(getCharacteristic(UUID_CHARACTERISTIC_XIAOMI_DATA_UPLOAD), true);
+    @Override
+    protected UUID getCharacteristicDataUpload() {
+        return UUID_CHARACTERISTIC_XIAOMI_DATA_UPLOAD;
+    }
 
+    @Override
+    protected void startAuthentication(TransactionBuilder builder) {
         authService.startEncryptedHandshake(builder);
-
-        return builder;
     }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPlaintextSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPlaintextSupport.java
index 8b5ff3788..8a2ea5e53 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPlaintextSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPlaintextSupport.java
@@ -16,23 +16,17 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi;
 
-import android.bluetooth.BluetoothGattCharacteristic;
 import android.content.SharedPreferences;
 
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
 import java.util.UUID;
 
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
-import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetDeviceStateAction;
-import nodomain.freeyourgadget.gadgetbridge.util.GB;
 
 public class XiaomiPlaintextSupport extends XiaomiSupport {
 
@@ -50,46 +44,34 @@ public class XiaomiPlaintextSupport extends XiaomiSupport {
     }
 
     @Override
-    protected TransactionBuilder initializeDevice(final TransactionBuilder builder) {
-        final BluetoothGattCharacteristic btCharacteristicCommandRead = getCharacteristic(UUID_CHARACTERISTIC_MAIN_READ);
-        final BluetoothGattCharacteristic btCharacteristicCommandWrite = getCharacteristic(UUID_CHARACTERISTIC_MAIN_WRITE);
-        final BluetoothGattCharacteristic btCharacteristicActivityData = getCharacteristic(UUID_CHARACTERISTIC_ACTIVITY_DATA);
-        final BluetoothGattCharacteristic btCharacteristicDataUpload = getCharacteristic(UUID_CHARACTERISTIC_DATA_UPLOAD);
-
-        if (btCharacteristicCommandRead == null || btCharacteristicCommandWrite == null) {
-            LOG.warn("Characteristics are null, will attempt to reconnect");
-            builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.WAITING_FOR_RECONNECT, getContext()));
-            return builder;
-        }
-
-        // TODO move this initialization to upstream class
-        this.characteristicCommandRead = new XiaomiCharacteristic(this, btCharacteristicCommandRead, authService);
-        this.characteristicCommandRead.setEncrypted(false);
-        this.characteristicCommandRead.setHandler(this::handleCommandBytes);
-        this.characteristicCommandWrite = new XiaomiCharacteristic(this, btCharacteristicCommandWrite, authService);
-        this.characteristicCommandWrite.setEncrypted(false);
-        this.characteristicActivityData = new XiaomiCharacteristic(this, btCharacteristicActivityData, authService);
-        this.characteristicActivityData.setHandler(healthService.getActivityFetcher()::addChunk);
-        this.characteristicActivityData.setEncrypted(false);
-        this.characteristicDataUpload = new XiaomiCharacteristic(this, btCharacteristicDataUpload, authService);
-        this.characteristicDataUpload.setEncrypted(false);
-
-        builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.INITIALIZING, getContext()));
-        enableNotifications(builder, true);
-        builder.requestMtu(247);
-
-        String userId = getUserId(gbDevice);
-        authService.startClearTextHandshake(builder, userId);
-
-        return builder;
+    protected boolean isEncrypted() {
+        return false;
     }
 
-    private void enableNotifications(TransactionBuilder builder, boolean enable) {
-        builder.notify(getCharacteristic(UUID_CHARACTERISTIC_MAIN_WRITE), enable);
-        builder.notify(getCharacteristic(UUID_CHARACTERISTIC_MAIN_READ), enable);
-        builder.notify(getCharacteristic(UUID_CHARACTERISTIC_ACTIVITY_DATA), enable);
-        builder.notify(getCharacteristic(UUID_CHARACTERISTIC_DATA_UPLOAD), enable);
-        builder.notify(getCharacteristic(UUID_CHARACTERISTIC_UNK5), enable);
+    @Override
+    protected UUID getCharacteristicCommandRead() {
+        return UUID_CHARACTERISTIC_MAIN_READ;
+    }
+
+    @Override
+    protected UUID getCharacteristicCommandWrite() {
+        return UUID_CHARACTERISTIC_MAIN_WRITE;
+    }
+
+    @Override
+    protected UUID getCharacteristicActivityData() {
+        return UUID_CHARACTERISTIC_ACTIVITY_DATA;
+    }
+
+    @Override
+    protected UUID getCharacteristicDataUpload() {
+        return UUID_CHARACTERISTIC_DATA_UPLOAD;
+    }
+
+    @Override
+    protected void startAuthentication(final TransactionBuilder builder) {
+        final String userId = getUserId(gbDevice);
+        authService.startClearTextHandshake(builder, userId);
     }
 
     protected static String getUserId(final GBDevice device) {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
index 1441ea584..485bc0df2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
@@ -49,6 +49,7 @@ import nodomain.freeyourgadget.gadgetbridge.model.WorldClock;
 import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.AbstractBTLEDeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetDeviceStateAction;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.AbstractXiaomiService;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.XiaomiCalendarService;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.XiaomiHealthService;
@@ -92,6 +93,51 @@ public abstract class XiaomiSupport extends AbstractBTLEDeviceSupport {
         super(LOG);
     }
 
+    protected abstract boolean isEncrypted();
+    protected abstract UUID getCharacteristicCommandRead();
+    protected abstract UUID getCharacteristicCommandWrite();
+    protected abstract UUID getCharacteristicActivityData();
+    protected abstract UUID getCharacteristicDataUpload();
+    protected abstract void startAuthentication(TransactionBuilder builder);
+
+    @Override
+    protected final TransactionBuilder initializeDevice(final TransactionBuilder builder) {
+        final BluetoothGattCharacteristic btCharacteristicCommandRead = getCharacteristic(getCharacteristicCommandRead());
+        final BluetoothGattCharacteristic btCharacteristicCommandWrite = getCharacteristic(getCharacteristicCommandWrite());
+        final BluetoothGattCharacteristic btCharacteristicActivityData = getCharacteristic(getCharacteristicActivityData());
+        final BluetoothGattCharacteristic btCharacteristicDataUpload = getCharacteristic(getCharacteristicDataUpload());
+
+        if (btCharacteristicCommandRead == null || btCharacteristicCommandWrite == null) {
+            LOG.warn("Characteristics are null, will attempt to reconnect");
+            builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.WAITING_FOR_RECONNECT, getContext()));
+            return builder;
+        }
+
+        this.characteristicCommandRead = new XiaomiCharacteristic(this, btCharacteristicCommandRead, authService);
+        this.characteristicCommandRead.setEncrypted(isEncrypted());
+        this.characteristicCommandRead.setHandler(this::handleCommandBytes);
+        this.characteristicCommandWrite = new XiaomiCharacteristic(this, btCharacteristicCommandWrite, authService);
+        this.characteristicCommandRead.setEncrypted(isEncrypted());
+        this.characteristicActivityData = new XiaomiCharacteristic(this, btCharacteristicActivityData, authService);
+        this.characteristicActivityData.setHandler(healthService.getActivityFetcher()::addChunk);
+        this.characteristicCommandRead.setEncrypted(isEncrypted());
+        this.characteristicDataUpload = new XiaomiCharacteristic(this, btCharacteristicDataUpload, authService);
+        this.characteristicCommandRead.setEncrypted(isEncrypted());
+
+        builder.requestMtu(247);
+
+        builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.INITIALIZING, getContext()));
+
+        builder.notify(btCharacteristicCommandRead, true);
+        builder.notify(btCharacteristicCommandWrite, true);
+        builder.notify(btCharacteristicActivityData, true);
+        builder.notify(btCharacteristicDataUpload, true);
+
+        startAuthentication(builder);
+
+        return builder;
+    }
+
     @Override
     public boolean useAutoConnect() {
         return true;

From bcefc39ad84ccfecb10e183f39b9052e965a633f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Wed, 18 Oct 2023 10:08:51 +0100
Subject: [PATCH 088/595] Mi Band 8: Restore setting of firmware version before
 initializing

---
 .../service/devices/xiaomi/XiaomiEncryptedSupport.java      | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiEncryptedSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiEncryptedSupport.java
index 1da4fab33..fc5719b70 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiEncryptedSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiEncryptedSupport.java
@@ -87,7 +87,11 @@ public class XiaomiEncryptedSupport extends XiaomiSupport {
     }
 
     @Override
-    protected void startAuthentication(TransactionBuilder builder) {
+    protected void startAuthentication(final TransactionBuilder builder) {
+        // FIXME why is this needed? We get an NPE without it
+        getDevice().setFirmwareVersion("...");
+        //getDevice().setFirmwareVersion2("...");
+
         authService.startEncryptedHandshake(builder);
     }
 }

From e40b7036786acf603382cc79bc048e02cb3687d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Wed, 18 Oct 2023 11:02:49 +0100
Subject: [PATCH 089/595] Xiaomi: Dump activity data to storage

---
 .../activity/XiaomiActivityFileFetcher.java   | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileFetcher.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileFetcher.java
index bbeefb2a0..65fad626f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileFetcher.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileFetcher.java
@@ -22,21 +22,29 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.OutputStream;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
+import java.text.SimpleDateFormat;
 import java.util.Arrays;
+import java.util.GregorianCalendar;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Queue;
 import java.util.Set;
 
+import nodomain.freeyourgadget.gadgetbridge.BuildConfig;
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.BLETypeConversions;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiPreferences;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.XiaomiHealthService;
 import nodomain.freeyourgadget.gadgetbridge.util.CheckSums;
+import nodomain.freeyourgadget.gadgetbridge.util.FileUtils;
 import nodomain.freeyourgadget.gadgetbridge.util.GB;
 
 public class XiaomiActivityFileFetcher {
@@ -96,6 +104,11 @@ public class XiaomiActivityFileFetcher {
             final byte[] activityData = Arrays.copyOfRange(data, 8, data.length - 4);
             final XiaomiActivityFileId fileId = XiaomiActivityFileId.from(fileIdBytes);
 
+            if (BuildConfig.DEBUG) {
+                // FIXME comment this out
+                dumpBytesToExternalStorage(fileId, data);
+            }
+
             final XiaomiActivityParser activityParser = XiaomiActivityParser.create(fileId);
             if (activityParser == null) {
                 LOG.warn("Failed to find activity parser for {}", fileId);
@@ -142,4 +155,22 @@ public class XiaomiActivityFileFetcher {
 
         mHealthService.requestRecordedData(fileId);
     }
+
+    protected void dumpBytesToExternalStorage(final XiaomiActivityFileId fileId, final byte[] bytes) {
+        try {
+            final File externalFilesDir = FileUtils.getExternalFilesDir();
+            final File targetDir = new File(externalFilesDir, "rawFetchOperations");
+            targetDir.mkdirs();
+
+            final String filename = "xiaomi_" + GB.hexdump(fileId.toBytes()) + ".bin";
+
+            final File outputFile = new File(targetDir, filename);
+
+            final OutputStream outputStream = new FileOutputStream(outputFile);
+            outputStream.write(bytes);
+            outputStream.close();
+        } catch (final Exception e) {
+            LOG.error("Failed to dump bytes to storage", e);
+        }
+    }
 }

From 5316a7dcf81f8dfe3ac7d637fd73b6a2d81f097b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Wed, 18 Oct 2023 11:04:28 +0100
Subject: [PATCH 090/595] Xiaomi: Send device update intent on activity fetch
 start and finish

---
 .../devices/xiaomi/activity/XiaomiActivityFileFetcher.java      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileFetcher.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileFetcher.java
index 65fad626f..04205027b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileFetcher.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileFetcher.java
@@ -136,6 +136,7 @@ public class XiaomiActivityFileFetcher {
             final Context context = support.getContext();
             GB.updateTransferNotification(context.getString(R.string.busy_task_fetch_activity_data),"", true, 0, context);
             support.getDevice().setBusyTask(context.getString(R.string.busy_task_fetch_activity_data));
+            support.getDevice().sendDeviceUpdateIntent(support.getContext());
             triggerNextFetch();
         }
     }
@@ -148,6 +149,7 @@ public class XiaomiActivityFileFetcher {
             isFetching = false;
             mHealthService.getSupport().getDevice().unsetBusyTask();
             GB.updateTransferNotification(null, "", false, 100, mHealthService.getSupport().getContext());
+            mHealthService.getSupport().getDevice().sendDeviceUpdateIntent(mHealthService.getSupport().getContext());
             return;
         }
 

From db57072dd3cd7d4297b1956cc9758d1f5108f6d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Wed, 18 Oct 2023 11:14:08 +0100
Subject: [PATCH 091/595] Xiaomi: Make activity file ID types readable

---
 .../activity/XiaomiActivityFileFetcher.java   |   2 +-
 .../xiaomi/activity/XiaomiActivityFileId.java | 109 +++++++++++++++---
 .../xiaomi/activity/XiaomiActivityParser.java |  40 ++++---
 3 files changed, 118 insertions(+), 33 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileFetcher.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileFetcher.java
index 04205027b..1726450f0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileFetcher.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileFetcher.java
@@ -116,7 +116,7 @@ public class XiaomiActivityFileFetcher {
                 return;
             }
 
-            if (activityParser.parse(fileId, activityData)) {
+            if (activityParser.parse(mHealthService.getSupport(), fileId, activityData)) {
                 if (!XiaomiPreferences.keepActivityDataOnDevice(mHealthService.getSupport().getDevice())) {
                     LOG.debug("Acking recorded data {}", fileId);
                     mHealthService.ackRecordedData(fileId);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java
index ab327fef5..3d84f120f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java
@@ -25,12 +25,6 @@ import java.util.Date;
 import nodomain.freeyourgadget.gadgetbridge.util.DateTimeUtils;
 
 public class XiaomiActivityFileId {
-    public static final int TYPE_ACTIVITY = 0;
-    public static final int TYPE_SPORTS = 1;
-
-    public static final int TYPE_DETAILS = 0;
-    public static final int TYPE_SUMMARY = 1;
-
     private final Date timestamp;
     private final int timezone;
     private final int type;
@@ -60,16 +54,16 @@ public class XiaomiActivityFileId {
         return timezone;
     }
 
-    public int getType() {
-        return type;
+    public Type getType() {
+        return Type.fromCode(type);
     }
 
-    public int getSubtype() {
-        return subtype;
+    public Subtype getSubtype() {
+        return Subtype.fromCode(getType(), subtype);
     }
 
-    public int getDetailType() {
-        return detailType;
+    public DetailType getDetailType() {
+        return DetailType.fromCode(detailType);
     }
 
     public int getVersion() {
@@ -113,13 +107,98 @@ public class XiaomiActivityFileId {
     @NonNull
     @Override
     public String toString() {
+        final Type typeName = Type.fromCode(type);
+        final Subtype subtypeName = Subtype.fromCode(typeName, subtype);
+        final DetailType detailTypeName = DetailType.fromCode(detailType);
+
         return getClass().getSimpleName() + "{" +
                 "timestamp=" + DateTimeUtils.formatIso8601(timestamp) +
                 ", timezone=" + timezone +
-                ", type=" + type +
-                ", subtype=" + subtype +
-                ", detailType=" + detailType +
+                ", type=" + (typeName != Type.UNKNOWN ? typeName : "UNKNOWN(" + type + ")") +
+                ", subtype=" + (subtypeName != Subtype.UNKNOWN ? subtypeName : "UNKNOWN(" + subtype + ")") +
+                ", detailType=" + (detailTypeName != DetailType.UNKNOWN ? detailTypeName : "UNKNOWN(" + detailType + ")") +
                 ", version=" + version +
                 "}";
     }
+
+    public enum Type {
+        UNKNOWN(-1),
+        ACTIVITY(0),
+        SPORTS(1),
+        ;
+
+        private final int code;
+
+        Type(final int code) {
+            this.code = code;
+        }
+
+        public int getCode() {
+            return code;
+        }
+
+        public static Type fromCode(final int code) {
+            for (final Type type : values()) {
+                if (type.getCode() == code) {
+                    return type;
+                }
+            }
+            return UNKNOWN;
+        }
+    }
+
+    public enum Subtype {
+        UNKNOWN(Type.UNKNOWN, -1),
+        ACTIVITY_DAILY(Type.ACTIVITY, 0),
+        ACTIVITY_SLEEP(Type.ACTIVITY,8),
+        SPORTS_FREESTYLE(Type.SPORTS, 8),
+        ;
+
+        private final Type type;
+        private final int code;
+
+        Subtype(final Type type, final int code) {
+            this.type = type;
+            this.code = code;
+        }
+
+        public int getCode() {
+            return code;
+        }
+
+        public static Subtype fromCode(final Type type, final int code) {
+            for (final Subtype subtype : values()) {
+                if (subtype.type == type && subtype.getCode() == code) {
+                    return subtype;
+                }
+            }
+            return UNKNOWN;
+        }
+    }
+
+    public enum DetailType {
+        UNKNOWN(-1),
+        DETAILS(0),
+        SUMMARY(1),
+        ;
+
+        private final int code;
+
+        DetailType(final int code) {
+            this.code = code;
+        }
+
+        public int getCode() {
+            return code;
+        }
+
+        public static DetailType fromCode(final int code) {
+            for (final DetailType detailType : values()) {
+                if (detailType.getCode() == code) {
+                    return detailType;
+                }
+            }
+            return UNKNOWN;
+        }
+    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityParser.java
index f1d5892d0..494135e34 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityParser.java
@@ -26,24 +26,14 @@ import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport
 public abstract class XiaomiActivityParser {
     private static final Logger LOG = LoggerFactory.getLogger(XiaomiActivityParser.class);
 
-    private final XiaomiSupport mSupport;
-
-    public XiaomiActivityParser(final XiaomiSupport support) {
-        this.mSupport = support;
-    }
-
-    public abstract boolean parse(final XiaomiActivityFileId fileId, final byte[] bytes);
-
-    public XiaomiSupport getSupport() {
-        return mSupport;
-    }
+    public abstract boolean parse(final XiaomiSupport support, final XiaomiActivityFileId fileId, final byte[] bytes);
 
     @Nullable
     public static XiaomiActivityParser create(final XiaomiActivityFileId fileId) {
         switch (fileId.getType()) {
-            case XiaomiActivityFileId.TYPE_ACTIVITY:
+            case ACTIVITY:
                 return createForActivity(fileId);
-            case XiaomiActivityFileId.TYPE_SPORTS:
+            case SPORTS:
                 return createForSports(fileId);
         }
 
@@ -51,14 +41,30 @@ public abstract class XiaomiActivityParser {
         return null;
     }
 
-    public static XiaomiActivityParser createForActivity(final XiaomiActivityFileId fileId) {
-        assert fileId.getType() == XiaomiActivityFileId.TYPE_ACTIVITY;
+    private static XiaomiActivityParser createForActivity(final XiaomiActivityFileId fileId) {
+        assert fileId.getType() == XiaomiActivityFileId.Type.ACTIVITY;
+
+        switch (fileId.getSubtype()) {
+            case ACTIVITY_DAILY:
+                switch (fileId.getDetailType()) {
+                    case DETAILS:
+                        return null;
+                    case SUMMARY:
+                        return null;
+                }
+
+                break;
+        }
+
+        LOG.warn("No parser for activity subtype in {}", fileId);
 
         return null;
     }
 
-    public static XiaomiActivityParser createForSports(final XiaomiActivityFileId fileId) {
-        assert fileId.getType() == XiaomiActivityFileId.TYPE_SPORTS;
+    private static XiaomiActivityParser createForSports(final XiaomiActivityFileId fileId) {
+        assert fileId.getType() == XiaomiActivityFileId.Type.SPORTS;
+
+        LOG.warn("No parser for sports subtype in {}", fileId);
 
         return null;
     }

From afaf0baa7982ecc36d6b6b7f682dc5f947cbbec4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Wed, 18 Oct 2023 14:07:26 +0100
Subject: [PATCH 092/595] Xiaomi: Cache firmware version

---
 .../devices/xiaomi/XiaomiEncryptedSupport.java       |  4 ----
 .../service/devices/xiaomi/XiaomiSupport.java        | 12 ++++++++++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiEncryptedSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiEncryptedSupport.java
index fc5719b70..600bef3b4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiEncryptedSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiEncryptedSupport.java
@@ -88,10 +88,6 @@ public class XiaomiEncryptedSupport extends XiaomiSupport {
 
     @Override
     protected void startAuthentication(final TransactionBuilder builder) {
-        // FIXME why is this needed? We get an NPE without it
-        getDevice().setFirmwareVersion("...");
-        //getDevice().setFirmwareVersion2("...");
-
         authService.startEncryptedHandshake(builder);
     }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
index 485bc0df2..5c0581272 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
@@ -78,6 +78,8 @@ public abstract class XiaomiSupport extends AbstractBTLEDeviceSupport {
     protected final XiaomiSystemService systemService = new XiaomiSystemService(this);
     protected final XiaomiCalendarService calendarService = new XiaomiCalendarService(this);
 
+    private String mFirmwareVersion = null;
+
     private final Map<Integer, AbstractXiaomiService> mServiceMap = new LinkedHashMap<Integer, AbstractXiaomiService>() {{
         put(XiaomiAuthService.COMMAND_TYPE, authService);
         put(XiaomiMusicService.COMMAND_TYPE, musicService);
@@ -107,6 +109,11 @@ public abstract class XiaomiSupport extends AbstractBTLEDeviceSupport {
         final BluetoothGattCharacteristic btCharacteristicActivityData = getCharacteristic(getCharacteristicActivityData());
         final BluetoothGattCharacteristic btCharacteristicDataUpload = getCharacteristic(getCharacteristicDataUpload());
 
+        // FIXME unsetDynamicState unsets the fw version, which causes problems..
+        if (getDevice().getFirmwareVersion() == null && mFirmwareVersion != null) {
+            getDevice().setFirmwareVersion(mFirmwareVersion);
+        }
+
         if (btCharacteristicCommandRead == null || btCharacteristicCommandWrite == null) {
             LOG.warn("Characteristics are null, will attempt to reconnect");
             builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.WAITING_FOR_RECONNECT, getContext()));
@@ -150,6 +157,11 @@ public abstract class XiaomiSupport extends AbstractBTLEDeviceSupport {
 
     @Override
     public void setContext(final GBDevice gbDevice, final BluetoothAdapter btAdapter, final Context context) {
+        // FIXME unsetDynamicState unsets the fw version, which causes problems..
+        if (mFirmwareVersion == null && gbDevice.getFirmwareVersion() != null) {
+            mFirmwareVersion = gbDevice.getFirmwareVersion();
+        }
+
         super.setContext(gbDevice, btAdapter, context);
         for (final AbstractXiaomiService service : mServiceMap.values()) {
             service.setContext(context);

From 5dd746f2d6477c6815b8d9d3e209eb6ac4a43359 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Wed, 18 Oct 2023 17:01:42 +0100
Subject: [PATCH 093/595] Xiaomi: Ack activity before parsing for now

---
 .../xiaomi/activity/XiaomiActivityFileFetcher.java  | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileFetcher.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileFetcher.java
index 1726450f0..b41c7864d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileFetcher.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileFetcher.java
@@ -109,6 +109,12 @@ public class XiaomiActivityFileFetcher {
                 dumpBytesToExternalStorage(fileId, data);
             }
 
+            if (!XiaomiPreferences.keepActivityDataOnDevice(mHealthService.getSupport().getDevice())) {
+                LOG.debug("Acking recorded data {}", fileId);
+                // TODO is this too early?
+                mHealthService.ackRecordedData(fileId);
+            }
+
             final XiaomiActivityParser activityParser = XiaomiActivityParser.create(fileId);
             if (activityParser == null) {
                 LOG.warn("Failed to find activity parser for {}", fileId);
@@ -116,11 +122,8 @@ public class XiaomiActivityFileFetcher {
                 return;
             }
 
-            if (activityParser.parse(mHealthService.getSupport(), fileId, activityData)) {
-                if (!XiaomiPreferences.keepActivityDataOnDevice(mHealthService.getSupport().getDevice())) {
-                    LOG.debug("Acking recorded data {}", fileId);
-                    mHealthService.ackRecordedData(fileId);
-                }
+            if (!activityParser.parse(mHealthService.getSupport(), fileId, activityData)) {
+                LOG.warn("Failed to parse {}", fileId);
             }
 
             triggerNextFetch();

From aead518e05bcf79d8caa809dd39db8e0169eeb91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Thu, 19 Oct 2023 23:33:46 +0100
Subject: [PATCH 094/595] Xiaomi: Implement daily activity parsing

---
 .../gadgetbridge/daogen/GBDaoGenerator.java   |  16 ++-
 .../AbstractSampleToTimeSampleProvider.java   |  93 ++++++++++++
 .../devices/xiaomi/XiaomiCoordinator.java     |   5 +-
 .../devices/xiaomi/XiaomiSampleProvider.java  |  23 +--
 .../xiaomi/XiaomiStressSampleProvider.java    |  62 ++++++++
 .../gadgetbridge/model/StressSample.java      |   1 +
 .../activity/XiaomiActivityFileFetcher.java   |   2 +-
 .../xiaomi/activity/XiaomiActivityFileId.java |   6 +-
 .../xiaomi/activity/XiaomiActivityParser.java |  15 +-
 .../activity/impl/DailyDetailsParser.java     | 132 ++++++++++++++++++
 .../xiaomi/services/XiaomiHealthService.java  |   3 +-
 11 files changed, 329 insertions(+), 29 deletions(-)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractSampleToTimeSampleProvider.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiStressSampleProvider.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/DailyDetailsParser.java

diff --git a/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java b/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java
index a08bfeec4..d93ed745b 100644
--- a/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java
+++ b/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java
@@ -45,7 +45,7 @@ public class GBDaoGenerator {
 
 
     public static void main(String[] args) throws Exception {
-        final Schema schema = new Schema(62, MAIN_PACKAGE + ".entities");
+        final Schema schema = new Schema(63, MAIN_PACKAGE + ".entities");
 
         Entity userAttributes = addUserAttributes(schema);
         Entity user = addUserInfo(schema, userAttributes);
@@ -70,6 +70,7 @@ public class GBDaoGenerator {
         addHuamiHeartRateRestingSample(schema, user, device);
         addHuamiPaiSample(schema, user, device);
         addHuamiSleepRespiratoryRateSample(schema, user, device);
+        addXiaomiActivitySample(schema, user, device);
         addPebbleHealthActivitySample(schema, user, device);
         addPebbleHealthActivityKindOverlay(schema, user, device);
         addPebbleMisfitActivitySample(schema, user, device);
@@ -324,6 +325,19 @@ public class GBDaoGenerator {
         return sleepRespiratoryRateSample;
     }
 
+    private static Entity addXiaomiActivitySample(Schema schema, Entity user, Entity device) {
+        Entity activitySample = addEntity(schema, "XiaomiActivitySample");
+        addCommonActivitySampleProperties("AbstractActivitySample", activitySample, user, device);
+        activitySample.implementsSerializable();
+        activitySample.addIntProperty(SAMPLE_RAW_INTENSITY).notNull().codeBeforeGetterAndSetter(OVERRIDE);
+        activitySample.addIntProperty(SAMPLE_STEPS).notNull().codeBeforeGetterAndSetter(OVERRIDE);
+        activitySample.addIntProperty(SAMPLE_RAW_KIND).notNull().codeBeforeGetterAndSetter(OVERRIDE);
+        addHeartRateProperties(activitySample);
+        activitySample.addIntProperty("stress");
+        activitySample.addIntProperty("spo2");
+        return activitySample;
+    }
+
     private static void addHeartRateProperties(Entity activitySample) {
         activitySample.addIntProperty(SAMPLE_HEART_RATE).notNull().codeBeforeGetterAndSetter(OVERRIDE);
     }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractSampleToTimeSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractSampleToTimeSampleProvider.java
new file mode 100644
index 000000000..c65b58e61
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractSampleToTimeSampleProvider.java
@@ -0,0 +1,93 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.entities.AbstractActivitySample;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.model.TimeSample;
+
+/**
+ * Wraps a {@link SampleProvider} into a {@link TimeSampleProvider}.
+ */
+public abstract class AbstractSampleToTimeSampleProvider<T extends TimeSample, S extends AbstractActivitySample> implements TimeSampleProvider<T> {
+    private final SampleProvider<S> mSampleProvider;
+    private final DaoSession mSession;
+    private final GBDevice mDevice;
+
+    protected AbstractSampleToTimeSampleProvider(final SampleProvider<S> sampleProvider, final GBDevice device, final DaoSession session) {
+        mSampleProvider = sampleProvider;
+        mDevice = device;
+        mSession = session;
+    }
+
+    protected abstract T convertSample(final S sample);
+
+    public GBDevice getDevice() {
+        return mDevice;
+    }
+
+    public DaoSession getSession() {
+        return mSession;
+    }
+
+    @NonNull
+    @Override
+    public List<T> getAllSamples(final long timestampFrom, final long timestampTo) {
+        final List<S> upstreamSamples = mSampleProvider.getAllActivitySamples((int) (timestampFrom / 1000L), (int) (timestampTo / 1000L));
+        final List<T> ret = new ArrayList<>();
+        for (final S sample : upstreamSamples) {
+            ret.add(convertSample(sample));
+        }
+        return ret;
+    }
+
+    @Override
+    public void addSample(final T timeSample) {
+        throw new UnsupportedOperationException("This sample provider is read-only!");
+    }
+
+    @Override
+    public void addSamples(final List<T> timeSamples) {
+        throw new UnsupportedOperationException("This sample provider is read-only!");
+    }
+
+    @Override
+    public T createSample() {
+        throw new UnsupportedOperationException("This sample provider is read-only!");
+    }
+
+    @Nullable
+    @Override
+    public T getLatestSample() {
+        final S latestSample = mSampleProvider.getLatestActivitySample();
+        return convertSample(latestSample);
+    }
+
+    @Nullable
+    @Override
+    public T getFirstSample() {
+        final S firstSample = mSampleProvider.getFirstActivitySample();
+        return convertSample(firstSample);
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
index f7ae7caea..ab52d60fe 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
@@ -70,8 +70,7 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
 
     @Override
     public TimeSampleProvider<? extends StressSample> getStressSampleProvider(final GBDevice device, final DaoSession session) {
-        // TODO XiaomiStressSampleProvider
-        return super.getStressSampleProvider(device, session);
+        return new XiaomiStressSampleProvider(device, session);
     }
 
     @Override
@@ -182,7 +181,7 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
     @Override
     public boolean supportsPai() {
         // TODO does it?
-        return true;
+        return false;
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSampleProvider.java
index a4ba4e6ab..d25887753 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSampleProvider.java
@@ -23,37 +23,36 @@ import de.greenrobot.dao.AbstractDao;
 import de.greenrobot.dao.Property;
 import nodomain.freeyourgadget.gadgetbridge.devices.AbstractSampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
-import nodomain.freeyourgadget.gadgetbridge.entities.HuamiExtendedActivitySample;
-import nodomain.freeyourgadget.gadgetbridge.entities.HuamiExtendedActivitySampleDao;
+import nodomain.freeyourgadget.gadgetbridge.entities.XiaomiActivitySample;
+import nodomain.freeyourgadget.gadgetbridge.entities.XiaomiActivitySampleDao;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 
-// TODO s/HuamiExtendedActivitySample/XiaomiActivitySample/g
-public class XiaomiSampleProvider extends AbstractSampleProvider<HuamiExtendedActivitySample> {
+public class XiaomiSampleProvider extends AbstractSampleProvider<XiaomiActivitySample> {
     public XiaomiSampleProvider(final GBDevice device, final DaoSession session) {
         super(device, session);
     }
 
     @Override
-    public AbstractDao<HuamiExtendedActivitySample, ?> getSampleDao() {
-        return getSession().getHuamiExtendedActivitySampleDao();
+    public AbstractDao<XiaomiActivitySample, ?> getSampleDao() {
+        return getSession().getXiaomiActivitySampleDao();
     }
 
     @Nullable
     @Override
     protected Property getRawKindSampleProperty() {
-        return HuamiExtendedActivitySampleDao.Properties.RawKind;
+        return XiaomiActivitySampleDao.Properties.RawKind;
     }
 
     @NonNull
     @Override
     protected Property getTimestampSampleProperty() {
-        return HuamiExtendedActivitySampleDao.Properties.Timestamp;
+        return XiaomiActivitySampleDao.Properties.Timestamp;
     }
 
     @NonNull
     @Override
     protected Property getDeviceIdentifierSampleProperty() {
-        return HuamiExtendedActivitySampleDao.Properties.DeviceId;
+        return XiaomiActivitySampleDao.Properties.DeviceId;
     }
 
     @Override
@@ -64,16 +63,18 @@ public class XiaomiSampleProvider extends AbstractSampleProvider<HuamiExtendedAc
 
     @Override
     public int toRawActivityKind(final int activityKind) {
+        // TODO
         return activityKind;
     }
 
     @Override
     public float normalizeIntensity(final int rawIntensity) {
+        // TODO
         return rawIntensity;
     }
 
     @Override
-    public HuamiExtendedActivitySample createActivitySample() {
-        return new HuamiExtendedActivitySample();
+    public XiaomiActivitySample createActivitySample() {
+        return new XiaomiActivitySample();
     }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiStressSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiStressSampleProvider.java
new file mode 100644
index 000000000..fb9706b63
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiStressSampleProvider.java
@@ -0,0 +1,62 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.AbstractSampleToTimeSampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.entities.XiaomiActivitySample;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.model.StressSample;
+
+public class XiaomiStressSampleProvider extends AbstractSampleToTimeSampleProvider<StressSample, XiaomiActivitySample> {
+    public XiaomiStressSampleProvider(final GBDevice device, final DaoSession session) {
+        super(new XiaomiSampleProvider(device, session), device, session);
+    }
+
+    @Override
+    protected StressSample convertSample(final XiaomiActivitySample sample) {
+        return new XiaomiStressSample(
+                sample.getTimestamp() * 1000L,
+                sample.getStress()
+        );
+    }
+
+    protected static class XiaomiStressSample implements StressSample {
+        private final long timestamp;
+        private final int stress;
+
+        public XiaomiStressSample(final long timestamp, final int stress) {
+            this.timestamp = timestamp;
+            this.stress = stress;
+        }
+
+        @Override
+        public long getTimestamp() {
+            return timestamp;
+        }
+
+        @Override
+        public Type getType() {
+            return Type.UNKNOWN;
+        }
+
+        @Override
+        public int getStress() {
+            return stress;
+        }
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/StressSample.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/StressSample.java
index 807d414cf..6c6827984 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/StressSample.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/StressSample.java
@@ -20,6 +20,7 @@ public interface StressSample extends TimeSample {
     enum Type {
         MANUAL(0),
         AUTOMATIC(1),
+        UNKNOWN(2),
         ;
 
         private final int num;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileFetcher.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileFetcher.java
index b41c7864d..ee9e27457 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileFetcher.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileFetcher.java
@@ -117,7 +117,7 @@ public class XiaomiActivityFileFetcher {
 
             final XiaomiActivityParser activityParser = XiaomiActivityParser.create(fileId);
             if (activityParser == null) {
-                LOG.warn("Failed to find activity parser for {}", fileId);
+                LOG.warn("Failed to find parser for {}", fileId);
                 triggerNextFetch();
                 return;
             }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java
index 3d84f120f..2f7a72929 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java
@@ -114,9 +114,9 @@ public class XiaomiActivityFileId {
         return getClass().getSimpleName() + "{" +
                 "timestamp=" + DateTimeUtils.formatIso8601(timestamp) +
                 ", timezone=" + timezone +
-                ", type=" + (typeName != Type.UNKNOWN ? typeName : "UNKNOWN(" + type + ")") +
-                ", subtype=" + (subtypeName != Subtype.UNKNOWN ? subtypeName : "UNKNOWN(" + subtype + ")") +
-                ", detailType=" + (detailTypeName != DetailType.UNKNOWN ? detailTypeName : "UNKNOWN(" + detailType + ")") +
+                ", type=" + (typeName + "(" + type + ")") +
+                ", subtype=" + (subtypeName + "(" + subtype + ")") +
+                ", detailType=" + (detailTypeName + "(" + detailType + ")") +
                 ", version=" + version +
                 "}";
     }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityParser.java
index 494135e34..edbf395b8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityParser.java
@@ -22,6 +22,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl.DailyDetailsParser;
 
 public abstract class XiaomiActivityParser {
     private static final Logger LOG = LoggerFactory.getLogger(XiaomiActivityParser.class);
@@ -46,26 +47,22 @@ public abstract class XiaomiActivityParser {
 
         switch (fileId.getSubtype()) {
             case ACTIVITY_DAILY:
-                switch (fileId.getDetailType()) {
-                    case DETAILS:
-                        return null;
-                    case SUMMARY:
-                        return null;
+                if (fileId.getDetailType() == XiaomiActivityFileId.DetailType.DETAILS) {
+                    return new DailyDetailsParser();
                 }
 
+                break;
+            case ACTIVITY_SLEEP:
+                // TODO
                 break;
         }
 
-        LOG.warn("No parser for activity subtype in {}", fileId);
-
         return null;
     }
 
     private static XiaomiActivityParser createForSports(final XiaomiActivityFileId fileId) {
         assert fileId.getType() == XiaomiActivityFileId.Type.SPORTS;
 
-        LOG.warn("No parser for sports subtype in {}", fileId);
-
         return null;
     }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/DailyDetailsParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/DailyDetailsParser.java
new file mode 100644
index 000000000..0be80fb68
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/DailyDetailsParser.java
@@ -0,0 +1,132 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl;
+
+import android.widget.Toast;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.database.DBHandler;
+import nodomain.freeyourgadget.gadgetbridge.database.DBHelper;
+import nodomain.freeyourgadget.gadgetbridge.devices.DeviceCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.entities.Device;
+import nodomain.freeyourgadget.gadgetbridge.entities.User;
+import nodomain.freeyourgadget.gadgetbridge.entities.XiaomiActivitySample;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.XiaomiActivityFileId;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.XiaomiActivityParser;
+import nodomain.freeyourgadget.gadgetbridge.util.GB;
+
+public class DailyDetailsParser extends XiaomiActivityParser {
+    private static final Logger LOG = LoggerFactory.getLogger(DailyDetailsParser.class);
+
+    @Override
+    public boolean parse(final XiaomiSupport support, final XiaomiActivityFileId fileId, final byte[] bytes) {
+        final int version = fileId.getVersion();
+        final int headerSize;
+        final int recordSize;
+        switch (version) {
+            case 1:
+            case 2:
+                headerSize = 4;
+                recordSize = 10;
+                break;
+            case 3:
+                headerSize = 5;
+                recordSize = 12;
+                break;
+            default:
+                LOG.warn("Unable to parse daily details version {}", fileId.getVersion());
+                return false;
+        }
+
+        final ByteBuffer buf = ByteBuffer.wrap(bytes).order(ByteOrder.LITTLE_ENDIAN);
+        final byte[] header = new byte[headerSize];
+        buf.get(header);
+
+        if ((buf.limit() - buf.position()) % recordSize != 0) {
+            LOG.warn("Remaining data in the buffer is not a multiple of {}", recordSize);
+            return false;
+        }
+
+        final List<XiaomiActivitySample> samples = new ArrayList<>();
+
+        while (buf.position() < buf.limit()) {
+            final XiaomiActivitySample sample = new XiaomiActivitySample();
+
+            sample.setSteps(buf.getShort());
+
+            final byte[] unknown1 = new byte[4];
+            buf.get(unknown1);  // TODO intensity and kind?
+
+            sample.setHeartRate(buf.get() & 0xff);
+
+            final byte[] unknown2 = new byte[3];
+            buf.get(unknown2);  // TODO intensity and kind?
+
+            if (version == 3) {
+                sample.setSpo2(buf.get() & 0xff);
+                sample.setStress(buf.get() & 0xff);
+            }
+
+            samples.add(sample);
+        }
+
+        // save all the samples that we got
+        final Calendar timestamp = Calendar.getInstance();
+        timestamp.setTime(fileId.getTimestamp());
+
+        try (DBHandler handler = GBApplication.acquireDB()) {
+            final DaoSession session = handler.getDaoSession();
+
+            final GBDevice gbDevice = support.getDevice();
+            final DeviceCoordinator coordinator = gbDevice.getDeviceCoordinator();
+            final SampleProvider<XiaomiActivitySample> sampleProvider = (SampleProvider<XiaomiActivitySample>) coordinator.getSampleProvider(gbDevice, session);
+            final Device device = DBHelper.getDevice(gbDevice, session);
+            final User user = DBHelper.getUser(session);
+
+            for (final XiaomiActivitySample sample : samples) {
+                sample.setDevice(device);
+                sample.setUser(user);
+                sample.setTimestamp((int) (timestamp.getTimeInMillis() / 1000));
+                sample.setProvider(sampleProvider);
+
+                timestamp.add(Calendar.MINUTE, 1);
+            }
+            sampleProvider.addGBActivitySamples(samples.toArray(new XiaomiActivitySample[0]));
+
+            timestamp.add(Calendar.MINUTE, -1);
+
+            return true;
+        } catch (final Exception e) {
+            GB.toast(support.getContext(), "Error saving activity samples", Toast.LENGTH_LONG, GB.ERROR);
+            LOG.error("Error saving activity samples", e);
+            return false;
+        }
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
index 91cc82bea..8bc63b325 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
@@ -44,6 +44,7 @@ import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.entities.HuamiExtendedActivitySample;
 import nodomain.freeyourgadget.gadgetbridge.entities.User;
+import nodomain.freeyourgadget.gadgetbridge.entities.XiaomiActivitySample;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.model.ActivityKind;
 import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
@@ -543,7 +544,7 @@ public class XiaomiHealthService extends AbstractXiaomiService {
             previousSteps = realTimeStats.getSteps();
         }
 
-        final HuamiExtendedActivitySample sample;
+        final XiaomiActivitySample sample;
         try (final DBHandler dbHandler = GBApplication.acquireDB()) {
             final DaoSession session = dbHandler.getDaoSession();
 

From 8333b8b8d86c4c38141d6a3468827c7ebe03f2aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 20 Oct 2023 00:05:10 +0100
Subject: [PATCH 095/595] Mi Band 8: Sleep details parser (very very wip)

---
 .../xiaomi/activity/XiaomiActivityParser.java |  6 ++-
 .../activity/impl/SleepDetailsParser.java     | 51 +++++++++++++++++++
 2 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/SleepDetailsParser.java

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityParser.java
index edbf395b8..5cbca661c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityParser.java
@@ -23,6 +23,7 @@ import org.slf4j.LoggerFactory;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl.DailyDetailsParser;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl.SleepDetailsParser;
 
 public abstract class XiaomiActivityParser {
     private static final Logger LOG = LoggerFactory.getLogger(XiaomiActivityParser.class);
@@ -53,7 +54,10 @@ public abstract class XiaomiActivityParser {
 
                 break;
             case ACTIVITY_SLEEP:
-                // TODO
+                if (fileId.getDetailType() == XiaomiActivityFileId.DetailType.DETAILS) {
+                    return new SleepDetailsParser();
+                }
+
                 break;
         }
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/SleepDetailsParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/SleepDetailsParser.java
new file mode 100644
index 000000000..21748faa9
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/SleepDetailsParser.java
@@ -0,0 +1,51 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.XiaomiActivityFileId;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.XiaomiActivityParser;
+
+public class SleepDetailsParser extends XiaomiActivityParser {
+    private static final Logger LOG = LoggerFactory.getLogger(SleepDetailsParser.class);
+
+    @Override
+    public boolean parse(final XiaomiSupport support, final XiaomiActivityFileId fileId, final byte[] bytes) {
+        if (fileId.getVersion() != 2) {
+            LOG.warn("Unknown sleep details version {}", fileId.getVersion());
+            return false;
+        }
+
+        final ByteBuffer buf = ByteBuffer.wrap(bytes).order(ByteOrder.LITTLE_ENDIAN);
+        buf.get(); // header ? 0xF0
+
+        buf.get(); // ?
+        final int bedTime = buf.getInt();
+        final int wakeupTime = buf.getInt();
+        LOG.info("Bed time: {}, wake up time: {}", bedTime, wakeupTime);
+
+        // TODO everything else...
+
+        return false;
+    }
+}

From cd2d7d144e7dc8e68b0ca345bb1f45fd7fd0c99d Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Fri, 20 Oct 2023 17:45:23 +0200
Subject: [PATCH 096/595] Xiaomi: Fix unencrypted support again

---
 .../gadgetbridge/service/devices/xiaomi/XiaomiSupport.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
index 5c0581272..fd32068df 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
@@ -124,12 +124,12 @@ public abstract class XiaomiSupport extends AbstractBTLEDeviceSupport {
         this.characteristicCommandRead.setEncrypted(isEncrypted());
         this.characteristicCommandRead.setHandler(this::handleCommandBytes);
         this.characteristicCommandWrite = new XiaomiCharacteristic(this, btCharacteristicCommandWrite, authService);
-        this.characteristicCommandRead.setEncrypted(isEncrypted());
+        this.characteristicCommandWrite.setEncrypted(isEncrypted());
         this.characteristicActivityData = new XiaomiCharacteristic(this, btCharacteristicActivityData, authService);
         this.characteristicActivityData.setHandler(healthService.getActivityFetcher()::addChunk);
-        this.characteristicCommandRead.setEncrypted(isEncrypted());
+        this.characteristicActivityData.setEncrypted(isEncrypted());
         this.characteristicDataUpload = new XiaomiCharacteristic(this, btCharacteristicDataUpload, authService);
-        this.characteristicCommandRead.setEncrypted(isEncrypted());
+        this.characteristicDataUpload.setEncrypted(isEncrypted());
 
         builder.requestMtu(247);
 

From 04434f4a5532bb8618ea245c625382b10684b10f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 20 Oct 2023 20:51:32 +0100
Subject: [PATCH 097/595] Mi Watch Lite: Attempt to fix activity parsing

---
 .../xiaomi/activity/impl/DailyDetailsParser.java | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/DailyDetailsParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/DailyDetailsParser.java
index 0be80fb68..4fb195c28 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/DailyDetailsParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/DailyDetailsParser.java
@@ -49,16 +49,16 @@ public class DailyDetailsParser extends XiaomiActivityParser {
     public boolean parse(final XiaomiSupport support, final XiaomiActivityFileId fileId, final byte[] bytes) {
         final int version = fileId.getVersion();
         final int headerSize;
-        final int recordSize;
+        final int sampleSize;
         switch (version) {
             case 1:
             case 2:
                 headerSize = 4;
-                recordSize = 10;
+                sampleSize = 7;
                 break;
             case 3:
                 headerSize = 5;
-                recordSize = 12;
+                sampleSize = 12;
                 break;
             default:
                 LOG.warn("Unable to parse daily details version {}", fileId.getVersion());
@@ -69,8 +69,8 @@ public class DailyDetailsParser extends XiaomiActivityParser {
         final byte[] header = new byte[headerSize];
         buf.get(header);
 
-        if ((buf.limit() - buf.position()) % recordSize != 0) {
-            LOG.warn("Remaining data in the buffer is not a multiple of {}", recordSize);
+        if ((buf.limit() - buf.position()) % sampleSize != 0) {
+            LOG.warn("Remaining data in the buffer is not a multiple of {}", sampleSize);
             return false;
         }
 
@@ -86,10 +86,10 @@ public class DailyDetailsParser extends XiaomiActivityParser {
 
             sample.setHeartRate(buf.get() & 0xff);
 
-            final byte[] unknown2 = new byte[3];
-            buf.get(unknown2);  // TODO intensity and kind?
-
             if (version == 3) {
+                final byte[] unknown2 = new byte[3];
+                buf.get(unknown2);  // TODO intensity and kind?
+
                 sample.setSpo2(buf.get() & 0xff);
                 sample.setStress(buf.get() & 0xff);
             }

From 9e1a6ca76a3c7bd9acb97ae7c4f5b8d5f4cbd428 Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Fri, 20 Oct 2023 23:09:35 +0200
Subject: [PATCH 098/595] Xiaomi: change order of enabling notifications

---
 .../gadgetbridge/service/devices/xiaomi/XiaomiSupport.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
index fd32068df..360dbcce9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
@@ -135,8 +135,8 @@ public abstract class XiaomiSupport extends AbstractBTLEDeviceSupport {
 
         builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.INITIALIZING, getContext()));
 
-        builder.notify(btCharacteristicCommandRead, true);
         builder.notify(btCharacteristicCommandWrite, true);
+        builder.notify(btCharacteristicCommandRead, true);
         builder.notify(btCharacteristicActivityData, true);
         builder.notify(btCharacteristicDataUpload, true);
 

From b09879dd311f165adfb317ded20ce3ff84ad57eb Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Fri, 20 Oct 2023 23:26:43 +0200
Subject: [PATCH 099/595] Mi Watch Lite: disable some features that do not
 exist on the watch

---
 .../miwatch/MiWatchLiteCoordinator.java       | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatch/MiWatchLiteCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatch/MiWatchLiteCoordinator.java
index 51a9b17e6..1ab94f303 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatch/MiWatchLiteCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatch/MiWatchLiteCoordinator.java
@@ -27,6 +27,7 @@ import java.util.regex.Pattern;
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiPlaintextSupport;
 
@@ -58,6 +59,35 @@ public class MiWatchLiteCoordinator extends XiaomiCoordinator {
         return R.drawable.ic_device_amazfit_bip_disabled;
     }
 
+    @Override
+    public boolean supportsCalendarEvents() {
+        return false;
+    }
+
+    @Override
+    public boolean supportsStressMeasurement() {
+        return false;
+    }
+
+    @Override
+    public boolean supportsSpo2() {
+        return false;
+    }
+
+    @Override
+    public boolean supportsRealtimeData() {
+        return false;
+    }
+
+    @Override
+    public int getAlarmSlotCount(final GBDevice device) {
+        return 0;
+    }
+    @Override
+    public int getReminderSlotCount(final GBDevice device) {
+        return 0;
+    }
+
     @NonNull
     @Override
     public Class<? extends DeviceSupport> getDeviceSupportClass() {

From fce2dfa0ca6a2acd03de00a4049eee69918c821b Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Sat, 21 Oct 2023 09:56:50 +0200
Subject: [PATCH 100/595] Xiaomi: fix incoming calls on Mi Watch lite (shoud
 not break Mi Band 8)

---
 .../devices/xiaomi/services/XiaomiNotificationService.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
index c9ec83a46..eec15b80a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
@@ -153,8 +153,8 @@ public class XiaomiNotificationService extends AbstractXiaomiService {
                 .setRepliesAllowed(canSendSms())
                 .setTimestamp(TIMESTAMP_SDF.format(new Date()));
 
-        notification3.setPackage(BuildConfig.APPLICATION_ID);
-        notification3.setAppName("Phone");
+        notification3.setPackage("phone");
+        notification3.setAppName("phone");
 
         if (callSpec.name != null) {
             notification3.setTitle(callSpec.name);

From 453ce5eedbb7644ca157c487ed6a2684682a6f9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sat, 21 Oct 2023 00:03:12 +0100
Subject: [PATCH 101/595] Mi Band 8: Map some notification icon messages

---
 app/src/main/proto/xiaomi.proto | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/app/src/main/proto/xiaomi.proto b/app/src/main/proto/xiaomi.proto
index 97650a7dc..f078be612 100644
--- a/app/src/main/proto/xiaomi.proto
+++ b/app/src/main/proto/xiaomi.proto
@@ -493,6 +493,11 @@ message Notification {
   optional uint32 unknown8 = 8; // 1 on canned replies request?
   // 7, 9 get | 7, 12 set
   optional CannedMessages cannedMessages = 9;
+  // 7, 16
+  optional NotificationIconRequest notificationIconRequest = 14;
+  // 7, 15
+  optional NotificationIconRequest notificationIconProperties = 15;
+  optional NotificationIconRequest notificationIconConfirm = 16;
 }
 
 message Notification2 {
@@ -529,6 +534,16 @@ message CannedMessages {
   optional uint32 maxReplies = 3;
 }
 
+message NotificationIconProperties {
+  optional string package = 1;
+}
+
+message NotificationIconRequest {
+  optional uint32 unknown1 = 1; // 0
+  optional uint32 unknown2 = 2; // 3
+  optional uint32 unknown3 = 3; // 28, 44, 80, size?
+}
+
 //
 // Weather
 //

From 0c27772bb59f99d04973f7e15b26f57529206479 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sat, 21 Oct 2023 13:01:04 +0100
Subject: [PATCH 102/595] Xiaomi: Map elliptical workout

---
 .../service/devices/xiaomi/activity/XiaomiActivityFileId.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java
index 2f7a72929..06f2ce3a0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java
@@ -152,6 +152,7 @@ public class XiaomiActivityFileId {
         ACTIVITY_DAILY(Type.ACTIVITY, 0),
         ACTIVITY_SLEEP(Type.ACTIVITY,8),
         SPORTS_FREESTYLE(Type.SPORTS, 8),
+        SPORTS_ELLIPTICAL(Type.SPORTS, 11),
         ;
 
         private final Type type;

From d3eb69fcf756d49f28ab7bf73fd30ba392335d27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sat, 21 Oct 2023 15:26:47 +0100
Subject: [PATCH 103/595] Mi Band 8: Send gps to watch (wip)

---
 .../devices/xiaomi/XiaomiCoordinator.java     |   6 +-
 .../service/devices/xiaomi/XiaomiSupport.java |   3 +-
 .../xiaomi/services/XiaomiHealthService.java  | 149 +++++++++++++++++-
 app/src/main/proto/xiaomi.proto               |  19 ++-
 4 files changed, 163 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
index ab52d60fe..0dc89863f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
@@ -333,8 +333,10 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
         //
         // Calendar
         //
-        settings.add(R.xml.devicesettings_header_calendar);
-        settings.add(R.xml.devicesettings_sync_calendar);
+        if (supportsCalendarEvents()) {
+            settings.add(R.xml.devicesettings_header_calendar);
+            settings.add(R.xml.devicesettings_sync_calendar);
+        }
 
         //
         // Other
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
index 360dbcce9..8c5e45785 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
@@ -274,8 +274,7 @@ public abstract class XiaomiSupport extends AbstractBTLEDeviceSupport {
 
     @Override
     public void onSetGpsLocation(final Location location) {
-        // TODO onSetGpsLocation
-        super.onSetGpsLocation(location);
+        healthService.onSetGpsLocation(location);
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
index 8bc63b325..35cb4ecca 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
@@ -17,6 +17,9 @@
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services;
 
 import android.content.Intent;
+import android.location.Location;
+import android.os.Build;
+import android.os.Handler;
 
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
@@ -27,11 +30,9 @@ import org.slf4j.LoggerFactory;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
-import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
-import java.util.List;
 import java.util.Locale;
 
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
@@ -42,9 +43,10 @@ import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdatePref
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiSampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.Device;
-import nodomain.freeyourgadget.gadgetbridge.entities.HuamiExtendedActivitySample;
 import nodomain.freeyourgadget.gadgetbridge.entities.User;
 import nodomain.freeyourgadget.gadgetbridge.entities.XiaomiActivitySample;
+import nodomain.freeyourgadget.gadgetbridge.externalevents.gps.GBLocationManager;
+import nodomain.freeyourgadget.gadgetbridge.externalevents.opentracks.OpenTracksController;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.model.ActivityKind;
 import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
@@ -77,6 +79,9 @@ public class XiaomiHealthService extends AbstractXiaomiService {
     private static final int CMD_CONFIG_STANDING_REMINDER_SET = 13;
     private static final int CMD_CONFIG_STRESS_GET = 14;
     private static final int CMD_CONFIG_STRESS_SET = 15;
+    private static final int CMD_WORKOUT_WATCH_STATUS = 26;
+    private static final int CMD_WORKOUT_WATCH_OPEN = 30;
+    private static final int CMD_WORKOUT_LOCATION = 48;
     private static final int CMD_REALTIME_STATS_START = 45;
     private static final int CMD_REALTIME_STATS_STOP = 46;
     private static final int CMD_REALTIME_STATS_EVENT = 47;
@@ -84,10 +89,20 @@ public class XiaomiHealthService extends AbstractXiaomiService {
     private static final int GENDER_MALE = 1;
     private static final int GENDER_FEMALE = 2;
 
+    private static final int WORKOUT_STARTED = 0;
+    private static final int WORKOUT_RESUMED = 1;
+    private static final int WORKOUT_PAUSED = 2;
+    private static final int WORKOUT_FINISHED = 3;
+
     private boolean realtimeStarted = false;
     private boolean realtimeOneShot = false;
     private int previousSteps = -1;
 
+    private boolean gpsStarted = false;
+    private boolean gpsFixAcquired = false;
+    private boolean workoutStarted = false;
+    private final Handler gpsTimeoutHandler = new Handler();
+
     private final XiaomiActivityFileFetcher activityFetcher = new XiaomiActivityFileFetcher(this);
 
     public XiaomiHealthService(final XiaomiSupport support) {
@@ -116,6 +131,12 @@ public class XiaomiHealthService extends AbstractXiaomiService {
             case CMD_CONFIG_STRESS_GET:
                 handleStressConfig(cmd.getHealth().getStress());
                 return;
+            case CMD_WORKOUT_WATCH_STATUS:
+                handleWorkoutStatus(cmd.getHealth().getWorkoutStatusWatch());
+                return;
+            case CMD_WORKOUT_WATCH_OPEN:
+                handleWorkoutOpen(cmd.getHealth().getWorkoutOpenWatch());
+                return;
             case CMD_REALTIME_STATS_EVENT:
                 handleRealtimeStats(cmd.getHealth().getRealTimeStats());
                 return;
@@ -406,6 +427,128 @@ public class XiaomiHealthService extends AbstractXiaomiService {
         );
     }
 
+    private void handleWorkoutOpen(final XiaomiProto.WorkoutOpenWatch workoutOpenWatch) {
+        LOG.debug("Workout open on watch: {}", workoutOpenWatch.getSport());
+
+        workoutStarted = false;
+
+        final boolean sendGpsToBand = getDevicePrefs().getBoolean(DeviceSettingsPreferenceConst.PREF_WORKOUT_SEND_GPS_TO_BAND, false);
+        if (!sendGpsToBand) {
+            getSupport().sendCommand(
+                    "send location disabled",
+                    XiaomiProto.Command.newBuilder()
+                            .setType(COMMAND_TYPE)
+                            .setSubtype(CMD_WORKOUT_WATCH_OPEN)
+                            .setHealth(XiaomiProto.Health.newBuilder().setWorkoutOpenReply(
+                                    XiaomiProto.WorkoutOpenReply.newBuilder()
+                                            .setUnknown1(3)
+                                            .setUnknown2(2)
+                                            .setUnknown3(10)
+                            ))
+                            .build()
+            );
+            return;
+        }
+
+        if (!gpsStarted) {
+            gpsStarted = true;
+            gpsFixAcquired = false;
+            GBLocationManager.start(getSupport().getContext(), getSupport());
+        }
+
+        gpsTimeoutHandler.removeCallbacksAndMessages(null);
+        // Timeout if the watch stops sending workout open
+        gpsTimeoutHandler.postDelayed(() -> GBLocationManager.stop(getSupport().getContext(), getSupport()), 5000);
+    }
+
+    private void handleWorkoutStatus(final XiaomiProto.WorkoutStatusWatch workoutStatus) {
+        LOG.debug("Got workout status: {}", workoutStatus.getStatus());
+
+        final boolean startOnPhone = getDevicePrefs().getBoolean(DeviceSettingsPreferenceConst.PREF_WORKOUT_START_ON_PHONE, false);
+
+        switch (workoutStatus.getStatus()) {
+            case WORKOUT_STARTED:
+                workoutStarted = true;
+                gpsTimeoutHandler.removeCallbacksAndMessages(null);
+                if (startOnPhone) {
+                    OpenTracksController.startRecording(getSupport().getContext(), sportToActivityKind(workoutStatus.getSport()));
+                }
+                break;
+            case WORKOUT_RESUMED:
+            case WORKOUT_PAUSED:
+                break;
+            case WORKOUT_FINISHED:
+                GBLocationManager.stop(getSupport().getContext(), getSupport());
+                if (startOnPhone) {
+                    OpenTracksController.stopRecording(getSupport().getContext());
+                }
+                break;
+        }
+    }
+
+    public void onSetGpsLocation(final Location location) {
+        if (!gpsFixAcquired) {
+            gpsFixAcquired = true;
+            getSupport().sendCommand(
+                    "send gps fix",
+                    XiaomiProto.Command.newBuilder()
+                            .setType(COMMAND_TYPE)
+                            .setSubtype(CMD_WORKOUT_WATCH_OPEN)
+                            .setHealth(XiaomiProto.Health.newBuilder().setWorkoutOpenReply(
+                                    XiaomiProto.WorkoutOpenReply.newBuilder()
+                                            .setUnknown1(0)
+                                            .setUnknown2(2)
+                                            .setUnknown3(10)
+                            ))
+                            .build()
+            );
+        }
+        
+        if (workoutStarted) {
+            final XiaomiProto.WorkoutLocation.Builder workoutLocation = XiaomiProto.WorkoutLocation.newBuilder()
+                    .setNumSatellites(10)
+                    .setTimestamp((int) (location.getTime() / 1000L))
+                    .setLongitude(location.getLongitude())
+                    .setLatitude(location.getLatitude())
+                    .setAltitude(location.getAltitude())
+                    .setSpeed(location.getSpeed())
+                    .setBearing(location.getBearing())
+                    .setHorizontalAccuracy(location.getAccuracy());
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                workoutLocation.setVerticalAccuracy(location.getVerticalAccuracyMeters());
+            }
+
+            getSupport().sendCommand(
+                    "send gps location",
+                    XiaomiProto.Command.newBuilder()
+                            .setType(COMMAND_TYPE)
+                            .setSubtype(CMD_WORKOUT_LOCATION)
+                            .setHealth(XiaomiProto.Health.newBuilder().setWorkoutLocation(workoutLocation))
+                            .build()
+            );
+        }
+    }
+
+    private int sportToActivityKind(final int sport) {
+        switch (sport) {
+            case 1: // outdoor run
+            case 5: // trail run
+                return ActivityKind.TYPE_RUNNING;
+            case 2:
+                return ActivityKind.TYPE_WALKING;
+            case 3: // hiking
+            case 4: // trekking
+                return ActivityKind.TYPE_HIKING;
+            case 6:
+                return ActivityKind.TYPE_CYCLING;
+        }
+
+        LOG.warn("Unknown sport {}", sport);
+
+        return ActivityKind.TYPE_UNKNOWN;
+    }
+
     public XiaomiActivityFileFetcher getActivityFetcher() {
         return activityFetcher;
     }
diff --git a/app/src/main/proto/xiaomi.proto b/app/src/main/proto/xiaomi.proto
index f078be612..d8325375a 100644
--- a/app/src/main/proto/xiaomi.proto
+++ b/app/src/main/proto/xiaomi.proto
@@ -392,7 +392,11 @@ message VitalityScore {
 
 message WorkoutStatusWatch {
   optional uint32 timestamp = 1; // seconds
-  optional uint32 unknown2 = 2;
+  optional uint32 sport = 3;
+  optional uint32 status = 4; // 0 started, 1 resumed, 2 paused, 3 finished
+  optional bytes activityFileIds = 5;
+  optional uint32 unknown6 = 6; // 2
+  optional uint32 unknown10 = 10; // 0
 }
 
 message WorkoutOpenWatch {
@@ -404,7 +408,7 @@ message WorkoutOpenWatch {
 
 message WorkoutOpenReply {
   // 3 2 10 when no gps permissions at all
-  // 5 2 10 when no background permissions?
+  // 5 2 10 when no all time gps permission
   // ...
   // 0 * * when phone gps is working fine
   // 0 2 10
@@ -415,14 +419,15 @@ message WorkoutOpenReply {
 }
 
 message WorkoutLocation {
-  optional uint32 unknown1 = 1; // 10, sometimes 2
+  optional uint32 numSatellites = 1; // 10, sometimes 2?
   optional uint32 timestamp = 2; // seconds
   optional double longitude = 3;
   optional double latitude = 4;
-  optional float unknown6 = 6; // ?
-  optional float unknown7 = 7; // altitude?
-  optional float unknown8 = 8; // ?
-  optional float unknown9 = 9; // ?
+  optional double altitude = 5;
+  optional float speed = 6;
+  optional float bearing = 7;
+  optional float horizontalAccuracy = 8;
+  optional float verticalAccuracy = 9;
 }
 
 message RealTimeStats {

From acba91d3c5ca911210f0104d7e8dea99c16ceede Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sat, 21 Oct 2023 16:53:34 +0100
Subject: [PATCH 104/595] Xiaomi: Refactor daily parser slightly

---
 .../xiaomi/activity/impl/DailyDetailsParser.java   | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/DailyDetailsParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/DailyDetailsParser.java
index 4fb195c28..f5b7f1ad5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/DailyDetailsParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/DailyDetailsParser.java
@@ -74,10 +74,14 @@ public class DailyDetailsParser extends XiaomiActivityParser {
             return false;
         }
 
+        final Calendar timestamp = Calendar.getInstance();
+        timestamp.setTime(fileId.getTimestamp());
+
         final List<XiaomiActivitySample> samples = new ArrayList<>();
 
         while (buf.position() < buf.limit()) {
             final XiaomiActivitySample sample = new XiaomiActivitySample();
+            sample.setTimestamp((int) (timestamp.getTimeInMillis() / 1000));
 
             sample.setSteps(buf.getShort());
 
@@ -95,12 +99,11 @@ public class DailyDetailsParser extends XiaomiActivityParser {
             }
 
             samples.add(sample);
+
+            timestamp.add(Calendar.MINUTE, 1);
         }
 
         // save all the samples that we got
-        final Calendar timestamp = Calendar.getInstance();
-        timestamp.setTime(fileId.getTimestamp());
-
         try (DBHandler handler = GBApplication.acquireDB()) {
             final DaoSession session = handler.getDaoSession();
 
@@ -113,15 +116,10 @@ public class DailyDetailsParser extends XiaomiActivityParser {
             for (final XiaomiActivitySample sample : samples) {
                 sample.setDevice(device);
                 sample.setUser(user);
-                sample.setTimestamp((int) (timestamp.getTimeInMillis() / 1000));
                 sample.setProvider(sampleProvider);
-
-                timestamp.add(Calendar.MINUTE, 1);
             }
             sampleProvider.addGBActivitySamples(samples.toArray(new XiaomiActivitySample[0]));
 
-            timestamp.add(Calendar.MINUTE, -1);
-
             return true;
         } catch (final Exception e) {
             GB.toast(support.getContext(), "Error saving activity samples", Toast.LENGTH_LONG, GB.ERROR);

From 7a3139fce027ee892114addb343b03e549d92351 Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Sat, 21 Oct 2023 21:14:25 +0200
Subject: [PATCH 105/595] Xiaomi: remove call notification if call has been
 taken on the phone or rejected, ended.

For in-call notification if those exist, it would not work.
---
 .../services/XiaomiNotificationService.java   | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
index eec15b80a..a5524525b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
@@ -44,6 +44,7 @@ public class XiaomiNotificationService extends AbstractXiaomiService {
     public static final int COMMAND_TYPE = 7;
 
     public static final int CMD_NOTIFICATION_SEND = 0;
+    public static final int CMD_NOTIFICATION_DISMISS = 1;
     public static final int CMD_CALL_REJECT = 2;
     public static final int CMD_CALL_IGNORE = 5;
     public static final int CMD_CANNED_MESSAGES_GET = 9;
@@ -142,12 +143,31 @@ public class XiaomiNotificationService extends AbstractXiaomiService {
 
     public void onSetCallState(final CallSpec callSpec) {
         // TODO handle callSpec.command
+        if (callSpec.command == CallSpec.CALL_OUTGOING) {
+            return;
+        }
+
         if (callSpec.command != CallSpec.CALL_INCOMING) {
+            final XiaomiProto.NotificationDismiss.Builder notification4 = XiaomiProto.NotificationDismiss.newBuilder()
+                    .setNotificationId(XiaomiProto.NotificationId.newBuilder().setId(0).setPackage("phone"));
+
+            final XiaomiProto.Notification notification = XiaomiProto.Notification.newBuilder()
+                    .setNotification4(notification4)
+                    .build();
+
+            getSupport().sendCommand(
+                    "send call end",
+                    XiaomiProto.Command.newBuilder()
+                            .setType(COMMAND_TYPE)
+                            .setSubtype(CMD_NOTIFICATION_DISMISS)
+                            .setNotification(notification)
+                            .build()
+            );
             return;
         }
 
         final XiaomiProto.Notification3.Builder notification3 = XiaomiProto.Notification3.newBuilder()
-                .setId(12345) // ?
+                .setId(0) // ?
                 .setUnknown4("") // ?
                 .setIsCall(true)
                 .setRepliesAllowed(canSendSms())

From 9ea7b48e0ce162b8ec921637154ffa4ed8128ddd Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Sat, 21 Oct 2023 22:41:07 +0200
Subject: [PATCH 106/595] Xiaomi: Add outdoor running subtype to enum.

---
 .../service/devices/xiaomi/activity/XiaomiActivityFileId.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java
index 06f2ce3a0..dfcbd8ed2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java
@@ -151,6 +151,7 @@ public class XiaomiActivityFileId {
         UNKNOWN(Type.UNKNOWN, -1),
         ACTIVITY_DAILY(Type.ACTIVITY, 0),
         ACTIVITY_SLEEP(Type.ACTIVITY,8),
+        SPORTS_OUTDOOR_RUNNING(Type.SPORTS, 1),
         SPORTS_FREESTYLE(Type.SPORTS, 8),
         SPORTS_ELLIPTICAL(Type.SPORTS, 11),
         ;

From 4e680cfcce13ca99d53d7a694f8e18d3d3db68ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sat, 21 Oct 2023 22:07:06 +0100
Subject: [PATCH 107/595] Mi Band 8: List watchface in app management

---
 .../devices/xiaomi/XiaomiCoordinator.java     |  43 +++++-
 .../devices/xiaomi/XiaomiInstallHandler.java  |  55 ++++++++
 .../xiaomi/miband8/MiBand8Coordinator.java    |   5 +-
 .../service/devices/xiaomi/XiaomiSupport.java |  41 ++----
 .../services/XiaomiWatchfaceService.java      | 123 ++++++++++++++++++
 app/src/main/proto/xiaomi.proto               |  46 ++++++-
 6 files changed, 275 insertions(+), 38 deletions(-)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiInstallHandler.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWatchfaceService.java

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
index 0dc89863f..5fde67d31 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
@@ -16,6 +16,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi;
 
+import android.app.Activity;
 import android.bluetooth.le.ScanFilter;
 
 import androidx.annotation.NonNull;
@@ -23,6 +24,8 @@ import androidx.annotation.Nullable;
 
 import org.apache.commons.lang3.ArrayUtils;
 
+import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -30,6 +33,7 @@ import java.util.List;
 
 import nodomain.freeyourgadget.gadgetbridge.GBException;
 import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.activities.appmanager.AppManagerActivity;
 import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSpecificSettingsCustomizer;
 import nodomain.freeyourgadget.gadgetbridge.capabilities.HeartRateCapability;
 import nodomain.freeyourgadget.gadgetbridge.capabilities.password.PasswordCapabilityImpl;
@@ -48,11 +52,13 @@ import nodomain.freeyourgadget.gadgetbridge.model.SleepRespiratoryRateSample;
 import nodomain.freeyourgadget.gadgetbridge.model.Spo2Sample;
 import nodomain.freeyourgadget.gadgetbridge.model.StressSample;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.HuamiLanguageType;
+import nodomain.freeyourgadget.gadgetbridge.util.FileUtils;
 
 public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
     @NonNull
     @Override
     public Collection<? extends ScanFilter> createBLEScanFilters() {
+        // TODO
         return super.createBLEScanFilters();
     }
 
@@ -131,10 +137,41 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
         return true;
     }
 
-    @Override
     public boolean supportsAppsManagement(final GBDevice device) {
-        // TODO maybe for watchfaces or widgets?
-        return super.supportsAppsManagement(device);
+        return true;
+    }
+
+    @Override
+    public Class<? extends Activity> getAppsManagementActivity() {
+        return AppManagerActivity.class;
+    }
+
+    @Override
+    public File getAppCacheDir() throws IOException {
+        // TODO we don't need this
+        return new File(FileUtils.getExternalFilesDir(), "xiaomi-app-cache");
+    }
+
+    @Override
+    public String getAppCacheSortFilename() {
+        // TODO we don't need this
+        return "xiaomi-app-cache-order.txt";
+    }
+
+    @Override
+    public String getAppFileExtension() {
+        // TODO we don't need this
+        return ".bin";
+    }
+
+    @Override
+    public boolean supportsAppListFetching() {
+        return true;
+    }
+
+    @Override
+    public boolean supportsAppReordering() {
+        return false;
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiInstallHandler.java
new file mode 100644
index 000000000..79ca4cb44
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiInstallHandler.java
@@ -0,0 +1,55 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi;
+
+import static nodomain.freeyourgadget.gadgetbridge.service.devices.huami.HuamiFirmwareType.AGPS_UIHH;
+
+import android.content.Context;
+import android.net.Uri;
+
+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.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.model.GenericItem;
+
+public class XiaomiInstallHandler implements InstallHandler {
+    protected final Uri mUri;
+    protected final Context mContext;
+
+    public XiaomiInstallHandler(final Uri uri, final Context context) {
+        this.mUri = uri;
+        this.mContext = context;
+    }
+
+    @Override
+    public boolean isValid() {
+        // TODO
+        return false;
+    }
+
+    @Override
+    public void validateInstallation(final InstallActivity installActivity, final GBDevice device) {
+        // TODO
+    }
+
+    @Override
+    public void onStartInstall(final GBDevice device) {
+        // nothing to do
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/MiBand8Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/MiBand8Coordinator.java
index 63afd1f52..7f0f0d9ce 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/MiBand8Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/MiBand8Coordinator.java
@@ -27,6 +27,7 @@ import java.util.regex.Pattern;
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiInstallHandler;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiEncryptedSupport;
 
@@ -39,8 +40,8 @@ public class MiBand8Coordinator extends XiaomiCoordinator {
     @Nullable
     @Override
     public InstallHandler findInstallHandler(final Uri uri, final Context context) {
-        // TODO implement this
-        return super.findInstallHandler(uri, context);
+        final XiaomiInstallHandler handler = new XiaomiInstallHandler(uri, context);
+        return handler.isValid() ? handler : null;
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
index 8c5e45785..9de912287 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
@@ -57,6 +57,7 @@ import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.Xiao
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.XiaomiNotificationService;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.XiaomiScheduleService;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.XiaomiSystemService;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.XiaomiWatchfaceService;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.XiaomiWeatherService;
 import nodomain.freeyourgadget.gadgetbridge.util.GB;
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
@@ -77,6 +78,7 @@ public abstract class XiaomiSupport extends AbstractBTLEDeviceSupport {
     protected final XiaomiWeatherService weatherService = new XiaomiWeatherService(this);
     protected final XiaomiSystemService systemService = new XiaomiSystemService(this);
     protected final XiaomiCalendarService calendarService = new XiaomiCalendarService(this);
+    protected final XiaomiWatchfaceService watchfaceService = new XiaomiWatchfaceService(this);
 
     private String mFirmwareVersion = null;
 
@@ -89,6 +91,7 @@ public abstract class XiaomiSupport extends AbstractBTLEDeviceSupport {
         put(XiaomiWeatherService.COMMAND_TYPE, weatherService);
         put(XiaomiSystemService.COMMAND_TYPE, systemService);
         put(XiaomiCalendarService.COMMAND_TYPE, calendarService);
+        put(XiaomiWatchfaceService.COMMAND_TYPE, watchfaceService);
     }};
 
     public XiaomiSupport() {
@@ -324,44 +327,24 @@ public abstract class XiaomiSupport extends AbstractBTLEDeviceSupport {
 
     @Override
     public void onInstallApp(final Uri uri) {
-        // TODO
-        super.onInstallApp(uri);
+        watchfaceService.installWatchface(uri);
     }
 
     @Override
     public void onAppInfoReq() {
-        // TODO
-        super.onAppInfoReq();
+        watchfaceService.requestWatchfaceList();
     }
 
     @Override
     public void onAppStart(final UUID uuid, boolean start) {
-        // TODO
-        super.onAppStart(uuid, start);
-    }
-
-    @Override
-    public void onAppDownload(final UUID uuid) {
-        // TODO
-        super.onAppDownload(uuid);
+        if (start) {
+            watchfaceService.setWatchface(uuid);
+        }
     }
 
     @Override
     public void onAppDelete(final UUID uuid) {
-        // TODO
-        super.onAppDelete(uuid);
-    }
-
-    @Override
-    public void onAppConfiguration(final UUID appUuid, String config, Integer id) {
-        // TODO
-        super.onAppConfiguration(appUuid, config, id);
-    }
-
-    @Override
-    public void onAppReorder(final UUID[] uuids) {
-        // TODO
-        super.onAppReorder(uuids);
+        watchfaceService.deleteWatchface(uuid);
     }
 
     @Override
@@ -369,12 +352,6 @@ public abstract class XiaomiSupport extends AbstractBTLEDeviceSupport {
         healthService.onFetchRecordedData(dataTypes);
     }
 
-    @Override
-    public void onReset(final int flags) {
-        // TODO
-        super.onReset(flags);
-    }
-
     @Override
     public void onHeartRateTest() {
         healthService.onHeartRateTest();
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWatchfaceService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWatchfaceService.java
new file mode 100644
index 000000000..f1898d658
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWatchfaceService.java
@@ -0,0 +1,123 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services;
+
+import android.net.Uri;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventAppInfo;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceApp;
+import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
+import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
+
+public class XiaomiWatchfaceService extends AbstractXiaomiService {
+    private static final Logger LOG = LoggerFactory.getLogger(XiaomiWatchfaceService.class);
+
+    public static final int COMMAND_TYPE = 4;
+
+    public static final int CMD_WATCHFACE_LIST = 0;
+    public static final int CMD_WATCHFACE_SET = 1;
+    public static final int CMD_WATCHFACE_INSTALL = 4;
+
+
+    public XiaomiWatchfaceService(final XiaomiSupport support) {
+        super(support);
+    }
+
+    @Override
+    public void initialize(final TransactionBuilder builder) {
+        //getSupport().sendCommand(builder, COMMAND_TYPE, CMD_WATCHFACE_LIST);
+    }
+
+    @Override
+    public void handleCommand(final XiaomiProto.Command cmd) {
+        // TODO
+        switch (cmd.getSubtype()) {
+            case CMD_WATCHFACE_LIST:
+                handleWatchfaceList(cmd.getWatchface().getWatchfaceList());
+                // TODO handle
+                return;
+            case CMD_WATCHFACE_SET:
+                // watchface set ack
+                return;
+            case CMD_WATCHFACE_INSTALL:
+                return;
+        }
+
+        LOG.warn("Unknown watchface command {}", cmd.getSubtype());
+    }
+
+    @Override
+    public boolean onSendConfiguration(final String config, final Prefs prefs) {
+        // TODO set watchface
+        return super.onSendConfiguration(config, prefs);
+    }
+
+    public void requestWatchfaceList() {
+        getSupport().sendCommand("request watchface list", COMMAND_TYPE, CMD_WATCHFACE_LIST);
+    }
+
+    private void handleWatchfaceList(final XiaomiProto.WatchfaceList watchfaceList) {
+        LOG.debug("Got {} watchfaces", watchfaceList.getWatchfaceCount());
+
+        final List<GBDeviceApp> gbDeviceApps = new ArrayList<>();
+
+        for (final XiaomiProto.WatchfaceInfo watchface : watchfaceList.getWatchfaceList()) {
+            GBDeviceApp gbDeviceApp = new GBDeviceApp(
+                    UUID.randomUUID(),
+                    watchface.getName(),
+                    "",
+                    "",
+                    GBDeviceApp.Type.WATCHFACE
+            );
+            gbDeviceApps.add(gbDeviceApp);
+        }
+
+        final GBDeviceEventAppInfo appInfoCmd = new GBDeviceEventAppInfo();
+        appInfoCmd.apps = gbDeviceApps.toArray(new GBDeviceApp[0]);
+        getSupport().evaluateGBDeviceEvent(appInfoCmd);
+    }
+
+    public void setWatchface(final UUID uuid) {
+        // TODO
+    }
+
+    public void setWatchface(final String watchfaceId) {
+        // TODO
+    }
+
+    public void deleteWatchface(final UUID uuid) {
+        // TODO
+    }
+
+    public void deleteWatchface(final String watchfaceId) {
+        // TODO
+        // TODO prevent uninstall of non-uninstallable watchface
+    }
+
+    public void installWatchface(final Uri uri) {
+        // TODO
+    }
+}
diff --git a/app/src/main/proto/xiaomi.proto b/app/src/main/proto/xiaomi.proto
index d8325375a..083384c6c 100644
--- a/app/src/main/proto/xiaomi.proto
+++ b/app/src/main/proto/xiaomi.proto
@@ -11,6 +11,7 @@ message Command {
 
   optional Auth auth = 3;
   optional System system = 4;
+  optional Watchface watchface = 6;
   optional Health health = 10;
   optional Calendar calendar = 14;
   optional Music music = 20;
@@ -277,6 +278,49 @@ message Charger {
   optional uint32 state = 1; // 1 charging, 2 not charging
 }
 
+//
+// Watchface
+//
+
+message Watchface {
+  optional WatchfaceList watchfaceList = 1;
+
+  // 4, 2 delete | 4, 1 set
+  optional string watchfaceId = 2;
+  optional uint32 ack = 4; // 1
+
+  // 4, 4
+  optional uint32 installStatus = 5; // 0 not installed, 2 already installed
+  optional WatchfaceInstallStart watchfaceInstallStart = 6;
+  optional WatchfaceInstallFinish watchfaceInstallFinish = 7;
+}
+
+message WatchfaceList {
+  repeated WatchfaceInfo watchface = 1;
+}
+
+message WatchfaceInfo {
+  optional string id = 1;
+  optional string name = 2;
+  optional bool active = 3;
+  optional bool canDelete = 4;
+  optional uint32 unknown5 = 5; // 0
+  optional uint32 unknown6 = 6; // 0
+  optional uint32 unknown11 = 11; // 0
+}
+
+message WatchfaceInstallStart {
+  optional string id = 1;
+  optional uint32 size = 2;
+}
+
+message WatchfaceInstallFinish {
+  optional string id = 1;
+  optional uint32 unknown2 = 2; // 2
+  optional uint32 unknown3 = 3; // 0
+  optional uint32 unknown4 = 4; // 0
+}
+
 //
 // Health
 //
@@ -706,7 +750,7 @@ message DataUpload {
 }
 
 message DataUploadRequest {
-  optional uint32 unknown1 = 1; // 16 for watchface, 50 for notification icons, 32 for firmware?
+  optional uint32 type = 1; // 16 for watchface, 50 for notification icons, 32 for firmware?
   optional bytes md5sum = 2;
   optional uint32 size = 3;
 }

From ce1d095074afb6643c7fce00a41238c620e5748d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sat, 21 Oct 2023 22:18:19 +0100
Subject: [PATCH 108/595] Xiaomi: Add encrypted and plaintext coordinators

---
 .../devices/xiaomi/XiaomiCoordinator.java     |  7 ---
 .../xiaomi/XiaomiEncryptedCoordinator.java    | 44 +++++++++++++++++++
 .../xiaomi/XiaomiPlaintextCoordinator.java    | 44 +++++++++++++++++++
 .../xiaomi/miband8/MiBand8Coordinator.java    | 13 +-----
 .../miwatch/MiWatchLiteCoordinator.java       | 13 +-----
 .../xiaomi/XiaomiEncryptedSupport.java        |  4 --
 .../xiaomi/XiaomiPlaintextSupport.java        |  4 +-
 7 files changed, 94 insertions(+), 35 deletions(-)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiEncryptedCoordinator.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiPlaintextCoordinator.java

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
index 5fde67d31..ccb5b1aa9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
@@ -55,13 +55,6 @@ import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.HuamiLanguageT
 import nodomain.freeyourgadget.gadgetbridge.util.FileUtils;
 
 public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
-    @NonNull
-    @Override
-    public Collection<? extends ScanFilter> createBLEScanFilters() {
-        // TODO
-        return super.createBLEScanFilters();
-    }
-
     @Override
     protected void deleteDevice(@NonNull final GBDevice gbDevice,
                                 @NonNull final Device device,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiEncryptedCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiEncryptedCoordinator.java
new file mode 100644
index 000000000..f8a705c88
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiEncryptedCoordinator.java
@@ -0,0 +1,44 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi;
+
+import android.bluetooth.le.ScanFilter;
+import android.os.ParcelUuid;
+
+import androidx.annotation.NonNull;
+
+import java.util.Collection;
+import java.util.Collections;
+
+import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiEncryptedSupport;
+
+public abstract class XiaomiEncryptedCoordinator extends XiaomiCoordinator {
+    @NonNull
+    @Override
+    public Collection<? extends ScanFilter> createBLEScanFilters() {
+        final ParcelUuid service = new ParcelUuid(XiaomiEncryptedSupport.UUID_SERVICE_XIAOMI_FE95);
+        final ScanFilter filter = new ScanFilter.Builder().setServiceUuid(service).build();
+        return Collections.singletonList(filter);
+    }
+
+    @NonNull
+    @Override
+    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+        return XiaomiEncryptedSupport.class;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiPlaintextCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiPlaintextCoordinator.java
new file mode 100644
index 000000000..3a249da92
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiPlaintextCoordinator.java
@@ -0,0 +1,44 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi;
+
+import android.bluetooth.le.ScanFilter;
+import android.os.ParcelUuid;
+
+import androidx.annotation.NonNull;
+
+import java.util.Collection;
+import java.util.Collections;
+
+import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiPlaintextSupport;
+
+public abstract class XiaomiPlaintextCoordinator extends XiaomiCoordinator {
+    @NonNull
+    @Override
+    public Collection<? extends ScanFilter> createBLEScanFilters() {
+        final ParcelUuid service = new ParcelUuid(XiaomiPlaintextSupport.UUID_SERVICE);
+        final ScanFilter filter = new ScanFilter.Builder().setServiceUuid(service).build();
+        return Collections.singletonList(filter);
+    }
+
+    @NonNull
+    @Override
+    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+        return XiaomiPlaintextSupport.class;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/MiBand8Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/MiBand8Coordinator.java
index 7f0f0d9ce..21aa3d650 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/MiBand8Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/MiBand8Coordinator.java
@@ -19,19 +19,16 @@ package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.miband8;
 import android.content.Context;
 import android.net.Uri;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
-import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiEncryptedCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiInstallHandler;
-import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiEncryptedSupport;
 
-public class MiBand8Coordinator extends XiaomiCoordinator {
+public class MiBand8Coordinator extends XiaomiEncryptedCoordinator {
     @Override
     protected Pattern getSupportedDeviceName() {
         return Pattern.compile("^Xiaomi Smart Band 8 [A-Z0-9]{4}$");
@@ -58,10 +55,4 @@ public class MiBand8Coordinator extends XiaomiCoordinator {
     public int getDisabledIconResource() {
         return R.drawable.ic_device_miband6_disabled;
     }
-
-    @NonNull
-    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
-        return XiaomiEncryptedSupport.class;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatch/MiWatchLiteCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatch/MiWatchLiteCoordinator.java
index 1ab94f303..e10eb0fbc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatch/MiWatchLiteCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatch/MiWatchLiteCoordinator.java
@@ -19,19 +19,16 @@ package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.miwatch;
 import android.content.Context;
 import android.net.Uri;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
-import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiPlaintextCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiPlaintextSupport;
 
-public class MiWatchLiteCoordinator extends XiaomiCoordinator {
+public class MiWatchLiteCoordinator extends XiaomiPlaintextCoordinator {
     @Override
     protected Pattern getSupportedDeviceName() {
         return Pattern.compile("^Mi Watch Lite_[A-Z0-9]{4}$");
@@ -87,10 +84,4 @@ public class MiWatchLiteCoordinator extends XiaomiCoordinator {
     public int getReminderSlotCount(final GBDevice device) {
         return 0;
     }
-
-    @NonNull
-    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
-        return XiaomiPlaintextSupport.class;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiEncryptedSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiEncryptedSupport.java
index 600bef3b4..aa38cea1e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiEncryptedSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiEncryptedSupport.java
@@ -16,17 +16,13 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi;
 
-import android.bluetooth.BluetoothGattCharacteristic;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.UUID;
 
-import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.GattService;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
-import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetDeviceStateAction;
 
 public class XiaomiEncryptedSupport extends XiaomiSupport {
     private static final Logger LOG = LoggerFactory.getLogger(XiaomiEncryptedSupport.class);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPlaintextSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPlaintextSupport.java
index 8a2ea5e53..a975d1f60 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPlaintextSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPlaintextSupport.java
@@ -29,9 +29,9 @@ import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
 
 public class XiaomiPlaintextSupport extends XiaomiSupport {
-
     private static final Logger LOG = LoggerFactory.getLogger(XiaomiPlaintextSupport.class);
 
+    public static final UUID UUID_SERVICE = UUID.fromString("16186f00-0000-1000-8000-00807f9b34fb");
     private static final UUID UUID_CHARACTERISTIC_MAIN_READ = UUID.fromString("16186f01-0000-1000-8000-00807f9b34fb");
     private static final UUID UUID_CHARACTERISTIC_MAIN_WRITE = UUID.fromString("16186f02-0000-1000-8000-00807f9b34fb");
     private static final UUID UUID_CHARACTERISTIC_ACTIVITY_DATA = UUID.fromString("16186f03-0000-1000-8000-00807f9b34fb");
@@ -40,7 +40,7 @@ public class XiaomiPlaintextSupport extends XiaomiSupport {
 
     public XiaomiPlaintextSupport() {
         super();
-        addSupportedService(UUID.fromString("16186f00-0000-1000-8000-00807f9b34fb"));
+        addSupportedService(UUID_SERVICE);
     }
 
     @Override

From 81ca61760109cc77a664b917cbc761f95e6b56a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sun, 22 Oct 2023 10:06:32 +0100
Subject: [PATCH 109/595] Xiaomi: Prevent NPE when not yet connected

---
 .../service/devices/xiaomi/XiaomiSupport.java        | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
index 9de912287..41dd98c1e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
@@ -428,6 +428,12 @@ public abstract class XiaomiSupport extends AbstractBTLEDeviceSupport {
     }
 
     public void sendCommand(final TransactionBuilder builder, final XiaomiProto.Command command) {
+        if (this.characteristicCommandWrite == null) {
+            // Can sometimes happen in race conditions when connecting + receiving calendar event or weather updates
+            LOG.warn("characteristicCommandWrite is null!");
+            return;
+        }
+
         // FIXME builder is ignored
         final byte[] commandBytes = command.toByteArray();
         LOG.debug("Sending command {}", GB.hexdump(commandBytes));
@@ -435,6 +441,12 @@ public abstract class XiaomiSupport extends AbstractBTLEDeviceSupport {
     }
 
     public void sendCommand(final TransactionBuilder builder, final byte[] commandBytes) {
+        if (this.characteristicCommandWrite == null) {
+            // Can sometimes happen in race conditions when connecting + receiving calendar event or weather updates
+            LOG.warn("characteristicCommandWrite is null!");
+            return;
+        }
+
         // FIXME builder is ignored
         this.characteristicCommandWrite.write(commandBytes);
     }

From fa72820e5ab4cd66d4ae8c5132e4e307f7ac50e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sun, 22 Oct 2023 10:20:40 +0100
Subject: [PATCH 110/595] Mi Band 8: Map emoji (inefficient)

---
 .../xiaomi/XiaomiEncryptedSupport.java        | 103 ++++++++++++++++++
 1 file changed, 103 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiEncryptedSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiEncryptedSupport.java
index aa38cea1e..fcdb81b16 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiEncryptedSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiEncryptedSupport.java
@@ -19,6 +19,8 @@ package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.LinkedHashMap;
+import java.util.Map;
 import java.util.UUID;
 
 import nodomain.freeyourgadget.gadgetbridge.service.btle.GattService;
@@ -86,4 +88,105 @@ public class XiaomiEncryptedSupport extends XiaomiSupport {
     protected void startAuthentication(final TransactionBuilder builder) {
         authService.startEncryptedHandshake(builder);
     }
+
+    @Override
+    public String customStringFilter(final String inputString) {
+        // TODO: Do this more efficiently - it iterates the input string 88 times...
+        String customString = inputString;
+        for (Map.Entry<String, String> emoji : EMOJI_MAP.entrySet()) {
+            customString = customString.replaceAll(emoji.getKey(), emoji.getValue());
+        }
+        return customString;
+    }
+
+    private static final Map<String, String> EMOJI_MAP = new LinkedHashMap<String, String>() {{
+        put("\uD83D\uDE0D", "ꀂ"); // 😍
+        put("\uD83D\uDE18", "ꀃ"); // 😘
+        put("\uD83D\uDE02", "ꀄ"); // 😂
+        put("\uD83D\uDE0A", "ꀅ"); // 😊
+        put("\uD83D\uDE0E", "ꀆ"); // 😎
+        put("\uD83D\uDE09", "ꀇ"); // 😉
+        put("\uD83D\uDC8B", "ꀈ"); // 💋
+        put("\uD83D\uDC4D", "ꀉ"); // 👍
+        put("\uD83E\uDD23", "ꀊ"); // 🤣
+        put("\uD83D\uDC95", "ꀋ"); // 💕
+        put("\uD83D\uDE00", "ꀌ"); // 😀
+        put("\uD83D\uDE04", "ꀍ"); // 😄
+        put("\uD83D\uDE2D", "ꀎ"); // 😭
+        put("\uD83E\uDD7A", "ꀏ"); // 🥺
+        put("\uD83D\uDE4F", "ꀑ"); // 🙏
+        put("\uD83E\uDD70", "ꀒ"); // 🥰
+        put("\uD83E\uDD14", "ꀓ"); // 🤔
+        put("\uD83D\uDD25", "ꀔ"); // 🔥
+        put("\uD83D\uDE29", "ꀗ"); // 😩
+        put("\uD83D\uDE14", "ꀘ"); // 😔
+        put("\uD83D\uDE01", "ꀙ"); // 😁
+        put("\uD83D\uDC4C", "ꀚ"); // 👌
+        put("\uD83D\uDE0F", "ꀛ"); // 😏
+        put("\uD83D\uDE05", "ꀜ"); // 😅
+        put("\uD83E\uDD0D", "ꀝ"); // 🤍
+        put("\uD83D\uDC94", "ꀞ"); // 💔
+        put("\uD83D\uDE0C", "ꀟ"); // 😌
+        put("\uD83D\uDE22", "ꀠ"); // 😢
+        put("\uD83D\uDC99", "ꀡ"); // 💙
+        put("\uD83D\uDC9C", "ꀢ"); // 💜
+        put("\uD83C\uDFB6", "ꀤ"); // 🎶
+        put("\uD83D\uDE33", "ꀥ"); // 😳
+        put("\uD83D\uDC96", "ꀦ"); // 💖
+        put("\uD83D\uDE4C", "ꀧ"); // 🙌
+        put("\uD83D\uDCAF", "ꀨ"); // 💯
+        put("\uD83D\uDE48", "ꀩ"); // 🙈
+        put("\uD83D\uDE0B", "ꀫ"); // 😋
+        put("\uD83D\uDE11", "ꀬ"); // 😑
+        put("\uD83D\uDE34", "ꀭ"); // 😴
+        put("\uD83D\uDE2A", "ꀮ"); // 😪
+        put("\uD83D\uDE1C", "ꀯ"); // 😜
+        put("\uD83D\uDE1B", "ꀰ"); // 😛
+        put("\uD83D\uDE1D", "ꀱ"); // 😝
+        put("\uD83D\uDE1E", "ꀲ"); // 😞
+        put("\uD83D\uDE15", "ꀳ"); // 😕
+        put("\uD83D\uDC97", "ꀴ"); // 💗
+        put("\uD83D\uDC4F", "ꀵ"); // 👏
+        put("\uD83D\uDE10", "ꀶ"); // 😐
+        put("\uD83D\uDC49", "ꀷ"); // 👉
+        put("\uD83D\uDC9B", "ꀸ"); // 💛
+        put("\uD83D\uDC9E", "ꀹ"); // 💞
+        put("\uD83D\uDCAA", "ꀺ"); // 💪
+        put("\uD83C\uDF39", "ꀻ"); // 🌹
+        put("\uD83D\uDC80", "ꀼ"); // 💀
+        put("\uD83D\uDE31", "ꀽ"); // 😱
+        put("\uD83D\uDC98", "ꀾ"); // 💘
+        put("\uD83E\uDD1F", "ꀿ"); // 🤟
+        put("\uD83D\uDE21", "ꁀ"); // 😡
+        put("\uD83D\uDCF7", "ꁁ"); // 📷
+        put("\uD83C\uDF38", "ꁂ"); // 🌸
+        put("\uD83D\uDE08", "ꁃ"); // 😈
+        put("\uD83D\uDC48", "ꁄ"); // 👈
+        put("\uD83C\uDF89", "ꁅ"); // 🎉
+        put("\uD83D\uDC81", "ꁆ"); // 💁
+        put("\uD83D\uDE4A", "ꁇ"); // 🙊
+        put("\uD83D\uDC9A", "ꁈ"); // 💚
+        put("\uD83D\uDE2B", "ꁉ"); // 😫
+        put("\uD83D\uDE24", "ꁊ"); // 😤
+        put("\uD83D\uDC93", "ꁍ"); // 💓
+        put("\uD83C\uDF1A", "ꁎ"); // 🌚
+        put("\uD83D\uDC47", "ꁏ"); // 👇
+        put("\uD83D\uDE07", "ꁒ"); // 😇
+        put("\uD83D\uDC4A", "ꁓ"); // 👊
+        put("\uD83D\uDC51", "ꁔ"); // 👑
+        put("\uD83D\uDE13", "ꁕ"); // 😓
+        put("\uD83D\uDE3B", "ꁖ"); // 😻
+        put("\uD83D\uDD34", "ꁗ"); // 🔴
+        put("\uD83D\uDE25", "ꁘ"); // 😥
+        put("\uD83E\uDD29", "ꁙ"); // 🤩
+        put("\uD83D\uDE1A", "ꁚ"); // 😚
+        put("\uD83D\uDE37", "ꁜ"); // 😷
+        put("\uD83D\uDC4B", "ꁝ"); // 👋
+        put("\uD83D\uDCA5", "ꁞ"); // 💥
+        put("\uD83E\uDD2D", "ꁠ"); // 🤭
+        put("\uD83C\uDF1F", "ꁡ"); // 🌟
+        put("\uD83E\uDD71", "ꁢ"); // 🥱
+        put("\uD83D\uDCA9", "ꁣ"); // 💩
+        put("\uD83D\uDE80", "ꁤ"); // 🚀
+    }};
 }

From 7fb81b6e0d9c9f8dcc6e15858ff0fcfe4c469d0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sun, 22 Oct 2023 10:34:38 +0100
Subject: [PATCH 111/595] Xiaomi: Fix edge cases in chunked math

---
 .../devices/xiaomi/XiaomiCharacteristic.java  | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
index fc28e43e8..efee6004c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
@@ -39,6 +39,9 @@ import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
 public class XiaomiCharacteristic {
     public static final byte[] PAYLOAD_ACK = new byte[]{0, 0, 3, 0};
 
+    // max chunk size, including headers
+    public static final int MAX_WRITE_SIZE = 242;
+
     private final Logger LOG;
 
     private final XiaomiSupport mSupport;
@@ -182,9 +185,9 @@ public class XiaomiCharacteristic {
                         case 1:
                             LOG.debug("Got chunked ack start");
                             final TransactionBuilder builder = mSupport.createTransactionBuilder("send chunks");
-                            for (int i = 0; i * 242 < currentSending.length; i++) {
-                                final int startIndex = i * 242;
-                                final int endIndex = Math.min((i + 1) * 242, currentSending.length);
+                            for (int i = 0; i * MAX_WRITE_SIZE < currentSending.length; i++) {
+                                final int startIndex = i * MAX_WRITE_SIZE;
+                                final int endIndex = Math.min((i + 1) * MAX_WRITE_SIZE, currentSending.length);
                                 LOG.debug("Sending chunk {} from {} to {}", i, startIndex, endIndex);
                                 final byte[] chunkToSend = new byte[2 + endIndex - startIndex];
                                 BLETypeConversions.writeUint16(chunkToSend, 0, i + 1);
@@ -265,7 +268,7 @@ public class XiaomiCharacteristic {
             buf.putShort((short) 0);
             buf.put((byte) 0);
             buf.put((byte) (isEncrypted ? 1 : 0));
-            buf.putShort((short) Math.max(1, Math.round(currentSending.length / 247.0)));
+            buf.putShort((short) Math.ceil(currentSending.length / (float) MAX_WRITE_SIZE));
 
             final TransactionBuilder builder = mSupport.createTransactionBuilder("send chunked start");
             builder.write(bluetoothGattCharacteristic, buf.array());
@@ -274,13 +277,15 @@ public class XiaomiCharacteristic {
             LOG.debug("Sending next - single");
 
             // Encrypt single command
-            final int commandLength = 6 + currentSending.length;
+            final int commandLength = (isEncrypted ? 6 : 4) + currentSending.length;
 
             final ByteBuffer buf = ByteBuffer.allocate(commandLength).order(ByteOrder.LITTLE_ENDIAN);
             buf.putShort((short) 0);
             buf.put((byte) 2); // 2 for command
-            buf.put((byte) 1); // 1 for encrypted
-            buf.putShort(encryptedIndex++);
+            buf.put((byte) (isEncrypted ? 1 : 2));
+            if (isEncrypted) {
+                buf.putShort(encryptedIndex++);
+            }
             buf.put(currentSending); // it's already encrypted
 
             waitingAck = true;
@@ -297,7 +302,8 @@ public class XiaomiCharacteristic {
             return true;
         }
 
-        return payload.length + 6 > 244;
+        // payload + 6 bytes at the start with the encryption stuff
+        return payload.length + 6 > MAX_WRITE_SIZE;
     }
 
     private void sendAck() {

From a895a6aae7561727d40a61b1a5462b6a42663fec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sun, 22 Oct 2023 10:56:24 +0100
Subject: [PATCH 112/595] Xiaomi: Set and delete watchfaces

---
 .../services/XiaomiWatchfaceService.java      | 93 ++++++++++++++++---
 1 file changed, 81 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWatchfaceService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWatchfaceService.java
index f1898d658..f290547ab 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWatchfaceService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWatchfaceService.java
@@ -22,7 +22,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.UUID;
 
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventAppInfo;
@@ -39,18 +41,16 @@ public class XiaomiWatchfaceService extends AbstractXiaomiService {
 
     public static final int CMD_WATCHFACE_LIST = 0;
     public static final int CMD_WATCHFACE_SET = 1;
+    public static final int CMD_WATCHFACE_DELETE = 2;
     public static final int CMD_WATCHFACE_INSTALL = 4;
 
+    private final Set<UUID> allWatchfaces = new HashSet<>();
+    private final Set<UUID> userWatchfaces = new HashSet<>();
 
     public XiaomiWatchfaceService(final XiaomiSupport support) {
         super(support);
     }
 
-    @Override
-    public void initialize(final TransactionBuilder builder) {
-        //getSupport().sendCommand(builder, COMMAND_TYPE, CMD_WATCHFACE_LIST);
-    }
-
     @Override
     public void handleCommand(final XiaomiProto.Command cmd) {
         // TODO
@@ -60,7 +60,12 @@ public class XiaomiWatchfaceService extends AbstractXiaomiService {
                 // TODO handle
                 return;
             case CMD_WATCHFACE_SET:
-                // watchface set ack
+                LOG.debug("Got watchface set response, ack={}", cmd.getWatchface().getAck());
+                //requestWatchfaceList();
+                return;
+            case CMD_WATCHFACE_DELETE:
+                LOG.debug("Got watchface delete response, ack={}", cmd.getWatchface().getAck());
+                requestWatchfaceList();
                 return;
             case CMD_WATCHFACE_INSTALL:
                 return;
@@ -82,11 +87,20 @@ public class XiaomiWatchfaceService extends AbstractXiaomiService {
     private void handleWatchfaceList(final XiaomiProto.WatchfaceList watchfaceList) {
         LOG.debug("Got {} watchfaces", watchfaceList.getWatchfaceCount());
 
+        allWatchfaces.clear();
+        userWatchfaces.clear();
+
         final List<GBDeviceApp> gbDeviceApps = new ArrayList<>();
 
         for (final XiaomiProto.WatchfaceInfo watchface : watchfaceList.getWatchfaceList()) {
+            final UUID uuid = toWatchfaceUUID(watchface.getId());
+            allWatchfaces.add(uuid);
+            if (watchface.getCanDelete()) {
+                userWatchfaces.add(uuid);
+            }
+
             GBDeviceApp gbDeviceApp = new GBDeviceApp(
-                    UUID.randomUUID(),
+                    uuid,
                     watchface.getName(),
                     "",
                     "",
@@ -101,23 +115,78 @@ public class XiaomiWatchfaceService extends AbstractXiaomiService {
     }
 
     public void setWatchface(final UUID uuid) {
-        // TODO
+        if (!allWatchfaces.contains(uuid)) {
+            LOG.warn("Unknown watchface {}", uuid);
+            return;
+        }
+
+        LOG.debug("Set watchface to {}", uuid);
+
+        getSupport().sendCommand(
+                "set watchface to " + uuid,
+                XiaomiProto.Command.newBuilder()
+                        .setType(COMMAND_TYPE)
+                        .setSubtype(CMD_WATCHFACE_SET)
+                        .setWatchface(XiaomiProto.Watchface.newBuilder().setWatchfaceId(toWatchfaceId(uuid)))
+                        .build()
+        );
     }
 
     public void setWatchface(final String watchfaceId) {
-        // TODO
+        setWatchface(toWatchfaceUUID(watchfaceId));
     }
 
     public void deleteWatchface(final UUID uuid) {
-        // TODO
+        if (!userWatchfaces.contains(uuid)) {
+            LOG.warn("Refusing to delete non-user watchface {}", uuid);
+            return;
+        }
+
+        if (!allWatchfaces.contains(uuid)) {
+            LOG.warn("Refusing to delete unknown watchface {}", uuid);
+            return;
+        }
+
+        LOG.debug("Delete watchface {}", uuid);
+
+        allWatchfaces.remove(uuid);
+        userWatchfaces.remove(uuid);
+
+        getSupport().sendCommand(
+                "delete watchface " + uuid,
+                XiaomiProto.Command.newBuilder()
+                        .setType(COMMAND_TYPE)
+                        .setSubtype(CMD_WATCHFACE_DELETE)
+                        .setWatchface(XiaomiProto.Watchface.newBuilder().setWatchfaceId(toWatchfaceId(uuid)))
+                        .build()
+        );
     }
 
     public void deleteWatchface(final String watchfaceId) {
-        // TODO
-        // TODO prevent uninstall of non-uninstallable watchface
+        deleteWatchface(toWatchfaceUUID(watchfaceId));
     }
 
     public void installWatchface(final Uri uri) {
         // TODO
     }
+
+    public static UUID toWatchfaceUUID(final String id) {
+        // Watchface IDs are numbers as strings - pad them to the right with F
+        // and encode as UUID
+        final String padded = String.format("%-32s", id).replace(' ', 'F');
+        return UUID.fromString(
+                padded.substring(0, 8) + "-" +
+                        padded.substring(8, 12) + "-" +
+                        padded.substring(12, 16) + "-" +
+                        padded.substring(16, 20) + "-" +
+                        padded.substring(20, 32)
+        );
+    }
+
+    public static String toWatchfaceId(final UUID uuid) {
+        return uuid.toString()
+                .replaceAll("-", "")
+                .replaceAll("f", "")
+                .replaceAll("F", "");
+    }
 }

From 1b645f44d7d86026dae868d45df7cd205d82b124 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sun, 22 Oct 2023 11:06:27 +0100
Subject: [PATCH 113/595] Xiaomi: Keep only watchface tab in app management

---
 .../appmanager/AppManagerActivity.java        | 36 +++++++++++++------
 .../devices/AbstractDeviceCoordinator.java    | 21 +++++++++++
 .../devices/DeviceCoordinator.java            |  4 +++
 .../devices/xiaomi/XiaomiCoordinator.java     | 15 ++++++++
 4 files changed, 66 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AppManagerActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AppManagerActivity.java
index c1c553f8e..166155d99 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AppManagerActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AppManagerActivity.java
@@ -45,6 +45,7 @@ import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.activities.AbstractFragmentPagerAdapter;
 import nodomain.freeyourgadget.gadgetbridge.activities.AbstractGBFragmentActivity;
 import nodomain.freeyourgadget.gadgetbridge.activities.FwAppInstallerActivity;
+import nodomain.freeyourgadget.gadgetbridge.devices.DeviceCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.util.FileUtils;
 
@@ -56,6 +57,8 @@ public class AppManagerActivity extends AbstractGBFragmentActivity {
 
     private GBDevice mGBDevice = null;
 
+    private List<String> enabledTabsList;
+
     public GBDevice getGBDevice() {
         return mGBDevice;
     }
@@ -75,6 +78,20 @@ public class AppManagerActivity extends AbstractGBFragmentActivity {
             throw new IllegalArgumentException("Must provide a device when invoking this activity");
         }
 
+        final DeviceCoordinator coordinator = mGBDevice.getDeviceCoordinator();
+
+        enabledTabsList = new ArrayList<>();
+
+        if (coordinator.supportsCachedAppManagement(mGBDevice)) {
+            enabledTabsList.add("cache");
+        }
+        if (coordinator.supportsInstalledAppManagement(mGBDevice)) {
+            enabledTabsList.add("apps");
+        }
+        if (coordinator.supportsWatchfaceManagement(mGBDevice)) {
+            enabledTabsList.add("watchfaces");
+        }
+
         FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
         assert fab != null;
         fab.setOnClickListener(new View.OnClickListener() {
@@ -114,12 +131,12 @@ public class AppManagerActivity extends AbstractGBFragmentActivity {
         @Override
         public Fragment getItem(int position) {
             // getItem is called to instantiate the fragment for the given page.
-            switch (position) {
-                case 0:
+            switch (enabledTabsList.get(position)) {
+                case "cache":
                     return new AppManagerFragmentCache();
-                case 1:
+                case "apps":
                     return new AppManagerFragmentInstalledApps();
-                case 2:
+                case "watchfaces":
                     return new AppManagerFragmentInstalledWatchfaces();
             }
             return null;
@@ -127,19 +144,18 @@ public class AppManagerActivity extends AbstractGBFragmentActivity {
 
         @Override
         public int getCount() {
-            return 3;
+            return enabledTabsList.toArray().length;
         }
 
         @Override
         public CharSequence getPageTitle(int position) {
-            switch (position) {
-                case 0:
+            switch (enabledTabsList.get(position)) {
+                case "cache":
                     return getString(R.string.appmanager_cached_watchapps_watchfaces);
-                case 1:
+                case "apps":
                     return getString(R.string.appmanager_installed_watchapps);
-                case 2:
+                case "watchfaces":
                     return getString(R.string.appmanager_installed_watchfaces);
-                case 3:
             }
             return super.getPageTitle(position);
         }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java
index 2a686ae67..934eb6780 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java
@@ -314,6 +314,27 @@ public abstract class AbstractDeviceCoordinator implements DeviceCoordinator {
         return false;
     }
 
+    @Override
+    public boolean supportsCachedAppManagement(final GBDevice device) {
+        try {
+            return supportsAppsManagement(device) && getAppCacheDir() != null;
+        } catch (final Exception e) {
+            // we failed, but still tried, so it's supported..
+            LOG.error("Failed to get app cache dir", e);
+            return true;
+        }
+    }
+
+    @Override
+    public boolean supportsInstalledAppManagement(final GBDevice device) {
+        return supportsAppsManagement(device);
+    }
+
+    @Override
+    public boolean supportsWatchfaceManagement(final GBDevice device) {
+        return supportsAppsManagement(device);
+    }
+
     @Nullable
     @Override
     public Class<? extends Activity> getAppsManagementActivity() {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java
index 5f2267a37..8ce2641c6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java
@@ -353,6 +353,10 @@ public interface DeviceCoordinator {
      */
     boolean supportsAppsManagement(GBDevice device);
 
+    boolean supportsCachedAppManagement(GBDevice device);
+    boolean supportsInstalledAppManagement(GBDevice device);
+    boolean supportsWatchfaceManagement(GBDevice device);
+
     /**
      * Returns the Activity class that will be used to manage device apps.
      *
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
index ccb5b1aa9..308c26b13 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
@@ -134,6 +134,21 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
         return true;
     }
 
+    @Override
+    public boolean supportsCachedAppManagement(GBDevice device) {
+        return false;
+    }
+
+    @Override
+    public boolean supportsInstalledAppManagement(GBDevice device) {
+        return false;
+    }
+
+    @Override
+    public boolean supportsWatchfaceManagement(GBDevice device) {
+        return supportsAppsManagement(device);
+    }
+
     @Override
     public Class<? extends Activity> getAppsManagementActivity() {
         return AppManagerActivity.class;

From e2d7798e36ae33ee632a778a0b1464aeda52cf8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sun, 22 Oct 2023 11:58:55 +0100
Subject: [PATCH 114/595] Xiaomi: Refuse delete of active watchface

---
 .../xiaomi/services/XiaomiWatchfaceService.java      | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWatchfaceService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWatchfaceService.java
index f290547ab..5c41dcdd3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWatchfaceService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWatchfaceService.java
@@ -46,6 +46,7 @@ public class XiaomiWatchfaceService extends AbstractXiaomiService {
 
     private final Set<UUID> allWatchfaces = new HashSet<>();
     private final Set<UUID> userWatchfaces = new HashSet<>();
+    private UUID activeWatchface = null;
 
     public XiaomiWatchfaceService(final XiaomiSupport support) {
         super(support);
@@ -89,6 +90,7 @@ public class XiaomiWatchfaceService extends AbstractXiaomiService {
 
         allWatchfaces.clear();
         userWatchfaces.clear();
+        activeWatchface = null;
 
         final List<GBDeviceApp> gbDeviceApps = new ArrayList<>();
 
@@ -98,6 +100,9 @@ public class XiaomiWatchfaceService extends AbstractXiaomiService {
             if (watchface.getCanDelete()) {
                 userWatchfaces.add(uuid);
             }
+            if (watchface.getActive()) {
+                activeWatchface = uuid;
+            }
 
             GBDeviceApp gbDeviceApp = new GBDeviceApp(
                     uuid,
@@ -120,6 +125,8 @@ public class XiaomiWatchfaceService extends AbstractXiaomiService {
             return;
         }
 
+        activeWatchface = uuid;
+
         LOG.debug("Set watchface to {}", uuid);
 
         getSupport().sendCommand(
@@ -147,6 +154,11 @@ public class XiaomiWatchfaceService extends AbstractXiaomiService {
             return;
         }
 
+        if (uuid.equals(activeWatchface)) {
+            LOG.warn("Refusing to delete active watchface {}", uuid);
+            return;
+        }
+
         LOG.debug("Delete watchface {}", uuid);
 
         allWatchfaces.remove(uuid);

From 1acd3ac5fd24f2354710ad57355fe8561374c681 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sun, 22 Oct 2023 12:18:26 +0100
Subject: [PATCH 115/595] Xiaomi: Remove usage of TransactionBuilders

---
 .../devices/xiaomi/XiaomiAuthService.java     |  4 +-
 .../service/devices/xiaomi/XiaomiSupport.java | 56 +++----------------
 .../services/AbstractXiaomiService.java       |  2 +-
 .../services/XiaomiCalendarService.java       | 12 +---
 .../xiaomi/services/XiaomiHealthService.java  | 45 +++++++--------
 .../services/XiaomiNotificationService.java   | 10 ++--
 .../services/XiaomiScheduleService.java       | 42 +++++++-------
 .../xiaomi/services/XiaomiSystemService.java  | 32 +++++------
 .../xiaomi/services/XiaomiWeatherService.java |  2 +-
 9 files changed, 76 insertions(+), 129 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java
index a3e7ef5f4..2ba07c516 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java
@@ -103,7 +103,7 @@ public class XiaomiAuthService extends AbstractXiaomiService {
                 .setAuth(auth)
                 .build();
 
-        getSupport().sendCommand(builder, command);
+        getSupport().sendCommand("start clear text handshake", command);
     }
 
     @Override
@@ -140,7 +140,7 @@ public class XiaomiAuthService extends AbstractXiaomiService {
 
                     final TransactionBuilder builder = getSupport().createTransactionBuilder("phase 2 initialize");
                     builder.add(new SetDeviceStateAction(getSupport().getDevice(), GBDevice.State.INITIALIZED, getSupport().getContext()));
-                    getSupport().phase2Initialize(builder);
+                    getSupport().phase2Initialize();
                     builder.queue(getSupport().getQueue());
                 } else {
                     LOG.warn("could not authenticate");
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
index 41dd98c1e..bdfef634d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
@@ -103,7 +103,7 @@ public abstract class XiaomiSupport extends AbstractBTLEDeviceSupport {
     protected abstract UUID getCharacteristicCommandWrite();
     protected abstract UUID getCharacteristicActivityData();
     protected abstract UUID getCharacteristicDataUpload();
-    protected abstract void startAuthentication(TransactionBuilder builder);
+    protected abstract void startAuthentication(final TransactionBuilder builder);
 
     @Override
     protected final TransactionBuilder initializeDevice(final TransactionBuilder builder) {
@@ -234,30 +234,17 @@ public abstract class XiaomiSupport extends AbstractBTLEDeviceSupport {
 
     @Override
     public void onSetTime() {
-        final TransactionBuilder builder;
-        try {
-            builder = performInitialized("set time");
-        } catch (final IOException e) {
-            LOG.error("Failed to initialize transaction builder", e);
-            return;
-        }
-        systemService.setCurrentTime(builder);
+        systemService.setCurrentTime();
 
-        final XiaomiCoordinator coordinator = getCoordinator();
-
-        if (coordinator.supportsCalendarEvents()) {
+        if (getCoordinator().supportsCalendarEvents()) {
             // TODO this should not be done here
-            calendarService.syncCalendar(builder);
+            calendarService.syncCalendar();
         }
-
-        builder.queue(getQueue());
     }
 
     @Override
     public void onTestNewFunction() {
-        final TransactionBuilder builder = createTransactionBuilder("test new function");
-        sendCommand(builder, 2, 29);
-        builder.queue(getQueue());
+        sendCommand("test new function", 2, 29);
     }
 
     @Override
@@ -404,7 +391,7 @@ public abstract class XiaomiSupport extends AbstractBTLEDeviceSupport {
         return (XiaomiCoordinator) gbDevice.getDeviceCoordinator();
     }
 
-    protected void phase2Initialize(final TransactionBuilder builder) {
+    protected void phase2Initialize() {
         LOG.info("phase2Initialize");
 
         characteristicCommandRead.reset();
@@ -413,21 +400,15 @@ public abstract class XiaomiSupport extends AbstractBTLEDeviceSupport {
         characteristicDataUpload.reset();
 
         if (GBApplication.getPrefs().getBoolean("datetime_synconconnect", true)) {
-            systemService.setCurrentTime(builder);
+            systemService.setCurrentTime();
         }
 
         for (final AbstractXiaomiService service : mServiceMap.values()) {
-            service.initialize(builder);
+            service.initialize();
         }
     }
 
     public void sendCommand(final String taskName, final XiaomiProto.Command command) {
-        final TransactionBuilder builder = createTransactionBuilder(taskName);
-        sendCommand(builder, command);
-        builder.queue(getQueue());
-    }
-
-    public void sendCommand(final TransactionBuilder builder, final XiaomiProto.Command command) {
         if (this.characteristicCommandWrite == null) {
             // Can sometimes happen in race conditions when connecting + receiving calendar event or weather updates
             LOG.warn("characteristicCommandWrite is null!");
@@ -440,27 +421,6 @@ public abstract class XiaomiSupport extends AbstractBTLEDeviceSupport {
         this.characteristicCommandWrite.write(commandBytes);
     }
 
-    public void sendCommand(final TransactionBuilder builder, final byte[] commandBytes) {
-        if (this.characteristicCommandWrite == null) {
-            // Can sometimes happen in race conditions when connecting + receiving calendar event or weather updates
-            LOG.warn("characteristicCommandWrite is null!");
-            return;
-        }
-
-        // FIXME builder is ignored
-        this.characteristicCommandWrite.write(commandBytes);
-    }
-
-    public void sendCommand(final TransactionBuilder builder, final int type, final int subtype) {
-        sendCommand(
-                builder,
-                XiaomiProto.Command.newBuilder()
-                        .setType(type)
-                        .setSubtype(subtype)
-                        .build()
-        );
-    }
-
     public void sendCommand(final String taskName, final int type, final int subtype) {
         sendCommand(
                 taskName,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/AbstractXiaomiService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/AbstractXiaomiService.java
index 18b2be35f..02738de0e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/AbstractXiaomiService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/AbstractXiaomiService.java
@@ -38,7 +38,7 @@ public abstract class AbstractXiaomiService {
 
     public abstract void handleCommand(final XiaomiProto.Command cmd);
 
-    public void initialize(final TransactionBuilder builder) {
+    public void initialize() {
 
     }
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiCalendarService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiCalendarService.java
index aec0c79d5..7082847c7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiCalendarService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiCalendarService.java
@@ -57,8 +57,8 @@ public class XiaomiCalendarService extends AbstractXiaomiService {
     }
 
     @Override
-    public void initialize(final TransactionBuilder builder) {
-        syncCalendar(builder);
+    public void initialize() {
+        syncCalendar();
     }
 
     @Override
@@ -83,12 +83,6 @@ public class XiaomiCalendarService extends AbstractXiaomiService {
     }
 
     public void syncCalendar() {
-        final TransactionBuilder builder = getSupport().createTransactionBuilder("sync calendar");
-        syncCalendar(builder);
-        builder.queue(getSupport().getQueue());
-    }
-
-    public void syncCalendar(final TransactionBuilder builder) {
         final boolean syncEnabled = GBApplication.getDeviceSpecificSharedPrefs(getSupport().getDevice().getAddress())
                 .getBoolean(PREF_SYNC_CALENDAR, false);
 
@@ -138,7 +132,7 @@ public class XiaomiCalendarService extends AbstractXiaomiService {
         LOG.debug("Syncing {} calendar events", lastSync.size());
 
         getSupport().sendCommand(
-                builder,
+                "sync calendar",
                 XiaomiProto.Command.newBuilder()
                         .setType(COMMAND_TYPE)
                         .setSubtype(CMD_CALENDAR_SET)
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
index 35cb4ecca..a27508130 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
@@ -146,18 +146,16 @@ public class XiaomiHealthService extends AbstractXiaomiService {
     }
 
     @Override
-    public void initialize(final TransactionBuilder builder) {
-        setUserInfo(builder);
-        getSupport().sendCommand(builder, COMMAND_TYPE, CMD_CONFIG_SPO2_GET);
-        getSupport().sendCommand(builder, COMMAND_TYPE, CMD_CONFIG_HEART_RATE_GET);
-        getSupport().sendCommand(builder, COMMAND_TYPE, CMD_CONFIG_STANDING_REMINDER_GET);
-        getSupport().sendCommand(builder, COMMAND_TYPE, CMD_CONFIG_STRESS_GET);
+    public void initialize() {
+        setUserInfo();
+        getSupport().sendCommand("get spo2 config", COMMAND_TYPE, CMD_CONFIG_SPO2_GET);
+        getSupport().sendCommand("get heart rate config", COMMAND_TYPE, CMD_CONFIG_HEART_RATE_GET);
+        getSupport().sendCommand("get standing reminders config", COMMAND_TYPE, CMD_CONFIG_STANDING_REMINDER_GET);
+        getSupport().sendCommand("get stress config", COMMAND_TYPE, CMD_CONFIG_STRESS_GET);
     }
 
     @Override
     public boolean onSendConfiguration(final String config, final Prefs prefs) {
-        final TransactionBuilder builder = getSupport().createTransactionBuilder("set " + config);
-
         switch (config) {
             case ActivityUser.PREF_USER_HEIGHT_CM:
             case ActivityUser.PREF_USER_WEIGHT_KG:
@@ -167,8 +165,7 @@ public class XiaomiHealthService extends AbstractXiaomiService {
             case ActivityUser.PREF_USER_STEPS_GOAL:
             case ActivityUser.PREF_USER_GOAL_STANDING_TIME_HOURS:
             case ActivityUser.PREF_USER_ACTIVETIME_MINUTES:
-                setUserInfo(builder);
-                builder.queue(getSupport().getQueue());
+                setUserInfo();
                 return true;
             case DeviceSettingsPreferenceConst.PREF_HEARTRATE_USE_FOR_SLEEP_DETECTION:
             case DeviceSettingsPreferenceConst.PREF_HEARTRATE_SLEEP_BREATHING_QUALITY_MONITORING:
@@ -176,11 +173,11 @@ public class XiaomiHealthService extends AbstractXiaomiService {
             case DeviceSettingsPreferenceConst.PREF_HEARTRATE_ALERT_ENABLED:
             case DeviceSettingsPreferenceConst.PREF_HEARTRATE_ALERT_HIGH_THRESHOLD:
             case DeviceSettingsPreferenceConst.PREF_HEARTRATE_ALERT_LOW_THRESHOLD:
-                setHeartRateConfig(builder);
+                setHeartRateConfig();
                 return true;
             case DeviceSettingsPreferenceConst.PREF_SPO2_ALL_DAY_MONITORING:
             case DeviceSettingsPreferenceConst.PREF_SPO2_LOW_ALERT_THRESHOLD:
-                setSpo2Config(builder);
+                setSpo2Config();
                 return true;
             case DeviceSettingsPreferenceConst.PREF_INACTIVITY_ENABLE:
             case DeviceSettingsPreferenceConst.PREF_INACTIVITY_START:
@@ -188,18 +185,18 @@ public class XiaomiHealthService extends AbstractXiaomiService {
             case DeviceSettingsPreferenceConst.PREF_INACTIVITY_DND:
             case DeviceSettingsPreferenceConst.PREF_INACTIVITY_DND_START:
             case DeviceSettingsPreferenceConst.PREF_INACTIVITY_DND_END:
-                setStandingReminderConfig(builder);
+                setStandingReminderConfig();
                 return true;
             case DeviceSettingsPreferenceConst.PREF_HEARTRATE_STRESS_MONITORING:
             case DeviceSettingsPreferenceConst.PREF_HEARTRATE_STRESS_RELAXATION_REMINDER:
-                setStressConfig(builder);
+                setStressConfig();
                 return true;
         }
 
         return false;
     }
 
-    public void setUserInfo(final TransactionBuilder builder) {
+    public void setUserInfo() {
         LOG.debug("Setting user info");
 
         final ActivityUser activityUser = new ActivityUser();
@@ -235,7 +232,7 @@ public class XiaomiHealthService extends AbstractXiaomiService {
                 .build();
 
         getSupport().sendCommand(
-                builder,
+                "set user info",
                 XiaomiProto.Command.newBuilder()
                         .setType(COMMAND_TYPE)
                         .setSubtype(CMD_SET_USER_INFO)
@@ -257,7 +254,7 @@ public class XiaomiHealthService extends AbstractXiaomiService {
         getSupport().evaluateGBDeviceEvent(eventUpdatePreferences);
     }
 
-    private void setSpo2Config(final TransactionBuilder builder) {
+    private void setSpo2Config() {
         LOG.debug("Set SpO2 config");
 
         final Prefs prefs = getDevicePrefs();
@@ -277,7 +274,7 @@ public class XiaomiHealthService extends AbstractXiaomiService {
                 .setAlarmLow(spo2alarmLowBuilder);
 
         getSupport().sendCommand(
-                builder,
+                "set spo2 config",
                 XiaomiProto.Command.newBuilder()
                         .setType(COMMAND_TYPE)
                         .setSubtype(CMD_CONFIG_SPO2_SET)
@@ -315,7 +312,7 @@ public class XiaomiHealthService extends AbstractXiaomiService {
         getSupport().evaluateGBDeviceEvent(eventUpdatePreferences);
     }
 
-    private void setHeartRateConfig(final TransactionBuilder builder) {
+    private void setHeartRateConfig() {
         final Prefs prefs = getDevicePrefs();
 
         final boolean sleepDetection = prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_HEARTRATE_USE_FOR_SLEEP_DETECTION, false);
@@ -338,7 +335,7 @@ public class XiaomiHealthService extends AbstractXiaomiService {
                 .setUnknown7(1);
 
         getSupport().sendCommand(
-                builder,
+                "set heart rate config",
                 XiaomiProto.Command.newBuilder()
                         .setType(COMMAND_TYPE)
                         .setSubtype(CMD_CONFIG_HEART_RATE_SET)
@@ -366,7 +363,7 @@ public class XiaomiHealthService extends AbstractXiaomiService {
         getSupport().evaluateGBDeviceEvent(eventUpdatePreferences);
     }
 
-    private void setStandingReminderConfig(final TransactionBuilder builder) {
+    private void setStandingReminderConfig() {
         LOG.debug("Set standing reminder config");
 
         final Prefs prefs = getDevicePrefs();
@@ -387,7 +384,7 @@ public class XiaomiHealthService extends AbstractXiaomiService {
                 .build();
 
         getSupport().sendCommand(
-                builder,
+                "set standing reminder config",
                 XiaomiProto.Command.newBuilder()
                         .setType(COMMAND_TYPE)
                         .setSubtype(CMD_CONFIG_STANDING_REMINDER_SET)
@@ -406,7 +403,7 @@ public class XiaomiHealthService extends AbstractXiaomiService {
         getSupport().evaluateGBDeviceEvent(eventUpdatePreferences);
     }
 
-    private void setStressConfig(final TransactionBuilder builder) {
+    private void setStressConfig() {
         LOG.debug("Set stress config");
 
         final Prefs prefs = getDevicePrefs();
@@ -418,7 +415,7 @@ public class XiaomiHealthService extends AbstractXiaomiService {
                 .setRelaxReminder(XiaomiProto.RelaxReminder.newBuilder().setEnabled(relaxReminder).setUnknown2(0));
 
         getSupport().sendCommand(
-                builder,
+                "set stress config",
                 XiaomiProto.Command.newBuilder()
                         .setType(COMMAND_TYPE)
                         .setSubtype(CMD_CONFIG_STRESS_SET)
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
index a5524525b..6e1cf84eb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
@@ -55,8 +55,8 @@ public class XiaomiNotificationService extends AbstractXiaomiService {
     }
 
     @Override
-    public void initialize(final TransactionBuilder builder) {
-        requestCannedMessages(builder);
+    public void initialize() {
+        requestCannedMessages();
     }
 
     @Override
@@ -128,7 +128,7 @@ public class XiaomiNotificationService extends AbstractXiaomiService {
                 .build();
 
         getSupport().sendCommand(
-                "send notification",
+                "send notification " + notificationSpec.getId(),
                 XiaomiProto.Command.newBuilder()
                         .setType(COMMAND_TYPE)
                         .setSubtype(CMD_NOTIFICATION_SEND)
@@ -235,9 +235,9 @@ public class XiaomiNotificationService extends AbstractXiaomiService {
         );
     }
 
-    public void requestCannedMessages(final TransactionBuilder builder) {
+    public void requestCannedMessages() {
         getSupport().sendCommand(
-                builder,
+                "get canned messages",
                 XiaomiProto.Command.newBuilder()
                         .setType(COMMAND_TYPE)
                         .setSubtype(CMD_CANNED_MESSAGES_GET)
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java
index 95402dd14..1cf105065 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java
@@ -109,10 +109,10 @@ public class XiaomiScheduleService extends AbstractXiaomiService {
                 break;
             case CMD_ALARMS_CREATE:
                 pendingAlarmAcks--;
+                LOG.debug("Got alarms create ack, remaining {}", pendingAlarmAcks);
                 if (pendingAlarmAcks <= 0) {
-                    final TransactionBuilder builder = getSupport().createTransactionBuilder("request alarms after all acks");
-                    requestAlarms(builder);
-                    builder.queue(getSupport().getQueue());
+                    LOG.debug("Requesting alarms after all acks");
+                    requestAlarms();
                 }
                 break;
             case CMD_WORLD_CLOCKS_GET:
@@ -126,10 +126,10 @@ public class XiaomiScheduleService extends AbstractXiaomiService {
                 break;
             case CMD_REMINDERS_CREATE:
                 pendingReminderAcks--;
+                LOG.debug("Got alarms create ack, remaining {}", pendingReminderAcks);
                 if (pendingReminderAcks <= 0) {
-                    final TransactionBuilder builder = getSupport().createTransactionBuilder("request reminders after all acks");
-                    requestReminders(builder);
-                    builder.queue(getSupport().getQueue());
+                    LOG.debug("Requesting reminders after all acks");
+                    requestReminders();
                 }
                 break;
         }
@@ -138,30 +138,28 @@ public class XiaomiScheduleService extends AbstractXiaomiService {
     }
 
     @Override
-    public void initialize(final TransactionBuilder builder) {
-        requestAlarms(builder);
-        requestReminders(builder);
-        requestWorldClocks(builder);
-        getSupport().sendCommand(builder, COMMAND_TYPE, CMD_SLEEP_MODE_GET);
+    public void initialize() {
+        requestAlarms();
+        requestReminders();
+        requestWorldClocks();
+        getSupport().sendCommand("get sleep mode", COMMAND_TYPE, CMD_SLEEP_MODE_GET);
     }
 
     @Override
     public boolean onSendConfiguration(final String config, final Prefs prefs) {
-        final TransactionBuilder builder = getSupport().createTransactionBuilder("set " + config);
-
         switch (config) {
             case DeviceSettingsPreferenceConst.PREF_SLEEP_TIME:
             case DeviceSettingsPreferenceConst.PREF_SLEEP_TIME_START:
             case DeviceSettingsPreferenceConst.PREF_SLEEP_TIME_END:
-                setSleepModeConfig(builder);
+                setSleepModeConfig();
                 return true;
         }
 
         return false;
     }
 
-    public void requestReminders(final TransactionBuilder builder) {
-        getSupport().sendCommand(builder, COMMAND_TYPE, CMD_REMINDERS_GET);
+    public void requestReminders() {
+        getSupport().sendCommand("request reminders", COMMAND_TYPE, CMD_REMINDERS_GET);
     }
 
     public void handleReminders(final XiaomiProto.Reminders reminders) {
@@ -386,8 +384,8 @@ public class XiaomiScheduleService extends AbstractXiaomiService {
         );
     }
 
-    public void requestWorldClocks(final TransactionBuilder builder) {
-        getSupport().sendCommand(builder, COMMAND_TYPE, CMD_WORLD_CLOCKS_GET);
+    public void requestWorldClocks() {
+        getSupport().sendCommand("get world clocks", COMMAND_TYPE, CMD_WORLD_CLOCKS_GET);
     }
 
     public void handleWorldClocks(final XiaomiProto.WorldClocks worldClocks) {
@@ -494,8 +492,8 @@ public class XiaomiScheduleService extends AbstractXiaomiService {
         }
     }
 
-    public void requestAlarms(final TransactionBuilder builder) {
-        getSupport().sendCommand(builder, COMMAND_TYPE, CMD_ALARMS_GET);
+    public void requestAlarms() {
+        getSupport().sendCommand("get alarms", COMMAND_TYPE, CMD_ALARMS_GET);
     }
 
     public void handleAlarms(final XiaomiProto.Alarms alarms) {
@@ -589,7 +587,7 @@ public class XiaomiScheduleService extends AbstractXiaomiService {
         getSupport().evaluateGBDeviceEvent(eventUpdatePreferences);
     }
 
-    private void setSleepModeConfig(final TransactionBuilder builder) {
+    private void setSleepModeConfig() {
         LOG.debug("Set sleep mode config");
 
         final Prefs prefs = getDevicePrefs();
@@ -606,7 +604,7 @@ public class XiaomiScheduleService extends AbstractXiaomiService {
                 .build();
 
         getSupport().sendCommand(
-                builder,
+                "set sleep mode",
                 XiaomiProto.Command.newBuilder()
                         .setType(COMMAND_TYPE)
                         .setSubtype(CMD_SLEEP_MODE_SET)
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
index f820dbd52..14938ee4c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
@@ -68,12 +68,12 @@ public class XiaomiSystemService extends AbstractXiaomiService {
     }
 
     @Override
-    public void initialize(final TransactionBuilder builder) {
+    public void initialize() {
         // Request device info and configs
-        getSupport().sendCommand(builder, COMMAND_TYPE, CMD_DEVICE_INFO);
-        getSupport().sendCommand(builder, COMMAND_TYPE, CMD_BATTERY);
-        getSupport().sendCommand(builder, COMMAND_TYPE, CMD_PASSWORD_GET);
-        getSupport().sendCommand(builder, COMMAND_TYPE, CMD_DISPLAY_ITEMS_GET);
+        getSupport().sendCommand("get device info", COMMAND_TYPE, CMD_DEVICE_INFO);
+        getSupport().sendCommand("get battery", COMMAND_TYPE, CMD_BATTERY);
+        getSupport().sendCommand("get password", COMMAND_TYPE, CMD_PASSWORD_GET);
+        getSupport().sendCommand("get display items", COMMAND_TYPE, CMD_DISPLAY_ITEMS_GET);
     }
 
     @Override
@@ -113,25 +113,22 @@ public class XiaomiSystemService extends AbstractXiaomiService {
 
     @Override
     public boolean onSendConfiguration(final String config, final Prefs prefs) {
-        final TransactionBuilder builder = getSupport().createTransactionBuilder("set " + config);
-
         switch (config) {
             case DeviceSettingsPreferenceConst.PREF_TIMEFORMAT:
-                setCurrentTime(builder);
-                builder.queue(getSupport().getQueue());
+                setCurrentTime();
                 return true;
             case PasswordCapabilityImpl.PREF_PASSWORD_ENABLED:
             case PasswordCapabilityImpl.PREF_PASSWORD:
-                setPassword(builder);
+                setPassword();
             case HuamiConst.PREF_DISPLAY_ITEMS_SORTABLE:
-                setDisplayItems(builder);
+                setDisplayItems();
                 return true;
         }
 
         return super.onSendConfiguration(config, prefs);
     }
 
-    public void setCurrentTime(final TransactionBuilder builder) {
+    public void setCurrentTime() {
         LOG.debug("Setting current time");
 
         final Calendar now = GregorianCalendar.getInstance();
@@ -162,7 +159,7 @@ public class XiaomiSystemService extends AbstractXiaomiService {
                 .build();
 
         getSupport().sendCommand(
-                builder,
+                "set time",
                 XiaomiProto.Command.newBuilder()
                         .setType(COMMAND_TYPE)
                         .setSubtype(CMD_CLOCK)
@@ -204,7 +201,7 @@ public class XiaomiSystemService extends AbstractXiaomiService {
         getSupport().evaluateGBDeviceEvent(batteryInfo);
     }
 
-    private void setPassword(final TransactionBuilder builder) {
+    private void setPassword() {
         final Prefs prefs = getDevicePrefs();
 
         final boolean passwordEnabled = prefs.getBoolean(PasswordCapabilityImpl.PREF_PASSWORD_ENABLED, false);
@@ -222,7 +219,7 @@ public class XiaomiSystemService extends AbstractXiaomiService {
                 .setPassword(password);
 
         getSupport().sendCommand(
-                builder,
+                "set password",
                 XiaomiProto.Command.newBuilder()
                         .setType(COMMAND_TYPE)
                         .setSubtype(CMD_PASSWORD_SET)
@@ -246,7 +243,7 @@ public class XiaomiSystemService extends AbstractXiaomiService {
         getSupport().evaluateGBDeviceEvent(eventUpdatePreferences);
     }
 
-    private void setDisplayItems(final TransactionBuilder builder) {
+    private void setDisplayItems() {
         final Prefs prefs = getDevicePrefs();
         final List<String> allScreens = new ArrayList<>(prefs.getList(XiaomiPreferences.getPrefPossibleValuesKey(HuamiConst.PREF_DISPLAY_ITEMS_SORTABLE), Collections.emptyList()));
         final List<String> enabledScreens = new ArrayList<>(prefs.getList(HuamiConst.PREF_DISPLAY_ITEMS_SORTABLE, Collections.emptyList()));
@@ -300,7 +297,7 @@ public class XiaomiSystemService extends AbstractXiaomiService {
         }
 
         getSupport().sendCommand(
-                builder,
+                "set display items",
                 XiaomiProto.Command.newBuilder()
                         .setType(COMMAND_TYPE)
                         .setSubtype(CMD_DISPLAY_ITEMS_SET)
@@ -311,6 +308,7 @@ public class XiaomiSystemService extends AbstractXiaomiService {
 
     private void handleDisplayItems(final XiaomiProto.DisplayItems displayItems) {
         LOG.debug("Got {} display items", displayItems.getDisplayItemCount());
+
         final List<String> allScreens = new ArrayList<>();
         final List<String> mainScreens = new ArrayList<>();
         final List<String> moreScreens = new ArrayList<>();
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java
index 95a68a7b4..3b236b77a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java
@@ -48,7 +48,7 @@ public class XiaomiWeatherService extends AbstractXiaomiService {
     }
 
     @Override
-    public void initialize(final TransactionBuilder builder) {
+    public void initialize() {
         // TODO setMeasurementSystem();, or request
     }
 

From 48e149aefec328c4448d056fd27fa6c53974afd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sun, 22 Oct 2023 13:47:20 +0100
Subject: [PATCH 116/595] Xiaomi: Refactor XiaomiCharacteristic to improve
 logging and ordering

Fixes a potential race condition on initialization, since the chunked
commands were being scheduled on a separate transaction builder, which
would be scheduled to be written before the initialization.
---
 .../devices/xiaomi/XiaomiAuthService.java     |  22 +--
 .../devices/xiaomi/XiaomiCharacteristic.java  | 135 +++++++++++-------
 .../service/devices/xiaomi/XiaomiSupport.java |  20 ++-
 3 files changed, 116 insertions(+), 61 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java
index 2ba07c516..a814f9db8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java
@@ -66,6 +66,8 @@ public class XiaomiAuthService extends AbstractXiaomiService {
     public static final int CMD_NONCE = 26;
     public static final int CMD_AUTH = 27;
 
+    private boolean encryptionInitialized = false;
+
     private final byte[] secretKey = new byte[16];
     private final byte[] nonce = new byte[16];
     private final byte[] encryptionKey = new byte[16];
@@ -77,17 +79,19 @@ public class XiaomiAuthService extends AbstractXiaomiService {
         super(support);
     }
 
+    public boolean isEncryptionInitialized() {
+        return encryptionInitialized;
+    }
+
     protected void startEncryptedHandshake(final TransactionBuilder builder) {
+        encryptionInitialized = false;
+
         builder.add(new SetDeviceStateAction(getSupport().getDevice(), GBDevice.State.AUTHENTICATING, getSupport().getContext()));
 
         System.arraycopy(getSecretKey(getSupport().getDevice()), 0, secretKey, 0, 16);
         new SecureRandom().nextBytes(nonce);
 
-        // TODO use sendCommand
-        builder.write(
-                getSupport().getCharacteristic(XiaomiEncryptedSupport.UUID_CHARACTERISTIC_XIAOMI_COMMAND_WRITE),
-                ArrayUtils.addAll(PAYLOAD_HEADER_AUTH, buildNonceCommand(nonce))
-        );
+        getSupport().sendCommand(builder, buildNonceCommand(nonce));
     }
 
     protected void startClearTextHandshake(final TransactionBuilder builder, String userId) {
@@ -103,7 +107,7 @@ public class XiaomiAuthService extends AbstractXiaomiService {
                 .setAuth(auth)
                 .build();
 
-        getSupport().sendCommand("start clear text handshake", command);
+        getSupport().sendCommand(builder, command);
     }
 
     @Override
@@ -138,6 +142,8 @@ public class XiaomiAuthService extends AbstractXiaomiService {
                 if (cmd.getSubtype() == CMD_AUTH || cmd.getAuth().getStatus() == 1) {
                     LOG.info("Authenticated!");
 
+                    encryptionInitialized = cmd.getSubtype() == CMD_AUTH;
+
                     final TransactionBuilder builder = getSupport().createTransactionBuilder("phase 2 initialize");
                     builder.add(new SetDeviceStateAction(getSupport().getDevice(), GBDevice.State.INITIALIZED, getSupport().getContext()));
                     getSupport().phase2Initialize();
@@ -227,7 +233,7 @@ public class XiaomiAuthService extends AbstractXiaomiService {
         return cmd.setAuth(auth.build()).build();
     }
 
-    public static byte[] buildNonceCommand(final byte[] nonce) {
+    public static XiaomiProto.Command buildNonceCommand(final byte[] nonce) {
         final XiaomiProto.PhoneNonce.Builder phoneNonce = XiaomiProto.PhoneNonce.newBuilder();
         phoneNonce.setNonce(ByteString.copyFrom(nonce));
 
@@ -238,7 +244,7 @@ public class XiaomiAuthService extends AbstractXiaomiService {
         command.setType(COMMAND_TYPE);
         command.setSubtype(CMD_NONCE);
         command.setAuth(auth.build());
-        return command.build().toByteArray();
+        return command.build();
     }
 
     public static byte[] computeAuthStep3Hmac(final byte[] secretKey,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
index efee6004c..5780a99ce 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
@@ -50,8 +50,8 @@ public class XiaomiCharacteristic {
     private final UUID characteristicUUID;
 
     // Encryption
-    private XiaomiAuthService authService = null;
-    private boolean isEncrypted = false;
+    private final XiaomiAuthService authService;
+    private boolean isEncrypted;
     private short encryptedIndex = 0;
 
     // Chunking
@@ -61,10 +61,10 @@ public class XiaomiCharacteristic {
 
     // Scheduling
     // TODO timeouts
-    private final Queue<byte[]> payloadQueue = new LinkedList<>();
+    private final Queue<Payload> payloadQueue = new LinkedList<>();
     private boolean waitingAck = false;
     private boolean sendingChunked = false;
-    private byte[] currentSending = null;
+    private Payload currentPayload = null;
 
     private Handler handler = null;
 
@@ -99,30 +99,35 @@ public class XiaomiCharacteristic {
         this.payloadQueue.clear();
         this.waitingAck = false;
         this.sendingChunked = false;
-        this.currentSending = null;
+        this.currentPayload = null;
     }
 
     /**
      * Write bytes to this characteristic, encrypting and splitting it into chunks if necessary.
      */
-    public void write(final byte[] value) {
-        payloadQueue.add(value);
-        sendNext();
+    public void write(final String taskName, final byte[] value) {
+        write(null, new Payload(taskName, value));
     }
 
     /**
-     * Write bytes to this characteristic directly.
+     * Write bytes to this characteristic, encrypting and splitting it into chunks if necessary. Uses
+     * the provided if we need to schedule something, otherwise it will be queued as other commands.
      */
-    public void writeDirect(final TransactionBuilder builder, final byte[] value) {
-        builder.write(bluetoothGattCharacteristic, value);
+    public void write(final TransactionBuilder builder, final byte[] value) {
+        write(builder, new Payload(builder.getTaskName(), value));
+    }
+
+    private void write(final TransactionBuilder builder, final Payload payload) {
+        payloadQueue.add(payload);
+        sendNext(builder);
     }
 
     public void onCharacteristicChanged(final byte[] value) {
         if (Arrays.equals(value, PAYLOAD_ACK)) {
             LOG.debug("Got ack");
-            currentSending = null;
+            currentPayload = null;
             waitingAck = false;
-            sendNext();
+            sendNext(null);
             return;
         }
 
@@ -178,34 +183,35 @@ public class XiaomiCharacteristic {
                     switch (subtype) {
                         case 0:
                             LOG.debug("Got chunked ack end");
-                            currentSending = null;
+                            currentPayload = null;
                             sendingChunked = false;
-                            sendNext();
+                            sendNext(null);
                             return;
                         case 1:
                             LOG.debug("Got chunked ack start");
-                            final TransactionBuilder builder = mSupport.createTransactionBuilder("send chunks");
-                            for (int i = 0; i * MAX_WRITE_SIZE < currentSending.length; i++) {
+                            final TransactionBuilder builder = mSupport.createTransactionBuilder("send chunks for " + currentPayload.getTaskName());
+                            final byte[] payload = currentPayload.getBytesToSend();
+                            for (int i = 0; i * MAX_WRITE_SIZE < payload.length; i++) {
                                 final int startIndex = i * MAX_WRITE_SIZE;
-                                final int endIndex = Math.min((i + 1) * MAX_WRITE_SIZE, currentSending.length);
-                                LOG.debug("Sending chunk {} from {} to {}", i, startIndex, endIndex);
+                                final int endIndex = Math.min((i + 1) * MAX_WRITE_SIZE, payload.length);
+                                LOG.debug("Sending chunk {} from {} to {} for {}", i, startIndex, endIndex, currentPayload.getTaskName());
                                 final byte[] chunkToSend = new byte[2 + endIndex - startIndex];
                                 BLETypeConversions.writeUint16(chunkToSend, 0, i + 1);
-                                System.arraycopy(currentSending, startIndex, chunkToSend, 2, endIndex - startIndex);
+                                System.arraycopy(payload, startIndex, chunkToSend, 2, endIndex - startIndex);
                                 builder.write(bluetoothGattCharacteristic, chunkToSend);
                             }
 
                             builder.queue(mSupport.getQueue());
                             return;
                         case 2:
-                            LOG.warn("Got chunked nack");
-                            currentSending = null;
+                            LOG.warn("Got chunked nack for {}", currentPayload.getTaskName());
+                            currentPayload = null;
                             sendingChunked = false;
-                            sendNext();
+                            sendNext(null);
                             return;
                     }
 
-                    LOG.warn("Unknown chunked ack subtype {}", subtype);
+                    LOG.warn("Unknown chunked ack subtype {} for {}", subtype, currentPayload.getTaskName());
 
                     return;
                 case 2:
@@ -233,66 +239,72 @@ public class XiaomiCharacteristic {
         }
     }
 
-    private void sendNext() {
+    private void sendNext(@Nullable final TransactionBuilder b) {
         if (waitingAck || sendingChunked) {
             LOG.debug("Already sending something");
             return;
         }
 
-        final byte[] payload = payloadQueue.poll();
-        if (payload == null) {
+        currentPayload = payloadQueue.poll();
+        if (currentPayload == null) {
             LOG.debug("Nothing to send");
             return;
         }
 
-        if (isEncrypted) {
-            currentSending = authService.encrypt(payload, encryptedIndex);
-        } else {
-            currentSending = payload;
+        final boolean encrypt = isEncrypted && authService.isEncryptionInitialized();
+
+        if (encrypt) {
+            currentPayload.setBytesToSend(authService.encrypt(currentPayload.getBytesToSend(), encryptedIndex));
         }
 
-        if (shouldWriteChunked(currentSending)) {
-            if (isEncrypted) {
+        if (shouldWriteChunked(currentPayload.getBytesToSend())) {
+            if (encrypt) {
                 // Prepend encrypted index for the nonce
-                currentSending = ByteBuffer.allocate(2 + currentSending.length).order(ByteOrder.LITTLE_ENDIAN)
-                        .putShort(encryptedIndex++)
-                        .put(currentSending)
-                        .array();
+                currentPayload.setBytesToSend(
+                        ByteBuffer.allocate(2 + currentPayload.getBytesToSend().length).order(ByteOrder.LITTLE_ENDIAN)
+                                .putShort(encryptedIndex++)
+                                .put(currentPayload.getBytesToSend())
+                                .array()
+                );
             }
 
-            LOG.debug("Sending next - chunked");
+            LOG.debug("Sending {} - chunked", currentPayload.getTaskName());
 
             sendingChunked = true;
 
             final ByteBuffer buf = ByteBuffer.allocate(6).order(ByteOrder.LITTLE_ENDIAN);
             buf.putShort((short) 0);
             buf.put((byte) 0);
-            buf.put((byte) (isEncrypted ? 1 : 0));
-            buf.putShort((short) Math.ceil(currentSending.length / (float) MAX_WRITE_SIZE));
+            buf.put((byte) (encrypt ? 1 : 0));
+            buf.putShort((short) Math.ceil(currentPayload.getBytesToSend().length / (float) MAX_WRITE_SIZE));
 
-            final TransactionBuilder builder = mSupport.createTransactionBuilder("send chunked start");
+            final TransactionBuilder builder = b == null ? mSupport.createTransactionBuilder("send chunked start for " + currentPayload.getTaskName()) : b;
             builder.write(bluetoothGattCharacteristic, buf.array());
-            builder.queue(mSupport.getQueue());
+            if (b == null) {
+                builder.queue(mSupport.getQueue());
+            }
         } else {
-            LOG.debug("Sending next - single");
+            LOG.debug("Sending {} - single", currentPayload.getTaskName());
 
             // Encrypt single command
-            final int commandLength = (isEncrypted ? 6 : 4) + currentSending.length;
+            final int commandLength = (encrypt ? 6 : 4) + currentPayload.getBytesToSend().length;
 
             final ByteBuffer buf = ByteBuffer.allocate(commandLength).order(ByteOrder.LITTLE_ENDIAN);
             buf.putShort((short) 0);
             buf.put((byte) 2); // 2 for command
-            buf.put((byte) (isEncrypted ? 1 : 2));
-            if (isEncrypted) {
+            buf.put((byte) (encrypt ? 1 : 2));
+            if (encrypt) {
                 buf.putShort(encryptedIndex++);
             }
-            buf.put(currentSending); // it's already encrypted
+            buf.put(currentPayload.getBytesToSend()); // it's already encrypted
 
             waitingAck = true;
 
-            final TransactionBuilder builder = mSupport.createTransactionBuilder("send single command");
+            final TransactionBuilder builder = b == null ? mSupport.createTransactionBuilder("send single command for " + currentPayload.getTaskName()) : b;
             builder.write(bluetoothGattCharacteristic, buf.array());
-            builder.queue(mSupport.getQueue());
+            if (b == null) {
+                builder.queue(mSupport.getQueue());
+            }
         }
     }
 
@@ -327,4 +339,29 @@ public class XiaomiCharacteristic {
     public interface Handler {
         void handle(final byte[] payload);
     }
+
+    private static class Payload {
+        private final String taskName;
+        private final byte[] bytes;
+
+        // Bytes that will actually be sent (might be encrypted)
+        private byte[] bytesToSend;
+
+        public Payload(final String taskName, final byte[] bytes) {
+            this.taskName = taskName;
+            this.bytes = bytes;
+        }
+
+        public String getTaskName() {
+            return taskName;
+        }
+
+        public void setBytesToSend(final byte[] bytesToSend) {
+            this.bytesToSend = bytesToSend;
+        }
+
+        public byte[] getBytesToSend() {
+            return bytesToSend != null ? bytesToSend : bytes;
+        }
+    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
index bdfef634d..d590b689e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
@@ -415,10 +415,22 @@ public abstract class XiaomiSupport extends AbstractBTLEDeviceSupport {
             return;
         }
 
-        // FIXME builder is ignored
-        final byte[] commandBytes = command.toByteArray();
-        LOG.debug("Sending command {}", GB.hexdump(commandBytes));
-        this.characteristicCommandWrite.write(commandBytes);
+        this.characteristicCommandWrite.write(taskName, command.toByteArray());
+    }
+
+    /**
+     * Realistically, this function should only be used during auth, as we must schedule the command after
+     * notifications were enabled on the characteristics, and for that we need the builder to guarantee the
+     * order.
+     */
+    public void sendCommand(final TransactionBuilder builder, final XiaomiProto.Command command) {
+        if (this.characteristicCommandWrite == null) {
+            // Can sometimes happen in race conditions when connecting + receiving calendar event or weather updates
+            LOG.warn("characteristicCommandWrite is null!");
+            return;
+        }
+
+        this.characteristicCommandWrite.write(builder, command.toByteArray());
     }
 
     public void sendCommand(final String taskName, final int type, final int subtype) {

From b0d3fe6a519265d780115b705235602916d6a878 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sun, 22 Oct 2023 14:53:48 +0100
Subject: [PATCH 117/595] Xiaomi: Set device language

---
 .../devices/xiaomi/XiaomiCoordinator.java     | 34 +++++++++++++++---
 .../xiaomi/services/XiaomiSystemService.java  | 36 +++++++++++++++++--
 app/src/main/proto/xiaomi.proto               |  7 ++++
 app/src/main/res/values/arrays.xml            |  8 +++++
 app/src/main/res/values/strings.xml           |  1 +
 5 files changed, 80 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
index 308c26b13..bd465e93c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
@@ -410,10 +410,36 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
 
     @Override
     public String[] getSupportedLanguageSettings(final GBDevice device) {
-        // TODO check which are supported
-        final List<String> allLanguages = new ArrayList<>(HuamiLanguageType.idLookup.keySet());
-        allLanguages.add(0, "auto");
-        return allLanguages.toArray(new String[0]);
+        return new String[]{
+                "auto",
+                "ar_SA",
+                "cs_CZ",
+                "da_DK",
+                "de_DE",
+                "el_GR",
+                "en_US",
+                "es_ES",
+                "fr_FR",
+                "he_IL",
+                "id_ID",
+                "it_IT",
+                "ja_JP",
+                "ko_KO",
+                "nl_NL",
+                "nb_NO",
+                "pl_PL",
+                "pt_BR",
+                "pt_PT",
+                "ro_RO",
+                "ru_RU",
+                "sv_SE",
+                "th_TH",
+                "tr_TR",
+                "uk_UA",
+                "vi_VN",
+                "zh_CN",
+                "zh_TW",
+        };
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
index 14938ee4c..47580c3a4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
@@ -25,6 +25,7 @@ import java.util.Collections;
 import java.util.GregorianCalendar;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.TimeZone;
 
@@ -36,11 +37,9 @@ import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventFindPhone;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdateDeviceInfo;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdatePreferences;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventVersionInfo;
-import nodomain.freeyourgadget.gadgetbridge.devices.huami.Huami2021Coordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
 import nodomain.freeyourgadget.gadgetbridge.model.BatteryState;
 import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
-import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiPreferences;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
 import nodomain.freeyourgadget.gadgetbridge.util.GBPrefs;
@@ -55,6 +54,7 @@ public class XiaomiSystemService extends AbstractXiaomiService {
     public static final int CMD_BATTERY = 1;
     public static final int CMD_DEVICE_INFO = 2;
     public static final int CMD_CLOCK = 3;
+    public static final int CMD_LANGUAGE = 6;
     public static final int CMD_PASSWORD_GET = 9;
     public static final int CMD_FIND_PHONE = 17;
     public static final int CMD_FIND_WATCH = 18;
@@ -114,6 +114,9 @@ public class XiaomiSystemService extends AbstractXiaomiService {
     @Override
     public boolean onSendConfiguration(final String config, final Prefs prefs) {
         switch (config) {
+            case DeviceSettingsPreferenceConst.PREF_LANGUAGE:
+                setLanguage();
+                return true;
             case DeviceSettingsPreferenceConst.PREF_TIMEFORMAT:
                 setCurrentTime();
                 return true;
@@ -128,6 +131,35 @@ public class XiaomiSystemService extends AbstractXiaomiService {
         return super.onSendConfiguration(config, prefs);
     }
 
+    public void setLanguage() {
+        String localeString = GBApplication.getDeviceSpecificSharedPrefs(getSupport().getDevice().getAddress()).getString(
+                DeviceSettingsPreferenceConst.PREF_LANGUAGE, DeviceSettingsPreferenceConst.PREF_LANGUAGE_AUTO
+        );
+        if (DeviceSettingsPreferenceConst.PREF_LANGUAGE_AUTO.equals(localeString)) {
+            String language = Locale.getDefault().getLanguage();
+            String country = Locale.getDefault().getCountry();
+
+            if (StringUtils.isNullOrEmpty(country)) {
+                // sometimes country is null, no idea why, guess it.
+                country = language;
+            }
+            localeString = language + "_" + country.toUpperCase();
+        }
+
+        LOG.info("Set language: {}", localeString);
+
+        getSupport().sendCommand(
+                "set language",
+                XiaomiProto.Command.newBuilder()
+                        .setType(COMMAND_TYPE)
+                        .setSubtype(CMD_LANGUAGE)
+                        .setSystem(XiaomiProto.System.newBuilder().setLanguage(
+                                XiaomiProto.Language.newBuilder().setCode(localeString.toLowerCase(Locale.ROOT))
+                        ))
+                        .build()
+        );
+    }
+
     public void setCurrentTime() {
         LOG.debug("Setting current time");
 
diff --git a/app/src/main/proto/xiaomi.proto b/app/src/main/proto/xiaomi.proto
index 083384c6c..369d4f2fd 100644
--- a/app/src/main/proto/xiaomi.proto
+++ b/app/src/main/proto/xiaomi.proto
@@ -94,6 +94,9 @@ message System {
   // 2, 7 get | 2, 8 set
   optional Camera camera = 15;
 
+  // 2, 6
+  optional Language language = 20;
+
   // 2, 51 get | 2, 52 create
   optional Widgets widgets = 28;
   // 2, 53
@@ -189,6 +192,10 @@ message Camera {
   required bool enabled = 1;
 }
 
+message Language {
+  optional string code = 1; // pt_pt, en_us
+}
+
 message Widgets {
   repeated Widget widget = 1;
   optional uint32 unknown2 = 2; // 1
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index f273c9bf3..1d09263ae 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -2210,6 +2210,10 @@
         <item name="ja_JP">@string/japanese</item>
         <item name="ko_KO">@string/korean</item>
         <item name="he_IL">@string/hebrew</item>
+        <item name="da_DK">@string/danish</item>
+        <item name="nb_NO">@string/norwegian_bokmal</item>
+        <item name="ro_RO">@string/romanian</item>
+        <item name="sv_SE">@string/swedish</item>
     </string-array>
 
     <string-array name="pref_language_all_values">
@@ -2244,6 +2248,10 @@
         <item>ja_JP</item>
         <item>ko_KO</item>
         <item>he_IL</item>
+        <item>da_DK</item>
+        <item>nb_NO</item>
+        <item>ro_RO</item>
+        <item>sv_SE</item>
     </string-array>
 
     <string-array name="pref_amazfitbip_language">
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 515925d6a..4e6c5ffbf 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1032,6 +1032,7 @@
     <string name="hebrew">Hebrew</string>
     <string name="swedish">Swedish</string>
     <string name="czesh">Czech</string>
+    <string name="danish">Danish</string>
     <string name="FetchActivityOperation_about_to_transfer_since">About to transfer data since %1$s</string>
     <string name="waiting_for_reconnect">Waiting for reconnect</string>
     <string name="activity_prefs_about_you">About you</string>

From 82a264cd65e7db69e99519ac4a785741361252ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sun, 22 Oct 2023 19:17:41 +0100
Subject: [PATCH 118/595] Xiaomi: Improve emoji mapping efficiency

---
 .../xiaomi/XiaomiEncryptedSupport.java        | 281 ++++++++++++------
 1 file changed, 183 insertions(+), 98 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiEncryptedSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiEncryptedSupport.java
index fcdb81b16..d6522e2b8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiEncryptedSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiEncryptedSupport.java
@@ -16,11 +16,10 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi;
 
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.LinkedHashMap;
-import java.util.Map;
 import java.util.UUID;
 
 import nodomain.freeyourgadget.gadgetbridge.service.btle.GattService;
@@ -91,102 +90,188 @@ public class XiaomiEncryptedSupport extends XiaomiSupport {
 
     @Override
     public String customStringFilter(final String inputString) {
-        // TODO: Do this more efficiently - it iterates the input string 88 times...
-        String customString = inputString;
-        for (Map.Entry<String, String> emoji : EMOJI_MAP.entrySet()) {
-            customString = customString.replaceAll(emoji.getKey(), emoji.getValue());
-        }
-        return customString;
+        return StringUtils.replaceEach(inputString, EMOJI_SOURCE, EMOJI_TARGET);
     }
 
-    private static final Map<String, String> EMOJI_MAP = new LinkedHashMap<String, String>() {{
-        put("\uD83D\uDE0D", "ꀂ"); // 😍
-        put("\uD83D\uDE18", "ꀃ"); // 😘
-        put("\uD83D\uDE02", "ꀄ"); // 😂
-        put("\uD83D\uDE0A", "ꀅ"); // 😊
-        put("\uD83D\uDE0E", "ꀆ"); // 😎
-        put("\uD83D\uDE09", "ꀇ"); // 😉
-        put("\uD83D\uDC8B", "ꀈ"); // 💋
-        put("\uD83D\uDC4D", "ꀉ"); // 👍
-        put("\uD83E\uDD23", "ꀊ"); // 🤣
-        put("\uD83D\uDC95", "ꀋ"); // 💕
-        put("\uD83D\uDE00", "ꀌ"); // 😀
-        put("\uD83D\uDE04", "ꀍ"); // 😄
-        put("\uD83D\uDE2D", "ꀎ"); // 😭
-        put("\uD83E\uDD7A", "ꀏ"); // 🥺
-        put("\uD83D\uDE4F", "ꀑ"); // 🙏
-        put("\uD83E\uDD70", "ꀒ"); // 🥰
-        put("\uD83E\uDD14", "ꀓ"); // 🤔
-        put("\uD83D\uDD25", "ꀔ"); // 🔥
-        put("\uD83D\uDE29", "ꀗ"); // 😩
-        put("\uD83D\uDE14", "ꀘ"); // 😔
-        put("\uD83D\uDE01", "ꀙ"); // 😁
-        put("\uD83D\uDC4C", "ꀚ"); // 👌
-        put("\uD83D\uDE0F", "ꀛ"); // 😏
-        put("\uD83D\uDE05", "ꀜ"); // 😅
-        put("\uD83E\uDD0D", "ꀝ"); // 🤍
-        put("\uD83D\uDC94", "ꀞ"); // 💔
-        put("\uD83D\uDE0C", "ꀟ"); // 😌
-        put("\uD83D\uDE22", "ꀠ"); // 😢
-        put("\uD83D\uDC99", "ꀡ"); // 💙
-        put("\uD83D\uDC9C", "ꀢ"); // 💜
-        put("\uD83C\uDFB6", "ꀤ"); // 🎶
-        put("\uD83D\uDE33", "ꀥ"); // 😳
-        put("\uD83D\uDC96", "ꀦ"); // 💖
-        put("\uD83D\uDE4C", "ꀧ"); // 🙌
-        put("\uD83D\uDCAF", "ꀨ"); // 💯
-        put("\uD83D\uDE48", "ꀩ"); // 🙈
-        put("\uD83D\uDE0B", "ꀫ"); // 😋
-        put("\uD83D\uDE11", "ꀬ"); // 😑
-        put("\uD83D\uDE34", "ꀭ"); // 😴
-        put("\uD83D\uDE2A", "ꀮ"); // 😪
-        put("\uD83D\uDE1C", "ꀯ"); // 😜
-        put("\uD83D\uDE1B", "ꀰ"); // 😛
-        put("\uD83D\uDE1D", "ꀱ"); // 😝
-        put("\uD83D\uDE1E", "ꀲ"); // 😞
-        put("\uD83D\uDE15", "ꀳ"); // 😕
-        put("\uD83D\uDC97", "ꀴ"); // 💗
-        put("\uD83D\uDC4F", "ꀵ"); // 👏
-        put("\uD83D\uDE10", "ꀶ"); // 😐
-        put("\uD83D\uDC49", "ꀷ"); // 👉
-        put("\uD83D\uDC9B", "ꀸ"); // 💛
-        put("\uD83D\uDC9E", "ꀹ"); // 💞
-        put("\uD83D\uDCAA", "ꀺ"); // 💪
-        put("\uD83C\uDF39", "ꀻ"); // 🌹
-        put("\uD83D\uDC80", "ꀼ"); // 💀
-        put("\uD83D\uDE31", "ꀽ"); // 😱
-        put("\uD83D\uDC98", "ꀾ"); // 💘
-        put("\uD83E\uDD1F", "ꀿ"); // 🤟
-        put("\uD83D\uDE21", "ꁀ"); // 😡
-        put("\uD83D\uDCF7", "ꁁ"); // 📷
-        put("\uD83C\uDF38", "ꁂ"); // 🌸
-        put("\uD83D\uDE08", "ꁃ"); // 😈
-        put("\uD83D\uDC48", "ꁄ"); // 👈
-        put("\uD83C\uDF89", "ꁅ"); // 🎉
-        put("\uD83D\uDC81", "ꁆ"); // 💁
-        put("\uD83D\uDE4A", "ꁇ"); // 🙊
-        put("\uD83D\uDC9A", "ꁈ"); // 💚
-        put("\uD83D\uDE2B", "ꁉ"); // 😫
-        put("\uD83D\uDE24", "ꁊ"); // 😤
-        put("\uD83D\uDC93", "ꁍ"); // 💓
-        put("\uD83C\uDF1A", "ꁎ"); // 🌚
-        put("\uD83D\uDC47", "ꁏ"); // 👇
-        put("\uD83D\uDE07", "ꁒ"); // 😇
-        put("\uD83D\uDC4A", "ꁓ"); // 👊
-        put("\uD83D\uDC51", "ꁔ"); // 👑
-        put("\uD83D\uDE13", "ꁕ"); // 😓
-        put("\uD83D\uDE3B", "ꁖ"); // 😻
-        put("\uD83D\uDD34", "ꁗ"); // 🔴
-        put("\uD83D\uDE25", "ꁘ"); // 😥
-        put("\uD83E\uDD29", "ꁙ"); // 🤩
-        put("\uD83D\uDE1A", "ꁚ"); // 😚
-        put("\uD83D\uDE37", "ꁜ"); // 😷
-        put("\uD83D\uDC4B", "ꁝ"); // 👋
-        put("\uD83D\uDCA5", "ꁞ"); // 💥
-        put("\uD83E\uDD2D", "ꁠ"); // 🤭
-        put("\uD83C\uDF1F", "ꁡ"); // 🌟
-        put("\uD83E\uDD71", "ꁢ"); // 🥱
-        put("\uD83D\uDCA9", "ꁣ"); // 💩
-        put("\uD83D\uDE80", "ꁤ"); // 🚀
-    }};
+    private static final String[] EMOJI_SOURCE = new String[] {
+            "\uD83D\uDE0D", // 😍
+            "\uD83D\uDE18", // 😘
+            "\uD83D\uDE02", // 😂
+            "\uD83D\uDE0A", // 😊
+            "\uD83D\uDE0E", // 😎
+            "\uD83D\uDE09", // 😉
+            "\uD83D\uDC8B", // 💋
+            "\uD83D\uDC4D", // 👍
+            "\uD83E\uDD23", // 🤣
+            "\uD83D\uDC95", // 💕
+            "\uD83D\uDE00", // 😀
+            "\uD83D\uDE04", // 😄
+            "\uD83D\uDE2D", // 😭
+            "\uD83E\uDD7A", // 🥺
+            "\uD83D\uDE4F", // 🙏
+            "\uD83E\uDD70", // 🥰
+            "\uD83E\uDD14", // 🤔
+            "\uD83D\uDD25", // 🔥
+            "\uD83D\uDE29", // 😩
+            "\uD83D\uDE14", // 😔
+            "\uD83D\uDE01", // 😁
+            "\uD83D\uDC4C", // 👌
+            "\uD83D\uDE0F", // 😏
+            "\uD83D\uDE05", // 😅
+            "\uD83E\uDD0D", // 🤍
+            "\uD83D\uDC94", // 💔
+            "\uD83D\uDE0C", // 😌
+            "\uD83D\uDE22", // 😢
+            "\uD83D\uDC99", // 💙
+            "\uD83D\uDC9C", // 💜
+            "\uD83C\uDFB6", // 🎶
+            "\uD83D\uDE33", // 😳
+            "\uD83D\uDC96", // 💖
+            "\uD83D\uDE4C", // 🙌
+            "\uD83D\uDCAF", // 💯
+            "\uD83D\uDE48", // 🙈
+            "\uD83D\uDE0B", // 😋
+            "\uD83D\uDE11", // 😑
+            "\uD83D\uDE34", // 😴
+            "\uD83D\uDE2A", // 😪
+            "\uD83D\uDE1C", // 😜
+            "\uD83D\uDE1B", // 😛
+            "\uD83D\uDE1D", // 😝
+            "\uD83D\uDE1E", // 😞
+            "\uD83D\uDE15", // 😕
+            "\uD83D\uDC97", // 💗
+            "\uD83D\uDC4F", // 👏
+            "\uD83D\uDE10", // 😐
+            "\uD83D\uDC49", // 👉
+            "\uD83D\uDC9B", // 💛
+            "\uD83D\uDC9E", // 💞
+            "\uD83D\uDCAA", // 💪
+            "\uD83C\uDF39", // 🌹
+            "\uD83D\uDC80", // 💀
+            "\uD83D\uDE31", // 😱
+            "\uD83D\uDC98", // 💘
+            "\uD83E\uDD1F", // 🤟
+            "\uD83D\uDE21", // 😡
+            "\uD83D\uDCF7", // 📷
+            "\uD83C\uDF38", // 🌸
+            "\uD83D\uDE08", // 😈
+            "\uD83D\uDC48", // 👈
+            "\uD83C\uDF89", // 🎉
+            "\uD83D\uDC81", // 💁
+            "\uD83D\uDE4A", // 🙊
+            "\uD83D\uDC9A", // 💚
+            "\uD83D\uDE2B", // 😫
+            "\uD83D\uDE24", // 😤
+            "\uD83D\uDC93", // 💓
+            "\uD83C\uDF1A", // 🌚
+            "\uD83D\uDC47", // 👇
+            "\uD83D\uDE07", // 😇
+            "\uD83D\uDC4A", // 👊
+            "\uD83D\uDC51", // 👑
+            "\uD83D\uDE13", // 😓
+            "\uD83D\uDE3B", // 😻
+            "\uD83D\uDD34", // 🔴
+            "\uD83D\uDE25", // 😥
+            "\uD83E\uDD29", // 🤩
+            "\uD83D\uDE1A", // 😚
+            "\uD83D\uDE37", // 😷
+            "\uD83D\uDC4B", // 👋
+            "\uD83D\uDCA5", // 💥
+            "\uD83E\uDD2D", // 🤭
+            "\uD83C\uDF1F", // 🌟
+            "\uD83E\uDD71", // 🥱
+            "\uD83D\uDCA9", // 💩
+            "\uD83D\uDE80", // 🚀
+    };
+
+    private static final String[] EMOJI_TARGET = new String[] {
+            "ꀂ", // 😍
+            "ꀃ", // 😘
+            "ꀄ", // 😂
+            "ꀅ", // 😊
+            "ꀆ", // 😎
+            "ꀇ", // 😉
+            "ꀈ", // 💋
+            "ꀉ", // 👍
+            "ꀊ", // 🤣
+            "ꀋ", // 💕
+            "ꀌ", // 😀
+            "ꀍ", // 😄
+            "ꀎ", // 😭
+            "ꀏ", // 🥺
+            "ꀑ", // 🙏
+            "ꀒ", // 🥰
+            "ꀓ", // 🤔
+            "ꀔ", // 🔥
+            "ꀗ", // 😩
+            "ꀘ", // 😔
+            "ꀙ", // 😁
+            "ꀚ", // 👌
+            "ꀛ", // 😏
+            "ꀜ", // 😅
+            "ꀝ", // 🤍
+            "ꀞ", // 💔
+            "ꀟ", // 😌
+            "ꀠ", // 😢
+            "ꀡ", // 💙
+            "ꀢ", // 💜
+            "ꀤ", // 🎶
+            "ꀥ", // 😳
+            "ꀦ", // 💖
+            "ꀧ", // 🙌
+            "ꀨ", // 💯
+            "ꀩ", // 🙈
+            "ꀫ", // 😋
+            "ꀬ", // 😑
+            "ꀭ", // 😴
+            "ꀮ", // 😪
+            "ꀯ", // 😜
+            "ꀰ", // 😛
+            "ꀱ", // 😝
+            "ꀲ", // 😞
+            "ꀳ", // 😕
+            "ꀴ", // 💗
+            "ꀵ", // 👏
+            "ꀶ", // 😐
+            "ꀷ", // 👉
+            "ꀸ", // 💛
+            "ꀹ", // 💞
+            "ꀺ", // 💪
+            "ꀻ", // 🌹
+            "ꀼ", // 💀
+            "ꀽ", // 😱
+            "ꀾ", // 💘
+            "ꀿ", // 🤟
+            "ꁀ", // 😡
+            "ꁁ", // 📷
+            "ꁂ", // 🌸
+            "ꁃ", // 😈
+            "ꁄ", // 👈
+            "ꁅ", // 🎉
+            "ꁆ", // 💁
+            "ꁇ", // 🙊
+            "ꁈ", // 💚
+            "ꁉ", // 😫
+            "ꁊ", // 😤
+            "ꁍ", // 💓
+            "ꁎ", // 🌚
+            "ꁏ", // 👇
+            "ꁒ", // 😇
+            "ꁓ", // 👊
+            "ꁔ", // 👑
+            "ꁕ", // 😓
+            "ꁖ", // 😻
+            "ꁗ", // 🔴
+            "ꁘ", // 😥
+            "ꁙ", // 🤩
+            "ꁚ", // 😚
+            "ꁜ", // 😷
+            "ꁝ", // 👋
+            "ꁞ", // 💥
+            "ꁠ", // 🤭
+            "ꁡ", // 🌟
+            "ꁢ", // 🥱
+            "ꁣ", // 💩
+            "ꁤ", // 🚀
+    };
 }

From c47e8300566b39531b3bc4732e6343cf08980509 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sun, 22 Oct 2023 22:41:56 +0100
Subject: [PATCH 119/595] Xiaomi: Watchface upload (wip, does not work)

---
 .../devices/xiaomi/XiaomiInstallHandler.java  |  38 +++-
 .../xiaomi/miband8/XiaomiFWHelper.java        | 123 ++++++++++++
 .../devices/xiaomi/XiaomiCharacteristic.java  |  42 +++-
 .../service/devices/xiaomi/XiaomiSupport.java |  10 +
 .../services/XiaomiDataUploadService.java     | 182 ++++++++++++++++++
 .../services/XiaomiWatchfaceService.java      | 134 ++++++++++---
 .../gadgetbridge/util/CheckSums.java          |  22 +++
 7 files changed, 514 insertions(+), 37 deletions(-)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/XiaomiFWHelper.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiDataUploadService.java

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiInstallHandler.java
index 79ca4cb44..de76f58a3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiInstallHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiInstallHandler.java
@@ -16,40 +16,64 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi;
 
-import static nodomain.freeyourgadget.gadgetbridge.service.devices.huami.HuamiFirmwareType.AGPS_UIHH;
-
 import android.content.Context;
 import android.net.Uri;
 
 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.xiaomi.miband8.XiaomiFWHelper;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.model.GenericItem;
 
 public class XiaomiInstallHandler implements InstallHandler {
     protected final Uri mUri;
     protected final Context mContext;
+    protected final XiaomiFWHelper helper;
 
     public XiaomiInstallHandler(final Uri uri, final Context context) {
         this.mUri = uri;
         this.mContext = context;
+        this.helper = new XiaomiFWHelper(uri, context);
     }
 
     @Override
     public boolean isValid() {
-        // TODO
-        return false;
+        return helper.isValid();
     }
 
     @Override
     public void validateInstallation(final InstallActivity installActivity, final GBDevice device) {
-        // TODO
+        if (device.isBusy()) {
+            installActivity.setInfoText(device.getBusyTask());
+            installActivity.setInstallEnabled(false);
+            return;
+        }
+
+        if (!device.isInitialized()) {
+            installActivity.setInfoText(mContext.getString(R.string.fwapp_install_device_not_ready));
+            installActivity.setInstallEnabled(false);
+            return;
+        }
+
+        if (!helper.isValid()) {
+            installActivity.setInfoText(mContext.getString(R.string.fwapp_install_device_not_supported));
+            installActivity.setInstallEnabled(false);
+            return;
+        }
+
+        final GenericItem installItem = new GenericItem();
+        installItem.setIcon(R.drawable.ic_watchface);
+        installItem.setName(mContext.getString(R.string.kind_watchface));
+        installItem.setDetails(helper.getDetails());
+
+        installActivity.setInfoText(mContext.getString(R.string.firmware_install_warning, "(unknown)"));
+        installActivity.setInstallItem(installItem);
+        installActivity.setInstallEnabled(true);
     }
 
     @Override
     public void onStartInstall(final GBDevice device) {
-        // nothing to do
+        helper.unsetFwBytes(); // free up memory
     }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/XiaomiFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/XiaomiFWHelper.java
new file mode 100644
index 000000000..bf5d7aa7a
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/XiaomiFWHelper.java
@@ -0,0 +1,123 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.miband8;
+
+import android.content.Context;
+import android.net.Uri;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import nodomain.freeyourgadget.gadgetbridge.util.FileUtils;
+import nodomain.freeyourgadget.gadgetbridge.util.StringUtils;
+import nodomain.freeyourgadget.gadgetbridge.util.UriHelper;
+
+public class XiaomiFWHelper {
+    private static final Logger LOG = LoggerFactory.getLogger(XiaomiFWHelper.class);
+
+    private final Uri uri;
+    private byte[] fw;
+    private boolean valid;
+
+    private String id;
+    private String name;
+
+    public XiaomiFWHelper(final Uri uri, final Context context) {
+        this.uri = uri;
+
+        final UriHelper uriHelper;
+        try {
+            uriHelper = UriHelper.get(uri, context);
+        } catch (final IOException e) {
+            LOG.error("Failed to get uri helper for {}", uri, e);
+            return;
+        }
+
+        final int maxExpectedFileSize = 1024 * 1024 * 128; // 64MB
+
+        if (uriHelper.getFileSize() > maxExpectedFileSize) {
+            LOG.warn("Firmware size is larger than the maximum expected file size of {}", maxExpectedFileSize);
+            return;
+        }
+
+        try (final InputStream in = new BufferedInputStream(uriHelper.openInputStream())) {
+            this.fw = FileUtils.readAll(in, maxExpectedFileSize);
+        } catch (final IOException e) {
+            LOG.error("Failed to read bytes from {}", uri, e);
+            return;
+        }
+
+        valid = parseFirmware();
+    }
+
+    public boolean isValid() {
+        return valid;
+    }
+
+    public String getDetails() {
+        return name != null ? name : "UNKNOWN WATCHFACE";
+    }
+
+    public byte[] getBytes() {
+        return fw;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void unsetFwBytes() {
+        this.fw = null;
+    }
+
+    private boolean parseFirmware() {
+        if (fw[0] != (byte) 0x5A || fw[1] != (byte) 0xA5) {
+            LOG.warn("File header not a watchface");
+            return false;
+        }
+
+        id = StringUtils.untilNullTerminator(fw, 0x28);
+        name = StringUtils.untilNullTerminator(fw, 0x68);
+
+        if (id == null) {
+            LOG.warn("id not found in {}", uri);
+            return false;
+        }
+
+        if (name == null) {
+            LOG.warn("name not found in {}", uri);
+            return false;
+        }
+
+        try {
+            Integer.parseInt(id);
+        } catch (final Exception e) {
+            LOG.warn("Id {} not a number", id);
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
index 5780a99ce..fe7bcc1ed 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
@@ -35,15 +35,16 @@ import java.util.UUID;
 
 import nodomain.freeyourgadget.gadgetbridge.service.btle.BLETypeConversions;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
+import nodomain.freeyourgadget.gadgetbridge.util.GB;
 
 public class XiaomiCharacteristic {
+    private final Logger LOG = LoggerFactory.getLogger(XiaomiCharacteristic.class);
+
     public static final byte[] PAYLOAD_ACK = new byte[]{0, 0, 3, 0};
 
     // max chunk size, including headers
     public static final int MAX_WRITE_SIZE = 242;
 
-    private final Logger LOG;
-
     private final XiaomiSupport mSupport;
 
     private final BluetoothGattCharacteristic bluetoothGattCharacteristic;
@@ -52,6 +53,7 @@ public class XiaomiCharacteristic {
     // Encryption
     private final XiaomiAuthService authService;
     private boolean isEncrypted;
+    public boolean incrementNonce = true;
     private short encryptedIndex = 0;
 
     // Chunking
@@ -68,6 +70,8 @@ public class XiaomiCharacteristic {
 
     private Handler handler = null;
 
+    private SendCallback callback;
+
     public XiaomiCharacteristic(final XiaomiSupport support,
                                 final BluetoothGattCharacteristic bluetoothGattCharacteristic,
                                 @Nullable final XiaomiAuthService authService) {
@@ -75,7 +79,6 @@ public class XiaomiCharacteristic {
         this.bluetoothGattCharacteristic = bluetoothGattCharacteristic;
         this.authService = authService;
         this.isEncrypted = authService != null;
-        this.LOG = LoggerFactory.getLogger("XiaomiCharacteristic [" + bluetoothGattCharacteristic.getUuid().toString() + "]");
         this.characteristicUUID = bluetoothGattCharacteristic.getUuid();
     }
 
@@ -87,10 +90,18 @@ public class XiaomiCharacteristic {
         this.handler = handler;
     }
 
+    public void setCallback(final SendCallback callback) {
+        this.callback = callback;
+    }
+
     public void setEncrypted(final boolean encrypted) {
         this.isEncrypted = encrypted;
     }
 
+    public void setIncrementNonce(final boolean incrementNonce) {
+        this.incrementNonce = incrementNonce;
+    }
+
     public void reset() {
         this.numChunks = 0;
         this.currentChunk = 0;
@@ -127,6 +138,9 @@ public class XiaomiCharacteristic {
             LOG.debug("Got ack");
             currentPayload = null;
             waitingAck = false;
+            if (callback != null) {
+                callback.onSend(payloadQueue.size());
+            }
             sendNext(null);
             return;
         }
@@ -185,6 +199,9 @@ public class XiaomiCharacteristic {
                             LOG.debug("Got chunked ack end");
                             currentPayload = null;
                             sendingChunked = false;
+                            if (callback != null) {
+                                callback.onSend(payloadQueue.size());
+                            }
                             sendNext(null);
                             return;
                         case 1:
@@ -207,6 +224,9 @@ public class XiaomiCharacteristic {
                             LOG.warn("Got chunked nack for {}", currentPayload.getTaskName());
                             currentPayload = null;
                             sendingChunked = false;
+                            if (callback != null) {
+                                callback.onSend(payloadQueue.size());
+                            }
                             sendNext(null);
                             return;
                     }
@@ -251,6 +271,8 @@ public class XiaomiCharacteristic {
             return;
         }
 
+        LOG.debug("Will send {}", GB.hexdump(currentPayload.getBytesToSend()));
+
         final boolean encrypt = isEncrypted && authService.isEncryptionInitialized();
 
         if (encrypt) {
@@ -262,10 +284,13 @@ public class XiaomiCharacteristic {
                 // Prepend encrypted index for the nonce
                 currentPayload.setBytesToSend(
                         ByteBuffer.allocate(2 + currentPayload.getBytesToSend().length).order(ByteOrder.LITTLE_ENDIAN)
-                                .putShort(encryptedIndex++)
+                                .putShort(encryptedIndex)
                                 .put(currentPayload.getBytesToSend())
                                 .array()
                 );
+                if (incrementNonce) {
+                    encryptedIndex++;
+                }
             }
 
             LOG.debug("Sending {} - chunked", currentPayload.getTaskName());
@@ -294,7 +319,10 @@ public class XiaomiCharacteristic {
             buf.put((byte) 2); // 2 for command
             buf.put((byte) (encrypt ? 1 : 2));
             if (encrypt) {
-                buf.putShort(encryptedIndex++);
+                buf.putShort(encryptedIndex);
+                if (incrementNonce) {
+                    encryptedIndex++;
+                }
             }
             buf.put(currentPayload.getBytesToSend()); // it's already encrypted
 
@@ -364,4 +392,8 @@ public class XiaomiCharacteristic {
             return bytesToSend != null ? bytesToSend : bytes;
         }
     }
+
+    public interface SendCallback {
+        void onSend(int remaining);
+    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
index d590b689e..3a2b52562 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
@@ -52,6 +52,7 @@ import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetDeviceStateAction;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.AbstractXiaomiService;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.XiaomiCalendarService;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.XiaomiDataUploadService;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.XiaomiHealthService;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.XiaomiMusicService;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.XiaomiNotificationService;
@@ -79,6 +80,7 @@ public abstract class XiaomiSupport extends AbstractBTLEDeviceSupport {
     protected final XiaomiSystemService systemService = new XiaomiSystemService(this);
     protected final XiaomiCalendarService calendarService = new XiaomiCalendarService(this);
     protected final XiaomiWatchfaceService watchfaceService = new XiaomiWatchfaceService(this);
+    protected final XiaomiDataUploadService dataUploadService = new XiaomiDataUploadService(this);
 
     private String mFirmwareVersion = null;
 
@@ -92,6 +94,7 @@ public abstract class XiaomiSupport extends AbstractBTLEDeviceSupport {
         put(XiaomiSystemService.COMMAND_TYPE, systemService);
         put(XiaomiCalendarService.COMMAND_TYPE, calendarService);
         put(XiaomiWatchfaceService.COMMAND_TYPE, watchfaceService);
+        put(XiaomiDataUploadService.COMMAND_TYPE, dataUploadService);
     }};
 
     public XiaomiSupport() {
@@ -133,6 +136,8 @@ public abstract class XiaomiSupport extends AbstractBTLEDeviceSupport {
         this.characteristicActivityData.setEncrypted(isEncrypted());
         this.characteristicDataUpload = new XiaomiCharacteristic(this, btCharacteristicDataUpload, authService);
         this.characteristicDataUpload.setEncrypted(isEncrypted());
+        this.characteristicDataUpload.setIncrementNonce(false);
+        this.dataUploadService.setDataUploadCharacteristic(this.characteristicDataUpload);
 
         builder.requestMtu(247);
 
@@ -314,6 +319,7 @@ public abstract class XiaomiSupport extends AbstractBTLEDeviceSupport {
 
     @Override
     public void onInstallApp(final Uri uri) {
+        // TODO distinguish between fw and watchface
         watchfaceService.installWatchface(uri);
     }
 
@@ -442,4 +448,8 @@ public abstract class XiaomiSupport extends AbstractBTLEDeviceSupport {
                         .build()
         );
     }
+
+    public XiaomiDataUploadService getDataUploader() {
+        return this.dataUploadService;
+    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiDataUploadService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiDataUploadService.java
new file mode 100644
index 000000000..8be61474c
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiDataUploadService.java
@@ -0,0 +1,182 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services;
+
+import androidx.annotation.Nullable;
+
+import com.google.protobuf.ByteString;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.Objects;
+
+import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.BLETypeConversions;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiCharacteristic;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
+import nodomain.freeyourgadget.gadgetbridge.util.CheckSums;
+
+public class XiaomiDataUploadService extends AbstractXiaomiService {
+    private static final Logger LOG = LoggerFactory.getLogger(XiaomiDataUploadService.class);
+
+    public static final int COMMAND_TYPE = 22;
+
+    public static final int CMD_UPLOAD_START = 0;
+
+    public static final byte TYPE_WATCHFACE = 16;
+    public static final byte TYPE_FIRMWARE = 32;
+    public static final byte TYPE_NOTIFICATION_ICON = 50;
+
+    private XiaomiCharacteristic characteristic;
+    private Callback callback;
+
+    private byte currentType;
+    private byte[] currentBytes;
+
+    public XiaomiDataUploadService(final XiaomiSupport support) {
+        super(support);
+    }
+
+    @Override
+    public void handleCommand(final XiaomiProto.Command cmd) {
+        switch (cmd.getSubtype()) {
+            case CMD_UPLOAD_START:
+                final XiaomiProto.DataUploadAck dataUploadAck = cmd.getDataUpload().getDataUploadAck();
+                LOG.debug("Got upload start, unknown2={}, unknown4={}", dataUploadAck.getUnknown2(), dataUploadAck.getUnknown4());
+
+                if (dataUploadAck.getUnknown2() != 0 || dataUploadAck.getUnknown4() != 0) {
+                    LOG.warn("Unexpected response");
+                    this.currentType = 0;
+                    this.currentBytes = null;
+                    return;
+                }
+                doUpload(currentType, currentBytes);
+                return;
+        }
+
+        LOG.warn("Unknown data upload command {}", cmd.getSubtype());
+    }
+
+    public void setCallback(@Nullable final Callback callback) {
+        this.callback = callback;
+    }
+
+    public void requestUpload(final byte type, final byte[] bytes) {
+        LOG.debug("Requesting upload for {} bytes of type {}", bytes.length, type);
+
+        this.currentType = type;
+        this.currentBytes = bytes;
+
+        getSupport().sendCommand(
+                "request upload",
+                XiaomiProto.Command.newBuilder()
+                        .setType(COMMAND_TYPE)
+                        .setSubtype(CMD_UPLOAD_START)
+                        .setDataUpload(XiaomiProto.DataUpload.newBuilder().setDataUploadRequest(
+                                XiaomiProto.DataUploadRequest.newBuilder()
+                                        .setType(type)
+                                        .setMd5Sum(ByteString.copyFrom(Objects.requireNonNull(CheckSums.md5(bytes))))
+                                        .setSize(bytes.length)
+                        ))
+                        .build()
+        );
+    }
+
+    private void doUpload(final short type, final byte[] bytes) {
+        LOG.debug("Doing upload for {} bytes of type {}", bytes.length, type);
+
+        // type + md5 + size + bytes + crc32
+        final ByteBuffer buf1 = ByteBuffer.allocate(2 + 16 + 4 + bytes.length).order(ByteOrder.LITTLE_ENDIAN);
+        final byte[] md5 = CheckSums.md5(bytes);
+        if (md5 == null) {
+            onUploadFinish(false);
+            return;
+        }
+
+        buf1.put((byte) 0);
+        buf1.put((byte) type);
+        buf1.put(md5);
+        buf1.putInt(bytes.length);
+        buf1.put(bytes);
+
+        final ByteBuffer buf2 = ByteBuffer.allocate(buf1.capacity() + 4).order(ByteOrder.LITTLE_ENDIAN);
+        buf2.put(buf1.array());
+        buf2.putInt(CheckSums.getCRC32(buf1.array()));
+
+        final byte[] payload = buf2.array();
+        final int partSize = 2044; // 2 + 2 at beginning of each for total and progress
+        final int totalParts = (int) Math.ceil(payload.length / (float) partSize);
+
+        characteristic.setCallback(remainingParts -> {
+            final int totalBytes = totalParts * 4 + payload.length;
+            int progressBytes = totalParts * 4 + payload.length;
+            if (remainingParts > 1) {
+                progressBytes -= (remainingParts - 1) * partSize;
+            }
+            if (remainingParts > 0) {
+                progressBytes -= (payload.length % partSize);
+            }
+
+            final int progressPercent = Math.round((100.0f * progressBytes) / totalBytes);
+
+            LOG.debug("Data upload progress: {} parts remaining ({}%)", remainingParts, progressPercent);
+
+            if (remainingParts > 0) {
+                if (callback != null) {
+                    callback.onUploadProgress(progressPercent);
+                }
+            } else {
+                onUploadFinish(true);
+            }
+        });
+
+        for (int i = 0; i * partSize < payload.length; i++) {
+            final int startIndex = i * partSize;
+            final int endIndex = Math.min((i + 1) * partSize, payload.length);
+            LOG.debug("Uploading part {} of {}, from {} to {}", (i + 1), totalParts, startIndex, endIndex);
+            final byte[] chunkToSend = new byte[4 + endIndex - startIndex];
+            BLETypeConversions.writeUint16(chunkToSend, 0, totalParts);
+            BLETypeConversions.writeUint16(chunkToSend, 2, i + 1);
+            System.arraycopy(payload, startIndex, chunkToSend, 4, endIndex - startIndex);
+            characteristic.write("upload part " + (i + 1) + " of " + totalParts, chunkToSend);
+        }
+    }
+
+    public void setDataUploadCharacteristic(final XiaomiCharacteristic characteristic) {
+        this.characteristic = characteristic;
+    }
+
+    private void onUploadFinish(final boolean success) {
+        this.currentType = 0;
+        this.currentBytes = null;
+
+        if (callback != null) {
+            callback.onUploadFinish(success);
+        }
+
+        characteristic.setCallback(null);
+    }
+
+    public interface Callback {
+        void onUploadFinish(boolean success);
+
+        void onUploadProgress(int progress);
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWatchfaceService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWatchfaceService.java
index 5c41dcdd3..537afd4c3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWatchfaceService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWatchfaceService.java
@@ -27,14 +27,18 @@ import java.util.List;
 import java.util.Set;
 import java.util.UUID;
 
+import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventAppInfo;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.miband8.XiaomiFWHelper;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceApp;
 import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetProgressAction;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
-import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
+import nodomain.freeyourgadget.gadgetbridge.util.GB;
 
-public class XiaomiWatchfaceService extends AbstractXiaomiService {
+public class XiaomiWatchfaceService extends AbstractXiaomiService implements XiaomiDataUploadService.Callback {
     private static final Logger LOG = LoggerFactory.getLogger(XiaomiWatchfaceService.class);
 
     public static final int COMMAND_TYPE = 4;
@@ -48,6 +52,9 @@ public class XiaomiWatchfaceService extends AbstractXiaomiService {
     private final Set<UUID> userWatchfaces = new HashSet<>();
     private UUID activeWatchface = null;
 
+    // Not null if we're installing a firmware
+    private XiaomiFWHelper fwHelper = null;
+
     public XiaomiWatchfaceService(final XiaomiSupport support) {
         super(support);
     }
@@ -69,18 +76,22 @@ public class XiaomiWatchfaceService extends AbstractXiaomiService {
                 requestWatchfaceList();
                 return;
             case CMD_WATCHFACE_INSTALL:
+                final int installStatus = cmd.getWatchface().getInstallStatus();
+                if (installStatus != 0) {
+                    LOG.warn("Invalid watchface install status {} for {}", installStatus, fwHelper.getId());
+                    return;
+                }
+
+                LOG.debug("Watchface install status 0, uploading");
+                setDeviceBusy();
+                getSupport().getDataUploader().setCallback(this);
+                getSupport().getDataUploader().requestUpload(XiaomiDataUploadService.TYPE_WATCHFACE, fwHelper.getBytes());
                 return;
         }
 
         LOG.warn("Unknown watchface command {}", cmd.getSubtype());
     }
 
-    @Override
-    public boolean onSendConfiguration(final String config, final Prefs prefs) {
-        // TODO set watchface
-        return super.onSendConfiguration(config, prefs);
-    }
-
     public void requestWatchfaceList() {
         getSupport().sendCommand("request watchface list", COMMAND_TYPE, CMD_WATCHFACE_LIST);
     }
@@ -120,21 +131,24 @@ public class XiaomiWatchfaceService extends AbstractXiaomiService {
     }
 
     public void setWatchface(final UUID uuid) {
-        if (!allWatchfaces.contains(uuid)) {
-            LOG.warn("Unknown watchface {}", uuid);
-            return;
-        }
+        final String id = toWatchfaceId(uuid);
+
+        // TODO for now we need to allow when installing a watchface
+        //if (!allWatchfaces.contains(uuid)) {
+        //    LOG.warn("Unknown watchface {}", uuid);
+        //    return;
+        //}
 
         activeWatchface = uuid;
 
-        LOG.debug("Set watchface to {}", uuid);
+        LOG.debug("Set watchface to {}", id);
 
         getSupport().sendCommand(
                 "set watchface to " + uuid,
                 XiaomiProto.Command.newBuilder()
                         .setType(COMMAND_TYPE)
                         .setSubtype(CMD_WATCHFACE_SET)
-                        .setWatchface(XiaomiProto.Watchface.newBuilder().setWatchfaceId(toWatchfaceId(uuid)))
+                        .setWatchface(XiaomiProto.Watchface.newBuilder().setWatchfaceId(id))
                         .build()
         );
     }
@@ -144,42 +158,58 @@ public class XiaomiWatchfaceService extends AbstractXiaomiService {
     }
 
     public void deleteWatchface(final UUID uuid) {
+        final String id = toWatchfaceId(uuid);
+
         if (!userWatchfaces.contains(uuid)) {
-            LOG.warn("Refusing to delete non-user watchface {}", uuid);
+            LOG.warn("Refusing to delete non-user watchface {}", id);
             return;
         }
 
         if (!allWatchfaces.contains(uuid)) {
-            LOG.warn("Refusing to delete unknown watchface {}", uuid);
+            LOG.warn("Refusing to delete unknown watchface {}", id);
             return;
         }
 
         if (uuid.equals(activeWatchface)) {
-            LOG.warn("Refusing to delete active watchface {}", uuid);
+            LOG.warn("Refusing to delete active watchface {}", id);
             return;
         }
 
-        LOG.debug("Delete watchface {}", uuid);
+        LOG.debug("Delete watchface {}", id);
 
         allWatchfaces.remove(uuid);
         userWatchfaces.remove(uuid);
 
         getSupport().sendCommand(
-                "delete watchface " + uuid,
+                "delete watchface " + id,
                 XiaomiProto.Command.newBuilder()
                         .setType(COMMAND_TYPE)
                         .setSubtype(CMD_WATCHFACE_DELETE)
-                        .setWatchface(XiaomiProto.Watchface.newBuilder().setWatchfaceId(toWatchfaceId(uuid)))
+                        .setWatchface(XiaomiProto.Watchface.newBuilder().setWatchfaceId(id))
                         .build()
         );
     }
 
-    public void deleteWatchface(final String watchfaceId) {
-        deleteWatchface(toWatchfaceUUID(watchfaceId));
-    }
-
     public void installWatchface(final Uri uri) {
-        // TODO
+        fwHelper = new XiaomiFWHelper(uri, getSupport().getContext());
+        if (!fwHelper.isValid()) {
+            fwHelper = null;
+            LOG.warn("watchface is not valid");
+            return;
+        }
+
+        getSupport().sendCommand(
+                "install watchface " + fwHelper.getId(),
+                XiaomiProto.Command.newBuilder()
+                        .setType(COMMAND_TYPE)
+                        .setSubtype(CMD_WATCHFACE_INSTALL)
+                        .setWatchface(XiaomiProto.Watchface.newBuilder().setWatchfaceInstallStart(
+                                XiaomiProto.WatchfaceInstallStart.newBuilder()
+                                        .setId(fwHelper.getId())
+                                        .setSize(fwHelper.getBytes().length)
+                        ))
+                        .build()
+        );
     }
 
     public static UUID toWatchfaceUUID(final String id) {
@@ -201,4 +231,58 @@ public class XiaomiWatchfaceService extends AbstractXiaomiService {
                 .replaceAll("f", "")
                 .replaceAll("F", "");
     }
+
+    @Override
+    public void onUploadFinish(final boolean success) {
+        LOG.debug("Watchface upload finished: {}", success);
+
+        getSupport().getDataUploader().setCallback(null);
+
+        final String notificationMessage = success ?
+                getSupport().getContext().getString(R.string.updatefirmwareoperation_update_complete) :
+                getSupport().getContext().getString(R.string.updatefirmwareoperation_write_failed);
+
+        GB.updateInstallNotification(notificationMessage, false, 100, getSupport().getContext());
+
+        unsetDeviceBusy();
+
+        if (success) {
+            setWatchface(fwHelper.getId());
+        }
+
+        fwHelper = null;
+    }
+
+    @Override
+    public void onUploadProgress(final int progressPercent) {
+        try {
+            final TransactionBuilder builder = getSupport().createTransactionBuilder("send data upload progress");
+            builder.add(new SetProgressAction(
+                    getSupport().getContext().getString(R.string.updatefirmwareoperation_update_in_progress),
+                    true,
+                    progressPercent,
+                    getSupport().getContext()
+            ));
+            builder.queue(getSupport().getQueue());
+        } catch (final Exception e) {
+            LOG.error("Failed to update progress notification", e);
+        }
+    }
+
+    private void setDeviceBusy() {
+        final GBDevice device = getSupport().getDevice();
+        device.setBusyTask(getSupport().getContext().getString(R.string.updating_firmware));
+        device.sendDeviceUpdateIntent(getSupport().getContext());
+    }
+
+    private void unsetDeviceBusy() {
+        final GBDevice device = getSupport().getDevice();
+        if (device != null && device.isConnected()) {
+            if (device.isBusy()) {
+                device.unsetBusyTask();
+                device.sendDeviceUpdateIntent(getSupport().getContext());
+            }
+            device.sendDeviceUpdateIntent(getSupport().getContext());
+        }
+    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/CheckSums.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/CheckSums.java
index c7455beda..4299eca1c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/CheckSums.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/CheckSums.java
@@ -16,13 +16,22 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util;
 
+import androidx.annotation.Nullable;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.ByteArrayOutputStream;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
 import java.util.zip.CRC32;
 
 public class CheckSums {
+    private static final Logger LOG = LoggerFactory.getLogger(CheckSums.class);
+
     public static int getCRC8(byte[] seq) {
         int len = seq.length;
         int i = 0;
@@ -152,4 +161,17 @@ public class CheckSums {
 
         return 65535 & i2;
     }
+
+    @Nullable
+    public static byte[] md5(final byte[] data) {
+        final MessageDigest md;
+        try {
+            md = MessageDigest.getInstance("MD5");
+        } catch (final NoSuchAlgorithmException e) {
+            LOG.error("Failed to get md5 digest", e);
+            return null;
+        }
+        md.update(data);
+        return md.digest();
+    }
 }

From 29c183b88af2d5a6125e2879b2fcc1106b35c98b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Mon, 23 Oct 2023 18:47:13 +0100
Subject: [PATCH 120/595] Xiaomi: Refactor to install firmware (untested)

---
 .../xiaomi/{miband8 => }/XiaomiFWHelper.java  |  42 +++++++-
 .../devices/xiaomi/XiaomiInstallHandler.java  |  14 ++-
 .../service/devices/xiaomi/XiaomiSupport.java |  18 +++-
 .../xiaomi/services/XiaomiSystemService.java  | 101 +++++++++++++++++-
 .../services/XiaomiWatchfaceService.java      |  16 ++-
 app/src/main/proto/xiaomi.proto               |  15 +++
 6 files changed, 185 insertions(+), 21 deletions(-)
 rename app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/{miband8 => }/XiaomiFWHelper.java (77%)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/XiaomiFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiFWHelper.java
similarity index 77%
rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/XiaomiFWHelper.java
rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiFWHelper.java
index bf5d7aa7a..54c308d0d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/XiaomiFWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiFWHelper.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 <http://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.miband8;
+package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi;
 
 import android.content.Context;
 import android.net.Uri;
@@ -36,9 +36,12 @@ public class XiaomiFWHelper {
     private final Uri uri;
     private byte[] fw;
     private boolean valid;
+    private boolean typeFirmware;
+    private boolean typeWatchface;
 
     private String id;
     private String name;
+    private String version;
 
     public XiaomiFWHelper(final Uri uri, final Context context) {
         this.uri = uri;
@@ -65,15 +68,23 @@ public class XiaomiFWHelper {
             return;
         }
 
-        valid = parseFirmware();
+        parseBytes();
     }
 
     public boolean isValid() {
         return valid;
     }
 
+    public boolean isWatchface() {
+        return typeWatchface;
+    }
+
+    public boolean isFirmware() {
+        return typeFirmware;
+    }
+
     public String getDetails() {
-        return name != null ? name : "UNKNOWN WATCHFACE";
+        return name != null ? name : (version != null ? version : "UNKNOWN");
     }
 
     public byte[] getBytes() {
@@ -88,11 +99,29 @@ public class XiaomiFWHelper {
         return name;
     }
 
+    public String getVersion() {
+        return version;
+    }
+
     public void unsetFwBytes() {
         this.fw = null;
     }
 
-    private boolean parseFirmware() {
+    private void parseBytes() {
+        if (parseAsWatchface()) {
+            assert id != null;
+            valid = true;
+            typeWatchface = true;
+        } else if (parseAsFirmware()) {
+            assert version != null;
+            valid = true;
+            typeFirmware = true;
+        } else {
+            valid = false;
+        }
+    }
+
+    private boolean parseAsWatchface() {
         if (fw[0] != (byte) 0x5A || fw[1] != (byte) 0xA5) {
             LOG.warn("File header not a watchface");
             return false;
@@ -120,4 +149,9 @@ public class XiaomiFWHelper {
 
         return true;
     }
+
+    private boolean parseAsFirmware() {
+        // TODO parse and set version
+        return false;
+    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiInstallHandler.java
index de76f58a3..863094d00 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiInstallHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiInstallHandler.java
@@ -22,7 +22,6 @@ import android.net.Uri;
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.activities.InstallActivity;
 import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
-import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.miband8.XiaomiFWHelper;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.model.GenericItem;
 
@@ -63,8 +62,17 @@ public class XiaomiInstallHandler implements InstallHandler {
         }
 
         final GenericItem installItem = new GenericItem();
-        installItem.setIcon(R.drawable.ic_watchface);
-        installItem.setName(mContext.getString(R.string.kind_watchface));
+        if (helper.isWatchface()) {
+            installItem.setIcon(R.drawable.ic_watchface);
+            installItem.setName(mContext.getString(R.string.kind_watchface));
+        } else if (helper.isFirmware()) {
+            installItem.setIcon(R.drawable.ic_firmware);
+            installItem.setName(mContext.getString(R.string.kind_firmware));
+        } else {
+            installItem.setIcon(R.drawable.ic_device_unknown);
+            installItem.setName(mContext.getString(R.string.kind_invalid));
+        }
+
         installItem.setDetails(helper.getDetails());
 
         installActivity.setInfoText(mContext.getString(R.string.firmware_install_warning, "(unknown)"));
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
index 3a2b52562..6b538fb3a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
@@ -27,7 +27,6 @@ import android.net.Uri;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -35,6 +34,7 @@ import java.util.UUID;
 
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiFWHelper;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.model.Alarm;
 import nodomain.freeyourgadget.gadgetbridge.model.CalendarEventSpec;
@@ -319,8 +319,20 @@ public abstract class XiaomiSupport extends AbstractBTLEDeviceSupport {
 
     @Override
     public void onInstallApp(final Uri uri) {
-        // TODO distinguish between fw and watchface
-        watchfaceService.installWatchface(uri);
+        final XiaomiFWHelper fwHelper = new XiaomiFWHelper(uri, getContext());
+
+        if (!fwHelper.isValid()) {
+            LOG.warn("Uri {} is not valid", uri);
+            return;
+        }
+
+        if (fwHelper.isFirmware()) {
+            systemService.installFirmware(fwHelper);
+        } else if (fwHelper.isWatchface()) {
+            watchfaceService.installWatchface(fwHelper);
+        } else {
+            LOG.warn("Unknown fwhelper for {}", uri);
+        }
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
index 47580c3a4..7d3d3d14d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
@@ -30,6 +30,7 @@ import java.util.Map;
 import java.util.TimeZone;
 
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
 import nodomain.freeyourgadget.gadgetbridge.capabilities.password.PasswordCapabilityImpl;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventBatteryInfo;
@@ -38,15 +39,21 @@ import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdateDevi
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdatePreferences;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventVersionInfo;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiFWHelper;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.model.BatteryState;
 import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetProgressAction;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiPreferences;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
+import nodomain.freeyourgadget.gadgetbridge.util.CheckSums;
+import nodomain.freeyourgadget.gadgetbridge.util.GB;
 import nodomain.freeyourgadget.gadgetbridge.util.GBPrefs;
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 import nodomain.freeyourgadget.gadgetbridge.util.StringUtils;
 
-public class XiaomiSystemService extends AbstractXiaomiService {
+public class XiaomiSystemService extends AbstractXiaomiService implements XiaomiDataUploadService.Callback {
     private static final Logger LOG = LoggerFactory.getLogger(XiaomiSystemService.class);
 
     public static final int COMMAND_TYPE = 2;
@@ -54,6 +61,7 @@ public class XiaomiSystemService extends AbstractXiaomiService {
     public static final int CMD_BATTERY = 1;
     public static final int CMD_DEVICE_INFO = 2;
     public static final int CMD_CLOCK = 3;
+    public static final int CMD_FIRMWARE_INSTALL = 5;
     public static final int CMD_LANGUAGE = 6;
     public static final int CMD_PASSWORD_GET = 9;
     public static final int CMD_FIND_PHONE = 17;
@@ -63,6 +71,9 @@ public class XiaomiSystemService extends AbstractXiaomiService {
     public static final int CMD_DISPLAY_ITEMS_SET = 30;
     public static final int CMD_CHARGER = 79;
 
+    // Not null if we're installing a firmware
+    private XiaomiFWHelper fwHelper = null;
+
     public XiaomiSystemService(final XiaomiSupport support) {
         super(support);
     }
@@ -86,6 +97,18 @@ public class XiaomiSystemService extends AbstractXiaomiService {
             case CMD_BATTERY:
                 handleBattery(cmd.getSystem().getPower().getBattery());
                 return;
+            case CMD_FIRMWARE_INSTALL:
+                final int installStatus = cmd.getSystem().getFirmwareInstallResponse().getStatus();
+                if (installStatus != 0) {
+                    LOG.warn("Invalid firmware install status {} for {}", installStatus, fwHelper.getId());
+                    return;
+                }
+
+                LOG.debug("Firmware install status 0, uploading");
+                setDeviceBusy();
+                getSupport().getDataUploader().setCallback(this);
+                getSupport().getDataUploader().requestUpload(XiaomiDataUploadService.TYPE_FIRMWARE, fwHelper.getBytes());
+                return;
             case CMD_PASSWORD_GET:
                 handlePassword(cmd.getSystem().getPassword());
                 return;
@@ -400,6 +423,82 @@ public class XiaomiSystemService extends AbstractXiaomiService {
         );
     }
 
+    public void installFirmware(final XiaomiFWHelper fwHelper) {
+        assert fwHelper.isValid();
+        assert fwHelper.isFirmware();
+
+        this.fwHelper = fwHelper;
+
+        getSupport().sendCommand(
+                "install firmware " + fwHelper.getVersion(),
+                XiaomiProto.Command.newBuilder()
+                        .setType(COMMAND_TYPE)
+                        .setSubtype(CMD_FIRMWARE_INSTALL)
+                        .setSystem(XiaomiProto.System.newBuilder().setFirmwareInstallRequest(
+                                XiaomiProto.FirmwareInstallRequest.newBuilder()
+                                        .setUnknown1(0)
+                                        .setUnknown2(0)
+                                        .setVersion(fwHelper.getVersion())
+                                        .setMd5(GB.hexdump(CheckSums.md5(fwHelper.getBytes())).toLowerCase(Locale.ROOT))
+                        ))
+                        .build()
+        );
+    }
+
+    private void setDeviceBusy() {
+        final GBDevice device = getSupport().getDevice();
+        device.setBusyTask(getSupport().getContext().getString(R.string.updating_firmware));
+        device.sendDeviceUpdateIntent(getSupport().getContext());
+    }
+
+    private void unsetDeviceBusy() {
+        final GBDevice device = getSupport().getDevice();
+        if (device != null && device.isConnected()) {
+            if (device.isBusy()) {
+                device.unsetBusyTask();
+                device.sendDeviceUpdateIntent(getSupport().getContext());
+            }
+            device.sendDeviceUpdateIntent(getSupport().getContext());
+        }
+    }
+
+    @Override
+    public void onUploadFinish(final boolean success) {
+        LOG.debug("Firmware upload finished: {}", success);
+
+        getSupport().getDataUploader().setCallback(null);
+
+        final String notificationMessage = success ?
+                getSupport().getContext().getString(R.string.updatefirmwareoperation_update_complete) :
+                getSupport().getContext().getString(R.string.updatefirmwareoperation_write_failed);
+
+        GB.updateInstallNotification(notificationMessage, false, 100, getSupport().getContext());
+
+        unsetDeviceBusy();
+
+        if (success) {
+            // TODO do we need to reboot?
+        }
+
+        fwHelper = null;
+    }
+
+    @Override
+    public void onUploadProgress(final int progressPercent) {
+        try {
+            final TransactionBuilder builder = getSupport().createTransactionBuilder("send data upload progress");
+            builder.add(new SetProgressAction(
+                    getSupport().getContext().getString(R.string.updatefirmwareoperation_update_in_progress),
+                    true,
+                    progressPercent,
+                    getSupport().getContext()
+            ));
+            builder.queue(getSupport().getQueue());
+        } catch (final Exception e) {
+            LOG.error("Failed to update progress notification", e);
+        }
+    }
+
     private static final Map<String, String> DISPLAY_ITEM_NAMES = new HashMap<String, String>() {{
         put("today_act", "Stats");
         put("sport", "Workout");
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWatchfaceService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWatchfaceService.java
index 537afd4c3..8bb7df6db 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWatchfaceService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWatchfaceService.java
@@ -16,8 +16,6 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services;
 
-import android.net.Uri;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -29,7 +27,7 @@ import java.util.UUID;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventAppInfo;
-import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.miband8.XiaomiFWHelper;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiFWHelper;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceApp;
 import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
@@ -190,13 +188,11 @@ public class XiaomiWatchfaceService extends AbstractXiaomiService implements Xia
         );
     }
 
-    public void installWatchface(final Uri uri) {
-        fwHelper = new XiaomiFWHelper(uri, getSupport().getContext());
-        if (!fwHelper.isValid()) {
-            fwHelper = null;
-            LOG.warn("watchface is not valid");
-            return;
-        }
+    public void installWatchface(final XiaomiFWHelper fwHelper) {
+        assert fwHelper.isValid();
+        assert fwHelper.isWatchface();
+
+        this.fwHelper = fwHelper;
 
         getSupport().sendCommand(
                 "install watchface " + fwHelper.getId(),
diff --git a/app/src/main/proto/xiaomi.proto b/app/src/main/proto/xiaomi.proto
index 369d4f2fd..32e57a8b3 100644
--- a/app/src/main/proto/xiaomi.proto
+++ b/app/src/main/proto/xiaomi.proto
@@ -88,6 +88,10 @@ message System {
   // 2, 34
   optional DoNotDisturb dndStatus = 11;
 
+  // 2, 5
+  optional FirmwareInstallRequest firmwareInstallRequest = 16;
+  optional FirmwareInstallResponse firmwareInstallResponse = 17;
+
   // 2, 9 get | 2, 21 set
   optional Password password = 19;
 
@@ -236,6 +240,17 @@ message DoNotDisturb2 {
 message DndSync {
 }
 
+message FirmwareInstallRequest {
+  optional uint32 unknown1 = 1; // 0
+  optional uint32 unknown2 = 2; // 0
+  optional string version = 3;
+  optional string md5 = 4;
+}
+
+message FirmwareInstallResponse {
+  optional uint32 status = 1; // 0
+}
+
 message Password {
   optional uint32 state = 1; // 1 disabled, 2 enabled
   optional string password = 2;

From cef4b6245843cde60e6f10ba9f70c9c4d04c8143 Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Mon, 23 Oct 2023 20:09:23 +0200
Subject: [PATCH 121/595] Mi Watch Lite: enable install handler

Does not work as is because we do not recognize watchfaces and firmware yet
---
 .../devices/xiaomi/miwatch/MiWatchLiteCoordinator.java       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatch/MiWatchLiteCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatch/MiWatchLiteCoordinator.java
index e10eb0fbc..b6257efcc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatch/MiWatchLiteCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatch/MiWatchLiteCoordinator.java
@@ -25,6 +25,7 @@ import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiInstallHandler;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiPlaintextCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 
@@ -37,8 +38,8 @@ public class MiWatchLiteCoordinator extends XiaomiPlaintextCoordinator {
     @Nullable
     @Override
     public InstallHandler findInstallHandler(final Uri uri, final Context context) {
-        // TODO implement this
-        return super.findInstallHandler(uri, context);
+        final XiaomiInstallHandler handler = new XiaomiInstallHandler(uri, context);
+        return handler.isValid() ? handler : null;
     }
 
     @Override

From 27fba5028386baa8a6bb2e53d223225df67b0ea3 Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Mon, 23 Oct 2023 20:22:10 +0200
Subject: [PATCH 122/595] Xiaomi: move emoji conversion to base class

This works on Mi Watch Lite from FW 4.1.12
---
 .../xiaomi/XiaomiEncryptedSupport.java        | 188 -----------------
 .../service/devices/xiaomi/XiaomiSupport.java | 193 ++++++++++++++++++
 2 files changed, 193 insertions(+), 188 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiEncryptedSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiEncryptedSupport.java
index d6522e2b8..aa38cea1e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiEncryptedSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiEncryptedSupport.java
@@ -16,7 +16,6 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi;
 
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -87,191 +86,4 @@ public class XiaomiEncryptedSupport extends XiaomiSupport {
     protected void startAuthentication(final TransactionBuilder builder) {
         authService.startEncryptedHandshake(builder);
     }
-
-    @Override
-    public String customStringFilter(final String inputString) {
-        return StringUtils.replaceEach(inputString, EMOJI_SOURCE, EMOJI_TARGET);
-    }
-
-    private static final String[] EMOJI_SOURCE = new String[] {
-            "\uD83D\uDE0D", // 😍
-            "\uD83D\uDE18", // 😘
-            "\uD83D\uDE02", // 😂
-            "\uD83D\uDE0A", // 😊
-            "\uD83D\uDE0E", // 😎
-            "\uD83D\uDE09", // 😉
-            "\uD83D\uDC8B", // 💋
-            "\uD83D\uDC4D", // 👍
-            "\uD83E\uDD23", // 🤣
-            "\uD83D\uDC95", // 💕
-            "\uD83D\uDE00", // 😀
-            "\uD83D\uDE04", // 😄
-            "\uD83D\uDE2D", // 😭
-            "\uD83E\uDD7A", // 🥺
-            "\uD83D\uDE4F", // 🙏
-            "\uD83E\uDD70", // 🥰
-            "\uD83E\uDD14", // 🤔
-            "\uD83D\uDD25", // 🔥
-            "\uD83D\uDE29", // 😩
-            "\uD83D\uDE14", // 😔
-            "\uD83D\uDE01", // 😁
-            "\uD83D\uDC4C", // 👌
-            "\uD83D\uDE0F", // 😏
-            "\uD83D\uDE05", // 😅
-            "\uD83E\uDD0D", // 🤍
-            "\uD83D\uDC94", // 💔
-            "\uD83D\uDE0C", // 😌
-            "\uD83D\uDE22", // 😢
-            "\uD83D\uDC99", // 💙
-            "\uD83D\uDC9C", // 💜
-            "\uD83C\uDFB6", // 🎶
-            "\uD83D\uDE33", // 😳
-            "\uD83D\uDC96", // 💖
-            "\uD83D\uDE4C", // 🙌
-            "\uD83D\uDCAF", // 💯
-            "\uD83D\uDE48", // 🙈
-            "\uD83D\uDE0B", // 😋
-            "\uD83D\uDE11", // 😑
-            "\uD83D\uDE34", // 😴
-            "\uD83D\uDE2A", // 😪
-            "\uD83D\uDE1C", // 😜
-            "\uD83D\uDE1B", // 😛
-            "\uD83D\uDE1D", // 😝
-            "\uD83D\uDE1E", // 😞
-            "\uD83D\uDE15", // 😕
-            "\uD83D\uDC97", // 💗
-            "\uD83D\uDC4F", // 👏
-            "\uD83D\uDE10", // 😐
-            "\uD83D\uDC49", // 👉
-            "\uD83D\uDC9B", // 💛
-            "\uD83D\uDC9E", // 💞
-            "\uD83D\uDCAA", // 💪
-            "\uD83C\uDF39", // 🌹
-            "\uD83D\uDC80", // 💀
-            "\uD83D\uDE31", // 😱
-            "\uD83D\uDC98", // 💘
-            "\uD83E\uDD1F", // 🤟
-            "\uD83D\uDE21", // 😡
-            "\uD83D\uDCF7", // 📷
-            "\uD83C\uDF38", // 🌸
-            "\uD83D\uDE08", // 😈
-            "\uD83D\uDC48", // 👈
-            "\uD83C\uDF89", // 🎉
-            "\uD83D\uDC81", // 💁
-            "\uD83D\uDE4A", // 🙊
-            "\uD83D\uDC9A", // 💚
-            "\uD83D\uDE2B", // 😫
-            "\uD83D\uDE24", // 😤
-            "\uD83D\uDC93", // 💓
-            "\uD83C\uDF1A", // 🌚
-            "\uD83D\uDC47", // 👇
-            "\uD83D\uDE07", // 😇
-            "\uD83D\uDC4A", // 👊
-            "\uD83D\uDC51", // 👑
-            "\uD83D\uDE13", // 😓
-            "\uD83D\uDE3B", // 😻
-            "\uD83D\uDD34", // 🔴
-            "\uD83D\uDE25", // 😥
-            "\uD83E\uDD29", // 🤩
-            "\uD83D\uDE1A", // 😚
-            "\uD83D\uDE37", // 😷
-            "\uD83D\uDC4B", // 👋
-            "\uD83D\uDCA5", // 💥
-            "\uD83E\uDD2D", // 🤭
-            "\uD83C\uDF1F", // 🌟
-            "\uD83E\uDD71", // 🥱
-            "\uD83D\uDCA9", // 💩
-            "\uD83D\uDE80", // 🚀
-    };
-
-    private static final String[] EMOJI_TARGET = new String[] {
-            "ꀂ", // 😍
-            "ꀃ", // 😘
-            "ꀄ", // 😂
-            "ꀅ", // 😊
-            "ꀆ", // 😎
-            "ꀇ", // 😉
-            "ꀈ", // 💋
-            "ꀉ", // 👍
-            "ꀊ", // 🤣
-            "ꀋ", // 💕
-            "ꀌ", // 😀
-            "ꀍ", // 😄
-            "ꀎ", // 😭
-            "ꀏ", // 🥺
-            "ꀑ", // 🙏
-            "ꀒ", // 🥰
-            "ꀓ", // 🤔
-            "ꀔ", // 🔥
-            "ꀗ", // 😩
-            "ꀘ", // 😔
-            "ꀙ", // 😁
-            "ꀚ", // 👌
-            "ꀛ", // 😏
-            "ꀜ", // 😅
-            "ꀝ", // 🤍
-            "ꀞ", // 💔
-            "ꀟ", // 😌
-            "ꀠ", // 😢
-            "ꀡ", // 💙
-            "ꀢ", // 💜
-            "ꀤ", // 🎶
-            "ꀥ", // 😳
-            "ꀦ", // 💖
-            "ꀧ", // 🙌
-            "ꀨ", // 💯
-            "ꀩ", // 🙈
-            "ꀫ", // 😋
-            "ꀬ", // 😑
-            "ꀭ", // 😴
-            "ꀮ", // 😪
-            "ꀯ", // 😜
-            "ꀰ", // 😛
-            "ꀱ", // 😝
-            "ꀲ", // 😞
-            "ꀳ", // 😕
-            "ꀴ", // 💗
-            "ꀵ", // 👏
-            "ꀶ", // 😐
-            "ꀷ", // 👉
-            "ꀸ", // 💛
-            "ꀹ", // 💞
-            "ꀺ", // 💪
-            "ꀻ", // 🌹
-            "ꀼ", // 💀
-            "ꀽ", // 😱
-            "ꀾ", // 💘
-            "ꀿ", // 🤟
-            "ꁀ", // 😡
-            "ꁁ", // 📷
-            "ꁂ", // 🌸
-            "ꁃ", // 😈
-            "ꁄ", // 👈
-            "ꁅ", // 🎉
-            "ꁆ", // 💁
-            "ꁇ", // 🙊
-            "ꁈ", // 💚
-            "ꁉ", // 😫
-            "ꁊ", // 😤
-            "ꁍ", // 💓
-            "ꁎ", // 🌚
-            "ꁏ", // 👇
-            "ꁒ", // 😇
-            "ꁓ", // 👊
-            "ꁔ", // 👑
-            "ꁕ", // 😓
-            "ꁖ", // 😻
-            "ꁗ", // 🔴
-            "ꁘ", // 😥
-            "ꁙ", // 🤩
-            "ꁚ", // 😚
-            "ꁜ", // 😷
-            "ꁝ", // 👋
-            "ꁞ", // 💥
-            "ꁠ", // 🤭
-            "ꁡ", // 🌟
-            "ꁢ", // 🥱
-            "ꁣ", // 💩
-            "ꁤ", // 🚀
-    };
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
index 6b538fb3a..3cc33e6a9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
@@ -24,6 +24,7 @@ import android.content.Context;
 import android.location.Location;
 import android.net.Uri;
 
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -102,10 +103,15 @@ public abstract class XiaomiSupport extends AbstractBTLEDeviceSupport {
     }
 
     protected abstract boolean isEncrypted();
+
     protected abstract UUID getCharacteristicCommandRead();
+
     protected abstract UUID getCharacteristicCommandWrite();
+
     protected abstract UUID getCharacteristicActivityData();
+
     protected abstract UUID getCharacteristicDataUpload();
+
     protected abstract void startAuthentication(final TransactionBuilder builder);
 
     @Override
@@ -464,4 +470,191 @@ public abstract class XiaomiSupport extends AbstractBTLEDeviceSupport {
     public XiaomiDataUploadService getDataUploader() {
         return this.dataUploadService;
     }
+
+    @Override
+    public String customStringFilter(final String inputString) {
+        return StringUtils.replaceEach(inputString, EMOJI_SOURCE, EMOJI_TARGET);
+    }
+
+    private static final String[] EMOJI_SOURCE = new String[]{
+            "\uD83D\uDE0D", // 😍
+            "\uD83D\uDE18", // 😘
+            "\uD83D\uDE02", // 😂
+            "\uD83D\uDE0A", // 😊
+            "\uD83D\uDE0E", // 😎
+            "\uD83D\uDE09", // 😉
+            "\uD83D\uDC8B", // 💋
+            "\uD83D\uDC4D", // 👍
+            "\uD83E\uDD23", // 🤣
+            "\uD83D\uDC95", // 💕
+            "\uD83D\uDE00", // 😀
+            "\uD83D\uDE04", // 😄
+            "\uD83D\uDE2D", // 😭
+            "\uD83E\uDD7A", // 🥺
+            "\uD83D\uDE4F", // 🙏
+            "\uD83E\uDD70", // 🥰
+            "\uD83E\uDD14", // 🤔
+            "\uD83D\uDD25", // 🔥
+            "\uD83D\uDE29", // 😩
+            "\uD83D\uDE14", // 😔
+            "\uD83D\uDE01", // 😁
+            "\uD83D\uDC4C", // 👌
+            "\uD83D\uDE0F", // 😏
+            "\uD83D\uDE05", // 😅
+            "\uD83E\uDD0D", // 🤍
+            "\uD83D\uDC94", // 💔
+            "\uD83D\uDE0C", // 😌
+            "\uD83D\uDE22", // 😢
+            "\uD83D\uDC99", // 💙
+            "\uD83D\uDC9C", // 💜
+            "\uD83C\uDFB6", // 🎶
+            "\uD83D\uDE33", // 😳
+            "\uD83D\uDC96", // 💖
+            "\uD83D\uDE4C", // 🙌
+            "\uD83D\uDCAF", // 💯
+            "\uD83D\uDE48", // 🙈
+            "\uD83D\uDE0B", // 😋
+            "\uD83D\uDE11", // 😑
+            "\uD83D\uDE34", // 😴
+            "\uD83D\uDE2A", // 😪
+            "\uD83D\uDE1C", // 😜
+            "\uD83D\uDE1B", // 😛
+            "\uD83D\uDE1D", // 😝
+            "\uD83D\uDE1E", // 😞
+            "\uD83D\uDE15", // 😕
+            "\uD83D\uDC97", // 💗
+            "\uD83D\uDC4F", // 👏
+            "\uD83D\uDE10", // 😐
+            "\uD83D\uDC49", // 👉
+            "\uD83D\uDC9B", // 💛
+            "\uD83D\uDC9E", // 💞
+            "\uD83D\uDCAA", // 💪
+            "\uD83C\uDF39", // 🌹
+            "\uD83D\uDC80", // 💀
+            "\uD83D\uDE31", // 😱
+            "\uD83D\uDC98", // 💘
+            "\uD83E\uDD1F", // 🤟
+            "\uD83D\uDE21", // 😡
+            "\uD83D\uDCF7", // 📷
+            "\uD83C\uDF38", // 🌸
+            "\uD83D\uDE08", // 😈
+            "\uD83D\uDC48", // 👈
+            "\uD83C\uDF89", // 🎉
+            "\uD83D\uDC81", // 💁
+            "\uD83D\uDE4A", // 🙊
+            "\uD83D\uDC9A", // 💚
+            "\uD83D\uDE2B", // 😫
+            "\uD83D\uDE24", // 😤
+            "\uD83D\uDC93", // 💓
+            "\uD83C\uDF1A", // 🌚
+            "\uD83D\uDC47", // 👇
+            "\uD83D\uDE07", // 😇
+            "\uD83D\uDC4A", // 👊
+            "\uD83D\uDC51", // 👑
+            "\uD83D\uDE13", // 😓
+            "\uD83D\uDE3B", // 😻
+            "\uD83D\uDD34", // 🔴
+            "\uD83D\uDE25", // 😥
+            "\uD83E\uDD29", // 🤩
+            "\uD83D\uDE1A", // 😚
+            "\uD83D\uDE37", // 😷
+            "\uD83D\uDC4B", // 👋
+            "\uD83D\uDCA5", // 💥
+            "\uD83E\uDD2D", // 🤭
+            "\uD83C\uDF1F", // 🌟
+            "\uD83E\uDD71", // 🥱
+            "\uD83D\uDCA9", // 💩
+            "\uD83D\uDE80", // 🚀
+    };
+
+    private static final String[] EMOJI_TARGET = new String[]{
+            "ꀂ", // 😍
+            "ꀃ", // 😘
+            "ꀄ", // 😂
+            "ꀅ", // 😊
+            "ꀆ", // 😎
+            "ꀇ", // 😉
+            "ꀈ", // 💋
+            "ꀉ", // 👍
+            "ꀊ", // 🤣
+            "ꀋ", // 💕
+            "ꀌ", // 😀
+            "ꀍ", // 😄
+            "ꀎ", // 😭
+            "ꀏ", // 🥺
+            "ꀑ", // 🙏
+            "ꀒ", // 🥰
+            "ꀓ", // 🤔
+            "ꀔ", // 🔥
+            "ꀗ", // 😩
+            "ꀘ", // 😔
+            "ꀙ", // 😁
+            "ꀚ", // 👌
+            "ꀛ", // 😏
+            "ꀜ", // 😅
+            "ꀝ", // 🤍
+            "ꀞ", // 💔
+            "ꀟ", // 😌
+            "ꀠ", // 😢
+            "ꀡ", // 💙
+            "ꀢ", // 💜
+            "ꀤ", // 🎶
+            "ꀥ", // 😳
+            "ꀦ", // 💖
+            "ꀧ", // 🙌
+            "ꀨ", // 💯
+            "ꀩ", // 🙈
+            "ꀫ", // 😋
+            "ꀬ", // 😑
+            "ꀭ", // 😴
+            "ꀮ", // 😪
+            "ꀯ", // 😜
+            "ꀰ", // 😛
+            "ꀱ", // 😝
+            "ꀲ", // 😞
+            "ꀳ", // 😕
+            "ꀴ", // 💗
+            "ꀵ", // 👏
+            "ꀶ", // 😐
+            "ꀷ", // 👉
+            "ꀸ", // 💛
+            "ꀹ", // 💞
+            "ꀺ", // 💪
+            "ꀻ", // 🌹
+            "ꀼ", // 💀
+            "ꀽ", // 😱
+            "ꀾ", // 💘
+            "ꀿ", // 🤟
+            "ꁀ", // 😡
+            "ꁁ", // 📷
+            "ꁂ", // 🌸
+            "ꁃ", // 😈
+            "ꁄ", // 👈
+            "ꁅ", // 🎉
+            "ꁆ", // 💁
+            "ꁇ", // 🙊
+            "ꁈ", // 💚
+            "ꁉ", // 😫
+            "ꁊ", // 😤
+            "ꁍ", // 💓
+            "ꁎ", // 🌚
+            "ꁏ", // 👇
+            "ꁒ", // 😇
+            "ꁓ", // 👊
+            "ꁔ", // 👑
+            "ꁕ", // 😓
+            "ꁖ", // 😻
+            "ꁗ", // 🔴
+            "ꁘ", // 😥
+            "ꁙ", // 🤩
+            "ꁚ", // 😚
+            "ꁜ", // 😷
+            "ꁝ", // 👋
+            "ꁞ", // 💥
+            "ꁠ", // 🤭
+            "ꁡ", // 🌟
+            "ꁢ", // 🥱
+            "ꁣ", // 💩
+            "ꁤ", // 🚀
+    };
 }

From cab63b2c98c48d489fbbe052560ad3fbeade9351 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Mon, 23 Oct 2023 23:30:59 +0100
Subject: [PATCH 123/595] Mi Band 8: Fix watchface upload

---
 .../devices/xiaomi/XiaomiCharacteristic.java       | 14 ++++++--------
 .../xiaomi/services/XiaomiWatchfaceService.java    |  1 +
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
index fe7bcc1ed..08dab3da7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
@@ -276,21 +276,18 @@ public class XiaomiCharacteristic {
         final boolean encrypt = isEncrypted && authService.isEncryptionInitialized();
 
         if (encrypt) {
-            currentPayload.setBytesToSend(authService.encrypt(currentPayload.getBytesToSend(), encryptedIndex));
+            currentPayload.setBytesToSend(authService.encrypt(currentPayload.getBytesToSend(), incrementNonce ? encryptedIndex : 0));
         }
 
         if (shouldWriteChunked(currentPayload.getBytesToSend())) {
-            if (encrypt) {
+            if (encrypt && incrementNonce) {
                 // Prepend encrypted index for the nonce
                 currentPayload.setBytesToSend(
                         ByteBuffer.allocate(2 + currentPayload.getBytesToSend().length).order(ByteOrder.LITTLE_ENDIAN)
-                                .putShort(encryptedIndex)
+                                .putShort(encryptedIndex++)
                                 .put(currentPayload.getBytesToSend())
                                 .array()
                 );
-                if (incrementNonce) {
-                    encryptedIndex++;
-                }
             }
 
             LOG.debug("Sending {} - chunked", currentPayload.getTaskName());
@@ -319,9 +316,10 @@ public class XiaomiCharacteristic {
             buf.put((byte) 2); // 2 for command
             buf.put((byte) (encrypt ? 1 : 2));
             if (encrypt) {
-                buf.putShort(encryptedIndex);
                 if (incrementNonce) {
-                    encryptedIndex++;
+                    buf.putShort(encryptedIndex++);
+                } else {
+                    buf.putShort((short) 0);
                 }
             }
             buf.put(currentPayload.getBytesToSend()); // it's already encrypted
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWatchfaceService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWatchfaceService.java
index 8bb7df6db..c2abbf3fd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWatchfaceService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWatchfaceService.java
@@ -244,6 +244,7 @@ public class XiaomiWatchfaceService extends AbstractXiaomiService implements Xia
 
         if (success) {
             setWatchface(fwHelper.getId());
+            requestWatchfaceList();
         }
 
         fwHelper = null;

From 929ea7ae57e19929610b3e7567280a130386da51 Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Tue, 24 Oct 2023 16:35:16 +0200
Subject: [PATCH 124/595] Xiaomi: Implement sending current weather
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

TODO: Support °F, find out about unknown values

Tested on Mi Watch Lite
---
 .../xiaomi/services/XiaomiWeatherService.java | 63 +++++++++++++++++--
 app/src/main/proto/xiaomi.proto               | 49 +++++++++++++++
 2 files changed, 106 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java
index 3b236b77a..ca659f769 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java
@@ -19,14 +19,14 @@ package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import nodomain.freeyourgadget.gadgetbridge.GBApplication;
-import nodomain.freeyourgadget.gadgetbridge.R;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+
 import nodomain.freeyourgadget.gadgetbridge.activities.SettingsActivity;
-import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiCoordinator;
-import nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst;
+import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiWeatherConditions;
 import nodomain.freeyourgadget.gadgetbridge.model.WeatherSpec;
 import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
-import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 
@@ -37,6 +37,7 @@ public class XiaomiWeatherService extends AbstractXiaomiService {
 
     private static final int CMD_TEMPERATURE_UNIT_GET = 9;
     private static final int CMD_TEMPERATURE_UNIT_SET = 10;
+    private static final int CMD_SET_CURRENT_WEATHER = 0;
 
     public XiaomiWeatherService(final XiaomiSupport support) {
         super(support);
@@ -64,7 +65,57 @@ public class XiaomiWeatherService extends AbstractXiaomiService {
     }
 
     public void onSendWeather(final WeatherSpec weatherSpec) {
-        // TODO
+        String timestamp = new StringBuilder(
+                new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ", Locale.US)
+                        .format(new Date(weatherSpec.timestamp * 1000L)))
+                .insert(22, ':') // FIXME: I bet this fails for some, but all this java date craps sucks
+                .toString();
+
+
+        getSupport().sendCommand(
+                "set current weather",
+                XiaomiProto.Command.newBuilder()
+                        .setType(COMMAND_TYPE)
+                        .setSubtype(CMD_SET_CURRENT_WEATHER)
+                        .setWeather(XiaomiProto.Weather.newBuilder().setCurrent(
+                                XiaomiProto.WeatherCurrent.newBuilder()
+                                        .setTimeLocation(XiaomiProto.WeatherCurrentTimeLocation.newBuilder()
+                                                .setTimestamp(timestamp)
+                                                .setUnk2("")
+                                                .setCurrentLocationString(weatherSpec.location)
+                                        )
+                                        .setWeatherCondition(HuamiWeatherConditions.mapToAmazfitBipWeatherCode(weatherSpec.currentConditionCode)) // *SEEMS* to work
+                                        .setTemperature(XiaomiProto.WeatherCurrentTemperature.newBuilder()
+                                                .setDegrees(weatherSpec.currentTemp - 273) // TODO: support inches for weather
+                                                .setSymbol("℃")
+                                        )
+                                        .setHumidity(XiaomiProto.WeatherCurrentHumidity.newBuilder()
+                                                .setHumidity(weatherSpec.currentHumidity)
+                                                .setSymbol("%")
+                                        )
+                                        .setUnk5(XiaomiProto.WeatherCurrentUnk5.newBuilder()
+                                                .setUnk1("")
+                                                .setUnk2(0)
+                                        )
+                                        .setUnk6(XiaomiProto.WeatherCurrentUnk6.newBuilder()
+                                                .setUnk1("")
+                                                .setUnk2(0)
+                                        )
+                                        .setUnk7(XiaomiProto.WeatherCurrentUnk7.newBuilder()
+                                                .setUnk1("")
+                                                .setUnk2(0)
+                                        )
+                                        .setWarning(XiaomiProto.WeatherCurrentWarning.newBuilder()
+                                                .setCurrentWarning1(XiaomiProto.WeatherCurrentWarning1.newBuilder()
+                                                        .setCurrentWarningText("")
+                                                        .setCurrentWarningSeverityText("")
+                                                )
+                                        )
+                                        .setPressure(weatherSpec.pressure)
+
+                        ))
+                        .build()
+        );
     }
 
     private void setMeasurementSystem() {
diff --git a/app/src/main/proto/xiaomi.proto b/app/src/main/proto/xiaomi.proto
index 32e57a8b3..19616fd9b 100644
--- a/app/src/main/proto/xiaomi.proto
+++ b/app/src/main/proto/xiaomi.proto
@@ -635,7 +635,56 @@ message Weather {
 }
 
 message WeatherCurrent {
+  optional WeatherCurrentTimeLocation timeLocation = 1;
+  optional uint32 weatherCondition = 2;
+  optional WeatherCurrentTemperature temperature = 3;
+  optional WeatherCurrentHumidity humidity= 4;
+  optional WeatherCurrentUnk5 unk5 = 5;
+  optional WeatherCurrentUnk6 unk6 = 6;
+  optional WeatherCurrentUnk7 unk7 = 7;
+  optional WeatherCurrentWarning warning = 8; // Seems to be an array?
+  optional float pressure = 9;
 }
+message WeatherCurrentTimeLocation {
+  optional string timestamp = 1;
+  optional string unk2 = 2;
+  optional string currentLocationString = 3;
+}
+
+message WeatherCurrentTemperature {
+  optional string symbol = 1;
+  optional sint32 degrees = 2;
+}
+
+message WeatherCurrentHumidity {
+  optional string symbol = 1;
+  optional sint32 humidity = 2;
+}
+
+message WeatherCurrentUnk5 {
+  optional string unk1 = 1;
+  optional uint32 unk2 = 2;
+}
+
+message WeatherCurrentUnk6 {
+  optional string unk1 = 1;
+  optional uint32 unk2 = 2;
+}
+
+message WeatherCurrentUnk7 {
+  optional string unk1 = 1;
+  optional uint32 unk2 = 2;
+}
+
+message WeatherCurrentWarning {
+  optional WeatherCurrentWarning1 currentWarning1 = 1; // FIXME: this is probably an array
+}
+
+message WeatherCurrentWarning1 {
+  optional string currentWarningText = 1;
+  optional string currentWarningSeverityText = 2;
+}
+
 
 message WeatherDaily {
 }

From 9749716c230005c22ae44ddfff41a7b471ea6ba6 Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Tue, 24 Oct 2023 22:03:50 +0200
Subject: [PATCH 125/595] Xiaomi: add two more fields to current weather (seen
 on Mi Band 8)

---
 .../service/devices/xiaomi/services/XiaomiWeatherService.java   | 2 ++
 app/src/main/proto/xiaomi.proto                                 | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java
index ca659f769..4fadb6dbc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java
@@ -83,6 +83,8 @@ public class XiaomiWeatherService extends AbstractXiaomiService {
                                                 .setTimestamp(timestamp)
                                                 .setUnk2("")
                                                 .setCurrentLocationString(weatherSpec.location)
+                                                .setCurrentLocationCode("accu:123456") // FIXME:AccuWeather code (we do not have it here)
+                                                .setUnk5(true)
                                         )
                                         .setWeatherCondition(HuamiWeatherConditions.mapToAmazfitBipWeatherCode(weatherSpec.currentConditionCode)) // *SEEMS* to work
                                         .setTemperature(XiaomiProto.WeatherCurrentTemperature.newBuilder()
diff --git a/app/src/main/proto/xiaomi.proto b/app/src/main/proto/xiaomi.proto
index 19616fd9b..599d58b3b 100644
--- a/app/src/main/proto/xiaomi.proto
+++ b/app/src/main/proto/xiaomi.proto
@@ -649,6 +649,8 @@ message WeatherCurrentTimeLocation {
   optional string timestamp = 1;
   optional string unk2 = 2;
   optional string currentLocationString = 3;
+  optional string currentLocationCode = 4;
+  optional bool unk5 = 5; // default location?
 }
 
 message WeatherCurrentTemperature {

From 047cc71d280afc940bc7c272063b4c72b6e2da51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Tue, 24 Oct 2023 21:17:08 +0100
Subject: [PATCH 126/595] Mi Band 8: Upload custom notification icons

---
 .../services/XiaomiDataUploadService.java     | 10 +++
 .../services/XiaomiNotificationService.java   | 86 ++++++++++++++++++-
 app/src/main/proto/xiaomi.proto               | 22 ++---
 3 files changed, 104 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiDataUploadService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiDataUploadService.java
index 8be61474c..cffe771e7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiDataUploadService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiDataUploadService.java
@@ -75,10 +75,20 @@ public class XiaomiDataUploadService extends AbstractXiaomiService {
     }
 
     public void setCallback(@Nullable final Callback callback) {
+        if (callback != null && currentBytes != null) {
+            LOG.warn("Already uploading {} for another callback, refusing new callback", currentType);
+            return;
+        }
+
         this.callback = callback;
     }
 
     public void requestUpload(final byte type, final byte[] bytes) {
+        if (this.currentBytes != null) {
+            LOG.warn("Already uploading {}, refusing upload of {}", currentType, type);
+            return;
+        }
+
         LOG.debug("Requesting upload for {} bytes of type {}", bytes.length, type);
 
         this.currentType = type;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
index 6e1cf84eb..2729c87f0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
@@ -18,10 +18,16 @@ package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services;
 
 import android.Manifest;
 import android.content.pm.PackageManager;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
@@ -32,11 +38,12 @@ import nodomain.freeyourgadget.gadgetbridge.model.CallSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.CannedMessagesSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.NotificationSpec;
 import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
-import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
+import nodomain.freeyourgadget.gadgetbridge.util.BitmapUtil;
+import nodomain.freeyourgadget.gadgetbridge.util.NotificationUtils;
 import nodomain.freeyourgadget.gadgetbridge.util.StringUtils;
 
-public class XiaomiNotificationService extends AbstractXiaomiService {
+public class XiaomiNotificationService extends AbstractXiaomiService implements XiaomiDataUploadService.Callback {
     private static final Logger LOG = LoggerFactory.getLogger(XiaomiNotificationService.class);
 
     private static final SimpleDateFormat TIMESTAMP_SDF = new SimpleDateFormat("yyyyMMdd'T'HHmmss", Locale.ROOT);
@@ -49,6 +56,10 @@ public class XiaomiNotificationService extends AbstractXiaomiService {
     public static final int CMD_CALL_IGNORE = 5;
     public static final int CMD_CANNED_MESSAGES_GET = 9;
     public static final int CMD_CANNED_MESSAGES_SET = 12; // also canned message reply
+    public static final int CMD_NOTIFICATION_ICON_REQUEST = 15;
+    public static final int CMD_NOTIFICATION_ICON_QUERY = 16;
+
+    private String iconPackageName;
 
     public XiaomiNotificationService(final XiaomiSupport support) {
         super(support);
@@ -77,13 +88,31 @@ public class XiaomiNotificationService extends AbstractXiaomiService {
             case CMD_CANNED_MESSAGES_GET:
                 handleCannedMessages(cmd.getNotification().getCannedMessages());
                 return;
-        }
+            case CMD_NOTIFICATION_ICON_REQUEST:
+                handleNotificationIconRequest(cmd.getNotification().getNotificationIconRequest());
+                return;
+            case CMD_NOTIFICATION_ICON_QUERY:
+                this.iconPackageName = cmd.getNotification().getNotificationIconQuery().getPackage();
+                LOG.debug("Watch querying notification icon for {}", iconPackageName);
 
-        // TODO
+                // TODO should we confirm that we have the icon before replying?
+                getSupport().sendCommand(
+                        "send notification reply for " + iconPackageName,
+                        XiaomiProto.Command.newBuilder()
+                                .setType(COMMAND_TYPE)
+                                .setSubtype(CMD_NOTIFICATION_ICON_REQUEST)
+                                .setNotification(XiaomiProto.Notification.newBuilder()
+                                        .setNotificationIconReply(cmd.getNotification().getNotificationIconQuery())
+                                ).build()
+                );
+                return;
+        }
 
         LOG.warn("Unhandled notification command {}", cmd.getSubtype());
     }
 
+
+
     public void onNotification(final NotificationSpec notificationSpec) {
         final XiaomiProto.Notification3.Builder notification3 = XiaomiProto.Notification3.newBuilder()
                 .setId(notificationSpec.getId())
@@ -260,4 +289,53 @@ public class XiaomiNotificationService extends AbstractXiaomiService {
             return true;
         }
     }
+
+    private void handleNotificationIconRequest(final XiaomiProto.NotificationIconRequest notificationIconRequest) {
+        if (iconPackageName == null) {
+            LOG.warn("No icon package name");
+            return;
+        }
+
+        int unk1 = notificationIconRequest.getUnknown1();
+        int unk2 = notificationIconRequest.getUnknown2();
+
+        final int size = notificationIconRequest.getSize();
+        LOG.debug("Got notification icon request for size {} for {}, unk1={}, unk2={}", size, iconPackageName, unk1, unk2);
+
+        final Drawable icon = NotificationUtils.getAppIcon(getSupport().getContext(), iconPackageName);
+        if (icon == null) {
+            LOG.warn("Failed to get icon for {}", iconPackageName);
+            return;
+        }
+
+        // TODO avoid resize?
+        final Bitmap bmp = BitmapUtil.toBitmap(icon);
+        final Bitmap bmpResized = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
+        final Canvas canvas = new Canvas(bmpResized);
+        final Rect rect = new Rect(0, 0, size, size);
+        canvas.drawBitmap(bmp, null, rect, null);
+
+        // convert from RGBA To ABGR
+        final ByteBuffer buf = ByteBuffer.allocate(size * size * 4).order(ByteOrder.LITTLE_ENDIAN);
+        for (int x = 0; x < size; x++) {
+            for (int y = 0; y < size; y++) {
+                buf.putInt(bmpResized.getPixel(x, y));
+            }
+        }
+
+        getSupport().getDataUploader().setCallback(this);
+        getSupport().getDataUploader().requestUpload(XiaomiDataUploadService.TYPE_NOTIFICATION_ICON, buf.array());
+    }
+
+    @Override
+    public void onUploadFinish(final boolean success) {
+        LOG.debug("Notification icon upload finished: {}", success);
+
+        getSupport().getDataUploader().setCallback(null);
+    }
+
+    @Override
+    public void onUploadProgress(final int progressPercent) {
+        LOG.debug("Notification icon upload progress: {}", progressPercent);
+    }
 }
diff --git a/app/src/main/proto/xiaomi.proto b/app/src/main/proto/xiaomi.proto
index 599d58b3b..4946c3851 100644
--- a/app/src/main/proto/xiaomi.proto
+++ b/app/src/main/proto/xiaomi.proto
@@ -564,11 +564,13 @@ message Notification {
   optional uint32 unknown8 = 8; // 1 on canned replies request?
   // 7, 9 get | 7, 12 set
   optional CannedMessages cannedMessages = 9;
-  // 7, 16
-  optional NotificationIconRequest notificationIconRequest = 14;
+
   // 7, 15
-  optional NotificationIconRequest notificationIconProperties = 15;
-  optional NotificationIconRequest notificationIconConfirm = 16;
+  optional NotificationIconPackage notificationIconReply = 14;
+  // 7, 15
+  optional NotificationIconRequest notificationIconRequest = 15;
+  // 7, 16
+  optional NotificationIconPackage notificationIconQuery = 16;
 }
 
 message Notification2 {
@@ -605,14 +607,14 @@ message CannedMessages {
   optional uint32 maxReplies = 3;
 }
 
-message NotificationIconProperties {
-  optional string package = 1;
+message NotificationIconRequest {
+  optional uint32 unknown1 = 1; // 0 probably format
+  optional uint32 unknown2 = 2; // 3 probably format
+  optional uint32 size = 3;
 }
 
-message NotificationIconRequest {
-  optional uint32 unknown1 = 1; // 0
-  optional uint32 unknown2 = 2; // 3
-  optional uint32 unknown3 = 3; // 28, 44, 80, size?
+message NotificationIconPackage {
+  optional string package = 1;
 }
 
 //

From 0e3e4063201d9bd52efa3111b0a4111f4a304892 Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Wed, 25 Oct 2023 18:11:42 +0200
Subject: [PATCH 127/595] Xiaomi: Send AQI

Todo: map to strings
---
 .../devices/xiaomi/services/XiaomiWeatherService.java     | 6 +++---
 app/src/main/proto/xiaomi.proto                           | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java
index 4fadb6dbc..18e15eaf6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java
@@ -103,9 +103,9 @@ public class XiaomiWeatherService extends AbstractXiaomiService {
                                                 .setUnk1("")
                                                 .setUnk2(0)
                                         )
-                                        .setUnk7(XiaomiProto.WeatherCurrentUnk7.newBuilder()
-                                                .setUnk1("")
-                                                .setUnk2(0)
+                                        .setAQI(XiaomiProto.WeatherCurrentAQI.newBuilder()
+                                                .setAQIText("Unknown") // some string like "Moderate"
+                                                .setAQI(weatherSpec.airQuality.aqi)
                                         )
                                         .setWarning(XiaomiProto.WeatherCurrentWarning.newBuilder()
                                                 .setCurrentWarning1(XiaomiProto.WeatherCurrentWarning1.newBuilder()
diff --git a/app/src/main/proto/xiaomi.proto b/app/src/main/proto/xiaomi.proto
index 4946c3851..8649483ce 100644
--- a/app/src/main/proto/xiaomi.proto
+++ b/app/src/main/proto/xiaomi.proto
@@ -643,7 +643,7 @@ message WeatherCurrent {
   optional WeatherCurrentHumidity humidity= 4;
   optional WeatherCurrentUnk5 unk5 = 5;
   optional WeatherCurrentUnk6 unk6 = 6;
-  optional WeatherCurrentUnk7 unk7 = 7;
+  optional WeatherCurrentAQI AQI = 7;
   optional WeatherCurrentWarning warning = 8; // Seems to be an array?
   optional float pressure = 9;
 }
@@ -675,9 +675,9 @@ message WeatherCurrentUnk6 {
   optional uint32 unk2 = 2;
 }
 
-message WeatherCurrentUnk7 {
-  optional string unk1 = 1;
-  optional uint32 unk2 = 2;
+message WeatherCurrentAQI {
+  optional string AQIText = 1;
+  optional uint32 AQI = 2;
 }
 
 message WeatherCurrentWarning {

From e2f60b38c9d8f966936abc436afd15b24acc0164 Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Wed, 25 Oct 2023 18:17:10 +0200
Subject: [PATCH 128/595] Xiaomi: fix NPE when no air quality is available

---
 .../service/devices/xiaomi/services/XiaomiWeatherService.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java
index 18e15eaf6..b7976ebc1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java
@@ -105,7 +105,7 @@ public class XiaomiWeatherService extends AbstractXiaomiService {
                                         )
                                         .setAQI(XiaomiProto.WeatherCurrentAQI.newBuilder()
                                                 .setAQIText("Unknown") // some string like "Moderate"
-                                                .setAQI(weatherSpec.airQuality.aqi)
+                                                .setAQI(weatherSpec.airQuality != null && weatherSpec.airQuality.aqi >=0 ? weatherSpec.airQuality.aqi : 0)
                                         )
                                         .setWarning(XiaomiProto.WeatherCurrentWarning.newBuilder()
                                                 .setCurrentWarning1(XiaomiProto.WeatherCurrentWarning1.newBuilder()

From 50f086b03a13c634a3eaf909148e764c081ea958 Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Wed, 25 Oct 2023 23:25:37 +0200
Subject: [PATCH 129/595] Xiaomi: Implement daily forecast

Works on Mi Watch Lite
---
 .../xiaomi/services/XiaomiWeatherService.java | 72 +++++++++++++++----
 app/src/main/proto/xiaomi.proto               | 41 +++++++++--
 2 files changed, 97 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java
index b7976ebc1..05fba895c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java
@@ -31,13 +31,12 @@ import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 
 public class XiaomiWeatherService extends AbstractXiaomiService {
-    private static final Logger LOG = LoggerFactory.getLogger(XiaomiWeatherService.class);
-
     public static final int COMMAND_TYPE = 10;
-
+    private static final Logger LOG = LoggerFactory.getLogger(XiaomiWeatherService.class);
     private static final int CMD_TEMPERATURE_UNIT_GET = 9;
     private static final int CMD_TEMPERATURE_UNIT_SET = 10;
     private static final int CMD_SET_CURRENT_WEATHER = 0;
+    private static final int CMD_SET_DAILY_WEATHER = 1;
 
     public XiaomiWeatherService(final XiaomiSupport support) {
         super(support);
@@ -65,12 +64,7 @@ public class XiaomiWeatherService extends AbstractXiaomiService {
     }
 
     public void onSendWeather(final WeatherSpec weatherSpec) {
-        String timestamp = new StringBuilder(
-                new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ", Locale.US)
-                        .format(new Date(weatherSpec.timestamp * 1000L)))
-                .insert(22, ':') // FIXME: I bet this fails for some, but all this java date craps sucks
-                .toString();
-
+        String timestamp = unixTimetstampToISOWithColons(weatherSpec.timestamp);
 
         getSupport().sendCommand(
                 "set current weather",
@@ -105,7 +99,7 @@ public class XiaomiWeatherService extends AbstractXiaomiService {
                                         )
                                         .setAQI(XiaomiProto.WeatherCurrentAQI.newBuilder()
                                                 .setAQIText("Unknown") // some string like "Moderate"
-                                                .setAQI(weatherSpec.airQuality != null && weatherSpec.airQuality.aqi >=0 ? weatherSpec.airQuality.aqi : 0)
+                                                .setAQI(weatherSpec.airQuality != null && weatherSpec.airQuality.aqi >= 0 ? weatherSpec.airQuality.aqi : 0)
                                         )
                                         .setWarning(XiaomiProto.WeatherCurrentWarning.newBuilder()
                                                 .setCurrentWarning1(XiaomiProto.WeatherCurrentWarning1.newBuilder()
@@ -114,10 +108,55 @@ public class XiaomiWeatherService extends AbstractXiaomiService {
                                                 )
                                         )
                                         .setPressure(weatherSpec.pressure)
-
                         ))
                         .build()
         );
+
+
+        if (weatherSpec.forecasts != null) {
+            XiaomiProto.WeatherDailyList.Builder dailyListBuilder = XiaomiProto.WeatherDailyList.newBuilder();
+            int daysToSend = Math.min(7, weatherSpec.forecasts.size());
+            for (int i = 0; i < daysToSend; i++) {
+                dailyListBuilder.addForecastDay(XiaomiProto.WeatherDailyForecastDay.newBuilder()
+                        .setUnk1(XiaomiProto.DailyUnk1.newBuilder()
+                                .setUnk1("")
+                                .setUnk2(0)
+                        )
+                        .setUnk2(XiaomiProto.DailyUnk2.newBuilder()
+                                .setUnk1(HuamiWeatherConditions.mapToAmazfitBipWeatherCode(weatherSpec.forecasts.get(i).conditionCode)) // TODO: verify
+                                .setUnk2(0)
+                        )
+                        .setHighLowTemp(XiaomiProto.DailyHighLowTemp.newBuilder()
+                                .setHigh(weatherSpec.forecasts.get(i).maxTemp - 273)
+                                .setLow(weatherSpec.forecasts.get(i).minTemp - 273)
+                        )
+                        .setTemperatureSymbol("℃")
+                        .setSunriseSunset(XiaomiProto.DailySunriseSunset.newBuilder()
+                                .setSunrise(weatherSpec.forecasts.get(i).sunRise != 0 ? unixTimetstampToISOWithColons(weatherSpec.forecasts.get(i).sunRise) : "")
+                                .setSunset(weatherSpec.forecasts.get(i).sunSet != 0 ? unixTimetstampToISOWithColons(weatherSpec.forecasts.get(i).sunSet) : "")
+                        )
+                );
+            }
+
+            getSupport().sendCommand(
+                    "set daily forecast",
+                    XiaomiProto.Command.newBuilder()
+                            .setType(COMMAND_TYPE)
+                            .setSubtype(CMD_SET_DAILY_WEATHER)
+                            .setWeather(XiaomiProto.Weather.newBuilder().setDaily(
+                                    XiaomiProto.WeatherDaily.newBuilder()
+                                            .setTimeLocation(XiaomiProto.WeatherCurrentTimeLocation.newBuilder()
+                                                    .setTimestamp(timestamp)
+                                                    .setUnk2("")
+                                                    .setCurrentLocationString(weatherSpec.location)
+                                                    .setCurrentLocationCode("accu:123456") // FIXME:AccuWeather code (we do not have it here)
+                                                    .setUnk5(true)
+                                            )
+                                            .setDailyList(dailyListBuilder)
+                            ))
+                            .build()
+            );
+        }
     }
 
     private void setMeasurementSystem() {
@@ -138,4 +177,13 @@ public class XiaomiWeatherService extends AbstractXiaomiService {
                         .build()
         );
     }
-}
+
+    private String unixTimetstampToISOWithColons(int timestamp) {
+        return new StringBuilder(
+                new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ", Locale.US)
+                        .format(new Date(timestamp * 1000L)))
+                .insert(22, ':') // FIXME: I bet this fails for some, but all this java date craps sucks
+                .toString();
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/proto/xiaomi.proto b/app/src/main/proto/xiaomi.proto
index 8649483ce..138a6911b 100644
--- a/app/src/main/proto/xiaomi.proto
+++ b/app/src/main/proto/xiaomi.proto
@@ -689,14 +689,47 @@ message WeatherCurrentWarning1 {
   optional string currentWarningSeverityText = 2;
 }
 
-
-message WeatherDaily {
-}
-
 message WeatherCurrentLocation {
   optional WeatherLocation location = 1;
 }
 
+message WeatherDaily {
+  required WeatherCurrentTimeLocation timeLocation = 1;
+  required WeatherDailyList dailyList = 2;
+}
+
+message WeatherDailyList {
+  repeated WeatherDailyForecastDay forecastDay = 1;
+}
+
+message WeatherDailyForecastDay {
+  optional DailyUnk1 unk1 = 1;
+  optional DailyUnk2 unk2 = 2;
+  optional DailyHighLowTemp highLowTemp = 3;
+  optional string temperatureSymbol = 4;
+  optional DailySunriseSunset sunriseSunset = 5;
+}
+
+message DailyUnk1 {
+  optional string unk1 = 1;
+  optional uint32 unk2 = 2;
+}
+
+message DailyUnk2 {
+  optional uint32 unk1 = 1;
+  optional uint32 unk2 = 2;
+}
+
+message DailyHighLowTemp {
+  optional sint32 low = 1;
+  optional sint32 high = 2;
+}
+
+message DailySunriseSunset {
+  optional string sunrise = 1;
+  optional string sunset = 2;
+}
+
 message WeatherLocation {
   optional string code = 1;
   optional string name = 2;

From ff2a26756f499d6c2cf2917164444520bef17335 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 27 Oct 2023 23:00:27 +0100
Subject: [PATCH 130/595] Mi Band 8: Fix weather (set current location)

---
 .../devices/xiaomi/XiaomiCoordinator.java     |  4 ++++
 .../xiaomi/miband8/MiBand8Coordinator.java    |  5 +++++
 .../xiaomi/services/XiaomiWeatherService.java | 22 +++++++++++++++++++
 3 files changed, 31 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
index bd465e93c..c83914ef6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
@@ -491,4 +491,8 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
     public AbstractNotificationPattern[] getNotificationLedPatterns() {
         return new AbstractNotificationPattern[0];
     }
+
+    public boolean supportsMultipleWeatherLocations() {
+        return false;
+    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/MiBand8Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/MiBand8Coordinator.java
index 21aa3d650..1a306af1d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/MiBand8Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/MiBand8Coordinator.java
@@ -55,4 +55,9 @@ public class MiBand8Coordinator extends XiaomiEncryptedCoordinator {
     public int getDisabledIconResource() {
         return R.drawable.ic_device_miband6_disabled;
     }
+
+    @Override
+    public boolean supportsMultipleWeatherLocations() {
+        return true;
+    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java
index 05fba895c..73c1b3625 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java
@@ -25,6 +25,7 @@ import java.util.Locale;
 
 import nodomain.freeyourgadget.gadgetbridge.activities.SettingsActivity;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiWeatherConditions;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.model.WeatherSpec;
 import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
@@ -37,6 +38,7 @@ public class XiaomiWeatherService extends AbstractXiaomiService {
     private static final int CMD_TEMPERATURE_UNIT_SET = 10;
     private static final int CMD_SET_CURRENT_WEATHER = 0;
     private static final int CMD_SET_DAILY_WEATHER = 1;
+    private static final int CMD_SET_CURRENT_LOCATION = 6;
 
     public XiaomiWeatherService(final XiaomiSupport support) {
         super(support);
@@ -66,6 +68,26 @@ public class XiaomiWeatherService extends AbstractXiaomiService {
     public void onSendWeather(final WeatherSpec weatherSpec) {
         String timestamp = unixTimetstampToISOWithColons(weatherSpec.timestamp);
 
+        final XiaomiCoordinator coordinator = getSupport().getCoordinator();
+
+        if (coordinator.supportsMultipleWeatherLocations()) {
+            // TODO actually support multiple locations
+            getSupport().sendCommand(
+                    "set current location",
+                    XiaomiProto.Command.newBuilder()
+                            .setType(COMMAND_TYPE)
+                            .setSubtype(CMD_SET_CURRENT_LOCATION)
+                            .setWeather(XiaomiProto.Weather.newBuilder().setCurrentLocation(
+                                    XiaomiProto.WeatherCurrentLocation.newBuilder()
+                                            .setLocation(XiaomiProto.WeatherLocation.newBuilder()
+                                                    .setCode("accu:123456") // FIXME:AccuWeather code (we do not have it here)
+                                                    .setName(weatherSpec.location)
+                                            )
+                            ))
+                            .build()
+            );
+        }
+
         getSupport().sendCommand(
                 "set current weather",
                 XiaomiProto.Command.newBuilder()

From 3948f95505045f597456fb585b2ec7fcb6aefc64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sat, 28 Oct 2023 14:56:55 +0100
Subject: [PATCH 131/595] Xiaomi: Dismiss notification from phone when dismiss
 from watch

---
 .../externalevents/NotificationListener.java           |  3 +++
 .../xiaomi/services/XiaomiNotificationService.java     | 10 ++++++++++
 2 files changed, 13 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
index db1c3cdc8..33a352a3a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
@@ -785,6 +785,9 @@ public class NotificationListener extends NotificationListenerService {
         // Clean up removed notifications from internal list
         notificationsActive.removeAll(notificationsToRemove);
 
+        // TODO prevent this from being called multiple times for the same ID
+        // TODO prevent thins from being called form notifications removed from the device
+
         // Send notification remove request to device
         List<GBDevice> devices = GBApplication.app().getDeviceManager().getDevices();
         for (GBDevice device : devices) {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
index 2729c87f0..adcf35fd6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
@@ -34,6 +34,7 @@ import java.util.Locale;
 
 import nodomain.freeyourgadget.gadgetbridge.BuildConfig;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventCallControl;
+import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventNotificationControl;
 import nodomain.freeyourgadget.gadgetbridge.model.CallSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.CannedMessagesSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.NotificationSpec;
@@ -73,8 +74,16 @@ public class XiaomiNotificationService extends AbstractXiaomiService implements
     @Override
     public void handleCommand(final XiaomiProto.Command cmd) {
         final GBDeviceEventCallControl deviceEvtCallControl = new GBDeviceEventCallControl();
+        final GBDeviceEventNotificationControl deviceEvtNotificationControl = new GBDeviceEventNotificationControl();
 
         switch (cmd.getSubtype()) {
+            case CMD_NOTIFICATION_DISMISS:
+                final int dismissNotificationId = cmd.getNotification().getNotification4().getNotificationId().getId();
+                LOG.info("Watch dismiss notification {}", dismissNotificationId);
+                deviceEvtNotificationControl.handle = dismissNotificationId;
+                deviceEvtNotificationControl.event = GBDeviceEventNotificationControl.Event.DISMISS;
+                getSupport().evaluateGBDeviceEvent(deviceEvtNotificationControl);
+                return;
             case CMD_CALL_REJECT:
                 LOG.debug("Reject call");
                 deviceEvtCallControl.event = GBDeviceEventCallControl.Event.REJECT;
@@ -304,6 +313,7 @@ public class XiaomiNotificationService extends AbstractXiaomiService implements
 
         final Drawable icon = NotificationUtils.getAppIcon(getSupport().getContext(), iconPackageName);
         if (icon == null) {
+            // FIXME the packageName is sometimes truncated
             LOG.warn("Failed to get icon for {}", iconPackageName);
             return;
         }

From 8192106fc076697d7caffa0ddf36cd0a2a1447b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sat, 28 Oct 2023 15:49:13 +0100
Subject: [PATCH 132/595] Mi Band 8: Fix notification icons mirroring

---
 .../devices/xiaomi/services/XiaomiNotificationService.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
index adcf35fd6..4bbc76e63 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
@@ -329,7 +329,8 @@ public class XiaomiNotificationService extends AbstractXiaomiService implements
         final ByteBuffer buf = ByteBuffer.allocate(size * size * 4).order(ByteOrder.LITTLE_ENDIAN);
         for (int x = 0; x < size; x++) {
             for (int y = 0; y < size; y++) {
-                buf.putInt(bmpResized.getPixel(x, y));
+                //noinspection SuspiciousNameCombination x and y are flipped on purpose
+                buf.putInt(bmpResized.getPixel(y, x));
             }
         }
 

From 516b3dbf1e62f4cb50fda79b8dfee9eaca7642a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sat, 28 Oct 2023 15:49:56 +0100
Subject: [PATCH 133/595] Mi Band 8: Fix notification icons for long package
 names

---
 .../services/XiaomiNotificationService.java   | 61 +++++++++++++++----
 1 file changed, 48 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
index 4bbc76e63..614dc5515 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
@@ -30,7 +30,9 @@ import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.LinkedList;
 import java.util.Locale;
+import java.util.Queue;
 
 import nodomain.freeyourgadget.gadgetbridge.BuildConfig;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventCallControl;
@@ -60,6 +62,10 @@ public class XiaomiNotificationService extends AbstractXiaomiService implements
     public static final int CMD_NOTIFICATION_ICON_REQUEST = 15;
     public static final int CMD_NOTIFICATION_ICON_QUERY = 16;
 
+    // Maintain a queue of the last seen package names, since the band will send
+    // requests with the package name truncated, and without an ID
+    private final Queue<String> mPackages = new LinkedList<>();
+
     private String iconPackageName;
 
     public XiaomiNotificationService(final XiaomiSupport support) {
@@ -101,19 +107,7 @@ public class XiaomiNotificationService extends AbstractXiaomiService implements
                 handleNotificationIconRequest(cmd.getNotification().getNotificationIconRequest());
                 return;
             case CMD_NOTIFICATION_ICON_QUERY:
-                this.iconPackageName = cmd.getNotification().getNotificationIconQuery().getPackage();
-                LOG.debug("Watch querying notification icon for {}", iconPackageName);
-
-                // TODO should we confirm that we have the icon before replying?
-                getSupport().sendCommand(
-                        "send notification reply for " + iconPackageName,
-                        XiaomiProto.Command.newBuilder()
-                                .setType(COMMAND_TYPE)
-                                .setSubtype(CMD_NOTIFICATION_ICON_REQUEST)
-                                .setNotification(XiaomiProto.Notification.newBuilder()
-                                        .setNotificationIconReply(cmd.getNotification().getNotificationIconQuery())
-                                ).build()
-                );
+                handleNotificationIconQuery(cmd.getNotification().getNotificationIconQuery());
                 return;
         }
 
@@ -134,6 +128,11 @@ public class XiaomiNotificationService extends AbstractXiaomiService implements
             notification3.setPackage(BuildConfig.APPLICATION_ID);
         }
 
+        mPackages.add(notification3.getPackage());
+        if (mPackages.size() > 32) {
+            mPackages.poll();
+        }
+
         final String senderOrTitle = StringUtils.getFirstOf(notificationSpec.sender, notificationSpec.title);
         if (!senderOrTitle.isEmpty()) {
             notification3.setTitle(senderOrTitle);
@@ -299,6 +298,42 @@ public class XiaomiNotificationService extends AbstractXiaomiService implements
         }
     }
 
+    private void handleNotificationIconQuery(final XiaomiProto.NotificationIconPackage notificationIconPackage) {
+        LOG.debug("Watch querying notification icon for {}", notificationIconPackage.getPackage());
+
+        iconPackageName = notificationIconPackage.getPackage();
+
+        if (NotificationUtils.getAppIcon(getSupport().getContext(), iconPackageName) == null) {
+            // Attempt to find truncated package name
+            for (final String fullPackage : mPackages) {
+                if (fullPackage.startsWith(iconPackageName)) {
+                    iconPackageName = fullPackage;
+                    break;
+                }
+            }
+
+            if (iconPackageName.equals(notificationIconPackage.getPackage())) {
+                LOG.warn("Failed to match a full package for {}", iconPackageName);
+                return;
+            }
+
+            if (NotificationUtils.getAppIcon(getSupport().getContext(), iconPackageName) == null) {
+                LOG.warn("Failed to find icon for {} and {}", notificationIconPackage.getPackage(), iconPackageName);
+                return;
+            }
+        }
+
+        getSupport().sendCommand(
+                "send notification reply for " + iconPackageName,
+                XiaomiProto.Command.newBuilder()
+                        .setType(COMMAND_TYPE)
+                        .setSubtype(CMD_NOTIFICATION_ICON_REQUEST)
+                        .setNotification(XiaomiProto.Notification.newBuilder()
+                                .setNotificationIconReply(notificationIconPackage)
+                        ).build()
+        );
+    }
+
     private void handleNotificationIconRequest(final XiaomiProto.NotificationIconRequest notificationIconRequest) {
         if (iconPackageName == null) {
             LOG.warn("No icon package name");

From dad97f9e960415cc537716642597365b92e3ac3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sat, 28 Oct 2023 21:43:54 +0100
Subject: [PATCH 134/595] Xiaomi: Update weather AQI and warning proto

---
 .../devices/xiaomi/services/XiaomiWeatherService.java      | 4 ++--
 app/src/main/proto/xiaomi.proto                            | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java
index 73c1b3625..b51d7e480 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java
@@ -71,7 +71,7 @@ public class XiaomiWeatherService extends AbstractXiaomiService {
         final XiaomiCoordinator coordinator = getSupport().getCoordinator();
 
         if (coordinator.supportsMultipleWeatherLocations()) {
-            // TODO actually support multiple locations
+            // TODO actually support multiple locations (primary + 4 secondary)
             getSupport().sendCommand(
                     "set current location",
                     XiaomiProto.Command.newBuilder()
@@ -124,7 +124,7 @@ public class XiaomiWeatherService extends AbstractXiaomiService {
                                                 .setAQI(weatherSpec.airQuality != null && weatherSpec.airQuality.aqi >= 0 ? weatherSpec.airQuality.aqi : 0)
                                         )
                                         .setWarning(XiaomiProto.WeatherCurrentWarning.newBuilder()
-                                                .setCurrentWarning1(XiaomiProto.WeatherCurrentWarning1.newBuilder()
+                                                .addCurrentWarning1(XiaomiProto.WeatherCurrentWarning1.newBuilder()
                                                         .setCurrentWarningText("")
                                                         .setCurrentWarningSeverityText("")
                                                 )
diff --git a/app/src/main/proto/xiaomi.proto b/app/src/main/proto/xiaomi.proto
index 138a6911b..5ddc8dd7d 100644
--- a/app/src/main/proto/xiaomi.proto
+++ b/app/src/main/proto/xiaomi.proto
@@ -677,16 +677,19 @@ message WeatherCurrentUnk6 {
 
 message WeatherCurrentAQI {
   optional string AQIText = 1;
-  optional uint32 AQI = 2;
+  optional sint32 AQI = 2;
 }
 
 message WeatherCurrentWarning {
-  optional WeatherCurrentWarning1 currentWarning1 = 1; // FIXME: this is probably an array
+  repeated WeatherCurrentWarning1 currentWarning1 = 1;
 }
 
 message WeatherCurrentWarning1 {
   optional string currentWarningText = 1;
   optional string currentWarningSeverityText = 2;
+  optional string currentWarningTitle = 3;
+  optional string currentWarningDescription = 4;
+  optional string unk5 = 5;
 }
 
 message WeatherCurrentLocation {

From fa20bf66c65187b8177040d57b1740e6390d1849 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sun, 5 Nov 2023 19:03:38 +0000
Subject: [PATCH 135/595] Mi Band 8: Fix send gps location during workout

---
 .../xiaomi/services/XiaomiHealthService.java  | 36 +++++++++++++------
 app/src/main/proto/xiaomi.proto               |  2 +-
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
index a27508130..5f8bd59d6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
@@ -425,7 +425,13 @@ public class XiaomiHealthService extends AbstractXiaomiService {
     }
 
     private void handleWorkoutOpen(final XiaomiProto.WorkoutOpenWatch workoutOpenWatch) {
-        LOG.debug("Workout open on watch: {}", workoutOpenWatch.getSport());
+        LOG.debug(
+                "Workout open on watch: {}, workoutStarted={}, gpsStarted={}, gpsFixAcquired={}",
+                workoutOpenWatch.getSport(),
+                workoutStarted,
+                gpsStarted,
+                gpsFixAcquired
+        );
 
         workoutStarted = false;
 
@@ -455,7 +461,12 @@ public class XiaomiHealthService extends AbstractXiaomiService {
 
         gpsTimeoutHandler.removeCallbacksAndMessages(null);
         // Timeout if the watch stops sending workout open
-        gpsTimeoutHandler.postDelayed(() -> GBLocationManager.stop(getSupport().getContext(), getSupport()), 5000);
+        gpsTimeoutHandler.postDelayed(() -> {
+            LOG.debug("Timed out waiting for workout");
+            gpsStarted = false;
+            gpsFixAcquired = false;
+            GBLocationManager.stop(getSupport().getContext(), getSupport());
+        }, 5000);
     }
 
     private void handleWorkoutStatus(final XiaomiProto.WorkoutStatusWatch workoutStatus) {
@@ -475,6 +486,8 @@ public class XiaomiHealthService extends AbstractXiaomiService {
             case WORKOUT_PAUSED:
                 break;
             case WORKOUT_FINISHED:
+                gpsStarted = false;
+                gpsFixAcquired = false;
                 GBLocationManager.stop(getSupport().getContext(), getSupport());
                 if (startOnPhone) {
                     OpenTracksController.stopRecording(getSupport().getContext());
@@ -495,26 +508,29 @@ public class XiaomiHealthService extends AbstractXiaomiService {
                                     XiaomiProto.WorkoutOpenReply.newBuilder()
                                             .setUnknown1(0)
                                             .setUnknown2(2)
-                                            .setUnknown3(10)
+                                            .setUnknown3(2)
                             ))
                             .build()
             );
         }
-        
+
         if (workoutStarted) {
             final XiaomiProto.WorkoutLocation.Builder workoutLocation = XiaomiProto.WorkoutLocation.newBuilder()
-                    .setNumSatellites(10)
+                    .setUnknown1(2)
                     .setTimestamp((int) (location.getTime() / 1000L))
                     .setLongitude(location.getLongitude())
                     .setLatitude(location.getLatitude())
                     .setAltitude(location.getAltitude())
                     .setSpeed(location.getSpeed())
-                    .setBearing(location.getBearing())
-                    .setHorizontalAccuracy(location.getAccuracy());
+                    .setBearing(location.getBearing());
 
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                workoutLocation.setVerticalAccuracy(location.getVerticalAccuracyMeters());
-            }
+            // FIXME: Check the value for these during actual workouts, but it seems to work without them
+            //if (location.hasAccuracy() && location.getAccuracy() != 100) {
+            //    workoutLocation.setHorizontalAccuracy(location.getAccuracy());
+            //}
+            //if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && location.hasVerticalAccuracy() && location.getVerticalAccuracyMeters() != 100) {
+            //    workoutLocation.setVerticalAccuracy(location.getVerticalAccuracyMeters());
+            //}
 
             getSupport().sendCommand(
                     "send gps location",
diff --git a/app/src/main/proto/xiaomi.proto b/app/src/main/proto/xiaomi.proto
index 5ddc8dd7d..51a6934d0 100644
--- a/app/src/main/proto/xiaomi.proto
+++ b/app/src/main/proto/xiaomi.proto
@@ -485,7 +485,7 @@ message WorkoutOpenReply {
 }
 
 message WorkoutLocation {
-  optional uint32 numSatellites = 1; // 10, sometimes 2?
+  optional uint32 unknown1 = 1; // 10, sometimes 2?
   optional uint32 timestamp = 2; // seconds
   optional double longitude = 3;
   optional double latitude = 4;

From 0dcb3164611155cf3c016946d10585e94f172583 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sun, 5 Nov 2023 21:22:41 +0000
Subject: [PATCH 136/595] Mi Band 8: Basic workout summary parser (wip)

---
 .../xiaomi/XiaomiActivitySummaryParser.java   |  28 ---
 .../devices/xiaomi/XiaomiCoordinator.java     |   3 +-
 .../xiaomi/activity/XiaomiActivityFileId.java |   2 +
 .../xiaomi/activity/XiaomiActivityParser.java |   6 +
 .../activity/impl/WorkoutSummaryParser.java   | 169 ++++++++++++++++++
 5 files changed, 179 insertions(+), 29 deletions(-)
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiActivitySummaryParser.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiActivitySummaryParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiActivitySummaryParser.java
deleted file mode 100644
index dbb782df1..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiActivitySummaryParser.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*  Copyright (C) 2023 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi;
-
-import nodomain.freeyourgadget.gadgetbridge.entities.BaseActivitySummary;
-import nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryParser;
-
-public class XiaomiActivitySummaryParser implements ActivitySummaryParser  {
-    @Override
-    public BaseActivitySummary parseBinaryData(final BaseActivitySummary summary) {
-        // TODO parse it
-        return summary;
-    }
-}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
index c83914ef6..0060f251d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
@@ -52,6 +52,7 @@ import nodomain.freeyourgadget.gadgetbridge.model.SleepRespiratoryRateSample;
 import nodomain.freeyourgadget.gadgetbridge.model.Spo2Sample;
 import nodomain.freeyourgadget.gadgetbridge.model.StressSample;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.HuamiLanguageType;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl.WorkoutSummaryParser;
 import nodomain.freeyourgadget.gadgetbridge.util.FileUtils;
 
 public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
@@ -111,7 +112,7 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
     @Nullable
     @Override
     public ActivitySummaryParser getActivitySummaryParser(final GBDevice device) {
-        return new XiaomiActivitySummaryParser();
+        return new WorkoutSummaryParser();
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java
index dfcbd8ed2..3db718cbd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java
@@ -154,6 +154,7 @@ public class XiaomiActivityFileId {
         SPORTS_OUTDOOR_RUNNING(Type.SPORTS, 1),
         SPORTS_FREESTYLE(Type.SPORTS, 8),
         SPORTS_ELLIPTICAL(Type.SPORTS, 11),
+        SPORTS_OUTDOOR_CYCLING(Type.SPORTS, 23),
         ;
 
         private final Type type;
@@ -182,6 +183,7 @@ public class XiaomiActivityFileId {
         UNKNOWN(-1),
         DETAILS(0),
         SUMMARY(1),
+        GPS_TRACK(2),
         ;
 
         private final int code;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityParser.java
index 5cbca661c..9de6aeb38 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityParser.java
@@ -24,6 +24,7 @@ import org.slf4j.LoggerFactory;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl.DailyDetailsParser;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl.SleepDetailsParser;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl.WorkoutSummaryParser;
 
 public abstract class XiaomiActivityParser {
     private static final Logger LOG = LoggerFactory.getLogger(XiaomiActivityParser.class);
@@ -67,6 +68,11 @@ public abstract class XiaomiActivityParser {
     private static XiaomiActivityParser createForSports(final XiaomiActivityFileId fileId) {
         assert fileId.getType() == XiaomiActivityFileId.Type.SPORTS;
 
+        switch (fileId.getDetailType()) {
+            case SUMMARY:
+                return new WorkoutSummaryParser();
+        }
+
         return null;
     }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java
new file mode 100644
index 000000000..e59869215
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java
@@ -0,0 +1,169 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl;
+
+import android.widget.Toast;
+
+import org.apache.commons.lang3.ArrayUtils;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.Date;
+
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.database.DBHandler;
+import nodomain.freeyourgadget.gadgetbridge.database.DBHelper;
+import nodomain.freeyourgadget.gadgetbridge.entities.BaseActivitySummary;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.entities.Device;
+import nodomain.freeyourgadget.gadgetbridge.entities.User;
+import nodomain.freeyourgadget.gadgetbridge.model.ActivityKind;
+import nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryParser;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.XiaomiActivityFileId;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.XiaomiActivityParser;
+import nodomain.freeyourgadget.gadgetbridge.util.GB;
+
+public class WorkoutSummaryParser extends XiaomiActivityParser implements ActivitySummaryParser {
+    private static final Logger LOG = LoggerFactory.getLogger(WorkoutSummaryParser.class);
+
+    @Override
+    public boolean parse(final XiaomiSupport support, final XiaomiActivityFileId fileId, final byte[] bytes) {
+        BaseActivitySummary summary = new BaseActivitySummary();
+
+        summary.setStartTime(fileId.getTimestamp()); // due to a bug this has to be set
+        summary.setRawSummaryData(ArrayUtils.addAll(fileId.toBytes(), bytes));
+
+        try {
+            summary = parseBinaryData(summary);
+        } catch (final Exception e) {
+            LOG.error("Failed to parse workout summary", e);
+            GB.toast(support.getContext(), "Failed to parse workout summary", Toast.LENGTH_LONG, GB.ERROR, e);
+            return false;
+        }
+
+        summary.setSummaryData(null); // remove json before saving to database
+
+        try (DBHandler dbHandler = GBApplication.acquireDB()) {
+            final DaoSession session = dbHandler.getDaoSession();
+            final Device device = DBHelper.getDevice(support.getDevice(), session);
+            final User user = DBHelper.getUser(session);
+            summary.setDevice(device);
+            summary.setUser(user);
+            session.getBaseActivitySummaryDao().insertOrReplace(summary);
+        } catch (final Exception e) {
+            GB.toast(support.getContext(), "Error saving activity summary", Toast.LENGTH_LONG, GB.ERROR, e);
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public BaseActivitySummary parseBinaryData(final BaseActivitySummary summary) {
+        final JSONObject summaryData = new JSONObject();
+
+        final ByteBuffer buf = ByteBuffer.wrap(summary.getRawSummaryData()).order(ByteOrder.LITTLE_ENDIAN);
+
+        final XiaomiActivityFileId fileId = XiaomiActivityFileId.from(buf);
+
+        final int version = fileId.getVersion();
+        final int headerSize;
+        switch (version) {
+            case 4:
+                headerSize = 6;
+                break;
+            default:
+                LOG.warn("Unable to parse workout summary version {}", fileId.getVersion());
+                return null;
+        }
+
+        final byte[] header = new byte[headerSize];
+        buf.get(header);
+
+        final short workoutType = buf.getShort();
+
+        switch (workoutType) {
+            case 6:
+                summary.setActivityKind(ActivityKind.TYPE_CYCLING);
+                break;
+            default:
+                summary.setActivityKind(ActivityKind.TYPE_UNKNOWN);
+        }
+
+        final int startTime = buf.getInt();
+        final int endTime = buf.getInt();
+
+        summary.setStartTime(new Date(startTime * 1000L));
+        summary.setEndTime(new Date(endTime * 1000L));
+
+        final int duration = buf.getInt();
+        addSummaryData(summaryData, "activeSeconds", duration, "seconds");
+
+        final int unknown1 = buf.getInt();
+        final int distance = buf.getInt();
+        addSummaryData(summaryData, "distanceMeters", distance, "meters");
+
+        final int unknown2 = buf.getShort();
+
+        final int calories = buf.getShort();
+        addSummaryData(summaryData, "caloriesBurnt", calories, "calories_unit");
+
+        final int unknown3 = buf.getInt();
+        final int unknown4 = buf.getInt();
+        final float maxSpeed = buf.getFloat();
+
+        final float avgHr = buf.get() & 0xff;
+        final float maxHr = buf.get() & 0xff;
+        final float minHr = buf.get() & 0xff;
+        addSummaryData(summaryData, "averageHR", avgHr, "bpm");
+        addSummaryData(summaryData, "maxHR", maxHr, "bpm");
+        addSummaryData(summaryData, "minHR", minHr, "bpm");
+
+        summary.setSummaryData(summaryData.toString());
+
+        return summary;
+    }
+
+    protected void addSummaryData(final JSONObject summaryData, final String key, final float value, final String unit) {
+        if (value > 0) {
+            try {
+                final JSONObject innerData = new JSONObject();
+                innerData.put("value", value);
+                innerData.put("unit", unit);
+                summaryData.put(key, innerData);
+            } catch (final JSONException ignore) {
+            }
+        }
+    }
+
+    protected void addSummaryData(final JSONObject summaryData, final String key, final String value) {
+        if (key != null && !key.equals("") && value != null && !value.equals("")) {
+            try {
+                final JSONObject innerData = new JSONObject();
+                innerData.put("value", value);
+                innerData.put("unit", "string");
+                summaryData.put(key, innerData);
+            } catch (final JSONException ignore) {
+            }
+        }
+    }
+}

From 84cf8efb59cbc6580f789bb1d78aecbde9198f07 Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Sat, 25 Nov 2023 20:33:02 +0100
Subject: [PATCH 137/595] Redmi Watch 3 Lite: Initial support

This is just using mi band 8 code, some feature work
---
 .../RedmiWatch3ActiveCoordinator.java         | 63 +++++++++++++++++++
 .../gadgetbridge/model/DeviceType.java        |  2 +
 app/src/main/res/values/strings.xml           |  1 +
 3 files changed, 66 insertions(+)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch3active/RedmiWatch3ActiveCoordinator.java

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch3active/RedmiWatch3ActiveCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch3active/RedmiWatch3ActiveCoordinator.java
new file mode 100644
index 000000000..7a60136a4
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch3active/RedmiWatch3ActiveCoordinator.java
@@ -0,0 +1,63 @@
+/*  Copyright (C) 2023 Andreas Shimokawa
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.redmiwatch3active;
+
+import android.content.Context;
+import android.net.Uri;
+
+import androidx.annotation.Nullable;
+
+import java.util.regex.Pattern;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiEncryptedCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiInstallHandler;
+
+public class RedmiWatch3ActiveCoordinator extends XiaomiEncryptedCoordinator {
+    @Override
+    protected Pattern getSupportedDeviceName() {
+        return Pattern.compile("^Redmi Watch 3 Active [A-Z0-9]{4}$");
+    }
+
+    @Nullable
+    @Override
+    public InstallHandler findInstallHandler(final Uri uri, final Context context) {
+        final XiaomiInstallHandler handler = new XiaomiInstallHandler(uri, context);
+        return handler.isValid() ? handler : null;
+    }
+
+    @Override
+    public int getDeviceNameResource() {
+        return R.string.devicetype_redmiwatch3active;
+    }
+
+    @Override
+    public int getDefaultIconResource() {
+        return R.drawable.ic_device_amazfit_bip;
+    }
+
+    @Override
+    public int getDisabledIconResource() {
+        return R.drawable.ic_device_amazfit_bip_disabled;
+    }
+
+    @Override
+    public boolean supportsMultipleWeatherLocations() {
+        return true;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
index 53f026eaa..8fc4aacc1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
@@ -144,6 +144,7 @@ import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.miband8.MiBand8Coordi
 import nodomain.freeyourgadget.gadgetbridge.devices.xwatch.XWatchCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.zetime.ZeTimeCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.miwatch.MiWatchLiteCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.redmiwatch3active.RedmiWatch3ActiveCoordinator;
 
 /**
  * For every supported device, a device type constant must exist.
@@ -196,6 +197,7 @@ public enum DeviceType {
     MIBAND7(MiBand7Coordinator.class),
     MIBAND8(MiBand8Coordinator.class),
     MIWATCHLITE(MiWatchLiteCoordinator.class),
+    REDMIWATCH3ACTIVE(RedmiWatch3ActiveCoordinator.class),
     AMAZFITGTS3(AmazfitGTS3Coordinator.class),
     AMAZFITGTR3(AmazfitGTR3Coordinator.class),
     AMAZFITGTR4(AmazfitGTR4Coordinator.class),
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4e6c5ffbf..299ebda9b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1388,6 +1388,7 @@
     <string name="devicetype_binary_sensor">Binary sensor</string>
     <string name="devicetype_femometer_vinca2">Femometer Vinca II</string>
     <string name="devicetype_xiaomi_watch_lite">Xiaomi Watch Lite</string>
+    <string name="devicetype_redmiwatch3active">Redmi Watch 3 Active</string>
     <string name="choose_auto_export_location">Choose export location</string>
     <string name="notification_channel_name">General</string>
     <string name="notification_channel_high_priority_name">High-priority</string>

From 543c8b28d0e6565b5b3bd2a50ecb59829cc7abc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sat, 25 Nov 2023 21:15:31 +0000
Subject: [PATCH 138/595] Rename org.bouncycastle package

Fixes roboelectric in unit tests.
---
 app/build.gradle                              |  6 +++--
 .../devices/xiaomi/XiaomiAuthService.java     | 10 ++++-----
 .../{ => shaded}/crypto/BlockCipher.java      |  2 +-
 .../{ => shaded}/crypto/CipherParameters.java |  2 +-
 .../{ => shaded}/crypto/CryptoException.java  |  2 +-
 .../crypto/DataLengthException.java           |  2 +-
 .../crypto/DefaultMultiBlockCipher.java       |  2 +-
 .../crypto/InvalidCipherTextException.java    |  2 +-
 .../bouncycastle/{ => shaded}/crypto/Mac.java |  2 +-
 .../{ => shaded}/crypto/MultiBlockCipher.java |  2 +-
 .../crypto/OutputLengthException.java         |  2 +-
 .../crypto/RuntimeCryptoException.java        |  2 +-
 .../{ => shaded}/crypto/SkippingCipher.java   |  2 +-
 .../crypto/SkippingStreamCipher.java          |  2 +-
 .../crypto/StreamBlockCipher.java             |  2 +-
 .../{ => shaded}/crypto/StreamCipher.java     |  2 +-
 .../crypto/engines/AESEngine.java             | 18 +++++++--------
 .../crypto/macs/CBCBlockCipherMac.java        | 16 +++++++-------
 .../crypto/modes/AEADBlockCipher.java         |  4 ++--
 .../{ => shaded}/crypto/modes/AEADCipher.java | 13 ++++++-----
 .../crypto/modes/CBCBlockCipher.java          | 14 ++++++------
 .../crypto/modes/CBCModeCipher.java           |  6 ++---
 .../crypto/modes/CCMBlockCipher.java          | 22 +++++++++----------
 .../crypto/modes/CCMModeCipher.java           |  2 +-
 .../crypto/modes/CTRModeCipher.java           |  8 +++----
 .../crypto/modes/SICBlockCipher.java          | 18 +++++++--------
 .../crypto/paddings/BlockCipherPadding.java   |  4 ++--
 .../crypto/params/AEADParameters.java         |  6 ++---
 .../crypto/params/KeyParameter.java           |  6 ++---
 .../crypto/params/ParametersWithIV.java       |  4 ++--
 .../{ => shaded}/util/Arrays.java             |  2 +-
 .../{ => shaded}/util/Objects.java            |  2 +-
 .../bouncycastle/{ => shaded}/util/Pack.java  |  2 +-
 .../{ => shaded}/util/Strings.java            |  2 +-
 34 files changed, 98 insertions(+), 95 deletions(-)
 rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/BlockCipher.java (97%)
 rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/CipherParameters.java (68%)
 rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/CryptoException.java (95%)
 rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/DataLengthException.java (94%)
 rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/DefaultMultiBlockCipher.java (95%)
 rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/InvalidCipherTextException.java (95%)
 rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/Mac.java (98%)
 rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/MultiBlockCipher.java (96%)
 rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/OutputLengthException.java (78%)
 rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/RuntimeCryptoException.java (92%)
 rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/SkippingCipher.java (95%)
 rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/SkippingStreamCipher.java (79%)
 rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/StreamBlockCipher.java (97%)
 rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/StreamCipher.java (97%)
 rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/engines/AESEngine.java (98%)
 rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/macs/CBCBlockCipherMac.java (93%)
 rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/modes/AEADBlockCipher.java (76%)
 rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/modes/AEADCipher.java (93%)
 rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/modes/CBCBlockCipher.java (95%)
 rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/modes/CBCModeCipher.java (62%)
 rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/modes/CCMBlockCipher.java (95%)
 rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/modes/CCMModeCipher.java (58%)
 rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/modes/CTRModeCipher.java (56%)
 rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/modes/SICBlockCipher.java (95%)
 rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/paddings/BlockCipherPadding.java (92%)
 rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/params/AEADParameters.java (89%)
 rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/params/KeyParameter.java (86%)
 rename app/src/main/java/org/bouncycastle/{ => shaded}/crypto/params/ParametersWithIV.java (88%)
 rename app/src/main/java/org/bouncycastle/{ => shaded}/util/Arrays.java (99%)
 rename app/src/main/java/org/bouncycastle/{ => shaded}/util/Objects.java (87%)
 rename app/src/main/java/org/bouncycastle/{ => shaded}/util/Pack.java (96%)
 rename app/src/main/java/org/bouncycastle/{ => shaded}/util/Strings.java (96%)

diff --git a/app/build.gradle b/app/build.gradle
index e7cd7c641..6fb66a594 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -293,8 +293,10 @@ dependencies {
     implementation 'com.android.volley:volley:1.2.1'
 
     // Bouncy Castle is included directly in GB, to avoid pulling the entire dependency
-    //implementation 'org.bouncycastle:bcpkix-jdk15to18:1.76'
-    //implementation 'org.bouncycastle:bcprov-jdk15to18:1.76'
+    // it's included in the org.bouncycastle.shaded package, to prevent conflicts with
+    // roboelectric
+    //implementation 'org.bouncycastle:bcpkix-jdk18on:1.76'
+    //implementation 'org.bouncycastle:bcprov-jdk18on:1.76'
 
 // NON-FOSS dependencies
 //    implementation('androidx.core:core-google-shortcuts:1.0.1') {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java
index a814f9db8..707964857 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java
@@ -25,11 +25,11 @@ import com.google.protobuf.ByteString;
 
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.bouncycastle.crypto.CryptoException;
-import org.bouncycastle.crypto.engines.AESEngine;
-import org.bouncycastle.crypto.modes.CCMBlockCipher;
-import org.bouncycastle.crypto.params.AEADParameters;
-import org.bouncycastle.crypto.params.KeyParameter;
+import org.bouncycastle.shaded.crypto.CryptoException;
+import org.bouncycastle.shaded.crypto.engines.AESEngine;
+import org.bouncycastle.shaded.crypto.modes.CCMBlockCipher;
+import org.bouncycastle.shaded.crypto.params.AEADParameters;
+import org.bouncycastle.shaded.crypto.params.KeyParameter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/app/src/main/java/org/bouncycastle/crypto/BlockCipher.java b/app/src/main/java/org/bouncycastle/shaded/crypto/BlockCipher.java
similarity index 97%
rename from app/src/main/java/org/bouncycastle/crypto/BlockCipher.java
rename to app/src/main/java/org/bouncycastle/shaded/crypto/BlockCipher.java
index 370225f65..e8ba9ea4b 100644
--- a/app/src/main/java/org/bouncycastle/crypto/BlockCipher.java
+++ b/app/src/main/java/org/bouncycastle/shaded/crypto/BlockCipher.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.crypto;
+package org.bouncycastle.shaded.crypto;
 
 
 /**
diff --git a/app/src/main/java/org/bouncycastle/crypto/CipherParameters.java b/app/src/main/java/org/bouncycastle/shaded/crypto/CipherParameters.java
similarity index 68%
rename from app/src/main/java/org/bouncycastle/crypto/CipherParameters.java
rename to app/src/main/java/org/bouncycastle/shaded/crypto/CipherParameters.java
index 5be873047..d1a1ff674 100644
--- a/app/src/main/java/org/bouncycastle/crypto/CipherParameters.java
+++ b/app/src/main/java/org/bouncycastle/shaded/crypto/CipherParameters.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.crypto;
+package org.bouncycastle.shaded.crypto;
 
 /**
  * all parameter classes implement this.
diff --git a/app/src/main/java/org/bouncycastle/crypto/CryptoException.java b/app/src/main/java/org/bouncycastle/shaded/crypto/CryptoException.java
similarity index 95%
rename from app/src/main/java/org/bouncycastle/crypto/CryptoException.java
rename to app/src/main/java/org/bouncycastle/shaded/crypto/CryptoException.java
index 352c5569b..9d8c3ae99 100644
--- a/app/src/main/java/org/bouncycastle/crypto/CryptoException.java
+++ b/app/src/main/java/org/bouncycastle/shaded/crypto/CryptoException.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.crypto;
+package org.bouncycastle.shaded.crypto;
 
 /**
  * the foundation class for the hard exceptions thrown by the crypto packages.
diff --git a/app/src/main/java/org/bouncycastle/crypto/DataLengthException.java b/app/src/main/java/org/bouncycastle/shaded/crypto/DataLengthException.java
similarity index 94%
rename from app/src/main/java/org/bouncycastle/crypto/DataLengthException.java
rename to app/src/main/java/org/bouncycastle/shaded/crypto/DataLengthException.java
index fbf047cf5..69994df35 100644
--- a/app/src/main/java/org/bouncycastle/crypto/DataLengthException.java
+++ b/app/src/main/java/org/bouncycastle/shaded/crypto/DataLengthException.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.crypto;
+package org.bouncycastle.shaded.crypto;
 
 /**
  * this exception is thrown if a buffer that is meant to have output
diff --git a/app/src/main/java/org/bouncycastle/crypto/DefaultMultiBlockCipher.java b/app/src/main/java/org/bouncycastle/shaded/crypto/DefaultMultiBlockCipher.java
similarity index 95%
rename from app/src/main/java/org/bouncycastle/crypto/DefaultMultiBlockCipher.java
rename to app/src/main/java/org/bouncycastle/shaded/crypto/DefaultMultiBlockCipher.java
index 3bc565cf0..af3a1e04c 100644
--- a/app/src/main/java/org/bouncycastle/crypto/DefaultMultiBlockCipher.java
+++ b/app/src/main/java/org/bouncycastle/shaded/crypto/DefaultMultiBlockCipher.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.crypto;
+package org.bouncycastle.shaded.crypto;
 
 public abstract class DefaultMultiBlockCipher
     implements MultiBlockCipher
diff --git a/app/src/main/java/org/bouncycastle/crypto/InvalidCipherTextException.java b/app/src/main/java/org/bouncycastle/shaded/crypto/InvalidCipherTextException.java
similarity index 95%
rename from app/src/main/java/org/bouncycastle/crypto/InvalidCipherTextException.java
rename to app/src/main/java/org/bouncycastle/shaded/crypto/InvalidCipherTextException.java
index 21c150d96..536f60e29 100644
--- a/app/src/main/java/org/bouncycastle/crypto/InvalidCipherTextException.java
+++ b/app/src/main/java/org/bouncycastle/shaded/crypto/InvalidCipherTextException.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.crypto;
+package org.bouncycastle.shaded.crypto;
 
 /**
  * this exception is thrown whenever we find something we don't expect in a
diff --git a/app/src/main/java/org/bouncycastle/crypto/Mac.java b/app/src/main/java/org/bouncycastle/shaded/crypto/Mac.java
similarity index 98%
rename from app/src/main/java/org/bouncycastle/crypto/Mac.java
rename to app/src/main/java/org/bouncycastle/shaded/crypto/Mac.java
index c00cd58cc..7923ff1bd 100644
--- a/app/src/main/java/org/bouncycastle/crypto/Mac.java
+++ b/app/src/main/java/org/bouncycastle/shaded/crypto/Mac.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.crypto;
+package org.bouncycastle.shaded.crypto;
 
 
 /**
diff --git a/app/src/main/java/org/bouncycastle/crypto/MultiBlockCipher.java b/app/src/main/java/org/bouncycastle/shaded/crypto/MultiBlockCipher.java
similarity index 96%
rename from app/src/main/java/org/bouncycastle/crypto/MultiBlockCipher.java
rename to app/src/main/java/org/bouncycastle/shaded/crypto/MultiBlockCipher.java
index dad402036..ef6b5a0ef 100644
--- a/app/src/main/java/org/bouncycastle/crypto/MultiBlockCipher.java
+++ b/app/src/main/java/org/bouncycastle/shaded/crypto/MultiBlockCipher.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.crypto;
+package org.bouncycastle.shaded.crypto;
 
 /**
  * Base interface for a cipher engine capable of processing multiple blocks at a time.
diff --git a/app/src/main/java/org/bouncycastle/crypto/OutputLengthException.java b/app/src/main/java/org/bouncycastle/shaded/crypto/OutputLengthException.java
similarity index 78%
rename from app/src/main/java/org/bouncycastle/crypto/OutputLengthException.java
rename to app/src/main/java/org/bouncycastle/shaded/crypto/OutputLengthException.java
index 62811a2b5..0eccf66cd 100644
--- a/app/src/main/java/org/bouncycastle/crypto/OutputLengthException.java
+++ b/app/src/main/java/org/bouncycastle/shaded/crypto/OutputLengthException.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.crypto;
+package org.bouncycastle.shaded.crypto;
 
 public class OutputLengthException
     extends DataLengthException
diff --git a/app/src/main/java/org/bouncycastle/crypto/RuntimeCryptoException.java b/app/src/main/java/org/bouncycastle/shaded/crypto/RuntimeCryptoException.java
similarity index 92%
rename from app/src/main/java/org/bouncycastle/crypto/RuntimeCryptoException.java
rename to app/src/main/java/org/bouncycastle/shaded/crypto/RuntimeCryptoException.java
index c1572020b..8470e3461 100644
--- a/app/src/main/java/org/bouncycastle/crypto/RuntimeCryptoException.java
+++ b/app/src/main/java/org/bouncycastle/shaded/crypto/RuntimeCryptoException.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.crypto;
+package org.bouncycastle.shaded.crypto;
 
 /**
  * the foundation class for the exceptions thrown by the crypto packages.
diff --git a/app/src/main/java/org/bouncycastle/crypto/SkippingCipher.java b/app/src/main/java/org/bouncycastle/shaded/crypto/SkippingCipher.java
similarity index 95%
rename from app/src/main/java/org/bouncycastle/crypto/SkippingCipher.java
rename to app/src/main/java/org/bouncycastle/shaded/crypto/SkippingCipher.java
index f8cc648eb..a8b4ce53c 100644
--- a/app/src/main/java/org/bouncycastle/crypto/SkippingCipher.java
+++ b/app/src/main/java/org/bouncycastle/shaded/crypto/SkippingCipher.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.crypto;
+package org.bouncycastle.shaded.crypto;
 
 /**
  * Ciphers producing a key stream which can be reset to particular points in the stream implement this.
diff --git a/app/src/main/java/org/bouncycastle/crypto/SkippingStreamCipher.java b/app/src/main/java/org/bouncycastle/shaded/crypto/SkippingStreamCipher.java
similarity index 79%
rename from app/src/main/java/org/bouncycastle/crypto/SkippingStreamCipher.java
rename to app/src/main/java/org/bouncycastle/shaded/crypto/SkippingStreamCipher.java
index a707a8108..9fa88b970 100644
--- a/app/src/main/java/org/bouncycastle/crypto/SkippingStreamCipher.java
+++ b/app/src/main/java/org/bouncycastle/shaded/crypto/SkippingStreamCipher.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.crypto;
+package org.bouncycastle.shaded.crypto;
 
 /**
  * General interface for a stream cipher that supports skipping.
diff --git a/app/src/main/java/org/bouncycastle/crypto/StreamBlockCipher.java b/app/src/main/java/org/bouncycastle/shaded/crypto/StreamBlockCipher.java
similarity index 97%
rename from app/src/main/java/org/bouncycastle/crypto/StreamBlockCipher.java
rename to app/src/main/java/org/bouncycastle/shaded/crypto/StreamBlockCipher.java
index b1702fe7f..7871951a7 100644
--- a/app/src/main/java/org/bouncycastle/crypto/StreamBlockCipher.java
+++ b/app/src/main/java/org/bouncycastle/shaded/crypto/StreamBlockCipher.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.crypto;
+package org.bouncycastle.shaded.crypto;
 
 /**
  * A parent class for block cipher modes that do not require block aligned data to be processed, but can function in
diff --git a/app/src/main/java/org/bouncycastle/crypto/StreamCipher.java b/app/src/main/java/org/bouncycastle/shaded/crypto/StreamCipher.java
similarity index 97%
rename from app/src/main/java/org/bouncycastle/crypto/StreamCipher.java
rename to app/src/main/java/org/bouncycastle/shaded/crypto/StreamCipher.java
index c1255e941..06fdb6ea6 100644
--- a/app/src/main/java/org/bouncycastle/crypto/StreamCipher.java
+++ b/app/src/main/java/org/bouncycastle/shaded/crypto/StreamCipher.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.crypto;
+package org.bouncycastle.shaded.crypto;
 
 /**
  * the interface stream ciphers conform to.
diff --git a/app/src/main/java/org/bouncycastle/crypto/engines/AESEngine.java b/app/src/main/java/org/bouncycastle/shaded/crypto/engines/AESEngine.java
similarity index 98%
rename from app/src/main/java/org/bouncycastle/crypto/engines/AESEngine.java
rename to app/src/main/java/org/bouncycastle/shaded/crypto/engines/AESEngine.java
index 6b3690732..af24dd06f 100644
--- a/app/src/main/java/org/bouncycastle/crypto/engines/AESEngine.java
+++ b/app/src/main/java/org/bouncycastle/shaded/crypto/engines/AESEngine.java
@@ -1,13 +1,13 @@
-package org.bouncycastle.crypto.engines;
+package org.bouncycastle.shaded.crypto.engines;
 
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.DefaultMultiBlockCipher;
-import org.bouncycastle.crypto.MultiBlockCipher;
-import org.bouncycastle.crypto.OutputLengthException;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Pack;
+import org.bouncycastle.shaded.crypto.CipherParameters;
+import org.bouncycastle.shaded.crypto.DataLengthException;
+import org.bouncycastle.shaded.crypto.DefaultMultiBlockCipher;
+import org.bouncycastle.shaded.crypto.MultiBlockCipher;
+import org.bouncycastle.shaded.crypto.OutputLengthException;
+import org.bouncycastle.shaded.crypto.params.KeyParameter;
+import org.bouncycastle.shaded.util.Arrays;
+import org.bouncycastle.shaded.util.Pack;
 
 /**
  * an implementation of the AES (Rijndael), from FIPS-197.
diff --git a/app/src/main/java/org/bouncycastle/crypto/macs/CBCBlockCipherMac.java b/app/src/main/java/org/bouncycastle/shaded/crypto/macs/CBCBlockCipherMac.java
similarity index 93%
rename from app/src/main/java/org/bouncycastle/crypto/macs/CBCBlockCipherMac.java
rename to app/src/main/java/org/bouncycastle/shaded/crypto/macs/CBCBlockCipherMac.java
index 908780735..b86ec14be 100644
--- a/app/src/main/java/org/bouncycastle/crypto/macs/CBCBlockCipherMac.java
+++ b/app/src/main/java/org/bouncycastle/shaded/crypto/macs/CBCBlockCipherMac.java
@@ -1,10 +1,10 @@
-package org.bouncycastle.crypto.macs;
+package org.bouncycastle.shaded.crypto.macs;
 
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.crypto.paddings.BlockCipherPadding;
+import org.bouncycastle.shaded.crypto.BlockCipher;
+import org.bouncycastle.shaded.crypto.CipherParameters;
+import org.bouncycastle.shaded.crypto.Mac;
+import org.bouncycastle.shaded.crypto.modes.CBCBlockCipher;
+import org.bouncycastle.shaded.crypto.paddings.BlockCipherPadding;
 
 /**
  * standard CBC Block Cipher MAC - if no padding is specified the default of
@@ -43,7 +43,7 @@ public class CBCBlockCipherMac
      */
     public CBCBlockCipherMac(
         BlockCipher         cipher,
-        BlockCipherPadding  padding)
+        org.bouncycastle.shaded.crypto.paddings.BlockCipherPadding padding)
     {
         this(cipher, (cipher.getBlockSize() * 8) / 2, padding);
     }
@@ -85,7 +85,7 @@ public class CBCBlockCipherMac
     public CBCBlockCipherMac(
         BlockCipher         cipher,
         int                 macSizeInBits,
-        BlockCipherPadding  padding)
+        BlockCipherPadding padding)
     {
         if ((macSizeInBits % 8) != 0)
         {
diff --git a/app/src/main/java/org/bouncycastle/crypto/modes/AEADBlockCipher.java b/app/src/main/java/org/bouncycastle/shaded/crypto/modes/AEADBlockCipher.java
similarity index 76%
rename from app/src/main/java/org/bouncycastle/crypto/modes/AEADBlockCipher.java
rename to app/src/main/java/org/bouncycastle/shaded/crypto/modes/AEADBlockCipher.java
index b8c7ad512..27241d66b 100644
--- a/app/src/main/java/org/bouncycastle/crypto/modes/AEADBlockCipher.java
+++ b/app/src/main/java/org/bouncycastle/shaded/crypto/modes/AEADBlockCipher.java
@@ -1,6 +1,6 @@
-package org.bouncycastle.crypto.modes;
+package org.bouncycastle.shaded.crypto.modes;
 
-import org.bouncycastle.crypto.BlockCipher;
+import org.bouncycastle.shaded.crypto.BlockCipher;
 
 /**
  * An {@link AEADCipher} based on a {@link BlockCipher}.
diff --git a/app/src/main/java/org/bouncycastle/crypto/modes/AEADCipher.java b/app/src/main/java/org/bouncycastle/shaded/crypto/modes/AEADCipher.java
similarity index 93%
rename from app/src/main/java/org/bouncycastle/crypto/modes/AEADCipher.java
rename to app/src/main/java/org/bouncycastle/shaded/crypto/modes/AEADCipher.java
index 4e49a5a98..2b40f1079 100644
--- a/app/src/main/java/org/bouncycastle/crypto/modes/AEADCipher.java
+++ b/app/src/main/java/org/bouncycastle/shaded/crypto/modes/AEADCipher.java
@@ -1,8 +1,9 @@
-package org.bouncycastle.crypto.modes;
+package org.bouncycastle.shaded.crypto.modes;
 
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.InvalidCipherTextException;
+import org.bouncycastle.shaded.crypto.CipherParameters;
+import org.bouncycastle.shaded.crypto.DataLengthException;
+import org.bouncycastle.shaded.crypto.InvalidCipherTextException;
+import org.bouncycastle.shaded.crypto.params.AEADParameters;
 
 /**
  * A cipher mode that includes authenticated encryption with a streaming mode and optional associated data.
@@ -16,7 +17,7 @@ import org.bouncycastle.crypto.InvalidCipherTextException;
  * may be output prior to the call to {@link #doFinal(byte[], int)} that results in an authentication
  * failure. The higher level protocol utilising this cipher must ensure the plaintext data is handled 
  * appropriately until the end of data is reached and the entire ciphertext is authenticated.
- * @see org.bouncycastle.crypto.params.AEADParameters
+ * @see AEADParameters
  */
 public interface AEADCipher
 {
@@ -88,7 +89,7 @@ public interface AEADCipher
      * @param outOff offset into out to start copying the data at.
      * @return number of bytes written into out.
      * @throws IllegalStateException if the cipher is in an inappropriate state.
-     * @throws org.bouncycastle.crypto.InvalidCipherTextException if the MAC fails to match.
+     * @throws InvalidCipherTextException if the MAC fails to match.
      */
     public int doFinal(byte[] out, int outOff)
         throws IllegalStateException, InvalidCipherTextException;
diff --git a/app/src/main/java/org/bouncycastle/crypto/modes/CBCBlockCipher.java b/app/src/main/java/org/bouncycastle/shaded/crypto/modes/CBCBlockCipher.java
similarity index 95%
rename from app/src/main/java/org/bouncycastle/crypto/modes/CBCBlockCipher.java
rename to app/src/main/java/org/bouncycastle/shaded/crypto/modes/CBCBlockCipher.java
index 42cf511bc..67dee8236 100644
--- a/app/src/main/java/org/bouncycastle/crypto/modes/CBCBlockCipher.java
+++ b/app/src/main/java/org/bouncycastle/shaded/crypto/modes/CBCBlockCipher.java
@@ -1,11 +1,11 @@
-package org.bouncycastle.crypto.modes;
+package org.bouncycastle.shaded.crypto.modes;
 
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.DefaultMultiBlockCipher;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.Arrays;
+import org.bouncycastle.shaded.crypto.BlockCipher;
+import org.bouncycastle.shaded.crypto.CipherParameters;
+import org.bouncycastle.shaded.crypto.DataLengthException;
+import org.bouncycastle.shaded.crypto.DefaultMultiBlockCipher;
+import org.bouncycastle.shaded.crypto.params.ParametersWithIV;
+import org.bouncycastle.shaded.util.Arrays;
 
 /**
  * implements Cipher-Block-Chaining (CBC) mode on top of a simple cipher.
diff --git a/app/src/main/java/org/bouncycastle/crypto/modes/CBCModeCipher.java b/app/src/main/java/org/bouncycastle/shaded/crypto/modes/CBCModeCipher.java
similarity index 62%
rename from app/src/main/java/org/bouncycastle/crypto/modes/CBCModeCipher.java
rename to app/src/main/java/org/bouncycastle/shaded/crypto/modes/CBCModeCipher.java
index 682b5807c..09187d243 100644
--- a/app/src/main/java/org/bouncycastle/crypto/modes/CBCModeCipher.java
+++ b/app/src/main/java/org/bouncycastle/shaded/crypto/modes/CBCModeCipher.java
@@ -1,7 +1,7 @@
-package org.bouncycastle.crypto.modes;
+package org.bouncycastle.shaded.crypto.modes;
 
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.MultiBlockCipher;
+import org.bouncycastle.shaded.crypto.BlockCipher;
+import org.bouncycastle.shaded.crypto.MultiBlockCipher;
 
 public interface CBCModeCipher
     extends MultiBlockCipher
diff --git a/app/src/main/java/org/bouncycastle/crypto/modes/CCMBlockCipher.java b/app/src/main/java/org/bouncycastle/shaded/crypto/modes/CCMBlockCipher.java
similarity index 95%
rename from app/src/main/java/org/bouncycastle/crypto/modes/CCMBlockCipher.java
rename to app/src/main/java/org/bouncycastle/shaded/crypto/modes/CCMBlockCipher.java
index 1ac255bb8..7370c02ce 100644
--- a/app/src/main/java/org/bouncycastle/crypto/modes/CCMBlockCipher.java
+++ b/app/src/main/java/org/bouncycastle/shaded/crypto/modes/CCMBlockCipher.java
@@ -1,17 +1,17 @@
-package org.bouncycastle.crypto.modes;
+package org.bouncycastle.shaded.crypto.modes;
 
 import java.io.ByteArrayOutputStream;
 
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.OutputLengthException;
-import org.bouncycastle.crypto.macs.CBCBlockCipherMac;
-import org.bouncycastle.crypto.params.AEADParameters;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.Arrays;
+import org.bouncycastle.shaded.crypto.BlockCipher;
+import org.bouncycastle.shaded.crypto.CipherParameters;
+import org.bouncycastle.shaded.crypto.DataLengthException;
+import org.bouncycastle.shaded.crypto.InvalidCipherTextException;
+import org.bouncycastle.shaded.crypto.Mac;
+import org.bouncycastle.shaded.crypto.OutputLengthException;
+import org.bouncycastle.shaded.crypto.macs.CBCBlockCipherMac;
+import org.bouncycastle.shaded.crypto.params.AEADParameters;
+import org.bouncycastle.shaded.crypto.params.ParametersWithIV;
+import org.bouncycastle.shaded.util.Arrays;
 
 /**
  * Implements the Counter with Cipher Block Chaining mode (CCM) detailed in
diff --git a/app/src/main/java/org/bouncycastle/crypto/modes/CCMModeCipher.java b/app/src/main/java/org/bouncycastle/shaded/crypto/modes/CCMModeCipher.java
similarity index 58%
rename from app/src/main/java/org/bouncycastle/crypto/modes/CCMModeCipher.java
rename to app/src/main/java/org/bouncycastle/shaded/crypto/modes/CCMModeCipher.java
index d96ac05ae..869e5246d 100644
--- a/app/src/main/java/org/bouncycastle/crypto/modes/CCMModeCipher.java
+++ b/app/src/main/java/org/bouncycastle/shaded/crypto/modes/CCMModeCipher.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.crypto.modes;
+package org.bouncycastle.shaded.crypto.modes;
 
 public interface CCMModeCipher
     extends AEADBlockCipher
diff --git a/app/src/main/java/org/bouncycastle/crypto/modes/CTRModeCipher.java b/app/src/main/java/org/bouncycastle/shaded/crypto/modes/CTRModeCipher.java
similarity index 56%
rename from app/src/main/java/org/bouncycastle/crypto/modes/CTRModeCipher.java
rename to app/src/main/java/org/bouncycastle/shaded/crypto/modes/CTRModeCipher.java
index 13fd97e74..babecfa44 100644
--- a/app/src/main/java/org/bouncycastle/crypto/modes/CTRModeCipher.java
+++ b/app/src/main/java/org/bouncycastle/shaded/crypto/modes/CTRModeCipher.java
@@ -1,8 +1,8 @@
-package org.bouncycastle.crypto.modes;
+package org.bouncycastle.shaded.crypto.modes;
 
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.MultiBlockCipher;
-import org.bouncycastle.crypto.SkippingStreamCipher;
+import org.bouncycastle.shaded.crypto.BlockCipher;
+import org.bouncycastle.shaded.crypto.MultiBlockCipher;
+import org.bouncycastle.shaded.crypto.SkippingStreamCipher;
 
 public interface CTRModeCipher
     extends MultiBlockCipher, SkippingStreamCipher
diff --git a/app/src/main/java/org/bouncycastle/crypto/modes/SICBlockCipher.java b/app/src/main/java/org/bouncycastle/shaded/crypto/modes/SICBlockCipher.java
similarity index 95%
rename from app/src/main/java/org/bouncycastle/crypto/modes/SICBlockCipher.java
rename to app/src/main/java/org/bouncycastle/shaded/crypto/modes/SICBlockCipher.java
index 8b2013635..fee0e55a2 100644
--- a/app/src/main/java/org/bouncycastle/crypto/modes/SICBlockCipher.java
+++ b/app/src/main/java/org/bouncycastle/shaded/crypto/modes/SICBlockCipher.java
@@ -1,13 +1,13 @@
-package org.bouncycastle.crypto.modes;
+package org.bouncycastle.shaded.crypto.modes;
 
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.OutputLengthException;
-import org.bouncycastle.crypto.StreamBlockCipher;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Pack;
+import org.bouncycastle.shaded.crypto.BlockCipher;
+import org.bouncycastle.shaded.crypto.CipherParameters;
+import org.bouncycastle.shaded.crypto.DataLengthException;
+import org.bouncycastle.shaded.crypto.OutputLengthException;
+import org.bouncycastle.shaded.crypto.StreamBlockCipher;
+import org.bouncycastle.shaded.crypto.params.ParametersWithIV;
+import org.bouncycastle.shaded.util.Arrays;
+import org.bouncycastle.shaded.util.Pack;
 
 /**
  * Implements the Segmented Integer Counter (SIC) mode on top of a simple
diff --git a/app/src/main/java/org/bouncycastle/crypto/paddings/BlockCipherPadding.java b/app/src/main/java/org/bouncycastle/shaded/crypto/paddings/BlockCipherPadding.java
similarity index 92%
rename from app/src/main/java/org/bouncycastle/crypto/paddings/BlockCipherPadding.java
rename to app/src/main/java/org/bouncycastle/shaded/crypto/paddings/BlockCipherPadding.java
index 7c4f0aee3..402bf17a8 100644
--- a/app/src/main/java/org/bouncycastle/crypto/paddings/BlockCipherPadding.java
+++ b/app/src/main/java/org/bouncycastle/shaded/crypto/paddings/BlockCipherPadding.java
@@ -1,8 +1,8 @@
-package org.bouncycastle.crypto.paddings;
+package org.bouncycastle.shaded.crypto.paddings;
 
 import java.security.SecureRandom;
 
-import org.bouncycastle.crypto.InvalidCipherTextException;
+import org.bouncycastle.shaded.crypto.InvalidCipherTextException;
 
 /**
  * Block cipher padders are expected to conform to this interface
diff --git a/app/src/main/java/org/bouncycastle/crypto/params/AEADParameters.java b/app/src/main/java/org/bouncycastle/shaded/crypto/params/AEADParameters.java
similarity index 89%
rename from app/src/main/java/org/bouncycastle/crypto/params/AEADParameters.java
rename to app/src/main/java/org/bouncycastle/shaded/crypto/params/AEADParameters.java
index c06481591..c39ffd2bb 100644
--- a/app/src/main/java/org/bouncycastle/crypto/params/AEADParameters.java
+++ b/app/src/main/java/org/bouncycastle/shaded/crypto/params/AEADParameters.java
@@ -1,7 +1,7 @@
-package org.bouncycastle.crypto.params;
+package org.bouncycastle.shaded.crypto.params;
 
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.util.Arrays;
+import org.bouncycastle.shaded.crypto.CipherParameters;
+import org.bouncycastle.shaded.util.Arrays;
 
 public class AEADParameters
     implements CipherParameters
diff --git a/app/src/main/java/org/bouncycastle/crypto/params/KeyParameter.java b/app/src/main/java/org/bouncycastle/shaded/crypto/params/KeyParameter.java
similarity index 86%
rename from app/src/main/java/org/bouncycastle/crypto/params/KeyParameter.java
rename to app/src/main/java/org/bouncycastle/shaded/crypto/params/KeyParameter.java
index e16399595..06224f526 100644
--- a/app/src/main/java/org/bouncycastle/crypto/params/KeyParameter.java
+++ b/app/src/main/java/org/bouncycastle/shaded/crypto/params/KeyParameter.java
@@ -1,7 +1,7 @@
-package org.bouncycastle.crypto.params;
+package org.bouncycastle.shaded.crypto.params;
 
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.util.Arrays;
+import org.bouncycastle.shaded.crypto.CipherParameters;
+import org.bouncycastle.shaded.util.Arrays;
 
 public class KeyParameter
     implements CipherParameters
diff --git a/app/src/main/java/org/bouncycastle/crypto/params/ParametersWithIV.java b/app/src/main/java/org/bouncycastle/shaded/crypto/params/ParametersWithIV.java
similarity index 88%
rename from app/src/main/java/org/bouncycastle/crypto/params/ParametersWithIV.java
rename to app/src/main/java/org/bouncycastle/shaded/crypto/params/ParametersWithIV.java
index 4a1e6e9a3..114324c5d 100644
--- a/app/src/main/java/org/bouncycastle/crypto/params/ParametersWithIV.java
+++ b/app/src/main/java/org/bouncycastle/shaded/crypto/params/ParametersWithIV.java
@@ -1,6 +1,6 @@
-package org.bouncycastle.crypto.params;
+package org.bouncycastle.shaded.crypto.params;
 
-import org.bouncycastle.crypto.CipherParameters;
+import org.bouncycastle.shaded.crypto.CipherParameters;
 
 public class ParametersWithIV
     implements CipherParameters
diff --git a/app/src/main/java/org/bouncycastle/util/Arrays.java b/app/src/main/java/org/bouncycastle/shaded/util/Arrays.java
similarity index 99%
rename from app/src/main/java/org/bouncycastle/util/Arrays.java
rename to app/src/main/java/org/bouncycastle/shaded/util/Arrays.java
index 230520eaf..b44ec3723 100644
--- a/app/src/main/java/org/bouncycastle/util/Arrays.java
+++ b/app/src/main/java/org/bouncycastle/shaded/util/Arrays.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.util;
+package org.bouncycastle.shaded.util;
 
 import java.math.BigInteger;
 import java.util.NoSuchElementException;
diff --git a/app/src/main/java/org/bouncycastle/util/Objects.java b/app/src/main/java/org/bouncycastle/shaded/util/Objects.java
similarity index 87%
rename from app/src/main/java/org/bouncycastle/util/Objects.java
rename to app/src/main/java/org/bouncycastle/shaded/util/Objects.java
index 9ea2ff36c..65a09e7d5 100644
--- a/app/src/main/java/org/bouncycastle/util/Objects.java
+++ b/app/src/main/java/org/bouncycastle/shaded/util/Objects.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.util;
+package org.bouncycastle.shaded.util;
 
 public class Objects
 {
diff --git a/app/src/main/java/org/bouncycastle/util/Pack.java b/app/src/main/java/org/bouncycastle/shaded/util/Pack.java
similarity index 96%
rename from app/src/main/java/org/bouncycastle/util/Pack.java
rename to app/src/main/java/org/bouncycastle/shaded/util/Pack.java
index 525f1e940..328aca8ed 100644
--- a/app/src/main/java/org/bouncycastle/util/Pack.java
+++ b/app/src/main/java/org/bouncycastle/shaded/util/Pack.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.util;
+package org.bouncycastle.shaded.util;
 
 /**
  * Utility methods for converting byte arrays into ints and longs, and back again.
diff --git a/app/src/main/java/org/bouncycastle/util/Strings.java b/app/src/main/java/org/bouncycastle/shaded/util/Strings.java
similarity index 96%
rename from app/src/main/java/org/bouncycastle/util/Strings.java
rename to app/src/main/java/org/bouncycastle/shaded/util/Strings.java
index 7f2d81b66..27a001fe2 100644
--- a/app/src/main/java/org/bouncycastle/util/Strings.java
+++ b/app/src/main/java/org/bouncycastle/shaded/util/Strings.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.util;
+package org.bouncycastle.shaded.util;
 
 import java.security.AccessController;
 import java.security.PrivilegedAction;

From 7416159ba2e33d0fdea86beed8422b0a6cbd6d96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sat, 25 Nov 2023 22:16:26 +0000
Subject: [PATCH 139/595] Xiaomi: Mark new devices as experimental

---
 README.md                                                   | 3 +++
 .../devices/xiaomi/miband8/MiBand8Coordinator.java          | 5 +++++
 .../devices/xiaomi/miwatch/MiWatchLiteCoordinator.java      | 6 ++++++
 .../redmiwatch3active/RedmiWatch3ActiveCoordinator.java     | 5 +++++
 4 files changed, 19 insertions(+)

diff --git a/README.md b/README.md
index af4612f27..3192c2de5 100644
--- a/README.md
+++ b/README.md
@@ -96,6 +96,9 @@ vendor's servers.
 	- [Band, Band 1A, Band 1S](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Mi-Band), [Band 2](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Mi-Band-2), [Band 3](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Mi-Band-3)
 	- [Band 4](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Mi-Band-4), [Band 5](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Mi-Band-5), [Band 6](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Mi-Band-6) [**\[!\]**](#special-pairing-procedures)
 	- [Xiaomi Smart Band 7](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Mi-Band-7) [**\[!\]**](#special-pairing-procedures)
+	- [Xiaomi Smart Band 8 (experimental)](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Mi-Band-8) [**\[!\]**](#special-pairing-procedures)
+    - Mi Watch Lite (experimental)
+    - Redmi Watch 3 Lite (experimental)
 	- Xiaomi Temperature and Humidity Monitor Clock (LYWSD02/LYWSD02MMC) (partial support)
 	- Scale 2 (Currently only displays a toast after stepping on the scale)
 - [MyKronoz ZeTime](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/MyKronoz-ZeTime)
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/MiBand8Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/MiBand8Coordinator.java
index 1a306af1d..98fecb619 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/MiBand8Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/MiBand8Coordinator.java
@@ -29,6 +29,11 @@ import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiEncryptedCoordi
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiInstallHandler;
 
 public class MiBand8Coordinator extends XiaomiEncryptedCoordinator {
+    @Override
+    public boolean isExperimental() {
+        return true;
+    }
+
     @Override
     protected Pattern getSupportedDeviceName() {
         return Pattern.compile("^Xiaomi Smart Band 8 [A-Z0-9]{4}$");
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatch/MiWatchLiteCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatch/MiWatchLiteCoordinator.java
index b6257efcc..41e237cb6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatch/MiWatchLiteCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatch/MiWatchLiteCoordinator.java
@@ -30,6 +30,11 @@ import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiPlaintextCoordi
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 
 public class MiWatchLiteCoordinator extends XiaomiPlaintextCoordinator {
+    @Override
+    public boolean isExperimental() {
+        return true;
+    }
+
     @Override
     protected Pattern getSupportedDeviceName() {
         return Pattern.compile("^Mi Watch Lite_[A-Z0-9]{4}$");
@@ -81,6 +86,7 @@ public class MiWatchLiteCoordinator extends XiaomiPlaintextCoordinator {
     public int getAlarmSlotCount(final GBDevice device) {
         return 0;
     }
+
     @Override
     public int getReminderSlotCount(final GBDevice device) {
         return 0;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch3active/RedmiWatch3ActiveCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch3active/RedmiWatch3ActiveCoordinator.java
index 7a60136a4..b15bf069c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch3active/RedmiWatch3ActiveCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch3active/RedmiWatch3ActiveCoordinator.java
@@ -29,6 +29,11 @@ import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiEncryptedCoordi
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiInstallHandler;
 
 public class RedmiWatch3ActiveCoordinator extends XiaomiEncryptedCoordinator {
+    @Override
+    public boolean isExperimental() {
+        return true;
+    }
+
     @Override
     protected Pattern getSupportedDeviceName() {
         return Pattern.compile("^Redmi Watch 3 Active [A-Z0-9]{4}$");

From e91ad80d276dde9cd44fb6be0e3d856a24791c17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sat, 25 Nov 2023 22:18:34 +0000
Subject: [PATCH 140/595] Xiaomi: Cleanup code and comments

---
 app/build.gradle                              |  2 +-
 .../devices/xiaomi/XiaomiCoordinator.java     | 26 +++++++++----------
 .../externalevents/NotificationListener.java  |  2 +-
 .../service/DeviceSupportFactory.java         |  1 -
 .../service/devices/xiaomi/XiaomiSupport.java |  8 +-----
 .../activity/impl/SleepDetailsParser.java     |  1 +
 .../services/AbstractXiaomiService.java       |  1 -
 .../services/XiaomiCalendarService.java       |  1 -
 .../xiaomi/services/XiaomiHealthService.java  |  1 -
 .../services/XiaomiNotificationService.java   |  3 ---
 .../xiaomi/services/XiaomiSystemService.java  |  6 +----
 .../services/XiaomiWatchfaceService.java      |  2 --
 .../xiaomi/services/XiaomiWeatherService.java |  3 +--
 app/src/main/res/values/strings.xml           |  1 -
 14 files changed, 19 insertions(+), 39 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 6fb66a594..92bd2c669 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -293,7 +293,7 @@ dependencies {
     implementation 'com.android.volley:volley:1.2.1'
 
     // Bouncy Castle is included directly in GB, to avoid pulling the entire dependency
-    // it's included in the org.bouncycastle.shaded package, to prevent conflicts with
+    // It's included in the org.bouncycastle.shaded package, to fix conflicts with
     // roboelectric
     //implementation 'org.bouncycastle:bcpkix-jdk18on:1.76'
     //implementation 'org.bouncycastle:bcprov-jdk18on:1.76'
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
index 0060f251d..6d68ce2fc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
@@ -31,6 +31,7 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
+import nodomain.freeyourgadget.gadgetbridge.BuildConfig;
 import nodomain.freeyourgadget.gadgetbridge.GBException;
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.activities.appmanager.AppManagerActivity;
@@ -205,7 +206,8 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
 
     @Override
     public boolean supportsActivityTracks() {
-        return true;
+        // TODO It does, but not yet fully working
+        return BuildConfig.DEBUG;
     }
 
     @Override
@@ -215,13 +217,14 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
 
     @Override
     public boolean supportsSpo2() {
-        return true;
+        // TODO it does, but not yet implemented, so let's not crash
+        return false;
     }
 
     @Override
     public boolean supportsHeartRateStats() {
         // TODO does it?
-        return true;
+        return false;
     }
 
     @Override
@@ -233,12 +236,11 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
     @Override
     public boolean supportsSleepRespiratoryRate() {
         // TODO does it?
-        return true;
+        return false;
     }
 
     @Override
     public boolean supportsAlarmSnoozing() {
-        // TODO does it?
         return false;
     }
 
@@ -267,8 +269,8 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
 
     @Override
     public int getWorldClocksSlotCount() {
-        // TODO how many?
-        return 5;
+        // TODO how many? also, map world clocks
+        return 0;
     }
 
     @Override
@@ -291,7 +293,6 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
 
     @Override
     public boolean supportsManualHeartRateMeasurement(final GBDevice device) {
-        // TODO orchestrate
         return true;
     }
 
@@ -302,7 +303,6 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
 
     @Override
     public boolean supportsRealtimeData() {
-        // TODO supports steps?
         return true;
     }
 
@@ -461,13 +461,13 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
 
     @Override
     public boolean supportsNotificationVibrationPatterns() {
-        // TODO maybe can used this
+        // TODO maybe can use this
         return true;
     }
 
     @Override
     public boolean supportsNotificationVibrationRepetitionPatterns() {
-        // TODO maybe can used this
+        // TODO maybe can use this
         return true;
     }
 
@@ -478,13 +478,13 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
 
     @Override
     public AbstractNotificationPattern[] getNotificationVibrationPatterns() {
-        // TODO maybe can used this
+        // TODO maybe can use this
         return new AbstractNotificationPattern[0];
     }
 
     @Override
     public AbstractNotificationPattern[] getNotificationVibrationRepetitionPatterns() {
-        // TODO maybe can used this
+        // TODO maybe can use this
         return new AbstractNotificationPattern[0];
     }
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
index 33a352a3a..fd794c1f8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
@@ -786,7 +786,7 @@ public class NotificationListener extends NotificationListenerService {
         notificationsActive.removeAll(notificationsToRemove);
 
         // TODO prevent this from being called multiple times for the same ID
-        // TODO prevent thins from being called form notifications removed from the device
+        // TODO prevent this from being called form notifications removed from the device
 
         // Send notification remove request to device
         List<GBDevice> devices = GBApplication.app().getDeviceManager().getDevices();
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceSupportFactory.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceSupportFactory.java
index 32d01343b..d6edb830b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceSupportFactory.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceSupportFactory.java
@@ -22,7 +22,6 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service;
 
-import android.app.Service;
 import android.bluetooth.BluetoothAdapter;
 import android.content.Context;
 import android.util.Log;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
index 3cc33e6a9..bbb1bdec9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
@@ -378,15 +378,9 @@ public abstract class XiaomiSupport extends AbstractBTLEDeviceSupport {
         healthService.enableRealtimeStats(enable);
     }
 
-    @Override
-    public void onScreenshotReq() {
-        // TODO
-        super.onScreenshotReq();
-    }
-
     @Override
     public void onEnableHeartRateSleepSupport(final boolean enable) {
-        // TODO
+        // TODO onEnableHeartRateSleepSupport
         super.onEnableHeartRateSleepSupport(enable);
     }
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/SleepDetailsParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/SleepDetailsParser.java
index 21748faa9..2164a69b3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/SleepDetailsParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/SleepDetailsParser.java
@@ -44,6 +44,7 @@ public class SleepDetailsParser extends XiaomiActivityParser {
         final int wakeupTime = buf.getInt();
         LOG.info("Bed time: {}, wake up time: {}", bedTime, wakeupTime);
 
+        // TODO save timestamps and overlay on activity
         // TODO everything else...
 
         return false;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/AbstractXiaomiService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/AbstractXiaomiService.java
index 02738de0e..044dd9563 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/AbstractXiaomiService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/AbstractXiaomiService.java
@@ -21,7 +21,6 @@ import android.content.Context;
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
-import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiCalendarService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiCalendarService.java
index 7082847c7..482467708 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiCalendarService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiCalendarService.java
@@ -29,7 +29,6 @@ import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
 import nodomain.freeyourgadget.gadgetbridge.model.CalendarEventSpec;
 import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
-import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 import nodomain.freeyourgadget.gadgetbridge.util.StringUtils;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
index 5f8bd59d6..a28d9c13b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
@@ -18,7 +18,6 @@ package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services;
 
 import android.content.Intent;
 import android.location.Location;
-import android.os.Build;
 import android.os.Handler;
 
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
index 614dc5515..b0315c133 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
@@ -114,8 +114,6 @@ public class XiaomiNotificationService extends AbstractXiaomiService implements
         LOG.warn("Unhandled notification command {}", cmd.getSubtype());
     }
 
-
-
     public void onNotification(final NotificationSpec notificationSpec) {
         final XiaomiProto.Notification3.Builder notification3 = XiaomiProto.Notification3.newBuilder()
                 .setId(notificationSpec.getId())
@@ -179,7 +177,6 @@ public class XiaomiNotificationService extends AbstractXiaomiService implements
     }
 
     public void onSetCallState(final CallSpec callSpec) {
-        // TODO handle callSpec.command
         if (callSpec.command == CallSpec.CALL_OUTGOING) {
             return;
         }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
index 7d3d3d14d..95028909e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
@@ -89,7 +89,6 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
 
     @Override
     public void handleCommand(final XiaomiProto.Command cmd) {
-        // TODO
         switch (cmd.getSubtype()) {
             case CMD_DEVICE_INFO:
                 handleDeviceInfo(cmd.getSystem().getDeviceInfo());
@@ -476,10 +475,6 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
 
         unsetDeviceBusy();
 
-        if (success) {
-            // TODO do we need to reboot?
-        }
-
         fwHelper = null;
     }
 
@@ -499,6 +494,7 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
         }
     }
 
+    // TODO do we even need this? also prevent NPE when unknown
     private static final Map<String, String> DISPLAY_ITEM_NAMES = new HashMap<String, String>() {{
         put("today_act", "Stats");
         put("sport", "Workout");
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWatchfaceService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWatchfaceService.java
index c2abbf3fd..28cc84e16 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWatchfaceService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWatchfaceService.java
@@ -59,11 +59,9 @@ public class XiaomiWatchfaceService extends AbstractXiaomiService implements Xia
 
     @Override
     public void handleCommand(final XiaomiProto.Command cmd) {
-        // TODO
         switch (cmd.getSubtype()) {
             case CMD_WATCHFACE_LIST:
                 handleWatchfaceList(cmd.getWatchface().getWatchfaceList());
-                // TODO handle
                 return;
             case CMD_WATCHFACE_SET:
                 LOG.debug("Got watchface set response, ack={}", cmd.getWatchface().getAck());
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java
index b51d7e480..048cee6f7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java
@@ -206,6 +206,5 @@ public class XiaomiWeatherService extends AbstractXiaomiService {
                         .format(new Date(timestamp * 1000L)))
                 .insert(22, ':') // FIXME: I bet this fails for some, but all this java date craps sucks
                 .toString();
-
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 299ebda9b..9550da72b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2394,7 +2394,6 @@
     <string name="temperature_scale_cf_summary">Select whether device uses Celsius or Fahrenheit scale.</string>
     <string name="temperature_scale_celsius">Celsius</string>
     <string name="temperature_scale_fahrenheit">Fahrenheit</string>
-
     <string name="fossil_hr_nav_app_not_installed_notify_title">Navigation app not installed on watch</string>
     <string name="fossil_hr_nav_app_not_installed_notify_text">Navigation started but navigationApp not installed on watch. Please install it from the App Manager.</string>
     <string name="call_rejection_method_reject">Reject</string>

From 8bd7e103d0ae6ef564907c3356081e872435585e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sat, 25 Nov 2023 22:30:25 +0000
Subject: [PATCH 141/595] Update changelog

---
 CHANGELOG.md                                      | 15 ++++++++++++++-
 .../AmazfitActiveEdgeCoordinator.java             |  5 +++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e3a18886..122cdb9e4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,12 +2,15 @@
 
 #### Next release (WIP)
 * Initial support for Amazfit Balance
+* Initial support for Amazfit Active
 * Initial support for Femometer Vinca II
 * Initial support for Mijia LYWSD02MMC variant
 * Initial support for Sony Wena 3
 * Experimental support for Sony WF-1000XM5
-* Experimental support for Amazfit Active
 * Experimental support for Amazfit Active Edge
+* Experimental support for Mi Band 8
+* Experimental support for Mi Watch Lite
+* Experimental support for Redmi Watch 3 Lite
 * Amazfit Band 7: Add alexa menu entries
 * Amazfit GTR 3 Pro: Fix firmware and watchface upload
 * Amazfit T-Rex: Fix activity summary parsing
@@ -15,7 +18,9 @@
 * AsteroidOS: Fix media info
 * AsteroidOS: Fix notification dismissal
 * Bangle.js: Add loyalty cards integration with Catima
+* Bangle.js: Improve handling of chinese characters
 * Bangle.js: Lower threshold for low battery warning
+* Bangle.js: Recover from device initialization failure
 * Casio GBX100/GBD-200: Fix first connect
 * Fossil/Skagen Hybrids: Add new navigation app
 * Fossil/Skagen Hybrids: Allow configuring call rejection method
@@ -24,20 +29,28 @@
 * Fossil/Skagen Hybrids: Show device specific settings in more logical order
 * Message privacy: Add mode Hide only body
 * Mijia LYWSD02: Add battery
+* Mijia LYWSD02: Add low battery notification
 * Mijia LYWSD02: Set temperature unit
 * Mijia LYWSD02: Fix battery drain while connected
 * PineTime: Display app name for VoIP app calls
+* PineTime: Honor Sync time setting on connect
+* PineTime: Improve notification handling
 * PineTime: Reduce weather memory usage
 * Withings Steel HR: Fix crash when calibrating hands on the nightly
 * Zepp OS: Add blood oxygen graph
 * Zepp OS: Add workout codes for hiking and outdoor swimming
+* Zepp OS: Attempt to fix activity fetch operation getting stuck
 * Zepp OS: Display swimming activity data
 * Zepp OS: Fix health settings on older Zepp OS versions
 * Zepp OS: Fix setting of unknown button press apps
 * Zepp OS: Fix sunrise and moon dates being off by local time + UTC offset
 * Zepp OS: Map hiking, outdoor swimming, climbing and table tennis activity types
 * Add transliteration for Latvian and Common Symbols
+* Autodetect OsmAnd package name and make it configurable
+* Make GMaps navigation handler follow the "navigation forwarding" setting
+* Support selecting enabled navigation apps
 * Allow ignore notifications from work profile apps
+* Display alias in low battery notification
 * Fix emoji when a transliterator is enabled
 * Fix UV Index and rain probability for some weather apps
 * Improve device discovery stability and fix freezes
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 88f6c2ccc..9d3af38e4 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
@@ -32,6 +32,11 @@ import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.AbstractHuami2
 import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitactiveedge.AmazfitActiveEdgeSupport;
 
 public class AmazfitActiveEdgeCoordinator extends Huami2021Coordinator {
+    @Override
+    public boolean isExperimental() {
+        return true;
+    }
+
     @NonNull
     @Override
     public Class<? extends DeviceSupport> getDeviceSupportClass() {

From 6ef6c9be4384fecfa778f40a68cf1eecab2607bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20B=C3=B6hler?= <dev@aboehler.at>
Date: Sun, 23 Jul 2023 21:59:04 +0200
Subject: [PATCH 142/595] Fix Bonding for the Casio GB5600/6900/STB-1000 series

---
 .../discovery/DiscoveryActivityV2.java        | 10 +++
 .../gb6900/CasioGB6900DeviceCoordinator.java  |  2 +-
 .../lenovo/LenovoWatchPairingActivity.java    | 10 +++
 .../devices/miband/MiBandPairingActivity.java | 12 +++-
 .../devices/pebble/PebblePairingActivity.java | 12 +++-
 .../devices/watch9/Watch9PairingActivity.java | 10 +++
 .../service/btle/TransactionBuilder.java      |  6 ++
 .../service/btle/actions/BondAction.java      | 66 +++++++++++++++++++
 .../gb6900/CasioGB6900DeviceSupport.java      |  2 +
 .../gadgetbridge/util/BondingInterface.java   |  3 +
 .../gadgetbridge/util/BondingUtil.java        | 40 +++++------
 11 files changed, 150 insertions(+), 23 deletions(-)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/BondAction.java

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/discovery/DiscoveryActivityV2.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/discovery/DiscoveryActivityV2.java
index d139261d4..0a810e30e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/discovery/DiscoveryActivityV2.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/discovery/DiscoveryActivityV2.java
@@ -752,6 +752,16 @@ public class DiscoveryActivityV2 extends AbstractGBActivity implements AdapterVi
         return this.deviceTarget;
     }
 
+    @Override
+    public String getMacAddress() {
+        return deviceTarget.getDevice().getAddress();
+    }
+
+    @Override
+    public boolean getAttemptToConnect() {
+        return true;
+    }
+
     @Override
     public void registerBroadcastReceivers() {
         final IntentFilter bluetoothIntents = new IntentFilter();
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/gb6900/CasioGB6900DeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/gb6900/CasioGB6900DeviceCoordinator.java
index ac40d2351..09cb4e095 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/gb6900/CasioGB6900DeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/gb6900/CasioGB6900DeviceCoordinator.java
@@ -54,7 +54,7 @@ public class CasioGB6900DeviceCoordinator extends CasioDeviceCoordinator {
 
     @Override
     public int getBondingStyle(){
-        return BONDING_STYLE_BOND;
+        return BONDING_STYLE_LAZY;
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lenovo/LenovoWatchPairingActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lenovo/LenovoWatchPairingActivity.java
index c10e72a76..4476eba83 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lenovo/LenovoWatchPairingActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lenovo/LenovoWatchPairingActivity.java
@@ -110,6 +110,16 @@ public class LenovoWatchPairingActivity extends AbstractGBActivity implements Bo
         return this.deviceCandidate;
     }
 
+    @Override
+    public String getMacAddress() {
+        return deviceCandidate.getDevice().getAddress();
+    }
+
+    @Override
+    public boolean getAttemptToConnect() {
+        return true;
+    }
+
     @Override
     protected void onResume() {
         registerBroadcastReceivers();
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPairingActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPairingActivity.java
index e4210a379..0f3dab468 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPairingActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPairingActivity.java
@@ -143,7 +143,7 @@ public class MiBandPairingActivity extends AbstractGBActivity implements Bonding
             return;
         }
 
-        BondingUtil.tryBondThenComplete(this, deviceCandidate);
+        BondingUtil.tryBondThenComplete(this, deviceCandidate.getDevice(), deviceCandidate.getMacAddress());
     }
 
 
@@ -189,6 +189,16 @@ public class MiBandPairingActivity extends AbstractGBActivity implements Bonding
         super.onResume();
     }
 
+    @Override
+    public String getMacAddress() {
+        return deviceCandidate.getDevice().getAddress();
+    }
+
+    @Override
+    public boolean getAttemptToConnect() {
+        return true;
+    }
+
     @Override
     protected void onStart() {
         registerBroadcastReceivers();
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebblePairingActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebblePairingActivity.java
index 80de724c0..a701fe041 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebblePairingActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebblePairingActivity.java
@@ -125,7 +125,7 @@ public class PebblePairingActivity extends AbstractGBActivity implements Bonding
                 btDevice.getBondState() == BluetoothDevice.BOND_BONDING) {
             BondingUtil.connectThenComplete(this, deviceCandidate);
         } else {
-            BondingUtil.tryBondThenComplete(this, deviceCandidate);
+            BondingUtil.tryBondThenComplete(this, deviceCandidate.getDevice(), deviceCandidate.getDevice().getAddress());
         }
     }
 
@@ -187,6 +187,16 @@ public class PebblePairingActivity extends AbstractGBActivity implements Bonding
         return this.deviceCandidate;
     }
 
+    @Override
+    public String getMacAddress() {
+        return deviceCandidate.getDevice().getAddress();
+    }
+
+    @Override
+    public boolean getAttemptToConnect() {
+        return true;
+    }
+
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/watch9/Watch9PairingActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/watch9/Watch9PairingActivity.java
index 1e7cb7945..1bad89c2f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/watch9/Watch9PairingActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/watch9/Watch9PairingActivity.java
@@ -101,6 +101,16 @@ public class Watch9PairingActivity extends AbstractGBActivity implements Bonding
         return this.deviceCandidate;
     }
 
+    @Override
+    public String getMacAddress() {
+        return deviceCandidate.getDevice().getAddress();
+    }
+
+    @Override
+    public boolean getAttemptToConnect() {
+        return true;
+    }
+
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/TransactionBuilder.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/TransactionBuilder.java
index d6e43f701..fc0669c1b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/TransactionBuilder.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/TransactionBuilder.java
@@ -28,6 +28,7 @@ import androidx.annotation.RequiresApi;
 
 import java.util.Arrays;
 
+import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.BondAction;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.NotifyAction;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.ReadAction;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.RequestConnectionPriorityAction;
@@ -87,6 +88,11 @@ public class TransactionBuilder {
         );
     }
 
+    public TransactionBuilder bond() {
+        BondAction action = new BondAction();
+        return add(action);
+    }
+
     public TransactionBuilder notify(BluetoothGattCharacteristic characteristic, boolean enable) {
         if (characteristic == null) {
             LOG.warn("Unable to notify characteristic: null");
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/BondAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/BondAction.java
new file mode 100644
index 000000000..59face7cd
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/BondAction.java
@@ -0,0 +1,66 @@
+package nodomain.freeyourgadget.gadgetbridge.service.btle.actions;
+
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothGatt;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.IntentFilter;
+
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
+import nodomain.freeyourgadget.gadgetbridge.util.AndroidUtils;
+import nodomain.freeyourgadget.gadgetbridge.util.BondingInterface;
+import nodomain.freeyourgadget.gadgetbridge.util.BondingUtil;
+
+public class BondAction extends PlainAction implements BondingInterface {
+    private String mMacAddress;
+    private final BroadcastReceiver pairingReceiver = BondingUtil.getPairingReceiver(this);
+    private final BroadcastReceiver bondingReceiver = BondingUtil.getBondingReceiver(this);
+
+    @Override
+    public void onBondingComplete(boolean success) {
+        unregisterBroadcastReceivers();
+    }
+
+    @Override
+    public GBDeviceCandidate getCurrentTarget() {
+        return null;
+    }
+
+    @Override
+    public String getMacAddress() {
+        return mMacAddress;
+    }
+
+    @Override
+    public boolean getAttemptToConnect() {
+        return false;
+    }
+
+    @Override
+    public void unregisterBroadcastReceivers() {
+        AndroidUtils.safeUnregisterBroadcastReceiver(LocalBroadcastManager.getInstance(GBApplication.getContext()), pairingReceiver);
+        AndroidUtils.safeUnregisterBroadcastReceiver(GBApplication.getContext(), bondingReceiver);
+    }
+
+    @Override
+    public void registerBroadcastReceivers() {
+        LocalBroadcastManager.getInstance(GBApplication.getContext()).registerReceiver(pairingReceiver, new IntentFilter(GBDevice.ACTION_DEVICE_CHANGED));
+        getContext().registerReceiver(bondingReceiver, new IntentFilter(BluetoothDevice.ACTION_BOND_STATE_CHANGED));
+    }
+
+    @Override
+    public Context getContext() {
+        return GBApplication.getContext();
+    }
+
+    @Override
+    public boolean run(BluetoothGatt gatt) {
+        mMacAddress = gatt.getDevice().getAddress();
+        BondingUtil.tryBondThenComplete(this, gatt.getDevice(), gatt.getDevice().getAddress());
+        return true;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gb6900/CasioGB6900DeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gb6900/CasioGB6900DeviceSupport.java
index 1ed30637e..07f7d3fa8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gb6900/CasioGB6900DeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gb6900/CasioGB6900DeviceSupport.java
@@ -60,6 +60,7 @@ import nodomain.freeyourgadget.gadgetbridge.service.devices.casio.CasioSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.casio.gb6900.CasioGB6900HandlerThread;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.casio.gb6900.InitOperation;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.casio.gb6900.SetAlarmOperation;
+import nodomain.freeyourgadget.gadgetbridge.util.BondingUtil;
 import nodomain.freeyourgadget.gadgetbridge.util.GB;
 import nodomain.freeyourgadget.gadgetbridge.util.StringUtils;
 
@@ -151,6 +152,7 @@ public class CasioGB6900DeviceSupport extends CasioSupport {
             setInitialized();
             getDevice().setFirmwareVersion("N/A");
             getDevice().setFirmwareVersion2("N/A");
+            builder.bond();
             return builder;
         }
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/BondingInterface.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/BondingInterface.java
index a90857745..564d1a759 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/BondingInterface.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/BondingInterface.java
@@ -54,6 +54,9 @@ public interface BondingInterface {
      **/
     void unregisterBroadcastReceivers();
 
+    String getMacAddress();
+
+    boolean getAttemptToConnect();
     /**
      * This forces bonding activities to handle the addition
      * of all broadcast receivers in the same place
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/BondingUtil.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/BondingUtil.java
index ce51ba348..442f18cc9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/BondingUtil.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/BondingUtil.java
@@ -68,7 +68,7 @@ public class BondingUtil {
                 if (GBDevice.ACTION_DEVICE_CHANGED.equals(intent.getAction())) {
                     GBDevice device = intent.getParcelableExtra(GBDevice.EXTRA_DEVICE);
                     LOG.debug("Pairing receiver: device changed: " + device);
-                    if (activity.getCurrentTarget().getDevice().getAddress().equals(device.getAddress())) {
+                    if (activity.getMacAddress().equals(device.getAddress())) {
                         if (device.isInitialized()) {
                             LOG.info("Device is initialized, finish things up");
                             activity.onBondingComplete(true);
@@ -90,7 +90,7 @@ public class BondingUtil {
             public void onReceive(Context context, Intent intent) {
                 if (BluetoothDevice.ACTION_BOND_STATE_CHANGED.equals(intent.getAction())) {
                     BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
-                    String bondingMacAddress = bondingInterface.getCurrentTarget().getDevice().getAddress();
+                    String bondingMacAddress = bondingInterface.getMacAddress();
 
                     LOG.info("Bond state changed: " + device + ", state: " + device.getBondState() + ", expected address: " + bondingMacAddress);
                     if (bondingMacAddress != null && bondingMacAddress.equals(device.getAddress())) {
@@ -99,8 +99,8 @@ public class BondingUtil {
                             case BluetoothDevice.BOND_BONDED: {
                                 LOG.info("Bonded with " + device.getAddress());
                                 //noinspection StatementWithEmptyBody
-                                if (isLePebble(device)) {
-                                    // Do not initiate connection to LE Pebble!
+                                if (isLePebble(device) || !bondingInterface.getAttemptToConnect()) {
+                                    // Do not initiate connection to LE Pebble and some others!
                                 } else {
                                     attemptToFirstConnect(bondingInterface.getCurrentTarget().getDevice());
                                 }
@@ -108,7 +108,8 @@ public class BondingUtil {
                             }
                             case BluetoothDevice.BOND_NONE: {
                                 LOG.info("Not bonded with " + device.getAddress() + ", attempting to connect anyway.");
-                                attemptToFirstConnect(bondingInterface.getCurrentTarget().getDevice());
+                                if(bondingInterface.getAttemptToConnect())
+                                    attemptToFirstConnect(bondingInterface.getCurrentTarget().getDevice());
                                 return;
                             }
                             case BluetoothDevice.BOND_BONDING: {
@@ -203,7 +204,7 @@ public class BondingUtil {
                     .setPositiveButton(bondingInterface.getContext().getString(R.string.discovery_yes_pair), new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialog, int which) {
-                            BondingUtil.tryBondThenComplete(bondingInterface, deviceCandidate);
+                            BondingUtil.tryBondThenComplete(bondingInterface, deviceCandidate.getDevice(), deviceCandidate.getMacAddress());
                         }
                     })
                     .setNegativeButton(R.string.discovery_dont_pair, new DialogInterface.OnClickListener() {
@@ -214,7 +215,7 @@ public class BondingUtil {
                     })
                     .show();
         } else {
-            BondingUtil.tryBondThenComplete(bondingInterface, deviceCandidate);
+            BondingUtil.tryBondThenComplete(bondingInterface, deviceCandidate.getDevice(), deviceCandidate.getMacAddress());
         }
         LOG.debug("Bonding initiated");
     }
@@ -223,8 +224,7 @@ public class BondingUtil {
      * Tries to create a BluetoothDevice bond
      * Do not call directly, use createBond(Activity, GBDeviceCandidate) instead!
      */
-    private static void bluetoothBond(BondingInterface context, GBDeviceCandidate candidate) {
-        BluetoothDevice device = candidate.getDevice();
+    private static void bluetoothBond(BondingInterface context, BluetoothDevice device) {
         if (device.createBond()) {
             // Async, results will be delivered via a broadcast
             LOG.info("Bonding in progress...");
@@ -273,7 +273,7 @@ public class BondingUtil {
             if (deviceToPair != null) {
                 if (bondingInterface.getCurrentTarget().getDevice().getAddress().equals(deviceToPair.getAddress())) {
                     if (deviceToPair.getBondState() != BluetoothDevice.BOND_BONDED) {
-                        BondingUtil.bluetoothBond(bondingInterface, bondingInterface.getCurrentTarget());
+                        BondingUtil.bluetoothBond(bondingInterface, bondingInterface.getCurrentTarget().getDevice());
                     } else {
                         bondingInterface.onBondingComplete(true);
                     }
@@ -297,9 +297,10 @@ public class BondingUtil {
      */
     @RequiresApi(Build.VERSION_CODES.O)
     private static void companionDeviceManagerBond(BondingInterface bondingInterface,
-                                                   final GBDeviceCandidate deviceCandidate) {
+                                                   BluetoothDevice device,
+                                                   String macAddress) {
         BluetoothDeviceFilter deviceFilter = new BluetoothDeviceFilter.Builder()
-                .setAddress(deviceCandidate.getMacAddress())
+                .setAddress(macAddress)
                 .build();
 
         AssociationRequest pairingRequest = new AssociationRequest.Builder()
@@ -308,14 +309,14 @@ public class BondingUtil {
                 .build();
 
         CompanionDeviceManager manager = (CompanionDeviceManager) bondingInterface.getContext().getSystemService(Context.COMPANION_DEVICE_SERVICE);
-        LOG.debug(String.format("Searching for %s associations", deviceCandidate.getMacAddress()));
+        LOG.debug(String.format("Searching for %s associations", macAddress));
         for (String association : manager.getAssociations()) {
             LOG.debug(String.format("Already associated with: %s", association));
-            if (association.equals(deviceCandidate.getMacAddress())) {
+            if (association.equals(macAddress)) {
                 LOG.info("The device has already been bonded through CompanionDeviceManager, using regular");
                 // If it's already "associated", we should immediately pair
                 // because the callback is never called (AFAIK?)
-                BondingUtil.bluetoothBond(bondingInterface, deviceCandidate);
+                BondingUtil.bluetoothBond(bondingInterface, device);
                 return;
             }
         }
@@ -354,9 +355,8 @@ public class BondingUtil {
     /**
      * Use this function to initiate bonding to a GBDeviceCandidate
      */
-    public static void tryBondThenComplete(BondingInterface bondingInterface, GBDeviceCandidate deviceCandidate) {
+    public static void tryBondThenComplete(BondingInterface bondingInterface, BluetoothDevice device, String macAddress) {
         bondingInterface.registerBroadcastReceivers();
-        BluetoothDevice device = deviceCandidate.getDevice();
 
         int bondState = device.getBondState();
         if (bondState == BluetoothDevice.BOND_BONDED) {
@@ -377,12 +377,12 @@ public class BondingUtil {
         }
 
         GB.toast(bondingInterface.getContext(), bondingInterface.getContext().getString(R.string.pairing_creating_bond_with, device.getName(), device.getAddress()), Toast.LENGTH_LONG, GB.INFO);
-        toast(bondingInterface.getContext(), bondingInterface.getContext().getString(R.string.discovery_attempting_to_pair, deviceCandidate.getName()), Toast.LENGTH_SHORT, GB.INFO);
+        toast(bondingInterface.getContext(), bondingInterface.getContext().getString(R.string.discovery_attempting_to_pair, macAddress), Toast.LENGTH_SHORT, GB.INFO);
         if (GBApplication.getPrefs().getBoolean("enable_companiondevice_pairing", true) &&
                 Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            companionDeviceManagerBond(bondingInterface, deviceCandidate);
+            companionDeviceManagerBond(bondingInterface, device, macAddress);
         } else {
-            bluetoothBond(bondingInterface, deviceCandidate);
+            bluetoothBond(bondingInterface, device);
         }
     }
 

From d9d6a8dc295dfbdaf02c5c65c7d1606cd185fc45 Mon Sep 17 00:00:00 2001
From: foxstidious <foxstidious@gmail.com>
Date: Thu, 28 Sep 2023 00:11:52 -0400
Subject: [PATCH 143/595] Categorized Google Voice messages as GENERIC_SMS,
 cleaned up some Casio support code, added portion of message text to
 notification title

---
 .../gadgetbridge/model/AppNotificationType.java  |  1 +
 .../casio/gbx100/CasioGBX100DeviceSupport.java   | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/AppNotificationType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/AppNotificationType.java
index ac9817ab2..8ddd2b59c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/AppNotificationType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/AppNotificationType.java
@@ -61,6 +61,7 @@ public class AppNotificationType extends HashMap<String, NotificationType> {
         put("com.google.android.talk", NotificationType.GOOGLE_HANGOUTS);
         put("com.google.android.apps.maps", NotificationType.GOOGLE_MAPS);
         put("com.google.android.apps.photos", NotificationType.GOOGLE_PHOTOS);
+        put("com.google.android.apps.googlevoice", NotificationType.GENERIC_SMS);
 
         // Conversations
         put("eu.siacs.conversations", NotificationType.CONVERSATIONS);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/CasioGBX100DeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/CasioGBX100DeviceSupport.java
index 333c42721..f81b2c3de 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/CasioGBX100DeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/CasioGBX100DeviceSupport.java
@@ -256,6 +256,9 @@ public class CasioGBX100DeviceSupport extends Casio2C2DSupport implements Shared
     }
 
     private void showNotification(byte icon, String sender, String title, String message, int id, boolean delete) {
+        title = title + "-" + message;
+        title = title.substring(0, Math.min(title.length(), 30));
+        title = title + "..";
         byte[] titleBytes = new byte[0];
         if(title != null)
             titleBytes = title.getBytes(StandardCharsets.UTF_8);
@@ -342,20 +345,23 @@ public class CasioGBX100DeviceSupport extends Casio2C2DSupport implements Shared
     public void onNotification(final NotificationSpec notificationSpec) {
         byte icon;
         boolean autoremove = false;
-        switch (notificationSpec.type.getGenericType()) {
-            case "generic_calendar":
+        switch (notificationSpec.type) {
+            case GENERIC_CALENDAR:
                 icon = CasioConstants.CATEGORY_SCHEDULE_AND_ALARM;
                 break;
-            case "generic_email":
+            case GENERIC_EMAIL:
                 icon = CasioConstants.CATEGORY_EMAIL;
                 break;
-            case "generic_sms":
+            case GENERIC_SMS:
                 icon = CasioConstants.CATEGORY_SNS;
                 SharedPreferences sharedPreferences = GBApplication.getDeviceSpecificSharedPrefs(getDevice().getAddress());
                 autoremove = sharedPreferences.getBoolean(PREF_AUTOREMOVE_MESSAGE, false);
                 break;
+            case GENERIC_PHONE:
+                icon = CasioConstants.CATEGORY_INCOMING_CALL;
+                break;
             default:
-                icon = CasioConstants.CATEGORY_SNS;
+                icon = CasioConstants.CATEGORY_OTHER;
                 break;
         }
         LOG.info("onNotification id=" + notificationSpec.getId());

From a1b59774d45a46b5ffd7bc71563595a4be2f2dac Mon Sep 17 00:00:00 2001
From: foxstidious <foxstidious@gmail.com>
Date: Sat, 30 Sep 2023 09:37:34 -0400
Subject: [PATCH 144/595] Fixed notification time stamp on Casio GDB-200

---
 .../gbx100/CasioGBX100DeviceSupport.java      | 46 ++++++++++++-------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/CasioGBX100DeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/CasioGBX100DeviceSupport.java
index f81b2c3de..79931ce5c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/CasioGBX100DeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/CasioGBX100DeviceSupport.java
@@ -27,6 +27,7 @@ import android.widget.Toast;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.threeten.bp.ZoneId;
 import org.threeten.bp.ZonedDateTime;
 
 import java.io.IOException;
@@ -279,23 +280,34 @@ public class CasioGBX100DeviceSupport extends Casio2C2DSupport implements Shared
         arr[4] = delete ? (byte) 0x02 : (byte) 0x00;
         arr[5] = (byte) 0x01; // Set to 0x00 to not vibrate/ring for this notification
         arr[6] = icon;
-        // These bytes contain a timestamp, not yet decoded / implemented
-        // ASCII Codes:
-        /*arr[7] = (byte) 0x32; // 2
-        arr[8] = (byte) 0x30;   // 0
-        arr[9] = (byte) 0x32;   // 2
-        arr[10] = (byte) 0x30;  // 0
-        arr[11] = (byte) 0x31;  // 1
-        arr[12] = (byte) 0x31;  // 1
-        arr[13] = (byte) 0x31;  // 1
-        arr[14] = (byte) 0x33;  // 3
-        arr[15] = (byte) 0x54;  // T
-        arr[16] = (byte) 0x30;  // 0
-        arr[17] = (byte) 0x39;  // 9
-        arr[18] = (byte) 0x33;  // 3
-        arr[19] = (byte) 0x31;  // 1
-        arr[20] = (byte) 0x35;  // 5
-        arr[21] = (byte) 0x33;*/// 3
+
+        // Unknonwn what these bytes are for
+        arr[7] = (byte) 0x00;
+        arr[8] = (byte) 0x00;
+        arr[9] = (byte) 0x00;
+        arr[10] = (byte) 0x00;
+
+        ZonedDateTime timestamp = ZonedDateTime.now();
+        // Bytes 11 - 19 are timestamp
+        // Encode the timestamp of the notification
+        // Month
+        arr[11] = (byte) (timestamp.getMonthValue() / 10 + 3); // Tens digit, but offset by 3 for some reason
+        arr[12] = (byte) (timestamp.getMonthValue() % 10);
+        // Day
+        arr[13] = (byte) (timestamp.getDayOfMonth() / 10 + 3); // Tens digit, but offset by 3 for some reason
+        arr[14] = (byte) (timestamp.getDayOfMonth() % 10);
+        // ??
+        arr[15] = (byte) 0; // Not sure what this byte is for?
+        // Hour
+        arr[16] = (byte) (timestamp.getHour() / 10 + 3); // Tens digit, but offset by 3 for some reason
+        arr[17] = (byte) (timestamp.getHour() % 10);
+        // Minute
+        arr[18] = (byte) (timestamp.getMinute() / 10 + 3);// Tens digit, but offset by 3 for some reason
+        arr[19] = (byte) (timestamp.getMinute() % 10);
+
+        arr[20] = (byte) 0x00;
+        arr[21] = (byte) 0x00;
+
         byte[] copy = Arrays.copyOf(arr, arr.length + 2);
         copy[copy.length-2] = 0;
         copy[copy.length-1] = 0;

From 6be7f7c9ccc3a8d57ed81f55e356974598b2dd0d Mon Sep 17 00:00:00 2001
From: foxstidious <foxstidious@gmail.com>
Date: Sat, 30 Sep 2023 11:22:00 -0400
Subject: [PATCH 145/595] Fixed find phone on, added preference to preview
 messages on Casio GDB-200

---
 .../DeviceSettingsPreferenceConst.java        |  2 ++
 .../DeviceSpecificSettingsFragment.java       |  1 +
 .../gbx100/CasioGBX100DeviceCoordinator.java  |  3 ++-
 .../service/AbstractDeviceSupport.java        |  6 +++++-
 .../gbx100/CasioGBX100DeviceSupport.java      | 20 ++++++++++++++-----
 app/src/main/res/values/strings.xml           |  2 ++
 6 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
index cfe235889..ab65644c9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
@@ -219,6 +219,8 @@ public class DeviceSettingsPreferenceConst {
     public static final String PREF_FIND_PHONE = "prefs_find_phone";
     public static final String PREF_FIND_PHONE_DURATION = "prefs_find_phone_duration";
     public static final String PREF_AUTOLIGHT = "autolight";
+
+    public static final String PREF_PREVIEW_MESSAGE_IN_TITLE = "preview_message_in_title";
     public static final String PREF_AUTOREMOVE_MESSAGE = "autoremove_message";
     public static final String PREF_AUTOREMOVE_NOTIFICATIONS = "autoremove_notifications";
     public static final String PREF_SCREEN_ON_ON_NOTIFICATIONS = "screen_on_on_notifications";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
index 243c67a78..298c19204 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
@@ -398,6 +398,7 @@ public class DeviceSpecificSettingsFragment extends AbstractPreferenceFragment i
         addPreferenceHandlerFor(PREF_AUTOLIGHT);
         addPreferenceHandlerFor(PREF_AUTOREMOVE_MESSAGE);
         addPreferenceHandlerFor(PREF_AUTOREMOVE_NOTIFICATIONS);
+        addPreferenceHandlerFor(PREF_PREVIEW_MESSAGE_IN_TITLE);
         addPreferenceHandlerFor(PREF_SCREEN_ON_ON_NOTIFICATIONS);
         addPreferenceHandlerFor(PREF_WORKOUT_KEEP_SCREEN_ON);
         addPreferenceHandlerFor(PREF_KEY_VIBRATION);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/gbx100/CasioGBX100DeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/gbx100/CasioGBX100DeviceCoordinator.java
index 52bb461d4..62835ca54 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/gbx100/CasioGBX100DeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/gbx100/CasioGBX100DeviceCoordinator.java
@@ -152,7 +152,8 @@ public class CasioGBX100DeviceCoordinator extends CasioDeviceCoordinator {
                 R.xml.devicesettings_operating_sounds,
                 R.xml.devicesettings_fake_ring_duration,
                 R.xml.devicesettings_autoremove_message,
-                R.xml.devicesettings_transliteration
+                R.xml.devicesettings_transliteration,
+                R.xml.devicesettings_preview_message_in_title
         };
     }
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java
index 78b1c1d87..a3b82469b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java
@@ -274,8 +274,12 @@ public abstract class AbstractDeviceSupport implements DeviceSupport {
             context.startActivity(intent);
             LOG.debug("CompanionDeviceManager associations were found, starting intent");
         } else {
+            LOG.warn("CompanionDeviceManager associations were not found, going to try to start intent anyway");
             GB.notify(GB.NOTIFICATION_ID_PHONE_FIND, notification.build(), context);
-            LOG.warn("CompanionDeviceManager associations were not found, can't start intent");
+            // Originally the Phone Find activity wasn't being started if no companion associations.
+            // Casio GDB-200 doesn't register companion but this still seems to work, so keeping
+            // warning but starting activity anyway
+            context.startActivity(intent);
         }
     }
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/CasioGBX100DeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/CasioGBX100DeviceSupport.java
index 79931ce5c..a8bdf7c98 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/CasioGBX100DeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/CasioGBX100DeviceSupport.java
@@ -78,6 +78,7 @@ import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.Dev
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_FIND_PHONE_DURATION;
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_KEY_VIBRATION;
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_OPERATING_SOUNDS;
+import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_PREVIEW_MESSAGE_IN_TITLE;
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_TIMEFORMAT;
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_WEARLOCATION;
 import static nodomain.freeyourgadget.gadgetbridge.model.ActivityUser.PREF_USER_ACTIVETIME_MINUTES;
@@ -257,9 +258,13 @@ public class CasioGBX100DeviceSupport extends Casio2C2DSupport implements Shared
     }
 
     private void showNotification(byte icon, String sender, String title, String message, int id, boolean delete) {
-        title = title + "-" + message;
-        title = title.substring(0, Math.min(title.length(), 30));
-        title = title + "..";
+        SharedPreferences sharedPreferences = GBApplication.getDeviceSpecificSharedPrefs(getDevice().getAddress());
+        boolean showMessagePreview = sharedPreferences.getBoolean(PREF_PREVIEW_MESSAGE_IN_TITLE, true);
+        if (showMessagePreview) {
+            title = title + "-" + message;
+            title = title.substring(0, Math.min(title.length(), 30));
+            title = title + "..";
+        }
         byte[] titleBytes = new byte[0];
         if(title != null)
             titleBytes = title.getBytes(StandardCharsets.UTF_8);
@@ -417,7 +422,7 @@ public class CasioGBX100DeviceSupport extends Casio2C2DSupport implements Shared
             findPhoneEvent.event = GBDeviceEventFindPhone.Event.START;
             evaluateGBDeviceEvent(findPhoneEvent);
 
-            if(!findPhone.equals(getContext().getString(R.string.p_on))) {
+            if(findPhone.equals(getContext().getString(R.string.p_on))) {
                 String duration = sharedPreferences.getString(PREF_FIND_PHONE_DURATION, "0");
 
                 try {
@@ -433,7 +438,9 @@ public class CasioGBX100DeviceSupport extends Casio2C2DSupport implements Shared
                         this.mFindPhoneHandler.postDelayed(new Runnable() {
                             @Override
                             public void run() {
-                                onReverseFindDevice(false);
+                                GBDeviceEventFindPhone findPhoneEvent = new GBDeviceEventFindPhone();
+                                findPhoneEvent.event = GBDeviceEventFindPhone.Event.STOP;
+                                evaluateGBDeviceEvent(findPhoneEvent);
                             }
                         }, iDuration * 1000);
                     }
@@ -635,6 +642,9 @@ public class CasioGBX100DeviceSupport extends Casio2C2DSupport implements Shared
                 case PREF_FIND_PHONE_DURATION:
                     // No action, we check the shared preferences when the device tries to ring the phone.
                     break;
+                case PREF_PREVIEW_MESSAGE_IN_TITLE:
+                    // No action, we check it when message is received
+                    break;
                 default:
             }
         } catch (IOException e) {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9550da72b..c11bab637 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -332,6 +332,8 @@
     <string name="pref_summary_enable_calendar_sync">Send calendar events to the timeline</string>
     <string name="pref_title_custom_deviceicon">Show device specific notification icon</string>
     <string name="pref_summary_custom_deviceicon">Show a device specific Android notification icon instead the Gadgetbridge icon when connected</string>
+    <string name="pref_title_preview_message_in_title">Show a preview of the message in the title</string>
+    <string name="pref_summary_preview_message_in_title">Shows a preview of the message in the title of a notification as allowed by the device</string>
     <string name="pref_title_autoremove_notifications">Autoremove dismissed notifications</string>
     <string name="pref_summary_autoremove_notifications">Notifications are automatically removed from the device when dismissed from the phone</string>
     <string name="pref_title_screen_on_on_notifications">Screen On on Notifications</string>

From 11bf0acf3285952796e33c3c085eef0f47eefc50 Mon Sep 17 00:00:00 2001
From: foxstidious <foxstidious@gmail.com>
Date: Thu, 5 Oct 2023 19:43:19 -0400
Subject: [PATCH 146/595] Changed notification timestamp format to be
 implemented specifically for GBD-200

---
 .../gbx100/CasioGBX100DeviceCoordinator.java  | 14 +++-
 .../gbx100/CasioGBX100DeviceSupport.java      | 76 +++++++++++++------
 2 files changed, 65 insertions(+), 25 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/gbx100/CasioGBX100DeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/gbx100/CasioGBX100DeviceCoordinator.java
index 62835ca54..e496d738b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/gbx100/CasioGBX100DeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/gbx100/CasioGBX100DeviceCoordinator.java
@@ -47,11 +47,23 @@ import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.casio.gbx100.CasioGBX100DeviceSupport;
 
 public class CasioGBX100DeviceCoordinator extends CasioDeviceCoordinator {
+    /** CASIO brand identifier in GB Device name */
+    public static final String CASIO_IDENTIFIER = "CASIO";
+
+    /** Sub-model string for GBX-100 in GB Device name */
+    public static final String GBX_100_SUB_MODEL = "GBX-100";
+    /** Sub-model string for GBD-200 in GB Device name */
+    public static final String GBD_200_SUB_MODEL = "GBD-200";
+    /** Sub-model string for GBD-100 in GB Device name */
+    public static final String GBD_100_SUB_MODEL = "GBD-100";
+    /** Sub-model string for GBD-H1000 in GB Device name */
+    public static final String GBD_H1000_SUB_MODEL = "GBD-H1000";
+
     protected static final Logger LOG = LoggerFactory.getLogger(CasioGBX100DeviceCoordinator.class);
 
     @Override
     protected Pattern getSupportedDeviceName() {
-        return Pattern.compile("CASIO.*(GBX-100|GBD-100|GBD-200|GBD-H1000)");
+        return Pattern.compile("CASIO.*(" + GBX_100_SUB_MODEL + "|" + GBD_100_SUB_MODEL + "|" + GBD_200_SUB_MODEL + "|" + GBD_H1000_SUB_MODEL + ")");
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/CasioGBX100DeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/CasioGBX100DeviceSupport.java
index a8bdf7c98..c0f5175f6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/CasioGBX100DeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/CasioGBX100DeviceSupport.java
@@ -48,6 +48,7 @@ import nodomain.freeyourgadget.gadgetbridge.database.DBHandler;
 import nodomain.freeyourgadget.gadgetbridge.database.DBHelper;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventFindPhone;
 import nodomain.freeyourgadget.gadgetbridge.devices.casio.CasioConstants;
+import nodomain.freeyourgadget.gadgetbridge.devices.casio.gbx100.CasioGBX100DeviceCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.casio.gbx100.CasioGBX100SampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.devices.makibeshr3.MakibesHR3Constants;
 import nodomain.freeyourgadget.gadgetbridge.entities.CasioGBX100ActivitySample;
@@ -286,32 +287,59 @@ public class CasioGBX100DeviceSupport extends Casio2C2DSupport implements Shared
         arr[5] = (byte) 0x01; // Set to 0x00 to not vibrate/ring for this notification
         arr[6] = icon;
 
-        // Unknonwn what these bytes are for
-        arr[7] = (byte) 0x00;
-        arr[8] = (byte) 0x00;
-        arr[9] = (byte) 0x00;
-        arr[10] = (byte) 0x00;
-
         ZonedDateTime timestamp = ZonedDateTime.now();
-        // Bytes 11 - 19 are timestamp
-        // Encode the timestamp of the notification
-        // Month
-        arr[11] = (byte) (timestamp.getMonthValue() / 10 + 3); // Tens digit, but offset by 3 for some reason
-        arr[12] = (byte) (timestamp.getMonthValue() % 10);
-        // Day
-        arr[13] = (byte) (timestamp.getDayOfMonth() / 10 + 3); // Tens digit, but offset by 3 for some reason
-        arr[14] = (byte) (timestamp.getDayOfMonth() % 10);
-        // ??
-        arr[15] = (byte) 0; // Not sure what this byte is for?
-        // Hour
-        arr[16] = (byte) (timestamp.getHour() / 10 + 3); // Tens digit, but offset by 3 for some reason
-        arr[17] = (byte) (timestamp.getHour() % 10);
-        // Minute
-        arr[18] = (byte) (timestamp.getMinute() / 10 + 3);// Tens digit, but offset by 3 for some reason
-        arr[19] = (byte) (timestamp.getMinute() % 10);
+        String deviceName = getDevice().getName();
 
-        arr[20] = (byte) 0x00;
-        arr[21] = (byte) 0x00;
+        // It seems that GBD-200 has a different timestamp format than other variants.
+        if (deviceName.endsWith(CasioGBX100DeviceCoordinator.GBD_200_SUB_MODEL)) {
+            // These bytes are likely for designating year, but GBD-200 does not display them
+            // For now leave as 0's until exact encoding can be verified
+            arr[7] = (byte) 0x00;
+            arr[8] = (byte) 0x00;
+            arr[9] = (byte) 0x00;
+            arr[10] = (byte) 0x00;
+
+            // Bytes 11 - 19 are timestamp
+            // Encode the timestamp of the notification
+            // Month
+            arr[11] = (byte) (timestamp.getMonthValue() / 10 + 3); // Tens digit, but offset by 3 for some reason
+            arr[12] = (byte) (timestamp.getMonthValue() % 10);
+            // Day
+            arr[13] = (byte) (timestamp.getDayOfMonth() / 10 + 3); // Tens digit, but offset by 3 for some reason
+            arr[14] = (byte) (timestamp.getDayOfMonth() % 10);
+            // ??
+            arr[15] = (byte) 0; // Not sure what this byte is for?
+            // Hour
+            arr[16] = (byte) (timestamp.getHour() / 10 + 3); // Tens digit, but offset by 3 for some reason
+            arr[17] = (byte) (timestamp.getHour() % 10);
+            // Minute
+            arr[18] = (byte) (timestamp.getMinute() / 10 + 3);// Tens digit, but offset by 3 for some reason
+            arr[19] = (byte) (timestamp.getMinute() % 10);
+
+            // Thes bytes are likely for designating seconds, but GBD-200 does not display them.
+            // For now leave as 0's until exact encoding can be verified.
+            arr[20] = (byte) 0x00;
+            arr[21] = (byte) 0x00;
+        } else {
+            // Other devices appear to use ASCII from initial investigation, information below
+            // These bytes contain a timestamp, not yet decoded / implemented
+            // ASCII Codes:
+            /*arr[7] = (byte) 0x32; // 2
+            arr[8] = (byte) 0x30;   // 0
+            arr[9] = (byte) 0x32;   // 2
+            arr[10] = (byte) 0x30;  // 0
+            arr[11] = (byte) 0x31;  // 1
+            arr[12] = (byte) 0x31;  // 1
+            arr[13] = (byte) 0x31;  // 1
+            arr[14] = (byte) 0x33;  // 3
+            arr[15] = (byte) 0x54;  // T
+            arr[16] = (byte) 0x30;  // 0
+            arr[17] = (byte) 0x39;  // 9
+            arr[18] = (byte) 0x33;  // 3
+            arr[19] = (byte) 0x31;  // 1
+            arr[20] = (byte) 0x35;  // 5
+            arr[21] = (byte) 0x33;*/// 3
+        }
 
         byte[] copy = Arrays.copyOf(arr, arr.length + 2);
         copy[copy.length-2] = 0;

From 4dc10d1d02fca4fe4eb370a89b7f5903478b5427 Mon Sep 17 00:00:00 2001
From: foxstidious <foxstidious@gmail.com>
Date: Sun, 8 Oct 2023 15:55:55 -0400
Subject: [PATCH 147/595] Implemented better message preview, added ability to
 specify high-level alert by category

---
 .../DeviceSettingsPreferenceConst.java        |  10 ++
 .../DeviceSpecificSettingsFragment.java       |   5 +
 .../gbx100/CasioGBX100DeviceCoordinator.java  |   7 +-
 .../gbx100/CasioGBX100DeviceSupport.java      | 152 +++++++++++-------
 app/src/main/res/values/strings.xml           |  10 ++
 .../devicesettings_casio_alert_calendar.xml   |   9 ++
 .../xml/devicesettings_casio_alert_call.xml   |   9 ++
 .../xml/devicesettings_casio_alert_email.xml  |   9 ++
 .../xml/devicesettings_casio_alert_other.xml  |   9 ++
 .../xml/devicesettings_casio_alert_sms.xml    |   9 ++
 10 files changed, 168 insertions(+), 61 deletions(-)
 create mode 100644 app/src/main/res/xml/devicesettings_casio_alert_calendar.xml
 create mode 100644 app/src/main/res/xml/devicesettings_casio_alert_call.xml
 create mode 100644 app/src/main/res/xml/devicesettings_casio_alert_email.xml
 create mode 100644 app/src/main/res/xml/devicesettings_casio_alert_other.xml
 create mode 100644 app/src/main/res/xml/devicesettings_casio_alert_sms.xml

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
index ab65644c9..83ed34fbd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
@@ -221,6 +221,16 @@ public class DeviceSettingsPreferenceConst {
     public static final String PREF_AUTOLIGHT = "autolight";
 
     public static final String PREF_PREVIEW_MESSAGE_IN_TITLE = "preview_message_in_title";
+
+    public static final String PREF_CASIO_ALERT_CALENDAR = "casio_alert_calendar";
+
+    public static final String PREF_CASIO_ALERT_CALL = "casio_alert_call";
+
+    public static final String PREF_CASIO_ALERT_EMAIL = "casio_alert_email";
+
+    public static final String PREF_CASIO_ALERT_OTHER = "casio_alert_other";
+
+    public static final String PREF_CASIO_ALERT_SMS = "casio_alert_sms";
     public static final String PREF_AUTOREMOVE_MESSAGE = "autoremove_message";
     public static final String PREF_AUTOREMOVE_NOTIFICATIONS = "autoremove_notifications";
     public static final String PREF_SCREEN_ON_ON_NOTIFICATIONS = "screen_on_on_notifications";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
index 298c19204..32efc921c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
@@ -399,6 +399,11 @@ public class DeviceSpecificSettingsFragment extends AbstractPreferenceFragment i
         addPreferenceHandlerFor(PREF_AUTOREMOVE_MESSAGE);
         addPreferenceHandlerFor(PREF_AUTOREMOVE_NOTIFICATIONS);
         addPreferenceHandlerFor(PREF_PREVIEW_MESSAGE_IN_TITLE);
+        addPreferenceHandlerFor(PREF_CASIO_ALERT_EMAIL);
+        addPreferenceHandlerFor(PREF_CASIO_ALERT_SMS);
+        addPreferenceHandlerFor(PREF_CASIO_ALERT_CALL);
+        addPreferenceHandlerFor(PREF_CASIO_ALERT_CALENDAR);
+        addPreferenceHandlerFor(PREF_CASIO_ALERT_OTHER);
         addPreferenceHandlerFor(PREF_SCREEN_ON_ON_NOTIFICATIONS);
         addPreferenceHandlerFor(PREF_WORKOUT_KEEP_SCREEN_ON);
         addPreferenceHandlerFor(PREF_KEY_VIBRATION);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/gbx100/CasioGBX100DeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/gbx100/CasioGBX100DeviceCoordinator.java
index e496d738b..e4f0e3789 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/gbx100/CasioGBX100DeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/gbx100/CasioGBX100DeviceCoordinator.java
@@ -165,7 +165,12 @@ public class CasioGBX100DeviceCoordinator extends CasioDeviceCoordinator {
                 R.xml.devicesettings_fake_ring_duration,
                 R.xml.devicesettings_autoremove_message,
                 R.xml.devicesettings_transliteration,
-                R.xml.devicesettings_preview_message_in_title
+                R.xml.devicesettings_preview_message_in_title,
+                R.xml.devicesettings_casio_alert_calendar,
+                R.xml.devicesettings_casio_alert_call,
+                R.xml.devicesettings_casio_alert_email,
+                R.xml.devicesettings_casio_alert_other,
+                R.xml.devicesettings_casio_alert_sms
         };
     }
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/CasioGBX100DeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/CasioGBX100DeviceSupport.java
index c0f5175f6..30db9ecd4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/CasioGBX100DeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/CasioGBX100DeviceSupport.java
@@ -32,8 +32,10 @@ import org.threeten.bp.ZonedDateTime;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
@@ -74,6 +76,11 @@ import nodomain.freeyourgadget.gadgetbridge.util.GB;
 
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_AUTOLIGHT;
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_AUTOREMOVE_MESSAGE;
+import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_CASIO_ALERT_CALENDAR;
+import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_CASIO_ALERT_CALL;
+import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_CASIO_ALERT_EMAIL;
+import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_CASIO_ALERT_OTHER;
+import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_CASIO_ALERT_SMS;
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_FAKE_RING_DURATION;
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_FIND_PHONE;
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_FIND_PHONE_DURATION;
@@ -258,14 +265,65 @@ public class CasioGBX100DeviceSupport extends Casio2C2DSupport implements Shared
         }
     }
 
+    /**
+     * Sends a notification to the watch module. Overloaded - this method does not specify a subtitle
+     * since subtitle isn't really used yet.
+     * @param icon Icon to use - see {@link CasioConstants}
+     * @param sender Sender (null if none)
+     * @param title Notification title (null if none)
+     * @param message Message body (null if none)
+     * @param id Notification id
+     * @param delete true if sending a delete of notification to the device
+     */
     private void showNotification(byte icon, String sender, String title, String message, int id, boolean delete) {
+        showNotification(icon, sender, title, null, message, id, delete);
+    }
+
+    /**
+     * Sends a notification to the watch module. Overloaded - this method does not specify a subtitle
+     * @param icon Icon to use - see {@link CasioConstants}
+     * @param sender Sender (null if none)
+     * @param title Notification title (null if none)
+     * @param subtitle Message subtitle (null if none)
+     * @param message Message body (null if none)
+     * @param id Notification id
+     */
+    private void showNotification(byte icon, String sender, String title, String subtitle, String message, int id, boolean delete) {
         SharedPreferences sharedPreferences = GBApplication.getDeviceSpecificSharedPrefs(getDevice().getAddress());
         boolean showMessagePreview = sharedPreferences.getBoolean(PREF_PREVIEW_MESSAGE_IN_TITLE, true);
-        if (showMessagePreview) {
-            title = title + "-" + message;
-            title = title.substring(0, Math.min(title.length(), 30));
-            title = title + "..";
+
+        boolean shouldAlert = true;
+        switch (icon) {
+            case CasioConstants.CATEGORY_EMAIL:
+                shouldAlert = sharedPreferences.getBoolean(PREF_CASIO_ALERT_EMAIL, true);
+                break;
+            case CasioConstants.CATEGORY_OTHER:
+                shouldAlert = sharedPreferences.getBoolean(PREF_CASIO_ALERT_OTHER, true);
+                break;
+            case CasioConstants.CATEGORY_SNS:
+                sharedPreferences.getBoolean(PREF_CASIO_ALERT_SMS, true);
+                break;
+            case CasioConstants.CATEGORY_INCOMING_CALL:
+                sharedPreferences.getBoolean(PREF_CASIO_ALERT_CALL, true);
+                break;
+            case CasioConstants.CATEGORY_SCHEDULE_AND_ALARM:
+                sharedPreferences.getBoolean(PREF_CASIO_ALERT_CALENDAR, true);
+                break;
         }
+
+        // If not a call or email, check the sender and if null, promote the title and message preview
+        // as subtitle
+        if (showMessagePreview && icon != CasioConstants.CATEGORY_INCOMING_CALL && icon != CasioConstants.CATEGORY_EMAIL) {
+            if (sender == null) {
+                // Shift title to sender slot
+                sender = title;
+            }
+            //Shift content to title
+            if (message != null) {
+                title = message.substring(0, Math.min(message.length(), 18)) + "..";
+            }
+        }
+
         byte[] titleBytes = new byte[0];
         if(title != null)
             titleBytes = title.getBytes(StandardCharsets.UTF_8);
@@ -278,68 +336,27 @@ public class CasioGBX100DeviceSupport extends Casio2C2DSupport implements Shared
         if(sender != null)
             senderBytes = sender.getBytes(StandardCharsets.UTF_8);
 
+        byte[] subtitleBytes = new byte[0];
+        if (subtitle != null)
+            subtitleBytes = subtitle.getBytes(StandardCharsets.UTF_8);
+
         byte[] arr = new byte[22];
         arr[0] = (byte)(id & 0xff);
         arr[1] = (byte) ((id >> 8) & 0xff);
         arr[2] = (byte) ((id >> 16) & 0xff);
         arr[3] = (byte) ((id >> 24) & 0xff);
         arr[4] = delete ? (byte) 0x02 : (byte) 0x00;
-        arr[5] = (byte) 0x01; // Set to 0x00 to not vibrate/ring for this notification
+        if (shouldAlert) {
+            arr[5] = (byte) 0x01; // Set to 0x0 to vibrate/ring for this notification
+        } else {
+            arr[5] = (byte) 0x00; // Set to 0x00 to not vibrate/ring for this notification
+        }
+
         arr[6] = icon;
 
-        ZonedDateTime timestamp = ZonedDateTime.now();
-        String deviceName = getDevice().getName();
-
-        // It seems that GBD-200 has a different timestamp format than other variants.
-        if (deviceName.endsWith(CasioGBX100DeviceCoordinator.GBD_200_SUB_MODEL)) {
-            // These bytes are likely for designating year, but GBD-200 does not display them
-            // For now leave as 0's until exact encoding can be verified
-            arr[7] = (byte) 0x00;
-            arr[8] = (byte) 0x00;
-            arr[9] = (byte) 0x00;
-            arr[10] = (byte) 0x00;
-
-            // Bytes 11 - 19 are timestamp
-            // Encode the timestamp of the notification
-            // Month
-            arr[11] = (byte) (timestamp.getMonthValue() / 10 + 3); // Tens digit, but offset by 3 for some reason
-            arr[12] = (byte) (timestamp.getMonthValue() % 10);
-            // Day
-            arr[13] = (byte) (timestamp.getDayOfMonth() / 10 + 3); // Tens digit, but offset by 3 for some reason
-            arr[14] = (byte) (timestamp.getDayOfMonth() % 10);
-            // ??
-            arr[15] = (byte) 0; // Not sure what this byte is for?
-            // Hour
-            arr[16] = (byte) (timestamp.getHour() / 10 + 3); // Tens digit, but offset by 3 for some reason
-            arr[17] = (byte) (timestamp.getHour() % 10);
-            // Minute
-            arr[18] = (byte) (timestamp.getMinute() / 10 + 3);// Tens digit, but offset by 3 for some reason
-            arr[19] = (byte) (timestamp.getMinute() % 10);
-
-            // Thes bytes are likely for designating seconds, but GBD-200 does not display them.
-            // For now leave as 0's until exact encoding can be verified.
-            arr[20] = (byte) 0x00;
-            arr[21] = (byte) 0x00;
-        } else {
-            // Other devices appear to use ASCII from initial investigation, information below
-            // These bytes contain a timestamp, not yet decoded / implemented
-            // ASCII Codes:
-            /*arr[7] = (byte) 0x32; // 2
-            arr[8] = (byte) 0x30;   // 0
-            arr[9] = (byte) 0x32;   // 2
-            arr[10] = (byte) 0x30;  // 0
-            arr[11] = (byte) 0x31;  // 1
-            arr[12] = (byte) 0x31;  // 1
-            arr[13] = (byte) 0x31;  // 1
-            arr[14] = (byte) 0x33;  // 3
-            arr[15] = (byte) 0x54;  // T
-            arr[16] = (byte) 0x30;  // 0
-            arr[17] = (byte) 0x39;  // 9
-            arr[18] = (byte) 0x33;  // 3
-            arr[19] = (byte) 0x31;  // 1
-            arr[20] = (byte) 0x35;  // 5
-            arr[21] = (byte) 0x33;*/// 3
-        }
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd'T'HHmmss");
+        String timestamp = dateFormat.format(new Date());
+        System.arraycopy(timestamp.getBytes(), 0, arr, 7, 15);
 
         byte[] copy = Arrays.copyOf(arr, arr.length + 2);
         copy[copy.length-2] = 0;
@@ -360,9 +377,17 @@ public class CasioGBX100DeviceSupport extends Casio2C2DSupport implements Shared
             System.arraycopy(titleBytes, 0, copy, copy.length - titleBytes.length, titleBytes.length);
         }
         copy = Arrays.copyOf(copy, copy.length + 2);
+
+        // Subtitle
         copy[copy.length-2] = 0;
         copy[copy.length-1] = 0;
-        //subtitle is currently not supported
+        if (subtitleBytes.length > 0) {
+            copy = Arrays.copyOf(copy, copy.length + subtitleBytes.length);
+            copy[copy.length-2-subtitleBytes.length] = (byte)(subtitleBytes.length & 0xff);
+            copy[copy.length-1-subtitleBytes.length] = (byte)((subtitleBytes.length >> 8) & 0xff);
+            System.arraycopy(subtitleBytes, 0, copy, copy.length - subtitleBytes.length, subtitleBytes.length);
+        }
+
         copy = Arrays.copyOf(copy, copy.length + 2);
         copy[copy.length-2] = 0;
         copy[copy.length-1] = 0;
@@ -395,6 +420,8 @@ public class CasioGBX100DeviceSupport extends Casio2C2DSupport implements Shared
                 icon = CasioConstants.CATEGORY_SCHEDULE_AND_ALARM;
                 break;
             case GENERIC_EMAIL:
+            case GMAIL:
+            case GOOGLE_INBOX:
                 icon = CasioConstants.CATEGORY_EMAIL;
                 break;
             case GENERIC_SMS:
@@ -539,7 +566,7 @@ public class CasioGBX100DeviceSupport extends Casio2C2DSupport implements Shared
     public void onSetCallState(final CallSpec callSpec) {
         switch (callSpec.command) {
             case CallSpec.CALL_INCOMING:
-                showNotification(CasioConstants.CATEGORY_INCOMING_CALL, "Phone", callSpec.name, callSpec.number, mLastCallId, false);
+                showNotification(CasioConstants.CATEGORY_INCOMING_CALL, callSpec.name, callSpec.number, "Phone Call", mLastCallId, false);
                 SharedPreferences sharedPreferences = GBApplication.getDeviceSpecificSharedPrefs(getDevice().getAddress());
                 boolean fakeRingDuration = sharedPreferences.getBoolean(PREF_FAKE_RING_DURATION, false);
                 if(fakeRingDuration && mFakeRingDurationCounter < CasioConstants.CASIO_FAKE_RING_RETRIES) {
@@ -671,6 +698,11 @@ public class CasioGBX100DeviceSupport extends Casio2C2DSupport implements Shared
                     // No action, we check the shared preferences when the device tries to ring the phone.
                     break;
                 case PREF_PREVIEW_MESSAGE_IN_TITLE:
+                case PREF_CASIO_ALERT_CALENDAR:
+                case PREF_CASIO_ALERT_CALL:
+                case PREF_CASIO_ALERT_EMAIL:
+                case PREF_CASIO_ALERT_OTHER:
+                case PREF_CASIO_ALERT_SMS:
                     // No action, we check it when message is received
                     break;
                 default:
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c11bab637..e70af4809 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -334,6 +334,16 @@
     <string name="pref_summary_custom_deviceicon">Show a device specific Android notification icon instead the Gadgetbridge icon when connected</string>
     <string name="pref_title_preview_message_in_title">Show a preview of the message in the title</string>
     <string name="pref_summary_preview_message_in_title">Shows a preview of the message in the title of a notification as allowed by the device</string>
+    <string name="pref_title_casio_alert_calendar">Alert for calendar notifications</string>
+    <string name="pref_summary_casio_alert_calendar">Alert (vibrate/beep) for calendar notifications</string>
+    <string name="pref_title_casio_alert_call">Alert for calendar calls</string>
+    <string name="pref_summary_casio_alert_call">Alert (vibrate/beep) for incoming calls</string>
+    <string name="pref_title_casio_alert_email">Alert for email notifications</string>
+    <string name="pref_summary_casio_alert_email">Alert (vibrate/beep) for email notifications</string>
+    <string name="pref_title_casio_alert_sms">Alert for SMS notifications</string>
+    <string name="pref_summary_casio_alert_sms">Alert (vibrate/beep) for SMS (text message) notifications</string>
+    <string name="pref_title_casio_alert_other">Alert for "other" notifications</string>
+    <string name="pref_summary_casio_alert_other">Alert (vibrate/beep) for notifications in the "other" category</string>
     <string name="pref_title_autoremove_notifications">Autoremove dismissed notifications</string>
     <string name="pref_summary_autoremove_notifications">Notifications are automatically removed from the device when dismissed from the phone</string>
     <string name="pref_title_screen_on_on_notifications">Screen On on Notifications</string>
diff --git a/app/src/main/res/xml/devicesettings_casio_alert_calendar.xml b/app/src/main/res/xml/devicesettings_casio_alert_calendar.xml
new file mode 100644
index 000000000..e5b2cb790
--- /dev/null
+++ b/app/src/main/res/xml/devicesettings_casio_alert_calendar.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <SwitchPreference
+        android:defaultValue="true"
+        android:icon="@android:drawable/ic_menu_my_calendar"
+        android:key="casio_alert_calendar"
+        android:summary="@string/pref_summary_casio_alert_calendar"
+        android:title="@string/pref_title_casio_alert_calendar" />
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/devicesettings_casio_alert_call.xml b/app/src/main/res/xml/devicesettings_casio_alert_call.xml
new file mode 100644
index 000000000..e676fb6bb
--- /dev/null
+++ b/app/src/main/res/xml/devicesettings_casio_alert_call.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <SwitchPreference
+        android:defaultValue="true"
+        android:icon="@android:drawable/ic_menu_call"
+        android:key="casio_alert_call"
+        android:summary="@string/pref_summary_casio_alert_call"
+        android:title="@string/pref_title_casio_alert_call" />
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/devicesettings_casio_alert_email.xml b/app/src/main/res/xml/devicesettings_casio_alert_email.xml
new file mode 100644
index 000000000..372565041
--- /dev/null
+++ b/app/src/main/res/xml/devicesettings_casio_alert_email.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <SwitchPreference
+        android:defaultValue="true"
+        android:icon="@android:drawable/ic_dialog_email"
+        android:key="casio_alert_email"
+        android:summary="@string/pref_summary_casio_alert_email"
+        android:title="@string/pref_title_casio_alert_email" />
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/devicesettings_casio_alert_other.xml b/app/src/main/res/xml/devicesettings_casio_alert_other.xml
new file mode 100644
index 000000000..c5ef58e0c
--- /dev/null
+++ b/app/src/main/res/xml/devicesettings_casio_alert_other.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <SwitchPreference
+        android:defaultValue="true"
+        android:icon="@android:drawable/ic_menu_help"
+        android:key="casio_alert_other"
+        android:summary="@string/pref_summary_casio_alert_other"
+        android:title="@string/pref_title_casio_alert_other" />
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/devicesettings_casio_alert_sms.xml b/app/src/main/res/xml/devicesettings_casio_alert_sms.xml
new file mode 100644
index 000000000..b7d820cd3
--- /dev/null
+++ b/app/src/main/res/xml/devicesettings_casio_alert_sms.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <SwitchPreference
+        android:defaultValue="true"
+        android:icon="@drawable/ic_message_outline"
+        android:key="casio_alert_other"
+        android:summary="@string/pref_summary_casio_alert_other"
+        android:title="@string/pref_title_casio_alert_other" />
+</androidx.preference.PreferenceScreen>
\ No newline at end of file

From 85d0722ffe13953d369ce3ea2f81aea1e78d85ec Mon Sep 17 00:00:00 2001
From: foxstidious <foxstidious@gmail.com>
Date: Sun, 8 Oct 2023 21:03:32 -0400
Subject: [PATCH 148/595] Updates to address findings on PR

---
 .../gbx100/CasioGBX100DeviceCoordinator.java  | 24 +++++++++-----
 .../res/xml/devicesettings_casio_alert.xml    | 33 +++++++++++++++++++
 .../devicesettings_casio_alert_calendar.xml   |  9 -----
 .../xml/devicesettings_casio_alert_call.xml   |  9 -----
 .../xml/devicesettings_casio_alert_email.xml  |  9 -----
 .../xml/devicesettings_casio_alert_other.xml  |  9 -----
 .../xml/devicesettings_casio_alert_sms.xml    |  9 -----
 7 files changed, 49 insertions(+), 53 deletions(-)
 create mode 100644 app/src/main/res/xml/devicesettings_casio_alert.xml
 delete mode 100644 app/src/main/res/xml/devicesettings_casio_alert_calendar.xml
 delete mode 100644 app/src/main/res/xml/devicesettings_casio_alert_call.xml
 delete mode 100644 app/src/main/res/xml/devicesettings_casio_alert_email.xml
 delete mode 100644 app/src/main/res/xml/devicesettings_casio_alert_other.xml
 delete mode 100644 app/src/main/res/xml/devicesettings_casio_alert_sms.xml

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/gbx100/CasioGBX100DeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/gbx100/CasioGBX100DeviceCoordinator.java
index e4f0e3789..3ababcb87 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/gbx100/CasioGBX100DeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/gbx100/CasioGBX100DeviceCoordinator.java
@@ -40,9 +40,7 @@ import nodomain.freeyourgadget.gadgetbridge.entities.CasioGBX100ActivitySampleDa
 import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
 import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
-import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.casio.gbx100.CasioGBX100DeviceSupport;
 
@@ -59,11 +57,25 @@ public class CasioGBX100DeviceCoordinator extends CasioDeviceCoordinator {
     /** Sub-model string for GBD-H1000 in GB Device name */
     public static final String GBD_H1000_SUB_MODEL = "GBD-H1000";
 
+    public static final String[] VARIANTS = {
+            GBX_100_SUB_MODEL,
+            GBD_200_SUB_MODEL,
+            GBD_100_SUB_MODEL,
+            GBD_H1000_SUB_MODEL};
+
     protected static final Logger LOG = LoggerFactory.getLogger(CasioGBX100DeviceCoordinator.class);
 
     @Override
     protected Pattern getSupportedDeviceName() {
-        return Pattern.compile("CASIO.*(" + GBX_100_SUB_MODEL + "|" + GBD_100_SUB_MODEL + "|" + GBD_200_SUB_MODEL + "|" + GBD_H1000_SUB_MODEL + ")");
+        String pattern = CASIO_IDENTIFIER + ".*(";
+        for (int i = 0; i < VARIANTS.length; i++) {
+            pattern += VARIANTS[i];
+            if (i < VARIANTS.length - 1) {
+                pattern += "|";
+            }
+        }
+        pattern += ")";
+        return Pattern.compile(pattern);
     }
 
     @Override
@@ -166,11 +178,7 @@ public class CasioGBX100DeviceCoordinator extends CasioDeviceCoordinator {
                 R.xml.devicesettings_autoremove_message,
                 R.xml.devicesettings_transliteration,
                 R.xml.devicesettings_preview_message_in_title,
-                R.xml.devicesettings_casio_alert_calendar,
-                R.xml.devicesettings_casio_alert_call,
-                R.xml.devicesettings_casio_alert_email,
-                R.xml.devicesettings_casio_alert_other,
-                R.xml.devicesettings_casio_alert_sms
+                R.xml.devicesettings_casio_alert
         };
     }
 
diff --git a/app/src/main/res/xml/devicesettings_casio_alert.xml b/app/src/main/res/xml/devicesettings_casio_alert.xml
new file mode 100644
index 000000000..becf269ea
--- /dev/null
+++ b/app/src/main/res/xml/devicesettings_casio_alert.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <SwitchPreference
+        android:defaultValue="true"
+        android:icon="@android:drawable/ic_menu_my_calendar"
+        android:key="casio_alert_calendar"
+        android:summary="@string/pref_summary_casio_alert_calendar"
+        android:title="@string/pref_title_casio_alert_calendar" />
+    <SwitchPreference
+        android:defaultValue="true"
+        android:icon="@android:drawable/ic_menu_call"
+        android:key="casio_alert_call"
+        android:summary="@string/pref_summary_casio_alert_call"
+        android:title="@string/pref_title_casio_alert_call" />
+    <SwitchPreference
+        android:defaultValue="true"
+        android:icon="@drawable/ic_email"
+        android:key="casio_alert_email"
+        android:summary="@string/pref_summary_casio_alert_email"
+        android:title="@string/pref_title_casio_alert_email" />
+    <SwitchPreference
+        android:defaultValue="true"
+        android:icon="@android:drawable/ic_menu_help"
+        android:key="casio_alert_other"
+        android:summary="@string/pref_summary_casio_alert_other"
+        android:title="@string/pref_title_casio_alert_other" />
+    <SwitchPreference
+        android:defaultValue="true"
+        android:icon="@drawable/ic_message_outline"
+        android:key="casio_alert_sms"
+        android:summary="@string/pref_summary_casio_alert_other"
+        android:title="@string/pref_title_casio_alert_other" />
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/devicesettings_casio_alert_calendar.xml b/app/src/main/res/xml/devicesettings_casio_alert_calendar.xml
deleted file mode 100644
index e5b2cb790..000000000
--- a/app/src/main/res/xml/devicesettings_casio_alert_calendar.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
-        android:defaultValue="true"
-        android:icon="@android:drawable/ic_menu_my_calendar"
-        android:key="casio_alert_calendar"
-        android:summary="@string/pref_summary_casio_alert_calendar"
-        android:title="@string/pref_title_casio_alert_calendar" />
-</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/devicesettings_casio_alert_call.xml b/app/src/main/res/xml/devicesettings_casio_alert_call.xml
deleted file mode 100644
index e676fb6bb..000000000
--- a/app/src/main/res/xml/devicesettings_casio_alert_call.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
-        android:defaultValue="true"
-        android:icon="@android:drawable/ic_menu_call"
-        android:key="casio_alert_call"
-        android:summary="@string/pref_summary_casio_alert_call"
-        android:title="@string/pref_title_casio_alert_call" />
-</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/devicesettings_casio_alert_email.xml b/app/src/main/res/xml/devicesettings_casio_alert_email.xml
deleted file mode 100644
index 372565041..000000000
--- a/app/src/main/res/xml/devicesettings_casio_alert_email.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
-        android:defaultValue="true"
-        android:icon="@android:drawable/ic_dialog_email"
-        android:key="casio_alert_email"
-        android:summary="@string/pref_summary_casio_alert_email"
-        android:title="@string/pref_title_casio_alert_email" />
-</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/devicesettings_casio_alert_other.xml b/app/src/main/res/xml/devicesettings_casio_alert_other.xml
deleted file mode 100644
index c5ef58e0c..000000000
--- a/app/src/main/res/xml/devicesettings_casio_alert_other.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
-        android:defaultValue="true"
-        android:icon="@android:drawable/ic_menu_help"
-        android:key="casio_alert_other"
-        android:summary="@string/pref_summary_casio_alert_other"
-        android:title="@string/pref_title_casio_alert_other" />
-</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/devicesettings_casio_alert_sms.xml b/app/src/main/res/xml/devicesettings_casio_alert_sms.xml
deleted file mode 100644
index b7d820cd3..000000000
--- a/app/src/main/res/xml/devicesettings_casio_alert_sms.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
-        android:defaultValue="true"
-        android:icon="@drawable/ic_message_outline"
-        android:key="casio_alert_other"
-        android:summary="@string/pref_summary_casio_alert_other"
-        android:title="@string/pref_title_casio_alert_other" />
-</androidx.preference.PreferenceScreen>
\ No newline at end of file

From be9b83eebf22e814b9483d4a51576d0dfd17ab38 Mon Sep 17 00:00:00 2001
From: foxstidious <foxstidious@gmail.com>
Date: Sun, 8 Oct 2023 21:05:47 -0400
Subject: [PATCH 149/595] Fixed SMS copy/paste error

---
 app/src/main/res/xml/devicesettings_casio_alert.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/xml/devicesettings_casio_alert.xml b/app/src/main/res/xml/devicesettings_casio_alert.xml
index becf269ea..506b04421 100644
--- a/app/src/main/res/xml/devicesettings_casio_alert.xml
+++ b/app/src/main/res/xml/devicesettings_casio_alert.xml
@@ -28,6 +28,6 @@
         android:defaultValue="true"
         android:icon="@drawable/ic_message_outline"
         android:key="casio_alert_sms"
-        android:summary="@string/pref_summary_casio_alert_other"
-        android:title="@string/pref_title_casio_alert_other" />
+        android:summary="@string/pref_summary_casio_alert_sms"
+        android:title="@string/pref_title_casio_alert_sms" />
 </androidx.preference.PreferenceScreen>
\ No newline at end of file

From 264ab14847fa164e4741c4b71d1209d441cd759d Mon Sep 17 00:00:00 2001
From: foxstidious <foxstidious@gmail.com>
Date: Sun, 8 Oct 2023 21:07:37 -0400
Subject: [PATCH 150/595] Fixed alert logic

---
 .../devices/casio/gbx100/CasioGBX100DeviceSupport.java      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/CasioGBX100DeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/CasioGBX100DeviceSupport.java
index 30db9ecd4..abccff8cf 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/CasioGBX100DeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/CasioGBX100DeviceSupport.java
@@ -301,13 +301,13 @@ public class CasioGBX100DeviceSupport extends Casio2C2DSupport implements Shared
                 shouldAlert = sharedPreferences.getBoolean(PREF_CASIO_ALERT_OTHER, true);
                 break;
             case CasioConstants.CATEGORY_SNS:
-                sharedPreferences.getBoolean(PREF_CASIO_ALERT_SMS, true);
+                shouldAlert = sharedPreferences.getBoolean(PREF_CASIO_ALERT_SMS, true);
                 break;
             case CasioConstants.CATEGORY_INCOMING_CALL:
-                sharedPreferences.getBoolean(PREF_CASIO_ALERT_CALL, true);
+                shouldAlert = sharedPreferences.getBoolean(PREF_CASIO_ALERT_CALL, true);
                 break;
             case CasioConstants.CATEGORY_SCHEDULE_AND_ALARM:
-                sharedPreferences.getBoolean(PREF_CASIO_ALERT_CALENDAR, true);
+                shouldAlert = sharedPreferences.getBoolean(PREF_CASIO_ALERT_CALENDAR, true);
                 break;
         }
 

From 1f115426fc351ff63ddffd9f7204a7d08ac592ea Mon Sep 17 00:00:00 2001
From: foxstidious <foxstidious@gmail.com>
Date: Mon, 9 Oct 2023 20:13:25 -0400
Subject: [PATCH 151/595] Added preview message in title preference file

---
 .../res/xml/devicesettings_preview_message_in_title.xml  | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 app/src/main/res/xml/devicesettings_preview_message_in_title.xml

diff --git a/app/src/main/res/xml/devicesettings_preview_message_in_title.xml b/app/src/main/res/xml/devicesettings_preview_message_in_title.xml
new file mode 100644
index 000000000..4c72099df
--- /dev/null
+++ b/app/src/main/res/xml/devicesettings_preview_message_in_title.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <SwitchPreference
+        android:defaultValue="true"
+        android:icon="@android:drawable/ic_menu_view"
+        android:key="preview_message_in_title"
+        android:summary="@string/pref_summary_preview_message_in_title"
+        android:title="@string/pref_title_preview_message_in_title" />
+</androidx.preference.PreferenceScreen>
\ No newline at end of file

From 40af20a176795ac07d911c358a462bdea7cb6f18 Mon Sep 17 00:00:00 2001
From: foxstidious <foxstidious@gmail.com>
Date: Fri, 13 Oct 2023 14:00:53 -0400
Subject: [PATCH 152/595] Removed call to start intent if no companion,
 defaulted companion preference to true, and reordered casio alert preferences
 to match watch order.

---
 .../service/AbstractDeviceSupport.java        |  6 +--
 app/src/main/res/values/strings.xml           |  2 +-
 .../res/xml/devicesettings_casio_alert.xml    | 40 +++++++++----------
 ...evicesettings_preview_message_in_title.xml |  2 +-
 .../res/xml/discovery_pairing_preferences.xml |  2 +-
 5 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java
index a3b82469b..78b1c1d87 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java
@@ -274,12 +274,8 @@ public abstract class AbstractDeviceSupport implements DeviceSupport {
             context.startActivity(intent);
             LOG.debug("CompanionDeviceManager associations were found, starting intent");
         } else {
-            LOG.warn("CompanionDeviceManager associations were not found, going to try to start intent anyway");
             GB.notify(GB.NOTIFICATION_ID_PHONE_FIND, notification.build(), context);
-            // Originally the Phone Find activity wasn't being started if no companion associations.
-            // Casio GDB-200 doesn't register companion but this still seems to work, so keeping
-            // warning but starting activity anyway
-            context.startActivity(intent);
+            LOG.warn("CompanionDeviceManager associations were not found, can't start intent");
         }
     }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e70af4809..fd6e9fbda 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -336,7 +336,7 @@
     <string name="pref_summary_preview_message_in_title">Shows a preview of the message in the title of a notification as allowed by the device</string>
     <string name="pref_title_casio_alert_calendar">Alert for calendar notifications</string>
     <string name="pref_summary_casio_alert_calendar">Alert (vibrate/beep) for calendar notifications</string>
-    <string name="pref_title_casio_alert_call">Alert for calendar calls</string>
+    <string name="pref_title_casio_alert_call">Alert for incoming calls</string>
     <string name="pref_summary_casio_alert_call">Alert (vibrate/beep) for incoming calls</string>
     <string name="pref_title_casio_alert_email">Alert for email notifications</string>
     <string name="pref_summary_casio_alert_email">Alert (vibrate/beep) for email notifications</string>
diff --git a/app/src/main/res/xml/devicesettings_casio_alert.xml b/app/src/main/res/xml/devicesettings_casio_alert.xml
index 506b04421..c5327fe6a 100644
--- a/app/src/main/res/xml/devicesettings_casio_alert.xml
+++ b/app/src/main/res/xml/devicesettings_casio_alert.xml
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
-        android:defaultValue="true"
-        android:icon="@android:drawable/ic_menu_my_calendar"
-        android:key="casio_alert_calendar"
-        android:summary="@string/pref_summary_casio_alert_calendar"
-        android:title="@string/pref_title_casio_alert_calendar" />
-    <SwitchPreference
-        android:defaultValue="true"
-        android:icon="@android:drawable/ic_menu_call"
-        android:key="casio_alert_call"
-        android:summary="@string/pref_summary_casio_alert_call"
-        android:title="@string/pref_title_casio_alert_call" />
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="true"
         android:icon="@drawable/ic_email"
         android:key="casio_alert_email"
         android:summary="@string/pref_summary_casio_alert_email"
         android:title="@string/pref_title_casio_alert_email" />
-    <SwitchPreference
-        android:defaultValue="true"
-        android:icon="@android:drawable/ic_menu_help"
-        android:key="casio_alert_other"
-        android:summary="@string/pref_summary_casio_alert_other"
-        android:title="@string/pref_title_casio_alert_other" />
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="true"
         android:icon="@drawable/ic_message_outline"
         android:key="casio_alert_sms"
         android:summary="@string/pref_summary_casio_alert_sms"
         android:title="@string/pref_title_casio_alert_sms" />
+    <SwitchPreferenceCompat
+        android:defaultValue="true"
+        android:icon="@android:drawable/ic_menu_call"
+        android:key="casio_alert_call"
+        android:summary="@string/pref_summary_casio_alert_call"
+        android:title="@string/pref_title_casio_alert_call" />
+    <SwitchPreferenceCompat
+        android:defaultValue="true"
+        android:icon="@android:drawable/ic_menu_my_calendar"
+        android:key="casio_alert_calendar"
+        android:summary="@string/pref_summary_casio_alert_calendar"
+        android:title="@string/pref_title_casio_alert_calendar" />
+    <SwitchPreferenceCompat
+        android:defaultValue="true"
+        android:icon="@android:drawable/ic_menu_help"
+        android:key="casio_alert_other"
+        android:summary="@string/pref_summary_casio_alert_other"
+        android:title="@string/pref_title_casio_alert_other" />
 </androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/devicesettings_preview_message_in_title.xml b/app/src/main/res/xml/devicesettings_preview_message_in_title.xml
index 4c72099df..cfd18189b 100644
--- a/app/src/main/res/xml/devicesettings_preview_message_in_title.xml
+++ b/app/src/main/res/xml/devicesettings_preview_message_in_title.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="true"
         android:icon="@android:drawable/ic_menu_view"
         android:key="preview_message_in_title"
diff --git a/app/src/main/res/xml/discovery_pairing_preferences.xml b/app/src/main/res/xml/discovery_pairing_preferences.xml
index c21b4f7a5..4871f7fe1 100644
--- a/app/src/main/res/xml/discovery_pairing_preferences.xml
+++ b/app/src/main/res/xml/discovery_pairing_preferences.xml
@@ -10,7 +10,7 @@
         android:title="@string/ignore_bonded_devices"
         app:iconSpaceReserved="false" />
     <SwitchPreferenceCompat
-        android:defaultValue="false"
+        android:defaultValue="true"
         android:key="enable_companiondevice_pairing"
         android:layout="@layout/preference_checkbox"
         android:summary="@string/companiondevice_pairing_details"

From deeaf28de45ffc676446424e34e4bbabb8234d69 Mon Sep 17 00:00:00 2001
From: foxstidious <foxstidious@gmail.com>
Date: Fri, 13 Oct 2023 16:21:33 -0400
Subject: [PATCH 153/595] Limit characters in heading and subheading to 32 (or
 else casio won't display the notification)

---
 .../gbx100/CasioGBX100DeviceSupport.java      | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/CasioGBX100DeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/CasioGBX100DeviceSupport.java
index abccff8cf..99d2cdebb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/CasioGBX100DeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/CasioGBX100DeviceSupport.java
@@ -324,21 +324,32 @@ public class CasioGBX100DeviceSupport extends Casio2C2DSupport implements Shared
             }
         }
 
+        // Make sure title and sender are less than 32 characters
         byte[] titleBytes = new byte[0];
-        if(title != null)
+        if(title != null) {
+            if (title.length() > 32) {
+                title = title.substring(0, 30) + "..";
+            }
             titleBytes = title.getBytes(StandardCharsets.UTF_8);
+        }
 
         byte[] messageBytes = new byte[0];
-        if(message != null)
+        if(message != null) {
             messageBytes = message.getBytes(StandardCharsets.UTF_8);
+        }
 
         byte[] senderBytes = new byte[0];
-        if(sender != null)
+        if(sender != null) {
+            if (sender.length() > 32) {
+                sender = sender.substring(0, 30) + "..";
+            }
             senderBytes = sender.getBytes(StandardCharsets.UTF_8);
+        }
 
         byte[] subtitleBytes = new byte[0];
-        if (subtitle != null)
+        if (subtitle != null) {
             subtitleBytes = subtitle.getBytes(StandardCharsets.UTF_8);
+        }
 
         byte[] arr = new byte[22];
         arr[0] = (byte)(id & 0xff);

From 23b2b4247f55f1072422eb092c22339b60ba3590 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sat, 25 Nov 2023 22:53:55 +0000
Subject: [PATCH 154/595] Revert companion pairing to false by default

---
 app/src/main/res/xml/discovery_pairing_preferences.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/xml/discovery_pairing_preferences.xml b/app/src/main/res/xml/discovery_pairing_preferences.xml
index 4871f7fe1..c21b4f7a5 100644
--- a/app/src/main/res/xml/discovery_pairing_preferences.xml
+++ b/app/src/main/res/xml/discovery_pairing_preferences.xml
@@ -10,7 +10,7 @@
         android:title="@string/ignore_bonded_devices"
         app:iconSpaceReserved="false" />
     <SwitchPreferenceCompat
-        android:defaultValue="true"
+        android:defaultValue="false"
         android:key="enable_companiondevice_pairing"
         android:layout="@layout/preference_checkbox"
         android:summary="@string/companiondevice_pairing_details"

From fead9c641d8fe0af61ada11c6562a5fdf9d06963 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sat, 25 Nov 2023 22:57:25 +0000
Subject: [PATCH 155/595] Update changelog

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 122cdb9e4..65af1c801 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,11 @@
 * Bangle.js: Lower threshold for low battery warning
 * Bangle.js: Recover from device initialization failure
 * Casio GBX100/GBD-200: Fix first connect
+* Casio GB5600/6900/STB-1000: Fix pairing
+* Casio GDB-200: Fix notification timestamp
+* Casio GDB-200: Fixed notification categories and default category
+* Casio GDB-200: Allow preview of notification message alongside title
+* Casio GDB-200: Fixed find my phone feature
 * Fossil/Skagen Hybrids: Add new navigation app
 * Fossil/Skagen Hybrids: Allow configuring call rejection method
 * Fossil/Skagen Hybrids: Fix some preference crashes on the nightly

From ee3b4d4aa1e06c846bddb4078c71a7d353e2f2de Mon Sep 17 00:00:00 2001
From: ssilverr <ssilverr@noreply.codeberg.org>
Date: Thu, 19 Oct 2023 15:31:18 +0000
Subject: [PATCH 156/595] added HungarianTransliterator

---
 .../util/language/LanguageUtils.java          |  2 +
 .../impl/HungarianTransliterator.java         | 38 +++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/HungarianTransliterator.java

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/LanguageUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/LanguageUtils.java
index 91bfd2933..400fab933 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/LanguageUtils.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/LanguageUtils.java
@@ -48,6 +48,7 @@ import nodomain.freeyourgadget.gadgetbridge.util.language.impl.GeorgianTranslite
 import nodomain.freeyourgadget.gadgetbridge.util.language.impl.GermanTransliterator;
 import nodomain.freeyourgadget.gadgetbridge.util.language.impl.GreekTransliterator;
 import nodomain.freeyourgadget.gadgetbridge.util.language.impl.HebrewTransliterator;
+import nodomain.freeyourgadget.gadgetbridge.util.language.impl.HungarianTransliterator;
 import nodomain.freeyourgadget.gadgetbridge.util.language.impl.IcelandicTransliterator;
 import nodomain.freeyourgadget.gadgetbridge.util.language.impl.KoreanTransliterator;
 import nodomain.freeyourgadget.gadgetbridge.util.language.impl.LatvianTransliterator;
@@ -75,6 +76,7 @@ public class LanguageUtils {
         put("german", new GermanTransliterator());
         put("greek", new GreekTransliterator());
         put("hebrew", new HebrewTransliterator());
+        put("hungarian", new HungarianTransliterator())
         put("icelandic", new IcelandicTransliterator());
         put("korean", new KoreanTransliterator());
         put("latvian", new LatvianTransliterator());
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/HungarianTransliterator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/HungarianTransliterator.java
new file mode 100644
index 000000000..6b1013fde
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/HungarianTransliterator.java
@@ -0,0 +1,38 @@
+/*  Copyright (C) 2017-2022 Andreas Shimokawa, Aniruddha Adhikary, Daniele
+    Gobbetti, ivanovlev, kalaee, lazarosfs, McSym28, M. Hadi, Roi Greenberg,
+    Taavi Eomäe, Ted Stein, Thomas, Yaron Shahrabani, José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.util.language.impl;
+
+import java.util.HashMap;
+
+import nodomain.freeyourgadget.gadgetbridge.util.language.SimpleTransliterator;
+
+public class HungarianTransliterator extends SimpleTransliterator {
+    public HungarianTransliterator() {
+        super(new HashMap<Character, String>() {{
+            put('á', "a");
+            put('é', "e");
+            put('í', "i");
+            put('ó', "o");
+            put('ö', "o");
+            put('ő', "o");
+            put('ü', "u");
+            put('ű', "u");
+        }});
+    }
+}

From 58a8484322761fb55e1c6539b9c759988ecea9e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Korn=C3=A9l=20Schmidt?= <kornel.schmidt@clubspot.app>
Date: Tue, 31 Oct 2023 07:33:06 +0100
Subject: [PATCH 157/595] added test, added to defaultLanguagesIfEnabled

---
 .../freeyourgadget/gadgetbridge/GBApplication.java     |  2 +-
 .../gadgetbridge/util/language/LanguageUtilsTest.java  | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
index 9309e4b19..56b5f010a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
@@ -1186,7 +1186,7 @@ public class GBApplication extends Application {
 
         if (oldVersion < 16) {
             // If transliteration was enabled for a device, migrate it to the per-language setting
-            final String defaultLanguagesIfEnabled = "extended_ascii,common_symbols,scandinavian,german,russian,hebrew,greek,ukranian,arabic,persian,latvian,lithuanian,polish,estonian,icelandic,czech,turkish,bengali,korean";
+            final String defaultLanguagesIfEnabled = "extended_ascii,common_symbols,scandinavian,german,russian,hebrew,greek,ukranian,arabic,persian,latvian,lithuanian,polish,estonian,icelandic,czech,turkish,bengali,korean,hungarian";
             try (DBHandler db = acquireDB()) {
                 final DaoSession daoSession = db.getDaoSession();
                 final List<Device> activeDevices = DBHelper.getActiveDevices(daoSession);
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/util/language/LanguageUtilsTest.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/util/language/LanguageUtilsTest.java
index 0f25a5244..ab50e784f 100644
--- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/util/language/LanguageUtilsTest.java
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/util/language/LanguageUtilsTest.java
@@ -189,6 +189,16 @@ public class LanguageUtilsTest extends TestBase {
         assertEquals("georgian transliteration failed", expected, output);
     }
 
+        @Test
+    public void testStringTransliterateHungarian() {
+        final Transliterator transliterator = LanguageUtils.getTransliterator("hungarian");
+
+        String input = "á é í ó ö ő ü ű";
+        String output = transliterator.transliterate(input);
+        String expected = "a e i o o u u";
+        assertEquals("hungarian transliteration failed", expected, output);
+    }
+
     @Test
     public void testStringTransliterateCommonSymbols() {
         final Transliterator transliterator = LanguageUtils.getTransliterator("common_symbols");

From 34039094c1937c8c2de3e6102f0d34baf0337b05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sat, 25 Nov 2023 23:04:39 +0000
Subject: [PATCH 158/595] Fix hungarian transliterator

---
 .../gadgetbridge/util/language/LanguageUtils.java               | 2 +-
 app/src/main/res/values/arrays.xml                              | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/LanguageUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/LanguageUtils.java
index 400fab933..52d926066 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/LanguageUtils.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/LanguageUtils.java
@@ -76,7 +76,7 @@ public class LanguageUtils {
         put("german", new GermanTransliterator());
         put("greek", new GreekTransliterator());
         put("hebrew", new HebrewTransliterator());
-        put("hungarian", new HungarianTransliterator())
+        put("hungarian", new HungarianTransliterator());
         put("icelandic", new IcelandicTransliterator());
         put("korean", new KoreanTransliterator());
         put("latvian", new LatvianTransliterator());
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 1d09263ae..2de3ca53b 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -3220,6 +3220,7 @@
         <item>@string/scandinavian</item>
         <item>@string/turkish</item>
         <item>@string/ukranian</item>
+        <item>@string/hungarian</item>
     </string-array>
 
     <string-array name="pref_transliteration_languages_values">
@@ -3245,6 +3246,7 @@
         <item>scandinavian</item>
         <item>turkish</item>
         <item>ukranian</item>
+        <item>hungarian</item>
     </string-array>
 
     <string-array name="pref_transliteration_languages_default">

From 096358c76f0d928226a83bb23db886cdf9697735 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sat, 25 Nov 2023 23:08:02 +0000
Subject: [PATCH 159/595] Fix unit tests

---
 .../devices/xiaomi/activity/XiaomiActivityFileIdTest.java   | 6 +++---
 .../gadgetbridge/util/language/LanguageUtilsTest.java       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileIdTest.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileIdTest.java
index 576974cda..f214d0f10 100644
--- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileIdTest.java
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileIdTest.java
@@ -53,9 +53,9 @@ public class XiaomiActivityFileIdTest {
         assertEquals(1697182497000L, expectedFileId.getTimestamp().getTime());
         assertEquals(4, expectedFileId.getTimezone());
         assertEquals(3, expectedFileId.getVersion());
-        assertEquals(1, expectedFileId.getType());
-        assertEquals(8, expectedFileId.getSubtype());
-        assertEquals(0, expectedFileId.getDetailType());
+        assertEquals(XiaomiActivityFileId.Type.SPORTS, expectedFileId.getType());
+        assertEquals(XiaomiActivityFileId.Subtype.SPORTS_FREESTYLE, expectedFileId.getSubtype());
+        assertEquals(XiaomiActivityFileId.DetailType.DETAILS, expectedFileId.getDetailType());
     }
 
     @Test
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/util/language/LanguageUtilsTest.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/util/language/LanguageUtilsTest.java
index ab50e784f..9375451aa 100644
--- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/util/language/LanguageUtilsTest.java
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/util/language/LanguageUtilsTest.java
@@ -195,7 +195,7 @@ public class LanguageUtilsTest extends TestBase {
 
         String input = "á é í ó ö ő ü ű";
         String output = transliterator.transliterate(input);
-        String expected = "a e i o o u u";
+        String expected = "a e i o o o u u";
         assertEquals("hungarian transliteration failed", expected, output);
     }
 

From eacb9be55238a65eb66f22dfadc25579d3baf42f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sat, 25 Nov 2023 23:08:05 +0000
Subject: [PATCH 160/595] Update changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 65af1c801..51a93cdac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -50,7 +50,7 @@
 * Zepp OS: Fix setting of unknown button press apps
 * Zepp OS: Fix sunrise and moon dates being off by local time + UTC offset
 * Zepp OS: Map hiking, outdoor swimming, climbing and table tennis activity types
-* Add transliteration for Latvian and Common Symbols
+* Add transliteration for Latvian, Hungarian, Common Symbols
 * Autodetect OsmAnd package name and make it configurable
 * Make GMaps navigation handler follow the "navigation forwarding" setting
 * Support selecting enabled navigation apps

From 6f2876fa66b41781f4fa3ad4352b7e81e1524bd6 Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Sun, 26 Nov 2023 00:22:37 +0100
Subject: [PATCH 161/595] Mi Watch 3 Lite: Fix firmware update

(not enabled yet)
---
 .../xiaomi/services/XiaomiDataUploadService.java  | 15 ++++++++++++---
 app/src/main/proto/xiaomi.proto                   |  3 ++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiDataUploadService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiDataUploadService.java
index cffe771e7..9299fa81e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiDataUploadService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiDataUploadService.java
@@ -50,6 +50,8 @@ public class XiaomiDataUploadService extends AbstractXiaomiService {
     private byte currentType;
     private byte[] currentBytes;
 
+    private int chunkSize;
+
     public XiaomiDataUploadService(final XiaomiSupport support) {
         super(support);
     }
@@ -59,14 +61,21 @@ public class XiaomiDataUploadService extends AbstractXiaomiService {
         switch (cmd.getSubtype()) {
             case CMD_UPLOAD_START:
                 final XiaomiProto.DataUploadAck dataUploadAck = cmd.getDataUpload().getDataUploadAck();
-                LOG.debug("Got upload start, unknown2={}, unknown4={}", dataUploadAck.getUnknown2(), dataUploadAck.getUnknown4());
+                LOG.debug("Got upload start, unknown2={}, resumePosition={}", dataUploadAck.getUnknown2(), dataUploadAck.getResumePosition());
 
-                if (dataUploadAck.getUnknown2() != 0 || dataUploadAck.getUnknown4() != 0) {
+                if (dataUploadAck.getUnknown2() != 0 || dataUploadAck.getResumePosition() != 0) {
                     LOG.warn("Unexpected response");
                     this.currentType = 0;
                     this.currentBytes = null;
                     return;
                 }
+
+                if (dataUploadAck.hasChunkSize()) {
+                    chunkSize = dataUploadAck.getChunkSize();
+                } else {
+                    chunkSize = 2048;
+                }
+
                 doUpload(currentType, currentBytes);
                 return;
         }
@@ -131,7 +140,7 @@ public class XiaomiDataUploadService extends AbstractXiaomiService {
         buf2.putInt(CheckSums.getCRC32(buf1.array()));
 
         final byte[] payload = buf2.array();
-        final int partSize = 2044; // 2 + 2 at beginning of each for total and progress
+        final int partSize = chunkSize - 4; // 2 + 2 at beginning of each for total and progress
         final int totalParts = (int) Math.ceil(payload.length / (float) partSize);
 
         characteristic.setCallback(remainingParts -> {
diff --git a/app/src/main/proto/xiaomi.proto b/app/src/main/proto/xiaomi.proto
index 51a6934d0..fba30a3f4 100644
--- a/app/src/main/proto/xiaomi.proto
+++ b/app/src/main/proto/xiaomi.proto
@@ -869,5 +869,6 @@ message DataUploadRequest {
 message DataUploadAck {
   optional bytes md5sum = 1;
   optional uint32 unknown2 = 2; // 0
-  optional uint32 unknown4 = 4; // 0
+  optional uint32 resumePosition = 4;
+  optional uint32 chunkSize = 5; // 4096 on Redmi Watch 3 Active, Nonexistent on Mi Band 8
 }

From 11ccf86056a245a2c8659f0916032486d2331426 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sun, 26 Nov 2023 17:53:38 +0000
Subject: [PATCH 162/595] Redmi Watch 3 Active: Fix name

---
 CHANGELOG.md | 2 +-
 README.md    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51a93cdac..113ea772f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,7 @@
 * Experimental support for Amazfit Active Edge
 * Experimental support for Mi Band 8
 * Experimental support for Mi Watch Lite
-* Experimental support for Redmi Watch 3 Lite
+* Experimental support for Redmi Watch 3 Active
 * Amazfit Band 7: Add alexa menu entries
 * Amazfit GTR 3 Pro: Fix firmware and watchface upload
 * Amazfit T-Rex: Fix activity summary parsing
diff --git a/README.md b/README.md
index 3192c2de5..f1f535eec 100644
--- a/README.md
+++ b/README.md
@@ -98,7 +98,7 @@ vendor's servers.
 	- [Xiaomi Smart Band 7](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Mi-Band-7) [**\[!\]**](#special-pairing-procedures)
 	- [Xiaomi Smart Band 8 (experimental)](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Mi-Band-8) [**\[!\]**](#special-pairing-procedures)
     - Mi Watch Lite (experimental)
-    - Redmi Watch 3 Lite (experimental)
+    - Redmi Watch 3 Active (experimental)
 	- Xiaomi Temperature and Humidity Monitor Clock (LYWSD02/LYWSD02MMC) (partial support)
 	- Scale 2 (Currently only displays a toast after stepping on the scale)
 - [MyKronoz ZeTime](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/MyKronoz-ZeTime)

From e53c67e8bf8f4c4134d7f2ecff86cd636526856c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sun, 26 Nov 2023 18:03:20 +0000
Subject: [PATCH 163/595] Xiaomi: Fix SpO2

---
 .../AbstractSampleToTimeSampleProvider.java   |  6 +-
 .../devices/xiaomi/XiaomiCoordinator.java     | 24 +------
 .../xiaomi/XiaomiSpo2SampleProvider.java      | 66 +++++++++++++++++++
 .../gadgetbridge/model/Spo2Sample.java        |  1 +
 4 files changed, 74 insertions(+), 23 deletions(-)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSpo2SampleProvider.java

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractSampleToTimeSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractSampleToTimeSampleProvider.java
index c65b58e61..1b10367d0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractSampleToTimeSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractSampleToTimeSampleProvider.java
@@ -41,6 +41,7 @@ public abstract class AbstractSampleToTimeSampleProvider<T extends TimeSample, S
         mSession = session;
     }
 
+    @Nullable
     protected abstract T convertSample(final S sample);
 
     public GBDevice getDevice() {
@@ -57,7 +58,10 @@ public abstract class AbstractSampleToTimeSampleProvider<T extends TimeSample, S
         final List<S> upstreamSamples = mSampleProvider.getAllActivitySamples((int) (timestampFrom / 1000L), (int) (timestampTo / 1000L));
         final List<T> ret = new ArrayList<>();
         for (final S sample : upstreamSamples) {
-            ret.add(convertSample(sample));
+            final T converted = convertSample(sample);
+            if (converted != null) {
+                ret.add(converted);
+            }
         }
         return ret;
     }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
index 6d68ce2fc..7e818fc33 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
@@ -76,8 +76,7 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
 
     @Override
     public TimeSampleProvider<? extends Spo2Sample> getSpo2SampleProvider(final GBDevice device, final DaoSession session) {
-        // TODO XiaomiSpo2SampleProvider
-        return super.getSpo2SampleProvider(device, session);
+        return new XiaomiSpo2SampleProvider(device, session);
     }
 
     @Override
@@ -156,24 +155,6 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
         return AppManagerActivity.class;
     }
 
-    @Override
-    public File getAppCacheDir() throws IOException {
-        // TODO we don't need this
-        return new File(FileUtils.getExternalFilesDir(), "xiaomi-app-cache");
-    }
-
-    @Override
-    public String getAppCacheSortFilename() {
-        // TODO we don't need this
-        return "xiaomi-app-cache-order.txt";
-    }
-
-    @Override
-    public String getAppFileExtension() {
-        // TODO we don't need this
-        return ".bin";
-    }
-
     @Override
     public boolean supportsAppListFetching() {
         return true;
@@ -217,8 +198,7 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
 
     @Override
     public boolean supportsSpo2() {
-        // TODO it does, but not yet implemented, so let's not crash
-        return false;
+        return true;
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSpo2SampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSpo2SampleProvider.java
new file mode 100644
index 000000000..c499a287d
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSpo2SampleProvider.java
@@ -0,0 +1,66 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.AbstractSampleToTimeSampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.entities.XiaomiActivitySample;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.model.Spo2Sample;
+
+public class XiaomiSpo2SampleProvider extends AbstractSampleToTimeSampleProvider<Spo2Sample, XiaomiActivitySample> {
+    public XiaomiSpo2SampleProvider(final GBDevice device, final DaoSession session) {
+        super(new XiaomiSampleProvider(device, session), device, session);
+    }
+
+    @Override
+    protected Spo2Sample convertSample(final XiaomiActivitySample sample) {
+        if (sample.getSpo2() == 0) {
+            return null;
+        }
+
+        return new XiaomiSpo2Sample(
+                sample.getTimestamp() * 1000L,
+                sample.getSpo2()
+        );
+    }
+
+    protected static class XiaomiSpo2Sample implements Spo2Sample {
+        private final long timestamp;
+        private final int spo2;
+
+        public XiaomiSpo2Sample(final long timestamp, final int spo2) {
+            this.timestamp = timestamp;
+            this.spo2 = spo2;
+        }
+
+        @Override
+        public long getTimestamp() {
+            return timestamp;
+        }
+
+        @Override
+        public Type getType() {
+            return Type.UNKNOWN;
+        }
+
+        @Override
+        public int getSpo2() {
+            return spo2;
+        }
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/Spo2Sample.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/Spo2Sample.java
index 67a8c14dc..9982d550d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/Spo2Sample.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/Spo2Sample.java
@@ -20,6 +20,7 @@ public interface Spo2Sample extends TimeSample {
     enum Type {
         MANUAL(0),
         AUTOMATIC(1),
+        UNKNOWN(2),
         ;
 
         private final int num;

From 636f4adc8d563bdc4e420112136c2f8a7bb81f73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sun, 26 Nov 2023 18:13:39 +0000
Subject: [PATCH 164/595] Zepp OS: Delete device data when deleting device

---
 .../devices/huami/Huami2021Coordinator.java   | 42 +++++++++++++++++--
 1 file changed, 39 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021Coordinator.java
index ef4348c65..4550da2dc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021Coordinator.java
@@ -36,7 +36,6 @@ import nodomain.freeyourgadget.gadgetbridge.activities.appmanager.AppManagerActi
 import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSpecificSettingsCustomizer;
 import nodomain.freeyourgadget.gadgetbridge.capabilities.HeartRateCapability;
 import nodomain.freeyourgadget.gadgetbridge.capabilities.password.PasswordCapabilityImpl;
-import de.greenrobot.dao.query.QueryBuilder;
 import nodomain.freeyourgadget.gadgetbridge.GBException;
 import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
 import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
@@ -46,6 +45,13 @@ import nodomain.freeyourgadget.gadgetbridge.entities.AbstractActivitySample;
 import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.entities.HuamiExtendedActivitySampleDao;
+import nodomain.freeyourgadget.gadgetbridge.entities.HuamiHeartRateManualSampleDao;
+import nodomain.freeyourgadget.gadgetbridge.entities.HuamiHeartRateMaxSampleDao;
+import nodomain.freeyourgadget.gadgetbridge.entities.HuamiHeartRateRestingSampleDao;
+import nodomain.freeyourgadget.gadgetbridge.entities.HuamiPaiSampleDao;
+import nodomain.freeyourgadget.gadgetbridge.entities.HuamiSleepRespiratoryRateSampleDao;
+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;
@@ -216,8 +222,38 @@ public abstract class Huami2021Coordinator extends HuamiCoordinator {
                                 @NonNull final Device device,
                                 @NonNull final DaoSession session) throws GBException {
         final Long deviceId = device.getId();
-        final QueryBuilder<?> qb = session.getHuamiExtendedActivitySampleDao().queryBuilder();
-        qb.where(HuamiExtendedActivitySampleDao.Properties.DeviceId.eq(deviceId)).buildDelete().executeDeleteWithoutDetachingEntities();
+
+        session.getHuamiExtendedActivitySampleDao().queryBuilder()
+                .where(HuamiExtendedActivitySampleDao.Properties.DeviceId.eq(deviceId))
+                .buildDelete().executeDeleteWithoutDetachingEntities();
+
+        session.getHuamiStressSampleDao().queryBuilder()
+                .where(HuamiStressSampleDao.Properties.DeviceId.eq(deviceId))
+                .buildDelete().executeDeleteWithoutDetachingEntities();
+
+        session.getHuamiSpo2SampleDao().queryBuilder()
+                .where(HuamiSpo2SampleDao.Properties.DeviceId.eq(deviceId))
+                .buildDelete().executeDeleteWithoutDetachingEntities();
+
+        session.getHuamiHeartRateManualSampleDao().queryBuilder()
+                .where(HuamiHeartRateManualSampleDao.Properties.DeviceId.eq(deviceId))
+                .buildDelete().executeDeleteWithoutDetachingEntities();
+
+        session.getHuamiHeartRateMaxSampleDao().queryBuilder()
+                .where(HuamiHeartRateMaxSampleDao.Properties.DeviceId.eq(deviceId))
+                .buildDelete().executeDeleteWithoutDetachingEntities();
+
+        session.getHuamiHeartRateRestingSampleDao().queryBuilder()
+                .where(HuamiHeartRateRestingSampleDao.Properties.DeviceId.eq(deviceId))
+                .buildDelete().executeDeleteWithoutDetachingEntities();
+
+        session.getHuamiPaiSampleDao().queryBuilder()
+                .where(HuamiPaiSampleDao.Properties.DeviceId.eq(deviceId))
+                .buildDelete().executeDeleteWithoutDetachingEntities();
+
+        session.getHuamiSleepRespiratoryRateSampleDao().queryBuilder()
+                .where(HuamiSleepRespiratoryRateSampleDao.Properties.DeviceId.eq(deviceId))
+                .buildDelete().executeDeleteWithoutDetachingEntities();
     }
 
     @Override

From 50cdcec846e92494909525445ded9183e3285417 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sun, 26 Nov 2023 18:14:34 +0000
Subject: [PATCH 165/595] Xiaomi: Delete device data when deleting device

---
 .../devices/xiaomi/XiaomiCoordinator.java         | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
index 7e818fc33..d16fe9c11 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
@@ -17,18 +17,14 @@
 package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi;
 
 import android.app.Activity;
-import android.bluetooth.le.ScanFilter;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import org.apache.commons.lang3.ArrayUtils;
 
-import java.io.File;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.List;
 
 import nodomain.freeyourgadget.gadgetbridge.BuildConfig;
@@ -43,6 +39,7 @@ import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.devices.TimeSampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.Device;
+import nodomain.freeyourgadget.gadgetbridge.entities.XiaomiActivitySampleDao;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.model.AbstractNotificationPattern;
 import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
@@ -52,16 +49,18 @@ import nodomain.freeyourgadget.gadgetbridge.model.PaiSample;
 import nodomain.freeyourgadget.gadgetbridge.model.SleepRespiratoryRateSample;
 import nodomain.freeyourgadget.gadgetbridge.model.Spo2Sample;
 import nodomain.freeyourgadget.gadgetbridge.model.StressSample;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.HuamiLanguageType;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl.WorkoutSummaryParser;
-import nodomain.freeyourgadget.gadgetbridge.util.FileUtils;
 
 public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
     @Override
     protected void deleteDevice(@NonNull final GBDevice gbDevice,
                                 @NonNull final Device device,
                                 @NonNull final DaoSession session) throws GBException {
-        // TODO, and fix on zepp
+        final Long deviceId = device.getId();
+
+        session.getXiaomiActivitySampleDao().queryBuilder()
+                .where(XiaomiActivitySampleDao.Properties.DeviceId.eq(deviceId))
+                .buildDelete().executeDeleteWithoutDetachingEntities();
     }
 
     @Override
@@ -311,7 +310,7 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
         final List<Integer> settings = new ArrayList<>();
 
         // TODO review this
-        
+
         //
         // Time
         //

From c5757ea478c8f36a7df61dc766bcc9c466552c94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sun, 26 Nov 2023 21:01:13 +0000
Subject: [PATCH 166/595] Mi Band 8: Improve stress charts

---
 .../devices/xiaomi/XiaomiStressSampleProvider.java            | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiStressSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiStressSampleProvider.java
index fb9706b63..6a8d15f67 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiStressSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiStressSampleProvider.java
@@ -29,6 +29,10 @@ public class XiaomiStressSampleProvider extends AbstractSampleToTimeSampleProvid
 
     @Override
     protected StressSample convertSample(final XiaomiActivitySample sample) {
+        if (sample.getStress() == 0) {
+            return null;
+        }
+
         return new XiaomiStressSample(
                 sample.getTimestamp() * 1000L,
                 sample.getStress()

From ae75f82a637482d3b8fd070382e029031d635b65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sun, 26 Nov 2023 21:14:46 +0000
Subject: [PATCH 167/595] Zepp OS: Improve activity fetch logging

---
 .../devices/huami/operations/AbstractFetchOperation.java      | 4 ++++
 1 file changed, 4 insertions(+)

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 6c026576a..bf9dc1228 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
@@ -153,6 +153,8 @@ public abstract class AbstractFetchOperation extends AbstractHuamiOperation {
             }
         }
 
+        LOG.debug("All operations finished");
+
         GB.updateTransferNotification(null, "", false, 100, getContext());
         operationFinished();
         unsetBusy();
@@ -325,6 +327,8 @@ public abstract class AbstractFetchOperation extends AbstractHuamiOperation {
             return;
         }
 
+        LOG.debug("Sending ack 2021, keepDataOnDevice = {}", keepDataOnDevice);
+
         // 0x01 to ACK, mark as saved on phone (drop from band)
         // 0x09 to ACK, but keep it marked as not saved
         // If 0x01 is sent, detailed information seems to be discarded, and is not sent again anymore

From 99b3dc3226f98e3b2adf322f62efdbc105311a68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Tue, 28 Nov 2023 18:12:12 +0000
Subject: [PATCH 168/595] Fix crash when pairing current device as companion

---
 .../gadgetbridge/activities/DebugActivity.java               | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DebugActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DebugActivity.java
index 0fbbd2209..2be4d031d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DebugActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DebugActivity.java
@@ -63,6 +63,7 @@ import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
 import androidx.appcompat.app.AlertDialog;
 import androidx.core.app.ActivityCompat;
@@ -778,7 +779,7 @@ public class DebugActivity extends AbstractGBActivity {
 
         final GBDevice device = devices.get(0);
 
-        final CompanionDeviceManager manager = (CompanionDeviceManager) GBApplication.getContext().getSystemService(Context.COMPANION_DEVICE_SERVICE);
+        final CompanionDeviceManager manager = (CompanionDeviceManager) getSystemService(Context.COMPANION_DEVICE_SERVICE);
 
         if (manager.getAssociations().contains(device.getAddress())) {
             GB.toast(device.getAliasOrName() + " already paired as companion", Toast.LENGTH_LONG, GB.INFO);
@@ -801,7 +802,7 @@ public class DebugActivity extends AbstractGBActivity {
             }
 
             @Override
-            public void onDeviceFound(final IntentSender chooserLauncher) {
+            public void onDeviceFound(@NonNull final IntentSender chooserLauncher) {
                 GB.toast("Found device", Toast.LENGTH_SHORT, GB.INFO);
 
                 try {

From ec73b244ee7b0fa73388e6499e39c5778385ee6e Mon Sep 17 00:00:00 2001
From: mormegil <mormegil@centrum.cz>
Date: Tue, 28 Nov 2023 13:25:58 +0100
Subject: [PATCH 169/595] Improve ASCII transliterator

We should use NFKD instead of NFD since we are flattening to US-ASCII
afterwards anyway. This allows various Unicode characters which would
end up as a question mark to be represented by their compatibility
decomposition. This applies to e.g. ligatures (e.g. U+FB01 LATIN SMALL
LIGATURE FI will now be replaced with plain fi instead of a question
mark), and also the U+00A0 NO-BREAK SPACE [NBSP] to be replaced by
a normal space instead of a question mark.

+Add Czech fancy quotes to the Czech transliterator
+Add a unit test for Multitransliterator
---
 .../language/impl/CzechTransliterator.java    |  1 +
 .../impl/FlattenToAsciiTransliterator.java    |  4 +--
 .../util/language/LanguageUtilsTest.java      | 27 ++++++++++++++-----
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/CzechTransliterator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/CzechTransliterator.java
index 47098327d..e7c87c139 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/CzechTransliterator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/CzechTransliterator.java
@@ -27,6 +27,7 @@ public class CzechTransliterator extends SimpleTransliterator {
         super(new HashMap<Character, String>() {{
             put('ř',"r"); put('ě',"e"); put('ý',"y"); put('á',"a"); put('í',"i"); put('é',"e");
             put('ó',"o"); put('ú',"u"); put('ů',"u"); put('ď',"d"); put('ť',"t"); put('ň',"n");
+            put('„', "\""); put('“', "\""); put('‚', "'"); put('‘', "'");
         }});
     }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/FlattenToAsciiTransliterator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/FlattenToAsciiTransliterator.java
index 01ca0e7e0..4478eda2b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/FlattenToAsciiTransliterator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/FlattenToAsciiTransliterator.java
@@ -32,8 +32,8 @@ public class FlattenToAsciiTransliterator implements Transliterator {
             return txt;
         }
 
-        // Decompose the string into its canonical decomposition (splits base characters from accents/marks)
-        txt = Normalizer.normalize(txt, Normalizer.Form.NFD);
+        // Decompose the string into its compatible decomposition (splits base characters from accents/marks, and changes some characters to compatibility version)
+        txt = Normalizer.normalize(txt, Normalizer.Form.NFKD);
         // Remove all marks (characters intended to be combined with another character), keeping the base glyphs
         txt = txt.replaceAll("\\p{M}", "");
         // Flatten the resulting string to ASCII
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/util/language/LanguageUtilsTest.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/util/language/LanguageUtilsTest.java
index 9375451aa..08a359860 100644
--- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/util/language/LanguageUtilsTest.java
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/util/language/LanguageUtilsTest.java
@@ -4,9 +4,13 @@ import android.content.SharedPreferences;
 
 import org.junit.Test;
 
+import java.util.Arrays;
+
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.test.TestBase;
+import nodomain.freeyourgadget.gadgetbridge.util.language.impl.CzechTransliterator;
+import nodomain.freeyourgadget.gadgetbridge.util.language.impl.ExtendedAsciiTransliterator;
 import nodomain.freeyourgadget.gadgetbridge.util.language.impl.FlattenToAsciiTransliterator;
 
 import static org.junit.Assert.assertEquals;
@@ -96,9 +100,9 @@ public class LanguageUtilsTest extends TestBase {
         final Transliterator transliterator = LanguageUtils.getTransliterator("bengali");
 
         // input with cyrillic and diacritic letters
-        String[] inputs = { "অনিরুদ্ধ", "বিজ্ঞানযাত্রা চলছে চলবে।", "আমি সব দেখেশুনে ক্ষেপে গিয়ে করি বাঙলায় চিৎকার!",
-                "আমার জাভা কোড is so bad! কী আর বলবো!" };
-        String[] outputs = { "oniruddho", "biggaanJaatraa cholchhe cholbe.",
+        String[] inputs = {"অনিরুদ্ধ", "বিজ্ঞানযাত্রা চলছে চলবে।", "আমি সব দেখেশুনে ক্ষেপে গিয়ে করি বাঙলায় চিৎকার!",
+                "আমার জাভা কোড is so bad! কী আর বলবো!"};
+        String[] outputs = {"oniruddho", "biggaanJaatraa cholchhe cholbe.",
                 "aami sob dekheshune kkhepe giye kori baanglaay chitkaar!",
                 "aamaar jaabhaa koD is so bad! kii aar bolbo!"};
 
@@ -189,7 +193,7 @@ public class LanguageUtilsTest extends TestBase {
         assertEquals("georgian transliteration failed", expected, output);
     }
 
-        @Test
+    @Test
     public void testStringTransliterateHungarian() {
         final Transliterator transliterator = LanguageUtils.getTransliterator("hungarian");
 
@@ -227,12 +231,23 @@ public class LanguageUtilsTest extends TestBase {
     @Test
     public void testFlattenToAscii() throws Exception {
         final FlattenToAsciiTransliterator transliterator = new FlattenToAsciiTransliterator();
-        String input = "ä ș ț ă";
+        String input = "ä ș ț ă fine";
         String output = transliterator.transliterate(input);
-        String expected = "a s t a";
+        String expected = "a s t a fine";
         assertEquals("flatten to ascii transliteration failed", expected, output);
     }
 
+    @Test
+    public void testMultitransliterator() throws Exception {
+        final MultiTransliterator multiTransliterator = new MultiTransliterator(Arrays.asList(
+                new CzechTransliterator(),
+                new ExtendedAsciiTransliterator(),
+                new FlattenToAsciiTransliterator()
+        ));
+        assertEquals("Zlutoucky kun upel \"dabelske\" \"ody\"", multiTransliterator.transliterate("Žluťoučký kůň úpěl »ďábelské« „ódy“"));
+        assertEquals("300 Kc", multiTransliterator.transliterate("300\u00A0Kč"));
+    }
+
     @Test
     public void testTransliterateOption() throws Exception {
         enableTransliteration(false);

From 8ef80a256585a699cfba83d0ec201c81cb33fd0d Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Wed, 29 Nov 2023 10:04:33 +0000
Subject: [PATCH 170/595] Bangle.js: ensure GPS speed is reported correctly
 when the phone is providing it

---
 .../service/devices/banglejs/BangleJSDeviceSupport.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java
index 8c0ef65f4..9b4264a50 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java
@@ -1095,7 +1095,7 @@ public class BangleJSDeviceSupport extends AbstractBTLEDeviceSupport {
             o.put("lat", location.getLatitude());
             o.put("lon", location.getLongitude());
             o.put("alt", location.getAltitude());
-            o.put("speed", location.getSpeed());
+            o.put("speed", location.getSpeed()*3.6); // m/s to kph
             if (location.hasBearing()) o.put("course", location.getBearing());
             o.put("time", location.getTime());
             if (location.getExtras() != null) {

From 6933b8a793fcc15e71a081815e1d2e65b88272f8 Mon Sep 17 00:00:00 2001
From: MrYoranimo <yvulker@gmail.com>
Date: Sun, 26 Nov 2023 21:24:12 +0100
Subject: [PATCH 171/595] Add device coordinator for Xiaomi Watch S1 Active

---
 .../XiaomiWatchS1ActiveCoordinator.java       | 70 +++++++++++++++++++
 .../gadgetbridge/model/DeviceType.java        |  2 +
 app/src/main/res/values/strings.xml           |  1 +
 3 files changed, 73 insertions(+)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs1active/XiaomiWatchS1ActiveCoordinator.java

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs1active/XiaomiWatchS1ActiveCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs1active/XiaomiWatchS1ActiveCoordinator.java
new file mode 100644
index 000000000..17b25f1d6
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs1active/XiaomiWatchS1ActiveCoordinator.java
@@ -0,0 +1,70 @@
+/*  Copyright (C) 2023 Yoran Vulker
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.watchs1active;
+
+import android.content.Context;
+import android.net.Uri;
+
+import androidx.annotation.Nullable;
+
+import java.util.regex.Pattern;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiEncryptedCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiInstallHandler;
+
+public class XiaomiWatchS1ActiveCoordinator extends XiaomiEncryptedCoordinator {
+
+    @Override
+    public int getDeviceNameResource() {
+        return R.string.devicetype_xiaomi_watch_s1_active;
+    }
+
+    @Override
+    protected Pattern getSupportedDeviceName() {
+        return Pattern.compile("^XiaomiWatchS1Active [0-9A-Z]{4}$");
+    }
+
+    @Override
+    public boolean isExperimental() {
+        return true;
+    }
+
+    @Nullable
+    @Override
+    public InstallHandler findInstallHandler(Uri uri, Context context) {
+        final XiaomiInstallHandler handler = new XiaomiInstallHandler(uri, context);
+
+        return handler.isValid() ? handler : null;
+    }
+
+    @Override
+    public int getDefaultIconResource() {
+        return R.drawable.ic_device_watchxplus;
+    }
+
+    @Override
+    public int getDisabledIconResource() {
+        return R.drawable.ic_device_watchxplus_disabled;
+    }
+
+    @Override
+    public boolean supportsMultipleWeatherLocations() {
+        return true;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
index 8fc4aacc1..1c5be9147 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
@@ -141,6 +141,7 @@ import nodomain.freeyourgadget.gadgetbridge.devices.waspos.WaspOSCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.watch9.Watch9DeviceCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.withingssteelhr.WithingsSteelHRDeviceCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.miband8.MiBand8Coordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.watchs1active.XiaomiWatchS1ActiveCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xwatch.XWatchCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.zetime.ZeTimeCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.miwatch.MiWatchLiteCoordinator;
@@ -198,6 +199,7 @@ public enum DeviceType {
     MIBAND8(MiBand8Coordinator.class),
     MIWATCHLITE(MiWatchLiteCoordinator.class),
     REDMIWATCH3ACTIVE(RedmiWatch3ActiveCoordinator.class),
+    XIAOMI_WATCH_S1_ACTIVE(XiaomiWatchS1ActiveCoordinator.class),
     AMAZFITGTS3(AmazfitGTS3Coordinator.class),
     AMAZFITGTR3(AmazfitGTR3Coordinator.class),
     AMAZFITGTR4(AmazfitGTR4Coordinator.class),
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fd6e9fbda..02dcddb81 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2429,4 +2429,5 @@
     <string name="wake_up_time">Wake Up</string>
     <string name="pref_sleep_mode_schedule_title">Sleep Mode Schedule</string>
     <string name="pref_sleep_mode_schedule_summary">Send a reminder and enter sleep mode at bedtime. At the scheduled wake-up time, the wake-up alarm will sound.</string>
+    <string name="devicetype_xiaomi_watch_s1_active">Xiaomi Watch S1 Active</string>
 </resources>

From 20cdef5283b4a6b926226807db41e141ef5678cf Mon Sep 17 00:00:00 2001
From: MrYoranimo <yvulker@gmail.com>
Date: Sun, 26 Nov 2023 21:45:17 +0100
Subject: [PATCH 172/595] Change some required fields to optional in Xiaomi
 protobuf specs

The Xiaomi Watch S1 Active does not send some fields that have
been declared as `required`, which results in those messages
not being processed at all.
---
 app/src/main/proto/xiaomi.proto | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/proto/xiaomi.proto b/app/src/main/proto/xiaomi.proto
index fba30a3f4..6203ab046 100644
--- a/app/src/main/proto/xiaomi.proto
+++ b/app/src/main/proto/xiaomi.proto
@@ -56,7 +56,7 @@ message AuthStep3 {
 
 message AuthStep4 {
   required uint32 unknown1 = 1;
-  required uint32 unknown2 = 2;
+  optional uint32 unknown2 = 2;
 }
 
 message AuthDeviceInfo {
@@ -415,7 +415,7 @@ message HeartRate {
   optional AdvancedMonitoring advancedMonitoring = 5;
   optional uint32 unknown7 = 7; // 1
   optional HeartRateAlarmLow heartRateAlarmLow = 8;
-  required uint32 breathingScore = 9; // 1 on, 2 off
+  optional uint32 breathingScore = 9; // 1 on, 2 off
 }
 
 message AdvancedMonitoring {

From dd6d9bd271752e4248b36b9448bc846c629dcd9a Mon Sep 17 00:00:00 2001
From: MrYoranimo <yvulker@gmail.com>
Date: Wed, 29 Nov 2023 20:23:24 +0100
Subject: [PATCH 173/595] Add device icon for Mi Watch, Xiaomi Watch S1 Active

---
 .../XiaomiWatchS1ActiveCoordinator.java       |  4 +-
 .../main/res/drawable/ic_device_miwatch.xml   | 52 ++++++++++++++++++
 .../drawable/ic_device_miwatch_disabled.xml   | 53 +++++++++++++++++++
 3 files changed, 107 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_device_miwatch.xml
 create mode 100644 app/src/main/res/drawable/ic_device_miwatch_disabled.xml

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs1active/XiaomiWatchS1ActiveCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs1active/XiaomiWatchS1ActiveCoordinator.java
index 17b25f1d6..63470f1c0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs1active/XiaomiWatchS1ActiveCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs1active/XiaomiWatchS1ActiveCoordinator.java
@@ -55,12 +55,12 @@ public class XiaomiWatchS1ActiveCoordinator extends XiaomiEncryptedCoordinator {
 
     @Override
     public int getDefaultIconResource() {
-        return R.drawable.ic_device_watchxplus;
+        return R.drawable.ic_device_miwatch;
     }
 
     @Override
     public int getDisabledIconResource() {
-        return R.drawable.ic_device_watchxplus_disabled;
+        return R.drawable.ic_device_miwatch_disabled;
     }
 
     @Override
diff --git a/app/src/main/res/drawable/ic_device_miwatch.xml b/app/src/main/res/drawable/ic_device_miwatch.xml
new file mode 100644
index 000000000..e699a4960
--- /dev/null
+++ b/app/src/main/res/drawable/ic_device_miwatch.xml
@@ -0,0 +1,52 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
+    <path
+        android:fillColor="#1f7fdb"
+        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
+        android:strokeWidth="3.57115173" />
+    <path
+        android:fillColor="#4dabf5"
+        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
+        android:strokeWidth="3.57115173" />
+    <path
+        android:fillColor="#2196f3"
+        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
+        android:strokeWidth="3.57115173" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M17.39 6.396h0.637a0.499 0.499 0 0 1 0.499 0.5v14.377a0.499 0.499 0 0 1-0.499 0.498H17.39a0.499 0.499 0 0 1-0.499-0.498V6.895a0.499 0.499 0 0 1 0.499-0.499z"
+        android:strokeWidth="3.87336898" />
+    <group
+        android:translateX="20"
+        android:translateY="16"
+        android:rotation="30">
+        <path
+            android:fillColor="#ffffff"
+            android:pathData="M0 0h0.36a0.499 0.499 0 0 1 0.5 0.5v1.465a0.499 0.499 0 0 1-0.5 0.5h-0.36z"
+            android:strokeWidth="3.5" />
+    </group>
+    <group
+        android:translateX="18.75"
+        android:translateY="10"
+        android:rotation="-30">
+        <path
+            android:fillColor="#ffffff"
+            android:pathData="M0 0h0.36a0.499 0.499 0 0 1 0.5 0.5v1.465a0.499 0.499 0 0 1-0.5 0.5h-0.36z"
+            android:strokeWidth="3.5" />
+    </group>
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M10.667 6.396h0.638a0.499 0.499 0 0 1 0.498 0.5v14.377a0.499 0.499 0 0 1-0.498 0.498h-0.638a0.499 0.499 0 0 1-0.498-0.498V6.895a0.499 0.499 0 0 1 0.498-0.499z"
+        android:strokeWidth="3.87336898" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M8.456 14.053a5.923 6.099 0 1 0 11.846 0 5.923 6.099 0 1 0-11.846 0z"
+        android:strokeWidth="9.28846169" />
+    <path
+        android:fillColor="#2196f3"
+        android:pathData="M9.95 14.014a4.464 4.597 0 1 0 8.929 0 4.464 4.597 0 1 0-8.928 0z"
+        android:strokeWidth="7.00060892" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_device_miwatch_disabled.xml b/app/src/main/res/drawable/ic_device_miwatch_disabled.xml
new file mode 100644
index 000000000..667483f9f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_device_miwatch_disabled.xml
@@ -0,0 +1,53 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="45sp"
+    android:height="45sp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
+    <path
+        android:fillColor="#7a7a7a"
+        android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z"
+        android:strokeWidth="3.57115173" />
+    <path
+        android:fillAlpha="0.9411765"
+        android:fillColor="#9f9f9f"
+        android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z"
+        android:strokeWidth="3.57115173" />
+    <path
+        android:fillColor="#8a8a8a"
+        android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z"
+        android:strokeWidth="3.57115173" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M17.39 6.396h0.637a0.499 0.499 0 0 1 0.499 0.5v14.377a0.499 0.499 0 0 1-0.499 0.498H17.39a0.499 0.499 0 0 1-0.499-0.498V6.895a0.499 0.499 0 0 1 0.499-0.499z"
+        android:strokeWidth="3.87336898" />
+    <group
+        android:translateX="20"
+        android:translateY="16"
+        android:rotation="30">
+        <path
+            android:fillColor="#ffffff"
+            android:pathData="M0 0h0.36a0.499 0.499 0 0 1 0.5 0.5v1.465a0.499 0.499 0 0 1-0.5 0.5h-0.36z"
+            android:strokeWidth="3.5" />
+    </group>
+    <group
+        android:translateX="18.75"
+        android:translateY="10"
+        android:rotation="-30">
+        <path
+            android:fillColor="#ffffff"
+            android:pathData="M0 0h0.36a0.499 0.499 0 0 1 0.5 0.5v1.465a0.499 0.499 0 0 1-0.5 0.5h-0.36z"
+            android:strokeWidth="3.5" />
+    </group>
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M10.667 6.396h0.638a0.499 0.499 0 0 1 0.498 0.5v14.377a0.499 0.499 0 0 1-0.498 0.498h-0.638a0.499 0.499 0 0 1-0.498-0.498V6.895a0.499 0.499 0 0 1 0.498-0.499z"
+        android:strokeWidth="3.87336898" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M8.456 14.053a5.923 6.099 0 1 0 11.846 0 5.923 6.099 0 1 0-11.846 0z"
+        android:strokeWidth="9.28846169" />
+    <path
+        android:fillColor="#8a8a8a"
+        android:pathData="M9.95 14.014a4.464 4.597 0 1 0 8.929 0 4.464 4.597 0 1 0-8.928 0z"
+        android:strokeWidth="7.00060892" />
+</vector>

From 0c4e2df075a95d367a0e097a3a6489acc8c8879a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Wed, 29 Nov 2023 21:11:54 +0000
Subject: [PATCH 174/595] Xiaomi: Fix crash when opening app manager

Regression introduced by e53c67e8bf8f4c4134d7f2ecff86cd636526856c
---
 .../activities/appmanager/AbstractAppManagerFragment.java    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AbstractAppManagerFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AbstractAppManagerFragment.java
index cae5dd197..1a8063d73 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AbstractAppManagerFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AbstractAppManagerFragment.java
@@ -279,6 +279,11 @@ public abstract class AbstractAppManagerFragment extends Fragment {
             return cachedAppList;
         }
 
+        if (cachePath == null) {
+            LOG.warn("Cached apps path is null");
+            return Collections.emptyList();
+        }
+
         File[] files;
         if (uuids == null) {
             files = cachePath.listFiles();

From 5be3543fa3a11723bb3a16892eecd5ac81ae1463 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Wed, 29 Nov 2023 21:18:52 +0000
Subject: [PATCH 175/595] Xiaomi Smart Band 7 Pro: Experimental support

---
 .../devices/huami/HuamiConst.java             |  1 +
 .../huami/miband7/MiBand7Coordinator.java     | 13 +---
 .../miband7pro/MiBand7ProCoordinator.java     | 69 +++++++++++++++++++
 .../gadgetbridge/model/DeviceType.java        |  2 +
 app/src/main/res/values/strings.xml           |  1 +
 5 files changed, 76 insertions(+), 10 deletions(-)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband7pro/MiBand7ProCoordinator.java

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiConst.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiConst.java
index c3707f131..67395288c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiConst.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiConst.java
@@ -75,6 +75,7 @@ public class HuamiConst {
     public static final String AMAZFIT_FALCON_NAME = "Amazfit Falcon";
 
     public static final String XIAOMI_SMART_BAND7_NAME = "Xiaomi Smart Band 7";
+    public static final String XIAOMI_SMART_BAND7_PRO_NAME = "Xiaomi Smart Band 7 Pro";
 
     public static final String PREF_DISPLAY_ITEMS = "display_items";
     public static final String PREF_DISPLAY_ITEMS_SORTABLE = "display_items_sortable";
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 7f4d18279..94a8f445b 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
@@ -21,27 +21,20 @@ import android.net.Uri;
 
 import androidx.annotation.NonNull;
 
-import org.slf4j.Logger;
-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.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.miband7.MiBand7Support;
 
 public class MiBand7Coordinator extends Huami2021Coordinator {
-    private static final Logger LOG = LoggerFactory.getLogger(MiBand7Coordinator.class);
-
     @Override
-    protected Pattern getSupportedDeviceName() {
-        return Pattern.compile(HuamiConst.XIAOMI_SMART_BAND7_NAME + ".*");
+    public boolean supports(final GBDeviceCandidate candidate) {
+        final String name = candidate.getName();
+        return name.startsWith(HuamiConst.XIAOMI_SMART_BAND7_NAME) && !name.contains("Pro");
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband7pro/MiBand7ProCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband7pro/MiBand7ProCoordinator.java
new file mode 100644
index 000000000..5fc2dadfd
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband7pro/MiBand7ProCoordinator.java
@@ -0,0 +1,69 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.miband7pro;
+
+import android.content.Context;
+import android.net.Uri;
+
+import androidx.annotation.Nullable;
+
+import java.util.regex.Pattern;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
+import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiEncryptedCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiInstallHandler;
+
+public class MiBand7ProCoordinator extends XiaomiEncryptedCoordinator {
+    @Override
+    public boolean isExperimental() {
+        return true;
+    }
+
+    @Override
+    protected Pattern getSupportedDeviceName() {
+        return Pattern.compile(HuamiConst.XIAOMI_SMART_BAND7_PRO_NAME + ".*");
+    }
+
+    @Nullable
+    @Override
+    public InstallHandler findInstallHandler(final Uri uri, final Context context) {
+        final XiaomiInstallHandler handler = new XiaomiInstallHandler(uri, context);
+        return handler.isValid() ? handler : null;
+    }
+
+    @Override
+    public int getDeviceNameResource() {
+        return R.string.devicetype_miband7pro;
+    }
+
+    @Override
+    public int getDefaultIconResource() {
+        return R.drawable.ic_device_default;
+    }
+
+    @Override
+    public int getDisabledIconResource() {
+        return R.drawable.ic_device_default_disabled;
+    }
+
+    @Override
+    public boolean supportsMultipleWeatherLocations() {
+        return true;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
index 1c5be9147..0656d482f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
@@ -140,6 +140,7 @@ import nodomain.freeyourgadget.gadgetbridge.devices.vivomovehr.VivomoveHrCoordin
 import nodomain.freeyourgadget.gadgetbridge.devices.waspos.WaspOSCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.watch9.Watch9DeviceCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.withingssteelhr.WithingsSteelHRDeviceCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.miband7pro.MiBand7ProCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.miband8.MiBand8Coordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.watchs1active.XiaomiWatchS1ActiveCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xwatch.XWatchCoordinator;
@@ -196,6 +197,7 @@ public enum DeviceType {
     AMAZFITPOP(AmazfitPopCoordinator.class),
     AMAZFITPOPPRO(AmazfitPopProCoordinator.class),
     MIBAND7(MiBand7Coordinator.class),
+    MIBAND7PRO(MiBand7ProCoordinator.class),
     MIBAND8(MiBand8Coordinator.class),
     MIWATCHLITE(MiWatchLiteCoordinator.class),
     REDMIWATCH3ACTIVE(RedmiWatch3ActiveCoordinator.class),
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 02dcddb81..f3decd289 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1309,6 +1309,7 @@
     <string name="devicetype_miband5">Mi Band 5</string>
     <string name="devicetype_miband6">Mi Band 6</string>
     <string name="devicetype_miband7">Xiaomi Smart Band 7</string>
+    <string name="devicetype_miband7pro">Xiaomi Smart Band 7 Pro</string>
     <string name="devicetype_miband8">Xiaomi Smart Band 8</string>
     <string name="devicetype_amazfit_balance">Amazfit Balance</string>
     <string name="devicetype_amazfit_active">Amazfit Active</string>

From 34c994759d5ba2baa9fbe35d026bf9a399afb471 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Wed, 29 Nov 2023 21:34:57 +0000
Subject: [PATCH 176/595] Update README and changelog

---
 CHANGELOG.md | 7 ++++++-
 README.md    | 4 +++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 113ea772f..678e747d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,9 +8,11 @@
 * Initial support for Sony Wena 3
 * Experimental support for Sony WF-1000XM5
 * Experimental support for Amazfit Active Edge
-* Experimental support for Mi Band 8
+* Experimental support for Mi Band 7 Pro (Xiaomi Smart Band 7 Pro)
+* Experimental support for Mi Band 8 (Xiaomi Smart Band 8)
 * Experimental support for Mi Watch Lite
 * Experimental support for Redmi Watch 3 Active
+* Experimental support for Xiaomi Watch S1 Active
 * Amazfit Band 7: Add alexa menu entries
 * Amazfit GTR 3 Pro: Fix firmware and watchface upload
 * Amazfit T-Rex: Fix activity summary parsing
@@ -18,6 +20,7 @@
 * AsteroidOS: Fix media info
 * AsteroidOS: Fix notification dismissal
 * Bangle.js: Add loyalty cards integration with Catima
+* Bangle.js: Fix GPS speed
 * Bangle.js: Improve handling of chinese characters
 * Bangle.js: Lower threshold for low battery warning
 * Bangle.js: Recover from device initialization failure
@@ -52,10 +55,12 @@
 * Zepp OS: Map hiking, outdoor swimming, climbing and table tennis activity types
 * Add transliteration for Latvian, Hungarian, Common Symbols
 * Autodetect OsmAnd package name and make it configurable
+* Improve ASCII transliterator
 * Make GMaps navigation handler follow the "navigation forwarding" setting
 * Support selecting enabled navigation apps
 * Allow ignore notifications from work profile apps
 * Display alias in low battery notification
+* Fix crash when pairing current device as companion
 * Fix emoji when a transliterator is enabled
 * Fix UV Index and rain probability for some weather apps
 * Improve device discovery stability and fix freezes
diff --git a/README.md b/README.md
index f1f535eec..ca28239e7 100644
--- a/README.md
+++ b/README.md
@@ -95,10 +95,12 @@ vendor's servers.
 - Mi
 	- [Band, Band 1A, Band 1S](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Mi-Band), [Band 2](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Mi-Band-2), [Band 3](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Mi-Band-3)
 	- [Band 4](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Mi-Band-4), [Band 5](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Mi-Band-5), [Band 6](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Mi-Band-6) [**\[!\]**](#special-pairing-procedures)
+	- Xiaomi Smart Band 7 Pro (experimental) [**\[!\]**](#special-pairing-procedures)
 	- [Xiaomi Smart Band 7](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Mi-Band-7) [**\[!\]**](#special-pairing-procedures)
 	- [Xiaomi Smart Band 8 (experimental)](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Mi-Band-8) [**\[!\]**](#special-pairing-procedures)
     - Mi Watch Lite (experimental)
-    - Redmi Watch 3 Active (experimental)
+    - Redmi Watch 3 Active (experimental) [**\[!\]**](#special-pairing-procedures)
+	- Watch S1 Active (experimental) [**\[!\]**](#special-pairing-procedures)
 	- Xiaomi Temperature and Humidity Monitor Clock (LYWSD02/LYWSD02MMC) (partial support)
 	- Scale 2 (Currently only displays a toast after stepping on the scale)
 - [MyKronoz ZeTime](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/MyKronoz-ZeTime)

From 684d976bfc92e7e879705581021803679ec14090 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Thu, 30 Nov 2023 09:33:07 +0000
Subject: [PATCH 177/595] Bangle.js: Ensure SMS messages have `src` field set
 to "SMS Message" (it was previously left out)

---
 .../service/devices/banglejs/BangleJSDeviceSupport.java   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java
index 9b4264a50..5c051bbe6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java
@@ -125,6 +125,7 @@ import nodomain.freeyourgadget.gadgetbridge.model.MusicSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.MusicStateSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.NavigationInfoSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.NotificationSpec;
+import nodomain.freeyourgadget.gadgetbridge.model.NotificationType;
 import nodomain.freeyourgadget.gadgetbridge.model.RecordedDataTypes;
 import nodomain.freeyourgadget.gadgetbridge.model.WeatherSpec;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.AbstractBTLEDeviceSupport;
@@ -1225,11 +1226,16 @@ public class BangleJSDeviceSupport extends AbstractBTLEDeviceSupport {
                 if (action.type==NotificationSpec.Action.TYPE_WEARABLE_REPLY)
                     mNotificationReplyAction.add(notificationSpec.getId(), ((long) notificationSpec.getId() << 4) + i + 1);
             }
+        // sourceName isn't set for SMS messages
+        String src = notificationSpec.sourceName;
+        if (notificationSpec.type == NotificationType.GENERIC_SMS)
+            src = "SMS Message";
+        // Send JSON to Bangle.js
         try {
             JSONObject o = new JSONObject();
             o.put("t", "notify");
             o.put("id", notificationSpec.getId());
-            o.put("src", notificationSpec.sourceName);
+            o.put("src", src);
             o.put("title", renderUnicodeAsImage(cropToLength(notificationSpec.title,80)));
             o.put("subject", renderUnicodeAsImage(cropToLength(notificationSpec.subject,80)));
             o.put("body", renderUnicodeAsImage(cropToLength(notificationSpec.body, 400)));

From b9b91db06ff3a8d75ff9f3121d1fba1d19c2bee9 Mon Sep 17 00:00:00 2001
From: MrYoranimo <yvulker@gmail.com>
Date: Wed, 29 Nov 2023 23:46:43 +0100
Subject: [PATCH 178/595] Xiaomi: implement phonebook service to respond to
 contact info requests

---
 .../service/devices/xiaomi/XiaomiSupport.java |   3 +
 .../services/XiaomiPhonebookService.java      | 136 ++++++++++++++++++
 app/src/main/proto/xiaomi.proto               |  13 ++
 3 files changed, 152 insertions(+)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiPhonebookService.java

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
index bbb1bdec9..51303c70c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
@@ -57,6 +57,7 @@ import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.Xiao
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.XiaomiHealthService;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.XiaomiMusicService;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.XiaomiNotificationService;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.XiaomiPhonebookService;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.XiaomiScheduleService;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.XiaomiSystemService;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.XiaomiWatchfaceService;
@@ -82,6 +83,7 @@ public abstract class XiaomiSupport extends AbstractBTLEDeviceSupport {
     protected final XiaomiCalendarService calendarService = new XiaomiCalendarService(this);
     protected final XiaomiWatchfaceService watchfaceService = new XiaomiWatchfaceService(this);
     protected final XiaomiDataUploadService dataUploadService = new XiaomiDataUploadService(this);
+    protected final XiaomiPhonebookService phonebookService = new XiaomiPhonebookService(this);
 
     private String mFirmwareVersion = null;
 
@@ -96,6 +98,7 @@ public abstract class XiaomiSupport extends AbstractBTLEDeviceSupport {
         put(XiaomiCalendarService.COMMAND_TYPE, calendarService);
         put(XiaomiWatchfaceService.COMMAND_TYPE, watchfaceService);
         put(XiaomiDataUploadService.COMMAND_TYPE, dataUploadService);
+        put(XiaomiPhonebookService.COMMAND_TYPE, phonebookService);
     }};
 
     public XiaomiSupport() {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiPhonebookService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiPhonebookService.java
new file mode 100644
index 000000000..c198d60e0
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiPhonebookService.java
@@ -0,0 +1,136 @@
+/*  Copyright (C) 2023 Yoran Vulker
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.net.Uri;
+import android.provider.ContactsContract;
+import android.text.TextUtils;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
+
+public class XiaomiPhonebookService extends AbstractXiaomiService {
+
+    public static final Integer COMMAND_TYPE = 21;
+    private static final Logger LOG = LoggerFactory.getLogger(XiaomiPhonebookService.class.getSimpleName());
+
+    private static final int CMD_GET_CONTACT = 2;
+    private static final int CMD_GET_CONTACT_RESPONSE = 3;
+
+    public XiaomiPhonebookService(final XiaomiSupport support) {
+        super(support);
+    }
+
+    @Override
+    public void handleCommand(XiaomiProto.Command cmd) {
+        if (cmd.getType() != COMMAND_TYPE) {
+            throw new IllegalArgumentException("Not a phonebook command");
+        }
+
+        XiaomiProto.Phonebook payload = cmd.getPhonebook();
+
+        if (payload == null) {
+            LOG.warn("Received phonebook command without phonebook payload");
+        }
+
+        switch (cmd.getSubtype()) {
+            case CMD_GET_CONTACT:
+                if (payload == null || TextUtils.isEmpty(payload.getRequestedPhoneNumber())) {
+                    LOG.error("Receive request for contact info without payload or requested phone number");
+                    return;
+                }
+
+                handleContactRequest(payload.getRequestedPhoneNumber());
+                return;
+        }
+
+        LOG.warn("Unhandled Phonebook command {}", cmd.getSubtype());
+    }
+
+    public void handleContactRequest(String phoneNumber) {
+        LOG.debug("Received request for contact info for {}", phoneNumber);
+
+        XiaomiProto.ContactInfo contact = getContactInfoForPhoneNumber(phoneNumber);
+
+        getSupport().sendCommand(
+                "send requested contact information",
+                XiaomiProto.Command.newBuilder()
+                        .setType(COMMAND_TYPE)
+                        .setSubtype(CMD_GET_CONTACT_RESPONSE)
+                        .setPhonebook(XiaomiProto.Phonebook.newBuilder().setContactInfo(contact))
+                        .build()
+        );
+    }
+
+    /**
+     * Returns contact information from Android contact list
+     *
+     * @param number contact number
+     * @return the contact display name, if found, otherwise the phone number
+     */
+    private XiaomiProto.ContactInfo getContactInfoForPhoneNumber(String number) {
+        Context context = getSupport().getContext();
+        String currentPrivacyMode = GBApplication.getPrefs().getString("pref_call_privacy_mode", GBApplication.getContext().getString(R.string.p_call_privacy_mode_off));
+
+        // mask the display name if complete privacy is set in preferences
+        if (currentPrivacyMode.equals(context.getString(R.string.p_call_privacy_mode_complete))) {
+            return XiaomiProto.ContactInfo.newBuilder().setDisplayName("********").setPhoneNumber(number).build();
+        }
+
+        // send empty contact name if name privacy is set in preferences, as the device will show
+        // the phone number instead
+        if (currentPrivacyMode.equals(context.getString(R.string.p_call_privacy_mode_name))) {
+            return XiaomiProto.ContactInfo.newBuilder().setDisplayName("").setPhoneNumber(number).build();
+        }
+
+        String name = "";
+
+        // prevent lookup of null or empty phone number
+        if (!TextUtils.isEmpty(number)) {
+            // search contact's display name in Android contact list
+            Uri uri = Uri.withAppendedPath(ContactsContract.PhoneLookup.ENTERPRISE_CONTENT_FILTER_URI, Uri.encode(number));
+
+            try (Cursor contactLookup = getSupport().getContext().getContentResolver().query(uri, new String[] { ContactsContract.Data.DISPLAY_NAME}, null, null, null)) {
+                if (contactLookup != null && contactLookup.getCount() > 0) {
+                    contactLookup.moveToNext();
+                    name = contactLookup.getString(0);
+                }
+            } catch (SecurityException e) {
+                // ignore, just return name below
+            }
+        }
+
+        XiaomiProto.ContactInfo.Builder contactInfoBuilder = XiaomiProto.ContactInfo.newBuilder();
+
+        // prevent the number from getting displayed if an empty contact name was retrieved from the
+        // contact list
+        if (TextUtils.isEmpty(name) && currentPrivacyMode.equals(context.getString(R.string.p_call_privacy_mode_number))) {
+            name = "********";
+        }
+
+        contactInfoBuilder.setPhoneNumber(number);
+        contactInfoBuilder.setDisplayName(name);
+        return contactInfoBuilder.build();
+    }
+}
diff --git a/app/src/main/proto/xiaomi.proto b/app/src/main/proto/xiaomi.proto
index 6203ab046..e1c854970 100644
--- a/app/src/main/proto/xiaomi.proto
+++ b/app/src/main/proto/xiaomi.proto
@@ -19,6 +19,9 @@ message Command {
   optional Weather weather = 12;
   optional Schedule schedule = 19;
 
+  // command type 21
+  optional Phonebook phonebook = 23;
+
   // type 22
   optional DataUpload dataUpload = 24;
 
@@ -872,3 +875,13 @@ message DataUploadAck {
   optional uint32 resumePosition = 4;
   optional uint32 chunkSize = 5; // 4096 on Redmi Watch 3 Active, Nonexistent on Mi Band 8
 }
+
+message ContactInfo {
+  optional string displayName = 1;
+  optional string phoneNumber = 2;
+}
+
+message Phonebook {
+  optional string requestedPhoneNumber = 2;
+  optional ContactInfo contactInfo = 3;
+}

From 6e5bedb365eed44227fea926a62c50e7785b7875 Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Fri, 1 Dec 2023 07:52:08 +0100
Subject: [PATCH 179/595] Xiaomi: Implement Screen On on Notification setting

Works on Redmi Watch 3 Active
Does not work on Mi Watch Lite
---
 .../xiaomi/services/XiaomiSystemService.java  | 22 +++++++++++++++++++
 app/src/main/proto/xiaomi.proto               |  1 +
 2 files changed, 23 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
index 95028909e..1d7361936 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
@@ -63,6 +63,7 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
     public static final int CMD_CLOCK = 3;
     public static final int CMD_FIRMWARE_INSTALL = 5;
     public static final int CMD_LANGUAGE = 6;
+    public static final int CMD_SCREEN_ON_ON_NOTIFICAIONS = 7;
     public static final int CMD_PASSWORD_GET = 9;
     public static final int CMD_FIND_PHONE = 17;
     public static final int CMD_FIND_WATCH = 18;
@@ -145,9 +146,13 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
             case PasswordCapabilityImpl.PREF_PASSWORD_ENABLED:
             case PasswordCapabilityImpl.PREF_PASSWORD:
                 setPassword();
+                return true;
             case HuamiConst.PREF_DISPLAY_ITEMS_SORTABLE:
                 setDisplayItems();
                 return true;
+            case DeviceSettingsPreferenceConst.PREF_SCREEN_ON_ON_NOTIFICATIONS:
+                setScreenOnOnNotifications();
+                return true;
         }
 
         return super.onSendConfiguration(config, prefs);
@@ -282,6 +287,23 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
         );
     }
 
+    private void setScreenOnOnNotifications() {
+        final Prefs prefs = getDevicePrefs();
+
+        final boolean screenOnOnNotificationsEnabled = prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_SCREEN_ON_ON_NOTIFICATIONS, true);
+
+        LOG.info("Setting screen on on notification: {}", screenOnOnNotificationsEnabled);
+
+        getSupport().sendCommand(
+                "set password",
+                XiaomiProto.Command.newBuilder()
+                        .setType(CMD_SCREEN_ON_ON_NOTIFICAIONS) // Why? Would also expect COMMAND_TYPE here
+                        .setSubtype(CMD_SCREEN_ON_ON_NOTIFICAIONS)
+                        .setNotification(XiaomiProto.Notification.newBuilder().setScreenOnOnNotifications(screenOnOnNotificationsEnabled).build())
+                        .build()
+        );
+    }
+
     private void handlePassword(final XiaomiProto.Password password) {
         LOG.debug("Got device password");
         final GBDeviceEventUpdatePreferences eventUpdatePreferences = new GBDeviceEventUpdatePreferences(
diff --git a/app/src/main/proto/xiaomi.proto b/app/src/main/proto/xiaomi.proto
index e1c854970..aa5f19f67 100644
--- a/app/src/main/proto/xiaomi.proto
+++ b/app/src/main/proto/xiaomi.proto
@@ -564,6 +564,7 @@ message Notification {
   optional Notification2 notification2 = 3;
   optional NotificationDismiss notification4 = 4;
 
+  optional bool screenOnOnNotifications = 7;
   optional uint32 unknown8 = 8; // 1 on canned replies request?
   // 7, 9 get | 7, 12 set
   optional CannedMessages cannedMessages = 9;

From 81e24e53edba3641308d788dbf20111ddb721ef7 Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Fri, 1 Dec 2023 12:40:53 +0100
Subject: [PATCH 180/595] Xiaomi: WIP implementation for sending contacts

This is not useful yet because contacts just get added when sending them, instaed of replacing.
Should be fixed or disabled before the release
---
 .../devices/xiaomi/XiaomiCoordinator.java     |  3 ++
 .../RedmiWatch3ActiveCoordinator.java         |  6 ++++
 .../service/devices/xiaomi/XiaomiSupport.java |  9 +++++-
 .../services/XiaomiPhonebookService.java      | 30 ++++++++++++++++++-
 app/src/main/proto/xiaomi.proto               |  6 ++++
 5 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
index d16fe9c11..1155d7510 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
@@ -367,6 +367,9 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
         // Other
         //
         settings.add(R.xml.devicesettings_header_other);
+        if (getContactsSlotCount(device) > 0) {
+            settings.add(R.xml.devicesettings_contacts);
+        }
         settings.add(R.xml.devicesettings_camera_remote);
 
         //
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch3active/RedmiWatch3ActiveCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch3active/RedmiWatch3ActiveCoordinator.java
index b15bf069c..c0de7da34 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch3active/RedmiWatch3ActiveCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch3active/RedmiWatch3ActiveCoordinator.java
@@ -27,6 +27,7 @@ import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiEncryptedCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiInstallHandler;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 
 public class RedmiWatch3ActiveCoordinator extends XiaomiEncryptedCoordinator {
     @Override
@@ -65,4 +66,9 @@ public class RedmiWatch3ActiveCoordinator extends XiaomiEncryptedCoordinator {
     public boolean supportsMultipleWeatherLocations() {
         return true;
     }
+
+    @Override
+    public int getContactsSlotCount(final GBDevice device) {
+        return 10; // TODO:verify
+    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
index 51303c70c..3a1ceacac 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023 José Rebelo, Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -30,6 +30,7 @@ import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
@@ -41,6 +42,7 @@ import nodomain.freeyourgadget.gadgetbridge.model.Alarm;
 import nodomain.freeyourgadget.gadgetbridge.model.CalendarEventSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.CallSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.CannedMessagesSpec;
+import nodomain.freeyourgadget.gadgetbridge.model.Contact;
 import nodomain.freeyourgadget.gadgetbridge.model.MusicSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.MusicStateSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.NotificationSpec;
@@ -408,6 +410,11 @@ public abstract class XiaomiSupport extends AbstractBTLEDeviceSupport {
         weatherService.onSendWeather(weatherSpec);
     }
 
+    @Override
+    public void onSetContacts(ArrayList<? extends Contact> contacts) {
+        phonebookService.setContacts((List<Contact>) contacts);
+    }
+
     public XiaomiCoordinator getCoordinator() {
         return (XiaomiCoordinator) gbDevice.getDeviceCoordinator();
     }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiPhonebookService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiPhonebookService.java
index c198d60e0..d6be412d7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiPhonebookService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiPhonebookService.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 Yoran Vulker
+/*  Copyright (C) 2023 Yoran Vulker, Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -25,10 +25,15 @@ import android.text.TextUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.model.Contact;
 import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
+import nodomain.freeyourgadget.gadgetbridge.util.StringUtils;
 
 public class XiaomiPhonebookService extends AbstractXiaomiService {
 
@@ -37,6 +42,7 @@ public class XiaomiPhonebookService extends AbstractXiaomiService {
 
     private static final int CMD_GET_CONTACT = 2;
     private static final int CMD_GET_CONTACT_RESPONSE = 3;
+    private static final int CMD_SET_CONTACT_LIST = 5;
 
     public XiaomiPhonebookService(final XiaomiSupport support) {
         super(support);
@@ -133,4 +139,26 @@ public class XiaomiPhonebookService extends AbstractXiaomiService {
         contactInfoBuilder.setDisplayName(name);
         return contactInfoBuilder.build();
     }
+
+    public void setContacts(List<Contact> contacts) {
+        final XiaomiProto.ContactList.Builder contactList = XiaomiProto.ContactList.newBuilder();
+        int maxContacts = 10; // TODO:verify, do not copy and paste
+        int numContacts = Math.min(contacts.size(), maxContacts);
+
+        for (int i = 0; i < numContacts; i++) {
+            final Contact contact = contacts.get(i);
+            if (!StringUtils.isNullOrEmpty(contact.getName()) && !StringUtils.isNullOrEmpty(contact.getNumber())) {
+                contactList.addContactInfo(XiaomiProto.ContactInfo.newBuilder().setDisplayName(contact.getName()).setPhoneNumber(contact.getNumber()));
+            }
+        }
+
+        getSupport().sendCommand(
+                "send contact list",
+                XiaomiProto.Command.newBuilder()
+                        .setType(COMMAND_TYPE)
+                        .setSubtype(CMD_SET_CONTACT_LIST)
+                        .setPhonebook(XiaomiProto.Phonebook.newBuilder().setContactList(contactList))
+                        .build()
+        );
+    }
 }
diff --git a/app/src/main/proto/xiaomi.proto b/app/src/main/proto/xiaomi.proto
index aa5f19f67..2c7cde082 100644
--- a/app/src/main/proto/xiaomi.proto
+++ b/app/src/main/proto/xiaomi.proto
@@ -882,7 +882,13 @@ message ContactInfo {
   optional string phoneNumber = 2;
 }
 
+message ContactList {
+  repeated ContactInfo contactInfo = 1;
+  optional string phoneNumber = 2;
+}
+
 message Phonebook {
   optional string requestedPhoneNumber = 2;
   optional ContactInfo contactInfo = 3;
+  optional ContactList contactList = 4;
 }

From 1b2a9ac1409544624ca82412118212a6c0508546 Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Fri, 1 Dec 2023 20:07:32 +0100
Subject: [PATCH 181/595] Xiaomi: When sending contacts, use correct command to
 replace the ones already on the watch

---
 .../devices/xiaomi/services/XiaomiPhonebookService.java        | 3 ++-
 app/src/main/proto/xiaomi.proto                                | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiPhonebookService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiPhonebookService.java
index d6be412d7..43d7c7d22 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiPhonebookService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiPhonebookService.java
@@ -42,7 +42,8 @@ public class XiaomiPhonebookService extends AbstractXiaomiService {
 
     private static final int CMD_GET_CONTACT = 2;
     private static final int CMD_GET_CONTACT_RESPONSE = 3;
-    private static final int CMD_SET_CONTACT_LIST = 5;
+    private static final int CMD_ADD_CONTACT_LIST = 5;
+    private static final int CMD_SET_CONTACT_LIST = 7;
 
     public XiaomiPhonebookService(final XiaomiSupport support) {
         super(support);
diff --git a/app/src/main/proto/xiaomi.proto b/app/src/main/proto/xiaomi.proto
index 2c7cde082..d156cd9aa 100644
--- a/app/src/main/proto/xiaomi.proto
+++ b/app/src/main/proto/xiaomi.proto
@@ -884,7 +884,6 @@ message ContactInfo {
 
 message ContactList {
   repeated ContactInfo contactInfo = 1;
-  optional string phoneNumber = 2;
 }
 
 message Phonebook {

From 84692e54326635b483a5af269a7b5904101f350e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 1 Dec 2023 21:35:29 +0000
Subject: [PATCH 182/595] Mi Band 8: Persist bedtime and wakeup times to
 database

---
 .../gadgetbridge/daogen/GBDaoGenerator.java   | 11 +++-
 .../xiaomi/XiaomiSleepTimeSampleProvider.java | 56 +++++++++++++++++++
 .../activity/impl/SleepDetailsParser.java     | 52 +++++++++++++++--
 3 files changed, 113 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSleepTimeSampleProvider.java

diff --git a/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java b/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java
index d93ed745b..4b457d9e5 100644
--- a/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java
+++ b/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java
@@ -45,7 +45,7 @@ public class GBDaoGenerator {
 
 
     public static void main(String[] args) throws Exception {
-        final Schema schema = new Schema(63, MAIN_PACKAGE + ".entities");
+        final Schema schema = new Schema(64, MAIN_PACKAGE + ".entities");
 
         Entity userAttributes = addUserAttributes(schema);
         Entity user = addUserInfo(schema, userAttributes);
@@ -71,6 +71,7 @@ public class GBDaoGenerator {
         addHuamiPaiSample(schema, user, device);
         addHuamiSleepRespiratoryRateSample(schema, user, device);
         addXiaomiActivitySample(schema, user, device);
+        addXiaomiSleepTimeSamples(schema, user, device);
         addPebbleHealthActivitySample(schema, user, device);
         addPebbleHealthActivityKindOverlay(schema, user, device);
         addPebbleMisfitActivitySample(schema, user, device);
@@ -338,6 +339,14 @@ public class GBDaoGenerator {
         return activitySample;
     }
 
+    private static Entity addXiaomiSleepTimeSamples(Schema schema, Entity user, Entity device) {
+        Entity sample = addEntity(schema, "XiaomiSleepTimeSample");
+        addCommonTimeSampleProperties("AbstractTimeSample", sample, user, device);
+        sample.addLongProperty("wakeupTime");
+        sample.addBooleanProperty("isAwake");
+        return sample;
+    }
+
     private static void addHeartRateProperties(Entity activitySample) {
         activitySample.addIntProperty(SAMPLE_HEART_RATE).notNull().codeBeforeGetterAndSetter(OVERRIDE);
     }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSleepTimeSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSleepTimeSampleProvider.java
new file mode 100644
index 000000000..0b031e8db
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSleepTimeSampleProvider.java
@@ -0,0 +1,56 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi;
+
+import androidx.annotation.NonNull;
+
+import de.greenrobot.dao.AbstractDao;
+import de.greenrobot.dao.Property;
+import nodomain.freeyourgadget.gadgetbridge.devices.AbstractTimeSampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.entities.XiaomiSleepTimeSample;
+import nodomain.freeyourgadget.gadgetbridge.entities.XiaomiSleepTimeSampleDao;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+
+public class XiaomiSleepTimeSampleProvider extends AbstractTimeSampleProvider<XiaomiSleepTimeSample> {
+    public XiaomiSleepTimeSampleProvider(final GBDevice device, final DaoSession session) {
+        super(device, session);
+    }
+
+    @NonNull
+    @Override
+    public AbstractDao<XiaomiSleepTimeSample, ?> getSampleDao() {
+        return getSession().getXiaomiSleepTimeSampleDao();
+    }
+
+    @NonNull
+    @Override
+    protected Property getTimestampSampleProperty() {
+        return XiaomiSleepTimeSampleDao.Properties.Timestamp;
+    }
+
+    @NonNull
+    @Override
+    protected Property getDeviceIdentifierSampleProperty() {
+        return XiaomiSleepTimeSampleDao.Properties.DeviceId;
+    }
+
+    @Override
+    public XiaomiSleepTimeSample createSample() {
+        return new XiaomiSleepTimeSample();
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/SleepDetailsParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/SleepDetailsParser.java
index 2164a69b3..3ae3f1804 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/SleepDetailsParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/SleepDetailsParser.java
@@ -16,15 +16,26 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl;
 
+import android.widget.Toast;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
+import java.util.List;
 
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.database.DBHandler;
+import nodomain.freeyourgadget.gadgetbridge.database.DBHelper;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiSleepTimeSampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.entities.XiaomiSleepTimeSample;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.XiaomiActivityFileId;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.XiaomiActivityParser;
+import nodomain.freeyourgadget.gadgetbridge.util.GB;
 
 public class SleepDetailsParser extends XiaomiActivityParser {
     private static final Logger LOG = LoggerFactory.getLogger(SleepDetailsParser.class);
@@ -39,14 +50,45 @@ public class SleepDetailsParser extends XiaomiActivityParser {
         final ByteBuffer buf = ByteBuffer.wrap(bytes).order(ByteOrder.LITTLE_ENDIAN);
         buf.get(); // header ? 0xF0
 
-        buf.get(); // ?
+        final int isAwake = buf.get() & 0xff; // 0/1
         final int bedTime = buf.getInt();
         final int wakeupTime = buf.getInt();
-        LOG.info("Bed time: {}, wake up time: {}", bedTime, wakeupTime);
+        LOG.debug("Sleep sample: bedTime: {}, wakeupTime: {}, isAwake: {}", bedTime, wakeupTime, isAwake);
 
-        // TODO save timestamps and overlay on activity
-        // TODO everything else...
+        final XiaomiSleepTimeSample sample = new XiaomiSleepTimeSample();
+        sample.setTimestamp(bedTime * 1000L);
+        sample.setWakeupTime(wakeupTime * 1000L);
+        sample.setIsAwake(isAwake == 1);
 
-        return false;
+        // save all the samples that we got
+        try (DBHandler handler = GBApplication.acquireDB()) {
+            final DaoSession session = handler.getDaoSession();
+            final GBDevice gbDevice = support.getDevice();
+
+            sample.setDevice(DBHelper.getDevice(gbDevice, session));
+            sample.setUser(DBHelper.getUser(session));
+
+            final XiaomiSleepTimeSampleProvider sampleProvider = new XiaomiSleepTimeSampleProvider(gbDevice, session);
+
+            // Check if there is already a later sleep sample - if so, ignore this one
+            // Samples for the same sleep will always have the same bedtime (timestamp), but we might get
+            // multiple bedtimes until the user wakes up
+            final List<XiaomiSleepTimeSample> existingSamples = sampleProvider.getAllSamples(sample.getTimestamp(), sample.getTimestamp());
+            if (!existingSamples.isEmpty()) {
+                final XiaomiSleepTimeSample existingSample = existingSamples.get(0);
+                if (existingSample.getWakeupTime() > sample.getWakeupTime()) {
+                    LOG.warn("Ignoring sleep sample - existing sample is more recent ({})", existingSample.getWakeupTime());
+                    return true;
+                }
+            }
+
+            sampleProvider.addSample(sample);
+
+            return true;
+        } catch (final Exception e) {
+            GB.toast(support.getContext(), "Error saving sleep sample", Toast.LENGTH_LONG, GB.ERROR);
+            LOG.error("Error saving sleep sample", e);
+            return false;
+        }
     }
 }

From 216dc9398606b6959bf644daf0a5bfeebacc4a9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sat, 2 Dec 2023 10:56:36 +0000
Subject: [PATCH 183/595] Mi Band 8: Overlay sleep on activity data

---
 .../devices/xiaomi/XiaomiCoordinator.java     |  3 +-
 .../devices/xiaomi/XiaomiSampleProvider.java  | 36 +++++++++++++++++--
 2 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
index 1155d7510..b95413795 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
@@ -287,7 +287,8 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
 
     @Override
     public boolean supportsRemSleep() {
-        return true;
+        // TODO it does, but we don't know how to parse it yet
+        return false;
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSampleProvider.java
index d25887753..917a2aadd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSampleProvider.java
@@ -19,15 +19,24 @@ package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
 import de.greenrobot.dao.AbstractDao;
 import de.greenrobot.dao.Property;
 import nodomain.freeyourgadget.gadgetbridge.devices.AbstractSampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.XiaomiActivitySample;
 import nodomain.freeyourgadget.gadgetbridge.entities.XiaomiActivitySampleDao;
+import nodomain.freeyourgadget.gadgetbridge.entities.XiaomiSleepTimeSample;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.model.ActivityKind;
 
 public class XiaomiSampleProvider extends AbstractSampleProvider<XiaomiActivitySample> {
+    private static final Logger LOG = LoggerFactory.getLogger(XiaomiSampleProvider.class);
+
     public XiaomiSampleProvider(final GBDevice device, final DaoSession session) {
         super(device, session);
     }
@@ -69,12 +78,35 @@ public class XiaomiSampleProvider extends AbstractSampleProvider<XiaomiActivityS
 
     @Override
     public float normalizeIntensity(final int rawIntensity) {
-        // TODO
-        return rawIntensity;
+        return rawIntensity / 100f;
     }
 
     @Override
     public XiaomiActivitySample createActivitySample() {
         return new XiaomiActivitySample();
     }
+
+    @Override
+    protected List<XiaomiActivitySample> getGBActivitySamples(final int timestamp_from, final int timestamp_to, final int activityType) {
+        final List<XiaomiActivitySample> samples = super.getGBActivitySamples(timestamp_from, timestamp_to, activityType);
+
+        // Fetch bed and wakeup times and overlay them on the activity
+        final XiaomiSleepTimeSampleProvider sleepTimeSampleProvider = new XiaomiSleepTimeSampleProvider(getDevice(), getSession());
+        final List<XiaomiSleepTimeSample> sleepSamples = sleepTimeSampleProvider.getAllSamples(timestamp_from * 1000L, timestamp_to * 1000L);
+        if (!sleepSamples.isEmpty()) {
+            LOG.debug("Found {} sleep samples between {} and {}", sleepSamples.size(), timestamp_from, timestamp_to);
+
+            for (final XiaomiActivitySample sample : samples) {
+                final long ts = sample.getTimestamp() * 1000L;
+                for (final XiaomiSleepTimeSample sleepSample : sleepSamples) {
+                    if (ts >= sleepSample.getTimestamp() && ts <= sleepSample.getWakeupTime()) {
+                        sample.setRawKind(ActivityKind.TYPE_LIGHT_SLEEP);
+                        sample.setRawIntensity(30);
+                    }
+                }
+            }
+        }
+
+        return samples;
+    }
 }

From ba0ca1de75b4f7758055dcb7d3213bd2c2bb4dee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sat, 2 Dec 2023 10:59:34 +0000
Subject: [PATCH 184/595] Delegate auth key validation to coordinator

---
 .../activities/discovery/DiscoveryActivityV2.java     |  2 +-
 .../devices/AbstractDeviceCoordinator.java            | 11 +++++++++++
 .../gadgetbridge/devices/DeviceCoordinator.java       |  2 ++
 .../devices/huami/Huami2021Coordinator.java           |  6 ++++++
 .../devices/xiaomi/XiaomiEncryptedCoordinator.java    |  6 ++++++
 .../devices/xiaomi/XiaomiPlaintextCoordinator.java    |  9 +++++++++
 .../devices/huami/operations/InitOperation.java       |  2 +-
 .../service/devices/xiaomi/XiaomiAuthService.java     |  2 +-
 8 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/discovery/DiscoveryActivityV2.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/discovery/DiscoveryActivityV2.java
index 0a810e30e..0d6352d74 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/discovery/DiscoveryActivityV2.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/discovery/DiscoveryActivityV2.java
@@ -607,7 +607,7 @@ public class DiscoveryActivityV2 extends AbstractGBActivity implements AdapterVi
             if (authKey == null || authKey.isEmpty()) {
                 toast(DiscoveryActivityV2.this, getString(R.string.discovery_need_to_enter_authkey), Toast.LENGTH_LONG, GB.WARN);
                 return;
-            } else if (authKey.getBytes().length < 34 || !authKey.startsWith("0x")) {
+            } else if (!coordinator.validateAuthKey(authKey)) {
                 toast(DiscoveryActivityV2.this, getString(R.string.discovery_entered_invalid_authkey), Toast.LENGTH_LONG, GB.WARN);
                 return;
             }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java
index 934eb6780..080df31ad 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java
@@ -607,27 +607,38 @@ public abstract class AbstractDeviceCoordinator implements DeviceCoordinator {
         return R.drawable.ic_device_default_disabled;
     }
 
+    @Override
     public boolean supportsNotificationVibrationPatterns() {
         return false;
     }
 
+    @Override
     public boolean supportsNotificationVibrationRepetitionPatterns() {
         return false;
     }
 
+    @Override
     public boolean supportsNotificationLedPatterns() {
         return false;
     }
 
+    @Override
     public AbstractNotificationPattern[] getNotificationVibrationPatterns() {
         return new AbstractNotificationPattern[0];
     }
 
+    @Override
     public AbstractNotificationPattern[] getNotificationVibrationRepetitionPatterns() {
         return new AbstractNotificationPattern[0];
     }
 
+    @Override
     public AbstractNotificationPattern[] getNotificationLedPatterns() {
         return new AbstractNotificationPattern[0];
     }
+
+    @Override
+    public boolean validateAuthKey(final String authKey) {
+        return !(authKey.getBytes().length < 34 || !authKey.startsWith("0x"));
+    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java
index 8ce2641c6..913780c60 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java
@@ -590,4 +590,6 @@ public interface DeviceCoordinator {
      * What LED patterns for notifications are supported by the device.
      */
     AbstractNotificationPattern[] getNotificationLedPatterns();
+
+    boolean validateAuthKey(String authKey);
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021Coordinator.java
index 4550da2dc..9c7d7e923 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021Coordinator.java
@@ -581,4 +581,10 @@ public abstract class Huami2021Coordinator extends HuamiCoordinator {
     public static boolean experimentalFeatures(final GBDevice device) {
         return getPrefs(device).getBoolean("zepp_os_experimental_features", false);
     }
+
+    @Override
+    public boolean validateAuthKey(final String authKey) {
+        final byte[] authKeyBytes = authKey.trim().getBytes();
+        return authKeyBytes.length == 32 || (authKey.trim().startsWith("0x") && authKeyBytes.length == 34);
+    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiEncryptedCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiEncryptedCoordinator.java
index f8a705c88..07e29257e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiEncryptedCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiEncryptedCoordinator.java
@@ -41,4 +41,10 @@ public abstract class XiaomiEncryptedCoordinator extends XiaomiCoordinator {
     public Class<? extends DeviceSupport> getDeviceSupportClass() {
         return XiaomiEncryptedSupport.class;
     }
+
+    @Override
+    public boolean validateAuthKey(final String authKey) {
+        final byte[] authKeyBytes = authKey.trim().getBytes();
+        return authKeyBytes.length == 32 || (authKey.startsWith("0x") && authKeyBytes.length == 34);
+    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiPlaintextCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiPlaintextCoordinator.java
index 3a249da92..d46242572 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiPlaintextCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiPlaintextCoordinator.java
@@ -23,11 +23,15 @@ import androidx.annotation.NonNull;
 
 import java.util.Collection;
 import java.util.Collections;
+import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiPlaintextSupport;
 
 public abstract class XiaomiPlaintextCoordinator extends XiaomiCoordinator {
+    // user id is used as auth key - numeric
+    private static final Pattern AUTH_KEY_PATTERN = Pattern.compile("^[0-9]+$");
+
     @NonNull
     @Override
     public Collection<? extends ScanFilter> createBLEScanFilters() {
@@ -41,4 +45,9 @@ public abstract class XiaomiPlaintextCoordinator extends XiaomiCoordinator {
     public Class<? extends DeviceSupport> getDeviceSupportClass() {
         return XiaomiPlaintextSupport.class;
     }
+
+    @Override
+    public boolean validateAuthKey(final String authKey) {
+        return AUTH_KEY_PATTERN.matcher(authKey.trim()).matches();
+    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/InitOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/InitOperation.java
index aef537941..c3136ec7b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/InitOperation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/InitOperation.java
@@ -95,7 +95,7 @@ public class InitOperation extends AbstractBTLEOperation<HuamiSupport> {
         String authKey = sharedPrefs.getString("authkey", null);
         if (authKey != null && !authKey.isEmpty()) {
             byte[] srcBytes = authKey.trim().getBytes();
-            if (authKey.length() == 34 && authKey.substring(0, 2).equals("0x")) {
+            if (authKey.length() == 34 && authKey.startsWith("0x")) {
                 srcBytes = GB.hexStringToByteArray(authKey.substring(2));
             }
             System.arraycopy(srcBytes, 0, authKeyBytes, 0, Math.min(srcBytes.length, 16));
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java
index 707964857..bc3f79f76 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java
@@ -286,7 +286,7 @@ public class XiaomiAuthService extends AbstractXiaomiService {
 
         final SharedPreferences sharedPrefs = GBApplication.getDeviceSpecificSharedPrefs(device.getAddress());
 
-        final String authKey = sharedPrefs.getString("authkey", null);
+        final String authKey = sharedPrefs.getString("authkey", "").trim();
         if (StringUtils.isNotBlank(authKey)) {
             final byte[] srcBytes;
             // Allow both with and without 0x, to avoid user mistakes

From ec050d7a4fa8ce451bc1c45cd03ccbf3e1a697ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sat, 2 Dec 2023 11:25:32 +0000
Subject: [PATCH 185/595] Xiaomi: Unify encrypted and plaintext logic

---
 .../devices/xiaomi/XiaomiCoordinator.java     | 37 +++++++
 .../xiaomi/XiaomiEncryptedCoordinator.java    | 50 ----------
 .../xiaomi/XiaomiPlaintextCoordinator.java    | 53 ----------
 .../miband7pro/MiBand7ProCoordinator.java     |  4 +-
 .../xiaomi/miband8/MiBand8Coordinator.java    |  4 +-
 .../miwatch/MiWatchLiteCoordinator.java       |  4 +-
 .../RedmiWatch3ActiveCoordinator.java         |  4 +-
 .../XiaomiWatchS1ActiveCoordinator.java       |  4 +-
 .../devices/xiaomi/XiaomiAuthService.java     | 17 +++-
 .../devices/xiaomi/XiaomiBleUuids.java        | 96 +++++++++++++++++++
 .../xiaomi/XiaomiEncryptedSupport.java        | 89 -----------------
 .../xiaomi/XiaomiPlaintextSupport.java        | 87 -----------------
 .../service/devices/xiaomi/XiaomiSupport.java | 55 ++++++-----
 13 files changed, 190 insertions(+), 314 deletions(-)
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiEncryptedCoordinator.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiPlaintextCoordinator.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiBleUuids.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiEncryptedSupport.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPlaintextSupport.java

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
index b95413795..5f0359033 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
@@ -17,6 +17,8 @@
 package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi;
 
 import android.app.Activity;
+import android.bluetooth.le.ScanFilter;
+import android.os.ParcelUuid;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -25,7 +27,10 @@ import org.apache.commons.lang3.ArrayUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
+import java.util.UUID;
+import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.BuildConfig;
 import nodomain.freeyourgadget.gadgetbridge.GBException;
@@ -49,9 +54,41 @@ import nodomain.freeyourgadget.gadgetbridge.model.PaiSample;
 import nodomain.freeyourgadget.gadgetbridge.model.SleepRespiratoryRateSample;
 import nodomain.freeyourgadget.gadgetbridge.model.Spo2Sample;
 import nodomain.freeyourgadget.gadgetbridge.model.StressSample;
+import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiBleUuids;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl.WorkoutSummaryParser;
 
 public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
+    // On plaintext devices, user id is used as auth key - numeric
+    private static final Pattern AUTH_KEY_PATTERN = Pattern.compile("^[0-9]+$");
+
+    @NonNull
+    @Override
+    public Collection<? extends ScanFilter> createBLEScanFilters() {
+        final List<ScanFilter> filters = new ArrayList<>();
+        for (final UUID uuid : XiaomiBleUuids.UUIDS.keySet()) {
+            final ParcelUuid service = new ParcelUuid(uuid);
+            final ScanFilter filter = new ScanFilter.Builder().setServiceUuid(service).build();
+            filters.add(filter);
+        }
+        return filters;
+    }
+
+    @NonNull
+    @Override
+    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+        return XiaomiSupport.class;
+    }
+
+    @Override
+    public boolean validateAuthKey(final String authKey) {
+        final byte[] authKeyBytes = authKey.trim().getBytes();
+        // At this point we don't know if it's encrypted or not, so let's accept both:
+        return authKeyBytes.length == 32 || (authKey.startsWith("0x") && authKeyBytes.length == 34)
+                || AUTH_KEY_PATTERN.matcher(authKey.trim()).matches();
+    }
+
     @Override
     protected void deleteDevice(@NonNull final GBDevice gbDevice,
                                 @NonNull final Device device,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiEncryptedCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiEncryptedCoordinator.java
deleted file mode 100644
index 07e29257e..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiEncryptedCoordinator.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*  Copyright (C) 2023 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi;
-
-import android.bluetooth.le.ScanFilter;
-import android.os.ParcelUuid;
-
-import androidx.annotation.NonNull;
-
-import java.util.Collection;
-import java.util.Collections;
-
-import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiEncryptedSupport;
-
-public abstract class XiaomiEncryptedCoordinator extends XiaomiCoordinator {
-    @NonNull
-    @Override
-    public Collection<? extends ScanFilter> createBLEScanFilters() {
-        final ParcelUuid service = new ParcelUuid(XiaomiEncryptedSupport.UUID_SERVICE_XIAOMI_FE95);
-        final ScanFilter filter = new ScanFilter.Builder().setServiceUuid(service).build();
-        return Collections.singletonList(filter);
-    }
-
-    @NonNull
-    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
-        return XiaomiEncryptedSupport.class;
-    }
-
-    @Override
-    public boolean validateAuthKey(final String authKey) {
-        final byte[] authKeyBytes = authKey.trim().getBytes();
-        return authKeyBytes.length == 32 || (authKey.startsWith("0x") && authKeyBytes.length == 34);
-    }
-}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiPlaintextCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiPlaintextCoordinator.java
deleted file mode 100644
index d46242572..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiPlaintextCoordinator.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*  Copyright (C) 2023 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi;
-
-import android.bluetooth.le.ScanFilter;
-import android.os.ParcelUuid;
-
-import androidx.annotation.NonNull;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.regex.Pattern;
-
-import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiPlaintextSupport;
-
-public abstract class XiaomiPlaintextCoordinator extends XiaomiCoordinator {
-    // user id is used as auth key - numeric
-    private static final Pattern AUTH_KEY_PATTERN = Pattern.compile("^[0-9]+$");
-
-    @NonNull
-    @Override
-    public Collection<? extends ScanFilter> createBLEScanFilters() {
-        final ParcelUuid service = new ParcelUuid(XiaomiPlaintextSupport.UUID_SERVICE);
-        final ScanFilter filter = new ScanFilter.Builder().setServiceUuid(service).build();
-        return Collections.singletonList(filter);
-    }
-
-    @NonNull
-    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
-        return XiaomiPlaintextSupport.class;
-    }
-
-    @Override
-    public boolean validateAuthKey(final String authKey) {
-        return AUTH_KEY_PATTERN.matcher(authKey.trim()).matches();
-    }
-}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband7pro/MiBand7ProCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband7pro/MiBand7ProCoordinator.java
index 5fc2dadfd..5116ff122 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband7pro/MiBand7ProCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband7pro/MiBand7ProCoordinator.java
@@ -26,10 +26,10 @@ import java.util.regex.Pattern;
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
-import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiEncryptedCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiInstallHandler;
 
-public class MiBand7ProCoordinator extends XiaomiEncryptedCoordinator {
+public class MiBand7ProCoordinator extends XiaomiCoordinator {
     @Override
     public boolean isExperimental() {
         return true;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/MiBand8Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/MiBand8Coordinator.java
index 98fecb619..3a78f2582 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/MiBand8Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/MiBand8Coordinator.java
@@ -25,10 +25,10 @@ import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
-import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiEncryptedCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiInstallHandler;
 
-public class MiBand8Coordinator extends XiaomiEncryptedCoordinator {
+public class MiBand8Coordinator extends XiaomiCoordinator {
     @Override
     public boolean isExperimental() {
         return true;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatch/MiWatchLiteCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatch/MiWatchLiteCoordinator.java
index 41e237cb6..11a37aa41 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatch/MiWatchLiteCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatch/MiWatchLiteCoordinator.java
@@ -25,11 +25,11 @@ import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiInstallHandler;
-import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiPlaintextCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 
-public class MiWatchLiteCoordinator extends XiaomiPlaintextCoordinator {
+public class MiWatchLiteCoordinator extends XiaomiCoordinator {
     @Override
     public boolean isExperimental() {
         return true;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch3active/RedmiWatch3ActiveCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch3active/RedmiWatch3ActiveCoordinator.java
index c0de7da34..6a2586801 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch3active/RedmiWatch3ActiveCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch3active/RedmiWatch3ActiveCoordinator.java
@@ -25,11 +25,11 @@ import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
-import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiEncryptedCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiInstallHandler;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 
-public class RedmiWatch3ActiveCoordinator extends XiaomiEncryptedCoordinator {
+public class RedmiWatch3ActiveCoordinator extends XiaomiCoordinator {
     @Override
     public boolean isExperimental() {
         return true;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs1active/XiaomiWatchS1ActiveCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs1active/XiaomiWatchS1ActiveCoordinator.java
index 63470f1c0..3ed43f298 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs1active/XiaomiWatchS1ActiveCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs1active/XiaomiWatchS1ActiveCoordinator.java
@@ -25,10 +25,10 @@ import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
-import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiEncryptedCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiInstallHandler;
 
-public class XiaomiWatchS1ActiveCoordinator extends XiaomiEncryptedCoordinator {
+public class XiaomiWatchS1ActiveCoordinator extends XiaomiCoordinator {
 
     @Override
     public int getDeviceNameResource() {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java
index bc3f79f76..9e8ed9aa3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java
@@ -94,11 +94,11 @@ public class XiaomiAuthService extends AbstractXiaomiService {
         getSupport().sendCommand(builder, buildNonceCommand(nonce));
     }
 
-    protected void startClearTextHandshake(final TransactionBuilder builder, String userId) {
+    protected void startClearTextHandshake(final TransactionBuilder builder) {
         builder.add(new SetDeviceStateAction(getSupport().getDevice(), GBDevice.State.AUTHENTICATING, getSupport().getContext()));
 
         final XiaomiProto.Auth auth = XiaomiProto.Auth.newBuilder()
-                .setUserId(userId)
+                .setUserId(getUserId(getSupport().getDevice()))
                 .build();
 
         final XiaomiProto.Command command = XiaomiProto.Command.newBuilder()
@@ -130,7 +130,7 @@ public class XiaomiAuthService extends AbstractXiaomiService {
                 final TransactionBuilder builder = getSupport().createTransactionBuilder("auth step 2");
                 // TODO use sendCommand
                 builder.write(
-                        getSupport().getCharacteristic(XiaomiEncryptedSupport.UUID_CHARACTERISTIC_XIAOMI_COMMAND_WRITE),
+                        getSupport().getCharacteristic(getSupport().characteristicCommandWrite.getCharacteristicUUID()),
                         ArrayUtils.addAll(PAYLOAD_HEADER_AUTH, reply.toByteArray())
                 );
                 builder.queue(getSupport().getQueue());
@@ -301,6 +301,17 @@ public class XiaomiAuthService extends AbstractXiaomiService {
         return authKeyBytes;
     }
 
+    protected static String getUserId(final GBDevice device) {
+        final SharedPreferences sharedPrefs = GBApplication.getDeviceSpecificSharedPrefs(device.getAddress());
+
+        final String authKey = sharedPrefs.getString("authkey", null);
+        if (StringUtils.isNotBlank(authKey)) {
+            return authKey;
+        }
+
+        return "0000000000";
+    }
+
     protected static byte[] hmacSHA256(final byte[] key, final byte[] input) {
         try {
             final Mac mac = Mac.getInstance("HmacSHA256");
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiBleUuids.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiBleUuids.java
new file mode 100644
index 000000000..313e3d331
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiBleUuids.java
@@ -0,0 +1,96 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.UUID;
+
+public class XiaomiBleUuids {
+    public static final Map<UUID, XiaomiBleUuidSet> UUIDS = new LinkedHashMap<UUID, XiaomiBleUuidSet>() {{
+        // all encrypted devices seem to share the same characteristics
+        // Mi Band 8
+        // Redmi Watch 3 Active
+        // Xiaomi Watch S1 Active
+        put(UUID.fromString("0000fe95-0000-1000-8000-00805f9b34fb"), new XiaomiBleUuidSet(
+                true,
+                UUID.fromString("00000051-0000-1000-8000-00805f9b34fb"),
+                UUID.fromString("00000052-0000-1000-8000-00805f9b34fb"),
+                UUID.fromString("00000053-0000-1000-8000-00805f9b34fb"),
+                UUID.fromString("00000055-0000-1000-8000-00805f9b34fb")
+        ));
+
+        // Mi Watch Lite
+        put(UUID.fromString("16186f00-0000-1000-8000-00807f9b34fb"), new XiaomiBleUuidSet(
+                false,
+                UUID.fromString("16186f01-0000-1000-8000-00807f9b34fb"),
+                UUID.fromString("16186f02-0000-1000-8000-00807f9b34fb"),
+                UUID.fromString("16186f03-0000-1000-8000-00807f9b34fb"),
+                UUID.fromString("16186f04-0000-1000-8000-00807f9b34fb")
+        ));
+
+        // Mi Watch Color Sport
+        put(UUID.fromString("1314f000-1000-9000-7000-301291e21220"), new XiaomiBleUuidSet(
+                false,
+                UUID.fromString("1314f005-1000-9000-7000-301291e21220"),
+                UUID.fromString("1314f001-1000-9000-7000-301291e21220"),
+                UUID.fromString("1314f002-1000-9000-7000-301291e21220"),
+                UUID.fromString("1314f007-1000-9000-7000-301291e21220")
+        ));
+    }};
+
+    public static class XiaomiBleUuidSet {
+        private final boolean encrypted;
+        private final UUID characteristicCommandRead;
+        private final UUID characteristicCommandWrite;
+        private final UUID characteristicActivityData;
+        private final UUID characteristicDataUpload;
+
+        public XiaomiBleUuidSet(final boolean encrypted,
+                                final UUID characteristicCommandRead,
+                                final UUID characteristicCommandWrite,
+                                final UUID characteristicActivityData,
+                                final UUID characteristicDataUpload) {
+
+            this.encrypted = encrypted;
+            this.characteristicCommandRead = characteristicCommandRead;
+            this.characteristicCommandWrite = characteristicCommandWrite;
+            this.characteristicActivityData = characteristicActivityData;
+            this.characteristicDataUpload = characteristicDataUpload;
+        }
+
+        protected boolean isEncrypted() {
+            return encrypted;
+        }
+
+        protected UUID getCharacteristicCommandRead() {
+            return characteristicCommandRead;
+        }
+
+        protected UUID getCharacteristicCommandWrite() {
+            return characteristicCommandWrite;
+        }
+
+        protected UUID getCharacteristicActivityData() {
+            return characteristicActivityData;
+        }
+
+        protected UUID getCharacteristicDataUpload() {
+            return characteristicDataUpload;
+        }
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiEncryptedSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiEncryptedSupport.java
deleted file mode 100644
index aa38cea1e..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiEncryptedSupport.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*  Copyright (C) 2023 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.UUID;
-
-import nodomain.freeyourgadget.gadgetbridge.service.btle.GattService;
-import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
-
-public class XiaomiEncryptedSupport extends XiaomiSupport {
-    private static final Logger LOG = LoggerFactory.getLogger(XiaomiEncryptedSupport.class);
-
-    public static final String BASE_UUID = "0000%s-0000-1000-8000-00805f9b34fb";
-
-    public static final UUID UUID_SERVICE_XIAOMI_FE95 = UUID.fromString((String.format(BASE_UUID, "fe95")));
-    public static final UUID UUID_CHARACTERISTIC_XIAOMI_UNKNOWN_0050 = UUID.fromString((String.format(BASE_UUID, "0050")));
-    public static final UUID UUID_CHARACTERISTIC_XIAOMI_COMMAND_READ = UUID.fromString((String.format(BASE_UUID, "0051")));
-    public static final UUID UUID_CHARACTERISTIC_XIAOMI_COMMAND_WRITE = UUID.fromString((String.format(BASE_UUID, "0052")));
-    public static final UUID UUID_CHARACTERISTIC_XIAOMI_ACTIVITY_DATA = UUID.fromString((String.format(BASE_UUID, "0053")));
-    public static final UUID UUID_CHARACTERISTIC_XIAOMI_UNKNOWN_0054 = UUID.fromString((String.format(BASE_UUID, "0054")));
-    public static final UUID UUID_CHARACTERISTIC_XIAOMI_DATA_UPLOAD = UUID.fromString((String.format(BASE_UUID, "0055")));
-    public static final UUID UUID_CHARACTERISTIC_XIAOMI_UNKNOWN_0056 = UUID.fromString((String.format(BASE_UUID, "0056")));
-    public static final UUID UUID_CHARACTERISTIC_XIAOMI_UNKNOWN_0057 = UUID.fromString((String.format(BASE_UUID, "0057")));
-    public static final UUID UUID_CHARACTERISTIC_XIAOMI_UNKNOWN_0058 = UUID.fromString((String.format(BASE_UUID, "0058")));
-    public static final UUID UUID_CHARACTERISTIC_XIAOMI_UNKNOWN_0059 = UUID.fromString((String.format(BASE_UUID, "0059")));
-    public static final UUID UUID_CHARACTERISTIC_XIAOMI_UNKNOWN_005A = UUID.fromString((String.format(BASE_UUID, "005a")));
-
-    public static final UUID UUID_SERVICE_XIAOMI_FDAB = UUID.fromString((String.format(BASE_UUID, "fdab")));
-    public static final UUID UUID_CHARACTERISTIC_XIAOMI_UNKNOWN_0001 = UUID.fromString((String.format(BASE_UUID, "0001")));
-    public static final UUID UUID_CHARACTERISTIC_XIAOMI_UNKNOWN_0002 = UUID.fromString((String.format(BASE_UUID, "0002")));
-    public static final UUID UUID_CHARACTERISTIC_XIAOMI_UNKNOWN_0003 = UUID.fromString((String.format(BASE_UUID, "0003")));
-
-    public XiaomiEncryptedSupport() {
-        super();
-        addSupportedService(GattService.UUID_SERVICE_GENERIC_ACCESS);
-        addSupportedService(GattService.UUID_SERVICE_GENERIC_ATTRIBUTE);
-        addSupportedService(GattService.UUID_SERVICE_DEVICE_INFORMATION);
-        addSupportedService(GattService.UUID_SERVICE_HUMAN_INTERFACE_DEVICE);
-        addSupportedService(UUID_SERVICE_XIAOMI_FE95);
-        addSupportedService(UUID_SERVICE_XIAOMI_FDAB);
-    }
-
-    @Override
-    protected boolean isEncrypted() {
-        return true;
-    }
-
-    @Override
-    protected UUID getCharacteristicCommandRead() {
-        return UUID_CHARACTERISTIC_XIAOMI_COMMAND_READ;
-    }
-
-    @Override
-    protected UUID getCharacteristicCommandWrite() {
-        return UUID_CHARACTERISTIC_XIAOMI_COMMAND_WRITE;
-    }
-
-    @Override
-    protected UUID getCharacteristicActivityData() {
-        return UUID_CHARACTERISTIC_XIAOMI_ACTIVITY_DATA;
-    }
-
-    @Override
-    protected UUID getCharacteristicDataUpload() {
-        return UUID_CHARACTERISTIC_XIAOMI_DATA_UPLOAD;
-    }
-
-    @Override
-    protected void startAuthentication(final TransactionBuilder builder) {
-        authService.startEncryptedHandshake(builder);
-    }
-}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPlaintextSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPlaintextSupport.java
deleted file mode 100644
index a975d1f60..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPlaintextSupport.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*  Copyright (C) 2023 Andreas Shimokawa
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi;
-
-import android.content.SharedPreferences;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.UUID;
-
-import nodomain.freeyourgadget.gadgetbridge.GBApplication;
-import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
-
-public class XiaomiPlaintextSupport extends XiaomiSupport {
-    private static final Logger LOG = LoggerFactory.getLogger(XiaomiPlaintextSupport.class);
-
-    public static final UUID UUID_SERVICE = UUID.fromString("16186f00-0000-1000-8000-00807f9b34fb");
-    private static final UUID UUID_CHARACTERISTIC_MAIN_READ = UUID.fromString("16186f01-0000-1000-8000-00807f9b34fb");
-    private static final UUID UUID_CHARACTERISTIC_MAIN_WRITE = UUID.fromString("16186f02-0000-1000-8000-00807f9b34fb");
-    private static final UUID UUID_CHARACTERISTIC_ACTIVITY_DATA = UUID.fromString("16186f03-0000-1000-8000-00807f9b34fb");
-    private static final UUID UUID_CHARACTERISTIC_DATA_UPLOAD = UUID.fromString("16186f04-0000-1000-8000-00807f9b34fb");
-    private static final UUID UUID_CHARACTERISTIC_UNK5 = UUID.fromString("16186f05-0000-1000-8000-00807f9b34fb");
-
-    public XiaomiPlaintextSupport() {
-        super();
-        addSupportedService(UUID_SERVICE);
-    }
-
-    @Override
-    protected boolean isEncrypted() {
-        return false;
-    }
-
-    @Override
-    protected UUID getCharacteristicCommandRead() {
-        return UUID_CHARACTERISTIC_MAIN_READ;
-    }
-
-    @Override
-    protected UUID getCharacteristicCommandWrite() {
-        return UUID_CHARACTERISTIC_MAIN_WRITE;
-    }
-
-    @Override
-    protected UUID getCharacteristicActivityData() {
-        return UUID_CHARACTERISTIC_ACTIVITY_DATA;
-    }
-
-    @Override
-    protected UUID getCharacteristicDataUpload() {
-        return UUID_CHARACTERISTIC_DATA_UPLOAD;
-    }
-
-    @Override
-    protected void startAuthentication(final TransactionBuilder builder) {
-        final String userId = getUserId(gbDevice);
-        authService.startClearTextHandshake(builder, userId);
-    }
-
-    protected static String getUserId(final GBDevice device) {
-        final SharedPreferences sharedPrefs = GBApplication.getDeviceSpecificSharedPrefs(device.getAddress());
-
-        final String authKey = sharedPrefs.getString("authkey", null);
-        if (StringUtils.isNotBlank(authKey)) {
-            return authKey;
-        }
-
-        return "0000000000";
-    }
-}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
index 3a1ceacac..3c200499b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
@@ -23,6 +23,7 @@ import android.bluetooth.BluetoothGattCharacteristic;
 import android.content.Context;
 import android.location.Location;
 import android.net.Uri;
+import android.widget.Toast;
 
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -67,7 +68,7 @@ import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.Xiao
 import nodomain.freeyourgadget.gadgetbridge.util.GB;
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 
-public abstract class XiaomiSupport extends AbstractBTLEDeviceSupport {
+public class XiaomiSupport extends AbstractBTLEDeviceSupport {
     private static final Logger LOG = LoggerFactory.getLogger(XiaomiSupport.class);
 
     protected XiaomiCharacteristic characteristicCommandRead;
@@ -105,26 +106,32 @@ public abstract class XiaomiSupport extends AbstractBTLEDeviceSupport {
 
     public XiaomiSupport() {
         super(LOG);
+        for (final UUID uuid : XiaomiBleUuids.UUIDS.keySet()) {
+            addSupportedService(uuid);
+        }
     }
 
-    protected abstract boolean isEncrypted();
-
-    protected abstract UUID getCharacteristicCommandRead();
-
-    protected abstract UUID getCharacteristicCommandWrite();
-
-    protected abstract UUID getCharacteristicActivityData();
-
-    protected abstract UUID getCharacteristicDataUpload();
-
-    protected abstract void startAuthentication(final TransactionBuilder builder);
-
     @Override
     protected final TransactionBuilder initializeDevice(final TransactionBuilder builder) {
-        final BluetoothGattCharacteristic btCharacteristicCommandRead = getCharacteristic(getCharacteristicCommandRead());
-        final BluetoothGattCharacteristic btCharacteristicCommandWrite = getCharacteristic(getCharacteristicCommandWrite());
-        final BluetoothGattCharacteristic btCharacteristicActivityData = getCharacteristic(getCharacteristicActivityData());
-        final BluetoothGattCharacteristic btCharacteristicDataUpload = getCharacteristic(getCharacteristicDataUpload());
+        XiaomiBleUuids.XiaomiBleUuidSet uuidSet = null;
+        for (Map.Entry<UUID, XiaomiBleUuids.XiaomiBleUuidSet> xiaomiUuid : XiaomiBleUuids.UUIDS.entrySet()) {
+            if (getSupportedServices().contains(xiaomiUuid.getKey())) {
+                uuidSet = xiaomiUuid.getValue();
+                break;
+            }
+        }
+
+        if (uuidSet == null) {
+            GB.toast(getContext(), "Failed to find known Xiaomi service", Toast.LENGTH_LONG, GB.ERROR);
+            LOG.warn("Failed to find known Xiaomi service");
+            builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.NOT_CONNECTED, getContext()));
+            return builder;
+        }
+
+        final BluetoothGattCharacteristic btCharacteristicCommandRead = getCharacteristic(uuidSet.getCharacteristicCommandRead());
+        final BluetoothGattCharacteristic btCharacteristicCommandWrite = getCharacteristic(uuidSet.getCharacteristicCommandWrite());
+        final BluetoothGattCharacteristic btCharacteristicActivityData = getCharacteristic(uuidSet.getCharacteristicActivityData());
+        final BluetoothGattCharacteristic btCharacteristicDataUpload = getCharacteristic(uuidSet.getCharacteristicDataUpload());
 
         // FIXME unsetDynamicState unsets the fw version, which causes problems..
         if (getDevice().getFirmwareVersion() == null && mFirmwareVersion != null) {
@@ -138,15 +145,15 @@ public abstract class XiaomiSupport extends AbstractBTLEDeviceSupport {
         }
 
         this.characteristicCommandRead = new XiaomiCharacteristic(this, btCharacteristicCommandRead, authService);
-        this.characteristicCommandRead.setEncrypted(isEncrypted());
+        this.characteristicCommandRead.setEncrypted(uuidSet.isEncrypted());
         this.characteristicCommandRead.setHandler(this::handleCommandBytes);
         this.characteristicCommandWrite = new XiaomiCharacteristic(this, btCharacteristicCommandWrite, authService);
-        this.characteristicCommandWrite.setEncrypted(isEncrypted());
+        this.characteristicCommandWrite.setEncrypted(uuidSet.isEncrypted());
         this.characteristicActivityData = new XiaomiCharacteristic(this, btCharacteristicActivityData, authService);
         this.characteristicActivityData.setHandler(healthService.getActivityFetcher()::addChunk);
-        this.characteristicActivityData.setEncrypted(isEncrypted());
+        this.characteristicActivityData.setEncrypted(uuidSet.isEncrypted());
         this.characteristicDataUpload = new XiaomiCharacteristic(this, btCharacteristicDataUpload, authService);
-        this.characteristicDataUpload.setEncrypted(isEncrypted());
+        this.characteristicDataUpload.setEncrypted(uuidSet.isEncrypted());
         this.characteristicDataUpload.setIncrementNonce(false);
         this.dataUploadService.setDataUploadCharacteristic(this.characteristicDataUpload);
 
@@ -159,7 +166,11 @@ public abstract class XiaomiSupport extends AbstractBTLEDeviceSupport {
         builder.notify(btCharacteristicActivityData, true);
         builder.notify(btCharacteristicDataUpload, true);
 
-        startAuthentication(builder);
+        if (uuidSet.isEncrypted()) {
+            authService.startEncryptedHandshake(builder);
+        } else {
+            authService.startClearTextHandshake(builder);
+        }
 
         return builder;
     }

From e6cb15d9eb2448f61ff3fae737ba3a96e264bd19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sat, 2 Dec 2023 11:56:23 +0000
Subject: [PATCH 186/595] Mi Watch Color Sport: Experimental support

---
 README.md                                     |  1 +
 .../MiWatchColorSportCoordinator.java         | 64 +++++++++++++++++++
 .../gadgetbridge/model/DeviceType.java        |  2 +
 app/src/main/res/values/strings.xml           |  1 +
 4 files changed, 68 insertions(+)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatchcolorsport/MiWatchColorSportCoordinator.java

diff --git a/README.md b/README.md
index ca28239e7..a19f01fa2 100644
--- a/README.md
+++ b/README.md
@@ -98,6 +98,7 @@ vendor's servers.
 	- Xiaomi Smart Band 7 Pro (experimental) [**\[!\]**](#special-pairing-procedures)
 	- [Xiaomi Smart Band 7](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Mi-Band-7) [**\[!\]**](#special-pairing-procedures)
 	- [Xiaomi Smart Band 8 (experimental)](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Mi-Band-8) [**\[!\]**](#special-pairing-procedures)
+	- Mi Watch Color Sport (experimental)
     - Mi Watch Lite (experimental)
     - Redmi Watch 3 Active (experimental) [**\[!\]**](#special-pairing-procedures)
 	- Watch S1 Active (experimental) [**\[!\]**](#special-pairing-procedures)
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatchcolorsport/MiWatchColorSportCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatchcolorsport/MiWatchColorSportCoordinator.java
new file mode 100644
index 000000000..c69791a08
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatchcolorsport/MiWatchColorSportCoordinator.java
@@ -0,0 +1,64 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.miwatchcolorsport;
+
+import android.content.Context;
+import android.net.Uri;
+
+import androidx.annotation.Nullable;
+
+import java.util.regex.Pattern;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiInstallHandler;
+
+public class MiWatchColorSportCoordinator extends XiaomiCoordinator {
+
+    @Override
+    public int getDeviceNameResource() {
+        return R.string.devicetype_mi_watch_color_sport;
+    }
+
+    @Override
+    protected Pattern getSupportedDeviceName() {
+        return Pattern.compile("^Mi ColorS [0-9A-Z]{4}$");
+    }
+
+    @Override
+    public boolean isExperimental() {
+        return true;
+    }
+
+    @Nullable
+    @Override
+    public InstallHandler findInstallHandler(Uri uri, Context context) {
+        final XiaomiInstallHandler handler = new XiaomiInstallHandler(uri, context);
+        return handler.isValid() ? handler : null;
+    }
+
+    @Override
+    public int getDefaultIconResource() {
+        return R.drawable.ic_device_miwatch;
+    }
+
+    @Override
+    public int getDisabledIconResource() {
+        return R.drawable.ic_device_miwatch_disabled;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
index 0656d482f..f41b262b9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
@@ -142,6 +142,7 @@ import nodomain.freeyourgadget.gadgetbridge.devices.watch9.Watch9DeviceCoordinat
 import nodomain.freeyourgadget.gadgetbridge.devices.withingssteelhr.WithingsSteelHRDeviceCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.miband7pro.MiBand7ProCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.miband8.MiBand8Coordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.miwatchcolorsport.MiWatchColorSportCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.watchs1active.XiaomiWatchS1ActiveCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xwatch.XWatchCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.zetime.ZeTimeCoordinator;
@@ -200,6 +201,7 @@ public enum DeviceType {
     MIBAND7PRO(MiBand7ProCoordinator.class),
     MIBAND8(MiBand8Coordinator.class),
     MIWATCHLITE(MiWatchLiteCoordinator.class),
+    MIWATCHCOLORSPORT(MiWatchColorSportCoordinator.class),
     REDMIWATCH3ACTIVE(RedmiWatch3ActiveCoordinator.class),
     XIAOMI_WATCH_S1_ACTIVE(XiaomiWatchS1ActiveCoordinator.class),
     AMAZFITGTS3(AmazfitGTS3Coordinator.class),
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f3decd289..b0d712421 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2431,4 +2431,5 @@
     <string name="pref_sleep_mode_schedule_title">Sleep Mode Schedule</string>
     <string name="pref_sleep_mode_schedule_summary">Send a reminder and enter sleep mode at bedtime. At the scheduled wake-up time, the wake-up alarm will sound.</string>
     <string name="devicetype_xiaomi_watch_s1_active">Xiaomi Watch S1 Active</string>
+    <string name="devicetype_mi_watch_color_sport">Mi Watch Color Sport</string>
 </resources>

From 376956bbe9c7fee997220297a051a6e4b89f17bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Mon, 4 Dec 2023 09:46:49 +0000
Subject: [PATCH 187/595] Xiaomi: Improve activity fetch logging

---
 .../activity/XiaomiActivityFileFetcher.java   | 20 ++++++-----
 .../xiaomi/activity/XiaomiActivityFileId.java | 34 +++++++++++++------
 2 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileFetcher.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileFetcher.java
index ee9e27457..70256e07d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileFetcher.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileFetcher.java
@@ -25,17 +25,12 @@ import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.OutputStream;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
-import java.util.GregorianCalendar;
-import java.util.HashSet;
 import java.util.LinkedList;
-import java.util.List;
 import java.util.Locale;
 import java.util.Queue;
-import java.util.Set;
+import java.util.TimeZone;
 
 import nodomain.freeyourgadget.gadgetbridge.BuildConfig;
 import nodomain.freeyourgadget.gadgetbridge.R;
@@ -137,7 +132,7 @@ public class XiaomiActivityFileFetcher {
             isFetching = true;
             final XiaomiSupport support = mHealthService.getSupport();
             final Context context = support.getContext();
-            GB.updateTransferNotification(context.getString(R.string.busy_task_fetch_activity_data),"", true, 0, context);
+            GB.updateTransferNotification(context.getString(R.string.busy_task_fetch_activity_data), "", true, 0, context);
             support.getDevice().setBusyTask(context.getString(R.string.busy_task_fetch_activity_data));
             support.getDevice().sendDeviceUpdateIntent(support.getContext());
             triggerNextFetch();
@@ -162,12 +157,21 @@ public class XiaomiActivityFileFetcher {
     }
 
     protected void dumpBytesToExternalStorage(final XiaomiActivityFileId fileId, final byte[] bytes) {
+        final SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd'T'HHmmss", Locale.US);
+
         try {
             final File externalFilesDir = FileUtils.getExternalFilesDir();
             final File targetDir = new File(externalFilesDir, "rawFetchOperations");
             targetDir.mkdirs();
 
-            final String filename = "xiaomi_" + GB.hexdump(fileId.toBytes()) + ".bin";
+            final String filename = String.format(
+                    Locale.ROOT,  "xiaomi_%s_%02X_%02X_%02X_v%d.bin",
+                    sdf.format(fileId.getTimestamp()),
+                    fileId.getTypeCode(),
+                    fileId.getSubtypeCode(),
+                    fileId.getDetailTypeCode(),
+                    fileId.getVersion()
+            );
 
             final File outputFile = new File(targetDir, filename);
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java
index 3db718cbd..dfe269783 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java
@@ -58,14 +58,26 @@ public class XiaomiActivityFileId {
         return Type.fromCode(type);
     }
 
+    public int getTypeCode() {
+        return type;
+    }
+
     public Subtype getSubtype() {
         return Subtype.fromCode(getType(), subtype);
     }
 
+    public int getSubtypeCode() {
+        return subtype;
+    }
+
     public DetailType getDetailType() {
         return DetailType.fromCode(detailType);
     }
 
+    public int getDetailTypeCode() {
+        return detailType;
+    }
+
     public int getVersion() {
         return version;
     }
@@ -114,9 +126,9 @@ public class XiaomiActivityFileId {
         return getClass().getSimpleName() + "{" +
                 "timestamp=" + DateTimeUtils.formatIso8601(timestamp) +
                 ", timezone=" + timezone +
-                ", type=" + (typeName + "(" + type + ")") +
-                ", subtype=" + (subtypeName + "(" + subtype + ")") +
-                ", detailType=" + (detailTypeName + "(" + detailType + ")") +
+                ", type=" + (typeName + String.format("(0x%02X)", type)) +
+                ", subtype=" + (subtypeName + String.format("(0x%02X)", subtype)) +
+                ", detailType=" + (detailTypeName + String.format("(0x%02X)", detailType)) +
                 ", version=" + version +
                 "}";
     }
@@ -149,12 +161,12 @@ public class XiaomiActivityFileId {
 
     public enum Subtype {
         UNKNOWN(Type.UNKNOWN, -1),
-        ACTIVITY_DAILY(Type.ACTIVITY, 0),
-        ACTIVITY_SLEEP(Type.ACTIVITY,8),
-        SPORTS_OUTDOOR_RUNNING(Type.SPORTS, 1),
-        SPORTS_FREESTYLE(Type.SPORTS, 8),
-        SPORTS_ELLIPTICAL(Type.SPORTS, 11),
-        SPORTS_OUTDOOR_CYCLING(Type.SPORTS, 23),
+        ACTIVITY_DAILY(Type.ACTIVITY, 0x00),
+        ACTIVITY_SLEEP(Type.ACTIVITY, 0x08),
+        SPORTS_OUTDOOR_RUNNING(Type.SPORTS, 0x01),
+        SPORTS_FREESTYLE(Type.SPORTS, 0x08),
+        SPORTS_ELLIPTICAL(Type.SPORTS, 0x0B),
+        SPORTS_OUTDOOR_CYCLING(Type.SPORTS, 0x17),
         ;
 
         private final Type type;
@@ -182,8 +194,8 @@ public class XiaomiActivityFileId {
     public enum DetailType {
         UNKNOWN(-1),
         DETAILS(0),
-        SUMMARY(1),
-        GPS_TRACK(2),
+        SUMMARY(0x01),
+        GPS_TRACK(0x02),
         ;
 
         private final int code;

From 0f83346d65fe6ac5453eab135c3cb179e24baaa1 Mon Sep 17 00:00:00 2001
From: MrYoranimo <yvulker@gmail.com>
Date: Mon, 4 Dec 2023 22:03:59 +0100
Subject: [PATCH 188/595] Xiaomi: check if binary parser result is null

The activity parser may return null pointers in case the version
of the data structure is not supported. Not checking for null here may
result in the activity fetching task may never complete and cause
further communication with the device to grind to a halt.
---
 .../devices/xiaomi/activity/impl/WorkoutSummaryParser.java   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java
index e59869215..6b9dff69d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java
@@ -60,6 +60,11 @@ public class WorkoutSummaryParser extends XiaomiActivityParser implements Activi
             return false;
         }
 
+        // parseBinaryData may return null in case the version is not supported
+        if (summary == null) {
+            return false;
+        }
+
         summary.setSummaryData(null); // remove json before saving to database
 
         try (DBHandler dbHandler = GBApplication.acquireDB()) {

From b303da4e62d341913bceea0bfcb51e86185f1043 Mon Sep 17 00:00:00 2001
From: MrYoranimo <yvulker@gmail.com>
Date: Mon, 4 Dec 2023 22:07:02 +0100
Subject: [PATCH 189/595] Xiaomi: wrap parsing of activity data in try block

This will prevent uncaught exceptions that occur during the
parsing of activity data from breaking up the activity fetching
chain and causing the task to never get completed.
---
 .../xiaomi/activity/XiaomiActivityFileFetcher.java     | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileFetcher.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileFetcher.java
index 70256e07d..6b0370372 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileFetcher.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileFetcher.java
@@ -117,8 +117,14 @@ public class XiaomiActivityFileFetcher {
                 return;
             }
 
-            if (!activityParser.parse(mHealthService.getSupport(), fileId, activityData)) {
-                LOG.warn("Failed to parse {}", fileId);
+            try {
+                if (activityParser.parse(mHealthService.getSupport(), fileId, activityData)) {
+                    LOG.info("Successfully parsed {}", fileId);
+                } else {
+                    LOG.warn("Failed to parse {}", fileId);
+                }
+            } catch (final Exception ex) {
+                LOG.error("addChunk(): failed to parse activity: ", ex);
             }
 
             triggerNextFetch();

From 5f9fda4f077f78f161359e87b82d63f1dbce3ae1 Mon Sep 17 00:00:00 2001
From: MrYoranimo <yvulker@gmail.com>
Date: Mon, 4 Dec 2023 22:09:04 +0100
Subject: [PATCH 190/595] BtLEQueue: fix typo in onCharacteristicChange

---
 .../freeyourgadget/gadgetbridge/service/btle/BtLEQueue.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEQueue.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEQueue.java
index 78d64ee29..a86f44015 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEQueue.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEQueue.java
@@ -652,7 +652,7 @@ public final class BtLEQueue {
                 try {
                     getCallbackToUse().onCharacteristicChanged(gatt, characteristic);
                 } catch (Throwable ex) {
-                    LOG.error("onCharaceristicChanged: " + ex.getMessage(), ex);
+                    LOG.error("onCharacteristicChanged: " + ex.getMessage(), ex);
                 }
             } else {
                 LOG.info("No gattcallback registered, ignoring characteristic change");

From 95d3ff81fdfcebac98cb7fdab4b3395b0a89f70e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Tue, 5 Dec 2023 18:16:45 +0000
Subject: [PATCH 191/595] Xiaomi: Fetch alarm and reminder slots from watch

---
 .../devices/xiaomi/XiaomiCoordinator.java      | 18 +++++++++---------
 .../xiaomi/miwatch/MiWatchLiteCoordinator.java | 10 ----------
 .../devices/xiaomi/XiaomiPreferences.java      |  3 +++
 .../xiaomi/services/XiaomiScheduleService.java | 11 ++++++++++-
 app/src/main/proto/xiaomi.proto                |  2 +-
 5 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
index 5f0359033..0662bb5c9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
@@ -33,6 +33,7 @@ import java.util.UUID;
 import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.BuildConfig;
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 import nodomain.freeyourgadget.gadgetbridge.GBException;
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.activities.appmanager.AppManagerActivity;
@@ -56,8 +57,10 @@ import nodomain.freeyourgadget.gadgetbridge.model.Spo2Sample;
 import nodomain.freeyourgadget.gadgetbridge.model.StressSample;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiBleUuids;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiPreferences;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl.WorkoutSummaryParser;
+import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 
 public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
     // On plaintext devices, user id is used as auth key - numeric
@@ -158,8 +161,7 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
 
     @Override
     public int getAlarmSlotCount(final GBDevice device) {
-        // TODO the watch returns the slot count
-        return 10;
+        return getPrefs(device).getInt(XiaomiPreferences.PREF_ALARM_SLOTS, 0);
     }
 
     @Override
@@ -255,11 +257,6 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
         return false;
     }
 
-    @Override
-    public boolean supportsAlarmSnoozing() {
-        return false;
-    }
-
     @Override
     public boolean supportsAlarmDescription(final GBDevice device) {
         // TODO does it?
@@ -279,8 +276,7 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
 
     @Override
     public int getReminderSlotCount(final GBDevice device) {
-        // TODO fetch from watch
-        return 50;
+        return getPrefs(device).getInt(XiaomiPreferences.PREF_REMINDER_SLOTS, 0);
     }
 
     @Override
@@ -513,6 +509,10 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
         return new AbstractNotificationPattern[0];
     }
 
+    protected static Prefs getPrefs(final GBDevice device) {
+        return new Prefs(GBApplication.getDeviceSpecificSharedPrefs(device.getAddress()));
+    }
+
     public boolean supportsMultipleWeatherLocations() {
         return false;
     }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatch/MiWatchLiteCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatch/MiWatchLiteCoordinator.java
index 11a37aa41..f7a4ab230 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatch/MiWatchLiteCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatch/MiWatchLiteCoordinator.java
@@ -81,14 +81,4 @@ public class MiWatchLiteCoordinator extends XiaomiCoordinator {
     public boolean supportsRealtimeData() {
         return false;
     }
-
-    @Override
-    public int getAlarmSlotCount(final GBDevice device) {
-        return 0;
-    }
-
-    @Override
-    public int getReminderSlotCount(final GBDevice device) {
-        return 0;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPreferences.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPreferences.java
index 86c17af4f..e683d550b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPreferences.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPreferences.java
@@ -28,6 +28,9 @@ import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 
 public final class XiaomiPreferences {
+    public static final String PREF_ALARM_SLOTS = "alarm_slots";
+    public static final String PREF_REMINDER_SLOTS = "reminder_slots";
+
     private XiaomiPreferences() {
         // util class
     }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java
index 1cf105065..6b8266fec 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java
@@ -48,7 +48,6 @@ import nodomain.freeyourgadget.gadgetbridge.model.DeviceService;
 import nodomain.freeyourgadget.gadgetbridge.model.Reminder;
 import nodomain.freeyourgadget.gadgetbridge.model.WorldClock;
 import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
-import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiPreferences;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
@@ -165,6 +164,11 @@ public class XiaomiScheduleService extends AbstractXiaomiService {
     public void handleReminders(final XiaomiProto.Reminders reminders) {
         LOG.debug("Got {} reminders from the watch", reminders.getReminderCount());
 
+        final GBDeviceEventUpdatePreferences eventUpdatePreferences = new GBDeviceEventUpdatePreferences()
+                .withPreference(XiaomiPreferences.PREF_REMINDER_SLOTS, reminders.getMaxReminders());
+
+        getSupport().evaluateGBDeviceEvent(eventUpdatePreferences);
+
         watchReminders.clear();
         for (final XiaomiProto.Reminder reminder : reminders.getReminderList()) {
             final nodomain.freeyourgadget.gadgetbridge.entities.Reminder gbReminder = new nodomain.freeyourgadget.gadgetbridge.entities.Reminder();
@@ -499,6 +503,11 @@ public class XiaomiScheduleService extends AbstractXiaomiService {
     public void handleAlarms(final XiaomiProto.Alarms alarms) {
         LOG.debug("Got {} alarms from the watch", alarms.getAlarmCount());
 
+        final GBDeviceEventUpdatePreferences eventUpdatePreferences = new GBDeviceEventUpdatePreferences()
+                .withPreference(XiaomiPreferences.PREF_ALARM_SLOTS, alarms.getMaxAlarms());
+
+        getSupport().evaluateGBDeviceEvent(eventUpdatePreferences);
+
         watchAlarms.clear();
         for (final XiaomiProto.Alarm alarm : alarms.getAlarmList()) {
             final nodomain.freeyourgadget.gadgetbridge.entities.Alarm gbAlarm = new nodomain.freeyourgadget.gadgetbridge.entities.Alarm();
diff --git a/app/src/main/proto/xiaomi.proto b/app/src/main/proto/xiaomi.proto
index d156cd9aa..ce3abe326 100644
--- a/app/src/main/proto/xiaomi.proto
+++ b/app/src/main/proto/xiaomi.proto
@@ -825,7 +825,7 @@ message SleepModeSchedule {
 
 message Reminders {
   repeated Reminder reminder = 1;
-  optional uint32 unknown2 = 2; // 50, max reminder?
+  optional uint32 maxReminders = 2;
 }
 
 message Reminder {

From 2dacdcface93da2f1986ce6dee136c824d3788a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Tue, 5 Dec 2023 18:17:50 +0000
Subject: [PATCH 192/595] Xiaomi: Log service

---
 .../gadgetbridge/service/devices/xiaomi/XiaomiSupport.java       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
index 3c200499b..41110357f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
@@ -116,6 +116,7 @@ public class XiaomiSupport extends AbstractBTLEDeviceSupport {
         XiaomiBleUuids.XiaomiBleUuidSet uuidSet = null;
         for (Map.Entry<UUID, XiaomiBleUuids.XiaomiBleUuidSet> xiaomiUuid : XiaomiBleUuids.UUIDS.entrySet()) {
             if (getSupportedServices().contains(xiaomiUuid.getKey())) {
+                LOG.debug("Found Xiaomi service: {}", xiaomiUuid.getKey());
                 uuidSet = xiaomiUuid.getValue();
                 break;
             }

From 3ab1ac26db6f8594feacf4cb70cd5057219a5773 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Tue, 5 Dec 2023 11:45:32 +0000
Subject: [PATCH 193/595] Refactor known preference values code to be reusable

---
 .../gadgetbridge/GBApplication.java           |  34 +++-
 .../devicesettings/DeviceSettingsUtils.java   | 184 ++++++++++++++++++
 .../devices/huami/Huami2021Coordinator.java   |  17 +-
 .../huami/Huami2021SettingsCustomizer.java    | 131 +------------
 .../zeppos/services/ZeppOsAlexaService.java   |   3 +-
 .../zeppos/services/ZeppOsConfigService.java  |  13 +-
 .../services/ZeppOsDisplayItemsService.java   |   9 +-
 .../services/ZeppOsMorningUpdatesService.java |   9 +-
 .../services/ZeppOsShortcutCardsService.java  |   3 +-
 .../services/ZeppOsWatchfaceService.java      |   3 +-
 10 files changed, 248 insertions(+), 158 deletions(-)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsUtils.java

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
index 56b5f010a..1f17df04d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
@@ -54,6 +54,7 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Lock;
@@ -121,7 +122,7 @@ public class GBApplication extends Application {
     private static SharedPreferences sharedPrefs;
     private static final String PREFS_VERSION = "shared_preferences_version";
     //if preferences have to be migrated, increment the following and add the migration logic in migratePrefs below; see http://stackoverflow.com/questions/16397848/how-can-i-migrate-android-preferences-with-a-new-version
-    private static final int CURRENT_PREFS_VERSION = 26;
+    private static final int CURRENT_PREFS_VERSION = 27;
 
     private static LimitedQueue mIDSenderLookup = new LimitedQueue(16);
     private static Prefs prefs;
@@ -1372,6 +1373,37 @@ public class GBApplication extends Application {
             }
         }
 
+        if (oldVersion < 27) {
+            try (DBHandler db = acquireDB()) {
+                final DaoSession daoSession = db.getDaoSession();
+                final List<Device> activeDevices = DBHelper.getActiveDevices(daoSession);
+
+                for (final Device dbDevice : activeDevices) {
+                    final SharedPreferences deviceSharedPrefs = GBApplication.getDeviceSpecificSharedPrefs(dbDevice.getIdentifier());
+                    final SharedPreferences.Editor deviceSharedPrefsEdit = deviceSharedPrefs.edit();
+
+                    for (final Map.Entry<String, ?> entry : deviceSharedPrefs.getAll().entrySet()) {
+                        final String key = entry.getKey();
+                        if (key.startsWith("huami_2021_known_config_")) {
+                            deviceSharedPrefsEdit.putString(
+                                    key.replace("huami_2021_known_config_", "") + "_is_known",
+                                    entry.getValue().toString()
+                            );
+                        } else if (key.endsWith("_huami_2021_possible_values")) {
+                            deviceSharedPrefsEdit.putString(
+                                    key.replace("_huami_2021_possible_values", "") + "_possible_values",
+                                    entry.getValue().toString()
+                            );
+                        }
+                    }
+
+                    deviceSharedPrefsEdit.apply();
+                }
+            } catch (Exception e) {
+                Log.w(TAG, "error acquiring DB lock");
+            }
+        }
+
         editor.putString(PREFS_VERSION, Integer.toString(CURRENT_PREFS_VERSION));
         editor.apply();
     }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsUtils.java
new file mode 100644
index 000000000..fc83cd343
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsUtils.java
@@ -0,0 +1,184 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.activities.devicesettings;
+
+import android.text.InputFilter;
+import android.text.InputType;
+import android.text.Spanned;
+
+import androidx.preference.EditTextPreference;
+import androidx.preference.ListPreference;
+import androidx.preference.MultiSelectListPreference;
+import androidx.preference.Preference;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
+
+public final class DeviceSettingsUtils {
+    private static final Logger LOG = LoggerFactory.getLogger(DeviceSettingsUtils.class);
+
+    private DeviceSettingsUtils() {
+        // utility class
+    }
+
+    /**
+     * Returns the preference key where to save the list of possible value for a preference, comma-separated.
+     */
+    public static String getPrefPossibleValuesKey(final String key) {
+        return String.format(Locale.ROOT, "%s_possible_values", key);
+    }
+
+    /**
+     * Returns the preference key where to that a config was reported as supported (boolean).
+     */
+    public static String getPrefKnownConfig(final String key) {
+        return String.format(Locale.ROOT, "%s_is_known", key);
+    }
+
+    /**
+     * Removes all unsupported elements from a list preference. If they are not known, the preference
+     * is hidden.
+     */
+    public static void removeUnsupportedElementsFromListPreference(final String prefKey,
+                                                                   final DeviceSpecificSettingsHandler handler,
+                                                                   final Prefs prefs) {
+        final Preference pref = handler.findPreference(prefKey);
+        if (pref == null) {
+            return;
+        }
+
+        // Get the list of possible values for this preference, as reported by the band
+        final List<String> possibleValues = prefs.getList(getPrefPossibleValuesKey(prefKey), null);
+        if (possibleValues == null || possibleValues.isEmpty()) {
+            // The band hasn't reported this setting, so we don't know the possible values.
+            // Hide it
+            pref.setVisible(false);
+
+            return;
+        }
+
+        final CharSequence[] originalEntries;
+        final CharSequence[] originalValues;
+
+        if (pref instanceof ListPreference) {
+            originalEntries = ((ListPreference) pref).getEntries();
+            originalValues = ((ListPreference) pref).getEntryValues();
+        } else if (pref instanceof MultiSelectListPreference) {
+            originalEntries = ((MultiSelectListPreference) pref).getEntries();
+            originalValues = ((MultiSelectListPreference) pref).getEntryValues();
+        } else {
+            LOG.error("Unknown list pref class {}", pref.getClass().getName());
+            return;
+        }
+
+        final List<String> prefValues = new ArrayList<>(originalValues.length);
+        for (final CharSequence entryValue : originalValues) {
+            prefValues.add(entryValue.toString());
+        }
+
+        final CharSequence[] entries = new CharSequence[possibleValues.size()];
+        final CharSequence[] values = new CharSequence[possibleValues.size()];
+        for (int i = 0; i < possibleValues.size(); i++) {
+            final String possibleValue = possibleValues.get(i);
+            final int idxPrefValue = prefValues.indexOf(possibleValue);
+
+            if (idxPrefValue >= 0) {
+                entries[i] = originalEntries[idxPrefValue];
+            } else {
+                entries[i] = handler.getContext().getString(R.string.menuitem_unknown_app, possibleValue);
+            }
+            values[i] = possibleValue;
+        }
+
+        if (pref instanceof ListPreference) {
+            ((ListPreference) pref).setEntries(entries);
+            ((ListPreference) pref).setEntryValues(values);
+        } else if (pref instanceof MultiSelectListPreference) {
+            ((MultiSelectListPreference) pref).setEntries(entries);
+            ((MultiSelectListPreference) pref).setEntryValues(values);
+        }
+    }
+
+    /**
+     * Hides the the prefToHide preference if none of the preferences in the preferences list are
+     * visible.
+     */
+    public static void hidePrefIfNoneVisible(final DeviceSpecificSettingsHandler handler,
+                                             final String prefToHide,
+                                             final List<String> subPrefs) {
+        final Preference pref = handler.findPreference(prefToHide);
+        if (pref == null) {
+            return;
+        }
+
+        for (final String subPrefKey : subPrefs) {
+            final Preference subPref = handler.findPreference(subPrefKey);
+            if (subPref == null) {
+                continue;
+            }
+            if (subPref.isVisible()) {
+                // At least one preference is visible
+                return;
+            }
+        }
+
+        // No preference was visible, hide
+        pref.setVisible(false);
+    }
+
+    public static void enforceMinMax(final EditTextPreference pref, final int minValue, final int maxValue) {
+        if (minValue >= maxValue) {
+            LOG.warn("Invalid min/max values for {}: {}/{}", pref.getKey(), minValue, maxValue);
+            return;
+        }
+
+        pref.setOnBindEditTextListener(p -> {
+            p.setInputType(InputType.TYPE_CLASS_NUMBER);
+            p.setFilters(new InputFilter[]{new MinMaxInputFilter(minValue, maxValue)});
+            p.setSelection(p.getText().length());
+        });
+    }
+
+    public static final class MinMaxInputFilter implements InputFilter {
+        private final int min;
+        private final int max;
+
+        public MinMaxInputFilter(final int min, final int max) {
+            this.min = min;
+            this.max = max;
+        }
+
+        @Override
+        public CharSequence filter(CharSequence source, int start, int end, Spanned dest, int dstart, int dend) {
+            try {
+                final int input = Integer.parseInt(dest.toString() + source.toString());
+                if (input >= min && input <= max) {
+                    return null;
+                }
+            } catch (final NumberFormatException ignored) {
+            }
+            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/Huami2021Coordinator.java
index 9c7d7e923..e23cf4725 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021Coordinator.java
@@ -33,6 +33,7 @@ import java.util.Locale;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.activities.appmanager.AppManagerActivity;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsUtils;
 import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSpecificSettingsCustomizer;
 import nodomain.freeyourgadget.gadgetbridge.capabilities.HeartRateCapability;
 import nodomain.freeyourgadget.gadgetbridge.capabilities.password.PasswordCapabilityImpl;
@@ -560,22 +561,8 @@ public abstract class Huami2021Coordinator extends HuamiCoordinator {
         return ZeppOsConfigService.deviceHasConfig(getPrefs(device), config);
     }
 
-    /**
-     * Returns the preference key where to save the list of possible value for a preference, comma-separated.
-     */
-    public static String getPrefPossibleValuesKey(final String key) {
-        return String.format(Locale.ROOT, "%s_huami_2021_possible_values", key);
-    }
-
-    /**
-     * Returns the preference key where to that a config was reported as supported (boolean).
-     */
-    public static String getPrefKnownConfig(final String key) {
-        return String.format(Locale.ROOT, "huami_2021_known_config_%s", key);
-    }
-
     public static boolean deviceHasConfig(final Prefs devicePrefs, final ZeppOsConfigService.ConfigArg config) {
-        return devicePrefs.getBoolean(Huami2021Coordinator.getPrefKnownConfig(config.name()), false);
+        return devicePrefs.getBoolean(DeviceSettingsUtils.getPrefKnownConfig(config.name()), false);
     }
 
     public static boolean experimentalFeatures(final GBDevice device) {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021SettingsCustomizer.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021SettingsCustomizer.java
index c4f5fa237..c68be2a4a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021SettingsCustomizer.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021SettingsCustomizer.java
@@ -16,6 +16,9 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami;
 
+import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsUtils.hidePrefIfNoneVisible;
+import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsUtils.removeUnsupportedElementsFromListPreference;
+
 import android.os.Parcel;
 import android.text.InputFilter;
 import android.text.InputType;
@@ -41,6 +44,7 @@ import java.util.Set;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsUtils;
 import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSpecificSettingsHandler;
 import nodomain.freeyourgadget.gadgetbridge.activities.loyaltycards.LoyaltyCardsSettingsConst;
 import nodomain.freeyourgadget.gadgetbridge.capabilities.GpsCapability;
@@ -388,70 +392,6 @@ public class Huami2021SettingsCustomizer extends HuamiSettingsCustomizer {
         }
     }
 
-    /**
-     * Removes all unsupported elements from a list preference. If they are not known, the preference
-     * is hidden.
-     */
-    private void removeUnsupportedElementsFromListPreference(final String prefKey,
-                                                             final DeviceSpecificSettingsHandler handler,
-                                                             final Prefs prefs) {
-        final Preference pref = handler.findPreference(prefKey);
-        if (pref == null) {
-            return;
-        }
-
-        // Get the list of possible values for this preference, as reported by the band
-        final List<String> possibleValues = prefs.getList(Huami2021Coordinator.getPrefPossibleValuesKey(prefKey), null);
-        if (possibleValues == null || possibleValues.isEmpty()) {
-            // The band hasn't reported this setting, so we don't know the possible values.
-            // Hide it
-            pref.setVisible(false);
-
-            return;
-        }
-
-        final CharSequence[] originalEntries;
-        final CharSequence[] originalValues;
-
-        if (pref instanceof ListPreference) {
-            originalEntries = ((ListPreference) pref).getEntries();
-            originalValues = ((ListPreference) pref).getEntryValues();
-        } else if (pref instanceof MultiSelectListPreference) {
-            originalEntries = ((MultiSelectListPreference) pref).getEntries();
-            originalValues = ((MultiSelectListPreference) pref).getEntryValues();
-        } else {
-            LOG.error("Unknown list pref class {}", pref.getClass().getName());
-            return;
-        }
-
-        final List<String> prefValues = new ArrayList<>(originalValues.length);
-        for (final CharSequence entryValue : originalValues) {
-            prefValues.add(entryValue.toString());
-        }
-
-        final CharSequence[] entries = new CharSequence[possibleValues.size()];
-        final CharSequence[] values = new CharSequence[possibleValues.size()];
-        for (int i = 0; i < possibleValues.size(); i++) {
-            final String possibleValue = possibleValues.get(i);
-            final int idxPrefValue = prefValues.indexOf(possibleValue);
-
-            if (idxPrefValue >= 0) {
-                entries[i] = originalEntries[idxPrefValue];
-            } else {
-                entries[i] = handler.getContext().getString(R.string.menuitem_unknown_app, possibleValue);
-            }
-            values[i] = possibleValue;
-        }
-
-        if (pref instanceof ListPreference) {
-            ((ListPreference) pref).setEntries(entries);
-            ((ListPreference) pref).setEntryValues(values);
-        } else if (pref instanceof MultiSelectListPreference) {
-            ((MultiSelectListPreference) pref).setEntries(entries);
-            ((MultiSelectListPreference) pref).setEntryValues(values);
-        }
-    }
-
     /**
      * Hides prefToHide if no configuration from the list has been reported by the band.
      */
@@ -465,7 +405,7 @@ public class Huami2021SettingsCustomizer extends HuamiSettingsCustomizer {
         }
 
         for (final String prefKey : supportedPref) {
-            final boolean deviceHasConfig = prefs.getBoolean(Huami2021Coordinator.getPrefKnownConfig(prefKey), false);
+            final boolean deviceHasConfig = prefs.getBoolean(DeviceSettingsUtils.getPrefKnownConfig(prefKey), false);
             if (deviceHasConfig) {
                 // This preference is supported, don't hide
                 return;
@@ -476,33 +416,6 @@ public class Huami2021SettingsCustomizer extends HuamiSettingsCustomizer {
         pref.setVisible(false);
     }
 
-    /**
-     * Hides the the prefToHide preference if none of the preferences in the preferences list are
-     * visible.
-     */
-    private void hidePrefIfNoneVisible(final DeviceSpecificSettingsHandler handler,
-                                       final String prefToHide,
-                                       final List<String> subPrefs) {
-        final Preference pref = handler.findPreference(prefToHide);
-        if (pref == null) {
-            return;
-        }
-
-        for (final String subPrefKey : subPrefs) {
-            final Preference subPref = handler.findPreference(subPrefKey);
-            if (subPref == null) {
-                continue;
-            }
-            if (subPref.isVisible()) {
-                // At least one preference is visible
-                return;
-            }
-        }
-
-        // No preference was visible, hide
-        pref.setVisible(false);
-    }
-
     private void enforceMinMax(final DeviceSpecificSettingsHandler handler, final Prefs prefs, final ZeppOsConfigService.ConfigArg config) {
         final String prefKey = config.getPrefKey();
         final Preference pref = handler.findPreference(prefKey);
@@ -526,17 +439,7 @@ public class Huami2021SettingsCustomizer extends HuamiSettingsCustomizer {
             return;
         }
 
-        if (minValue >= maxValue) {
-            LOG.warn("Invalid min/max values: {}/{}", minValue, maxValue);
-            return;
-        }
-
-        final EditTextPreference textPref = (EditTextPreference) pref;
-        textPref.setOnBindEditTextListener(editText -> {
-            editText.setInputType(InputType.TYPE_CLASS_NUMBER);
-            editText.setFilters(new InputFilter[]{new MinMaxInputFilter(minValue, maxValue)});
-            editText.setSelection(editText.getText().length());
-        });
+        DeviceSettingsUtils.enforceMinMax((EditTextPreference) pref, minValue, maxValue);
     }
 
     public static final Creator<Huami2021SettingsCustomizer> CREATOR = new Creator<Huami2021SettingsCustomizer>() {
@@ -553,26 +456,4 @@ public class Huami2021SettingsCustomizer extends HuamiSettingsCustomizer {
             return new Huami2021SettingsCustomizer[size];
         }
     };
-
-    public static final class MinMaxInputFilter implements InputFilter {
-        private final int min;
-        private final int max;
-
-        public MinMaxInputFilter(final int min, final int max) {
-            this.min = min;
-            this.max = max;
-        }
-
-        @Override
-        public CharSequence filter(CharSequence source, int start, int end, Spanned dest, int dstart, int dend) {
-            try {
-                final int input = Integer.parseInt(dest.toString() + source.toString());
-                if (input >= min && input <= max) {
-                    return null;
-                }
-            } catch (final NumberFormatException ignored) {
-            }
-            return "";
-        }
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAlexaService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAlexaService.java
index 88214ca63..3fa7d3772 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAlexaService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAlexaService.java
@@ -34,6 +34,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 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.model.WeatherSpec;
@@ -385,7 +386,7 @@ public class ZeppOsAlexaService extends AbstractZeppOsService {
 
         final GBDeviceEventUpdatePreferences evt = new GBDeviceEventUpdatePreferences()
                 .withPreference(PREF_VOICE_SERVICE_LANGUAGE, currentLanguage.replace("-", "_"))
-                .withPreference(Huami2021Coordinator.getPrefPossibleValuesKey(PREF_VOICE_SERVICE_LANGUAGE), String.join(",", allLanguages).replace("-", "_"));
+                .withPreference(DeviceSettingsUtils.getPrefPossibleValuesKey(PREF_VOICE_SERVICE_LANGUAGE), String.join(",", allLanguages).replace("-", "_"));
         getSupport().evaluateGBDeviceEvent(evt);
     }
 
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 bc291b982..7523dd9ca 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
@@ -60,6 +60,7 @@ import java.util.regex.Pattern;
 import nodomain.freeyourgadget.gadgetbridge.BuildConfig;
 import nodomain.freeyourgadget.gadgetbridge.activities.SettingsActivity;
 import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsUtils;
 import nodomain.freeyourgadget.gadgetbridge.capabilities.GpsCapability;
 import nodomain.freeyourgadget.gadgetbridge.capabilities.WorkoutDetectionCapability;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdatePreferences;
@@ -663,7 +664,7 @@ public class ZeppOsConfigService extends AbstractZeppOsService {
     }
 
     public static boolean deviceHasConfig(final Prefs devicePrefs, final ZeppOsConfigService.ConfigArg config) {
-        return devicePrefs.getBoolean(Huami2021Coordinator.getPrefKnownConfig(config.name()), false);
+        return devicePrefs.getBoolean(DeviceSettingsUtils.getPrefKnownConfig(config.name()), false);
     }
 
     public ConfigSetter newSetter() {
@@ -973,7 +974,7 @@ public class ZeppOsConfigService extends AbstractZeppOsService {
                 }
 
                 if (configArg != null && argPrefs != null && configType == configArg.getConfigType(mGroupVersions)) {
-                    prefs.put(Huami2021Coordinator.getPrefKnownConfig(configArg.name()), true);
+                    prefs.put(DeviceSettingsUtils.getPrefKnownConfig(configArg.name()), true);
 
                     // Special cases for "follow phone" preferences. We need to ensure that "auto"
                     // always has precedence
@@ -1062,7 +1063,7 @@ public class ZeppOsConfigService extends AbstractZeppOsService {
                 prefs = singletonMap(configArg.getPrefKey(), decoder.decode(str.getValue()));
                 if (includesConstraints) {
                     prefs.put(
-                            Huami2021Coordinator.getPrefPossibleValuesKey(configArg.getPrefKey()),
+                            DeviceSettingsUtils.getPrefPossibleValuesKey(configArg.getPrefKey()),
                             decodeStringValues(possibleValues, decoder)
                     );
                 }
@@ -1147,7 +1148,7 @@ public class ZeppOsConfigService extends AbstractZeppOsService {
                 prefs = singletonMap(configArg.getPrefKey(), new HashSet<>(valuesList));
                 if (includesConstraints) {
                     prefs.put(
-                            Huami2021Coordinator.getPrefPossibleValuesKey(configArg.getPrefKey()),
+                            DeviceSettingsUtils.getPrefPossibleValuesKey(configArg.getPrefKey()),
                             String.join(",", decodeByteValues(possibleValues, decoder))
                     );
                 }
@@ -1183,7 +1184,7 @@ public class ZeppOsConfigService extends AbstractZeppOsService {
                                 possibleLanguages.add(languageByteToLocale(possibleValue));
                             }
                             possibleLanguages.removeAll(Collections.singleton(null));
-                            prefs.put(Huami2021Coordinator.getPrefPossibleValuesKey(configArg.getPrefKey()), String.join(",", possibleLanguages));
+                            prefs.put(DeviceSettingsUtils.getPrefPossibleValuesKey(configArg.getPrefKey()), String.join(",", possibleLanguages));
                         }
                     }
                     decoder = null;
@@ -1239,7 +1240,7 @@ public class ZeppOsConfigService extends AbstractZeppOsService {
                 prefs = singletonMap(configArg.getPrefKey(), decoder.decode(value.getValue()));
                 if (includesConstraints) {
                     prefs.put(
-                            Huami2021Coordinator.getPrefPossibleValuesKey(configArg.getPrefKey()),
+                            DeviceSettingsUtils.getPrefPossibleValuesKey(configArg.getPrefKey()),
                             String.join(",", decodeByteValues(possibleValues, decoder))
                     );
                 }
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 fbd999290..53e275c08 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
@@ -32,6 +32,7 @@ import java.util.List;
 import java.util.Map;
 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;
@@ -98,7 +99,7 @@ public class ZeppOsDisplayItemsService extends AbstractZeppOsService {
             case HuamiConst.PREF_DISPLAY_ITEMS_SORTABLE:
                 setDisplayItems(
                         DISPLAY_ITEMS_MENU,
-                        new ArrayList<>(prefs.getList(Huami2021Coordinator.getPrefPossibleValuesKey(HuamiConst.PREF_DISPLAY_ITEMS_SORTABLE), Collections.emptyList())),
+                        new ArrayList<>(prefs.getList(DeviceSettingsUtils.getPrefPossibleValuesKey(HuamiConst.PREF_DISPLAY_ITEMS_SORTABLE), Collections.emptyList())),
                         new ArrayList<>(prefs.getList(HuamiConst.PREF_DISPLAY_ITEMS_SORTABLE, Collections.emptyList()))
                 );
                 return true;
@@ -106,14 +107,14 @@ public class ZeppOsDisplayItemsService extends AbstractZeppOsService {
             case HuamiConst.PREF_SHORTCUTS_SORTABLE:
                 setDisplayItems(
                         DISPLAY_ITEMS_SHORTCUTS,
-                        new ArrayList<>(prefs.getList(Huami2021Coordinator.getPrefPossibleValuesKey(HuamiConst.PREF_SHORTCUTS_SORTABLE), Collections.emptyList())),
+                        new ArrayList<>(prefs.getList(DeviceSettingsUtils.getPrefPossibleValuesKey(HuamiConst.PREF_SHORTCUTS_SORTABLE), Collections.emptyList())),
                         new ArrayList<>(prefs.getList(HuamiConst.PREF_SHORTCUTS_SORTABLE, Collections.emptyList()))
                 );
                 return true;
             case HuamiConst.PREF_CONTROL_CENTER_SORTABLE:
                 setDisplayItems(
                         DISPLAY_ITEMS_CONTROL_CENTER,
-                        new ArrayList<>(prefs.getList(Huami2021Coordinator.getPrefPossibleValuesKey(HuamiConst.PREF_CONTROL_CENTER_SORTABLE), Collections.emptyList())),
+                        new ArrayList<>(prefs.getList(DeviceSettingsUtils.getPrefPossibleValuesKey(HuamiConst.PREF_CONTROL_CENTER_SORTABLE), Collections.emptyList())),
                         new ArrayList<>(prefs.getList(HuamiConst.PREF_CONTROL_CENTER_SORTABLE, Collections.emptyList()))
                 );
                 return true;
@@ -169,7 +170,7 @@ public class ZeppOsDisplayItemsService extends AbstractZeppOsService {
                 LOG.error("Unknown display items type {}", String.format("0x%x", payload[1]));
                 return;
         }
-        final String allScreensPrefKey = Huami2021Coordinator.getPrefPossibleValuesKey(prefKey);
+        final String allScreensPrefKey = DeviceSettingsUtils.getPrefPossibleValuesKey(prefKey);
 
         final boolean menuHasMoreSection;
 
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 9f609a8f9..3bf91e277 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
@@ -30,6 +30,7 @@ import java.util.regex.Matcher;
 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;
@@ -92,7 +93,7 @@ public class ZeppOsMorningUpdatesService extends AbstractZeppOsService {
                     return;
                 }
                 final GBDeviceEventUpdatePreferences gbDeviceEventUpdatePreferences = new GBDeviceEventUpdatePreferences()
-                        .withPreference(Huami2021Coordinator.getPrefKnownConfig(DeviceSettingsPreferenceConst.MORNING_UPDATES_ENABLED), true)
+                        .withPreference(DeviceSettingsUtils.getPrefKnownConfig(DeviceSettingsPreferenceConst.MORNING_UPDATES_ENABLED), true)
                         .withPreference(DeviceSettingsPreferenceConst.MORNING_UPDATES_ENABLED, enabled);
                 getSupport().evaluateGBDeviceEvent(gbDeviceEventUpdatePreferences);
                 LOG.info("Morning updates enabled = {}", enabled);
@@ -122,7 +123,7 @@ public class ZeppOsMorningUpdatesService extends AbstractZeppOsService {
                 return true;
             case DeviceSettingsPreferenceConst.MORNING_UPDATES_CATEGORIES_SORTABLE:
                 final List<String> categories = new ArrayList<>(prefs.getList(config, Collections.emptyList()));
-                final List<String> allCategories = new ArrayList<>(prefs.getList(Huami2021Coordinator.getPrefPossibleValuesKey(config), Collections.emptyList()));
+                final List<String> allCategories = new ArrayList<>(prefs.getList(DeviceSettingsUtils.getPrefPossibleValuesKey(config), Collections.emptyList()));
                 LOG.info("Setting morning updates categories = {}", categories);
                 setCategories(categories, allCategories);
                 return true;
@@ -222,12 +223,12 @@ public class ZeppOsMorningUpdatesService extends AbstractZeppOsService {
         }
 
         final String prefKey = DeviceSettingsPreferenceConst.MORNING_UPDATES_CATEGORIES_SORTABLE;
-        final String allCategoriesPrefKey = Huami2021Coordinator.getPrefPossibleValuesKey(prefKey);
+        final String allCategoriesPrefKey = DeviceSettingsUtils.getPrefPossibleValuesKey(prefKey);
 
         final String allCategoriesPrefValue = StringUtils.join(",", allCategories.toArray(new String[0])).toString();
         final String prefValue = StringUtils.join(",", enabledCategories.toArray(new String[0])).toString();
         final GBDeviceEventUpdatePreferences eventUpdatePreferences = new GBDeviceEventUpdatePreferences()
-                .withPreference(Huami2021Coordinator.getPrefKnownConfig(prefKey), true)
+                .withPreference(DeviceSettingsUtils.getPrefKnownConfig(prefKey), true)
                 .withPreference(allCategoriesPrefKey, allCategoriesPrefValue)
                 .withPreference(prefKey, prefValue);
 
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 a2f07d780..b963ae783 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
@@ -34,6 +34,7 @@ import java.util.regex.Matcher;
 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;
@@ -218,7 +219,7 @@ public class ZeppOsShortcutCardsService extends AbstractZeppOsService {
 
         final GBDeviceEventUpdatePreferences evt = new GBDeviceEventUpdatePreferences()
                 .withPreference(SHORTCUT_CARDS_SORTABLE, String.join(",", enabledCards))
-                .withPreference(Huami2021Coordinator.getPrefPossibleValuesKey(SHORTCUT_CARDS_SORTABLE), String.join(",", allCards));
+                .withPreference(DeviceSettingsUtils.getPrefPossibleValuesKey(SHORTCUT_CARDS_SORTABLE), String.join(",", allCards));
         getSupport().evaluateGBDeviceEvent(evt);
     }
 
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 0c6a6727a..d7a7c79ed 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
@@ -34,6 +34,7 @@ import java.util.regex.Pattern;
 
 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;
@@ -228,7 +229,7 @@ public class ZeppOsWatchfaceService extends AbstractZeppOsService {
 
         // TODO broadcast something to update app manager
         final GBDeviceEventUpdatePreferences evt = new GBDeviceEventUpdatePreferences()
-                .withPreference(Huami2021Coordinator.getPrefPossibleValuesKey(PREF_WATCHFACE), String.join(",", watchfacePrefValues));
+                .withPreference(DeviceSettingsUtils.getPrefPossibleValuesKey(PREF_WATCHFACE), String.join(",", watchfacePrefValues));
         getSupport().evaluateGBDeviceEvent(evt);
     }
 

From 9ddbcc0c8a9415047667e951c63945392ef8e539 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Tue, 5 Dec 2023 13:23:18 +0000
Subject: [PATCH 194/595] Xiaomi: Use display items labels from watch

---
 .../devicesettings/DeviceSettingsUtils.java   | 52 ++++++++++++----
 .../huami/Huami2021SettingsCustomizer.java    | 22 +++----
 .../xiaomi/XiaomiSettingsCustomizer.java      |  5 ++
 .../devices/xiaomi/XiaomiPreferences.java     |  7 ---
 .../xiaomi/services/XiaomiSystemService.java  | 61 ++++++++-----------
 app/src/main/res/values/arrays.xml            | 60 ------------------
 .../devicesettings_xiaomi_displayitems.xml    |  4 +-
 7 files changed, 83 insertions(+), 128 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsUtils.java
index fc83cd343..effdd5788 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsUtils.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsUtils.java
@@ -28,9 +28,10 @@ import androidx.preference.Preference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
@@ -49,6 +50,13 @@ public final class DeviceSettingsUtils {
         return String.format(Locale.ROOT, "%s_possible_values", key);
     }
 
+    /**
+     * Returns the preference key where to save the list of entry labels for a preference, comma-separated.
+     */
+    public static String getPrefPossibleValueLabelsKey(final String key) {
+        return String.format(Locale.ROOT, "%s_possible_value_labels", key);
+    }
+
     /**
      * Returns the preference key where to that a config was reported as supported (boolean).
      */
@@ -57,12 +65,11 @@ public final class DeviceSettingsUtils {
     }
 
     /**
-     * Removes all unsupported elements from a list preference. If they are not known, the preference
-     * is hidden.
+     * Populates a list preference, or hides it if no known supported values are known.
      */
-    public static void removeUnsupportedElementsFromListPreference(final String prefKey,
-                                                                   final DeviceSpecificSettingsHandler handler,
-                                                                   final Prefs prefs) {
+    public static void populateOrHideListPreference(final String prefKey,
+                                                    final DeviceSpecificSettingsHandler handler,
+                                                    final Prefs prefs) {
         final Preference pref = handler.findPreference(prefKey);
         if (pref == null) {
             return;
@@ -92,19 +99,40 @@ public final class DeviceSettingsUtils {
             return;
         }
 
-        final List<String> prefValues = new ArrayList<>(originalValues.length);
-        for (final CharSequence entryValue : originalValues) {
-            prefValues.add(entryValue.toString());
+        final Map<CharSequence, CharSequence> entryNames = new HashMap<>();
+        final List<String> knownLabels = prefs.getList(getPrefPossibleValueLabelsKey(prefKey), null);
+        if (knownLabels != null) {
+            // We got some known labels from the watch
+            if (knownLabels.size() != possibleValues.size()) {
+                LOG.warn(
+                        "Number of possible values ({}) and labels ({}) for {} differs - this should never happen",
+                        possibleValues.size(),
+                        knownLabels.size(),
+                        prefKey
+                );
+
+                // Abort and hide preference - we can't safely recover from this
+                pref.setVisible(false);
+                return;
+            }
+
+            for (int i = 0; i < knownLabels.size(); i++) {
+                entryNames.put(possibleValues.get(i), knownLabels.get(i));
+            }
+        } else {
+            for (int i = 0; i < originalEntries.length; i++) {
+                entryNames.put(originalValues[i], originalEntries[i]);
+            }
         }
 
         final CharSequence[] entries = new CharSequence[possibleValues.size()];
         final CharSequence[] values = new CharSequence[possibleValues.size()];
         for (int i = 0; i < possibleValues.size(); i++) {
             final String possibleValue = possibleValues.get(i);
-            final int idxPrefValue = prefValues.indexOf(possibleValue);
+            final CharSequence knownLabel = entryNames.get(possibleValue);
 
-            if (idxPrefValue >= 0) {
-                entries[i] = originalEntries[idxPrefValue];
+            if (knownLabel != null) {
+                entries[i] = knownLabel;
             } else {
                 entries[i] = handler.getContext().getString(R.string.menuitem_unknown_app, possibleValue);
             }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021SettingsCustomizer.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021SettingsCustomizer.java
index c68be2a4a..7f3c55f09 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021SettingsCustomizer.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021SettingsCustomizer.java
@@ -17,16 +17,12 @@
 package nodomain.freeyourgadget.gadgetbridge.devices.huami;
 
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsUtils.hidePrefIfNoneVisible;
-import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsUtils.removeUnsupportedElementsFromListPreference;
+import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsUtils.populateOrHideListPreference;
 
 import android.os.Parcel;
-import android.text.InputFilter;
-import android.text.InputType;
-import android.text.Spanned;
 
 import androidx.preference.EditTextPreference;
 import androidx.preference.ListPreference;
-import androidx.preference.MultiSelectListPreference;
 import androidx.preference.Preference;
 
 import org.slf4j.Logger;
@@ -65,13 +61,13 @@ public class Huami2021SettingsCustomizer extends HuamiSettingsCustomizer {
         super.customizeSettings(handler, prefs);
 
         // These are not reported by the normal configs
-        removeUnsupportedElementsFromListPreference(HuamiConst.PREF_DISPLAY_ITEMS_SORTABLE, handler, prefs);
-        removeUnsupportedElementsFromListPreference(HuamiConst.PREF_SHORTCUTS_SORTABLE, handler, prefs);
-        removeUnsupportedElementsFromListPreference(HuamiConst.PREF_CONTROL_CENTER_SORTABLE, handler, prefs);
-        removeUnsupportedElementsFromListPreference(DeviceSettingsPreferenceConst.SHORTCUT_CARDS_SORTABLE, handler, prefs);
-        removeUnsupportedElementsFromListPreference(DeviceSettingsPreferenceConst.PREF_WATCHFACE, handler, prefs);
-        removeUnsupportedElementsFromListPreference(DeviceSettingsPreferenceConst.MORNING_UPDATES_CATEGORIES_SORTABLE, handler, prefs);
-        removeUnsupportedElementsFromListPreference(DeviceSettingsPreferenceConst.PREF_VOICE_SERVICE_LANGUAGE, handler, prefs);
+        populateOrHideListPreference(HuamiConst.PREF_DISPLAY_ITEMS_SORTABLE, handler, prefs);
+        populateOrHideListPreference(HuamiConst.PREF_SHORTCUTS_SORTABLE, handler, prefs);
+        populateOrHideListPreference(HuamiConst.PREF_CONTROL_CENTER_SORTABLE, handler, prefs);
+        populateOrHideListPreference(DeviceSettingsPreferenceConst.SHORTCUT_CARDS_SORTABLE, handler, prefs);
+        populateOrHideListPreference(DeviceSettingsPreferenceConst.PREF_WATCHFACE, handler, prefs);
+        populateOrHideListPreference(DeviceSettingsPreferenceConst.MORNING_UPDATES_CATEGORIES_SORTABLE, handler, prefs);
+        populateOrHideListPreference(DeviceSettingsPreferenceConst.PREF_VOICE_SERVICE_LANGUAGE, handler, prefs);
 
         for (final ZeppOsConfigService.ConfigArg config : ZeppOsConfigService.ConfigArg.values()) {
             if (config.getPrefKey() == null) {
@@ -88,7 +84,7 @@ public class Huami2021SettingsCustomizer extends HuamiSettingsCustomizer {
                 case BYTE_LIST:
                 case STRING_LIST:
                     // For list preferences, remove the unsupported items
-                    removeUnsupportedElementsFromListPreference(config.getPrefKey(), handler, prefs);
+                    populateOrHideListPreference(config.getPrefKey(), handler, prefs);
                     break;
                 case SHORT:
                 case INT:
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSettingsCustomizer.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSettingsCustomizer.java
index c973e197f..c0c6f1b1b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSettingsCustomizer.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSettingsCustomizer.java
@@ -16,6 +16,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi;
 
+import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsUtils.populateOrHideListPreference;
+
 import android.os.Parcel;
 
 import androidx.preference.Preference;
@@ -26,6 +28,7 @@ import java.util.Set;
 import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
 import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSpecificSettingsCustomizer;
 import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSpecificSettingsHandler;
+import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 
 public class XiaomiSettingsCustomizer implements DeviceSpecificSettingsCustomizer {
@@ -39,6 +42,8 @@ public class XiaomiSettingsCustomizer implements DeviceSpecificSettingsCustomize
         if (activityMonitoringPref != null) {
             activityMonitoringPref.setVisible(false);
         }
+
+        populateOrHideListPreference(HuamiConst.PREF_DISPLAY_ITEMS_SORTABLE, handler, prefs);
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPreferences.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPreferences.java
index e683d550b..e4d5109dc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPreferences.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPreferences.java
@@ -61,13 +61,6 @@ public final class XiaomiPreferences {
         return calendar.getTime();
     }
 
-    /**
-     * Returns the preference key where to save the list of possible value for a preference, comma-separated.
-     */
-    public static String getPrefPossibleValuesKey(final String key) {
-        return String.format(Locale.ROOT, "%s_possible_values", key);
-    }
-
     public static boolean keepActivityDataOnDevice(final GBDevice gbDevice) {
         final Prefs prefs = new Prefs(GBApplication.getDeviceSpecificSharedPrefs(gbDevice.getAddress()));
         return prefs.getBoolean("keep_activity_data_on_device", false);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
index 1d7361936..58275705e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
@@ -32,6 +32,7 @@ import java.util.TimeZone;
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsUtils;
 import nodomain.freeyourgadget.gadgetbridge.capabilities.password.PasswordCapabilityImpl;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventBatteryInfo;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventFindPhone;
@@ -321,13 +322,28 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
 
     private void setDisplayItems() {
         final Prefs prefs = getDevicePrefs();
-        final List<String> allScreens = new ArrayList<>(prefs.getList(XiaomiPreferences.getPrefPossibleValuesKey(HuamiConst.PREF_DISPLAY_ITEMS_SORTABLE), Collections.emptyList()));
+        final List<String> allScreens = new ArrayList<>(prefs.getList(DeviceSettingsUtils.getPrefPossibleValuesKey(HuamiConst.PREF_DISPLAY_ITEMS_SORTABLE), Collections.emptyList()));
+        final List<String> allLabels = new ArrayList<>(prefs.getList(DeviceSettingsUtils.getPrefPossibleValueLabelsKey(HuamiConst.PREF_DISPLAY_ITEMS_SORTABLE), Collections.emptyList()));
         final List<String> enabledScreens = new ArrayList<>(prefs.getList(HuamiConst.PREF_DISPLAY_ITEMS_SORTABLE, Collections.emptyList()));
         if (allScreens.isEmpty()) {
             LOG.warn("No list of all screens");
             return;
         }
 
+        if (allScreens.size() != allLabels.size()) {
+            LOG.warn(
+                    "Mismatched allScreens ({}) and allLabels ({}) sizes - this should never happen",
+                    allScreens.size(),
+                    allLabels.size()
+            );
+            return;
+        }
+
+        final Map<String, String> labelsMap = new HashMap<>();
+        for (int i = 0; i < allScreens.size(); i++) {
+            labelsMap.put(allScreens.get(i), allLabels.get(i));
+        }
+
         LOG.debug("Setting display items: {}", enabledScreens);
 
         if (!enabledScreens.contains("setting")) {
@@ -344,7 +360,7 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
 
             final XiaomiProto.DisplayItem.Builder displayItem = XiaomiProto.DisplayItem.newBuilder()
                     .setCode(enabledScreen)
-                    .setName(DISPLAY_ITEM_NAMES.get(enabledScreen))
+                    .setName(labelsMap.get(enabledScreen))
                     .setUnknown5(1);
 
             if (inMoreSection) {
@@ -365,7 +381,7 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
 
             final XiaomiProto.DisplayItem.Builder displayItem = XiaomiProto.DisplayItem.newBuilder()
                     .setCode(screen)
-                    .setName(DISPLAY_ITEM_NAMES.get(screen))
+                    .setName(labelsMap.get(screen))
                     .setDisabled(true)
                     .setUnknown5(1);
 
@@ -386,10 +402,12 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
         LOG.debug("Got {} display items", displayItems.getDisplayItemCount());
 
         final List<String> allScreens = new ArrayList<>();
+        final List<String> allScreensLabels = new ArrayList<>();
         final List<String> mainScreens = new ArrayList<>();
         final List<String> moreScreens = new ArrayList<>();
         for (final XiaomiProto.DisplayItem displayItem : displayItems.getDisplayItemList()) {
             allScreens.add(displayItem.getCode());
+            allScreensLabels.add(displayItem.getName().replace(",", ""));
             if (!displayItem.getDisabled()) {
                 if (displayItem.getInMoreSection()) {
                     moreScreens.add(displayItem.getCode());
@@ -405,11 +423,16 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
             enabledScreens.addAll(moreScreens);
         }
 
+        allScreens.add("more");
+        allScreensLabels.add(getSupport().getContext().getString(R.string.menuitem_more));
+
         final String allScreensPrefValue = StringUtils.join(",", allScreens.toArray(new String[0])).toString();
+        final String allScreensLabelsPrefValue = StringUtils.join(",", allScreensLabels.toArray(new String[0])).toString();
         final String prefValue = StringUtils.join(",", enabledScreens.toArray(new String[0])).toString();
 
         final GBDeviceEventUpdatePreferences eventUpdatePreferences = new GBDeviceEventUpdatePreferences()
-                .withPreference(XiaomiPreferences.getPrefPossibleValuesKey(HuamiConst.PREF_DISPLAY_ITEMS_SORTABLE), allScreensPrefValue)
+                .withPreference(DeviceSettingsUtils.getPrefPossibleValuesKey(HuamiConst.PREF_DISPLAY_ITEMS_SORTABLE), allScreensPrefValue)
+                .withPreference(DeviceSettingsUtils.getPrefPossibleValueLabelsKey(HuamiConst.PREF_DISPLAY_ITEMS_SORTABLE), allScreensLabelsPrefValue)
                 .withPreference(HuamiConst.PREF_DISPLAY_ITEMS_SORTABLE, prefValue);
 
         getSupport().evaluateGBDeviceEvent(eventUpdatePreferences);
@@ -515,34 +538,4 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
             LOG.error("Failed to update progress notification", e);
         }
     }
-
-    // TODO do we even need this? also prevent NPE when unknown
-    private static final Map<String, String> DISPLAY_ITEM_NAMES = new HashMap<String, String>() {{
-        put("today_act", "Stats");
-        put("sport", "Workout");
-        put("sport_record", "Activity");
-        put("sport_course", "Running");
-        put("sport_state", "Status");
-        put("heart", "Heart rate");
-        put("pai", "Vitality");
-        put("blood_ox", "SpO₂");
-        put("sleep", "Sleep");
-        put("press", "Stress");
-        put("weather", "Weather");
-        put("alarm", "Alarm");
-        put("setting", "Settings");
-        put("event_reminder", "Alerts");
-        put("schedule", "Events");
-        put("breath", "Breathing");
-        put("stopwatch", "Stopwatch");
-        put("music", "Music");
-        put("find_phone", "Find phone");
-        put("world_clock", "World clock");
-        put("phone_mute", "Silence phone");
-        put("phone_remote", "Camera");
-        put("count_down", "Timer");
-        put("focus", "Focus");
-        put("flash_light", "Flashlight");
-        put("fm_health", "Cycles");
-    }};
 }
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 2de3ca53b..476aed6a6 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -1022,66 +1022,6 @@
         <item>headphone</item>
     </string-array>
 
-    <string-array name="pref_xiaomi_apps">
-        <item>@string/menuitem_stats</item>
-        <item>@string/menuitem_workout</item>
-        <item>@string/menuitem_activity</item>
-        <item>@string/menuitem_running</item>
-        <item>@string/menuitem_status</item>
-        <item>@string/menuitem_hr</item>
-        <item>@string/menuitem_pai</item>
-        <item>@string/menuitem_spo2</item>
-        <item>@string/menuitem_sleep</item>
-        <item>@string/menuitem_stress</item>
-        <item>@string/menuitem_weather</item>
-        <item>@string/menuitem_alarm</item>
-        <item>@string/menuitem_settings</item>
-        <item>@string/menuitem_more</item>  <!-- dummy item -->
-        <item>@string/menuitem_alerts</item>
-        <item>@string/menuitem_events</item>
-        <item>@string/menuitem_breathing</item>
-        <item>@string/menuitem_female_health</item>
-        <item>@string/menuitem_stopwatch</item>
-        <item>@string/menuitem_music</item>
-        <item>@string/menuitem_findphone</item>
-        <item>@string/menuitem_worldclock</item>
-        <item>@string/menuitem_mutephone</item>
-        <item>@string/menuitem_takephoto</item>
-        <item>@string/menuitem_timer</item>
-        <item>@string/menuitem_flashlight</item>
-        <item>@string/menuitem_pomodoro</item>
-    </string-array>
-
-    <string-array name="pref_xiaomi_apps_values">
-        <item>today_act</item>
-        <item>sport</item>
-        <item>sport_record</item>
-        <item>sport_course</item>
-        <item>sport_state</item>
-        <item>heart</item>
-        <item>pai</item>
-        <item>blood_ox</item>
-        <item>sleep</item>
-        <item>press</item>
-        <item>weather</item>
-        <item>alarm</item>
-        <item>setting</item>
-        <item>more</item>  <!-- dummy item -->
-        <item>schedule</item>
-        <item>event_reminder</item>
-        <item>breath</item>
-        <item>fm_health</item>
-        <item>stopwatch</item>
-        <item>music</item>
-        <item>find_phone</item>
-        <item>world_clock</item>
-        <item>phone_mute</item>
-        <item>phone_remote</item>
-        <item>count_down</item>
-        <item>flash_light</item>
-        <item>focus</item>
-    </string-array>
-
     <string-array name="pref_miband5_workout_activity_types">
         <item>@string/activity_type_outdoor_running</item>
         <item>@string/activity_type_walking</item>
diff --git a/app/src/main/res/xml/devicesettings_xiaomi_displayitems.xml b/app/src/main/res/xml/devicesettings_xiaomi_displayitems.xml
index 08ad3f301..1ca0247c7 100644
--- a/app/src/main/res/xml/devicesettings_xiaomi_displayitems.xml
+++ b/app/src/main/res/xml/devicesettings_xiaomi_displayitems.xml
@@ -3,8 +3,8 @@
     <com.mobeta.android.dslv.DragSortListPreference
         android:defaultValue="@array/pref_huami2021_empty_array"
         android:dialogTitle="@string/mi2_prefs_display_items"
-        android:entries="@array/pref_xiaomi_apps"
-        android:entryValues="@array/pref_xiaomi_apps_values"
+        android:entries="@array/pref_huami2021_empty_array"
+        android:entryValues="@array/pref_huami2021_empty_array"
         android:icon="@drawable/ic_widgets"
         android:key="display_items_sortable"
         android:persistent="true"

From 776346d311874b967f6331a366e5662e1a348101 Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Tue, 5 Dec 2023 18:38:27 +0100
Subject: [PATCH 195/595] Xiaomi: guard against null pointer crash

---
 .../service/devices/xiaomi/services/XiaomiSystemService.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
index 58275705e..dd112d042 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
@@ -357,6 +357,9 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
                 inMoreSection = true;
                 continue;
             }
+            if (labelsMap.get(enabledScreen) == null) {
+                continue;
+            }
 
             final XiaomiProto.DisplayItem.Builder displayItem = XiaomiProto.DisplayItem.newBuilder()
                     .setCode(enabledScreen)

From 1c68252255688508e04af5b785592d74c3ffeba9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Tue, 5 Dec 2023 17:51:25 +0000
Subject: [PATCH 196/595] Xiaomi: Fix settings display items code

---
 .../xiaomi/services/XiaomiSystemService.java  | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
index dd112d042..fae2b7cb8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
@@ -46,7 +46,6 @@ import nodomain.freeyourgadget.gadgetbridge.model.BatteryState;
 import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetProgressAction;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiPreferences;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
 import nodomain.freeyourgadget.gadgetbridge.util.CheckSums;
 import nodomain.freeyourgadget.gadgetbridge.util.GB;
@@ -57,6 +56,10 @@ import nodomain.freeyourgadget.gadgetbridge.util.StringUtils;
 public class XiaomiSystemService extends AbstractXiaomiService implements XiaomiDataUploadService.Callback {
     private static final Logger LOG = LoggerFactory.getLogger(XiaomiSystemService.class);
 
+    // We persist the settings code when receiving the display items,
+    // so we can enforce it when sending them
+    private static final String PREF_SETTINGS_DISPLAY_ITEM_CODE = "xiaomi_settings_display_item_code";
+
     public static final int COMMAND_TYPE = 2;
 
     public static final int CMD_BATTERY = 1;
@@ -325,6 +328,8 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
         final List<String> allScreens = new ArrayList<>(prefs.getList(DeviceSettingsUtils.getPrefPossibleValuesKey(HuamiConst.PREF_DISPLAY_ITEMS_SORTABLE), Collections.emptyList()));
         final List<String> allLabels = new ArrayList<>(prefs.getList(DeviceSettingsUtils.getPrefPossibleValueLabelsKey(HuamiConst.PREF_DISPLAY_ITEMS_SORTABLE), Collections.emptyList()));
         final List<String> enabledScreens = new ArrayList<>(prefs.getList(HuamiConst.PREF_DISPLAY_ITEMS_SORTABLE, Collections.emptyList()));
+        final String settingsCode = prefs.getString(PREF_SETTINGS_DISPLAY_ITEM_CODE, null);
+
         if (allScreens.isEmpty()) {
             LOG.warn("No list of all screens");
             return;
@@ -346,8 +351,8 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
 
         LOG.debug("Setting display items: {}", enabledScreens);
 
-        if (!enabledScreens.contains("setting")) {
-            enabledScreens.add("setting");
+        if (settingsCode != null && !enabledScreens.contains(settingsCode)) {
+            enabledScreens.add(settingsCode);
         }
 
         boolean inMoreSection = false;
@@ -370,7 +375,7 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
                 displayItem.setInMoreSection(true);
             }
 
-            if ("setting".equals(enabledScreen)) {
+            if (enabledScreen.equals(settingsCode)) {
                 displayItem.setIsSettings(1);
             }
 
@@ -408,6 +413,7 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
         final List<String> allScreensLabels = new ArrayList<>();
         final List<String> mainScreens = new ArrayList<>();
         final List<String> moreScreens = new ArrayList<>();
+        String settingsCode = null;
         for (final XiaomiProto.DisplayItem displayItem : displayItems.getDisplayItemList()) {
             allScreens.add(displayItem.getCode());
             allScreensLabels.add(displayItem.getName().replace(",", ""));
@@ -418,6 +424,10 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
                     mainScreens.add(displayItem.getCode());
                 }
             }
+
+            if (displayItem.getIsSettings() == 1) {
+                settingsCode = displayItem.getCode();
+            }
         }
 
         final List<String> enabledScreens = new ArrayList<>(mainScreens);
@@ -436,6 +446,7 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
         final GBDeviceEventUpdatePreferences eventUpdatePreferences = new GBDeviceEventUpdatePreferences()
                 .withPreference(DeviceSettingsUtils.getPrefPossibleValuesKey(HuamiConst.PREF_DISPLAY_ITEMS_SORTABLE), allScreensPrefValue)
                 .withPreference(DeviceSettingsUtils.getPrefPossibleValueLabelsKey(HuamiConst.PREF_DISPLAY_ITEMS_SORTABLE), allScreensLabelsPrefValue)
+                .withPreference(PREF_SETTINGS_DISPLAY_ITEM_CODE, settingsCode)
                 .withPreference(HuamiConst.PREF_DISPLAY_ITEMS_SORTABLE, prefValue);
 
         getSupport().evaluateGBDeviceEvent(eventUpdatePreferences);

From 4de7cb359160f1e84dfa6434079a4456680b2395 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Tue, 5 Dec 2023 18:28:37 +0000
Subject: [PATCH 197/595] Xiaomi: Improve service auto-detection

Some watches have the encrypted service, even though they're plaintext,
but are missing the characteristics.
---
 .../service/devices/xiaomi/XiaomiSupport.java | 27 +++++++++++++++----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
index 41110357f..5afaba60e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
@@ -114,9 +114,31 @@ public class XiaomiSupport extends AbstractBTLEDeviceSupport {
     @Override
     protected final TransactionBuilder initializeDevice(final TransactionBuilder builder) {
         XiaomiBleUuids.XiaomiBleUuidSet uuidSet = null;
+        BluetoothGattCharacteristic btCharacteristicCommandRead = null;
+        BluetoothGattCharacteristic btCharacteristicCommandWrite = null;
+        BluetoothGattCharacteristic btCharacteristicActivityData = null;
+        BluetoothGattCharacteristic btCharacteristicDataUpload = null;
         for (Map.Entry<UUID, XiaomiBleUuids.XiaomiBleUuidSet> xiaomiUuid : XiaomiBleUuids.UUIDS.entrySet()) {
             if (getSupportedServices().contains(xiaomiUuid.getKey())) {
                 LOG.debug("Found Xiaomi service: {}", xiaomiUuid.getKey());
+                btCharacteristicCommandRead = getCharacteristic(xiaomiUuid.getValue().getCharacteristicCommandRead());
+                btCharacteristicCommandWrite = getCharacteristic(xiaomiUuid.getValue().getCharacteristicCommandWrite());
+                btCharacteristicActivityData = getCharacteristic(xiaomiUuid.getValue().getCharacteristicActivityData());
+                btCharacteristicDataUpload = getCharacteristic(xiaomiUuid.getValue().getCharacteristicDataUpload());
+                if (btCharacteristicCommandRead == null) {
+                    LOG.warn("btCharacteristicCommandRead characteristicc is null");
+                    continue;
+                } else if (btCharacteristicCommandWrite == null) {
+                    LOG.warn("btCharacteristicCommandWrite characteristicc is null");
+                    continue;
+                } else if (btCharacteristicActivityData == null) {
+                    LOG.warn("btCharacteristicActivityData characteristicc is null");
+                    continue;
+                } else if (btCharacteristicDataUpload == null) {
+                    LOG.warn("btCharacteristicDataUpload characteristicc is null");
+                    continue;
+                }
+
                 uuidSet = xiaomiUuid.getValue();
                 break;
             }
@@ -129,11 +151,6 @@ public class XiaomiSupport extends AbstractBTLEDeviceSupport {
             return builder;
         }
 
-        final BluetoothGattCharacteristic btCharacteristicCommandRead = getCharacteristic(uuidSet.getCharacteristicCommandRead());
-        final BluetoothGattCharacteristic btCharacteristicCommandWrite = getCharacteristic(uuidSet.getCharacteristicCommandWrite());
-        final BluetoothGattCharacteristic btCharacteristicActivityData = getCharacteristic(uuidSet.getCharacteristicActivityData());
-        final BluetoothGattCharacteristic btCharacteristicDataUpload = getCharacteristic(uuidSet.getCharacteristicDataUpload());
-
         // FIXME unsetDynamicState unsets the fw version, which causes problems..
         if (getDevice().getFirmwareVersion() == null && mFirmwareVersion != null) {
             getDevice().setFirmwareVersion(mFirmwareVersion);

From 7f7834c6200a30795398b0444472e8336cc321b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Tue, 5 Dec 2023 18:30:33 +0000
Subject: [PATCH 198/595] Xiaomi: Fix reconnect if characteristics are null

If a service was found, but characteristics are null, maybe we're just
connecting too early - set the device to reconnect.
---
 .../service/devices/xiaomi/XiaomiSupport.java       | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
index 5afaba60e..151999abb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
@@ -118,13 +118,17 @@ public class XiaomiSupport extends AbstractBTLEDeviceSupport {
         BluetoothGattCharacteristic btCharacteristicCommandWrite = null;
         BluetoothGattCharacteristic btCharacteristicActivityData = null;
         BluetoothGattCharacteristic btCharacteristicDataUpload = null;
+
+        // Attempt to find a known xiaomi service
         for (Map.Entry<UUID, XiaomiBleUuids.XiaomiBleUuidSet> xiaomiUuid : XiaomiBleUuids.UUIDS.entrySet()) {
             if (getSupportedServices().contains(xiaomiUuid.getKey())) {
                 LOG.debug("Found Xiaomi service: {}", xiaomiUuid.getKey());
-                btCharacteristicCommandRead = getCharacteristic(xiaomiUuid.getValue().getCharacteristicCommandRead());
-                btCharacteristicCommandWrite = getCharacteristic(xiaomiUuid.getValue().getCharacteristicCommandWrite());
-                btCharacteristicActivityData = getCharacteristic(xiaomiUuid.getValue().getCharacteristicActivityData());
-                btCharacteristicDataUpload = getCharacteristic(xiaomiUuid.getValue().getCharacteristicDataUpload());
+                uuidSet = xiaomiUuid.getValue();
+
+                btCharacteristicCommandRead = getCharacteristic(uuidSet.getCharacteristicCommandRead());
+                btCharacteristicCommandWrite = getCharacteristic(uuidSet.getCharacteristicCommandWrite());
+                btCharacteristicActivityData = getCharacteristic(uuidSet.getCharacteristicActivityData());
+                btCharacteristicDataUpload = getCharacteristic(uuidSet.getCharacteristicDataUpload());
                 if (btCharacteristicCommandRead == null) {
                     LOG.warn("btCharacteristicCommandRead characteristicc is null");
                     continue;
@@ -139,7 +143,6 @@ public class XiaomiSupport extends AbstractBTLEDeviceSupport {
                     continue;
                 }
 
-                uuidSet = xiaomiUuid.getValue();
                 break;
             }
         }

From 561dc16b286f703168d0d2f6ccd2ce851655db8e Mon Sep 17 00:00:00 2001
From: MrYoranimo <yvulker@gmail.com>
Date: Tue, 5 Dec 2023 20:13:13 +0100
Subject: [PATCH 199/595] DeviceCommunicationService: catch uncaught exceptions
 from handleActions

Exceptions raised while handling actions in the device's support class
may result in the DeviceCommunicationService crashing as a whole and not
being started again until the user forces GB to make a connection by
pressing the device from the list.

This change is made, because Xiaomi devices make use of proto2 messages,
where optional fields cannot be set to null values as that will make it
throw NPEs.
---
 .../gadgetbridge/service/DeviceCommunicationService.java        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
index e92b1f70f..fbe8c263c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
@@ -689,6 +689,8 @@ public class DeviceCommunicationService extends Service implements SharedPrefere
                         handleAction(intent, action, device1);
                     } catch (DeviceNotFoundException e) {
                         e.printStackTrace();
+                    } catch (Exception e) {
+                        LOG.error("An exception was raised while handling the action {} for the device {}: ", action, device1, e);
                     }
                 }
                 break;

From 405596d9608924724f9b84f7c781dd2a88379885 Mon Sep 17 00:00:00 2001
From: MrYoranimo <yvulker@gmail.com>
Date: Tue, 5 Dec 2023 20:27:33 +0100
Subject: [PATCH 200/595] Xiaomi: check for null values before encoding
 MusicSpec to proto

---
 .../service/devices/xiaomi/services/XiaomiMusicService.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiMusicService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiMusicService.java
index ab91d047f..d48eb66e4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiMusicService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiMusicService.java
@@ -136,8 +136,8 @@ public class XiaomiMusicService extends AbstractXiaomiService {
             }
 
             musicInfo.setVolume(mediaManager.getPhoneVolume())
-                    .setTrack(musicSpec.track)
-                    .setArtist(musicSpec.artist)
+                    .setTrack(musicSpec.track != null ? musicSpec.track : "")
+                    .setArtist(musicSpec.artist != null ? musicSpec.artist : "")
                     .setPosition(musicStateSpec.position)
                     .setDuration(musicSpec.duration);
         }

From b902ee96c3c349ba23e915353dc9b8c21bac0989 Mon Sep 17 00:00:00 2001
From: MrYoranimo <yvulker@gmail.com>
Date: Wed, 6 Dec 2023 01:02:11 +0100
Subject: [PATCH 201/595] Xiaomi: improve battery level and charger status
 processing

Because the reporting of battery state is inconsistent between different
models, the device's battery state was not correctly processed in GB.

For at least the firmware on the Xiaomi Watch S1 Active, the charger
state is broadcast through a separate message from the message
containing the battery level. Even though the battery level was
requested by GB upon receiving this broadcast, the charger state got
discarded as it was expected to also be included in the result of the
subsequent request.

This patch changes the name of the `Charger` message to `DeviceState`
and includes more fields that may be presented by some device models.
Furthemore, the broadcast is cached so that the charger state can be
processed from this cache instead of the battery level response message.
---
 .../xiaomi/services/XiaomiSystemService.java  | 23 +++++++++++++++----
 app/src/main/proto/xiaomi.proto               | 15 +++++++++---
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
index fae2b7cb8..313d84165 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
@@ -74,10 +74,11 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
     public static final int CMD_PASSWORD_SET = 21;
     public static final int CMD_DISPLAY_ITEMS_GET = 29;
     public static final int CMD_DISPLAY_ITEMS_SET = 30;
-    public static final int CMD_CHARGER = 79;
+    public static final int CMD_DEVICE_STATE = 79;
 
     // Not null if we're installing a firmware
     private XiaomiFWHelper fwHelper = null;
+    private XiaomiProto.DeviceState cachedDeviceState = null;
 
     public XiaomiSystemService(final XiaomiSupport support) {
         super(support);
@@ -129,8 +130,13 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
             case CMD_DISPLAY_ITEMS_GET:
                 handleDisplayItems(cmd.getSystem().getDisplayItems());
                 return;
-            case CMD_CHARGER:
-                // charger event, request battery state
+            case CMD_DEVICE_STATE:
+                // some devices (e.g. Xiaomi Watch S1 Active) only broadcast the charger state through
+                // this message, so this will need to be kept cached to process when the battery levels
+                // get requested
+                cachedDeviceState = cmd.getSystem().getDeviceState();
+
+                // request battery state to request battery level and charger state on supported models
                 getSupport().sendCommand("request battery state", COMMAND_TYPE, CMD_BATTERY);
                 return;
         }
@@ -250,7 +256,16 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
         final GBDeviceEventBatteryInfo batteryInfo = new GBDeviceEventBatteryInfo();
         batteryInfo.batteryIndex = 0;
         batteryInfo.level = battery.getLevel();
-        switch (battery.getState()) {
+
+        int chargerState = battery.getState();
+
+        // if device state is cached and the charging state there is set, take the charger status
+        // from there
+        if (cachedDeviceState != null && cachedDeviceState.hasChargingState()) {
+            chargerState = cachedDeviceState.getChargingState();
+        }
+
+        switch (chargerState) {
             case 1:
                 batteryInfo.state = BatteryState.BATTERY_CHARGING;
                 break;
diff --git a/app/src/main/proto/xiaomi.proto b/app/src/main/proto/xiaomi.proto
index ce3abe326..e3c49081b 100644
--- a/app/src/main/proto/xiaomi.proto
+++ b/app/src/main/proto/xiaomi.proto
@@ -130,7 +130,7 @@ message System {
   optional VibrationPatternAck vibrationPatternAck = 43;
 
   // 2, 79
-  optional Charger charger = 49;
+  optional DeviceState deviceState = 49;
 }
 
 message Power {
@@ -299,8 +299,17 @@ message Vibration {
   optional uint32 ms = 2;
 }
 
-message Charger {
-  optional uint32 state = 1; // 1 charging, 2 not charging
+message DeviceActivityState {
+  optional uint32 activityType = 1;
+  optional uint32 currentActivityState = 2;
+}
+
+message DeviceState {
+  optional uint32 chargingState = 1; // 1 charging, 2 not charging
+  optional uint32 wearingState = 2; // 1 wearing, 2 not wearing
+  optional uint32 sleepState = 3; // 1 sleep detected, 2 no sleep detected
+  optional uint32 warningState = 4; // ?
+  optional DeviceActivityState activityState = 5;
 }
 
 //

From 03dbf7533f09006cd7a802b1c13983e5bb5158ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Wed, 6 Dec 2023 11:17:36 +0000
Subject: [PATCH 202/595] Xiaomi: Get canned messages from watch

---
 .../DeviceSpecificSettingsFragment.java       | 23 +++++++-
 .../devices/AbstractDeviceCoordinator.java    |  5 ++
 .../devices/DeviceCoordinator.java            |  5 ++
 .../devices/huami/Huami2021Coordinator.java   |  5 ++
 .../devices/pebble/PebbleCoordinator.java     |  5 ++
 .../devices/qhybrid/QHybridCoordinator.java   |  9 +++
 .../devices/xiaomi/XiaomiCoordinator.java     |  9 ++-
 .../devices/xiaomi/XiaomiPreferences.java     |  2 +
 .../services/XiaomiNotificationService.java   | 58 ++++++++++++++++---
 .../devicesettings_canned_dismisscall_16.xml  |  5 ++
 .../xml/devicesettings_canned_reply_16.xml    |  5 ++
 11 files changed, 119 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
index 32efc921c..849367934 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
@@ -772,12 +772,14 @@ public class DeviceSpecificSettingsFragment extends AbstractPreferenceFragment i
             });
         }
 
+        final int cannedRepliesSlotCount = coordinator.getCannedRepliesSlotCount(device);
+
         final Preference cannedMessagesDismissCall = findPreference("canned_messages_dismisscall_send");
         if (cannedMessagesDismissCall != null) {
             cannedMessagesDismissCall.setOnPreferenceClickListener(new androidx.preference.Preference.OnPreferenceClickListener() {
                 public boolean onPreferenceClick(androidx.preference.Preference preference) {
                     ArrayList<String> messages = new ArrayList<>();
-                    for (int i = 1; i <= 16; i++) {
+                    for (int i = 1; i <= cannedRepliesSlotCount; i++) {
                         String message = prefs.getString("canned_message_dismisscall_" + i, null);
                         if (message != null && !message.equals("")) {
                             messages.add(message);
@@ -790,14 +792,23 @@ public class DeviceSpecificSettingsFragment extends AbstractPreferenceFragment i
                     return true;
                 }
             });
+
+            // TODO we could use this to auto-create preferences for watches with > 16 slots
+            for (int i = cannedRepliesSlotCount + 1; i <= 16; i++) {
+                final Preference cannedReplyPref = findPreference("canned_message_dismisscall_" + i);
+                if (cannedReplyPref != null) {
+                    cannedReplyPref.setVisible(false);
+                }
+            }
         }
 
         final Preference cannedMessagesGeneric = findPreference("canned_messages_generic_send");
         if (cannedMessagesGeneric != null) {
+
             cannedMessagesGeneric.setOnPreferenceClickListener(new androidx.preference.Preference.OnPreferenceClickListener() {
                 public boolean onPreferenceClick(androidx.preference.Preference preference) {
                     final ArrayList<String> messages = new ArrayList<>();
-                    for (int i = 1; i <= 16; i++) {
+                    for (int i = 1; i <= cannedRepliesSlotCount; i++) {
                         String message = prefs.getString("canned_reply_" + i, null);
                         if (message != null && !message.equals("")) {
                             messages.add(message);
@@ -810,6 +821,14 @@ public class DeviceSpecificSettingsFragment extends AbstractPreferenceFragment i
                     return true;
                 }
             });
+
+            // TODO we could use this to auto-create preferences for watches with > 16 slots
+            for (int i = cannedRepliesSlotCount + 1; i <= 16; i++) {
+                final Preference cannedReplyPref = findPreference("canned_reply_" + i);
+                if (cannedReplyPref != null) {
+                    cannedReplyPref.setVisible(false);
+                }
+            }
         }
 
         setInputTypeFor(HuamiConst.PREF_BUTTON_ACTION_BROADCAST_DELAY, InputType.TYPE_CLASS_NUMBER);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java
index 080df31ad..e5d58e595 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java
@@ -432,6 +432,11 @@ public abstract class AbstractDeviceCoordinator implements DeviceCoordinator {
         return 0;
     }
 
+    @Override
+    public int getCannedRepliesSlotCount(final GBDevice device) {
+        return 0;
+    }
+
     @Override
     public int getWorldClocksSlotCount() {
         return 0;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java
index 913780c60..618e5fa6f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java
@@ -451,6 +451,11 @@ public interface DeviceCoordinator {
      */
     int getReminderSlotCount(GBDevice device);
 
+    /**
+     * Indicates the maximum number of canned replies available in the device.
+     */
+    int getCannedRepliesSlotCount(GBDevice device);
+
     /**
      * Indicates the maximum number of slots available for world clocks in the device.
      */
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021Coordinator.java
index e23cf4725..33e16abc6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021Coordinator.java
@@ -283,6 +283,11 @@ public abstract class Huami2021Coordinator extends HuamiCoordinator {
         return ZeppOsRemindersService.getSlotCount(getPrefs(device));
     }
 
+    @Override
+    public int getCannedRepliesSlotCount(final GBDevice device) {
+        return 16;
+    }
+
     @Override
     public int getContactsSlotCount(final GBDevice device) {
         return getPrefs(device).getInt(ZeppOsContactsService.PREF_CONTACTS_SLOT_COUNT, 0);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleCoordinator.java
index 4c4493a21..cf72a164d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleCoordinator.java
@@ -125,6 +125,11 @@ public class PebbleCoordinator extends AbstractBLClassicDeviceCoordinator {
         return 0;
     }
 
+    @Override
+    public int getCannedRepliesSlotCount(final GBDevice device) {
+        return 16;
+    }
+
     @Override
     public boolean supportsSmartWakeup(GBDevice device) {
         return false;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridCoordinator.java
index 21bbcb88a..5b9d1ac46 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridCoordinator.java
@@ -146,6 +146,15 @@ public class QHybridCoordinator extends AbstractBLEDeviceCoordinator {
         return this.supportsAlarmConfiguration() ? 5 : 0;
     }
 
+    @Override
+    public int getCannedRepliesSlotCount(final GBDevice device) {
+        if (isHybridHR()) {
+            return 16;
+        }
+
+        return 0;
+    }
+
     @Override
     public boolean supportsAlarmDescription(GBDevice device) {
         return isHybridHR();
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
index 0662bb5c9..ec5413ed1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
@@ -279,6 +279,11 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
         return getPrefs(device).getInt(XiaomiPreferences.PREF_REMINDER_SLOTS, 0);
     }
 
+    @Override
+    public int getCannedRepliesSlotCount(final GBDevice device) {
+        return getPrefs(device).getInt(XiaomiPreferences.PREF_CANNED_MESSAGES_MAX, 0);
+    }
+
     @Override
     public int getWorldClocksSlotCount() {
         // TODO how many? also, map world clocks
@@ -387,7 +392,9 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
         settings.add(R.xml.devicesettings_donotdisturb_withauto_and_always);
         settings.add(R.xml.devicesettings_screen_on_on_notifications);
         settings.add(R.xml.devicesettings_autoremove_notifications);
-        settings.add(R.xml.devicesettings_canned_reply_16);
+        if (getCannedRepliesSlotCount(device) > 0) {
+            settings.add(R.xml.devicesettings_canned_dismisscall_16);
+        }
 
         //
         // Calendar
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPreferences.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPreferences.java
index e4d5109dc..721270b86 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPreferences.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPreferences.java
@@ -30,6 +30,8 @@ import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 public final class XiaomiPreferences {
     public static final String PREF_ALARM_SLOTS = "alarm_slots";
     public static final String PREF_REMINDER_SLOTS = "reminder_slots";
+    public static final String PREF_CANNED_MESSAGES_MIN = "canned_messages_min";
+    public static final String PREF_CANNED_MESSAGES_MAX = "canned_messages_max";
 
     private XiaomiPreferences() {
         // util class
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
index b0315c133..91da93302 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
@@ -37,10 +37,12 @@ import java.util.Queue;
 import nodomain.freeyourgadget.gadgetbridge.BuildConfig;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventCallControl;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventNotificationControl;
+import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdatePreferences;
 import nodomain.freeyourgadget.gadgetbridge.model.CallSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.CannedMessagesSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.NotificationSpec;
 import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiPreferences;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
 import nodomain.freeyourgadget.gadgetbridge.util.BitmapUtil;
 import nodomain.freeyourgadget.gadgetbridge.util.NotificationUtils;
@@ -242,18 +244,36 @@ public class XiaomiNotificationService extends AbstractXiaomiService implements
     }
 
     public void onSetCannedMessages(final CannedMessagesSpec cannedMessagesSpec) {
-        if (cannedMessagesSpec.type != CannedMessagesSpec.TYPE_GENERIC) {
+        if (cannedMessagesSpec.type != CannedMessagesSpec.TYPE_REJECTEDCALLS) {
             LOG.warn("Got unsupported canned messages type: {}", cannedMessagesSpec.type);
             return;
         }
 
+        final int minReplies = getDevicePrefs().getInt(XiaomiPreferences.PREF_CANNED_MESSAGES_MIN, 0);
+        final int maxReplies = getDevicePrefs().getInt(XiaomiPreferences.PREF_CANNED_MESSAGES_MAX, 0);
+
+        if (maxReplies == 0) {
+            LOG.warn("Attempting to set canned messages, but max replies is 0");
+            return;
+        }
+
         final XiaomiProto.CannedMessages.Builder cannedMessagesBuilder = XiaomiProto.CannedMessages.newBuilder()
-                // TODO get those from wathc
-                // TODO enforce these
-                .setMinReplies(1)
-                .setMaxReplies(10);
+                .setMinReplies(minReplies)
+                .setMaxReplies(maxReplies);
+        int i = 0;
         for (final String cannedMessage : cannedMessagesSpec.cannedMessages) {
+            if (i >= maxReplies) {
+                LOG.warn("Got too many canned messages ({}), limit is {}", cannedMessagesSpec.cannedMessages.length, maxReplies);
+                break;
+            }
+
             cannedMessagesBuilder.addReply(cannedMessage);
+
+            i++;
+        }
+
+        for (; i < minReplies; i++) {
+            cannedMessagesBuilder.addReply("-");
         }
 
         final XiaomiProto.Notification.Builder notificationBuilder = XiaomiProto.Notification.newBuilder()
@@ -281,10 +301,30 @@ public class XiaomiNotificationService extends AbstractXiaomiService implements
     }
 
     public void handleCannedMessages(final XiaomiProto.CannedMessages cannedMessages) {
-        // TODO save them
-        //final GBDeviceEventUpdatePreferences gbDeviceEventUpdatePreferences = new GBDeviceEventUpdatePreferences();
-        //gbDeviceEventUpdatePreferences.withPreference("canned_reply_" + i, message);
-        //getSupport().evaluateGBDeviceEvent(gbDeviceEventUpdatePreferences);
+        LOG.info("Got {} canned messages", cannedMessages.getReplyCount());
+
+        final int minReplies = cannedMessages.getMinReplies();
+        final int maxReplies = cannedMessages.getMaxReplies();
+        final GBDeviceEventUpdatePreferences gbDeviceEventUpdatePreferences = new GBDeviceEventUpdatePreferences()
+                .withPreference(XiaomiPreferences.PREF_CANNED_MESSAGES_MIN, minReplies)
+                .withPreference(XiaomiPreferences.PREF_CANNED_MESSAGES_MAX, maxReplies);
+
+        int i = 1;
+        for (final String reply : cannedMessages.getReplyList()) {
+            gbDeviceEventUpdatePreferences.withPreference("canned_message_dismisscall_" + i, reply);
+            i++;
+
+            if (i > maxReplies || i > 16) {
+                LOG.warn("Got too many canned messages ({})", i);
+                break;
+            }
+        }
+
+        for (int j = i; j <= maxReplies; j++) {
+            gbDeviceEventUpdatePreferences.withPreference("canned_message_dismisscall_" + j, null);
+        }
+
+        getSupport().evaluateGBDeviceEvent(gbDeviceEventUpdatePreferences);
     }
 
     public boolean canSendSms() {
diff --git a/app/src/main/res/xml/devicesettings_canned_dismisscall_16.xml b/app/src/main/res/xml/devicesettings_canned_dismisscall_16.xml
index 8722b5640..5436114d5 100644
--- a/app/src/main/res/xml/devicesettings_canned_dismisscall_16.xml
+++ b/app/src/main/res/xml/devicesettings_canned_dismisscall_16.xml
@@ -13,6 +13,11 @@
             android:summary="@string/pref_summary_canned_messages_set"
             android:title="@string/pref_title_canned_messages_set" />
 
+        <!--
+            WARNING: Make sure to override getCannedRepliesSlotCount in the device coordinator
+            in order for the options below to show up.
+        -->
+
         <PreferenceCategory
             android:key="pref_key_canned_reply_messages"
             android:title="@string/pref_header_cannned_messages">
diff --git a/app/src/main/res/xml/devicesettings_canned_reply_16.xml b/app/src/main/res/xml/devicesettings_canned_reply_16.xml
index 50e2455d8..5d1790f78 100644
--- a/app/src/main/res/xml/devicesettings_canned_reply_16.xml
+++ b/app/src/main/res/xml/devicesettings_canned_reply_16.xml
@@ -20,6 +20,11 @@
             android:title="@string/pref_title_canned_reply_suffix"
             app:useSimpleSummaryProvider="true" />
 
+        <!--
+            WARNING: Make sure to override getCannedRepliesSlotCount in the device coordinator
+            in order for the options below to show up.
+        -->
+
         <PreferenceCategory
             android:key="pref_key_canned_reply_messages"
             android:title="@string/pref_header_cannned_messages">

From 130e2ab85cade25c0884c4013197256ac4da2dac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Wed, 6 Dec 2023 11:51:01 +0000
Subject: [PATCH 203/595] Xiaomi: Fix heart rate interval and sleep support

---
 .../service/devices/xiaomi/XiaomiSupport.java |  6 +--
 .../xiaomi/services/XiaomiHealthService.java  | 38 +++++++++++++++++--
 2 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
index 151999abb..c7ffb8ec7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
@@ -417,14 +417,12 @@ public class XiaomiSupport extends AbstractBTLEDeviceSupport {
 
     @Override
     public void onEnableHeartRateSleepSupport(final boolean enable) {
-        // TODO onEnableHeartRateSleepSupport
-        super.onEnableHeartRateSleepSupport(enable);
+        healthService.setHeartRateConfig();
     }
 
     @Override
     public void onSetHeartRateMeasurementInterval(final int seconds) {
-        // TODO
-        super.onSetHeartRateMeasurementInterval(seconds);
+        healthService.setHeartRateConfig();
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
index a28d9c13b..ceb59c1fd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
@@ -121,15 +121,28 @@ public class XiaomiHealthService extends AbstractXiaomiService {
             case CMD_CONFIG_SPO2_GET:
                 handleSpo2Config(cmd.getHealth().getSpo2());
                 return;
+            case CMD_CONFIG_SPO2_SET:
+                LOG.debug("Got spo2 set ack, status={}", cmd.getStatus());
+                return;
+            case CMD_CONFIG_HEART_RATE_SET:
+                LOG.debug("Got heart rate set ack, status={}", cmd.getStatus());
+                return;
+
             case CMD_CONFIG_HEART_RATE_GET:
                 handleHeartRateConfig(cmd.getHealth().getHeartRate());
                 return;
             case CMD_CONFIG_STANDING_REMINDER_GET:
                 handleStandingReminderConfig(cmd.getHealth().getStandingReminder());
                 return;
+            case CMD_CONFIG_STANDING_REMINDER_SET:
+                LOG.debug("Got standing reminder set ack, status={}", cmd.getStatus());
+                return;
             case CMD_CONFIG_STRESS_GET:
                 handleStressConfig(cmd.getHealth().getStress());
                 return;
+            case CMD_CONFIG_STRESS_SET:
+                LOG.debug("Got stress set ack, status={}", cmd.getStatus());
+                return;
             case CMD_WORKOUT_WATCH_STATUS:
                 handleWorkoutStatus(cmd.getHealth().getWorkoutStatusWatch());
                 return;
@@ -311,18 +324,35 @@ public class XiaomiHealthService extends AbstractXiaomiService {
         getSupport().evaluateGBDeviceEvent(eventUpdatePreferences);
     }
 
-    private void setHeartRateConfig() {
+    public void setHeartRateConfig() {
         final Prefs prefs = getDevicePrefs();
 
         final boolean sleepDetection = prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_HEARTRATE_USE_FOR_SLEEP_DETECTION, false);
         final boolean sleepBreathingQuality = prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_HEARTRATE_SLEEP_BREATHING_QUALITY_MONITORING, false);
-        final int intervalMin = prefs.getInt(DeviceSettingsPreferenceConst.PREF_HEARTRATE_MEASUREMENT_INTERVAL, 0);
+        final int intervalSeconds = prefs.getInt(DeviceSettingsPreferenceConst.PREF_HEARTRATE_MEASUREMENT_INTERVAL, 0);
         final int alertHigh = prefs.getInt(DeviceSettingsPreferenceConst.PREF_HEARTRATE_ALERT_HIGH_THRESHOLD, 0);
         final int alertLow = prefs.getInt(DeviceSettingsPreferenceConst.PREF_HEARTRATE_ALERT_LOW_THRESHOLD, 0);
 
+        int intervalMin;
+        if (intervalSeconds == -1) {
+            // Smart
+            intervalMin = 0;
+        } else {
+            intervalMin = intervalSeconds / 60;
+        }
+
+        LOG.debug(
+                "Set heart rate config: sleepDetection={}, sleepBreathingQuality={}, intervalSeconds={}, alertHigh={}, alertLow={}",
+                sleepDetection,
+                sleepBreathingQuality,
+                intervalSeconds,
+                alertHigh,
+                alertLow
+        );
+
         final XiaomiProto.HeartRate.Builder heartRate = XiaomiProto.HeartRate.newBuilder()
-                .setDisabled(intervalMin == 0)
-                .setInterval(Math.max(intervalMin, 0)) // smart will be -1 from pref
+                .setDisabled(intervalSeconds == 0)
+                .setInterval(intervalMin)
                 .setAdvancedMonitoring(XiaomiProto.AdvancedMonitoring.newBuilder()
                         .setEnabled(sleepDetection))
                 .setBreathingScore(sleepBreathingQuality ? 1 : 2)

From b44b0fec7e4d0fa078d91272aac87e1fe7d5072f Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Wed, 6 Dec 2023 15:56:18 +0100
Subject: [PATCH 204/595] Divoom Pixoo: Initial experimental support

Works:
- notifications
- call notification
- set time
- setting brightness
- setting 24h/12h format
- sending weather

Note
- this is implemented using using the classic bluetooth serial protocol, the
  device can do BLE, but I don't know how to use it, as I did not have the
  offical app to sniff.
- The information about the protocol comes from here
  https://github.com/jfroehlich/node-p1x3lramen/blob/main/source/devices/pixoo.js

TODO:
- Enable beep? Possible? I heard it beep once at least when switching it on
- Getting out of factory mode? Why does it always play animations even when I
   switch to the clock?
- Implement switching modes (can be done with the button)
- Implement sending own images and animations
- Firmware update?
- ...
---
 .../devices/divoom/PixooCoordinator.java      |  82 +++++++
 .../gadgetbridge/model/DeviceType.java        |   2 +
 .../service/devices/divoom/PixooIOThread.java |  57 +++++
 .../service/devices/divoom/PixooProtocol.java | 220 ++++++++++++++++++
 .../service/devices/divoom/PixooSupport.java  |  65 ++++++
 app/src/main/res/values/strings.xml           |   1 +
 6 files changed, 427 insertions(+)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/divoom/PixooCoordinator.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooIOThread.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooProtocol.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooSupport.java

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/divoom/PixooCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/divoom/PixooCoordinator.java
new file mode 100644
index 000000000..0617bc37b
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/divoom/PixooCoordinator.java
@@ -0,0 +1,82 @@
+/*  Copyright (C) 2023 Andreas Shimokawa
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.divoom;
+
+import androidx.annotation.NonNull;
+
+import java.util.regex.Pattern;
+
+import nodomain.freeyourgadget.gadgetbridge.GBException;
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.devices.AbstractBLEDeviceCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.entities.Device;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.divoom.PixooSupport;
+
+public class PixooCoordinator extends AbstractBLEDeviceCoordinator {
+    @Override
+    protected Pattern getSupportedDeviceName() {
+        return Pattern.compile("Pixoo");
+    }
+
+    @Override
+    protected void deleteDevice(@NonNull GBDevice gbDevice, @NonNull Device device, @NonNull DaoSession session) throws GBException {
+
+    }
+
+    @Override
+    public String getManufacturer() {
+        return "Divoom";
+    }
+
+    @NonNull
+    @Override
+    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+        return PixooSupport.class;
+    }
+
+    @Override
+    public int getDeviceNameResource() {
+        return R.string.devicetype_pixoo;
+    }
+
+    @Override
+    public boolean supportsWeather() {
+        return true;
+    }
+
+    @Override
+    public int getDefaultIconResource() {
+        return R.drawable.ic_device_lovetoy;
+    }
+
+    @Override
+    public int getDisabledIconResource() {
+        return R.drawable.ic_device_lovetoy_disabled;
+    }
+
+    @Override
+    public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
+        return new int[]{
+                R.xml.devicesettings_screen_brightness,
+                R.xml.devicesettings_timeformat,
+        };
+    }
+
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
index f41b262b9..35639310e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
@@ -30,6 +30,7 @@ import nodomain.freeyourgadget.gadgetbridge.devices.casio.gb6900.CasioGB6900Devi
 import nodomain.freeyourgadget.gadgetbridge.devices.casio.gbx100.CasioGBX100DeviceCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.casio.gwb5600.CasioGMWB5000DeviceCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.casio.gwb5600.CasioGWB5600DeviceCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.divoom.PixooCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.domyos.DomyosT540Coordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.femometer.FemometerVinca2DeviceCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.fitpro.FitProDeviceCoordinator;
@@ -288,6 +289,7 @@ public enum DeviceType {
     WITHINGS_STEEL_HR(WithingsSteelHRDeviceCoordinator.class),
     SONY_WENA_3(SonyWena3Coordinator.class),
     FEMOMETER_VINCA2(FemometerVinca2DeviceCoordinator.class),
+    PIXOO(PixooCoordinator.class),
     TEST(TestDeviceCoordinator.class);
 
     private DeviceCoordinator coordinator;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooIOThread.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooIOThread.java
new file mode 100644
index 000000000..e4936ceae
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooIOThread.java
@@ -0,0 +1,57 @@
+/*  Copyright (C) 2023 Andreas Shimokawa
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+
+package nodomain.freeyourgadget.gadgetbridge.service.devices.divoom;
+
+import static nodomain.freeyourgadget.gadgetbridge.util.GB.hexdump;
+
+import android.bluetooth.BluetoothAdapter;
+import android.content.Context;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;
+
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.service.btclassic.BtClassicIoThread;
+
+public class PixooIOThread extends BtClassicIoThread {
+    private static final Logger LOG = LoggerFactory.getLogger(PixooIOThread.class);
+
+
+    @Override
+    protected void initialize() {
+        setUpdateState(GBDevice.State.INITIALIZED);
+    }
+
+    public PixooIOThread(GBDevice device, Context context, PixooProtocol deviceProtocol,
+                         PixooSupport PixooSupport, BluetoothAdapter bluetoothAdapter) {
+        super(device, context, deviceProtocol, PixooSupport, bluetoothAdapter);
+    }
+
+    @Override
+    protected byte[] parseIncoming(InputStream inStream) throws IOException {
+        byte[] buffer = new byte[1048576]; //HUGE read
+        int bytes = inStream.read(buffer);
+        LOG.debug("read " + bytes + " bytes. " + hexdump(buffer, 0, bytes));
+        return Arrays.copyOf(buffer, bytes);
+    }
+
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooProtocol.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooProtocol.java
new file mode 100644
index 000000000..f0d13d971
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooProtocol.java
@@ -0,0 +1,220 @@
+/*  Copyright (C) 2023 Andreas Shimokawa
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+
+package nodomain.freeyourgadget.gadgetbridge.service.devices.divoom;
+
+import android.content.SharedPreferences;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+
+import lineageos.weather.util.WeatherUtils;
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.activities.SettingsActivity;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
+import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEvent;
+import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventVersionInfo;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.model.CallSpec;
+import nodomain.freeyourgadget.gadgetbridge.model.NotificationSpec;
+import nodomain.freeyourgadget.gadgetbridge.model.WeatherSpec;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.BLETypeConversions;
+import nodomain.freeyourgadget.gadgetbridge.service.serial.GBDeviceProtocol;
+import nodomain.freeyourgadget.gadgetbridge.util.GBPrefs;
+import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
+
+public class PixooProtocol extends GBDeviceProtocol {
+    private static final Logger LOG = LoggerFactory.getLogger(PixooProtocol.class);
+
+    private boolean isFirstExchange = true;
+
+    protected PixooProtocol(GBDevice device) {
+        super(device);
+    }
+
+    @Override
+    public GBDeviceEvent[] decodeResponse(byte[] responseData) {
+        List<GBDeviceEvent> devEvts = new ArrayList<>();
+
+        if (isFirstExchange) {
+            isFirstExchange = false;
+            devEvts.add(new GBDeviceEventVersionInfo()); //TODO: this is a weird hack to make the DBHelper happy. Replace with proper firmware detection
+        }
+
+        ByteBuffer incoming = ByteBuffer.wrap(responseData);
+        incoming.order(ByteOrder.LITTLE_ENDIAN);
+
+        return devEvts.toArray(new GBDeviceEvent[0]);
+    }
+
+    @Override
+    public byte[] encodeSendConfiguration(String config) {
+        SharedPreferences prefs = GBApplication.getDeviceSpecificSharedPrefs(getDevice().getAddress());
+
+        switch (config) {
+            case DeviceSettingsPreferenceConst.PREF_SCREEN_BRIGHTNESS:
+                byte brightness = (byte) prefs.getInt(DeviceSettingsPreferenceConst.PREF_SCREEN_BRIGHTNESS, 50);
+                LOG.debug("setting brightness to " + brightness);
+                return encodeProtocol(new byte[]{
+                        0x74,
+                        brightness
+                });
+            case DeviceSettingsPreferenceConst.PREF_TIMEFORMAT:
+                final GBPrefs gbPrefs = new GBPrefs(new Prefs(GBApplication.getDeviceSpecificSharedPrefs(getDevice().getAddress())));
+                final String timeFormat = gbPrefs.getTimeFormat();
+                final boolean is24hour = DeviceSettingsPreferenceConst.PREF_TIMEFORMAT_24H.equals(timeFormat);
+
+                return encodeProtocol(new byte[]{
+                        0x2d,
+                        (byte) (is24hour ? 1 : 0),
+                });
+
+        }
+
+        return super.encodeSendConfiguration(config);
+    }
+
+    @Override
+    public byte[] encodeSetCallState(String number, String name, int command) {
+        if (command == CallSpec.CALL_OUTGOING) {
+            return null;
+        }
+        return encodeProtocol(new byte[]{
+                0x50,
+                (byte) (command == CallSpec.CALL_INCOMING ? 5 : 6),
+        });
+    }
+
+    @Override
+    public byte[] encodeNotification(NotificationSpec notificationSpec) {
+        byte iconID;
+        switch (notificationSpec.type) {
+            case KAKAO_TALK:
+                iconID = 0;
+                break;
+            case INSTAGRAM:
+                iconID = 1;
+                break;
+            case SNAPCHAT:
+                iconID = 2;
+                break;
+            case FACEBOOK:
+                iconID = 3;
+                break;
+            case TWITTER:
+                iconID = 4;
+                break;
+            case WHATSAPP:
+            case GENERIC_SMS:
+                iconID = 8;
+                break;
+            case SKYPE:
+                iconID = 9;
+                break;
+            case LINE:
+                iconID = 10;
+                break;
+            case WECHAT:
+                iconID = 11;
+                break;
+            case VIBER:
+                iconID = 12;
+                break;
+            case GENERIC_ALARM_CLOCK:
+                iconID = 17;
+                break;
+            default:
+                iconID = 0x20;
+        }
+
+        return encodeProtocol(new byte[]{
+                0x50,
+                iconID,
+        });
+
+    }
+
+    @Override
+    public byte[] encodeSetTime() {
+        Calendar now = BLETypeConversions.createCalendar();
+        return encodeProtocol(new byte[]{
+                0x18,
+                (byte) (now.get(Calendar.YEAR) % 100),
+                (byte) (now.get(Calendar.YEAR) / 100),
+                (byte) (now.get(Calendar.MONTH) + 1),
+                (byte) now.get(Calendar.DAY_OF_MONTH),
+                (byte) now.get(Calendar.HOUR_OF_DAY),
+                (byte) now.get(Calendar.MINUTE),
+                (byte) now.get(Calendar.SECOND)
+        });
+
+    }
+
+    @Override
+    public byte[] encodeSendWeather(WeatherSpec weatherSpec) {
+        byte pixooWeatherCode = 0;
+        if (weatherSpec.currentConditionCode >= 200 && weatherSpec.currentConditionCode <= 299) {
+            pixooWeatherCode = 5;
+        } else if (weatherSpec.currentConditionCode >= 300 && weatherSpec.currentConditionCode < 600) {
+            pixooWeatherCode = 6;
+        } else if (weatherSpec.currentConditionCode >= 600 && weatherSpec.currentConditionCode < 700) {
+            pixooWeatherCode = 8;
+        } else if (weatherSpec.currentConditionCode >= 700 && weatherSpec.currentConditionCode < 800) {
+            pixooWeatherCode = 9;
+        } else if (weatherSpec.currentConditionCode == 800) {
+            pixooWeatherCode = 1;
+        } else if (weatherSpec.currentConditionCode >= 801 && weatherSpec.currentConditionCode <= 804) {
+            pixooWeatherCode = 3;
+        }
+
+        byte temp = (byte) (weatherSpec.currentTemp - 273);
+        String units = GBApplication.getPrefs().getString(SettingsActivity.PREF_MEASUREMENT_SYSTEM, GBApplication.getContext().getString(R.string.p_unit_metric));
+        if (units.equals(GBApplication.getContext().getString(R.string.p_unit_imperial))) {
+            temp = (byte) WeatherUtils.celsiusToFahrenheit(temp);
+        }
+
+        return encodeProtocol(new byte[]{
+                0x5f,
+                temp,
+                pixooWeatherCode,
+        });
+    }
+
+    byte[] encodeProtocol(byte[] payload) {
+
+        ByteBuffer msgBuf = ByteBuffer.allocate(6 + payload.length);
+        msgBuf.order(ByteOrder.LITTLE_ENDIAN);
+        msgBuf.put((byte) 0x01);
+        msgBuf.putShort((short) (payload.length + 2));
+        msgBuf.put(payload);
+        short crc = (short) (((payload.length + 2) & 0xff) + ((payload.length + 2) >> 8));
+        for (byte b : payload) {
+            crc += b;
+        }
+        msgBuf.putShort(crc);
+        msgBuf.put((byte) 0x02);
+        return msgBuf.array();
+    }
+
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooSupport.java
new file mode 100644
index 000000000..5a718aea6
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooSupport.java
@@ -0,0 +1,65 @@
+/*  Copyright (C) 2023 Andreas Shimokawa
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+
+package nodomain.freeyourgadget.gadgetbridge.service.devices.divoom;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import nodomain.freeyourgadget.gadgetbridge.service.serial.AbstractSerialDeviceSupport;
+import nodomain.freeyourgadget.gadgetbridge.service.serial.GBDeviceIoThread;
+import nodomain.freeyourgadget.gadgetbridge.service.serial.GBDeviceProtocol;
+
+public class PixooSupport extends AbstractSerialDeviceSupport {
+    private static final Logger LOG = LoggerFactory.getLogger(PixooSupport.class);
+
+
+    @Override
+    public void onSendConfiguration(String config) {
+        super.onSendConfiguration(config);
+    }
+
+    @Override
+    public void onTestNewFunction() {
+    }
+
+    @Override
+    public boolean connect() {
+        getDeviceIOThread().start();
+        return true;
+    }
+
+    @Override
+    public synchronized PixooIOThread getDeviceIOThread() {
+        return (PixooIOThread) super.getDeviceIOThread();
+    }
+
+    @Override
+    public boolean useAutoConnect() {
+        return false;
+    }
+
+    protected GBDeviceProtocol createDeviceProtocol() {
+        return new PixooProtocol(getDevice());
+    }
+
+    @Override
+    protected GBDeviceIoThread createDeviceIOThread() {
+        return new PixooIOThread(getDevice(), getContext(), (PixooProtocol) getDeviceProtocol(),
+                PixooSupport.this, getBluetoothAdapter());
+    }
+}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b0d712421..aa93dd155 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2432,4 +2432,5 @@
     <string name="pref_sleep_mode_schedule_summary">Send a reminder and enter sleep mode at bedtime. At the scheduled wake-up time, the wake-up alarm will sound.</string>
     <string name="devicetype_xiaomi_watch_s1_active">Xiaomi Watch S1 Active</string>
     <string name="devicetype_mi_watch_color_sport">Mi Watch Color Sport</string>
+    <string name="devicetype_pixoo">Pixoo</string>
 </resources>

From b4aca410b43714bf6eab7a1764658b1f54dba95d Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Thu, 7 Dec 2023 21:07:52 +0100
Subject: [PATCH 205/595] Pixoo: implement some protocol for testing

---
 .../service/devices/divoom/PixooProtocol.java | 44 +++++++++++++++++++
 .../service/devices/divoom/PixooSupport.java  |  4 --
 2 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooProtocol.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooProtocol.java
index f0d13d971..8cd6fa408 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooProtocol.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooProtocol.java
@@ -201,6 +201,50 @@ public class PixooProtocol extends GBDeviceProtocol {
         });
     }
 
+    private byte[] encodeClockModeCommand(int clockMode, boolean showTime, boolean showWeather, boolean showTemperature, boolean showDate,
+                                          int r, int g, int b) {
+
+        r = Math.min(r, 127);
+        g = Math.min(g, 127);
+        b = Math.min(b, 127);
+
+        return encodeProtocol(new byte[]{
+                0x45,
+                0x00,
+                0x01, // unknown, can be 0 or 1
+                (byte) clockMode,
+                (byte) (showTime ? 0x01 : 0x00), // ignored it seems
+                (byte) (showWeather ? 0x01 : 0x00),
+                (byte) (showTemperature ? 0x01 : 0x00),
+                (byte) (showDate ? 0x01 : 0x00),
+                (byte) r, (byte) g, (byte) b
+        });
+
+    }
+
+    private byte[] encodeAudioVisualisationModeCommand(int visualisationMode) {
+        return encodeProtocol(new byte[]{
+                0x45,
+                0x04,
+                (byte) visualisationMode,
+        });
+    }
+
+    private byte[] encodeEffectModeCommand(int effectMode) {
+        return encodeProtocol(new byte[]{
+                0x45,
+                0x03,
+                (byte) effectMode,
+        });
+    }
+
+    @Override
+    public byte[] encodeTestNewFunction() {
+        //return encodeAudioModeCommand(1); // works
+        //return encodeEffectModeCommand(5); // does nothing
+        return encodeClockModeCommand(0, true, true, false, true, 127, 127, 127); // works r,g,b up to 127
+    }
+
     byte[] encodeProtocol(byte[] payload) {
 
         ByteBuffer msgBuf = ByteBuffer.allocate(6 + payload.length);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooSupport.java
index 5a718aea6..3c5b95f9d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooSupport.java
@@ -33,10 +33,6 @@ public class PixooSupport extends AbstractSerialDeviceSupport {
         super.onSendConfiguration(config);
     }
 
-    @Override
-    public void onTestNewFunction() {
-    }
-
     @Override
     public boolean connect() {
         getDeviceIOThread().start();

From 77329813b96263ade97ca71798d432111c76bbea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 8 Dec 2023 10:45:07 +0000
Subject: [PATCH 206/595] Use simple summary provider for vibration pattern
 counts

---
 .../huami/HuamiSettingsCustomizer.java        |   9 +-
 .../xml/devicesettings_vibrationpatterns.xml  | 173 ++++++++++--------
 2 files changed, 93 insertions(+), 89 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiSettingsCustomizer.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiSettingsCustomizer.java
index 5e0f230ec..1bdc63591 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiSettingsCustomizer.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiSettingsCustomizer.java
@@ -98,14 +98,7 @@ public class HuamiSettingsCustomizer implements DeviceSpecificSettingsCustomizer
 
     @Override
     public Set<String> getPreferenceKeysWithSummary() {
-        final Set<String> keysWithSummary = new HashSet<>();
-
-        for (HuamiVibrationPatternNotificationType notificationType : HuamiVibrationPatternNotificationType.values()) {
-            final String typeKey = notificationType.name().toLowerCase(Locale.ROOT);
-            keysWithSummary.add(HuamiConst.PREF_HUAMI_VIBRATION_COUNT_PREFIX + typeKey);
-        }
-
-        return keysWithSummary;
+        return new HashSet<>();
     }
 
     public static final Creator<HuamiSettingsCustomizer> CREATOR = new Creator<HuamiSettingsCustomizer>() {
diff --git a/app/src/main/res/xml/devicesettings_vibrationpatterns.xml b/app/src/main/res/xml/devicesettings_vibrationpatterns.xml
index 6e244f6a5..ec0acaa6d 100644
--- a/app/src/main/res/xml/devicesettings_vibrationpatterns.xml
+++ b/app/src/main/res/xml/devicesettings_vibrationpatterns.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <PreferenceScreen
         android:icon="@drawable/ic_vibration"
         android:key="vibration_patterns_key"
@@ -10,10 +11,10 @@
         <PreferenceCategory android:title="@string/pref_screen_vibration_patterns_title" />
 
         <PreferenceScreen
-            android:key="vibration_profile_key_app_alerts"
             android:icon="@drawable/ic_settings_applications"
-            android:title="@string/pref_screen_notification_profile_generic"
-            android:persistent="false">
+            android:key="vibration_profile_key_app_alerts"
+            android:persistent="false"
+            android:title="@string/pref_screen_notification_profile_generic">
 
             <!-- workaround for missing toolbar -->
             <PreferenceCategory android:title="@string/pref_screen_notification_profile_generic" />
@@ -23,27 +24,28 @@
                 android:entries="@array/vibration_profile"
                 android:entryValues="@array/vibration_profile_values"
                 android:key="huami_vibration_profile_app_alerts"
-                android:title="@string/miband_prefs_vibration"
-                android:summary="%s" />
+                android:summary="%s"
+                android:title="@string/miband_prefs_vibration" />
 
             <EditTextPreference
                 android:defaultValue="2"
                 android:inputType="number"
                 android:key="huami_vibration_count_app_alerts"
                 android:maxLength="1"
-                android:title="@string/pref_title_notifications_repetitions" />
+                android:title="@string/pref_title_notifications_repetitions"
+                app:useSimpleSummaryProvider="true" />
 
             <Preference
-                android:persistent="false"
                 android:key="huami_vibration_try_app_alerts"
-                android:title="@string/vibration_try"/>
+                android:persistent="false"
+                android:title="@string/vibration_try" />
         </PreferenceScreen>
 
         <PreferenceScreen
-            android:key="vibration_profile_key_incoming_call"
             android:icon="@drawable/ic_phone"
-            android:title="@string/pref_screen_notification_profile_incoming_call"
-            android:persistent="false">
+            android:key="vibration_profile_key_incoming_call"
+            android:persistent="false"
+            android:title="@string/pref_screen_notification_profile_incoming_call">
 
             <!-- workaround for missing toolbar -->
             <PreferenceCategory android:title="@string/pref_screen_notification_profile_incoming_call" />
@@ -53,27 +55,28 @@
                 android:entries="@array/vibration_profile"
                 android:entryValues="@array/vibration_profile_values"
                 android:key="huami_vibration_profile_incoming_call"
-                android:title="@string/miband_prefs_vibration"
-                android:summary="%s" />
+                android:summary="%s"
+                android:title="@string/miband_prefs_vibration" />
 
             <EditTextPreference
                 android:defaultValue="1"
                 android:inputType="number"
                 android:key="huami_vibration_count_incoming_call"
                 android:maxLength="1"
-                android:title="@string/pref_title_notifications_repetitions" />
+                android:title="@string/pref_title_notifications_repetitions"
+                app:useSimpleSummaryProvider="true" />
 
             <Preference
-                android:persistent="false"
                 android:key="huami_vibration_try_incoming_call"
-                android:title="@string/vibration_try"/>
+                android:persistent="false"
+                android:title="@string/vibration_try" />
         </PreferenceScreen>
 
         <PreferenceScreen
-            android:key="vibration_profile_key_incoming_sms"
             android:icon="@drawable/ic_message_outline"
-            android:title="@string/pref_screen_notification_profile_sms"
-            android:persistent="false">
+            android:key="vibration_profile_key_incoming_sms"
+            android:persistent="false"
+            android:title="@string/pref_screen_notification_profile_sms">
 
             <!-- workaround for missing toolbar -->
             <PreferenceCategory android:title="@string/pref_screen_notification_profile_sms" />
@@ -83,27 +86,28 @@
                 android:entries="@array/vibration_profile"
                 android:entryValues="@array/vibration_profile_values"
                 android:key="huami_vibration_profile_incoming_sms"
-                android:title="@string/miband_prefs_vibration"
-                android:summary="%s" />
+                android:summary="%s"
+                android:title="@string/miband_prefs_vibration" />
 
             <EditTextPreference
                 android:defaultValue="2"
                 android:inputType="number"
                 android:key="huami_vibration_count_incoming_sms"
                 android:maxLength="1"
-                android:title="@string/pref_title_notifications_repetitions" />
+                android:title="@string/pref_title_notifications_repetitions"
+                app:useSimpleSummaryProvider="true" />
 
             <Preference
-                android:persistent="false"
                 android:key="huami_vibration_try_incoming_sms"
-                android:title="@string/vibration_try"/>
+                android:persistent="false"
+                android:title="@string/vibration_try" />
         </PreferenceScreen>
 
         <PreferenceScreen
-            android:key="vibration_profile_key_goal_notification"
             android:icon="@drawable/ic_star_gray"
-            android:title="@string/mi2_prefs_goal_notification"
-            android:persistent="false">
+            android:key="vibration_profile_key_goal_notification"
+            android:persistent="false"
+            android:title="@string/mi2_prefs_goal_notification">
 
             <!-- workaround for missing toolbar -->
             <PreferenceCategory android:title="@string/mi2_prefs_goal_notification" />
@@ -113,27 +117,28 @@
                 android:entries="@array/vibration_profile"
                 android:entryValues="@array/vibration_profile_values"
                 android:key="huami_vibration_profile_goal_notification"
-                android:title="@string/miband_prefs_vibration"
-                android:summary="%s" />
+                android:summary="%s"
+                android:title="@string/miband_prefs_vibration" />
 
             <EditTextPreference
                 android:defaultValue="1"
                 android:inputType="number"
                 android:key="huami_vibration_count_goal_notification"
                 android:maxLength="1"
-                android:title="@string/pref_title_notifications_repetitions" />
+                android:title="@string/pref_title_notifications_repetitions"
+                app:useSimpleSummaryProvider="true" />
 
             <Preference
-                android:persistent="false"
                 android:key="huami_vibration_try_goal_notification"
-                android:title="@string/vibration_try"/>
+                android:persistent="false"
+                android:title="@string/vibration_try" />
         </PreferenceScreen>
 
         <PreferenceScreen
-            android:key="vibration_profile_key_alarm"
             android:icon="@drawable/ic_access_alarms"
-            android:title="@string/vibration_profile_alarm_clock"
-            android:persistent="false">
+            android:key="vibration_profile_key_alarm"
+            android:persistent="false"
+            android:title="@string/vibration_profile_alarm_clock">
 
             <!-- workaround for missing toolbar -->
             <PreferenceCategory android:title="@string/vibration_profile_alarm_clock" />
@@ -143,27 +148,28 @@
                 android:entries="@array/vibration_profile"
                 android:entryValues="@array/vibration_profile_values"
                 android:key="huami_vibration_profile_alarm"
-                android:title="@string/miband_prefs_vibration"
-                android:summary="%s" />
+                android:summary="%s"
+                android:title="@string/miband_prefs_vibration" />
 
             <EditTextPreference
                 android:defaultValue="7"
                 android:inputType="number"
                 android:key="huami_vibration_count_alarm"
                 android:maxLength="1"
-                android:title="@string/pref_title_notifications_repetitions" />
+                android:title="@string/pref_title_notifications_repetitions"
+                app:useSimpleSummaryProvider="true" />
 
             <Preference
-                android:persistent="false"
                 android:key="huami_vibration_try_alarm"
-                android:title="@string/vibration_try"/>
+                android:persistent="false"
+                android:title="@string/vibration_try" />
         </PreferenceScreen>
 
         <PreferenceScreen
-            android:key="vibration_profile_key_idle_alerts"
             android:icon="@drawable/ic_chair"
-            android:title="@string/pref_screen_notification_idle_alerts"
-            android:persistent="false">
+            android:key="vibration_profile_key_idle_alerts"
+            android:persistent="false"
+            android:title="@string/pref_screen_notification_idle_alerts">
 
             <!-- workaround for missing toolbar -->
             <PreferenceCategory android:title="@string/pref_screen_notification_idle_alerts" />
@@ -173,27 +179,28 @@
                 android:entries="@array/vibration_profile"
                 android:entryValues="@array/vibration_profile_values"
                 android:key="huami_vibration_profile_idle_alerts"
-                android:title="@string/miband_prefs_vibration"
-                android:summary="%s" />
+                android:summary="%s"
+                android:title="@string/miband_prefs_vibration" />
 
             <EditTextPreference
                 android:defaultValue="2"
                 android:inputType="number"
                 android:key="huami_vibration_count_idle_alerts"
                 android:maxLength="1"
-                android:title="@string/pref_title_notifications_repetitions" />
+                android:title="@string/pref_title_notifications_repetitions"
+                app:useSimpleSummaryProvider="true" />
 
             <Preference
-                android:persistent="false"
                 android:key="huami_vibration_try_idle_alerts"
-                android:title="@string/vibration_try"/>
+                android:persistent="false"
+                android:title="@string/vibration_try" />
         </PreferenceScreen>
 
         <PreferenceScreen
-            android:key="vibration_profile_key_event_reminder"
             android:icon="@drawable/ic_device_set_reminders"
-            android:title="@string/pref_screen_notification_profile_event_reminder"
-            android:persistent="false">
+            android:key="vibration_profile_key_event_reminder"
+            android:persistent="false"
+            android:title="@string/pref_screen_notification_profile_event_reminder">
 
             <!-- workaround for missing toolbar -->
             <PreferenceCategory android:title="@string/pref_screen_notification_profile_event_reminder" />
@@ -203,27 +210,28 @@
                 android:entries="@array/vibration_profile"
                 android:entryValues="@array/vibration_profile_values"
                 android:key="huami_vibration_profile_event_reminder"
-                android:title="@string/miband_prefs_vibration"
-                android:summary="%s" />
+                android:summary="%s"
+                android:title="@string/miband_prefs_vibration" />
 
             <EditTextPreference
                 android:defaultValue="1"
                 android:inputType="number"
                 android:key="huami_vibration_count_event_reminder"
                 android:maxLength="1"
-                android:title="@string/pref_title_notifications_repetitions" />
+                android:title="@string/pref_title_notifications_repetitions"
+                app:useSimpleSummaryProvider="true" />
 
             <Preference
-                android:persistent="false"
                 android:key="huami_vibration_try_event_reminder"
-                android:title="@string/vibration_try"/>
+                android:persistent="false"
+                android:title="@string/vibration_try" />
         </PreferenceScreen>
 
         <PreferenceScreen
-            android:key="vibration_profile_key_find_band"
             android:icon="@drawable/ic_action_find_lost_device"
-            android:title="@string/pref_screen_notification_profile_find_device"
-            android:persistent="false">
+            android:key="vibration_profile_key_find_band"
+            android:persistent="false"
+            android:title="@string/pref_screen_notification_profile_find_device">
 
             <!-- workaround for missing toolbar -->
             <PreferenceCategory android:title="@string/pref_screen_notification_profile_find_device" />
@@ -233,27 +241,28 @@
                 android:entries="@array/vibration_profile"
                 android:entryValues="@array/vibration_profile_values"
                 android:key="huami_vibration_profile_find_band"
-                android:title="@string/miband_prefs_vibration"
-                android:summary="%s" />
+                android:summary="%s"
+                android:title="@string/miband_prefs_vibration" />
 
             <EditTextPreference
                 android:defaultValue="1"
                 android:inputType="number"
                 android:key="huami_vibration_count_find_band"
                 android:maxLength="1"
-                android:title="@string/pref_title_notifications_repetitions" />
+                android:title="@string/pref_title_notifications_repetitions"
+                app:useSimpleSummaryProvider="true" />
 
             <Preference
-                android:persistent="false"
                 android:key="huami_vibration_try_find_band"
-                android:title="@string/vibration_try"/>
+                android:persistent="false"
+                android:title="@string/vibration_try" />
         </PreferenceScreen>
 
         <PreferenceScreen
-            android:key="vibration_profile_key_todo_list"
             android:icon="@drawable/ic_checklist"
-            android:title="@string/pref_screen_notification_profile_todo_list"
-            android:persistent="false">
+            android:key="vibration_profile_key_todo_list"
+            android:persistent="false"
+            android:title="@string/pref_screen_notification_profile_todo_list">
 
             <!-- workaround for missing toolbar -->
             <PreferenceCategory android:title="@string/pref_screen_notification_profile_todo_list" />
@@ -263,27 +272,28 @@
                 android:entries="@array/vibration_profile"
                 android:entryValues="@array/vibration_profile_values"
                 android:key="huami_vibration_profile_todo_list"
-                android:title="@string/miband_prefs_vibration"
-                android:summary="%s" />
+                android:summary="%s"
+                android:title="@string/miband_prefs_vibration" />
 
             <EditTextPreference
                 android:defaultValue="2"
                 android:inputType="number"
                 android:key="huami_vibration_count_todo_list"
                 android:maxLength="1"
-                android:title="@string/pref_title_notifications_repetitions" />
+                android:title="@string/pref_title_notifications_repetitions"
+                app:useSimpleSummaryProvider="true" />
 
             <Preference
-                android:persistent="false"
                 android:key="huami_vibration_try_todo_list"
-                android:title="@string/vibration_try"/>
+                android:persistent="false"
+                android:title="@string/vibration_try" />
         </PreferenceScreen>
 
         <PreferenceScreen
-            android:key="vibration_profile_key_schedule"
             android:icon="@drawable/ic_calendar_to"
-            android:title="@string/pref_screen_notification_profile_schedule"
-            android:persistent="false">
+            android:key="vibration_profile_key_schedule"
+            android:persistent="false"
+            android:title="@string/pref_screen_notification_profile_schedule">
 
             <!-- workaround for missing toolbar -->
             <PreferenceCategory android:title="@string/pref_screen_notification_profile_schedule" />
@@ -293,20 +303,21 @@
                 android:entries="@array/vibration_profile"
                 android:entryValues="@array/vibration_profile_values"
                 android:key="huami_vibration_profile_schedule"
-                android:title="@string/miband_prefs_vibration"
-                android:summary="%s" />
+                android:summary="%s"
+                android:title="@string/miband_prefs_vibration" />
 
             <EditTextPreference
                 android:defaultValue="2"
                 android:inputType="number"
                 android:key="huami_vibration_count_schedule"
                 android:maxLength="1"
-                android:title="@string/pref_title_notifications_repetitions" />
+                android:title="@string/pref_title_notifications_repetitions"
+                app:useSimpleSummaryProvider="true" />
 
             <Preference
-                android:persistent="false"
                 android:key="huami_vibration_try_schedule"
-                android:title="@string/vibration_try"/>
+                android:persistent="false"
+                android:title="@string/vibration_try" />
         </PreferenceScreen>
     </PreferenceScreen>
 </androidx.preference.PreferenceScreen>

From f29995b571a9d25205fd172c3497ef567b91bbbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 8 Dec 2023 11:29:20 +0000
Subject: [PATCH 207/595] Zepp OS: Allow disabling app notifications per device

---
 .../devicesettings/DeviceSettingsPreferenceConst.java |  1 +
 .../devices/huami/Huami2021Coordinator.java           |  1 +
 .../zeppos/services/ZeppOsNotificationService.java    | 11 +++++++++++
 app/src/main/res/values/strings.xml                   |  2 ++
 .../res/xml/devicesettings_send_app_notifications.xml |  9 +++++++++
 5 files changed, 24 insertions(+)
 create mode 100644 app/src/main/res/xml/devicesettings_send_app_notifications.xml

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
index 83ed34fbd..219477d8d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
@@ -232,6 +232,7 @@ public class DeviceSettingsPreferenceConst {
 
     public static final String PREF_CASIO_ALERT_SMS = "casio_alert_sms";
     public static final String PREF_AUTOREMOVE_MESSAGE = "autoremove_message";
+    public static final String PREF_SEND_APP_NOTIFICATIONS = "send_app_notifications";
     public static final String PREF_AUTOREMOVE_NOTIFICATIONS = "autoremove_notifications";
     public static final String PREF_SCREEN_ON_ON_NOTIFICATIONS = "screen_on_on_notifications";
     public static final String PREF_WORKOUT_KEEP_SCREEN_ON = "workout_keep_screen_on";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021Coordinator.java
index 33e16abc6..11749462b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021Coordinator.java
@@ -398,6 +398,7 @@ public abstract class Huami2021Coordinator extends HuamiCoordinator {
         settings.add(R.xml.devicesettings_sound_and_vibration);
         settings.add(R.xml.devicesettings_vibrationpatterns);
         settings.add(R.xml.devicesettings_donotdisturb_withauto_and_always);
+        settings.add(R.xml.devicesettings_send_app_notifications);
         settings.add(R.xml.devicesettings_screen_on_on_notifications);
         settings.add(R.xml.devicesettings_autoremove_notifications);
         settings.add(R.xml.devicesettings_canned_reply_16);
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 b0e55b83f..715d7f1dd 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
@@ -31,6 +31,7 @@ import java.nio.charset.StandardCharsets;
 import java.util.Locale;
 
 import nodomain.freeyourgadget.gadgetbridge.BuildConfig;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventCallControl;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventNotificationControl;
 import nodomain.freeyourgadget.gadgetbridge.model.CallSpec;
@@ -215,6 +216,11 @@ public class ZeppOsNotificationService extends AbstractZeppOsService {
     }
 
     public void sendNotification(final NotificationSpec notificationSpec) {
+        if (!getDevicePrefs().getBoolean(DeviceSettingsPreferenceConst.PREF_SEND_APP_NOTIFICATIONS, true)) {
+            LOG.debug("App notifications disabled - ignoring");
+            return;
+        }
+
         final ByteArrayOutputStream baos = new ByteArrayOutputStream();
 
         final String senderOrTitle = StringUtils.getFirstOf(notificationSpec.sender, notificationSpec.title);
@@ -289,6 +295,11 @@ public class ZeppOsNotificationService extends AbstractZeppOsService {
     }
 
     public void deleteNotification(final int id) {
+        if (!getDevicePrefs().getBoolean(DeviceSettingsPreferenceConst.PREF_SEND_APP_NOTIFICATIONS, true)) {
+            LOG.debug("App notifications disabled - ignoring delete");
+            return;
+        }
+
         LOG.info("Deleting notification {} from band", id);
 
         final ByteBuffer buf = ByteBuffer.allocate(12);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index aa93dd155..c43545adc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -348,6 +348,8 @@
     <string name="pref_summary_autoremove_notifications">Notifications are automatically removed from the device when dismissed from the phone</string>
     <string name="pref_title_screen_on_on_notifications">Screen On on Notifications</string>
     <string name="pref_summary_screen_on_on_notifications">Turn on the band\'s screen when a notification arrives</string>
+    <string name="pref_title_send_app_notifications">Send notifications</string>
+    <string name="pref_summary_send_app_notifications">Send app notifications to the device</string>
     <string name="pref_title_pebble_privacy_mode">Privacy mode</string>
     <string name="pref_pebble_privacy_mode_off">Normal notifications</string>
     <string name="pref_pebble_privacy_mode_content">Shift the notification text off-screen</string>
diff --git a/app/src/main/res/xml/devicesettings_send_app_notifications.xml b/app/src/main/res/xml/devicesettings_send_app_notifications.xml
new file mode 100644
index 000000000..e6b5dab84
--- /dev/null
+++ b/app/src/main/res/xml/devicesettings_send_app_notifications.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <SwitchPreferenceCompat
+        android:defaultValue="true"
+        android:icon="@drawable/ic_notifications"
+        android:key="send_app_notifications"
+        android:summary="@string/pref_summary_send_app_notifications"
+        android:title="@string/pref_title_send_app_notifications" />
+</androidx.preference.PreferenceScreen>

From 6479cc3bb0a2283bfbaaf41290da51d27b5200f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 8 Dec 2023 11:39:53 +0000
Subject: [PATCH 208/595] Xiaomi: Allow disabling app notifications per device

---
 .../devices/xiaomi/XiaomiCoordinator.java             |  1 +
 .../xiaomi/services/XiaomiNotificationService.java    | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
index ec5413ed1..a31a237ee 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
@@ -390,6 +390,7 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
         settings.add(R.xml.devicesettings_display_caller);
         settings.add(R.xml.devicesettings_vibrationpatterns);
         settings.add(R.xml.devicesettings_donotdisturb_withauto_and_always);
+        settings.add(R.xml.devicesettings_send_app_notifications);
         settings.add(R.xml.devicesettings_screen_on_on_notifications);
         settings.add(R.xml.devicesettings_autoremove_notifications);
         if (getCannedRepliesSlotCount(device) > 0) {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
index 91da93302..a2da9e080 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
@@ -35,6 +35,7 @@ import java.util.Locale;
 import java.util.Queue;
 
 import nodomain.freeyourgadget.gadgetbridge.BuildConfig;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventCallControl;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventNotificationControl;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdatePreferences;
@@ -117,6 +118,11 @@ public class XiaomiNotificationService extends AbstractXiaomiService implements
     }
 
     public void onNotification(final NotificationSpec notificationSpec) {
+        if (!getDevicePrefs().getBoolean(DeviceSettingsPreferenceConst.PREF_SEND_APP_NOTIFICATIONS, true)) {
+            LOG.debug("App notifications disabled - ignoring");
+            return;
+        }
+
         final XiaomiProto.Notification3.Builder notification3 = XiaomiProto.Notification3.newBuilder()
                 .setId(notificationSpec.getId())
                 .setUnknown4("") // ?
@@ -175,6 +181,11 @@ public class XiaomiNotificationService extends AbstractXiaomiService implements
     }
 
     public void onDeleteNotification(final int id) {
+        if (!getDevicePrefs().getBoolean(DeviceSettingsPreferenceConst.PREF_SEND_APP_NOTIFICATIONS, true)) {
+            LOG.debug("App notifications disabled - ignoring delete");
+            return;
+        }
+
         // TODO
     }
 

From 2b8d8c2cb07858164c8eaa06bdc56e822e1166bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 8 Dec 2023 11:49:47 +0000
Subject: [PATCH 209/595] Xiaomi: Fix dismiss multiple notifications from watch

---
 .../services/XiaomiNotificationService.java      | 16 +++++++++-------
 app/src/main/proto/xiaomi.proto                  |  4 ++--
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
index a2da9e080..b831ced2a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
@@ -87,11 +87,13 @@ public class XiaomiNotificationService extends AbstractXiaomiService implements
 
         switch (cmd.getSubtype()) {
             case CMD_NOTIFICATION_DISMISS:
-                final int dismissNotificationId = cmd.getNotification().getNotification4().getNotificationId().getId();
-                LOG.info("Watch dismiss notification {}", dismissNotificationId);
-                deviceEvtNotificationControl.handle = dismissNotificationId;
-                deviceEvtNotificationControl.event = GBDeviceEventNotificationControl.Event.DISMISS;
-                getSupport().evaluateGBDeviceEvent(deviceEvtNotificationControl);
+                LOG.info("Watch dismiss {} notifications", cmd.getNotification().getNotificationDismiss().getNotificationIdCount());
+                for (final XiaomiProto.NotificationId notificationId : cmd.getNotification().getNotificationDismiss().getNotificationIdList()) {
+                    LOG.debug("Watch dismiss {}", notificationId.getId());
+                    deviceEvtNotificationControl.handle = notificationId.getId();
+                    deviceEvtNotificationControl.event = GBDeviceEventNotificationControl.Event.DISMISS;
+                    getSupport().evaluateGBDeviceEvent(deviceEvtNotificationControl);
+                }
                 return;
             case CMD_CALL_REJECT:
                 LOG.debug("Reject call");
@@ -196,10 +198,10 @@ public class XiaomiNotificationService extends AbstractXiaomiService implements
 
         if (callSpec.command != CallSpec.CALL_INCOMING) {
             final XiaomiProto.NotificationDismiss.Builder notification4 = XiaomiProto.NotificationDismiss.newBuilder()
-                    .setNotificationId(XiaomiProto.NotificationId.newBuilder().setId(0).setPackage("phone"));
+                    .addNotificationId(XiaomiProto.NotificationId.newBuilder().setId(0).setPackage("phone"));
 
             final XiaomiProto.Notification notification = XiaomiProto.Notification.newBuilder()
-                    .setNotification4(notification4)
+                    .setNotificationDismiss(notification4)
                     .build();
 
             getSupport().sendCommand(
diff --git a/app/src/main/proto/xiaomi.proto b/app/src/main/proto/xiaomi.proto
index e3c49081b..b4a769b81 100644
--- a/app/src/main/proto/xiaomi.proto
+++ b/app/src/main/proto/xiaomi.proto
@@ -571,7 +571,7 @@ message MediaKey {
 
 message Notification {
   optional Notification2 notification2 = 3;
-  optional NotificationDismiss notification4 = 4;
+  optional NotificationDismiss notificationDismiss = 4;
 
   optional bool screenOnOnNotifications = 7;
   optional uint32 unknown8 = 8; // 1 on canned replies request?
@@ -605,7 +605,7 @@ message Notification3 {
 }
 
 message NotificationDismiss {
-  optional NotificationId notificationId = 1;
+  repeated NotificationId notificationId = 1;
 }
 
 message NotificationId {

From 6984572d3398c6c4e75f1de1e2dc93e98109bdb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 8 Dec 2023 12:12:35 +0000
Subject: [PATCH 210/595] Xiaomi: Allow notification open on phone

---
 .../externalevents/NotificationListener.java  |   1 +
 .../gadgetbridge/impl/GBDeviceService.java    |   1 +
 .../gadgetbridge/model/DeviceService.java     |   3 +-
 .../gadgetbridge/model/NotificationSpec.java  |   1 +
 .../service/DeviceCommunicationService.java   | 120 +-----------------
 .../services/XiaomiNotificationService.java   |  19 +--
 app/src/main/proto/xiaomi.proto               |   6 +-
 7 files changed, 21 insertions(+), 130 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
index fd794c1f8..389ed4364 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
@@ -354,6 +354,7 @@ public class NotificationListener extends NotificationListenerService {
         }
 
         NotificationSpec notificationSpec = new NotificationSpec();
+        notificationSpec.key = sbn.getKey();
         notificationSpec.when = notification.when;
 
         // determinate Source App Name ("Label")
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceService.java
index dfb3e18a9..a107da02d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceService.java
@@ -176,6 +176,7 @@ public class GBDeviceService implements DeviceService {
                 .putExtra(EXTRA_NOTIFICATION_TITLE, hideMessageDetails ? null : notificationSpec.title)
                 .putExtra(EXTRA_NOTIFICATION_BODY, hideMessageDetails || hideMessageBodyOnly ? null : notificationSpec.body)
                 .putExtra(EXTRA_NOTIFICATION_ID, notificationSpec.getId())
+                .putExtra(EXTRA_NOTIFICATION_KEY, notificationSpec.key)
                 .putExtra(EXTRA_NOTIFICATION_TYPE, notificationSpec.type)
                 .putExtra(EXTRA_NOTIFICATION_ACTIONS, notificationSpec.attachedActions)
                 .putExtra(EXTRA_NOTIFICATION_SOURCENAME, notificationSpec.sourceName)
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceService.java
index 1ac8c8323..0b46b2cab 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceService.java
@@ -18,8 +18,6 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.model;
 
-import androidx.annotation.Nullable;
-
 import nodomain.freeyourgadget.gadgetbridge.devices.EventHandler;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceCommunicationService;
@@ -82,6 +80,7 @@ public interface DeviceService extends EventHandler {
     String EXTRA_NOTIFICATION_BODY = "notification_body";
     String EXTRA_NOTIFICATION_FLAGS = "notification_flags";
     String EXTRA_NOTIFICATION_ID = "notification_id";
+    String EXTRA_NOTIFICATION_KEY = "notification_key";
     String EXTRA_NOTIFICATION_PHONENUMBER = "notification_phonenumber";
     String EXTRA_NOTIFICATION_SENDER = "notification_sender";
     String EXTRA_NOTIFICATION_SOURCENAME = "notification_sourcename";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/NotificationSpec.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/NotificationSpec.java
index b7c1e3a84..b6c9103fa 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/NotificationSpec.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/NotificationSpec.java
@@ -24,6 +24,7 @@ public class NotificationSpec {
     public int flags;
     private static final AtomicInteger c = new AtomicInteger((int) (System.currentTimeMillis()/1000));
     private int id;
+    public String key;
     public long when;
     public String sender;
     public String phoneNumber;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
index fbe8c263c..558aba663 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
@@ -20,6 +20,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service;
 
+import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.*;
+
 import android.Manifest;
 import android.annotation.SuppressLint;
 import android.app.Service;
@@ -98,123 +100,6 @@ import nodomain.freeyourgadget.gadgetbridge.util.language.LanguageUtils;
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 import nodomain.freeyourgadget.gadgetbridge.util.language.Transliterator;
 
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_ADD_CALENDAREVENT;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_APP_CONFIGURE;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_APP_REORDER;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_CALLSTATE;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_CONNECT;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_DELETEAPP;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_DELETE_CALENDAREVENT;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_DELETE_NOTIFICATION;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_DISCONNECT;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_ENABLE_HEARTRATE_SLEEP_SUPPORT;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_ENABLE_REALTIME_HEARTRATE_MEASUREMENT;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_ENABLE_REALTIME_STEPS;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_FETCH_RECORDED_DATA;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_FIND_DEVICE;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_HEARTRATE_TEST;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_INSTALL;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_NOTIFICATION;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_PHONE_FOUND;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_POWER_OFF;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_READ_CONFIGURATION;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_REQUEST_APPINFO;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_REQUEST_DEVICEINFO;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_REQUEST_SCREENSHOT;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_RESET;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_SEND_CONFIGURATION;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_SEND_WEATHER;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_SETCANNEDMESSAGES;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_SETMUSICINFO;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_SETMUSICSTATE;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_SETNAVIGATIONINFO;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_SETTIME;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_SET_ALARMS;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_SET_CONSTANT_VIBRATION;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_SET_CONTACTS;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_SET_FM_FREQUENCY;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_SET_HEARTRATE_MEASUREMENT_INTERVAL;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_SET_GPS_LOCATION;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_SET_LED_COLOR;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_SET_LOYALTY_CARDS;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_SET_PHONE_VOLUME;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_SET_REMINDERS;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_SET_WORLD_CLOCKS;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_START;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_STARTAPP;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_DOWNLOADAPP;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_TEST_NEW_FUNCTION;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_ALARMS;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_APP_CONFIG;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_APP_CONFIG_ID;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_APP_START;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_APP_UUID;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_BOOLEAN_ENABLE;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_CALENDAREVENT_DESCRIPTION;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_CALENDAREVENT_DURATION;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_CALENDAREVENT_ID;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_CALENDAREVENT_LOCATION;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_CALENDAREVENT_TIMESTAMP;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_CALENDAREVENT_ALLDAY;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_CALENDAREVENT_TITLE;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_CALENDAREVENT_TYPE;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_CALENDAREVENT_CALNAME;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_CALENDAREVENT_COLOR;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_CALL_COMMAND;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_CALL_DISPLAYNAME;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_CALL_SOURCENAME;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_CALL_SOURCEAPPID;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_CALL_DNDSUPPRESSED;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_CALL_PHONENUMBER;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_CANNEDMESSAGES;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_CANNEDMESSAGES_TYPE;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_CONFIG;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_CONNECT_FIRST_TIME;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_CONTACTS;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_FIND_START;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_FM_FREQUENCY;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_GPS_LOCATION;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_INTERVAL_SECONDS;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_LED_COLOR;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_LOYALTY_CARDS;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_MUSIC_ALBUM;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_MUSIC_ARTIST;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_MUSIC_DURATION;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_MUSIC_POSITION;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_MUSIC_RATE;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_MUSIC_REPEAT;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_MUSIC_SHUFFLE;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_MUSIC_STATE;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_MUSIC_TRACK;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_MUSIC_TRACKCOUNT;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_MUSIC_TRACKNR;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_NAVIGATION_DISTANCE_TO_TURN;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_NAVIGATION_INSTRUCTION;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_NAVIGATION_NEXT_ACTION;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_NAVIGATION_ETA;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_NOTIFICATION_ACTIONS;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_NOTIFICATION_BODY;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_NOTIFICATION_DNDSUPPRESSED;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_NOTIFICATION_FLAGS;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_NOTIFICATION_ICONID;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_NOTIFICATION_ID;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_NOTIFICATION_PEBBLE_COLOR;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_NOTIFICATION_PHONENUMBER;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_NOTIFICATION_SENDER;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_NOTIFICATION_SOURCEAPPID;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_NOTIFICATION_SOURCENAME;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_NOTIFICATION_SUBJECT;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_NOTIFICATION_TITLE;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_NOTIFICATION_TYPE;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_PHONE_VOLUME;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_RECORDED_DATA_TYPES;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_REMINDERS;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_RESET_FLAGS;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_URI;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_VIBRATION_INTENSITY;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_WEATHER;
-import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_WORLD_CLOCKS;
-
 public class DeviceCommunicationService extends Service implements SharedPreferences.OnSharedPreferenceChangeListener {
     public static class DeviceStruct{
         private GBDevice device;
@@ -757,6 +642,7 @@ public class DeviceCommunicationService extends Service implements SharedPrefere
                 notificationSpec.sender = intent.getStringExtra(EXTRA_NOTIFICATION_SENDER);
                 notificationSpec.subject = intent.getStringExtra(EXTRA_NOTIFICATION_SUBJECT);
                 notificationSpec.title = intent.getStringExtra(EXTRA_NOTIFICATION_TITLE);
+                notificationSpec.key = intent.getStringExtra(EXTRA_NOTIFICATION_KEY);
                 notificationSpec.body = intent.getStringExtra(EXTRA_NOTIFICATION_BODY);
                 notificationSpec.sourceName = intent.getStringExtra(EXTRA_NOTIFICATION_SOURCENAME);
                 notificationSpec.type = (NotificationType) intent.getSerializableExtra(EXTRA_NOTIFICATION_TYPE);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
index b831ced2a..bddc0a051 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
@@ -60,6 +60,7 @@ public class XiaomiNotificationService extends AbstractXiaomiService implements
     public static final int CMD_NOTIFICATION_DISMISS = 1;
     public static final int CMD_CALL_REJECT = 2;
     public static final int CMD_CALL_IGNORE = 5;
+    public static final int CMD_OPEN_ON_PHONE = 8;
     public static final int CMD_CANNED_MESSAGES_GET = 9;
     public static final int CMD_CANNED_MESSAGES_SET = 12; // also canned message reply
     public static final int CMD_NOTIFICATION_ICON_REQUEST = 15;
@@ -105,6 +106,11 @@ public class XiaomiNotificationService extends AbstractXiaomiService implements
                 deviceEvtCallControl.event = GBDeviceEventCallControl.Event.IGNORE;
                 getSupport().evaluateGBDeviceEvent(deviceEvtCallControl);
                 return;
+            case CMD_OPEN_ON_PHONE:
+                LOG.debug("Open on phone {}", cmd.getNotification().getOpenOnPhone().getId());
+                deviceEvtNotificationControl.handle = cmd.getNotification().getOpenOnPhone().getId();
+                deviceEvtNotificationControl.event = GBDeviceEventNotificationControl.Event.OPEN;
+                getSupport().evaluateGBDeviceEvent(deviceEvtNotificationControl);
             case CMD_CANNED_MESSAGES_GET:
                 handleCannedMessages(cmd.getNotification().getCannedMessages());
                 return;
@@ -154,15 +160,10 @@ public class XiaomiNotificationService extends AbstractXiaomiService implements
             notification3.setAppName(notificationSpec.sourceName);
         }
 
-        // TODO Open on phone
-        //final String unknown12 = String.format(
-        //        Locale.ROOT,
-        //        "0|%s|%d|null|12345",
-        //        notification3.getPackage(),
-        //        notification3.getId() // i think this needs to be converted to unsigned
-        //);
-        //notification3.setUnknown12(unknown12);
-        //notification3.setOpenOnPhone(1);
+        if (notificationSpec.key != null) {
+            notification3.setKey(notificationSpec.key);
+            notification3.setOpenOnPhone(true);
+        }
 
         final XiaomiProto.Notification2 notification2 = XiaomiProto.Notification2.newBuilder()
                 .setNotification3(notification3)
diff --git a/app/src/main/proto/xiaomi.proto b/app/src/main/proto/xiaomi.proto
index b4a769b81..eaaad8d05 100644
--- a/app/src/main/proto/xiaomi.proto
+++ b/app/src/main/proto/xiaomi.proto
@@ -570,6 +570,8 @@ message MediaKey {
 //
 
 message Notification {
+  // 7, 8
+  optional NotificationId openOnPhone = 2;
   optional Notification2 notification2 = 3;
   optional NotificationDismiss notificationDismiss = 4;
 
@@ -600,8 +602,8 @@ message Notification3 {
   optional uint32 id = 7;
   optional bool isCall = 8;
   optional bool repliesAllowed = 11; // only for calls?
-  optional string unknown12 = 12; // "0|<package>|<id 2 complement>|null|12345"
-  optional uint32 openOnPhone = 13; // 1 to show "Open on phone", needs unknown12
+  optional string key = 12; // "0|<package>|<id 2 complement>|null|12345"
+  optional bool openOnPhone = 13; // 1 to show "Open on phone", needs key
 }
 
 message NotificationDismiss {

From 961e9f1bf9e0a40d4e1a664ec1aeb4ef5b882b42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 8 Dec 2023 18:53:11 +0000
Subject: [PATCH 211/595] Xiaomi: Fix sleep schedule preference

---
 .../services/XiaomiScheduleService.java       | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java
index 6b8266fec..79fe583ba 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java
@@ -105,7 +105,7 @@ public class XiaomiScheduleService extends AbstractXiaomiService {
         switch (cmd.getSubtype()) {
             case CMD_ALARMS_GET:
                 handleAlarms(cmd.getSchedule().getAlarms());
-                break;
+                return;
             case CMD_ALARMS_CREATE:
                 pendingAlarmAcks--;
                 LOG.debug("Got alarms create ack, remaining {}", pendingAlarmAcks);
@@ -113,16 +113,19 @@ public class XiaomiScheduleService extends AbstractXiaomiService {
                     LOG.debug("Requesting alarms after all acks");
                     requestAlarms();
                 }
-                break;
+                return;
+            case CMD_SLEEP_MODE_SET:
+                LOG.debug("Got sleep mode set ack, status={}", cmd.getStatus());
+                return;
             case CMD_WORLD_CLOCKS_GET:
                 handleWorldClocks(cmd.getSchedule().getWorldClocks());
-                break;
+                return;
             case CMD_SLEEP_MODE_GET:
                 handleSleepModeConfig(cmd.getSchedule().getSleepMode());
-                break;
+                return;
             case CMD_REMINDERS_GET:
                 handleReminders(cmd.getSchedule().getReminders());
-                break;
+                return;
             case CMD_REMINDERS_CREATE:
                 pendingReminderAcks--;
                 LOG.debug("Got alarms create ack, remaining {}", pendingReminderAcks);
@@ -130,7 +133,7 @@ public class XiaomiScheduleService extends AbstractXiaomiService {
                     LOG.debug("Requesting reminders after all acks");
                     requestReminders();
                 }
-                break;
+                return;
         }
 
         LOG.warn("Unknown schedule command {}", cmd.getSubtype());
@@ -147,9 +150,9 @@ public class XiaomiScheduleService extends AbstractXiaomiService {
     @Override
     public boolean onSendConfiguration(final String config, final Prefs prefs) {
         switch (config) {
-            case DeviceSettingsPreferenceConst.PREF_SLEEP_TIME:
-            case DeviceSettingsPreferenceConst.PREF_SLEEP_TIME_START:
-            case DeviceSettingsPreferenceConst.PREF_SLEEP_TIME_END:
+            case DeviceSettingsPreferenceConst.PREF_SLEEP_MODE_SCHEDULE_ENABLED:
+            case DeviceSettingsPreferenceConst.PREF_SLEEP_MODE_SCHEDULE_START:
+            case DeviceSettingsPreferenceConst.PREF_SLEEP_MODE_SCHEDULE_END:
                 setSleepModeConfig();
                 return true;
         }

From 2063bc2dfdebf7aa0eeaa4d9f84a1133560ace64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 8 Dec 2023 18:53:22 +0000
Subject: [PATCH 212/595] Xiaomi: Remove not-implemented preferences

---
 .../devices/xiaomi/XiaomiCoordinator.java     | 49 +++----------------
 1 file changed, 6 insertions(+), 43 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
index a31a237ee..a6ab4d597 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
@@ -348,14 +348,11 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
     public int[] getSupportedDeviceSpecificSettings(final GBDevice device) {
         final List<Integer> settings = new ArrayList<>();
 
-        // TODO review this
-
         //
         // Time
         //
         settings.add(R.xml.devicesettings_header_time);
         settings.add(R.xml.devicesettings_timeformat);
-        settings.add(R.xml.devicesettings_dateformat_2);
         if (getWorldClocksSlotCount() > 0) {
             settings.add(R.xml.devicesettings_world_clocks);
         }
@@ -374,7 +371,7 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
         settings.add(R.xml.devicesettings_heartrate_sleep_alert_activity_stress_spo2);
         settings.add(R.xml.devicesettings_inactivity_dnd_no_threshold);
         settings.add(R.xml.devicesettings_sleep_mode_schedule);
-        settings.add(R.xml.devicesettings_goal_notification);
+        // TODO not implemented settings.add(R.xml.devicesettings_goal_notification);
 
         //
         // Workout
@@ -387,12 +384,12 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
         // Notifications
         //
         settings.add(R.xml.devicesettings_header_notifications);
-        settings.add(R.xml.devicesettings_display_caller);
-        settings.add(R.xml.devicesettings_vibrationpatterns);
-        settings.add(R.xml.devicesettings_donotdisturb_withauto_and_always);
+        // TODO not implemented settings.add(R.xml.devicesettings_display_caller);
+        // TODO not implemented settings.add(R.xml.devicesettings_vibrationpatterns);
+        // TODO not implemented settings.add(R.xml.devicesettings_donotdisturb_withauto_and_always);
         settings.add(R.xml.devicesettings_send_app_notifications);
-        settings.add(R.xml.devicesettings_screen_on_on_notifications);
-        settings.add(R.xml.devicesettings_autoremove_notifications);
+        // TODO not implemented settings.add(R.xml.devicesettings_screen_on_on_notifications);
+        // TODO not implemented settings.add(R.xml.devicesettings_autoremove_notifications);
         if (getCannedRepliesSlotCount(device) > 0) {
             settings.add(R.xml.devicesettings_canned_dismisscall_16);
         }
@@ -483,40 +480,6 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
         );
     }
 
-    @Override
-    public boolean supportsNotificationVibrationPatterns() {
-        // TODO maybe can use this
-        return true;
-    }
-
-    @Override
-    public boolean supportsNotificationVibrationRepetitionPatterns() {
-        // TODO maybe can use this
-        return true;
-    }
-
-    @Override
-    public boolean supportsNotificationLedPatterns() {
-        return false;
-    }
-
-    @Override
-    public AbstractNotificationPattern[] getNotificationVibrationPatterns() {
-        // TODO maybe can use this
-        return new AbstractNotificationPattern[0];
-    }
-
-    @Override
-    public AbstractNotificationPattern[] getNotificationVibrationRepetitionPatterns() {
-        // TODO maybe can use this
-        return new AbstractNotificationPattern[0];
-    }
-
-    @Override
-    public AbstractNotificationPattern[] getNotificationLedPatterns() {
-        return new AbstractNotificationPattern[0];
-    }
-
     protected static Prefs getPrefs(final GBDevice device) {
         return new Prefs(GBApplication.getDeviceSpecificSharedPrefs(device.getAddress()));
     }

From 2ff92c73f88fbea47d0ba30840d97e15ad8082fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 8 Dec 2023 20:55:58 +0000
Subject: [PATCH 213/595] Xiaomi: Re-enable screen on on notifications
 preference

- Disabled by accident on 2063bc2df
- Move preference to XiaomiNotificationService
- Get preference value on connection
---
 .../devices/xiaomi/XiaomiCoordinator.java     |  2 +-
 .../services/XiaomiNotificationService.java   | 41 +++++++++++++++++++
 .../xiaomi/services/XiaomiSystemService.java  | 21 ----------
 3 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
index a6ab4d597..d12eb45c4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
@@ -388,7 +388,7 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
         // TODO not implemented settings.add(R.xml.devicesettings_vibrationpatterns);
         // TODO not implemented settings.add(R.xml.devicesettings_donotdisturb_withauto_and_always);
         settings.add(R.xml.devicesettings_send_app_notifications);
-        // TODO not implemented settings.add(R.xml.devicesettings_screen_on_on_notifications);
+        settings.add(R.xml.devicesettings_screen_on_on_notifications);
         // TODO not implemented settings.add(R.xml.devicesettings_autoremove_notifications);
         if (getCannedRepliesSlotCount(device) > 0) {
             settings.add(R.xml.devicesettings_canned_dismisscall_16);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
index bddc0a051..a538bc89f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
@@ -47,6 +47,7 @@ import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiPrefere
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
 import nodomain.freeyourgadget.gadgetbridge.util.BitmapUtil;
 import nodomain.freeyourgadget.gadgetbridge.util.NotificationUtils;
+import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 import nodomain.freeyourgadget.gadgetbridge.util.StringUtils;
 
 public class XiaomiNotificationService extends AbstractXiaomiService implements XiaomiDataUploadService.Callback {
@@ -60,6 +61,8 @@ public class XiaomiNotificationService extends AbstractXiaomiService implements
     public static final int CMD_NOTIFICATION_DISMISS = 1;
     public static final int CMD_CALL_REJECT = 2;
     public static final int CMD_CALL_IGNORE = 5;
+    public static final int CMD_SCREEN_ON_ON_NOTIFICATIONS_GET = 6;
+    public static final int CMD_SCREEN_ON_ON_NOTIFICATIONS_SET = 7;
     public static final int CMD_OPEN_ON_PHONE = 8;
     public static final int CMD_CANNED_MESSAGES_GET = 9;
     public static final int CMD_CANNED_MESSAGES_SET = 12; // also canned message reply
@@ -78,6 +81,7 @@ public class XiaomiNotificationService extends AbstractXiaomiService implements
 
     @Override
     public void initialize() {
+        getSupport().sendCommand("get screen on on notifications", COMMAND_TYPE, CMD_SCREEN_ON_ON_NOTIFICATIONS_GET);
         requestCannedMessages();
     }
 
@@ -106,6 +110,15 @@ public class XiaomiNotificationService extends AbstractXiaomiService implements
                 deviceEvtCallControl.event = GBDeviceEventCallControl.Event.IGNORE;
                 getSupport().evaluateGBDeviceEvent(deviceEvtCallControl);
                 return;
+            case CMD_SCREEN_ON_ON_NOTIFICATIONS_GET:
+                final boolean screenOnOnNotifications = cmd.getNotification().getScreenOnOnNotifications();
+                LOG.debug("Got screen on on notifications: {}", screenOnOnNotifications);
+                final GBDeviceEventUpdatePreferences eventUpdatePreferences = new GBDeviceEventUpdatePreferences(
+                        DeviceSettingsPreferenceConst.PREF_SCREEN_ON_ON_NOTIFICATIONS,
+                        screenOnOnNotifications
+                );
+                getSupport().evaluateGBDeviceEvent(eventUpdatePreferences);
+                return;
             case CMD_OPEN_ON_PHONE:
                 LOG.debug("Open on phone {}", cmd.getNotification().getOpenOnPhone().getId());
                 deviceEvtNotificationControl.handle = cmd.getNotification().getOpenOnPhone().getId();
@@ -125,6 +138,17 @@ public class XiaomiNotificationService extends AbstractXiaomiService implements
         LOG.warn("Unhandled notification command {}", cmd.getSubtype());
     }
 
+    @Override
+    public boolean onSendConfiguration(final String config, final Prefs prefs) {
+        switch (config) {
+            case DeviceSettingsPreferenceConst.PREF_SCREEN_ON_ON_NOTIFICATIONS:
+                setScreenOnOnNotifications();
+                return true;
+        }
+
+        return super.onSendConfiguration(config, prefs);
+    }
+
     public void onNotification(final NotificationSpec notificationSpec) {
         if (!getDevicePrefs().getBoolean(DeviceSettingsPreferenceConst.PREF_SEND_APP_NOTIFICATIONS, true)) {
             LOG.debug("App notifications disabled - ignoring");
@@ -257,6 +281,23 @@ public class XiaomiNotificationService extends AbstractXiaomiService implements
         );
     }
 
+    private void setScreenOnOnNotifications() {
+        final Prefs prefs = getDevicePrefs();
+
+        final boolean screenOnOnNotificationsEnabled = prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_SCREEN_ON_ON_NOTIFICATIONS, true);
+
+        LOG.info("Setting screen on on notification: {}", screenOnOnNotificationsEnabled);
+
+        getSupport().sendCommand(
+                "set screen on on notification",
+                XiaomiProto.Command.newBuilder()
+                        .setType(COMMAND_TYPE)
+                        .setSubtype(CMD_SCREEN_ON_ON_NOTIFICATIONS_SET)
+                        .setNotification(XiaomiProto.Notification.newBuilder().setScreenOnOnNotifications(screenOnOnNotificationsEnabled).build())
+                        .build()
+        );
+    }
+
     public void onSetCannedMessages(final CannedMessagesSpec cannedMessagesSpec) {
         if (cannedMessagesSpec.type != CannedMessagesSpec.TYPE_REJECTEDCALLS) {
             LOG.warn("Got unsupported canned messages type: {}", cannedMessagesSpec.type);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
index 313d84165..446f9f86e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
@@ -67,7 +67,6 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
     public static final int CMD_CLOCK = 3;
     public static final int CMD_FIRMWARE_INSTALL = 5;
     public static final int CMD_LANGUAGE = 6;
-    public static final int CMD_SCREEN_ON_ON_NOTIFICAIONS = 7;
     public static final int CMD_PASSWORD_GET = 9;
     public static final int CMD_FIND_PHONE = 17;
     public static final int CMD_FIND_WATCH = 18;
@@ -160,9 +159,6 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
             case HuamiConst.PREF_DISPLAY_ITEMS_SORTABLE:
                 setDisplayItems();
                 return true;
-            case DeviceSettingsPreferenceConst.PREF_SCREEN_ON_ON_NOTIFICATIONS:
-                setScreenOnOnNotifications();
-                return true;
         }
 
         return super.onSendConfiguration(config, prefs);
@@ -306,23 +302,6 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
         );
     }
 
-    private void setScreenOnOnNotifications() {
-        final Prefs prefs = getDevicePrefs();
-
-        final boolean screenOnOnNotificationsEnabled = prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_SCREEN_ON_ON_NOTIFICATIONS, true);
-
-        LOG.info("Setting screen on on notification: {}", screenOnOnNotificationsEnabled);
-
-        getSupport().sendCommand(
-                "set password",
-                XiaomiProto.Command.newBuilder()
-                        .setType(CMD_SCREEN_ON_ON_NOTIFICAIONS) // Why? Would also expect COMMAND_TYPE here
-                        .setSubtype(CMD_SCREEN_ON_ON_NOTIFICAIONS)
-                        .setNotification(XiaomiProto.Notification.newBuilder().setScreenOnOnNotifications(screenOnOnNotificationsEnabled).build())
-                        .build()
-        );
-    }
-
     private void handlePassword(final XiaomiProto.Password password) {
         LOG.debug("Got device password");
         final GBDeviceEventUpdatePreferences eventUpdatePreferences = new GBDeviceEventUpdatePreferences(

From 435d41aca0d76f7575f7eec1004026a8e705b597 Mon Sep 17 00:00:00 2001
From: MrYoranimo <yvulker@gmail.com>
Date: Thu, 7 Dec 2023 01:50:14 +0100
Subject: [PATCH 214/595] Huami/Xiaomi: centralize handling of device state
 events

Gadgetbridge can be configured to perform an action when a
Huami device is taken off or the user was detected to fall asleep or
wake up. This functionality was specific to Huami devices, but this
changeset moves this upstream to the AbstractDeviceSupport class in
combination with new GBDeviceEvents.

Now that the ADS has centralized support for this functionality, the
same logic can be used for other devices. In this case, an
implementation is added for supported Xiaomi devices.
---
 .../DeviceSettingsPreferenceConst.java        |   8 +
 .../DeviceSpecificSettingsFragment.java       |  16 +-
 .../GBDeviceEventSleepStateDetection.java     |  30 +++
 .../deviceevents/GBDeviceEventWearState.java  |  30 +++
 .../devices/huami/HuamiConst.java             |   9 -
 .../devices/xiaomi/XiaomiCoordinator.java     |   7 +
 .../XiaomiWatchS1ActiveCoordinator.java       |   5 +
 .../gadgetbridge/model/SleepState.java        |  23 ++
 .../gadgetbridge/model/WearingState.java      |  23 ++
 .../service/AbstractDeviceSupport.java        | 141 +++++++++++-
 .../service/DeviceCommunicationService.java   |   4 +-
 .../service/devices/huami/HuamiSupport.java   |  95 +++-----
 .../xiaomi/services/XiaomiSystemService.java  | 216 +++++++++++++++---
 app/src/main/proto/xiaomi.proto               |  11 +
 14 files changed, 504 insertions(+), 114 deletions(-)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventSleepStateDetection.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventWearState.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/SleepState.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/WearingState.java

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
index 219477d8d..d3fa9df2a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
@@ -382,4 +382,12 @@ public class DeviceSettingsPreferenceConst {
     public static final String PREF_FEMOMETER_MEASUREMENT_MODE = "femometer_measurement_mode";
 
     public static final String PREF_PREFIX_NOTIFICATION_WITH_APP = "pref_prefix_notification_with_app";
+    public static final String PREF_DEVICE_ACTION_SELECTION_OFF = "UNKNOWN";
+    public static final String PREF_DEVICE_ACTION_SELECTION_BROADCAST = "BROADCAST";
+    public static final String PREF_DEVICE_ACTION_FELL_SLEEP_SELECTION = "events_forwarding_fellsleep_action_selection";
+    public static final String PREF_DEVICE_ACTION_FELL_SLEEP_BROADCAST = "prefs_events_forwarding_fellsleep_broadcast";
+    public static final String PREF_DEVICE_ACTION_WOKE_UP_SELECTION = "events_forwarding_wokeup_action_selection";
+    public static final String PREF_DEVICE_ACTION_WOKE_UP_BROADCAST = "prefs_events_forwarding_wokeup_broadcast";
+    public static final String PREF_DEVICE_ACTION_START_NON_WEAR_SELECTION = "events_forwarding_startnonwear_action_selection";
+    public static final String PREF_DEVICE_ACTION_START_NON_WEAR_BROADCAST = "prefs_events_forwarding_startnonwear_broadcast";
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
index 849367934..738e4bd77 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
@@ -59,14 +59,14 @@ import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.*;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_CONTROL_CENTER_SORTABLE;
-import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_DEVICE_ACTION_FELL_SLEEP_BROADCAST;
-import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_DEVICE_ACTION_FELL_SLEEP_SELECTION;
-import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_DEVICE_ACTION_SELECTION_BROADCAST;
-import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_DEVICE_ACTION_SELECTION_OFF;
-import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_DEVICE_ACTION_START_NON_WEAR_BROADCAST;
-import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_DEVICE_ACTION_START_NON_WEAR_SELECTION;
-import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_DEVICE_ACTION_WOKE_UP_BROADCAST;
-import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_DEVICE_ACTION_WOKE_UP_SELECTION;
+import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_DEVICE_ACTION_FELL_SLEEP_BROADCAST;
+import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_DEVICE_ACTION_FELL_SLEEP_SELECTION;
+import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_DEVICE_ACTION_SELECTION_BROADCAST;
+import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_DEVICE_ACTION_SELECTION_OFF;
+import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_DEVICE_ACTION_START_NON_WEAR_BROADCAST;
+import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_DEVICE_ACTION_START_NON_WEAR_SELECTION;
+import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_DEVICE_ACTION_WOKE_UP_BROADCAST;
+import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_DEVICE_ACTION_WOKE_UP_SELECTION;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_DISPLAY_ITEMS;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_DISPLAY_ITEMS_SORTABLE;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_EXPOSE_HR_THIRDPARTY;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventSleepStateDetection.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventSleepStateDetection.java
new file mode 100644
index 000000000..419916725
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventSleepStateDetection.java
@@ -0,0 +1,30 @@
+/*  Copyright (C) 2023 Yoran Vulker
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.deviceevents;
+
+import java.util.Locale;
+
+import nodomain.freeyourgadget.gadgetbridge.model.SleepState;
+
+public class GBDeviceEventSleepStateDetection extends GBDeviceEvent {
+    public SleepState sleepState;
+
+    @Override
+    public String toString() {
+        return super.toString() + String.format(Locale.ROOT, "sleepState=%s", sleepState);
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventWearState.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventWearState.java
new file mode 100644
index 000000000..3c913b6b1
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventWearState.java
@@ -0,0 +1,30 @@
+/*  Copyright (C) 2023 Yoran Vulker
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.deviceevents;
+
+import java.util.Locale;
+
+import nodomain.freeyourgadget.gadgetbridge.model.WearingState;
+
+public class GBDeviceEventWearState extends GBDeviceEvent {
+    public WearingState wearingState = WearingState.UNKNOWN;
+
+    @Override
+    public String toString() {
+        return super.toString() + String.format(Locale.ROOT, "wearingState=%s", wearingState);
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiConst.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiConst.java
index 67395288c..fbec4d016 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiConst.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiConst.java
@@ -98,15 +98,6 @@ public class HuamiConst {
     public static final String PREF_BUTTON_ACTION_SELECTION_FITNESS_APP_STOP = "FITNESS_CONTROL_STOP";
     public static final String PREF_BUTTON_ACTION_SELECTION_FITNESS_APP_TOGGLE = "FITNESS_CONTROL_TOGGLE";
 
-    public static final String PREF_DEVICE_ACTION_SELECTION_OFF = "UNKNOWN";
-    public static final String PREF_DEVICE_ACTION_SELECTION_BROADCAST = "BROADCAST";
-    public static final String PREF_DEVICE_ACTION_FELL_SLEEP_SELECTION = "events_forwarding_fellsleep_action_selection";
-    public static final String PREF_DEVICE_ACTION_FELL_SLEEP_BROADCAST = "prefs_events_forwarding_fellsleep_broadcast";
-    public static final String PREF_DEVICE_ACTION_WOKE_UP_SELECTION = "events_forwarding_wokeup_action_selection";
-    public static final String PREF_DEVICE_ACTION_WOKE_UP_BROADCAST = "prefs_events_forwarding_wokeup_broadcast";
-    public static final String PREF_DEVICE_ACTION_START_NON_WEAR_SELECTION = "events_forwarding_startnonwear_action_selection";
-    public static final String PREF_DEVICE_ACTION_START_NON_WEAR_BROADCAST = "prefs_events_forwarding_startnonwear_broadcast";
-
     /**
      * The suffixes match the enum {@link nodomain.freeyourgadget.gadgetbridge.service.devices.huami.HuamiVibrationPatternNotificationType}.
      */
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
index d12eb45c4..c9a2a275b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
@@ -410,6 +410,9 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
             settings.add(R.xml.devicesettings_contacts);
         }
         settings.add(R.xml.devicesettings_camera_remote);
+        if (supportsWearingAndSleepingDataThroughDeviceState()) {
+            settings.add(R.xml.devicesettings_device_actions);
+        }
 
         //
         // Developer
@@ -487,4 +490,8 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
     public boolean supportsMultipleWeatherLocations() {
         return false;
     }
+
+    public boolean supportsWearingAndSleepingDataThroughDeviceState() {
+        return false;
+    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs1active/XiaomiWatchS1ActiveCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs1active/XiaomiWatchS1ActiveCoordinator.java
index 3ed43f298..76a957d61 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs1active/XiaomiWatchS1ActiveCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs1active/XiaomiWatchS1ActiveCoordinator.java
@@ -67,4 +67,9 @@ public class XiaomiWatchS1ActiveCoordinator extends XiaomiCoordinator {
     public boolean supportsMultipleWeatherLocations() {
         return true;
     }
+
+    @Override
+    public boolean supportsWearingAndSleepingDataThroughDeviceState() {
+        return true;
+    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/SleepState.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/SleepState.java
new file mode 100644
index 000000000..65a02ca1f
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/SleepState.java
@@ -0,0 +1,23 @@
+/*  Copyright (C) 2023 Yoran Vulker
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.model;
+
+public enum SleepState {
+    UNKNOWN,
+    ASLEEP,
+    AWAKE,
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/WearingState.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/WearingState.java
new file mode 100644
index 000000000..17217212c
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/WearingState.java
@@ -0,0 +1,23 @@
+/*  Copyright (C) 2023 Yoran Vulker
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.model;
+
+public enum WearingState {
+    UNKNOWN,
+    WEARING,
+    NOT_WEARING,
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java
index 78b1c1d87..8a140d689 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java
@@ -1,6 +1,6 @@
-/*  Copyright (C) 2015-2021 Andreas Böhler, Andreas Shimokawa, Carsten
+/*  Copyright (C) 2015-2023 Andreas Böhler, Andreas Shimokawa, Carsten
     Pfeiffer, Daniele Gobbetti, José Rebelo, Pauli Salmenrinne, Sebastian Kranz,
-    Taavi Eomäe
+    Taavi Eomäe, Yoran Vulker
 
     This file is part of Gadgetbridge.
 
@@ -56,6 +56,7 @@ import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.activities.FindPhoneActivity;
 import nodomain.freeyourgadget.gadgetbridge.activities.appmanager.AbstractAppManagerFragment;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
 import nodomain.freeyourgadget.gadgetbridge.capabilities.loyaltycards.LoyaltyCard;
 import nodomain.freeyourgadget.gadgetbridge.database.DBAccess;
 import nodomain.freeyourgadget.gadgetbridge.database.DBHandler;
@@ -67,6 +68,7 @@ import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventCallContro
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventDisplayMessage;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventFindPhone;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventFmFrequency;
+import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventSleepStateDetection;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdateDeviceInfo;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventLEDColor;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventMusicControl;
@@ -75,10 +77,12 @@ import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdateDevi
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdatePreferences;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventScreenshot;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventVersionInfo;
+import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventWearState;
 import nodomain.freeyourgadget.gadgetbridge.entities.BatteryLevel;
 import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.externalevents.NotificationListener;
+import nodomain.freeyourgadget.gadgetbridge.externalevents.opentracks.OpenTracksController;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.model.Alarm;
 import nodomain.freeyourgadget.gadgetbridge.model.BatteryState;
@@ -90,6 +94,8 @@ import nodomain.freeyourgadget.gadgetbridge.model.MusicSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.MusicStateSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.NotificationSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.Reminder;
+import nodomain.freeyourgadget.gadgetbridge.model.SleepState;
+import nodomain.freeyourgadget.gadgetbridge.model.WearingState;
 import nodomain.freeyourgadget.gadgetbridge.model.WeatherSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.WorldClock;
 import nodomain.freeyourgadget.gadgetbridge.model.NavigationInfoSpec;
@@ -208,6 +214,10 @@ public abstract class AbstractDeviceSupport implements DeviceSupport {
             handleGBDeviceEvent((GBDeviceEventUpdateDeviceState) deviceEvent);
         } else if (deviceEvent instanceof GBDeviceEventFmFrequency) {
             handleGBDeviceEvent((GBDeviceEventFmFrequency) deviceEvent);
+        } else if (deviceEvent instanceof GBDeviceEventWearState) {
+            handleGBDeviceEvent((GBDeviceEventWearState) deviceEvent);
+        } else if (deviceEvent instanceof GBDeviceEventSleepStateDetection) {
+            handleGBDeviceEvent((GBDeviceEventSleepStateDetection) deviceEvent);
         }
     }
 
@@ -521,6 +531,133 @@ public abstract class AbstractDeviceSupport implements DeviceSupport {
         gbDevice.sendDeviceUpdateIntent(context);
     }
 
+    /**
+     * Helper method to run specific actions configured in the device preferences, upon wear state
+     * or awake/asleep events.
+     *
+     * @param action
+     * @param message
+     */
+    private void handleDeviceAction(String action, String message) {
+        String actionDisabled = getContext().getString(R.string.pref_button_action_disabled_value);
+
+        if (actionDisabled.equals(action)) {
+            return;
+        }
+
+        final String actionBroadcast = getContext().getString(R.string.pref_device_action_broadcast_value);
+        final String actionFitnessControlStart = getContext().getString(R.string.pref_device_action_fitness_app_control_start_value);
+        final String actionFitnessControlStop = getContext().getString(R.string.pref_device_action_fitness_app_control_stop_value);
+        final String actionFitnessControlToggle = getContext().getString(R.string.pref_device_action_fitness_app_control_toggle_value);
+        final String actionMediaPlay = getContext().getString(R.string.pref_media_play_value);
+        final String actionMediaPause = getContext().getString(R.string.pref_media_pause_value);
+        final String actionMediaPlayPause = getContext().getString(R.string.pref_media_playpause_value);
+
+        if (actionBroadcast.equals(action)) {
+            if (message != null) {
+                Intent in = new Intent();
+                in.setAction(message);
+                LOG.info("Sending broadcast " + message);
+                getContext().getApplicationContext().sendBroadcast(in);
+                return;
+            }
+        }
+
+        if (actionFitnessControlStart.equals(action)) {
+            OpenTracksController.startRecording(getContext());
+            return;
+        }
+
+        if (actionFitnessControlStop.equals(action)) {
+            OpenTracksController.stopRecording(getContext());
+            return;
+        }
+
+        if (actionFitnessControlToggle.equals(action)) {
+            OpenTracksController.toggleRecording(getContext());
+            return;
+        }
+
+        if (actionMediaPlay.equals(action) ||
+                actionMediaPause.equals(action) ||
+                actionMediaPlayPause.equals(action)
+        ) {
+            GBDeviceEventMusicControl deviceEventMusicControl = new GBDeviceEventMusicControl();
+            deviceEventMusicControl.event = GBDeviceEventMusicControl.Event.valueOf(action);
+            evaluateGBDeviceEvent(deviceEventMusicControl);
+            return;
+        }
+
+        LOG.warn("Unhandled device state change action (action: {}, message: {})", action, message);
+    }
+
+    private void handleGBDeviceEvent(GBDeviceEventSleepStateDetection event) {
+        LOG.debug("Got SLEEP_STATE_DETECTION device event, detected sleep state = {}", event.sleepState);
+
+        if (event.sleepState == SleepState.UNKNOWN) {
+            return;
+        }
+
+        String actionDisabled = getContext().getString(R.string.pref_button_action_disabled_value);
+        String actionPreferenceKey, messagePreferenceKey;
+        int defaultBroadcastMessageResource;
+
+        switch (event.sleepState) {
+            case AWAKE:
+                actionPreferenceKey = DeviceSettingsPreferenceConst.PREF_DEVICE_ACTION_WOKE_UP_SELECTION;
+                messagePreferenceKey = DeviceSettingsPreferenceConst.PREF_DEVICE_ACTION_WOKE_UP_BROADCAST;
+                defaultBroadcastMessageResource = R.string.prefs_events_forwarding_wokeup_broadcast_default_value;
+                break;
+            case ASLEEP:
+                actionPreferenceKey = DeviceSettingsPreferenceConst.PREF_DEVICE_ACTION_FELL_SLEEP_SELECTION;
+                messagePreferenceKey = DeviceSettingsPreferenceConst.PREF_DEVICE_ACTION_FELL_SLEEP_BROADCAST;
+                defaultBroadcastMessageResource = R.string.prefs_events_forwarding_fellsleep_broadcast_default_value;
+                break;
+            default:
+                LOG.warn("Unable to deduce action and broadcast message preference key for sleep state {}", event.sleepState);
+                return;
+        }
+
+        String action = getDevicePrefs().getString(actionPreferenceKey, actionDisabled);
+
+        if (actionDisabled.equals(action)) {
+            return;
+        }
+
+        String broadcastMessage = getDevicePrefs().getString(messagePreferenceKey, context.getString(defaultBroadcastMessageResource));
+        handleDeviceAction(action, broadcastMessage);
+    }
+
+    private void handleGBDeviceEvent(GBDeviceEventWearState event) {
+        LOG.debug("Got WEAR_STATE device event, wearingState = {}", event.wearingState);
+
+        if (event.wearingState == WearingState.UNKNOWN) {
+            LOG.warn("WEAR_STATE state is UNKNOWN, aborting further evaluation");
+            return;
+        }
+
+        if (event.wearingState != WearingState.NOT_WEARING) {
+            LOG.debug("WEAR_STATE state is not NOT_WEARING, aborting further evaluation");
+        }
+
+        String valueDisabled = getContext().getString(R.string.pref_button_action_disabled_value);
+        String actionOnUnwear = getDevicePrefs().getString(
+                DeviceSettingsPreferenceConst.PREF_DEVICE_ACTION_START_NON_WEAR_SELECTION,
+                valueDisabled
+        );
+
+        // check if an action is set
+        if (actionOnUnwear.equals(valueDisabled)) {
+            return;
+        }
+
+        String broadcastMessage = getDevicePrefs().getString(
+                DeviceSettingsPreferenceConst.PREF_DEVICE_ACTION_START_NON_WEAR_BROADCAST,
+                getContext().getString(R.string.prefs_events_forwarding_startnonwear_broadcast_default_value)
+        );
+
+        handleDeviceAction(actionOnUnwear, broadcastMessage);
+    }
 
     private StoreDataTask createStoreTask(String task, Context context, GBDeviceEventBatteryInfo deviceEvent) {
         return new StoreDataTask(task, context, deviceEvent);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
index 558aba663..a2925accb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
@@ -1,8 +1,8 @@
-/*  Copyright (C) 2015-2021 Andreas Böhler, Andreas Shimokawa, Avamander,
+/*  Copyright (C) 2015-2023 Andreas Böhler, Andreas Shimokawa, Avamander,
     Carsten Pfeiffer, Daniel Dakhno, Daniele Gobbetti, Daniel Hauck, Dikay900,
     Frank Slezak, ivanovlev, João Paulo Barraca, José Rebelo, Julien Pivotto,
     Kasha, keeshii, mamucho, Martin, Matthieu Baerts, Nephiel, Sebastian Kranz,
-    Sergey Trofimov, Steffen Liebergeld, Taavi Eomäe, Uwe Hermann
+    Sergey Trofimov, Steffen Liebergeld, Taavi Eomäe, Uwe Hermann, Yoran Vulker
 
     This file is part of Gadgetbridge.
 
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 45732e189..5df6eb42f 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
@@ -1,7 +1,7 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Christian
+/*  Copyright (C) 2015-2023 Andreas Shimokawa, Carsten Pfeiffer, Christian
     Fischer, Daniele Gobbetti, Dmitry Markin, JohnnySun, José Rebelo, Julien
     Pivotto, Kasha, Michal Novotny, Petr Vaněk, Sebastian Kranz, Sergey Trofimov,
-    Steffen Liebergeld, Taavi Eomäe, Zhong Jianxin
+    Steffen Liebergeld, Taavi Eomäe, Yoran Vulker, Zhong Jianxin
 
     This file is part of Gadgetbridge.
 
@@ -80,12 +80,15 @@ import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSett
 import nodomain.freeyourgadget.gadgetbridge.capabilities.password.PasswordCapabilityImpl;
 import nodomain.freeyourgadget.gadgetbridge.database.DBHandler;
 import nodomain.freeyourgadget.gadgetbridge.database.DBHelper;
+import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEvent;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventBatteryInfo;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventCallControl;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventFindPhone;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventMusicControl;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventNotificationControl;
+import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventSleepStateDetection;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventVersionInfo;
+import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventWearState;
 import nodomain.freeyourgadget.gadgetbridge.devices.DeviceCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.ActivateDisplayOnLift;
@@ -121,6 +124,8 @@ import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
 import nodomain.freeyourgadget.gadgetbridge.model.ActivityUser;
 import nodomain.freeyourgadget.gadgetbridge.model.Alarm;
 import nodomain.freeyourgadget.gadgetbridge.model.RecordedDataTypes;
+import nodomain.freeyourgadget.gadgetbridge.model.SleepState;
+import nodomain.freeyourgadget.gadgetbridge.model.WearingState;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.operations.AbstractFetchOperation;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.operations.FetchStatisticsOperation;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.operations.FetchTemperatureOperation;
@@ -220,6 +225,7 @@ import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.Dev
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_TIMEFORMAT;
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_USER_FITNESS_GOAL_NOTIFICATION;
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_WEARLOCATION;
+import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_DEVICE_ACTION_SELECTION_OFF;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.Huami2021Service.WORKOUT_GPS_FLAG_POSITION;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.Huami2021Service.WORKOUT_GPS_FLAG_STATUS;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_BUTTON_ACTION_SELECTION_BROADCAST;
@@ -227,13 +233,6 @@ import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_BUTTON_ACTION_SELECTION_FITNESS_APP_STOP;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_BUTTON_ACTION_SELECTION_FITNESS_APP_TOGGLE;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_BUTTON_ACTION_SELECTION_OFF;
-import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_DEVICE_ACTION_FELL_SLEEP_BROADCAST;
-import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_DEVICE_ACTION_FELL_SLEEP_SELECTION;
-import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_DEVICE_ACTION_SELECTION_OFF;
-import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_DEVICE_ACTION_START_NON_WEAR_BROADCAST;
-import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_DEVICE_ACTION_START_NON_WEAR_SELECTION;
-import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_DEVICE_ACTION_WOKE_UP_BROADCAST;
-import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_DEVICE_ACTION_WOKE_UP_SELECTION;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_HUAMI_VIBRATION_COUNT_ALARM;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_HUAMI_VIBRATION_COUNT_APP_ALERTS;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_HUAMI_VIBRATION_COUNT_EVENT_REMINDER;
@@ -1788,13 +1787,12 @@ public abstract class HuamiSupport extends AbstractBTLEDeviceSupport implements
     }
 
     private void executeButtonAction(String buttonKey) {
-        Prefs prefs = new Prefs(GBApplication.getDeviceSpecificSharedPrefs(gbDevice.getAddress()));
-        String buttonPreference = prefs.getString(buttonKey, PREF_BUTTON_ACTION_SELECTION_OFF);
+        String buttonPreference = getDevicePrefs().getString(buttonKey, PREF_BUTTON_ACTION_SELECTION_OFF);
 
         if (buttonPreference.equals(PREF_BUTTON_ACTION_SELECTION_OFF)) {
             return;
         }
-        if (prefs.getBoolean(HuamiConst.PREF_BUTTON_ACTION_VIBRATE, false)) {
+        if (getDevicePrefs().getBoolean(HuamiConst.PREF_BUTTON_ACTION_VIBRATE, false)) {
             vibrateOnce();
         }
         switch (buttonPreference) {
@@ -1815,37 +1813,6 @@ public abstract class HuamiSupport extends AbstractBTLEDeviceSupport implements
         }
     }
 
-    protected void handleDeviceAction(String deviceAction, String message) {
-        if (deviceAction.equals(PREF_DEVICE_ACTION_SELECTION_OFF)) {
-            return;
-        }
-        switch (deviceAction) {
-            case PREF_BUTTON_ACTION_SELECTION_BROADCAST:
-                sendSystemBroadcast(message);
-                break;
-            case PREF_BUTTON_ACTION_SELECTION_FITNESS_APP_START:
-                OpenTracksController.startRecording(this.getContext());
-                break;
-            case PREF_BUTTON_ACTION_SELECTION_FITNESS_APP_STOP:
-                OpenTracksController.stopRecording(this.getContext());
-                break;
-            case PREF_BUTTON_ACTION_SELECTION_FITNESS_APP_TOGGLE:
-                OpenTracksController.toggleRecording(this.getContext());
-                break;
-            default:
-                handleMediaButton(deviceAction);
-        }
-    }
-
-    private void sendSystemBroadcast(String message){
-        if (message !=null) {
-            Intent in = new Intent();
-            in.setAction(message);
-            LOG.info("Sending broadcast " + message);
-            this.getContext().getApplicationContext().sendBroadcast(in);
-        }
-    }
-
     private void sendSystemBroadcastWithButtonId() {
         Prefs prefs = new Prefs(GBApplication.getDeviceSpecificSharedPrefs(gbDevice.getAddress()));
         String requiredButtonPressMessage = prefs.getString(HuamiConst.PREF_BUTTON_ACTION_BROADCAST,
@@ -1857,12 +1824,12 @@ public abstract class HuamiSupport extends AbstractBTLEDeviceSupport implements
         this.getContext().getApplicationContext().sendBroadcast(in);
     }
 
-    private void handleMediaButton(String MediaAction) {
-        if (MediaAction.equals(PREF_DEVICE_ACTION_SELECTION_OFF)) {
+    private void handleMediaButton(String mediaAction) {
+        if (mediaAction.equals(PREF_DEVICE_ACTION_SELECTION_OFF) || mediaAction.equals(PREF_BUTTON_ACTION_SELECTION_OFF)) {
             return;
         }
         GBDeviceEventMusicControl deviceEventMusicControl = new GBDeviceEventMusicControl();
-        deviceEventMusicControl.event = GBDeviceEventMusicControl.Event.valueOf(MediaAction);
+        deviceEventMusicControl.event = GBDeviceEventMusicControl.Event.valueOf(mediaAction);
         evaluateGBDeviceEvent(deviceEventMusicControl);
     }
 
@@ -2190,34 +2157,28 @@ public abstract class HuamiSupport extends AbstractBTLEDeviceSupport implements
         }
     }
 
-    protected void processDeviceEvent(int event){
-        LOG.debug("Handling device event: " + event);
-        Prefs prefs = new Prefs(GBApplication.getDeviceSpecificSharedPrefs(gbDevice.getAddress()));
-        String deviceActionBroadcastMessage=null;
-
-        switch (event) {
+    protected void processDeviceEvent(int deviceEvent){
+        LOG.debug("Handling device event: " + deviceEvent);
+        GBDeviceEvent event;
+        switch (deviceEvent) {
             case HuamiDeviceEvent.WOKE_UP:
-                String wakeupAction = prefs.getString(PREF_DEVICE_ACTION_WOKE_UP_SELECTION,PREF_DEVICE_ACTION_SELECTION_OFF);
-                if (wakeupAction.equals(PREF_DEVICE_ACTION_SELECTION_OFF)) return;
-                deviceActionBroadcastMessage= prefs.getString(PREF_DEVICE_ACTION_WOKE_UP_BROADCAST,
-                        this.getContext().getString(R.string.prefs_events_forwarding_wokeup_broadcast_default_value));
-                handleDeviceAction(wakeupAction, deviceActionBroadcastMessage);
+                event = new GBDeviceEventSleepStateDetection();
+                ((GBDeviceEventSleepStateDetection) event).sleepState = SleepState.AWAKE;
                 break;
             case HuamiDeviceEvent.FELL_ASLEEP:
-                String fellsleepAction = prefs.getString(PREF_DEVICE_ACTION_FELL_SLEEP_SELECTION,PREF_DEVICE_ACTION_SELECTION_OFF);
-                if (fellsleepAction.equals(PREF_DEVICE_ACTION_SELECTION_OFF)) return;
-                deviceActionBroadcastMessage= prefs.getString(PREF_DEVICE_ACTION_FELL_SLEEP_BROADCAST,
-                        this.getContext().getString(R.string.prefs_events_forwarding_fellsleep_broadcast_default_value));
-                handleDeviceAction(fellsleepAction, deviceActionBroadcastMessage);
+                event = new GBDeviceEventSleepStateDetection();
+                ((GBDeviceEventSleepStateDetection) event).sleepState = SleepState.ASLEEP;
                 break;
             case HuamiDeviceEvent.START_NONWEAR:
-                String nonwearAction = prefs.getString(PREF_DEVICE_ACTION_START_NON_WEAR_SELECTION,PREF_DEVICE_ACTION_SELECTION_OFF);
-                if (nonwearAction.equals(PREF_DEVICE_ACTION_SELECTION_OFF)) return;
-                deviceActionBroadcastMessage= prefs.getString(PREF_DEVICE_ACTION_START_NON_WEAR_BROADCAST,
-                        this.getContext().getString(R.string.prefs_events_forwarding_startnonwear_broadcast_default_value));
-                handleDeviceAction(nonwearAction, deviceActionBroadcastMessage);
+                event = new GBDeviceEventWearState();
+                ((GBDeviceEventWearState) event).wearingState = WearingState.NOT_WEARING;
                 break;
+            default:
+                LOG.warn("Unhandled device event {}", deviceEvent);
+                return;
         }
+
+        evaluateGBDeviceEvent(event);
     }
 
     private void handleLongButtonEvent(){
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
index 446f9f86e..3c5529027 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023 José Rebelo, Yoran Vulker
 
     This file is part of Gadgetbridge.
 
@@ -36,13 +36,17 @@ import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSett
 import nodomain.freeyourgadget.gadgetbridge.capabilities.password.PasswordCapabilityImpl;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventBatteryInfo;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventFindPhone;
+import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventSleepStateDetection;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdateDeviceInfo;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdatePreferences;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventVersionInfo;
+import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventWearState;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiFWHelper;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.model.BatteryState;
+import nodomain.freeyourgadget.gadgetbridge.model.SleepState;
+import nodomain.freeyourgadget.gadgetbridge.model.WearingState;
 import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetProgressAction;
@@ -73,11 +77,14 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
     public static final int CMD_PASSWORD_SET = 21;
     public static final int CMD_DISPLAY_ITEMS_GET = 29;
     public static final int CMD_DISPLAY_ITEMS_SET = 30;
+    public static final int CMD_DEVICE_STATE_GET = 78;
     public static final int CMD_DEVICE_STATE = 79;
 
     // Not null if we're installing a firmware
     private XiaomiFWHelper fwHelper = null;
-    private XiaomiProto.DeviceState cachedDeviceState = null;
+    private WearingState currentWearingState = WearingState.UNKNOWN;
+    private BatteryState currentBatteryState = BatteryState.UNKNOWN;
+    private SleepState currentSleepDetectionState = SleepState.UNKNOWN;
 
     public XiaomiSystemService(final XiaomiSupport support) {
         super(support);
@@ -87,7 +94,10 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
     public void initialize() {
         // Request device info and configs
         getSupport().sendCommand("get device info", COMMAND_TYPE, CMD_DEVICE_INFO);
-        getSupport().sendCommand("get battery", COMMAND_TYPE, CMD_BATTERY);
+        getSupport().sendCommand("get device status", COMMAND_TYPE, CMD_DEVICE_STATE_GET);
+        // device status request may initialize wearing, charger, sleeping, and activity state, so
+        // get battery level as a failsafe for devices that don't support CMD_DEVICE_STATE_SET command
+        getSupport().sendCommand("get battery state", COMMAND_TYPE, CMD_BATTERY);
         getSupport().sendCommand("get password", COMMAND_TYPE, CMD_PASSWORD_GET);
         getSupport().sendCommand("get display items", COMMAND_TYPE, CMD_DISPLAY_ITEMS_GET);
     }
@@ -129,14 +139,15 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
             case CMD_DISPLAY_ITEMS_GET:
                 handleDisplayItems(cmd.getSystem().getDisplayItems());
                 return;
+            case CMD_DEVICE_STATE_GET:
+                handleBasicDeviceState(cmd.getSystem().hasBasicDeviceState()
+                        ? cmd.getSystem().getBasicDeviceState()
+                        : null);
+                return;
             case CMD_DEVICE_STATE:
-                // some devices (e.g. Xiaomi Watch S1 Active) only broadcast the charger state through
-                // this message, so this will need to be kept cached to process when the battery levels
-                // get requested
-                cachedDeviceState = cmd.getSystem().getDeviceState();
-
-                // request battery state to request battery level and charger state on supported models
-                getSupport().sendCommand("request battery state", COMMAND_TYPE, CMD_BATTERY);
+                handleDeviceState(cmd.getSystem().hasDeviceState()
+                        ? cmd.getSystem().getDeviceState()
+                        : null);
                 return;
         }
 
@@ -246,6 +257,17 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
         getSupport().evaluateGBDeviceEvent(gbDeviceEventUpdateDeviceInfo);
     }
 
+    private BatteryState convertBatteryStateFromRawValue(int chargerState) {
+        switch (chargerState) {
+            case 1:
+                return BatteryState.BATTERY_CHARGING;
+            case 2:
+                return BatteryState.BATTERY_NORMAL;
+        }
+
+        return BatteryState.UNKNOWN;
+    }
+
     private void handleBattery(final XiaomiProto.Battery battery) {
         LOG.debug("Got battery: {}", battery.getLevel());
 
@@ -253,25 +275,18 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
         batteryInfo.batteryIndex = 0;
         batteryInfo.level = battery.getLevel();
 
-        int chargerState = battery.getState();
+        // currentBatteryState may already be set if the DeviceState message contained the field,
+        // but since some models report their charger state through this message, we will update it
+        // from here
+        if (battery.hasState()) {
+            currentBatteryState = convertBatteryStateFromRawValue(battery.getState());
 
-        // if device state is cached and the charging state there is set, take the charger status
-        // from there
-        if (cachedDeviceState != null && cachedDeviceState.hasChargingState()) {
-            chargerState = cachedDeviceState.getChargingState();
-        }
-
-        switch (chargerState) {
-            case 1:
-                batteryInfo.state = BatteryState.BATTERY_CHARGING;
-                break;
-            case 2:
-                batteryInfo.state = BatteryState.BATTERY_NORMAL;
-                break;
-            default:
-                batteryInfo.state = BatteryState.UNKNOWN;
+            if (currentBatteryState == BatteryState.UNKNOWN) {
                 LOG.warn("Unknown battery state {}", battery.getState());
+            }
         }
+
+        batteryInfo.state = currentBatteryState;
         getSupport().evaluateGBDeviceEvent(batteryInfo);
     }
 
@@ -446,6 +461,155 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
         getSupport().evaluateGBDeviceEvent(eventUpdatePreferences);
     }
 
+    private void handleWearingState(int newStateValue) {
+        WearingState newState;
+
+        switch (newStateValue) {
+            case 1:
+                newState = WearingState.WEARING;
+                break;
+            case 2:
+                newState = WearingState.NOT_WEARING;
+                break;
+            default:
+                LOG.warn("Unknown wearing state {}", newStateValue);
+                return;
+        }
+
+        LOG.debug("Current wearing state = {}, new wearing state = {}", currentWearingState, newState);
+
+        if (currentWearingState != WearingState.UNKNOWN && currentWearingState != newState) {
+            GBDeviceEventWearState event = new GBDeviceEventWearState();
+            event.wearingState = newState;
+            getSupport().evaluateGBDeviceEvent(event);
+        }
+
+        currentWearingState = newState;
+    }
+
+    private void handleSleepDetectionState(int newStateValue) {
+        SleepState newState;
+
+        switch (newStateValue) {
+            case 1:
+                newState = SleepState.ASLEEP;
+                break;
+            case 2:
+                newState = SleepState.AWAKE;
+                break;
+            default:
+                LOG.warn("Unknown sleep detection state {}", newStateValue);
+                return;
+        }
+
+        LOG.debug("Current sleep detection state = {}, new sleep detection state = {}", currentSleepDetectionState, newState);
+
+        if (currentSleepDetectionState != SleepState.UNKNOWN && currentSleepDetectionState != newState) {
+            GBDeviceEventSleepStateDetection event = new GBDeviceEventSleepStateDetection();
+            event.sleepState = newState;
+            getSupport().evaluateGBDeviceEvent(event);
+        }
+
+        currentSleepDetectionState = newState;
+    }
+
+    public void handleBasicDeviceState(XiaomiProto.BasicDeviceState deviceState) {
+        LOG.debug("Got basic device state: {}", deviceState);
+
+        if (null == deviceState) {
+            LOG.warn("Got null for BasicDeviceState, requesting battery state and returning");
+            getSupport().sendCommand("request battery state", COMMAND_TYPE, CMD_BATTERY);
+            return;
+        }
+
+        // handle battery info from message
+        {
+            BatteryState newBatteryState = deviceState.getIsCharging() ? BatteryState.BATTERY_CHARGING : BatteryState.BATTERY_NORMAL;
+            LOG.debug("Previous charging state: {}, new charging state: {}", currentBatteryState, newBatteryState);
+
+            currentBatteryState = newBatteryState;
+
+            // if the device state did not have a battery level, request it from the device through other means.
+            // the battery state is now cached, so that it can be used when another response with battery level is received.
+            if (!deviceState.hasBatteryLevel()) {
+                getSupport().sendCommand("request battery state", COMMAND_TYPE, CMD_BATTERY);
+            } else {
+                GBDeviceEventBatteryInfo event = new GBDeviceEventBatteryInfo();
+                event.batteryIndex = 0;
+                event.state = newBatteryState;
+                event.level = deviceState.getBatteryLevel();
+                getSupport().evaluateGBDeviceEvent(event);
+            }
+        }
+
+        // handle sleep state from message
+        {
+            SleepState newSleepState = deviceState.getIsUserAsleep() ? SleepState.ASLEEP : SleepState.AWAKE;
+            LOG.debug("Previous sleep state: {}, new sleep state: {}", currentSleepDetectionState, newSleepState);
+
+            // send event if the previous state is known and the new state is different from cached
+            if (currentSleepDetectionState != SleepState.UNKNOWN && currentSleepDetectionState != newSleepState) {
+                GBDeviceEventSleepStateDetection event = new GBDeviceEventSleepStateDetection();
+                event.sleepState = newSleepState;
+                getSupport().evaluateGBDeviceEvent(event);
+            }
+
+            currentSleepDetectionState = newSleepState;
+        }
+
+        // handle wearing state from message
+        {
+            WearingState newWearingState = deviceState.getIsWorn() ? WearingState.WEARING : WearingState.NOT_WEARING;
+            LOG.debug("Previous wearing state: {}, new wearing state: {}", currentWearingState, newWearingState);
+
+            if (currentWearingState != WearingState.UNKNOWN && currentWearingState != newWearingState) {
+                GBDeviceEventWearState event = new GBDeviceEventWearState();
+                event.wearingState = newWearingState;
+                getSupport().evaluateGBDeviceEvent(event);
+            }
+
+            currentWearingState = newWearingState;
+        }
+
+        // TODO: handle activity state
+    }
+
+    public void handleDeviceState(XiaomiProto.DeviceState deviceState) {
+        LOG.debug("Got device state: {}", deviceState);
+
+        if (null == deviceState) {
+            LOG.warn("Got null for DeviceState, requesting battery state and returning");
+            getSupport().sendCommand("request battery state", COMMAND_TYPE, CMD_BATTERY);
+            return;
+        }
+
+        if (deviceState.hasWearingState()) {
+            handleWearingState(deviceState.getWearingState());
+        }
+
+        // The charger state of some devices can only be known when listening for device status
+        // updates. If available, this state will be cached here and updated in the GBDevice upon
+        // the next retrieval of the battery level
+        if (deviceState.hasChargingState()) {
+            BatteryState newBatteryState = convertBatteryStateFromRawValue(deviceState.getChargingState());
+
+            LOG.debug("Current battery state = {}, new battery state = {}", currentBatteryState, newBatteryState);
+
+            if (currentBatteryState != newBatteryState) {
+                currentBatteryState = newBatteryState;
+            }
+        }
+
+        if (deviceState.hasSleepState()) {
+            handleSleepDetectionState(deviceState.getSleepState());
+        }
+
+        // TODO process warning (unknown possible values) and activity information
+
+        // request battery state to request battery level and charger state on supported models
+        getSupport().sendCommand("request battery state", COMMAND_TYPE, CMD_BATTERY);
+    }
+
     public void onFindPhone(final boolean start) {
         LOG.debug("Find phone: {}", start);
 
diff --git a/app/src/main/proto/xiaomi.proto b/app/src/main/proto/xiaomi.proto
index eaaad8d05..efb911140 100644
--- a/app/src/main/proto/xiaomi.proto
+++ b/app/src/main/proto/xiaomi.proto
@@ -129,6 +129,9 @@ message System {
   // 2, 47
   optional VibrationPatternAck vibrationPatternAck = 43;
 
+  // 2, 78
+  optional BasicDeviceState basicDeviceState = 48;
+
   // 2, 79
   optional DeviceState deviceState = 49;
 }
@@ -304,6 +307,14 @@ message DeviceActivityState {
   optional uint32 currentActivityState = 2;
 }
 
+message BasicDeviceState {
+  required bool isCharging = 1; // true when connected to charger
+  optional uint32 batteryLevel = 2;
+  required bool isWorn = 3; // true when the device detects it's being worn
+  required bool isUserAsleep = 4; // true when the device detected its user is asleep
+  optional DeviceActivityState activityState = 5;
+}
+
 message DeviceState {
   optional uint32 chargingState = 1; // 1 charging, 2 not charging
   optional uint32 wearingState = 2; // 1 wearing, 2 not wearing

From 0378f487989c81011c4b83580d8d43b9fc820d84 Mon Sep 17 00:00:00 2001
From: MrYoranimo <yvulker@gmail.com>
Date: Thu, 7 Dec 2023 03:15:18 +0100
Subject: [PATCH 215/595] Xiaomi: fix for invalid birthdate being sent in user
 info

---
 .../service/devices/xiaomi/services/XiaomiHealthService.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
index ceb59c1fd..864cbfdc0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
@@ -230,7 +230,7 @@ public class XiaomiHealthService extends AbstractXiaomiService {
         final XiaomiProto.UserInfo userInfo = XiaomiProto.UserInfo.newBuilder()
                 .setHeight(activityUser.getHeightCm())
                 .setWeight(activityUser.getWeightKg())
-                .setBirthday(Integer.parseInt(String.format(Locale.ROOT, "%02d%02d%02d", birthYear, birthMonth, birthDay)))
+                .setBirthday(Integer.parseInt(String.format(Locale.ROOT, "%04d%02d%02d", birthYear, birthMonth, birthDay)))
                 .setGender(genderInt)
                 .setMaxHeartRate(maxHeartRate)
                 .setGoalCalories(activityUser.getCaloriesBurntGoal())

From 577ee27c149d02e8954f4d15cd42e7fc234d5bff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sat, 9 Dec 2023 10:59:39 +0000
Subject: [PATCH 216/595] Intent API: Add debug action for test new function

---
 .../externalevents/IntentApiReceiver.java             | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/IntentApiReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/IntentApiReceiver.java
index b5d437cb0..5354d1478 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/IntentApiReceiver.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/IntentApiReceiver.java
@@ -54,6 +54,7 @@ public class IntentApiReceiver extends BroadcastReceiver {
     public static final String COMMAND_DEBUG_SEND_NOTIFICATION = "nodomain.freeyourgadget.gadgetbridge.command.DEBUG_SEND_NOTIFICATION";
     public static final String COMMAND_DEBUG_INCOMING_CALL = "nodomain.freeyourgadget.gadgetbridge.command.DEBUG_INCOMING_CALL";
     public static final String COMMAND_DEBUG_SET_DEVICE_ADDRESS = "nodomain.freeyourgadget.gadgetbridge.command.DEBUG_SET_DEVICE_ADDRESS";
+    public static final String COMMAND_DEBUG_TEST_NEW_FUNCTION = "nodomain.freeyourgadget.gadgetbridge.command.DEBUG_TEST_NEW_FUNCTION";
 
     private static final String MAC_ADDR_PATTERN = "^([0-9A-F]{2}:){5}[0-9A-F]{2}$";
 
@@ -174,6 +175,15 @@ public class IntentApiReceiver extends BroadcastReceiver {
                 }
                 setDeviceAddress(intent);
                 break;
+
+            case COMMAND_DEBUG_TEST_NEW_FUNCTION:
+                if (!prefs.getBoolean("intent_api_allow_debug_commands", false)) {
+                    LOG.warn(msgDebugNotAllowed);
+                    return;
+                }
+                LOG.info("Triggering Debug Test New Function");
+                GBApplication.deviceService().onTestNewFunction();
+                break;
         }
     }
 
@@ -184,6 +194,7 @@ public class IntentApiReceiver extends BroadcastReceiver {
         intentFilter.addAction(COMMAND_DEBUG_SEND_NOTIFICATION);
         intentFilter.addAction(COMMAND_DEBUG_INCOMING_CALL);
         intentFilter.addAction(COMMAND_DEBUG_SET_DEVICE_ADDRESS);
+        intentFilter.addAction(COMMAND_DEBUG_TEST_NEW_FUNCTION);
         return intentFilter;
     }
 

From 25196a932ed4e7d6bc37db511ee15497febc271b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sat, 9 Dec 2023 11:01:55 +0000
Subject: [PATCH 217/595] Allow toggling DND through device actions

---
 .../service/AbstractDeviceSupport.java        | 37 +++++++++++++++++--
 app/src/main/res/values/arrays.xml            |  8 ++++
 app/src/main/res/values/strings.xml           |  4 ++
 app/src/main/res/values/values.xml            |  4 ++
 4 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java
index 8a140d689..832c09f74 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java
@@ -19,10 +19,9 @@
 package nodomain.freeyourgadget.gadgetbridge.service;
 
 import android.app.Notification;
+import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothGatt;
 import android.companion.CompanionDeviceManager;
 import android.content.Context;
 import android.content.Intent;
@@ -106,7 +105,6 @@ import nodomain.freeyourgadget.gadgetbridge.util.PendingIntentUtils;
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 
 import static nodomain.freeyourgadget.gadgetbridge.util.GB.NOTIFICATION_CHANNEL_HIGH_PRIORITY_ID;
-import static nodomain.freeyourgadget.gadgetbridge.util.GB.NOTIFICATION_CHANNEL_ID;
 
 // TODO: support option for a single reminder notification when notifications could not be delivered?
 // conditions: app was running and received notifications, but device was not connected.
@@ -552,6 +550,10 @@ public abstract class AbstractDeviceSupport implements DeviceSupport {
         final String actionMediaPlay = getContext().getString(R.string.pref_media_play_value);
         final String actionMediaPause = getContext().getString(R.string.pref_media_pause_value);
         final String actionMediaPlayPause = getContext().getString(R.string.pref_media_playpause_value);
+        final String actionDndOff = getContext().getString(R.string.pref_device_action_dnd_off_value);
+        final String actionDndpriority = getContext().getString(R.string.pref_device_action_dnd_priority_value);
+        final String actionDndAlarms = getContext().getString(R.string.pref_device_action_dnd_alarms_value);
+        final String actionDndOn = getContext().getString(R.string.pref_device_action_dnd_on_value);
 
         if (actionBroadcast.equals(action)) {
             if (message != null) {
@@ -588,6 +590,35 @@ public abstract class AbstractDeviceSupport implements DeviceSupport {
             return;
         }
 
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            final NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+
+            final int interruptionFilter;
+            if (actionDndOff.equals(action)) {
+                interruptionFilter = NotificationManager.INTERRUPTION_FILTER_ALL;
+            } else if (actionDndpriority.equals(action)) {
+                interruptionFilter = NotificationManager.INTERRUPTION_FILTER_PRIORITY;
+            } else if (actionDndAlarms.equals(action)) {
+                interruptionFilter = NotificationManager.INTERRUPTION_FILTER_ALARMS;
+            } else if (actionDndOn.equals(action)) {
+                interruptionFilter = NotificationManager.INTERRUPTION_FILTER_NONE;
+            } else {
+                interruptionFilter = NotificationManager.INTERRUPTION_FILTER_UNKNOWN;
+            }
+
+            if (interruptionFilter != NotificationManager.INTERRUPTION_FILTER_UNKNOWN) {
+                LOG.debug("Setting do not disturb to {} for {}", interruptionFilter, action);
+
+                if (!notificationManager.isNotificationPolicyAccessGranted()) {
+                    LOG.warn("Do not disturb permissions not granted");
+                    return;
+                }
+
+                notificationManager.setInterruptionFilter(interruptionFilter);
+                return;
+            }
+        }
+
         LOG.warn("Unhandled device state change action (action: {}, message: {})", action, message);
     }
 
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 476aed6a6..176b46307 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -2562,6 +2562,10 @@
         <item>@string/pref_device_action_fitness_app_control_start</item>
         <item>@string/pref_device_action_fitness_app_control_stop</item>
         <item>@string/pref_device_action_fitness_app_control_toggle</item>
+        <item>@string/pref_device_action_dnd_off</item>
+        <item>@string/pref_device_action_dnd_priority</item>
+        <item>@string/pref_device_action_dnd_alarms</item>
+        <item>@string/pref_device_action_dnd_on</item>
     </string-array>
 
     <string-array name="device_action_values">
@@ -2573,6 +2577,10 @@
         <item>@string/pref_device_action_fitness_app_control_start_value</item>
         <item>@string/pref_device_action_fitness_app_control_stop_value</item>
         <item>@string/pref_device_action_fitness_app_control_toggle_value</item>
+        <item>@string/pref_device_action_dnd_off_value</item>
+        <item>@string/pref_device_action_dnd_priority_value</item>
+        <item>@string/pref_device_action_dnd_alarms_value</item>
+        <item>@string/pref_device_action_dnd_on_value</item>
     </string-array>
 
     <string-array name="pref_hybridhr_buttonfunctions">
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c43545adc..089c7029c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2161,6 +2161,10 @@
     <string name="pref_device_action_fitness_app_control_stop">Fitness App Tracking Stop</string>
     <string name="pref_device_action_fitness_app_control_toggle">Toggle Fitness App Tracking</string>
     <string name="pref_device_action_phone_gps_location_listener_stop">GPS Location Listener Stop</string>
+    <string name="pref_device_action_dnd_off">Do not disturb - Off</string>
+    <string name="pref_device_action_dnd_priority">Do not disturb - Priority only</string>
+    <string name="pref_device_action_dnd_alarms">Do not disturb - Alarms only</string>
+    <string name="pref_device_action_dnd_on">Do not disturb - On</string>
     <!-- Translators: the ### indicate number of digits, keep intact -->
     <string name="distance_format_meters">###m</string>
     <!-- Translators: the ### indicate number of digits, keep intact -->
diff --git a/app/src/main/res/values/values.xml b/app/src/main/res/values/values.xml
index 3cddf520d..d1d4187bb 100644
--- a/app/src/main/res/values/values.xml
+++ b/app/src/main/res/values/values.xml
@@ -125,6 +125,10 @@
     <item name="pref_device_action_fitness_app_control_start_value" translatable="false" type="string">FITNESS_CONTROL_START</item>
     <item name="pref_device_action_fitness_app_control_stop_value" translatable="false" type="string">FITNESS_CONTROL_STOP</item>
     <item name="pref_device_action_fitness_app_control_toggle_value" translatable="false" type="string">FITNESS_CONTROL_TOGGLE</item>
+    <item name="pref_device_action_dnd_off_value" translatable="false" type="string">DO_NOT_DISTURB_OFF</item>
+    <item name="pref_device_action_dnd_priority_value" translatable="false" type="string">DO_NOT_DISTURB_PRIORITY</item>
+    <item name="pref_device_action_dnd_alarms_value" translatable="false" type="string">DO_NOT_DISTURB_ALARMS</item>
+    <item name="pref_device_action_dnd_on_value" translatable="false" type="string">DO_NOT_DISTURB_ON</item>
 
     <item name="pref_theme_value_system" translatable="false" type="string">system</item>
     <item name="pref_theme_value_light" translatable="false" type="string">light</item>

From 4d12ac93e7736e552d4dec9e8ef9fd7c31870f93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sat, 9 Dec 2023 11:40:28 +0000
Subject: [PATCH 218/595] Allow multiple device actions to be triggered for the
 same event

---
 .../gadgetbridge/GBApplication.java           | 43 +++++++++-
 .../AbstractPreferenceFragment.java           | 27 +++++-
 .../DeviceSettingsPreferenceConst.java        |  7 +-
 .../DeviceSpecificSettingsFragment.java       | 41 ++++-----
 .../service/AbstractDeviceSupport.java        | 83 +++++++++----------
 .../service/devices/huami/HuamiSupport.java   |  3 +-
 app/src/main/res/values/arrays.xml            |  6 +-
 app/src/main/res/values/strings.xml           |  1 +
 .../res/xml/devicesettings_device_actions.xml | 20 ++---
 ...ttings_device_actions_without_not_wear.xml | 12 +--
 10 files changed, 153 insertions(+), 90 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
index 1f17df04d..56ec02f93 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
@@ -122,7 +122,7 @@ public class GBApplication extends Application {
     private static SharedPreferences sharedPrefs;
     private static final String PREFS_VERSION = "shared_preferences_version";
     //if preferences have to be migrated, increment the following and add the migration logic in migratePrefs below; see http://stackoverflow.com/questions/16397848/how-can-i-migrate-android-preferences-with-a-new-version
-    private static final int CURRENT_PREFS_VERSION = 27;
+    private static final int CURRENT_PREFS_VERSION = 28;
 
     private static LimitedQueue mIDSenderLookup = new LimitedQueue(16);
     private static Prefs prefs;
@@ -1404,6 +1404,47 @@ public class GBApplication extends Application {
             }
         }
 
+        if (oldVersion < 28) {
+            try (DBHandler db = acquireDB()) {
+                final DaoSession daoSession = db.getDaoSession();
+                final List<Device> activeDevices = DBHelper.getActiveDevices(daoSession);
+
+                for (final Device dbDevice : activeDevices) {
+                    final SharedPreferences deviceSharedPrefs = GBApplication.getDeviceSpecificSharedPrefs(dbDevice.getIdentifier());
+                    final SharedPreferences.Editor deviceSharedPrefsEdit = deviceSharedPrefs.edit();
+                    boolean shouldApply = false;
+
+                    if (!"UNKNOWN".equals(deviceSharedPrefs.getString("events_forwarding_fellsleep_action_selection", "UNKNOWN"))) {
+                        shouldApply = true;
+                        deviceSharedPrefsEdit.putStringSet(
+                                "events_forwarding_fellsleep_action_selections",
+                                Collections.singleton(deviceSharedPrefs.getString("events_forwarding_fellsleep_action_selection", "UNKNOWN"))
+                        );
+                    }
+                    if (!"UNKNOWN".equals(deviceSharedPrefs.getString("events_forwarding_wokeup_action_selection", "UNKNOWN"))) {
+                        shouldApply = true;
+                        deviceSharedPrefsEdit.putStringSet(
+                                "events_forwarding_wokeup_action_selections",
+                                Collections.singleton(deviceSharedPrefs.getString("events_forwarding_wokeup_action_selection", "UNKNOWN"))
+                        );
+                    }
+                    if (!"UNKNOWN".equals(deviceSharedPrefs.getString("events_forwarding_startnonwear_action_selection", "UNKNOWN"))) {
+                        shouldApply = true;
+                        deviceSharedPrefsEdit.putStringSet(
+                                "events_forwarding_startnonwear_action_selections",
+                                Collections.singleton(deviceSharedPrefs.getString("events_forwarding_startnonwear_action_selection", "UNKNOWN"))
+                        );
+                    }
+
+                    if (shouldApply) {
+                        deviceSharedPrefsEdit.apply();
+                    }
+                }
+            } catch (Exception e) {
+                Log.w(TAG, "error acquiring DB lock");
+            }
+        }
+
         editor.putString(PREFS_VERSION, Integer.toString(CURRENT_PREFS_VERSION));
         editor.apply();
     }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractPreferenceFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractPreferenceFragment.java
index 07b4de95e..5c4c15e6d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractPreferenceFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractPreferenceFragment.java
@@ -38,9 +38,12 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
 import java.util.Collections;
+import java.util.List;
 import java.util.Set;
 
+import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.util.XTimePreference;
 import nodomain.freeyourgadget.gadgetbridge.util.XTimePreferenceFragment;
 import nodomain.freeyourgadget.gadgetbridge.util.dialogs.MaterialEditTextPreferenceDialogFragment;
@@ -199,7 +202,29 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragmentCompa
             }
 
             if (getPreferenceKeysWithSummary().contains(key)) {
-                final String summary = prefs.getString(key, preference.getSummary() != null ? preference.getSummary().toString() : "");
+                final String summary;
+
+                // For multi select preferences, let's set the summary to the values, comma-delimited
+                if (preference instanceof MultiSelectListPreference) {
+                    final Set<String> prefSetValue = prefs.getStringSet(key, Collections.emptySet());
+                    if (prefSetValue.isEmpty()) {
+                        summary = requireContext().getString(R.string.not_set);
+                    } else {
+                        final MultiSelectListPreference multiSelectListPreference = (MultiSelectListPreference) preference;
+                        final CharSequence[] entries = multiSelectListPreference.getEntries();
+                        final CharSequence[] entryValues = multiSelectListPreference.getEntryValues();
+                        final List<String> translatedEntries = new ArrayList<>();
+                        for (int i = 0; i < entryValues.length; i++) {
+                            if (prefSetValue.contains(entryValues[i].toString())) {
+                                translatedEntries.add(entries[i].toString());
+                            }
+                        }
+                        summary = String.join(", ", translatedEntries);
+                    }
+                } else {
+                    summary = prefs.getString(key, preference.getSummary() != null ? preference.getSummary().toString() : "");
+                }
+
                 preference.setSummary(summary);
             }
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
index d3fa9df2a..89426647f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
@@ -382,12 +382,11 @@ public class DeviceSettingsPreferenceConst {
     public static final String PREF_FEMOMETER_MEASUREMENT_MODE = "femometer_measurement_mode";
 
     public static final String PREF_PREFIX_NOTIFICATION_WITH_APP = "pref_prefix_notification_with_app";
-    public static final String PREF_DEVICE_ACTION_SELECTION_OFF = "UNKNOWN";
     public static final String PREF_DEVICE_ACTION_SELECTION_BROADCAST = "BROADCAST";
-    public static final String PREF_DEVICE_ACTION_FELL_SLEEP_SELECTION = "events_forwarding_fellsleep_action_selection";
+    public static final String PREF_DEVICE_ACTION_FELL_SLEEP_SELECTIONS = "events_forwarding_fellsleep_action_selections";
     public static final String PREF_DEVICE_ACTION_FELL_SLEEP_BROADCAST = "prefs_events_forwarding_fellsleep_broadcast";
-    public static final String PREF_DEVICE_ACTION_WOKE_UP_SELECTION = "events_forwarding_wokeup_action_selection";
+    public static final String PREF_DEVICE_ACTION_WOKE_UP_SELECTIONS = "events_forwarding_wokeup_action_selections";
     public static final String PREF_DEVICE_ACTION_WOKE_UP_BROADCAST = "prefs_events_forwarding_wokeup_broadcast";
-    public static final String PREF_DEVICE_ACTION_START_NON_WEAR_SELECTION = "events_forwarding_startnonwear_action_selection";
+    public static final String PREF_DEVICE_ACTION_START_NON_WEAR_SELECTIONS = "events_forwarding_startnonwear_action_selections";
     public static final String PREF_DEVICE_ACTION_START_NON_WEAR_BROADCAST = "prefs_events_forwarding_startnonwear_broadcast";
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
index 738e4bd77..eaf04b249 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
@@ -26,11 +26,11 @@ import androidx.preference.ListPreference;
 import androidx.preference.Preference;
 
 import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
@@ -50,23 +50,20 @@ import nodomain.freeyourgadget.gadgetbridge.devices.DeviceCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.DeviceManager;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
 import nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst;
-import nodomain.freeyourgadget.gadgetbridge.devices.sony.wena3.SonyWena3SettingKeys;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.model.CannedMessagesSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
-import nodomain.freeyourgadget.gadgetbridge.util.DeviceHelper;
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.*;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_CONTROL_CENTER_SORTABLE;
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_DEVICE_ACTION_FELL_SLEEP_BROADCAST;
-import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_DEVICE_ACTION_FELL_SLEEP_SELECTION;
+import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_DEVICE_ACTION_FELL_SLEEP_SELECTIONS;
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_DEVICE_ACTION_SELECTION_BROADCAST;
-import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_DEVICE_ACTION_SELECTION_OFF;
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_DEVICE_ACTION_START_NON_WEAR_BROADCAST;
-import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_DEVICE_ACTION_START_NON_WEAR_SELECTION;
+import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_DEVICE_ACTION_START_NON_WEAR_SELECTIONS;
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_DEVICE_ACTION_WOKE_UP_BROADCAST;
-import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_DEVICE_ACTION_WOKE_UP_SELECTION;
+import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_DEVICE_ACTION_WOKE_UP_SELECTIONS;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_DISPLAY_ITEMS;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_DISPLAY_ITEMS_SORTABLE;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_EXPOSE_HR_THIRDPARTY;
@@ -845,15 +842,16 @@ public class DeviceSpecificSettingsFragment extends AbstractPreferenceFragment i
         new PasswordCapabilityImpl().registerPreferences(getContext(), coordinator.getPasswordCapability(), this);
         new HeartRateCapability().registerPreferences(getContext(), coordinator.getHeartRateMeasurementIntervals(), this);
 
-        String deviceActionsFellSleepSelection = prefs.getString(PREF_DEVICE_ACTION_FELL_SLEEP_SELECTION, PREF_DEVICE_ACTION_SELECTION_OFF);
-        final Preference deviceActionsFellSleep = findPreference(PREF_DEVICE_ACTION_FELL_SLEEP_SELECTION);
+        Set<String> deviceActionsFellSleepSelection = prefs.getStringSet(PREF_DEVICE_ACTION_FELL_SLEEP_SELECTIONS, Collections.emptySet());
+        final Preference deviceActionsFellSleep = findPreference(PREF_DEVICE_ACTION_FELL_SLEEP_SELECTIONS);
         final Preference deviceActionsFellSleepBroadcast = findPreference(PREF_DEVICE_ACTION_FELL_SLEEP_BROADCAST);
-        boolean deviceActionsFellSleepSelectionBroadcast = deviceActionsFellSleepSelection.equals(PREF_DEVICE_ACTION_SELECTION_BROADCAST);
+        boolean deviceActionsFellSleepSelectionBroadcast = deviceActionsFellSleepSelection.contains(PREF_DEVICE_ACTION_SELECTION_BROADCAST);
         if (deviceActionsFellSleep != null) {
             deviceActionsFellSleep.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
                 @Override
                 public boolean onPreferenceChange(Preference preference, Object newVal) {
-                    final boolean broadcast = PREF_DEVICE_ACTION_SELECTION_BROADCAST.equals(newVal.toString());
+                    final Set<String> newValSet = (Set<String>) newVal;
+                    final boolean broadcast = newValSet.contains(PREF_DEVICE_ACTION_SELECTION_BROADCAST);
                     Objects.requireNonNull(deviceActionsFellSleepBroadcast).setEnabled(broadcast);
                     return true;
                 }
@@ -863,15 +861,16 @@ public class DeviceSpecificSettingsFragment extends AbstractPreferenceFragment i
             deviceActionsFellSleepBroadcast.setEnabled(deviceActionsFellSleepSelectionBroadcast);
         }
 
-        String deviceActionsWokeUpSelection = prefs.getString(PREF_DEVICE_ACTION_WOKE_UP_SELECTION, PREF_DEVICE_ACTION_SELECTION_OFF);
-        final Preference deviceActionsWokeUp = findPreference(PREF_DEVICE_ACTION_WOKE_UP_SELECTION);
+        Set<String> deviceActionsWokeUpSelection = prefs.getStringSet(PREF_DEVICE_ACTION_WOKE_UP_SELECTIONS, Collections.emptySet());
+        final Preference deviceActionsWokeUp = findPreference(PREF_DEVICE_ACTION_WOKE_UP_SELECTIONS);
         final Preference deviceActionsWokeUpBroadcast = findPreference(PREF_DEVICE_ACTION_WOKE_UP_BROADCAST);
-        boolean deviceActionsWokeUpSelectionBroadcast = deviceActionsWokeUpSelection.equals(PREF_DEVICE_ACTION_SELECTION_BROADCAST);
+        boolean deviceActionsWokeUpSelectionBroadcast = deviceActionsWokeUpSelection.contains(PREF_DEVICE_ACTION_SELECTION_BROADCAST);
         if (deviceActionsWokeUp != null) {
             deviceActionsWokeUp.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
                 @Override
                 public boolean onPreferenceChange(Preference preference, Object newVal) {
-                    final boolean broadcast = PREF_DEVICE_ACTION_SELECTION_BROADCAST.equals(newVal.toString());
+                    final Set<String> newValSet = (Set<String>) newVal;
+                    final boolean broadcast = newValSet.contains(PREF_DEVICE_ACTION_SELECTION_BROADCAST);
                     Objects.requireNonNull(deviceActionsWokeUpBroadcast).setEnabled(broadcast);
                     return true;
                 }
@@ -881,15 +880,16 @@ public class DeviceSpecificSettingsFragment extends AbstractPreferenceFragment i
             deviceActionsWokeUpBroadcast.setEnabled(deviceActionsWokeUpSelectionBroadcast);
         }
 
-        String deviceActionsStartNonWearSelection = prefs.getString(PREF_DEVICE_ACTION_START_NON_WEAR_SELECTION, PREF_DEVICE_ACTION_SELECTION_OFF);
-        final Preference deviceActionsStartNonWear = findPreference(PREF_DEVICE_ACTION_START_NON_WEAR_SELECTION);
+        Set<String> deviceActionsStartNonWearSelection = prefs.getStringSet(PREF_DEVICE_ACTION_START_NON_WEAR_SELECTIONS, Collections.emptySet());
+        final Preference deviceActionsStartNonWear = findPreference(PREF_DEVICE_ACTION_START_NON_WEAR_SELECTIONS);
         final Preference deviceActionsStartNonWearBroadcast = findPreference(PREF_DEVICE_ACTION_START_NON_WEAR_BROADCAST);
-        boolean deviceActionsStartNonWearSelectionBroadcast = deviceActionsStartNonWearSelection.equals(PREF_DEVICE_ACTION_SELECTION_BROADCAST);
+        boolean deviceActionsStartNonWearSelectionBroadcast = deviceActionsStartNonWearSelection.contains(PREF_DEVICE_ACTION_SELECTION_BROADCAST);
         if (deviceActionsStartNonWear != null) {
             deviceActionsStartNonWear.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
                 @Override
                 public boolean onPreferenceChange(Preference preference, Object newVal) {
-                    final boolean broadcast = PREF_DEVICE_ACTION_SELECTION_BROADCAST.equals(newVal.toString());
+                    final Set<String> newValSet = (Set<String>) newVal;
+                    final boolean broadcast = newValSet.contains(PREF_DEVICE_ACTION_SELECTION_BROADCAST);
                     Objects.requireNonNull(deviceActionsStartNonWearBroadcast).setEnabled(broadcast);
                     return true;
                 }
@@ -1030,6 +1030,9 @@ public class DeviceSpecificSettingsFragment extends AbstractPreferenceFragment i
         final Set<String> keysWithSummary = new HashSet<>();
 
         keysWithSummary.add(PREF_INACTIVITY_THRESHOLD);
+        keysWithSummary.add(PREF_DEVICE_ACTION_FELL_SLEEP_SELECTIONS);
+        keysWithSummary.add(PREF_DEVICE_ACTION_START_NON_WEAR_SELECTIONS);
+        keysWithSummary.add(PREF_DEVICE_ACTION_WOKE_UP_SELECTIONS);
 
         if (deviceSpecificSettingsCustomizer != null) {
             keysWithSummary.addAll(deviceSpecificSettingsCustomizer.getPreferenceKeysWithSummary());
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java
index 832c09f74..84e371f72 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java
@@ -46,9 +46,11 @@ import java.io.IOException;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.Locale;
 import java.util.Objects;
+import java.util.Set;
 import java.util.UUID;
 
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
@@ -533,16 +535,16 @@ public abstract class AbstractDeviceSupport implements DeviceSupport {
      * Helper method to run specific actions configured in the device preferences, upon wear state
      * or awake/asleep events.
      *
-     * @param action
+     * @param actions
      * @param message
      */
-    private void handleDeviceAction(String action, String message) {
-        String actionDisabled = getContext().getString(R.string.pref_button_action_disabled_value);
-
-        if (actionDisabled.equals(action)) {
+    private void handleDeviceAction(Set<String> actions, String message) {
+        if (actions.isEmpty()) {
             return;
         }
 
+        LOG.debug("Handing device actions: {}", String.join(",", actions));
+
         final String actionBroadcast = getContext().getString(R.string.pref_device_action_broadcast_value);
         final String actionFitnessControlStart = getContext().getString(R.string.pref_device_action_fitness_app_control_start_value);
         final String actionFitnessControlStop = getContext().getString(R.string.pref_device_action_fitness_app_control_stop_value);
@@ -555,71 +557,66 @@ public abstract class AbstractDeviceSupport implements DeviceSupport {
         final String actionDndAlarms = getContext().getString(R.string.pref_device_action_dnd_alarms_value);
         final String actionDndOn = getContext().getString(R.string.pref_device_action_dnd_on_value);
 
-        if (actionBroadcast.equals(action)) {
+        if (actions.contains(actionBroadcast)) {
             if (message != null) {
                 Intent in = new Intent();
                 in.setAction(message);
-                LOG.info("Sending broadcast " + message);
+                LOG.info("Sending broadcast {}", message);
                 getContext().getApplicationContext().sendBroadcast(in);
-                return;
             }
         }
 
-        if (actionFitnessControlStart.equals(action)) {
+        if (actions.contains(actionFitnessControlStart)) {
             OpenTracksController.startRecording(getContext());
-            return;
-        }
-
-        if (actionFitnessControlStop.equals(action)) {
+        } else if (actions.contains(actionFitnessControlStop)) {
             OpenTracksController.stopRecording(getContext());
-            return;
-        }
-
-        if (actionFitnessControlToggle.equals(action)) {
+        } else if (actions.contains(actionFitnessControlToggle)) {
             OpenTracksController.toggleRecording(getContext());
-            return;
         }
 
-        if (actionMediaPlay.equals(action) ||
-                actionMediaPause.equals(action) ||
-                actionMediaPlayPause.equals(action)
-        ) {
+        final String mediaAction;
+        if (actions.contains(actionMediaPlayPause)) {
+            mediaAction = actionMediaPlayPause;
+        } else if (actions.contains(actionMediaPause)) {
+            mediaAction = actionMediaPause;
+        } else if (actions.contains(actionMediaPlay)) {
+            mediaAction = actionMediaPlay;
+        } else {
+            mediaAction = null;
+        }
+
+        if (mediaAction != null) {
             GBDeviceEventMusicControl deviceEventMusicControl = new GBDeviceEventMusicControl();
-            deviceEventMusicControl.event = GBDeviceEventMusicControl.Event.valueOf(action);
+            deviceEventMusicControl.event = GBDeviceEventMusicControl.Event.valueOf(mediaAction);
             evaluateGBDeviceEvent(deviceEventMusicControl);
-            return;
         }
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             final NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
 
             final int interruptionFilter;
-            if (actionDndOff.equals(action)) {
+            if (actions.contains(actionDndOff)) {
                 interruptionFilter = NotificationManager.INTERRUPTION_FILTER_ALL;
-            } else if (actionDndpriority.equals(action)) {
+            } else if (actions.contains(actionDndpriority)) {
                 interruptionFilter = NotificationManager.INTERRUPTION_FILTER_PRIORITY;
-            } else if (actionDndAlarms.equals(action)) {
+            } else if (actions.contains(actionDndAlarms)) {
                 interruptionFilter = NotificationManager.INTERRUPTION_FILTER_ALARMS;
-            } else if (actionDndOn.equals(action)) {
+            } else if (actions.contains(actionDndOn)) {
                 interruptionFilter = NotificationManager.INTERRUPTION_FILTER_NONE;
             } else {
                 interruptionFilter = NotificationManager.INTERRUPTION_FILTER_UNKNOWN;
             }
 
             if (interruptionFilter != NotificationManager.INTERRUPTION_FILTER_UNKNOWN) {
-                LOG.debug("Setting do not disturb to {} for {}", interruptionFilter, action);
+                LOG.debug("Setting do not disturb to {}", interruptionFilter);
 
                 if (!notificationManager.isNotificationPolicyAccessGranted()) {
                     LOG.warn("Do not disturb permissions not granted");
-                    return;
                 }
 
                 notificationManager.setInterruptionFilter(interruptionFilter);
-                return;
             }
         }
-
-        LOG.warn("Unhandled device state change action (action: {}, message: {})", action, message);
     }
 
     private void handleGBDeviceEvent(GBDeviceEventSleepStateDetection event) {
@@ -629,18 +626,17 @@ public abstract class AbstractDeviceSupport implements DeviceSupport {
             return;
         }
 
-        String actionDisabled = getContext().getString(R.string.pref_button_action_disabled_value);
         String actionPreferenceKey, messagePreferenceKey;
         int defaultBroadcastMessageResource;
 
         switch (event.sleepState) {
             case AWAKE:
-                actionPreferenceKey = DeviceSettingsPreferenceConst.PREF_DEVICE_ACTION_WOKE_UP_SELECTION;
+                actionPreferenceKey = DeviceSettingsPreferenceConst.PREF_DEVICE_ACTION_WOKE_UP_SELECTIONS;
                 messagePreferenceKey = DeviceSettingsPreferenceConst.PREF_DEVICE_ACTION_WOKE_UP_BROADCAST;
                 defaultBroadcastMessageResource = R.string.prefs_events_forwarding_wokeup_broadcast_default_value;
                 break;
             case ASLEEP:
-                actionPreferenceKey = DeviceSettingsPreferenceConst.PREF_DEVICE_ACTION_FELL_SLEEP_SELECTION;
+                actionPreferenceKey = DeviceSettingsPreferenceConst.PREF_DEVICE_ACTION_FELL_SLEEP_SELECTIONS;
                 messagePreferenceKey = DeviceSettingsPreferenceConst.PREF_DEVICE_ACTION_FELL_SLEEP_BROADCAST;
                 defaultBroadcastMessageResource = R.string.prefs_events_forwarding_fellsleep_broadcast_default_value;
                 break;
@@ -649,14 +645,14 @@ public abstract class AbstractDeviceSupport implements DeviceSupport {
                 return;
         }
 
-        String action = getDevicePrefs().getString(actionPreferenceKey, actionDisabled);
+        Set<String> actions = getDevicePrefs().getStringSet(actionPreferenceKey, Collections.emptySet());
 
-        if (actionDisabled.equals(action)) {
+        if (actions.isEmpty()) {
             return;
         }
 
         String broadcastMessage = getDevicePrefs().getString(messagePreferenceKey, context.getString(defaultBroadcastMessageResource));
-        handleDeviceAction(action, broadcastMessage);
+        handleDeviceAction(actions, broadcastMessage);
     }
 
     private void handleGBDeviceEvent(GBDeviceEventWearState event) {
@@ -671,14 +667,13 @@ public abstract class AbstractDeviceSupport implements DeviceSupport {
             LOG.debug("WEAR_STATE state is not NOT_WEARING, aborting further evaluation");
         }
 
-        String valueDisabled = getContext().getString(R.string.pref_button_action_disabled_value);
-        String actionOnUnwear = getDevicePrefs().getString(
-                DeviceSettingsPreferenceConst.PREF_DEVICE_ACTION_START_NON_WEAR_SELECTION,
-                valueDisabled
+        Set<String> actionOnUnwear = getDevicePrefs().getStringSet(
+                DeviceSettingsPreferenceConst.PREF_DEVICE_ACTION_START_NON_WEAR_SELECTIONS,
+                Collections.emptySet()
         );
 
         // check if an action is set
-        if (actionOnUnwear.equals(valueDisabled)) {
+        if (actionOnUnwear.isEmpty()) {
             return;
         }
 
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 5df6eb42f..557afb49a 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
@@ -225,7 +225,6 @@ import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.Dev
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_TIMEFORMAT;
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_USER_FITNESS_GOAL_NOTIFICATION;
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_WEARLOCATION;
-import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_DEVICE_ACTION_SELECTION_OFF;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.Huami2021Service.WORKOUT_GPS_FLAG_POSITION;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.Huami2021Service.WORKOUT_GPS_FLAG_STATUS;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_BUTTON_ACTION_SELECTION_BROADCAST;
@@ -1825,7 +1824,7 @@ public abstract class HuamiSupport extends AbstractBTLEDeviceSupport implements
     }
 
     private void handleMediaButton(String mediaAction) {
-        if (mediaAction.equals(PREF_DEVICE_ACTION_SELECTION_OFF) || mediaAction.equals(PREF_BUTTON_ACTION_SELECTION_OFF)) {
+        if (mediaAction.equals(PREF_BUTTON_ACTION_SELECTION_OFF)) {
             return;
         }
         GBDeviceEventMusicControl deviceEventMusicControl = new GBDeviceEventMusicControl();
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 176b46307..4d05fdf2c 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string-array name="empty_array">
+        <!-- empty array -->
+    </string-array>
+
     <string-array name="pref_theme_options">
         <item>@string/pref_theme_system</item>
         <item>@string/pref_theme_light</item>
@@ -2554,7 +2558,6 @@
     </string-array>
 
     <string-array name="device_action_options">
-        <item>@string/pref_button_action_disabled</item>
         <item>@string/pref_media_play</item>
         <item>@string/pref_media_pause</item>
         <item>@string/pref_media_playpause</item>
@@ -2569,7 +2572,6 @@
     </string-array>
 
     <string-array name="device_action_values">
-        <item>@string/pref_button_action_disabled_value</item>
         <item>@string/pref_media_play_value</item>
         <item>@string/pref_media_pause_value</item>
         <item>@string/pref_media_playpause_value</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 089c7029c..2be00ba70 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2439,4 +2439,5 @@
     <string name="devicetype_xiaomi_watch_s1_active">Xiaomi Watch S1 Active</string>
     <string name="devicetype_mi_watch_color_sport">Mi Watch Color Sport</string>
     <string name="devicetype_pixoo">Pixoo</string>
+    <string name="not_set">Not set</string>
 </resources>
diff --git a/app/src/main/res/xml/devicesettings_device_actions.xml b/app/src/main/res/xml/devicesettings_device_actions.xml
index 39ca0a2d4..db353cfc6 100644
--- a/app/src/main/res/xml/devicesettings_device_actions.xml
+++ b/app/src/main/res/xml/devicesettings_device_actions.xml
@@ -12,12 +12,11 @@
             android:title="@string/prefs_events_forwarding_fellsleep"
             android:icon="@drawable/ic_nights_stay">
 
-            <ListPreference
+            <MultiSelectListPreference
                 android:entries="@array/device_action_options"
                 android:entryValues="@array/device_action_values"
-                android:key="events_forwarding_fellsleep_action_selection"
-                android:summary="%s"
-                android:defaultValue="@string/pref_button_action_disabled_value"
+                android:key="events_forwarding_fellsleep_action_selections"
+                android:defaultValue="@array/empty_array"
                 android:title="@string/prefs_events_forwarding_action_title" />
             <EditTextPreference
                 android:defaultValue="@string/prefs_events_forwarding_fellsleep_broadcast_default_value"
@@ -30,12 +29,11 @@
             android:title="@string/prefs_events_forwarding_wokeup"
             android:icon="@drawable/ic_wb_sunny">
 
-            <ListPreference
+            <MultiSelectListPreference
                 android:entries="@array/device_action_options"
                 android:entryValues="@array/device_action_values"
-                android:key="events_forwarding_wokeup_action_selection"
-                android:summary="%s"
-                android:defaultValue="@string/pref_button_action_disabled_value"
+                android:key="events_forwarding_wokeup_action_selections"
+                android:defaultValue="@array/empty_array"
                 android:title="@string/prefs_events_forwarding_action_title" />
             <EditTextPreference
                 android:defaultValue="@string/prefs_events_forwarding_wokeup_broadcast_default_value"
@@ -48,12 +46,12 @@
             android:title="@string/prefs_events_forwarding_startnonwear"
             android:icon="@drawable/ic_no_watch">
 
-            <ListPreference
+            <MultiSelectListPreference
                 android:entries="@array/device_action_options"
                 android:entryValues="@array/device_action_values"
-                android:key="events_forwarding_startnonwear_action_selection"
+                android:key="events_forwarding_startnonwear_action_selections"
                 android:summary="%s"
-                android:defaultValue="@string/pref_button_action_disabled_value"
+                android:defaultValue="@array/empty_array"
                 android:title="@string/prefs_events_forwarding_action_title" />
             <EditTextPreference
                 android:defaultValue="@string/prefs_events_forwarding_startnonwear_broadcast_default_value"
diff --git a/app/src/main/res/xml/devicesettings_device_actions_without_not_wear.xml b/app/src/main/res/xml/devicesettings_device_actions_without_not_wear.xml
index 917f19656..18e37e828 100644
--- a/app/src/main/res/xml/devicesettings_device_actions_without_not_wear.xml
+++ b/app/src/main/res/xml/devicesettings_device_actions_without_not_wear.xml
@@ -12,11 +12,11 @@
             android:icon="@drawable/ic_nights_stay"
             android:title="@string/prefs_events_forwarding_fellsleep">
 
-            <ListPreference
-                android:defaultValue="@string/pref_button_action_disabled_value"
+            <MultiSelectListPreference
+                android:defaultValue="@array/empty_array"
                 android:entries="@array/device_action_options"
                 android:entryValues="@array/device_action_values"
-                android:key="events_forwarding_fellsleep_action_selection"
+                android:key="events_forwarding_fellsleep_action_selections"
                 android:summary="%s"
                 android:title="@string/prefs_events_forwarding_action_title" />
             <EditTextPreference
@@ -30,11 +30,11 @@
             android:icon="@drawable/ic_wb_sunny"
             android:title="@string/prefs_events_forwarding_wokeup">
 
-            <ListPreference
-                android:defaultValue="@string/pref_button_action_disabled_value"
+            <MultiSelectListPreference
+                android:defaultValue="@array/empty_array"
                 android:entries="@array/device_action_options"
                 android:entryValues="@array/device_action_values"
-                android:key="events_forwarding_wokeup_action_selection"
+                android:key="events_forwarding_wokeup_action_selections"
                 android:summary="%s"
                 android:title="@string/prefs_events_forwarding_action_title" />
             <EditTextPreference

From ef73ea1bd5b4ab5b293d7b36902531b5e1bb4dce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sun, 10 Dec 2023 10:30:27 +0000
Subject: [PATCH 219/595] Make LimitedQueue generic

---
 .../gadgetbridge/GBApplication.java           |  4 +--
 .../charts/AbstractWeekChartFragment.java     |  4 +--
 .../charts/ActivityChartsActivity.java        |  3 +-
 .../externalevents/NotificationListener.java  | 34 ++++++-------------
 .../service/AbstractDeviceSupport.java        |  2 +-
 .../banglejs/BangleJSDeviceSupport.java       |  4 +--
 .../services/ZeppOsNotificationService.java   |  4 +--
 .../gadgetbridge/util/LimitedQueue.java       | 28 +++++++--------
 ...evicesettings_autoremove_notifications.xml |  2 +-
 9 files changed, 37 insertions(+), 48 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
index 56ec02f93..496ea4fde 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
@@ -124,7 +124,7 @@ public class GBApplication extends Application {
     //if preferences have to be migrated, increment the following and add the migration logic in migratePrefs below; see http://stackoverflow.com/questions/16397848/how-can-i-migrate-android-preferences-with-a-new-version
     private static final int CURRENT_PREFS_VERSION = 28;
 
-    private static LimitedQueue mIDSenderLookup = new LimitedQueue(16);
+    private static final LimitedQueue<Integer, String> mIDSenderLookup = new LimitedQueue<>(16);
     private static Prefs prefs;
     private static GBPrefs gbPrefs;
     private static LockHandler lockHandler;
@@ -1481,7 +1481,7 @@ public class GBApplication extends Application {
         LocalBroadcastManager.getInstance(context).sendBroadcast(intent);
     }
 
-    public static LimitedQueue getIDSenderLookup() {
+    public static LimitedQueue<Integer, String> getIDSenderLookup() {
         return mIDSenderLookup;
     }
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractWeekChartFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractWeekChartFragment.java
index d8c22f75c..48fcff7ea 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractWeekChartFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractWeekChartFragment.java
@@ -371,14 +371,14 @@ public abstract class AbstractWeekChartFragment extends AbstractActivityChartFra
 
     private ActivityAmounts getActivityAmountsForDay(DBHandler db, Calendar day, GBDevice device) {
 
-        LimitedQueue activityAmountCache = null;
+        LimitedQueue<Integer, ActivityAmounts> activityAmountCache = null;
         ActivityAmounts amounts = null;
 
         Activity activity = getActivity();
         int key = (int) (day.getTimeInMillis() / 1000) + (mOffsetHours * 3600);
         if (activity != null) {
             activityAmountCache = ((ActivityChartsActivity) activity).mActivityAmountCache;
-            amounts = (ActivityAmounts) (activityAmountCache.lookup(key));
+            amounts = activityAmountCache.lookup(key);
         }
 
         if (amounts == null) {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityChartsActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityChartsActivity.java
index d4b702e5d..d3d818bd7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityChartsActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityChartsActivity.java
@@ -33,12 +33,13 @@ import nodomain.freeyourgadget.gadgetbridge.activities.AbstractFragmentPagerAdap
 import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
 import nodomain.freeyourgadget.gadgetbridge.devices.DeviceCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.model.ActivityAmounts;
 import nodomain.freeyourgadget.gadgetbridge.model.RecordedDataTypes;
 import nodomain.freeyourgadget.gadgetbridge.util.LimitedQueue;
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 
 public class ActivityChartsActivity extends AbstractChartsActivity {
-    LimitedQueue mActivityAmountCache = new LimitedQueue(60);
+    LimitedQueue<Integer, ActivityAmounts> mActivityAmountCache = new LimitedQueue<>(60);
 
     @Override
     protected AbstractFragmentPagerAdapter createFragmentPagerAdapter(final FragmentManager fragmentManager) {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
index 389ed4364..e9fbfb2f4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
@@ -83,17 +83,6 @@ import nodomain.freeyourgadget.gadgetbridge.util.MediaManager;
 import nodomain.freeyourgadget.gadgetbridge.util.NotificationUtils;
 import nodomain.freeyourgadget.gadgetbridge.util.PebbleUtils;
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
 
 import static nodomain.freeyourgadget.gadgetbridge.activities.NotificationFilterActivity.NOTIFICATION_FILTER_MODE_BLACKLIST;
 import static nodomain.freeyourgadget.gadgetbridge.activities.NotificationFilterActivity.NOTIFICATION_FILTER_MODE_WHITELIST;
@@ -115,9 +104,9 @@ public class NotificationListener extends NotificationListenerService {
     public static final String ACTION_REPLY
             = "nodomain.freeyourgadget.gadgetbridge.notificationlistener.action.reply";
 
-    private final LimitedQueue mActionLookup = new LimitedQueue(32);
-    private final LimitedQueue mPackageLookup = new LimitedQueue(64);
-    private final LimitedQueue mNotificationHandleLookup = new LimitedQueue(128);
+    private final LimitedQueue<Integer, NotificationCompat.Action> mActionLookup = new LimitedQueue<>(32);
+    private final LimitedQueue<Integer, String> mPackageLookup = new LimitedQueue<>(64);
+    private final LimitedQueue<Integer, Long> mNotificationHandleLookup = new LimitedQueue<>(128);
 
     private final HashMap<String, Long> notificationBurstPrevention = new HashMap<>();
     private final HashMap<String, Long> notificationOldRepeatPrevention = new HashMap<>();
@@ -158,7 +147,7 @@ public class NotificationListener extends NotificationListenerService {
 
                 case ACTION_OPEN: {
                     StatusBarNotification[] sbns = NotificationListener.this.getActiveNotifications();
-                    Long ts = (Long) mNotificationHandleLookup.lookup(handle);
+                    Long ts = mNotificationHandleLookup.lookup(handle);
                     if (ts == null) {
                         LOG.info("could not lookup handle for open action");
                         break;
@@ -179,7 +168,7 @@ public class NotificationListener extends NotificationListenerService {
                     break;
                 }
                 case ACTION_MUTE:
-                    String packageName = (String) mPackageLookup.lookup(handle);
+                    String packageName = mPackageLookup.lookup(handle);
                     if (packageName == null) {
                         LOG.info("could not lookup handle for mute action");
                         break;
@@ -193,7 +182,7 @@ public class NotificationListener extends NotificationListenerService {
                     break;
                 case ACTION_DISMISS: {
                     StatusBarNotification[] sbns = NotificationListener.this.getActiveNotifications();
-                    Long ts = (Long) mNotificationHandleLookup.lookup(handle);
+                    Long ts = mNotificationHandleLookup.lookup(handle);
                     if (ts == null) {
                         LOG.info("could not lookup handle for dismiss action");
                         break;
@@ -210,7 +199,7 @@ public class NotificationListener extends NotificationListenerService {
                     NotificationListener.this.cancelAllNotifications();
                     break;
                 case ACTION_REPLY:
-                    NotificationCompat.Action wearableAction = (NotificationCompat.Action) mActionLookup.lookup(handle);
+                    NotificationCompat.Action wearableAction = mActionLookup.lookup(handle);
                     String reply = intent.getStringExtra("reply");
                     if (wearableAction != null) {
                         PendingIntent actionIntent = wearableAction.getActionIntent();
@@ -766,17 +755,16 @@ public class NotificationListener extends NotificationListenerService {
         if (shouldIgnoreNotification(sbn, true)) return;
 
         // Build list of all currently active notifications
-        ArrayList<Integer> activeNotificationsIds = new ArrayList<Integer>();
+        ArrayList<Integer> activeNotificationsIds = new ArrayList<>();
         for (StatusBarNotification notification : getActiveNotifications()) {
-            Object o = mNotificationHandleLookup.lookupByValue(notification.getPostTime());
-            if (o != null) {
-                int id = (int) o;
+            Integer id = mNotificationHandleLookup.lookupByValue(notification.getPostTime());
+            if (id != null) {
                 activeNotificationsIds.add(id);
             }
         }
 
         // Build list of notifications that aren't active anymore
-        ArrayList<Integer> notificationsToRemove = new ArrayList<Integer>();
+        ArrayList<Integer> notificationsToRemove = new ArrayList<>();
         for (int notificationId : notificationsActive) {
             if (!activeNotificationsIds.contains(notificationId)) {
                 notificationsToRemove.add(notificationId);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java
index 84e371f72..e9a89ac27 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java
@@ -461,7 +461,7 @@ public abstract class AbstractDeviceSupport implements DeviceSupport {
                 break;
             case REPLY:
                 if (deviceEvent.phoneNumber == null) {
-                    deviceEvent.phoneNumber = (String) GBApplication.getIDSenderLookup().lookup((int) (deviceEvent.handle >> 4));
+                    deviceEvent.phoneNumber = GBApplication.getIDSenderLookup().lookup((int) (deviceEvent.handle >> 4));
                 }
                 if (deviceEvent.phoneNumber != null) {
                     LOG.info("Got notification reply for SMS from " + deviceEvent.phoneNumber + " : " + deviceEvent.reply);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java
index 5c051bbe6..c0cee6b81 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java
@@ -159,7 +159,7 @@ public class BangleJSDeviceSupport extends AbstractBTLEDeviceSupport {
     /// Last battery percentage reported (or -1) to help with smoothing reported battery levels
     private int lastBatteryPercent = -1;
 
-    private final LimitedQueue/*Long*/ mNotificationReplyAction = new LimitedQueue(16);
+    private final LimitedQueue<Integer, Long> mNotificationReplyAction = new LimitedQueue<>(16);
 
     private boolean gpsUpdateSetup = false;
 
@@ -623,7 +623,7 @@ public class BangleJSDeviceSupport extends AbstractBTLEDeviceSupport {
         /* REPLY responses don't use the ID from the event (MUTE/etc seem to), but instead
          * they use a handle that was provided in an action list on the onNotification.. event  */
         if (deviceEvtNotificationControl.event == GBDeviceEventNotificationControl.Event.REPLY) {
-            Long foundHandle = (Long)mNotificationReplyAction.lookup((int)deviceEvtNotificationControl.handle);
+            Long foundHandle = mNotificationReplyAction.lookup((int)deviceEvtNotificationControl.handle);
             if (foundHandle!=null)
                 deviceEvtNotificationControl.handle = foundHandle;
         }
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 715d7f1dd..f6c12c56c 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
@@ -70,7 +70,7 @@ public class ZeppOsNotificationService extends AbstractZeppOsService {
 
     // Keep track of Notification ID -> action handle, as BangleJSDeviceSupport.
     // This needs to be simplified.
-    private final LimitedQueue mNotificationReplyAction = new LimitedQueue(16);
+    private final LimitedQueue<Integer, Long> mNotificationReplyAction = new LimitedQueue<>(16);
 
     private final ZeppOsFileTransferService fileTransferService;
 
@@ -98,7 +98,7 @@ public class ZeppOsNotificationService extends AbstractZeppOsService {
             case NOTIFICATION_CMD_REPLY:
                 // TODO make this configurable?
                 final int notificationId = BLETypeConversions.toUint32(subarray(payload, 1, 5));
-                final Long replyHandle = (Long) mNotificationReplyAction.lookup(notificationId);
+                final Long replyHandle = mNotificationReplyAction.lookup(notificationId);
                 if (replyHandle == null) {
                     LOG.warn("Failed to find reply handle for notification ID {}", notificationId);
                     return;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/LimitedQueue.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/LimitedQueue.java
index 846f94e0d..df51b110d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/LimitedQueue.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/LimitedQueue.java
@@ -22,41 +22,41 @@ import android.util.Pair;
 import java.util.Iterator;
 import java.util.LinkedList;
 
-public class LimitedQueue {
+public class LimitedQueue<K, V> {
     private final int limit;
-    private LinkedList<Pair> list = new LinkedList<>();
+    private final LinkedList<Pair<K, V>> list = new LinkedList<>();
 
-    public LimitedQueue(int limit) {
+    public LimitedQueue(final int limit) {
         this.limit = limit;
     }
 
-    synchronized public void add(int id, Object obj) {
+    synchronized public void add(final K id, final V obj) {
         if (list.size() > limit - 1) {
             list.removeFirst();
         }
         list.add(new Pair<>(id, obj));
     }
 
-    synchronized public void remove(int id) {
-        for (Iterator<Pair> iter = list.iterator(); iter.hasNext(); ) {
-            Pair pair = iter.next();
-            if ((Integer) pair.first == id) {
-                iter.remove();
+    synchronized public void remove(final K id) {
+        for (final Iterator<Pair<K, V>> it = list.iterator(); it.hasNext(); ) {
+            Pair<K, V> pair = it.next();
+            if (id.equals(pair.first)) {
+                it.remove();
             }
         }
     }
 
-    synchronized public Object lookup(int id) {
-        for (Pair entry : list) {
-            if (id == (Integer) entry.first) {
+    synchronized public V lookup(final K id) {
+        for (final Pair<K, V> entry : list) {
+            if (id.equals(entry.first)) {
                 return entry.second;
             }
         }
         return null;
     }
 
-    synchronized public Object lookupByValue(Object value){
-        for (Pair entry : list) {
+    synchronized public K lookupByValue(final V value){
+        for (final Pair<K, V> entry : list) {
             if (value.equals(entry.second)) {
                 return entry.first;
             }
diff --git a/app/src/main/res/xml/devicesettings_autoremove_notifications.xml b/app/src/main/res/xml/devicesettings_autoremove_notifications.xml
index 0ecb6d6aa..682b7156c 100644
--- a/app/src/main/res/xml/devicesettings_autoremove_notifications.xml
+++ b/app/src/main/res/xml/devicesettings_autoremove_notifications.xml
@@ -6,4 +6,4 @@
         android:key="autoremove_notifications"
         android:summary="@string/pref_summary_autoremove_notifications"
         android:title="@string/pref_title_autoremove_notifications" />
-</androidx.preference.PreferenceScreen>
\ No newline at end of file
+</androidx.preference.PreferenceScreen>

From 18686e98c565348ee8668edb84adafbf098c1656 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sun, 10 Dec 2023 10:36:14 +0000
Subject: [PATCH 220/595] Xiaomi: Delete notification from watch when dismissed
 from phone

---
 .../services/XiaomiNotificationService.java   | 31 ++++++++++++++++++-
 app/src/main/proto/xiaomi.proto               |  2 +-
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
index a538bc89f..d0ee2fb6a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
@@ -46,6 +46,7 @@ import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiPreferences;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
 import nodomain.freeyourgadget.gadgetbridge.util.BitmapUtil;
+import nodomain.freeyourgadget.gadgetbridge.util.LimitedQueue;
 import nodomain.freeyourgadget.gadgetbridge.util.NotificationUtils;
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 import nodomain.freeyourgadget.gadgetbridge.util.StringUtils;
@@ -73,6 +74,10 @@ public class XiaomiNotificationService extends AbstractXiaomiService implements
     // requests with the package name truncated, and without an ID
     private final Queue<String> mPackages = new LinkedList<>();
 
+    // Keep track of package names and keys for notification dismissal
+    private final LimitedQueue<Integer, String> mNotificationPackageName = new LimitedQueue<>(128);
+    private final LimitedQueue<Integer, String> mNotificationKey = new LimitedQueue<>(128);
+
     private String iconPackageName;
 
     public XiaomiNotificationService(final XiaomiSupport support) {
@@ -166,6 +171,9 @@ public class XiaomiNotificationService extends AbstractXiaomiService implements
             notification3.setPackage(BuildConfig.APPLICATION_ID);
         }
 
+        mNotificationPackageName.add(notificationSpec.getId(), notificationSpec.sourceAppId);
+        mNotificationKey.add(notificationSpec.getId(), notificationSpec.key);
+
         mPackages.add(notification3.getPackage());
         if (mPackages.size() > 32) {
             mPackages.poll();
@@ -213,7 +221,28 @@ public class XiaomiNotificationService extends AbstractXiaomiService implements
             return;
         }
 
-        // TODO
+        final XiaomiProto.NotificationId notificationId = XiaomiProto.NotificationId.newBuilder()
+                .setId(id)
+                .setPackage(mNotificationPackageName.lookup(id))
+                .setKey(mNotificationKey.lookup(id))
+                .build();
+
+        final XiaomiProto.NotificationDismiss notificationDismiss = XiaomiProto.NotificationDismiss.newBuilder()
+                .addNotificationId(notificationId)
+                .build();
+
+        final XiaomiProto.Notification notification = XiaomiProto.Notification.newBuilder()
+                .setNotificationDismiss(notificationDismiss)
+                .build();
+
+        getSupport().sendCommand(
+                "delete notification " + id,
+                XiaomiProto.Command.newBuilder()
+                        .setType(COMMAND_TYPE)
+                        .setSubtype(CMD_NOTIFICATION_DISMISS)
+                        .setNotification(notification)
+                        .build()
+        );
     }
 
     public void onSetCallState(final CallSpec callSpec) {
diff --git a/app/src/main/proto/xiaomi.proto b/app/src/main/proto/xiaomi.proto
index efb911140..2ed83fc50 100644
--- a/app/src/main/proto/xiaomi.proto
+++ b/app/src/main/proto/xiaomi.proto
@@ -624,7 +624,7 @@ message NotificationDismiss {
 message NotificationId {
   optional uint32 id = 1;
   optional string package = 2; // truncated
-  optional string unknown4 = 4; // ""
+  optional string key = 4; // ""
 }
 
 message CannedMessages {

From 4635bf018aef1003965a7c588dbaf3b546ae5852 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sun, 10 Dec 2023 10:42:07 +0000
Subject: [PATCH 221/595] Xiaomi: Enable autoremove dismissed notifications
 preference

---
 .../gadgetbridge/devices/xiaomi/XiaomiCoordinator.java         | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
index c9a2a275b..317a4cd4c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
@@ -384,12 +384,11 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
         // Notifications
         //
         settings.add(R.xml.devicesettings_header_notifications);
-        // TODO not implemented settings.add(R.xml.devicesettings_display_caller);
         // TODO not implemented settings.add(R.xml.devicesettings_vibrationpatterns);
         // TODO not implemented settings.add(R.xml.devicesettings_donotdisturb_withauto_and_always);
         settings.add(R.xml.devicesettings_send_app_notifications);
         settings.add(R.xml.devicesettings_screen_on_on_notifications);
-        // TODO not implemented settings.add(R.xml.devicesettings_autoremove_notifications);
+        settings.add(R.xml.devicesettings_autoremove_notifications);
         if (getCannedRepliesSlotCount(device) > 0) {
             settings.add(R.xml.devicesettings_canned_dismisscall_16);
         }

From dd0c9cf3e073a9d5be4786dd04acfd190d0acb3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sun, 10 Dec 2023 11:02:22 +0000
Subject: [PATCH 222/595] Xiaomi: Configure fitness goal notification and
 secondary goal

---
 .../DeviceSettingsPreferenceConst.java        |  1 +
 .../DeviceSpecificSettingsFragment.java       |  1 +
 .../devices/xiaomi/XiaomiCoordinator.java     |  3 +-
 .../xiaomi/services/XiaomiHealthService.java  | 66 ++++++++++++++++++-
 app/src/main/res/values/arrays.xml            | 10 +++
 app/src/main/res/values/strings.xml           |  3 +
 .../res/xml/devicesettings_goal_secondary.xml | 12 ++++
 7 files changed, 93 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/res/xml/devicesettings_goal_secondary.xml

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
index 89426647f..ea7b3d088 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
@@ -371,6 +371,7 @@ public class DeviceSettingsPreferenceConst {
     public static final String PREF_AUTH_KEY = "authkey";
     public static final String PREF_USER_FITNESS_GOAL = "fitness_goal";
     public static final String PREF_USER_FITNESS_GOAL_NOTIFICATION = "fitness_goal_notification";
+    public static final String PREF_USER_FITNESS_GOAL_SECONDARY = "fitness_goal_secondary";
 
     public static final String PREF_HOURLY_CHIME_ENABLE = "hourly_chime_enable";
     public static final String PREF_HOURLY_CHIME_START = "hourly_chime_start";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
index eaf04b249..a7db56e3d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
@@ -515,6 +515,7 @@ public class DeviceSpecificSettingsFragment extends AbstractPreferenceFragment i
         addPreferenceHandlerFor(PREF_QC35_NOISE_CANCELLING_LEVEL);
         addPreferenceHandlerFor(PREF_USER_FITNESS_GOAL);
         addPreferenceHandlerFor(PREF_USER_FITNESS_GOAL_NOTIFICATION);
+        addPreferenceHandlerFor(PREF_USER_FITNESS_GOAL_SECONDARY);
 
         addPreferenceHandlerFor(PREF_UM25_SHOW_THRESHOLD_NOTIFICATION);
         addPreferenceHandlerFor(PREF_UM25_SHOW_THRESHOLD);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
index 317a4cd4c..b79833e4d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
@@ -371,7 +371,8 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
         settings.add(R.xml.devicesettings_heartrate_sleep_alert_activity_stress_spo2);
         settings.add(R.xml.devicesettings_inactivity_dnd_no_threshold);
         settings.add(R.xml.devicesettings_sleep_mode_schedule);
-        // TODO not implemented settings.add(R.xml.devicesettings_goal_notification);
+        settings.add(R.xml.devicesettings_goal_notification);
+        settings.add(R.xml.devicesettings_goal_secondary);
 
         //
         // Workout
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
index 864cbfdc0..5337fbedb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
@@ -52,7 +52,6 @@ import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
 import nodomain.freeyourgadget.gadgetbridge.model.ActivityUser;
 import nodomain.freeyourgadget.gadgetbridge.model.DeviceService;
 import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
-import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiPreferences;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.XiaomiActivityFileFetcher;
@@ -78,6 +77,8 @@ public class XiaomiHealthService extends AbstractXiaomiService {
     private static final int CMD_CONFIG_STANDING_REMINDER_SET = 13;
     private static final int CMD_CONFIG_STRESS_GET = 14;
     private static final int CMD_CONFIG_STRESS_SET = 15;
+    private static final int CMD_CONFIG_GOAL_GET = 21;
+    private static final int CMD_CONFIG_GOAL_SET = 22;
     private static final int CMD_WORKOUT_WATCH_STATUS = 26;
     private static final int CMD_WORKOUT_WATCH_OPEN = 30;
     private static final int CMD_WORKOUT_LOCATION = 48;
@@ -127,7 +128,6 @@ public class XiaomiHealthService extends AbstractXiaomiService {
             case CMD_CONFIG_HEART_RATE_SET:
                 LOG.debug("Got heart rate set ack, status={}", cmd.getStatus());
                 return;
-
             case CMD_CONFIG_HEART_RATE_GET:
                 handleHeartRateConfig(cmd.getHealth().getHeartRate());
                 return;
@@ -143,6 +143,12 @@ public class XiaomiHealthService extends AbstractXiaomiService {
             case CMD_CONFIG_STRESS_SET:
                 LOG.debug("Got stress set ack, status={}", cmd.getStatus());
                 return;
+            case CMD_CONFIG_GOAL_GET:
+                handleGoalConfig(cmd.getHealth().getAchievementReminders());
+                return;
+            case CMD_CONFIG_GOAL_SET:
+                LOG.debug("Got goal set ack, status={}", cmd.getStatus());
+                return;
             case CMD_WORKOUT_WATCH_STATUS:
                 handleWorkoutStatus(cmd.getHealth().getWorkoutStatusWatch());
                 return;
@@ -164,6 +170,7 @@ public class XiaomiHealthService extends AbstractXiaomiService {
         getSupport().sendCommand("get heart rate config", COMMAND_TYPE, CMD_CONFIG_HEART_RATE_GET);
         getSupport().sendCommand("get standing reminders config", COMMAND_TYPE, CMD_CONFIG_STANDING_REMINDER_GET);
         getSupport().sendCommand("get stress config", COMMAND_TYPE, CMD_CONFIG_STRESS_GET);
+        getSupport().sendCommand("get goal config", COMMAND_TYPE, CMD_CONFIG_GOAL_GET);
     }
 
     @Override
@@ -179,6 +186,10 @@ public class XiaomiHealthService extends AbstractXiaomiService {
             case ActivityUser.PREF_USER_ACTIVETIME_MINUTES:
                 setUserInfo();
                 return true;
+            case DeviceSettingsPreferenceConst.PREF_USER_FITNESS_GOAL_NOTIFICATION:
+            case DeviceSettingsPreferenceConst.PREF_USER_FITNESS_GOAL_SECONDARY:
+                sendGoalConfig();
+                return true;
             case DeviceSettingsPreferenceConst.PREF_HEARTRATE_USE_FOR_SLEEP_DETECTION:
             case DeviceSettingsPreferenceConst.PREF_HEARTRATE_SLEEP_BREATHING_QUALITY_MONITORING:
             case DeviceSettingsPreferenceConst.PREF_HEARTRATE_MEASUREMENT_INTERVAL:
@@ -253,6 +264,57 @@ public class XiaomiHealthService extends AbstractXiaomiService {
         );
     }
 
+    private void handleGoalConfig(final XiaomiProto.AchievementReminders achievementReminders) {
+        LOG.debug("Got goal config");
+
+        final String secondaryValue;
+
+        switch (achievementReminders.getSuggested()) {
+            case 0:
+                secondaryValue = "active_time";
+                break;
+            case 1:
+            default:
+                secondaryValue = "standing_time";
+        }
+
+        final GBDeviceEventUpdatePreferences eventUpdatePreferences = new GBDeviceEventUpdatePreferences()
+                .withPreference(DeviceSettingsPreferenceConst.PREF_USER_FITNESS_GOAL_NOTIFICATION, achievementReminders.getEnabled())
+                .withPreference(DeviceSettingsPreferenceConst.PREF_USER_FITNESS_GOAL_SECONDARY, secondaryValue);
+
+        getSupport().evaluateGBDeviceEvent(eventUpdatePreferences);
+    }
+
+    public void sendGoalConfig() {
+        final boolean goalNotification = getDevicePrefs().getBoolean(DeviceSettingsPreferenceConst.PREF_USER_FITNESS_GOAL_NOTIFICATION, false);
+        final String goalSecondary = getDevicePrefs().getString(DeviceSettingsPreferenceConst.PREF_USER_FITNESS_GOAL_SECONDARY, "standing_time");
+
+        LOG.debug("Setting goal config, notification={}, secondary={}", goalNotification, goalSecondary);
+
+        final XiaomiProto.AchievementReminders.Builder achievementReminders = XiaomiProto.AchievementReminders.newBuilder()
+                .setEnabled(goalNotification)
+                .setSuggested(1);
+
+        if (goalSecondary.equals("active_time")) {
+            achievementReminders.setSuggested(0);
+        } else {
+            achievementReminders.setSuggested(1);
+        }
+
+        final XiaomiProto.Health health = XiaomiProto.Health.newBuilder()
+                .setAchievementReminders(achievementReminders)
+                .build();
+
+        getSupport().sendCommand(
+                "set goal config",
+                XiaomiProto.Command.newBuilder()
+                        .setType(COMMAND_TYPE)
+                        .setSubtype(CMD_CONFIG_GOAL_SET)
+                        .setHealth(health)
+                        .build()
+        );
+    }
+
     private void handleSpo2Config(final XiaomiProto.SpO2 spo2) {
         LOG.debug("Got SpO2 config");
 
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 4d05fdf2c..5447d402c 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -2089,6 +2089,16 @@
         <item>@string/timeformat_am_pm</item>
     </string-array>
 
+    <string-array name="goal_fitness_secondary_goal_values">
+        <item>active_time</item>
+        <item>standing_time</item>
+    </string-array>
+
+    <string-array name="goal_fitness_secondary_goal_entries">
+        <item>@string/active_time</item>
+        <item>@string/standing_time</item>
+    </string-array>
+
     <string-array name="pref_timeformat_values">
         <item>@string/p_timeformat_auto</item>
         <item>@string/p_timeformat_24h</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2be00ba70..121163615 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -408,6 +408,7 @@
     <string name="pref_title_unit_system">Units</string>
     <string name="pref_title_timeformat">Time format</string>
     <string name="pref_title_screentime">Screen on duration</string>
+    <string name="pref_title_goal_secondary">Secondary goal</string>
     <string name="prefs_title_all_day_heart_rate">All day heart rate measurement</string>
     <string name="preferences_hplus_settings">HPlus/Makibes settings</string>
     <!-- WatchXPlus Preferences -->
@@ -1100,6 +1101,8 @@
     <string name="activity_prefs_activetime_minutes">Daily target: active time in minutes</string>
     <string name="activity_prefs_goal_standing_time_minutes">Daily target: standing time in minutes</string>
     <string name="activity_prefs_goal_fat_burn_time_minutes">Daily target: fat burn time in minutes</string>
+    <string name="active_time">Active time</string>
+    <string name="standing_time">Standing time</string>
     <string name="pref_title_pebble_health_store_raw">Store raw record in the database</string>
     <string name="pref_summary_pebble_health_store_raw">Stores the data \"as is\", increasing the database usage to allow for later interpretation.</string>
     <string name="action_db_management">Data management</string>
diff --git a/app/src/main/res/xml/devicesettings_goal_secondary.xml b/app/src/main/res/xml/devicesettings_goal_secondary.xml
new file mode 100644
index 000000000..bfb1c47d0
--- /dev/null
+++ b/app/src/main/res/xml/devicesettings_goal_secondary.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <ListPreference
+        android:defaultValue="standing_time"
+        android:entries="@array/goal_fitness_secondary_goal_entries"
+        android:entryValues="@array/goal_fitness_secondary_goal_values"
+        android:icon="@drawable/ic_star_gray"
+        android:key="fitness_goal_secondary"
+        android:title="@string/pref_title_goal_secondary"
+        app:useSimpleSummaryProvider="true" />
+</androidx.preference.PreferenceScreen>

From c38d2044d86998993c681a6d80bf9557c13fb43e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sun, 10 Dec 2023 11:19:01 +0000
Subject: [PATCH 223/595] Xiaomi: Add vitality score notification preferences

---
 .../DeviceSettingsPreferenceConst.java        |  2 +
 .../DeviceSpecificSettingsFragment.java       |  3 ++
 .../devices/xiaomi/XiaomiCoordinator.java     |  1 +
 .../xiaomi/services/XiaomiHealthService.java  | 48 +++++++++++++++++++
 app/src/main/res/drawable/ic_health.xml       | 10 ++++
 app/src/main/res/values/strings.xml           |  5 ++
 .../res/xml/devicesettings_vitality_score.xml | 23 +++++++++
 7 files changed, 92 insertions(+)
 create mode 100644 app/src/main/res/drawable/ic_health.xml
 create mode 100644 app/src/main/res/xml/devicesettings_vitality_score.xml

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
index ea7b3d088..21dfee1e5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
@@ -372,6 +372,8 @@ public class DeviceSettingsPreferenceConst {
     public static final String PREF_USER_FITNESS_GOAL = "fitness_goal";
     public static final String PREF_USER_FITNESS_GOAL_NOTIFICATION = "fitness_goal_notification";
     public static final String PREF_USER_FITNESS_GOAL_SECONDARY = "fitness_goal_secondary";
+    public static final String PREF_VITALITY_SCORE_7_DAY = "pref_vitality_score_7_day";
+    public static final String PREF_VITALITY_SCORE_DAILY = "pref_vitality_score_daily";
 
     public static final String PREF_HOURLY_CHIME_ENABLE = "hourly_chime_enable";
     public static final String PREF_HOURLY_CHIME_START = "hourly_chime_start";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
index a7db56e3d..1fd43e0e9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
@@ -517,6 +517,9 @@ public class DeviceSpecificSettingsFragment extends AbstractPreferenceFragment i
         addPreferenceHandlerFor(PREF_USER_FITNESS_GOAL_NOTIFICATION);
         addPreferenceHandlerFor(PREF_USER_FITNESS_GOAL_SECONDARY);
 
+        addPreferenceHandlerFor(PREF_VITALITY_SCORE_7_DAY);
+        addPreferenceHandlerFor(PREF_VITALITY_SCORE_DAILY);
+
         addPreferenceHandlerFor(PREF_UM25_SHOW_THRESHOLD_NOTIFICATION);
         addPreferenceHandlerFor(PREF_UM25_SHOW_THRESHOLD);
         addPreferenceHandlerFor(PREF_HOURLY_CHIME_ENABLE);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
index b79833e4d..d40cb2ce2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
@@ -373,6 +373,7 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
         settings.add(R.xml.devicesettings_sleep_mode_schedule);
         settings.add(R.xml.devicesettings_goal_notification);
         settings.add(R.xml.devicesettings_goal_secondary);
+        settings.add(R.xml.devicesettings_vitality_score);
 
         //
         // Workout
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
index 5337fbedb..579c58a9c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
@@ -81,6 +81,8 @@ public class XiaomiHealthService extends AbstractXiaomiService {
     private static final int CMD_CONFIG_GOAL_SET = 22;
     private static final int CMD_WORKOUT_WATCH_STATUS = 26;
     private static final int CMD_WORKOUT_WATCH_OPEN = 30;
+    private static final int CMD_CONFIG_VITALITY_SCORE_GET = 35;
+    private static final int CMD_CONFIG_VITALITY_SCORE_SET = 36;
     private static final int CMD_WORKOUT_LOCATION = 48;
     private static final int CMD_REALTIME_STATS_START = 45;
     private static final int CMD_REALTIME_STATS_STOP = 46;
@@ -149,6 +151,12 @@ public class XiaomiHealthService extends AbstractXiaomiService {
             case CMD_CONFIG_GOAL_SET:
                 LOG.debug("Got goal set ack, status={}", cmd.getStatus());
                 return;
+            case CMD_CONFIG_VITALITY_SCORE_GET:
+                handleVitalityScore(cmd.getHealth().getVitalityScore());
+                return;
+            case CMD_CONFIG_VITALITY_SCORE_SET:
+                LOG.debug("Got vitality score set ack, status={}", cmd.getStatus());
+                return;
             case CMD_WORKOUT_WATCH_STATUS:
                 handleWorkoutStatus(cmd.getHealth().getWorkoutStatusWatch());
                 return;
@@ -171,6 +179,7 @@ public class XiaomiHealthService extends AbstractXiaomiService {
         getSupport().sendCommand("get standing reminders config", COMMAND_TYPE, CMD_CONFIG_STANDING_REMINDER_GET);
         getSupport().sendCommand("get stress config", COMMAND_TYPE, CMD_CONFIG_STRESS_GET);
         getSupport().sendCommand("get goal config", COMMAND_TYPE, CMD_CONFIG_GOAL_GET);
+        getSupport().sendCommand("get vitality score config", COMMAND_TYPE, CMD_CONFIG_VITALITY_SCORE_GET);
     }
 
     @Override
@@ -190,6 +199,10 @@ public class XiaomiHealthService extends AbstractXiaomiService {
             case DeviceSettingsPreferenceConst.PREF_USER_FITNESS_GOAL_SECONDARY:
                 sendGoalConfig();
                 return true;
+            case DeviceSettingsPreferenceConst.PREF_VITALITY_SCORE_7_DAY:
+            case DeviceSettingsPreferenceConst.PREF_VITALITY_SCORE_DAILY:
+                sendVitalityScoreConfig();
+                return true;
             case DeviceSettingsPreferenceConst.PREF_HEARTRATE_USE_FOR_SLEEP_DETECTION:
             case DeviceSettingsPreferenceConst.PREF_HEARTRATE_SLEEP_BREATHING_QUALITY_MONITORING:
             case DeviceSettingsPreferenceConst.PREF_HEARTRATE_MEASUREMENT_INTERVAL:
@@ -315,6 +328,41 @@ public class XiaomiHealthService extends AbstractXiaomiService {
         );
     }
 
+    private void handleVitalityScore(final XiaomiProto.VitalityScore vitalityScore) {
+        LOG.debug("Got vitality score config");
+
+        final GBDeviceEventUpdatePreferences eventUpdatePreferences = new GBDeviceEventUpdatePreferences()
+                .withPreference(DeviceSettingsPreferenceConst.PREF_VITALITY_SCORE_7_DAY, vitalityScore.getSevenDay())
+                .withPreference(DeviceSettingsPreferenceConst.PREF_VITALITY_SCORE_DAILY, vitalityScore.getDailyProgress());
+
+        getSupport().evaluateGBDeviceEvent(eventUpdatePreferences);
+    }
+
+    public void sendVitalityScoreConfig() {
+        final boolean prefSevenDay = getDevicePrefs().getBoolean(DeviceSettingsPreferenceConst.PREF_VITALITY_SCORE_7_DAY, false);
+        final boolean prefDaily = getDevicePrefs().getBoolean(DeviceSettingsPreferenceConst.PREF_VITALITY_SCORE_DAILY, false);
+
+        LOG.debug("Setting vitality score config, 7day={}, daily={}", prefSevenDay, prefDaily);
+
+        final XiaomiProto.VitalityScore vitalityScore = XiaomiProto.VitalityScore.newBuilder()
+                .setSevenDay(prefSevenDay)
+                .setDailyProgress(prefDaily)
+                .build();
+
+        final XiaomiProto.Health health = XiaomiProto.Health.newBuilder()
+                .setVitalityScore(vitalityScore)
+                .build();
+
+        getSupport().sendCommand(
+                "set vitality score config",
+                XiaomiProto.Command.newBuilder()
+                        .setType(COMMAND_TYPE)
+                        .setSubtype(CMD_CONFIG_VITALITY_SCORE_SET)
+                        .setHealth(health)
+                        .build()
+        );
+    }
+
     private void handleSpo2Config(final XiaomiProto.SpO2 spo2) {
         LOG.debug("Got SpO2 config");
 
diff --git a/app/src/main/res/drawable/ic_health.xml b/app/src/main/res/drawable/ic_health.xml
new file mode 100644
index 000000000..1282ee360
--- /dev/null
+++ b/app/src/main/res/drawable/ic_health.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#7E7E7E"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M10.5,13H8v-3h2.5V7.5h3V10H16v3h-2.5v2.5h-3V13zM12,2L4,5v6.09c0,5.05 3.41,9.76 8,10.91c4.59,-1.15 8,-5.86 8,-10.91V5L12,2z" />
+</vector>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 121163615..15898934c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2443,4 +2443,9 @@
     <string name="devicetype_mi_watch_color_sport">Mi Watch Color Sport</string>
     <string name="devicetype_pixoo">Pixoo</string>
     <string name="not_set">Not set</string>
+    <string name="pref_vitality_score_title">Vitality Score</string>
+    <string name="pref_vitality_score_7_day_title">7-day progress</string>
+    <string name="pref_vitality_score_7_day_summary">Get a notification when your vitality score reaches 30, 60 or 100 in the past 7 days</string>
+    <string name="pref_vitality_score_daily_title">Daily progress</string>
+    <string name="pref_vitality_score_daily_summary">Get a notification when you reached the maximum number of vitality points for the day</string>
 </resources>
diff --git a/app/src/main/res/xml/devicesettings_vitality_score.xml b/app/src/main/res/xml/devicesettings_vitality_score.xml
new file mode 100644
index 000000000..eb109d7fc
--- /dev/null
+++ b/app/src/main/res/xml/devicesettings_vitality_score.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <PreferenceScreen
+        android:icon="@drawable/ic_health"
+        android:key="pref_screen_vitality_score"
+        android:persistent="false"
+        android:title="@string/pref_vitality_score_title">
+
+        <SwitchPreferenceCompat
+            android:defaultValue="false"
+            android:icon="@drawable/ic_notifications"
+            android:key="pref_vitality_score_7_day"
+            android:summary="@string/pref_vitality_score_7_day_summary"
+            android:title="@string/pref_vitality_score_7_day_title" />
+
+        <SwitchPreferenceCompat
+            android:defaultValue="false"
+            android:icon="@drawable/ic_notifications"
+            android:key="pref_vitality_score_daily"
+            android:summary="@string/pref_vitality_score_daily_summary"
+            android:title="@string/pref_vitality_score_daily_title" />
+    </PreferenceScreen>
+</androidx.preference.PreferenceScreen>

From 8d1c243297e2b37d821ccdc4b145f5efd443be92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sun, 10 Dec 2023 12:24:59 +0000
Subject: [PATCH 224/595] Xiaomi: Detect supported preferences

---
 .../devices/xiaomi/XiaomiCoordinator.java     | 43 +++++++++++++------
 .../xiaomi/XiaomiSettingsCustomizer.java      | 12 ++++++
 .../miwatch/MiWatchLiteCoordinator.java       |  1 -
 .../XiaomiWatchS1ActiveCoordinator.java       |  5 ---
 .../devices/xiaomi/XiaomiPreferences.java     | 12 ++++++
 .../xiaomi/services/XiaomiHealthService.java  |  5 +++
 .../services/XiaomiNotificationService.java   |  3 ++
 .../xiaomi/services/XiaomiSystemService.java  | 16 +++++++
 8 files changed, 78 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
index d40cb2ce2..c6f0cd39a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
@@ -16,6 +16,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi;
 
+import static nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiPreferences.*;
+
 import android.app.Activity;
 import android.bluetooth.le.ScanFilter;
 import android.os.ParcelUuid;
@@ -47,7 +49,6 @@ import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.entities.XiaomiActivitySampleDao;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.model.AbstractNotificationPattern;
 import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
 import nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryParser;
 import nodomain.freeyourgadget.gadgetbridge.model.HeartRateSample;
@@ -361,19 +362,31 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
         // Display
         //
         settings.add(R.xml.devicesettings_header_display);
-        settings.add(R.xml.devicesettings_xiaomi_displayitems);
-        settings.add(R.xml.devicesettings_password);
+        if (supports(device, FEAT_DISPLAY_ITEMS)) {
+            settings.add(R.xml.devicesettings_xiaomi_displayitems);
+        }
+        if (supports(device, FEAT_PASSWORD)) {
+            settings.add(R.xml.devicesettings_password);
+        }
 
         //
         // Health
         //
         settings.add(R.xml.devicesettings_header_health);
         settings.add(R.xml.devicesettings_heartrate_sleep_alert_activity_stress_spo2);
-        settings.add(R.xml.devicesettings_inactivity_dnd_no_threshold);
-        settings.add(R.xml.devicesettings_sleep_mode_schedule);
-        settings.add(R.xml.devicesettings_goal_notification);
-        settings.add(R.xml.devicesettings_goal_secondary);
-        settings.add(R.xml.devicesettings_vitality_score);
+        if (supports(device, FEAT_INACTIVITY)) {
+            settings.add(R.xml.devicesettings_inactivity_dnd_no_threshold);
+        }
+        if (supports(device, FEAT_SLEEP_MODE_SCHEDULE)) {
+            settings.add(R.xml.devicesettings_sleep_mode_schedule);
+        }
+        if (supports(device, FEAT_GOAL_NOTIFICATION)) {
+            settings.add(R.xml.devicesettings_goal_notification);
+            settings.add(R.xml.devicesettings_goal_secondary);
+        }
+        if (supports(device, FEAT_VITALITY_SCORE)) {
+            settings.add(R.xml.devicesettings_vitality_score);
+        }
 
         //
         // Workout
@@ -389,7 +402,9 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
         // TODO not implemented settings.add(R.xml.devicesettings_vibrationpatterns);
         // TODO not implemented settings.add(R.xml.devicesettings_donotdisturb_withauto_and_always);
         settings.add(R.xml.devicesettings_send_app_notifications);
-        settings.add(R.xml.devicesettings_screen_on_on_notifications);
+        if (supports(device, FEAT_SCREEN_ON_ON_NOTIFICATIONS)) {
+            settings.add(R.xml.devicesettings_screen_on_on_notifications);
+        }
         settings.add(R.xml.devicesettings_autoremove_notifications);
         if (getCannedRepliesSlotCount(device) > 0) {
             settings.add(R.xml.devicesettings_canned_dismisscall_16);
@@ -410,8 +425,10 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
         if (getContactsSlotCount(device) > 0) {
             settings.add(R.xml.devicesettings_contacts);
         }
-        settings.add(R.xml.devicesettings_camera_remote);
-        if (supportsWearingAndSleepingDataThroughDeviceState()) {
+        // TODO not implemented if (supports(device, FEAT_CAMERA_REMOTE)) {
+        // TODO not implemented     settings.add(R.xml.devicesettings_camera_remote);
+        // TODO not implemented }
+        if (supports(device, FEAT_DEVICE_ACTIONS)) {
             settings.add(R.xml.devicesettings_device_actions);
         }
 
@@ -492,7 +509,7 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
         return false;
     }
 
-    public boolean supportsWearingAndSleepingDataThroughDeviceState() {
-        return false;
+    public boolean supports(final GBDevice device, final String feature) {
+        return getPrefs(device).getBoolean(feature, false);
     }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSettingsCustomizer.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSettingsCustomizer.java
index c0c6f1b1b..af198707c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSettingsCustomizer.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSettingsCustomizer.java
@@ -16,12 +16,14 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi;
 
+import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsUtils.hidePrefIfNoneVisible;
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsUtils.populateOrHideListPreference;
 
 import android.os.Parcel;
 
 import androidx.preference.Preference;
 
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Set;
 
@@ -44,6 +46,16 @@ public class XiaomiSettingsCustomizer implements DeviceSpecificSettingsCustomize
         }
 
         populateOrHideListPreference(HuamiConst.PREF_DISPLAY_ITEMS_SORTABLE, handler, prefs);
+
+        hidePrefIfNoneVisible(handler, DeviceSettingsPreferenceConst.PREF_HEADER_DISPLAY, Arrays.asList(
+                HuamiConst.PREF_DISPLAY_ITEMS_SORTABLE,
+                DeviceSettingsPreferenceConst.PREF_SCREEN_PASSWORD
+        ));
+        hidePrefIfNoneVisible(handler, "pref_header_other", Arrays.asList(
+                "pref_contacts",
+                "camera_remote",
+                "screen_events_forwarding"
+        ));
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatch/MiWatchLiteCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatch/MiWatchLiteCoordinator.java
index f7a4ab230..a7ad29601 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatch/MiWatchLiteCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatch/MiWatchLiteCoordinator.java
@@ -27,7 +27,6 @@ import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiInstallHandler;
-import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 
 public class MiWatchLiteCoordinator extends XiaomiCoordinator {
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs1active/XiaomiWatchS1ActiveCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs1active/XiaomiWatchS1ActiveCoordinator.java
index 76a957d61..3ed43f298 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs1active/XiaomiWatchS1ActiveCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs1active/XiaomiWatchS1ActiveCoordinator.java
@@ -67,9 +67,4 @@ public class XiaomiWatchS1ActiveCoordinator extends XiaomiCoordinator {
     public boolean supportsMultipleWeatherLocations() {
         return true;
     }
-
-    @Override
-    public boolean supportsWearingAndSleepingDataThroughDeviceState() {
-        return true;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPreferences.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPreferences.java
index 721270b86..be63f4f24 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPreferences.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPreferences.java
@@ -33,6 +33,18 @@ public final class XiaomiPreferences {
     public static final String PREF_CANNED_MESSAGES_MIN = "canned_messages_min";
     public static final String PREF_CANNED_MESSAGES_MAX = "canned_messages_max";
 
+    public static final String FEAT_DEVICE_ACTIONS = "feat_device_actions";
+    public static final String FEAT_DISPLAY_ITEMS = "feat_display_items";
+    public static final String FEAT_STRESS = "feat_stress";
+    public static final String FEAT_SPO2 = "feat_spo2";
+    public static final String FEAT_PASSWORD = "feat_password";
+    public static final String FEAT_INACTIVITY = "feat_inactivity";
+    public static final String FEAT_SLEEP_MODE_SCHEDULE = "feat_sleep_mode_schedule";
+    public static final String FEAT_GOAL_NOTIFICATION = "feat_goal_notification";
+    public static final String FEAT_VITALITY_SCORE = "feat_vitality_score";
+    public static final String FEAT_SCREEN_ON_ON_NOTIFICATIONS = "feat_screen_on_on_notifications";
+    public static final String FEAT_CAMERA_REMOTE = "feat_camera_remote";
+
     private XiaomiPreferences() {
         // util class
     }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
index 579c58a9c..fb5c20cc5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
@@ -292,6 +292,7 @@ public class XiaomiHealthService extends AbstractXiaomiService {
         }
 
         final GBDeviceEventUpdatePreferences eventUpdatePreferences = new GBDeviceEventUpdatePreferences()
+                .withPreference(XiaomiPreferences.FEAT_GOAL_NOTIFICATION, true)
                 .withPreference(DeviceSettingsPreferenceConst.PREF_USER_FITNESS_GOAL_NOTIFICATION, achievementReminders.getEnabled())
                 .withPreference(DeviceSettingsPreferenceConst.PREF_USER_FITNESS_GOAL_SECONDARY, secondaryValue);
 
@@ -332,6 +333,7 @@ public class XiaomiHealthService extends AbstractXiaomiService {
         LOG.debug("Got vitality score config");
 
         final GBDeviceEventUpdatePreferences eventUpdatePreferences = new GBDeviceEventUpdatePreferences()
+                .withPreference(XiaomiPreferences.FEAT_VITALITY_SCORE, true)
                 .withPreference(DeviceSettingsPreferenceConst.PREF_VITALITY_SCORE_7_DAY, vitalityScore.getSevenDay())
                 .withPreference(DeviceSettingsPreferenceConst.PREF_VITALITY_SCORE_DAILY, vitalityScore.getDailyProgress());
 
@@ -367,6 +369,7 @@ public class XiaomiHealthService extends AbstractXiaomiService {
         LOG.debug("Got SpO2 config");
 
         final GBDeviceEventUpdatePreferences eventUpdatePreferences = new GBDeviceEventUpdatePreferences()
+                .withPreference(XiaomiPreferences.FEAT_SPO2, true)
                 .withPreference(DeviceSettingsPreferenceConst.PREF_SPO2_ALL_DAY_MONITORING, spo2.getAllDayTracking())
                 .withPreference(
                         DeviceSettingsPreferenceConst.PREF_SPO2_LOW_ALERT_THRESHOLD,
@@ -492,6 +495,7 @@ public class XiaomiHealthService extends AbstractXiaomiService {
         final String dndEnd = XiaomiPreferences.prefFromHourMin(standingReminder.getDndEnd());
 
         final GBDeviceEventUpdatePreferences eventUpdatePreferences = new GBDeviceEventUpdatePreferences()
+                .withPreference(XiaomiPreferences.FEAT_INACTIVITY, true)
                 .withPreference(DeviceSettingsPreferenceConst.PREF_INACTIVITY_ENABLE, standingReminder.getEnabled())
                 .withPreference(DeviceSettingsPreferenceConst.PREF_INACTIVITY_START, start)
                 .withPreference(DeviceSettingsPreferenceConst.PREF_INACTIVITY_END, end)
@@ -536,6 +540,7 @@ public class XiaomiHealthService extends AbstractXiaomiService {
         LOG.debug("Got stress config");
 
         final GBDeviceEventUpdatePreferences eventUpdatePreferences = new GBDeviceEventUpdatePreferences()
+                .withPreference(XiaomiPreferences.FEAT_STRESS, true)
                 .withPreference(DeviceSettingsPreferenceConst.PREF_HEARTRATE_STRESS_MONITORING, stress.getAllDayTracking())
                 .withPreference(DeviceSettingsPreferenceConst.PREF_HEARTRATE_STRESS_RELAXATION_REMINDER, stress.getRelaxReminder().getEnabled());
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
index d0ee2fb6a..13b2eeceb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
@@ -121,6 +121,9 @@ public class XiaomiNotificationService extends AbstractXiaomiService implements
                 final GBDeviceEventUpdatePreferences eventUpdatePreferences = new GBDeviceEventUpdatePreferences(
                         DeviceSettingsPreferenceConst.PREF_SCREEN_ON_ON_NOTIFICATIONS,
                         screenOnOnNotifications
+                ).withPreference(
+                        XiaomiPreferences.FEAT_SCREEN_ON_ON_NOTIFICATIONS,
+                        true
                 );
                 getSupport().evaluateGBDeviceEvent(eventUpdatePreferences);
                 return;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
index 3c5529027..f42b9e710 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
@@ -50,6 +50,7 @@ import nodomain.freeyourgadget.gadgetbridge.model.WearingState;
 import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetProgressAction;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiPreferences;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
 import nodomain.freeyourgadget.gadgetbridge.util.CheckSums;
 import nodomain.freeyourgadget.gadgetbridge.util.GB;
@@ -71,6 +72,8 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
     public static final int CMD_CLOCK = 3;
     public static final int CMD_FIRMWARE_INSTALL = 5;
     public static final int CMD_LANGUAGE = 6;
+    public static final int CMD_CAMERA_REMOTE_GET = 7;
+    public static final int CMD_CAMERA_REMOTE_SET = 8;
     public static final int CMD_PASSWORD_GET = 9;
     public static final int CMD_FIND_PHONE = 17;
     public static final int CMD_FIND_WATCH = 18;
@@ -329,6 +332,11 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
                     password.getPassword()
             );
         }
+        eventUpdatePreferences.withPreference(
+                XiaomiPreferences.FEAT_PASSWORD,
+                true
+        );
+
         getSupport().evaluateGBDeviceEvent(eventUpdatePreferences);
     }
 
@@ -453,6 +461,7 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
         final String prefValue = StringUtils.join(",", enabledScreens.toArray(new String[0])).toString();
 
         final GBDeviceEventUpdatePreferences eventUpdatePreferences = new GBDeviceEventUpdatePreferences()
+                .withPreference(XiaomiPreferences.FEAT_DISPLAY_ITEMS, displayItems.getDisplayItemCount() > 0)
                 .withPreference(DeviceSettingsUtils.getPrefPossibleValuesKey(HuamiConst.PREF_DISPLAY_ITEMS_SORTABLE), allScreensPrefValue)
                 .withPreference(DeviceSettingsUtils.getPrefPossibleValueLabelsKey(HuamiConst.PREF_DISPLAY_ITEMS_SORTABLE), allScreensLabelsPrefValue)
                 .withPreference(PREF_SETTINGS_DISPLAY_ITEM_CODE, settingsCode)
@@ -522,6 +531,13 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
             return;
         }
 
+        // If we got basic device state, we support device actions
+        final GBDeviceEventUpdatePreferences eventUpdatePreferences = new GBDeviceEventUpdatePreferences(
+                XiaomiPreferences.FEAT_DEVICE_ACTIONS,
+                true
+        );
+        getSupport().evaluateGBDeviceEvent(eventUpdatePreferences);
+
         // handle battery info from message
         {
             BatteryState newBatteryState = deviceState.getIsCharging() ? BatteryState.BATTERY_CHARGING : BatteryState.BATTERY_NORMAL;

From a3e2997f26cfbc9f1b76b03bc565b9658dbdd4f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sun, 10 Dec 2023 12:31:19 +0000
Subject: [PATCH 225/595] Xiaomi: Fix sleep mode schedule, spo2 and stress
 support detection

---
 .../gadgetbridge/devices/xiaomi/XiaomiCoordinator.java    | 8 +++++++-
 .../devices/xiaomi/services/XiaomiScheduleService.java    | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
index c6f0cd39a..5ad6d13cc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
@@ -373,7 +373,13 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
         // Health
         //
         settings.add(R.xml.devicesettings_header_health);
-        settings.add(R.xml.devicesettings_heartrate_sleep_alert_activity_stress_spo2);
+        if (supportsStressMeasurement() && supports(device, FEAT_STRESS) && supportsSpo2() && supports(device, FEAT_SPO2)) {
+            settings.add(R.xml.devicesettings_heartrate_sleep_alert_activity_stress_spo2);
+        } else if (supportsStressMeasurement() && supports(device, FEAT_STRESS)) {
+            settings.add(R.xml.devicesettings_heartrate_sleep_alert_activity_stress);
+        } else {
+            settings.add(R.xml.devicesettings_heartrate_sleep_activity);
+        }
         if (supports(device, FEAT_INACTIVITY)) {
             settings.add(R.xml.devicesettings_inactivity_dnd_no_threshold);
         }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java
index 79fe583ba..ac838c6e0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java
@@ -591,6 +591,7 @@ public class XiaomiScheduleService extends AbstractXiaomiService {
         final String end = XiaomiPreferences.prefFromHourMin(sleepMode.getSchedule().getEnd());
 
         final GBDeviceEventUpdatePreferences eventUpdatePreferences = new GBDeviceEventUpdatePreferences()
+                .withPreference(XiaomiPreferences.FEAT_SLEEP_MODE_SCHEDULE, true)
                 .withPreference("prefs_enable_sleep_time", null)
                 .withPreference(DeviceSettingsPreferenceConst.PREF_SLEEP_MODE_SCHEDULE_ENABLED, sleepMode.getEnabled())
                 .withPreference(DeviceSettingsPreferenceConst.PREF_SLEEP_MODE_SCHEDULE_START, start)

From bf9a5d90d4d54b753ed196586709c1692166c819 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sun, 10 Dec 2023 13:24:35 +0000
Subject: [PATCH 226/595] Xiaomi: Add camera remote preference

---
 .../devices/xiaomi/XiaomiCoordinator.java     |  6 +--
 .../xiaomi/services/XiaomiSystemService.java  | 37 +++++++++++++++++++
 2 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
index 5ad6d13cc..b801efdc6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
@@ -431,9 +431,9 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
         if (getContactsSlotCount(device) > 0) {
             settings.add(R.xml.devicesettings_contacts);
         }
-        // TODO not implemented if (supports(device, FEAT_CAMERA_REMOTE)) {
-        // TODO not implemented     settings.add(R.xml.devicesettings_camera_remote);
-        // TODO not implemented }
+        if (supports(device, FEAT_CAMERA_REMOTE)) {
+            settings.add(R.xml.devicesettings_camera_remote);
+        }
         if (supports(device, FEAT_DEVICE_ACTIONS)) {
             settings.add(R.xml.devicesettings_device_actions);
         }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
index f42b9e710..d8285fab0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
@@ -103,6 +103,7 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
         getSupport().sendCommand("get battery state", COMMAND_TYPE, CMD_BATTERY);
         getSupport().sendCommand("get password", COMMAND_TYPE, CMD_PASSWORD_GET);
         getSupport().sendCommand("get display items", COMMAND_TYPE, CMD_DISPLAY_ITEMS_GET);
+        getSupport().sendCommand("get camera remote", COMMAND_TYPE, CMD_CAMERA_REMOTE_GET);
     }
 
     @Override
@@ -129,6 +130,12 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
             case CMD_PASSWORD_GET:
                 handlePassword(cmd.getSystem().getPassword());
                 return;
+            case CMD_PASSWORD_GET:
+                handleCameraRemote(cmd.getSystem().getCamera());
+                return;
+            case CMD_CAMERA_REMOTE_SET:
+                LOG.debug("Got camera remote set ack, status={}", cmd.getStatus());
+                return;
             case CMD_FIND_PHONE:
                 LOG.debug("Got find phone: {}", cmd.getSystem().getFindDevice());
                 final GBDeviceEventFindPhone findPhoneEvent = new GBDeviceEventFindPhone();
@@ -160,6 +167,9 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
     @Override
     public boolean onSendConfiguration(final String config, final Prefs prefs) {
         switch (config) {
+            case DeviceSettingsPreferenceConst.PREF_CAMERA_REMOTE:
+                setCameraRemoteConfig();
+                return true;
             case DeviceSettingsPreferenceConst.PREF_LANGUAGE:
                 setLanguage();
                 return true;
@@ -340,6 +350,33 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
         getSupport().evaluateGBDeviceEvent(eventUpdatePreferences);
     }
 
+    private void handleCameraRemote(final XiaomiProto.Camera camera) {
+        LOG.debug("Got camera remote enabled={}", camera.getEnabled());
+
+        final GBDeviceEventUpdatePreferences eventUpdatePreferences = new GBDeviceEventUpdatePreferences()
+                .withPreference(XiaomiPreferences.FEAT_CAMERA_REMOTE, true)
+                .withPreference(DeviceSettingsPreferenceConst.PREF_CAMERA_REMOTE, camera.getEnabled());
+
+        getSupport().evaluateGBDeviceEvent(eventUpdatePreferences);
+    }
+
+    private void setCameraRemoteConfig() {
+        final boolean enabled = getDevicePrefs().getBoolean(DeviceSettingsPreferenceConst.PREF_CAMERA_REMOTE, false);
+
+        LOG.debug("Set camera remote enabled={}", enabled);
+
+        getSupport().sendCommand(
+                "set camera remote",
+                XiaomiProto.Command.newBuilder()
+                        .setType(COMMAND_TYPE)
+                        .setSubtype(CMD_CAMERA_REMOTE_SET)
+                        .setSystem(XiaomiProto.System.newBuilder().setCamera(
+                                XiaomiProto.Camera.newBuilder().setEnabled(enabled)
+                        ))
+                        .build()
+        );
+    }
+
     private void setDisplayItems() {
         final Prefs prefs = getDevicePrefs();
         final List<String> allScreens = new ArrayList<>(prefs.getList(DeviceSettingsUtils.getPrefPossibleValuesKey(HuamiConst.PREF_DISPLAY_ITEMS_SORTABLE), Collections.emptyList()));

From 9babbf504ec22c573d0220f727ef7cbe02cc4b7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sun, 10 Dec 2023 13:30:14 +0000
Subject: [PATCH 227/595] Xiaomi: Fix camera remote get typo

---
 .../service/devices/xiaomi/services/XiaomiSystemService.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
index d8285fab0..457084035 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
@@ -130,7 +130,7 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
             case CMD_PASSWORD_GET:
                 handlePassword(cmd.getSystem().getPassword());
                 return;
-            case CMD_PASSWORD_GET:
+            case CMD_CAMERA_REMOTE_GET:
                 handleCameraRemote(cmd.getSystem().getCamera());
                 return;
             case CMD_CAMERA_REMOTE_SET:

From d28cff478cf9056b1d5bb21909c246422a558bd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sun, 10 Dec 2023 17:28:15 +0000
Subject: [PATCH 228/595] Delete notifications from connected devices only

---
 .../externalevents/NotificationListener.java        | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
index e9fbfb2f4..191dba293 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
@@ -774,17 +774,18 @@ public class NotificationListener extends NotificationListenerService {
         // Clean up removed notifications from internal list
         notificationsActive.removeAll(notificationsToRemove);
 
-        // TODO prevent this from being called multiple times for the same ID
-        // TODO prevent this from being called form notifications removed from the device
-
         // Send notification remove request to device
-        List<GBDevice> devices = GBApplication.app().getDeviceManager().getDevices();
+        List<GBDevice> devices = GBApplication.app().getDeviceManager().getSelectedDevices();
         for (GBDevice device : devices) {
+            if (!device.isInitialized()) {
+                continue;
+            }
+
             Prefs devicePrefs = new Prefs(GBApplication.getDeviceSpecificSharedPrefs(device.getAddress()));
             if (devicePrefs.getBoolean("autoremove_notifications", true)) {
                 for (int id : notificationsToRemove) {
-                    LOG.info("Notification " + id + " removed, will ask device to delete it");
-                    GBApplication.deviceService().onDeleteNotification(id);
+                    LOG.info("Notification {} removed, deleting from {}", id, device.getAliasOrName());
+                    GBApplication.deviceService(device).onDeleteNotification(id);
                 }
             }
         }

From 4051c7f7d4dc653c472e5347c1b80ca5b493fe4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sun, 10 Dec 2023 18:03:17 +0000
Subject: [PATCH 229/595] Xiaomi: Add wear mode preference

---
 .../DeviceSettingsPreferenceConst.java        |  1 +
 .../DeviceSpecificSettingsFragment.java       |  1 +
 .../devices/xiaomi/XiaomiCoordinator.java     |  6 ++
 .../devices/xiaomi/XiaomiPreferences.java     |  1 +
 .../services/XiaomiNotificationService.java   |  3 -
 .../xiaomi/services/XiaomiSystemService.java  | 75 +++++++++++++++++++
 app/src/main/proto/xiaomi.proto               | 26 ++++++-
 app/src/main/res/values/arrays.xml            | 11 +++
 app/src/main/res/values/strings.xml           |  4 +
 .../main/res/xml/devicesettings_wearmode.xml  | 12 +++
 10 files changed, 134 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/res/xml/devicesettings_wearmode.xml

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
index 21dfee1e5..e9a8e1e20 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
@@ -54,6 +54,7 @@ public class DeviceSettingsPreferenceConst {
     public static final String PREF_TIMEFORMAT_AUTO = "auto";
     public static final String PREF_WEARLOCATION = "wearlocation";
     public static final String PREF_WEARDIRECTION = "weardirection";
+    public static final String PREF_WEARMODE = "wearmode";
     public static final String PREF_VIBRATION_ENABLE = "vibration_enable";
     public static final String PREF_NOTIFICATION_ENABLE = "notification_enable";
     public static final String PREF_SCREEN_BRIGHTNESS = "screen_brightness";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
index 1fd43e0e9..d8fc5bfba 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
@@ -539,6 +539,7 @@ public class DeviceSpecificSettingsFragment extends AbstractPreferenceFragment i
         addPreferenceHandlerFor(PREF_ALWAYS_ON_DISPLAY_FOLLOW_WATCHFACE);
         addPreferenceHandlerFor(PREF_ALWAYS_ON_DISPLAY_STYLE);
         addPreferenceHandlerFor(PREF_WEARDIRECTION);
+        addPreferenceHandlerFor(PREF_WEARMODE);
 
         addPreferenceHandlerFor(PREF_VOLUME);
         addPreferenceHandlerFor(PREF_CROWN_VIBRATION);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
index b801efdc6..cd3b47c15 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
@@ -349,6 +349,12 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
     public int[] getSupportedDeviceSpecificSettings(final GBDevice device) {
         final List<Integer> settings = new ArrayList<>();
 
+        if (supports(device, FEAT_WEAR_MODE)) {
+            // TODO we should be able to get this from the band - right now it must be changed
+            // at least once from the band itself
+            settings.add(R.xml.devicesettings_wearmode);
+        }
+
         //
         // Time
         //
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPreferences.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPreferences.java
index be63f4f24..6ef16b89c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPreferences.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPreferences.java
@@ -33,6 +33,7 @@ public final class XiaomiPreferences {
     public static final String PREF_CANNED_MESSAGES_MIN = "canned_messages_min";
     public static final String PREF_CANNED_MESSAGES_MAX = "canned_messages_max";
 
+    public static final String FEAT_WEAR_MODE = "feat_wear_mode";
     public static final String FEAT_DEVICE_ACTIONS = "feat_device_actions";
     public static final String FEAT_DISPLAY_ITEMS = "feat_display_items";
     public static final String FEAT_STRESS = "feat_stress";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
index 13b2eeceb..53e07a36d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
@@ -293,8 +293,6 @@ public class XiaomiNotificationService extends AbstractXiaomiService implements
             notification3.setBody("?");
         }
 
-        // TODO unknown caller i18n
-
         final XiaomiProto.Notification2 notification2 = XiaomiProto.Notification2.newBuilder()
                 .setNotification3(notification3)
                 .build();
@@ -477,7 +475,6 @@ public class XiaomiNotificationService extends AbstractXiaomiService implements
             return;
         }
 
-        // TODO avoid resize?
         final Bitmap bmp = BitmapUtil.toBitmap(icon);
         final Bitmap bmpResized = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
         final Canvas canvas = new Canvas(bmpResized);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
index 457084035..7557b490e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
@@ -75,11 +75,14 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
     public static final int CMD_CAMERA_REMOTE_GET = 7;
     public static final int CMD_CAMERA_REMOTE_SET = 8;
     public static final int CMD_PASSWORD_GET = 9;
+    public static final int CMD_MISC_SETTING_GET = 14;
+    public static final int CMD_MISC_SETTING_SET = 15;
     public static final int CMD_FIND_PHONE = 17;
     public static final int CMD_FIND_WATCH = 18;
     public static final int CMD_PASSWORD_SET = 21;
     public static final int CMD_DISPLAY_ITEMS_GET = 29;
     public static final int CMD_DISPLAY_ITEMS_SET = 30;
+    public static final int CMD_MISC_SETTING_SET_FROM_BAND = 42;
     public static final int CMD_DEVICE_STATE_GET = 78;
     public static final int CMD_DEVICE_STATE = 79;
 
@@ -130,6 +133,9 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
             case CMD_PASSWORD_GET:
                 handlePassword(cmd.getSystem().getPassword());
                 return;
+            case CMD_MISC_SETTING_SET:
+                LOG.debug("Got misc setting set ack, status={}", cmd.getStatus());
+                return;
             case CMD_CAMERA_REMOTE_GET:
                 handleCameraRemote(cmd.getSystem().getCamera());
                 return;
@@ -149,6 +155,9 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
             case CMD_DISPLAY_ITEMS_GET:
                 handleDisplayItems(cmd.getSystem().getDisplayItems());
                 return;
+            case CMD_MISC_SETTING_SET_FROM_BAND:
+                handleMiscSettingSet(cmd.getSystem().getMiscSettingSet());
+                return;
             case CMD_DEVICE_STATE_GET:
                 handleBasicDeviceState(cmd.getSystem().hasBasicDeviceState()
                         ? cmd.getSystem().getBasicDeviceState()
@@ -167,6 +176,9 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
     @Override
     public boolean onSendConfiguration(final String config, final Prefs prefs) {
         switch (config) {
+            case DeviceSettingsPreferenceConst.PREF_WEARMODE:
+                setWearMode();
+                return true;
             case DeviceSettingsPreferenceConst.PREF_CAMERA_REMOTE:
                 setCameraRemoteConfig();
                 return true;
@@ -350,6 +362,69 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
         getSupport().evaluateGBDeviceEvent(eventUpdatePreferences);
     }
 
+    private void handleMiscSettingSet(final XiaomiProto.MiscSettingSet miscSettingSet) {
+        LOG.debug("Got misc setting set");
+
+        final GBDeviceEventUpdatePreferences eventUpdatePreferences = new GBDeviceEventUpdatePreferences();
+
+        if (miscSettingSet.hasWearingMode()) {
+            final String wearMode;
+
+            switch (miscSettingSet.getWearingMode().getMode()) {
+                case 0:
+                    wearMode = "band";
+                    break;
+                case 1:
+                    wearMode = "pebble";
+                    break;
+                case 2:
+                    wearMode = "necklace";
+                    break;
+                default:
+                    wearMode = null;
+                    LOG.warn("Unknown wear mode {}", miscSettingSet.getWearingMode().getMode());
+                    break;
+            }
+
+            eventUpdatePreferences.withPreference(XiaomiPreferences.FEAT_WEAR_MODE, wearMode != null)
+                    .withPreference(DeviceSettingsPreferenceConst.PREF_WEARMODE, wearMode);
+        }
+
+        getSupport().evaluateGBDeviceEvent(eventUpdatePreferences);
+    }
+
+    private void setWearMode() {
+        final String wearMode = getDevicePrefs().getString(DeviceSettingsPreferenceConst.PREF_WEARMODE, "band");
+
+        LOG.debug("Set wear mode to {}", wearMode);
+
+        final int wearModeInt;
+
+        if ("band".equals(wearMode)) {
+            wearModeInt = 0;
+        } else if ("pebble".equals(wearMode)) {
+            wearModeInt = 1;
+        } else if ("necklace".equals(wearMode)) {
+            wearModeInt = 2;
+        } else {
+            LOG.warn("Unknown wear mode {}", wearMode);
+            return;
+        }
+
+        getSupport().sendCommand(
+                "set wear mode",
+                XiaomiProto.Command.newBuilder()
+                        .setType(COMMAND_TYPE)
+                        .setSubtype(CMD_MISC_SETTING_SET)
+                        .setSystem(XiaomiProto.System.newBuilder().setMiscSettingSet(
+                                XiaomiProto.MiscSettingSet.newBuilder().setWearingMode(
+                                        XiaomiProto.WearingMode.newBuilder().setMode(wearModeInt)
+                                )
+                        ))
+                        .build()
+        );
+    }
+
     private void handleCameraRemote(final XiaomiProto.Camera camera) {
         LOG.debug("Got camera remote enabled={}", camera.getEnabled());
 
diff --git a/app/src/main/proto/xiaomi.proto b/app/src/main/proto/xiaomi.proto
index 2ed83fc50..cc1bd7c7c 100644
--- a/app/src/main/proto/xiaomi.proto
+++ b/app/src/main/proto/xiaomi.proto
@@ -110,9 +110,9 @@ message System {
   optional WidgetParts widgetsSingle = 29;
 
   // 2, 14
-  optional DoNotDisturb dnd2 = 34;
+  optional MiscSettingGet miscSettingGet = 34;
   // 2, 15
-  optional DndSync dndSync = 35;
+  optional MiscSettingSet miscSettingSet = 35;
 
   // 2, 46
   optional VibrationPatterns vibrationPatterns = 38;
@@ -240,10 +240,30 @@ message DoNotDisturb {
   optional uint32 status = 1; // 0 enabled, 2 disabled
 }
 
-message DoNotDisturb2 {
+message MiscSettingGet {
+  optional uint32 setting = 1; // 2 dndSync
+}
+
+message MiscSettingSet {
+  optional MiscNotificationSettings miscNotificationSettings = 1;
+  optional DndSync dndSync = 2;
+  optional WearingMode wearingMode = 3;
+}
+
+message MiscNotificationSettings {
+  optional uint32 wakeScreen = 1; // 0 ignore 1 enable 2 disable
+  optional uint32 onlyWhenPhoneLocked = 2; // 0 ignore 1 enable 2 disable
 }
 
 message DndSync {
+  optional uint32 enabled = 1; // 0/1
+}
+
+message WearingMode {
+  // 0 Band Mode (wristband)
+  // 1 Pebble Mode (show buckle)
+  // 2 Necklace mode (neck strap)
+  optional uint32 mode = 1;
 }
 
 message FirmwareInstallRequest {
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 5447d402c..38f919aea 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -161,6 +161,17 @@
         <item>buttons_on_right</item>
     </string-array>
 
+    <string-array name="wearmode">
+        <item>@string/wearmode_band</item>
+        <item>@string/wearmode_pebble</item>
+        <item>@string/wearmode_necklace</item>
+    </string-array>
+    <string-array name="wearmode_values">
+        <item>band</item>
+        <item>pebble</item>
+        <item>necklace</item>
+    </string-array>
+
     <string-array name="orientation">
         <item>@string/horizontal</item>
         <item>@string/vertical</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 15898934c..5342d21dd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -619,6 +619,9 @@
     <string name="vertical">Vertical</string>
     <string name="buttons_on_left">Buttons on left</string>
     <string name="buttons_on_right">Buttons on right</string>
+    <string name="wearmode_band">Band (wristband)</string>
+    <string name="wearmode_pebble">Pebble (shoe buckle)</string>
+    <string name="wearmode_necklace">Necklace (neck strap)</string>
     <string name="miband_pairing_using_dummy_userdata">No valid user data given, using dummy user data for now.</string>
     <string name="miband_pairing_tap_hint">When your Mi Band vibrates and blinks, tap it a few times in a row.</string>
     <string name="appinstaller_install">Install</string>
@@ -650,6 +653,7 @@
     <string name="sleep_activity_date_range">From %1$s to %2$s</string>
     <string name="prefs_wearside">Wearing left or right?</string>
     <string name="prefs_weardirection">Wearing direction</string>
+    <string name="prefs_wearmode">Wearing mode</string>
     <string name="pref_screen_vibration_profile">Vibration profile</string>
     <string name="vibration_profile_default">Default</string>
     <string name="vibration_profile_staccato">Staccato</string>
diff --git a/app/src/main/res/xml/devicesettings_wearmode.xml b/app/src/main/res/xml/devicesettings_wearmode.xml
new file mode 100644
index 000000000..7584dd982
--- /dev/null
+++ b/app/src/main/res/xml/devicesettings_wearmode.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <ListPreference
+        android:defaultValue="band"
+        android:entries="@array/wearmode"
+        android:entryValues="@array/wearmode_values"
+        android:icon="@drawable/ic_switch_left"
+        android:key="wearmode"
+        android:title="@string/prefs_wearmode"
+        app:useSimpleSummaryProvider="true" />
+</androidx.preference.PreferenceScreen>

From 5ca3298e5b28f7f328c5170ea8c2ad48c7b33cc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sun, 10 Dec 2023 20:24:22 +0000
Subject: [PATCH 230/595] Xiaomi: Update xiaomi.proto widgets and vibration
 patterns

---
 app/src/main/proto/xiaomi.proto | 41 ++++++++++++++++++++++-----------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/app/src/main/proto/xiaomi.proto b/app/src/main/proto/xiaomi.proto
index cc1bd7c7c..062c55339 100644
--- a/app/src/main/proto/xiaomi.proto
+++ b/app/src/main/proto/xiaomi.proto
@@ -91,6 +91,9 @@ message System {
   // 2, 34
   optional DoNotDisturb dndStatus = 11;
 
+  // 2, 39
+  optional WidgetSubtypes widgetSubtypes = 14;
+
   // 2, 5
   optional FirmwareInstallRequest firmwareInstallRequest = 16;
   optional FirmwareInstallResponse firmwareInstallResponse = 17;
@@ -105,9 +108,9 @@ message System {
   optional Language language = 20;
 
   // 2, 51 get | 2, 52 create
-  optional Widgets widgets = 28;
+  optional WidgetsScreens widgetScreens = 28;
   // 2, 53
-  optional WidgetParts widgetsSingle = 29;
+  optional WidgetParts widgetParts = 29;
 
   // 2, 14
   optional MiscSettingGet miscSettingGet = 34;
@@ -206,10 +209,20 @@ message Language {
   optional string code = 1; // pt_pt, en_us
 }
 
-message Widgets {
-  repeated Widget widget = 1;
+message WidgetSubtypes {
+  repeated WidgetSubtype widgetSubtype = 1;
   optional uint32 unknown2 = 2; // 1
-  optional WidgetsCapabilities widget3 = 3;
+}
+
+message WidgetSubtype {
+  optional uint32 subType = 1;
+  optional uint32 unknown2 = 2; // 1
+}
+
+message WidgetsScreens {
+  repeated WidgetScreen widgetScreen = 1;
+  optional uint32 isFullList = 2; // 1 to overwrite the full list
+  optional WidgetsCapabilities widgetsCapabilities = 3; // only in response
 }
 
 message WidgetsCapabilities {
@@ -218,9 +231,9 @@ message WidgetsCapabilities {
   optional uint32 unknown3 = 3; // 768
 }
 
-message Widget {
+message WidgetScreen {
   optional uint32 id = 1; // starts at 1
-  optional uint32 type = 2; // 256 for split, 512 for tall
+  optional uint32 layout = 2; // 256 for split, 512 for tall
   repeated WidgetPart widgetPart = 3;
 }
 
@@ -229,11 +242,13 @@ message WidgetParts {
 }
 
 message WidgetPart {
-  optional uint32 partType = 1; // 1 for small, 3 for tall
+  optional uint32 type = 1; // 1 for small 1x1, 2 for wide 2x1, 3 for tall 1x2
   optional uint32 app = 2; // matches command type
-  optional uint32 partId = 3; // they all seem unique
+  optional uint32 id = 3; // they all seem unique
   optional string title = 4; // not set on create
-  optional uint32 unknown5 = 5; // 0, not set on create
+  optional uint32 subType = 5; // usually 0 if no subtype
+  optional string unknown6 = 6; // "" on get
+  optional string unknown7 = 7; // "" on get
 }
 
 message DoNotDisturb {
@@ -298,13 +313,13 @@ message CustomVibrationPattern {
 
 message VibrationNotificationType {
   // 1 incoming calls
-  // 2 events
+  // 2 events // TODO confirm which one is events, which one is schedule
   // 3 alarms
   // 4 notifications
   // 5 standing reminder
   // 6 sms
   // 7 goal
-  // 8 events
+  // 8 events // TODO confirm which one is events, which one is schedule
   optional uint32 notificationType = 1;
   optional uint32 preset = 2;
 }
@@ -644,7 +659,7 @@ message NotificationDismiss {
 message NotificationId {
   optional uint32 id = 1;
   optional string package = 2; // truncated
-  optional string key = 4; // ""
+  optional string key = 4; // sometimes ""
 }
 
 message CannedMessages {

From e6aa9d276a6562a5dea8b3217a5fd2ab1f43fab6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sun, 10 Dec 2023 20:48:30 +0000
Subject: [PATCH 231/595] Xiaomi: Fix workout types on xiaomi.proto

---
 app/src/main/proto/xiaomi.proto | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/proto/xiaomi.proto b/app/src/main/proto/xiaomi.proto
index 062c55339..edb9df498 100644
--- a/app/src/main/proto/xiaomi.proto
+++ b/app/src/main/proto/xiaomi.proto
@@ -92,7 +92,7 @@ message System {
   optional DoNotDisturb dndStatus = 11;
 
   // 2, 39
-  optional WidgetSubtypes widgetSubtypes = 14;
+  optional WorkoutTypes workoutTypes = 14;
 
   // 2, 5
   optional FirmwareInstallRequest firmwareInstallRequest = 16;
@@ -209,13 +209,13 @@ message Language {
   optional string code = 1; // pt_pt, en_us
 }
 
-message WidgetSubtypes {
-  repeated WidgetSubtype widgetSubtype = 1;
+message WorkoutTypes {
+  repeated WorkoutType workoutType = 1;
   optional uint32 unknown2 = 2; // 1
 }
 
-message WidgetSubtype {
-  optional uint32 subType = 1;
+message WorkoutType {
+  optional uint32 type = 1;
   optional uint32 unknown2 = 2; // 1
 }
 

From 8f2924c873ac30a28b06aa0d76cc10cb62a41530 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sun, 10 Dec 2023 22:12:16 +0000
Subject: [PATCH 232/595] Xiaomi: Reject call with SMS reply

---
 .../zeppos/services/ZeppOsPhoneService.java   |  1 -
 .../services/XiaomiNotificationService.java   | 48 +++++++++++++++++++
 app/src/main/proto/xiaomi.proto               | 12 +++++
 3 files changed, 60 insertions(+), 1 deletion(-)

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 f106f11bc..d625e199d 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
@@ -33,7 +33,6 @@ import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdatePref
 import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021Support;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsService;
-import nodomain.freeyourgadget.gadgetbridge.util.GB;
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 
 public class ZeppOsPhoneService extends AbstractZeppOsService {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
index 53e07a36d..3a2bdeea1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
@@ -67,6 +67,8 @@ public class XiaomiNotificationService extends AbstractXiaomiService implements
     public static final int CMD_OPEN_ON_PHONE = 8;
     public static final int CMD_CANNED_MESSAGES_GET = 9;
     public static final int CMD_CANNED_MESSAGES_SET = 12; // also canned message reply
+    public static final int CMD_CALL_REPLY_SEND = 13;
+    public static final int CMD_CALL_REPLY_ACK = 14;
     public static final int CMD_NOTIFICATION_ICON_REQUEST = 15;
     public static final int CMD_NOTIFICATION_ICON_QUERY = 16;
 
@@ -135,6 +137,9 @@ public class XiaomiNotificationService extends AbstractXiaomiService implements
             case CMD_CANNED_MESSAGES_GET:
                 handleCannedMessages(cmd.getNotification().getCannedMessages());
                 return;
+            case CMD_CALL_REPLY_SEND:
+                handleCannedSmsReply(cmd.getNotification().getNotificationReply());
+                return;
             case CMD_NOTIFICATION_ICON_REQUEST:
                 handleNotificationIconRequest(cmd.getNotification().getNotificationIconRequest());
                 return;
@@ -456,6 +461,49 @@ public class XiaomiNotificationService extends AbstractXiaomiService implements
         );
     }
 
+    private void handleCannedSmsReply(final XiaomiProto.NotificationReply notificationReply) {
+        final String phoneNumber = notificationReply.getNumber();
+        if (phoneNumber == null) {
+            LOG.warn("Missing phone number for sms reply");
+            ackSmsReply(false);
+            return;
+        }
+
+        final String message = notificationReply.getMessage();
+        if (message == null) {
+            LOG.warn("Missing message for sms reply");
+            ackSmsReply(false);
+            return;
+        }
+
+        LOG.debug("Sending SMS message '{}' to number '{}' and rejecting call", message, phoneNumber);
+
+        final GBDeviceEventNotificationControl devEvtNotificationControl = new GBDeviceEventNotificationControl();
+        devEvtNotificationControl.handle = -1;
+        devEvtNotificationControl.phoneNumber = phoneNumber;
+        devEvtNotificationControl.reply = message;
+        devEvtNotificationControl.event = GBDeviceEventNotificationControl.Event.REPLY;
+        getSupport().evaluateGBDeviceEvent(devEvtNotificationControl);
+
+        final GBDeviceEventCallControl rejectCallCmd = new GBDeviceEventCallControl(GBDeviceEventCallControl.Event.REJECT);
+        getSupport().evaluateGBDeviceEvent(rejectCallCmd);
+
+        // FIXME probably premature
+        ackSmsReply(true);
+    }
+
+    private void ackSmsReply(final boolean success) {
+        getSupport().sendCommand(
+                "ack sms reply success=" + success,
+                XiaomiProto.Command.newBuilder()
+                        .setType(COMMAND_TYPE)
+                        .setSubtype(CMD_CALL_REPLY_ACK)
+                        .setNotification(XiaomiProto.Notification.newBuilder()
+                                .setNotificationReplyStatus(success ? 0 : 1)
+                        ).build()
+        );
+    }
+
     private void handleNotificationIconRequest(final XiaomiProto.NotificationIconRequest notificationIconRequest) {
         if (iconPackageName == null) {
             LOG.warn("No icon package name");
diff --git a/app/src/main/proto/xiaomi.proto b/app/src/main/proto/xiaomi.proto
index edb9df498..888b430f8 100644
--- a/app/src/main/proto/xiaomi.proto
+++ b/app/src/main/proto/xiaomi.proto
@@ -626,6 +626,11 @@ message Notification {
   // 7, 9 get | 7, 12 set
   optional CannedMessages cannedMessages = 9;
 
+  // 7, 13
+  optional NotificationReply notificationReply = 12;
+  // 7, 14
+  optional uint32 notificationReplyStatus = 13; // 0 on success, 1 on failure
+
   // 7, 15
   optional NotificationIconPackage notificationIconReply = 14;
   // 7, 15
@@ -674,6 +679,13 @@ message NotificationIconRequest {
   optional uint32 size = 3;
 }
 
+message NotificationReply {
+  optional uint32 unknown1 = 1; // 1
+  optional string message = 2;
+  optional uint32 unknown3 = 3; // 1
+  optional string number = 4;
+}
+
 message NotificationIconPackage {
   optional string package = 1;
 }

From 4dbf9bb8ac2bb0abfee4f79575ca1e45727adcda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Mon, 11 Dec 2023 10:50:31 +0000
Subject: [PATCH 233/595] Huami: Toggle phone silent mode from band

---
 .../DeviceSettingsPreferenceConst.java        |  2 +
 .../DeviceSpecificSettingsFragment.java       | 12 +++
 .../deviceevents/GBDeviceEventSilentMode.java | 29 ++++++
 .../gadgetbridge/devices/EventHandler.java    |  2 +
 .../amazfitband5/AmazfitBand5Coordinator.java |  1 +
 .../amazfitbip/AmazfitBipCoordinator.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/miband3/MiBand3Coordinator.java     |  1 +
 .../huami/miband5/MiBand5Coordinator.java     |  1 +
 .../huami/miband6/MiBand6Coordinator.java     |  1 +
 .../devices/huami/zeppe/ZeppECoordinator.java |  1 +
 .../externalevents/SilentModeReceiver.java    | 48 +++++++++
 .../gadgetbridge/impl/GBDeviceService.java    |  7 ++
 .../gadgetbridge/model/DeviceService.java     |  2 +
 .../service/AbstractDeviceSupport.java        | 19 ++++
 .../service/DeviceCommunicationService.java   | 18 ++++
 .../service/ServiceDeviceSupport.java         |  8 ++
 .../devices/huami/HuamiDeviceEvent.java       |  1 +
 .../service/devices/huami/HuamiSupport.java   | 31 ++++++
 .../gadgetbridge/util/SilentMode.java         | 99 +++++++++++++++++++
 app/src/main/res/values/arrays.xml            | 11 +++
 app/src/main/res/values/strings.xml           |  4 +
 .../xml/devicesettings_phone_silent_mode.xml  | 12 +++
 40 files changed, 329 insertions(+)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventSilentMode.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/SilentModeReceiver.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/SilentMode.java
 create mode 100644 app/src/main/res/xml/devicesettings_phone_silent_mode.xml

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
index e9a8e1e20..52b84d2de 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
@@ -376,6 +376,8 @@ public class DeviceSettingsPreferenceConst {
     public static final String PREF_VITALITY_SCORE_7_DAY = "pref_vitality_score_7_day";
     public static final String PREF_VITALITY_SCORE_DAILY = "pref_vitality_score_daily";
 
+    public static final String PREF_PHONE_SILENT_MODE = "phone_silent_mode";
+
     public static final String PREF_HOURLY_CHIME_ENABLE = "hourly_chime_enable";
     public static final String PREF_HOURLY_CHIME_START = "hourly_chime_start";
     public static final String PREF_HOURLY_CHIME_END = "hourly_chime_end";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
index d8fc5bfba..3b4ab03fa 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
@@ -16,7 +16,9 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.devicesettings;
 
+import android.content.Context;
 import android.content.Intent;
+import android.media.AudioManager;
 import android.os.Bundle;
 import android.text.InputType;
 
@@ -55,6 +57,7 @@ import nodomain.freeyourgadget.gadgetbridge.model.CannedMessagesSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 
+import static nodomain.freeyourgadget.gadgetbridge.GBApplication.getContext;
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.*;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_CONTROL_CENTER_SORTABLE;
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_DEVICE_ACTION_FELL_SLEEP_BROADCAST;
@@ -636,6 +639,15 @@ public class DeviceSpecificSettingsFragment extends AbstractPreferenceFragment i
             });
         }
 
+        final Preference phoneSilentMode = findPreference(PREF_PHONE_SILENT_MODE);
+        if (phoneSilentMode != null) {
+            phoneSilentMode.setOnPreferenceChangeListener((preference, newVal) -> {
+                final AudioManager audioManager = (AudioManager) requireContext().getSystemService(Context.AUDIO_SERVICE);
+                GBApplication.deviceService(device).onChangePhoneSilentMode(audioManager.getRingerMode());
+                return true;
+            });
+        }
+
         final String alwaysOnDisplayState = prefs.getString(PREF_ALWAYS_ON_DISPLAY_MODE, PREF_ALWAYS_ON_DISPLAY_OFF);
         boolean alwaysOnDisplayScheduled = alwaysOnDisplayState.equals(PREF_ALWAYS_ON_DISPLAY_SCHEDULED);
         boolean alwaysOnDisplayOff = alwaysOnDisplayState.equals(PREF_ALWAYS_ON_DISPLAY_OFF);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventSilentMode.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventSilentMode.java
new file mode 100644
index 000000000..d02847250
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventSilentMode.java
@@ -0,0 +1,29 @@
+/*  Copyright (C) 2022 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.deviceevents;
+
+public class GBDeviceEventSilentMode extends GBDeviceEvent {
+    private final boolean enabled;
+
+    public GBDeviceEventSilentMode(final boolean enabled) {
+        this.enabled = enabled;
+    }
+
+    public boolean isEnabled() {
+        return enabled;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/EventHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/EventHandler.java
index 05b00847f..900c007c1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/EventHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/EventHandler.java
@@ -75,6 +75,8 @@ public interface EventHandler {
      */
     void onSetPhoneVolume(final float volume);
 
+    void onChangePhoneSilentMode(int ringerMode);
+
     void onSetNavigationInfo(NavigationInfoSpec navigationInfoSpec);
 
     void onEnableRealtimeSteps(boolean enable);
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 9c627479b..6fe4beede 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
@@ -109,6 +109,7 @@ public class AmazfitBand5Coordinator extends HuamiCoordinator {
                 R.xml.devicesettings_expose_hr_thirdparty,
                 R.xml.devicesettings_bt_connected_advertisement,
                 R.xml.devicesettings_device_actions,
+                R.xml.devicesettings_phone_silent_mode,
                 R.xml.devicesettings_high_mtu,
                 R.xml.devicesettings_overwrite_settings_on_connection,
                 R.xml.devicesettings_huami2021_fetch_operation_time_unit,
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 ad346a1fb..19923b027 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
@@ -82,6 +82,7 @@ public class AmazfitBipCoordinator extends HuamiCoordinator {
                 R.xml.devicesettings_bt_connected_advertisement,
                 R.xml.devicesettings_buttonactions_with_longpress,
                 R.xml.devicesettings_device_actions,
+                R.xml.devicesettings_phone_silent_mode,
                 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 a66d89599..9abb2aa32 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
@@ -96,6 +96,7 @@ public class AmazfitBipSCoordinator extends HuamiCoordinator {
                 R.xml.devicesettings_bt_connected_advertisement,
                 R.xml.devicesettings_high_mtu,
                 R.xml.devicesettings_device_actions,
+                R.xml.devicesettings_phone_silent_mode,
                 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 a0af5cacf..e58e37ef7 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
@@ -119,6 +119,7 @@ public class AmazfitBipUCoordinator extends HuamiCoordinator {
                 R.xml.devicesettings_bt_connected_advertisement,
                 R.xml.devicesettings_high_mtu,
                 R.xml.devicesettings_device_actions,
+                R.xml.devicesettings_phone_silent_mode,
                 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 4e7b77acf..837e7e0db 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
@@ -110,6 +110,7 @@ public class AmazfitBipUProCoordinator extends HuamiCoordinator {
                 R.xml.devicesettings_bt_connected_advertisement,
                 R.xml.devicesettings_high_mtu,
                 R.xml.devicesettings_device_actions,
+                R.xml.devicesettings_phone_silent_mode,
                 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 5c6cc5dce..dc734ce17 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
@@ -90,6 +90,7 @@ public class AmazfitCorCoordinator extends HuamiCoordinator {
                 R.xml.devicesettings_reserve_reminders_calendar,
                 R.xml.devicesettings_bt_connected_advertisement,
                 R.xml.devicesettings_device_actions,
+                R.xml.devicesettings_phone_silent_mode,
                 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 32f2a82f0..9f1050109 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
@@ -92,6 +92,7 @@ public class AmazfitCor2Coordinator extends HuamiCoordinator {
                 R.xml.devicesettings_reserve_reminders_calendar,
                 R.xml.devicesettings_bt_connected_advertisement,
                 R.xml.devicesettings_device_actions,
+                R.xml.devicesettings_phone_silent_mode,
                 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 e0f2470d9..94d61ff8a 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
@@ -90,6 +90,7 @@ public class AmazfitGTRCoordinator extends HuamiCoordinator {
                 R.xml.devicesettings_bt_connected_advertisement,
                 R.xml.devicesettings_buttonactions_with_longpress,
                 R.xml.devicesettings_device_actions,
+                R.xml.devicesettings_phone_silent_mode,
                 R.xml.devicesettings_high_mtu,
                 R.xml.devicesettings_overwrite_settings_on_connection,
                 R.xml.devicesettings_huami2021_fetch_operation_time_unit,
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 7d7fa1176..bbbf9b5bd 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
@@ -90,6 +90,7 @@ public class AmazfitGTRLiteCoordinator extends HuamiCoordinator {
                 R.xml.devicesettings_reserve_reminders_calendar,
                 R.xml.devicesettings_expose_hr_thirdparty,
                 R.xml.devicesettings_bt_connected_advertisement,
+                R.xml.devicesettings_phone_silent_mode,
                 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 cf0be46e4..e14dfece9 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
@@ -96,6 +96,7 @@ public class AmazfitGTR2Coordinator extends HuamiCoordinator {
                 R.xml.devicesettings_expose_hr_thirdparty,
                 R.xml.devicesettings_bt_connected_advertisement,
                 R.xml.devicesettings_device_actions,
+                R.xml.devicesettings_phone_silent_mode,
                 R.xml.devicesettings_high_mtu,
                 R.xml.devicesettings_overwrite_settings_on_connection,
                 R.xml.devicesettings_huami2021_fetch_operation_time_unit,
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 fc95ba722..b6e680f0d 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
@@ -96,6 +96,7 @@ public class AmazfitGTR2eCoordinator extends HuamiCoordinator {
                 R.xml.devicesettings_expose_hr_thirdparty,
                 R.xml.devicesettings_bt_connected_advertisement,
                 R.xml.devicesettings_device_actions,
+                R.xml.devicesettings_phone_silent_mode,
                 R.xml.devicesettings_high_mtu,
                 R.xml.devicesettings_overwrite_settings_on_connection,
                 R.xml.devicesettings_huami2021_fetch_operation_time_unit,
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 7c511b90a..ffffb2a59 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
@@ -90,6 +90,7 @@ public class AmazfitGTSCoordinator extends HuamiCoordinator {
                 R.xml.devicesettings_expose_hr_thirdparty,
                 R.xml.devicesettings_bt_connected_advertisement,
                 R.xml.devicesettings_device_actions,
+                R.xml.devicesettings_phone_silent_mode,
                 R.xml.devicesettings_high_mtu,
                 R.xml.devicesettings_overwrite_settings_on_connection,
                 R.xml.devicesettings_huami2021_fetch_operation_time_unit,
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 643f1dfd4..13ef19e59 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
@@ -96,6 +96,7 @@ public class AmazfitGTS2Coordinator extends HuamiCoordinator {
                 R.xml.devicesettings_expose_hr_thirdparty,
                 R.xml.devicesettings_bt_connected_advertisement,
                 R.xml.devicesettings_device_actions,
+                R.xml.devicesettings_phone_silent_mode,
                 R.xml.devicesettings_high_mtu,
                 R.xml.devicesettings_overwrite_settings_on_connection,
                 R.xml.devicesettings_huami2021_fetch_operation_time_unit,
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 872f2277d..6259e22a5 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
@@ -65,6 +65,7 @@ public class AmazfitGTS2MiniCoordinator extends AmazfitGTS2Coordinator {
                 R.xml.devicesettings_expose_hr_thirdparty,
                 R.xml.devicesettings_bt_connected_advertisement,
                 R.xml.devicesettings_device_actions,
+                R.xml.devicesettings_phone_silent_mode,
                 R.xml.devicesettings_high_mtu,
                 R.xml.devicesettings_overwrite_settings_on_connection,
                 R.xml.devicesettings_huami2021_fetch_operation_time_unit,
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 a76262cda..5c48f60cf 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
@@ -96,6 +96,7 @@ public class AmazfitGTS2eCoordinator extends HuamiCoordinator {
                 R.xml.devicesettings_expose_hr_thirdparty,
                 R.xml.devicesettings_bt_connected_advertisement,
                 R.xml.devicesettings_device_actions,
+                R.xml.devicesettings_phone_silent_mode,
                 R.xml.devicesettings_high_mtu,
                 R.xml.devicesettings_overwrite_settings_on_connection,
                 R.xml.devicesettings_huami2021_fetch_operation_time_unit,
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 10e502b55..58bd69714 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
@@ -98,6 +98,7 @@ public class AmazfitNeoCoordinator extends HuamiCoordinator {
                 R.xml.devicesettings_expose_hr_thirdparty,
                 R.xml.devicesettings_bt_connected_advertisement,
                 R.xml.devicesettings_device_actions,
+                R.xml.devicesettings_phone_silent_mode,
                 R.xml.devicesettings_high_mtu,
                 R.xml.devicesettings_overwrite_settings_on_connection,
                 R.xml.devicesettings_huami2021_fetch_operation_time_unit,
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 579685a28..1cbbc3015 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
@@ -90,6 +90,7 @@ public class AmazfitTRexCoordinator extends HuamiCoordinator {
                 R.xml.devicesettings_expose_hr_thirdparty,
                 R.xml.devicesettings_bt_connected_advertisement,
                 R.xml.devicesettings_device_actions,
+                R.xml.devicesettings_phone_silent_mode,
                 R.xml.devicesettings_high_mtu,
                 R.xml.devicesettings_overwrite_settings_on_connection,
                 R.xml.devicesettings_huami2021_fetch_operation_time_unit,
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 baf7231fa..5c79275cc 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
@@ -90,6 +90,7 @@ public class AmazfitTRexProCoordinator extends HuamiCoordinator {
                 R.xml.devicesettings_expose_hr_thirdparty,
                 R.xml.devicesettings_bt_connected_advertisement,
                 R.xml.devicesettings_device_actions,
+                R.xml.devicesettings_phone_silent_mode,
                 R.xml.devicesettings_high_mtu,
                 R.xml.devicesettings_overwrite_settings_on_connection,
                 R.xml.devicesettings_huami2021_fetch_operation_time_unit,
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 c8745b63b..781a10509 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
@@ -91,6 +91,7 @@ public class AmazfitVergeLCoordinator extends HuamiCoordinator {
                 R.xml.devicesettings_disconnectnotification,
                 R.xml.devicesettings_bt_connected_advertisement,
                 R.xml.devicesettings_buttonactions_with_longpress,
+                R.xml.devicesettings_phone_silent_mode,
                 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 739d25445..06b4be53d 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
@@ -93,6 +93,7 @@ public class AmazfitXCoordinator extends HuamiCoordinator {
                 R.xml.devicesettings_expose_hr_thirdparty,
                 R.xml.devicesettings_bt_connected_advertisement,
                 R.xml.devicesettings_device_actions,
+                R.xml.devicesettings_phone_silent_mode,
                 R.xml.devicesettings_high_mtu,
                 R.xml.devicesettings_overwrite_settings_on_connection,
                 R.xml.devicesettings_huami2021_fetch_operation_time_unit,
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 48364887f..6bc289636 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
@@ -107,6 +107,7 @@ public class MiBand3Coordinator extends HuamiCoordinator {
                 R.xml.devicesettings_expose_hr_thirdparty,
                 R.xml.devicesettings_bt_connected_advertisement,
                 R.xml.devicesettings_device_actions,
+                R.xml.devicesettings_phone_silent_mode,
                 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 5c5ebc85a..6749bd680 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
@@ -118,6 +118,7 @@ public class MiBand5Coordinator extends HuamiCoordinator {
                 R.xml.devicesettings_expose_hr_thirdparty,
                 R.xml.devicesettings_bt_connected_advertisement,
                 R.xml.devicesettings_device_actions,
+                R.xml.devicesettings_phone_silent_mode,
                 R.xml.devicesettings_high_mtu,
                 R.xml.devicesettings_overwrite_settings_on_connection,
                 R.xml.devicesettings_huami2021_fetch_operation_time_unit,
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 bd2c6d23c..643d48cb7 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
@@ -107,6 +107,7 @@ public class MiBand6Coordinator extends HuamiCoordinator {
                 R.xml.devicesettings_reserve_reminders_calendar,
                 R.xml.devicesettings_expose_hr_thirdparty,
                 R.xml.devicesettings_bt_connected_advertisement,
+                R.xml.devicesettings_phone_silent_mode,
                 R.xml.devicesettings_high_mtu,
                 R.xml.devicesettings_overwrite_settings_on_connection,
                 R.xml.devicesettings_huami2021_fetch_operation_time_unit,
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 f0a38483d..d450a121c 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
@@ -89,6 +89,7 @@ public class ZeppECoordinator extends HuamiCoordinator {
                 R.xml.devicesettings_expose_hr_thirdparty,
                 R.xml.devicesettings_bt_connected_advertisement,
                 R.xml.devicesettings_device_actions,
+                R.xml.devicesettings_phone_silent_mode,
                 R.xml.devicesettings_high_mtu,
                 R.xml.devicesettings_overwrite_settings_on_connection,
                 R.xml.devicesettings_huami2021_fetch_operation_time_unit,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/SilentModeReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/SilentModeReceiver.java
new file mode 100644
index 000000000..84eeb57af
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/SilentModeReceiver.java
@@ -0,0 +1,48 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.externalevents;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.media.AudioManager;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+
+public class SilentModeReceiver extends BroadcastReceiver {
+    private static final Logger LOG = LoggerFactory.getLogger(SilentModeReceiver.class);
+
+    @Override
+    public void onReceive(final Context context, final Intent intent) {
+        if (intent.getAction() == null) {
+            return;
+        }
+
+        if (!AudioManager.RINGER_MODE_CHANGED_ACTION.equals(intent.getAction())) {
+            LOG.warn("Unexpected action {}", intent.getAction());
+            return;
+        }
+
+        final AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
+        final int ringerMode = audioManager.getRingerMode();
+
+        GBApplication.deviceService().onChangePhoneSilentMode(ringerMode);
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceService.java
index a107da02d..bd9e68a14 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceService.java
@@ -262,6 +262,13 @@ public class GBDeviceService implements DeviceService {
         invokeService(intent);
     }
 
+    @Override
+    public void onChangePhoneSilentMode(int ringerMode) {
+        Intent intent = createIntent().setAction(ACTION_SET_PHONE_SILENT_MODE)
+                .putExtra(EXTRA_PHONE_RINGER_MODE, ringerMode);
+        invokeService(intent);
+    }
+
     @Override
     public void onSetReminders(ArrayList<? extends Reminder> reminders) {
         Intent intent = createIntent().setAction(ACTION_SET_REMINDERS)
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceService.java
index 0b46b2cab..e83ab9ab6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceService.java
@@ -38,6 +38,7 @@ public interface DeviceService extends EventHandler {
     String ACTION_SETMUSICINFO = PREFIX + ".action.setmusicinfo";
     String ACTION_SETMUSICSTATE = PREFIX + ".action.setmusicstate";
     String ACTION_SET_PHONE_VOLUME = PREFIX + ".action.set_phone_volume";
+    String ACTION_SET_PHONE_SILENT_MODE = PREFIX + ".action.set_phone_silent_mode";
     String ACTION_SETNAVIGATIONINFO = PREFIX + ".action.setnavigationinfo";
     String ACTION_REQUEST_DEVICEINFO = PREFIX + ".action.request_deviceinfo";
     String ACTION_REQUEST_APPINFO = PREFIX + ".action.request_appinfo";
@@ -114,6 +115,7 @@ public interface DeviceService extends EventHandler {
     String EXTRA_MUSIC_POSITION = "music_position";
     String EXTRA_MUSIC_RATE = "music_rate";
     String EXTRA_PHONE_VOLUME = "phone_volume";
+    String EXTRA_PHONE_RINGER_MODE = "ringer_mode";
     String EXTRA_NAVIGATION_INSTRUCTION = "navigation_instruction";
     String EXTRA_NAVIGATION_DISTANCE_TO_TURN = "navigation_distance_to_turn";
     String EXTRA_NAVIGATION_NEXT_ACTION = "navigation_next_action";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java
index e9a89ac27..85b27e881 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java
@@ -70,6 +70,7 @@ import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventDisplayMes
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventFindPhone;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventFmFrequency;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventSleepStateDetection;
+import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventSilentMode;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdateDeviceInfo;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventLEDColor;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventMusicControl;
@@ -105,6 +106,7 @@ import nodomain.freeyourgadget.gadgetbridge.service.receivers.GBMusicControlRece
 import nodomain.freeyourgadget.gadgetbridge.util.GB;
 import nodomain.freeyourgadget.gadgetbridge.util.PendingIntentUtils;
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
+import nodomain.freeyourgadget.gadgetbridge.util.SilentMode;
 
 import static nodomain.freeyourgadget.gadgetbridge.util.GB.NOTIFICATION_CHANNEL_HIGH_PRIORITY_ID;
 
@@ -212,6 +214,8 @@ public abstract class AbstractDeviceSupport implements DeviceSupport {
             handleGBDeviceEvent((GBDeviceEventUpdatePreferences) deviceEvent);
         } else if (deviceEvent instanceof GBDeviceEventUpdateDeviceState) {
             handleGBDeviceEvent((GBDeviceEventUpdateDeviceState) deviceEvent);
+        } else if (deviceEvent instanceof GBDeviceEventSilentMode) {
+            handleGBDeviceEvent((GBDeviceEventSilentMode) deviceEvent);
         } else if (deviceEvent instanceof GBDeviceEventFmFrequency) {
             handleGBDeviceEvent((GBDeviceEventFmFrequency) deviceEvent);
         } else if (deviceEvent instanceof GBDeviceEventWearState) {
@@ -221,6 +225,12 @@ public abstract class AbstractDeviceSupport implements DeviceSupport {
         }
     }
 
+    private void handleGBDeviceEvent(GBDeviceEventSilentMode deviceEvent) {
+        LOG.info("Got GBDeviceEventSilentMode: enabled = {}", deviceEvent.isEnabled());
+
+        SilentMode.setPhoneSilentMode(getDevice().getAddress(), deviceEvent.isEnabled());
+    }
+
     private void handleGBDeviceEvent(final GBDeviceEventFindPhone deviceEvent) {
         final Context context = getContext();
         LOG.info("Got GBDeviceEventFindPhone: {}", deviceEvent.event);
@@ -793,6 +803,15 @@ public abstract class AbstractDeviceSupport implements DeviceSupport {
 
     }
 
+    /**
+     * Called when the phone's interruption filter or ringer mode is changed.
+     * @param ringerMode as per {@link android.media.AudioManager#getRingerMode()}
+     */
+    @Override
+    public void onChangePhoneSilentMode(int ringerMode) {
+
+    }
+
     /**
      * If the device can receive the GPS location from the phone, this method
      * can be overridden and implemented by the device support class.
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
index a2925accb..058f9cb7d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
@@ -33,6 +33,7 @@ import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.location.Location;
+import android.media.AudioManager;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
@@ -73,6 +74,7 @@ import nodomain.freeyourgadget.gadgetbridge.externalevents.OsmandEventReceiver;
 import nodomain.freeyourgadget.gadgetbridge.externalevents.PebbleReceiver;
 import nodomain.freeyourgadget.gadgetbridge.externalevents.PhoneCallReceiver;
 import nodomain.freeyourgadget.gadgetbridge.externalevents.SMSReceiver;
+import nodomain.freeyourgadget.gadgetbridge.externalevents.SilentModeReceiver;
 import nodomain.freeyourgadget.gadgetbridge.externalevents.TimeChangeReceiver;
 import nodomain.freeyourgadget.gadgetbridge.externalevents.TinyWeatherForecastGermanyReceiver;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
@@ -233,6 +235,7 @@ public class DeviceCommunicationService extends Service implements SharedPrefere
     private BluetoothConnectReceiver mBlueToothConnectReceiver = null;
     private BluetoothPairingRequestReceiver mBlueToothPairingRequestReceiver = null;
     private AlarmClockReceiver mAlarmClockReceiver = null;
+    private SilentModeReceiver mSilentModeReceiver = null;
     private GBAutoFetchReceiver mGBAutoFetchReceiver = null;
     private AutoConnectIntervalReceiver mAutoConnectInvervalReceiver = null;
 
@@ -776,6 +779,10 @@ public class DeviceCommunicationService extends Service implements SharedPrefere
                 float phoneVolume = intent.getFloatExtra(EXTRA_PHONE_VOLUME, 0);
                 deviceSupport.onSetPhoneVolume(phoneVolume);
                 break;
+            case ACTION_SET_PHONE_SILENT_MODE:
+                final int ringerMode = intent.getIntExtra(EXTRA_PHONE_RINGER_MODE, -1);
+                deviceSupport.onChangePhoneSilentMode(ringerMode);
+                break;
             case ACTION_SETMUSICSTATE:
                 MusicStateSpec stateSpec = new MusicStateSpec();
                 stateSpec.shuffle = intent.getByteExtra(EXTRA_MUSIC_SHUFFLE, (byte) 0);
@@ -1156,6 +1163,13 @@ public class DeviceCommunicationService extends Service implements SharedPrefere
                 registerReceiver(mAlarmClockReceiver, filter);
             }
 
+            if (mSilentModeReceiver == null) {
+                mSilentModeReceiver = new SilentModeReceiver();
+                IntentFilter filter = new IntentFilter();
+                filter.addAction(AudioManager.RINGER_MODE_CHANGED_ACTION);
+                registerReceiver(mSilentModeReceiver, filter);
+            }
+
             if (mOsmandAidlHelper == null && features.supportsNavigation()) {
                 mOsmandAidlHelper = new OsmandEventReceiver(this.getApplication());
             }
@@ -1226,6 +1240,10 @@ public class DeviceCommunicationService extends Service implements SharedPrefere
                 unregisterReceiver(mAlarmClockReceiver);
                 mAlarmClockReceiver = null;
             }
+            if (mSilentModeReceiver != null) {
+                unregisterReceiver(mSilentModeReceiver);
+                mSilentModeReceiver = null;
+            }
             if (mCMWeatherReceiver != null) {
                 unregisterReceiver(mCMWeatherReceiver);
                 mCMWeatherReceiver = null;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/ServiceDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/ServiceDeviceSupport.java
index 420155fad..f26aa7719 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/ServiceDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/ServiceDeviceSupport.java
@@ -224,6 +224,14 @@ public class ServiceDeviceSupport implements DeviceSupport {
         delegate.onSetPhoneVolume(volume);
     }
 
+    @Override
+    public void onChangePhoneSilentMode(final int ringerMode) {
+        if (checkBusy("change phone silent mode")) {
+            return;
+        }
+        delegate.onChangePhoneSilentMode(ringerMode);
+    }
+
     @Override
     public void onSetNavigationInfo(NavigationInfoSpec navigationInfoSpec) {
         if (checkBusy("set navigation info")) {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiDeviceEvent.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiDeviceEvent.java
index c299eb845..1efa93eb1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiDeviceEvent.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiDeviceEvent.java
@@ -30,6 +30,7 @@ public class HuamiDeviceEvent {
     public static final byte BUTTON_PRESSED_LONG = 0x0b;
     public static final byte TICK_30MIN = 0x0e; // unsure
     public static final byte FIND_PHONE_STOP = 0x0f;
+    public static final byte SILENT_MODE = 0x10;
     public static final byte MTU_REQUEST = 0x16;
     public static final byte WORKOUT_STARTING = 0x14;
     public static final byte ALARM_CHANGED = 0x1a;
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 557afb49a..19beeb779 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
@@ -87,6 +87,7 @@ import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventFindPhone;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventMusicControl;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventNotificationControl;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventSleepStateDetection;
+import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventSilentMode;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventVersionInfo;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventWearState;
 import nodomain.freeyourgadget.gadgetbridge.devices.DeviceCoordinator;
@@ -141,6 +142,7 @@ import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.operations.Fet
 import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.operations.HuamiFetchDebugLogsOperation;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services.ZeppOsCannedMessagesService;
 import nodomain.freeyourgadget.gadgetbridge.util.MediaManager;
+import nodomain.freeyourgadget.gadgetbridge.util.SilentMode;
 import nodomain.freeyourgadget.gadgetbridge.util.calendar.CalendarEvent;
 import nodomain.freeyourgadget.gadgetbridge.util.calendar.CalendarManager;
 import nodomain.freeyourgadget.gadgetbridge.model.CallSpec;
@@ -1893,6 +1895,12 @@ public abstract class HuamiSupport extends AbstractBTLEDeviceSupport implements
                 findPhoneEvent.event = GBDeviceEventFindPhone.Event.STOP;
                 evaluateGBDeviceEvent(findPhoneEvent);
                 break;
+            case HuamiDeviceEvent.SILENT_MODE:
+                final boolean silentModeEnabled = value[1] == 1;
+                LOG.info("silent mode = {}", silentModeEnabled);
+                sendPhoneSilentMode(silentModeEnabled);
+                evaluateGBDeviceEvent(new GBDeviceEventSilentMode(silentModeEnabled));
+                break;
             case HuamiDeviceEvent.MUSIC_CONTROL:
                 LOG.info("got music control");
                 GBDeviceEventMusicControl deviceEventMusicControl = new GBDeviceEventMusicControl();
@@ -2156,6 +2164,28 @@ public abstract class HuamiSupport extends AbstractBTLEDeviceSupport implements
         }
     }
 
+    private void sendPhoneSilentMode(final TransactionBuilder builder) {
+        final boolean silentMode = SilentMode.isPhoneInSilenceMode(getDevice().getAddress());
+
+        sendPhoneSilentMode(builder, silentMode);
+    }
+
+    private void sendPhoneSilentMode(final boolean enabled) {
+        try {
+            final TransactionBuilder builder = performInitialized("send phone silent mode");
+            sendPhoneSilentMode(builder, enabled);
+            builder.queue(getQueue());
+        } catch (final Exception ex) {
+            LOG.error("Error while sending phone silent mode", ex);
+        }
+    }
+
+    private void sendPhoneSilentMode(final TransactionBuilder builder, final boolean enabled) {
+        final byte[] cmd = {ENDPOINT_DISPLAY, 0x19, 0x00, (byte) (enabled ? 0x01 : 0x00)};
+
+        writeToConfiguration(builder, cmd);
+    }
+
     protected void processDeviceEvent(int deviceEvent){
         LOG.debug("Handling device event: " + deviceEvent);
         GBDeviceEvent event;
@@ -4161,6 +4191,7 @@ public abstract class HuamiSupport extends AbstractBTLEDeviceSupport implements
         }
 
         requestAlarms(builder);
+        sendPhoneSilentMode(builder);
     }
 
     public abstract HuamiFWHelper createFWHelper(Uri uri, Context context) throws IOException;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/SilentMode.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/SilentMode.java
new file mode 100644
index 000000000..f80c99568
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/SilentMode.java
@@ -0,0 +1,99 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.util;
+
+import static nodomain.freeyourgadget.gadgetbridge.GBApplication.getContext;
+
+import android.content.Context;
+import android.media.AudioManager;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Locale;
+
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
+
+public class SilentMode {
+    private static final Logger LOG = LoggerFactory.getLogger(SilentMode.class);
+
+    public enum RingerMode {
+        NORMAL(AudioManager.RINGER_MODE_NORMAL),
+        VIBRATE(AudioManager.RINGER_MODE_VIBRATE),
+        SILENT(AudioManager.RINGER_MODE_SILENT),
+        UNKNOWN(-1);
+
+        private final int code;
+
+        RingerMode(final int code) {
+            this.code = code;
+        }
+
+        public int getCode() {
+            return code;
+        }
+
+        public static RingerMode fromCode(final int code) {
+            for (final RingerMode ringerMode : values()) {
+                if (ringerMode.code == code) {
+                    return ringerMode;
+                }
+            }
+
+            return RingerMode.UNKNOWN;
+        }
+    }
+
+    public static void setPhoneSilentMode(final String deviceAddress, final boolean enabled) {
+        final RingerMode[] phoneSilentMode = getPhoneSilentMode(deviceAddress);
+        final RingerMode ringerMode = phoneSilentMode[enabled ? 1 : 0];
+
+        LOG.debug("Set phone silent mode = {} ({})", enabled, ringerMode);
+
+        setRingerMode(ringerMode);
+    }
+
+    public static boolean isPhoneInSilenceMode(final String deviceAddress) {
+        final AudioManager audioManager = (AudioManager) getContext().getSystemService(Context.AUDIO_SERVICE);
+        final RingerMode currentRingerMode = RingerMode.fromCode(audioManager.getRingerMode());
+        final RingerMode[] phoneSilentMode = getPhoneSilentMode(deviceAddress);
+
+        // Check if current mode "is more silent than" desired ringer mode
+        return currentRingerMode.getCode() < phoneSilentMode[0].getCode();
+    }
+
+    public static RingerMode[] getPhoneSilentMode(final String deviceAddress) {
+        final Prefs prefs = new Prefs(GBApplication.getDeviceSpecificSharedPrefs(deviceAddress));
+        final String phoneSilentModePref = prefs.getString(DeviceSettingsPreferenceConst.PREF_PHONE_SILENT_MODE, "normal_silent").toUpperCase(Locale.ROOT);
+        final String[] prefSplit = phoneSilentModePref.split("_");
+        return new RingerMode[]{
+                RingerMode.valueOf(prefSplit[0]),
+                RingerMode.valueOf(prefSplit[1])
+        };
+    }
+
+    public static void setRingerMode(final RingerMode mode) {
+        if (mode == RingerMode.UNKNOWN) {
+            LOG.warn("Unable to set unknown ringer mode");
+            return;
+        }
+
+        final AudioManager audioManager = (AudioManager) getContext().getSystemService(Context.AUDIO_SERVICE);
+        audioManager.setRingerMode(mode.getCode());
+    }
+}
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 38f919aea..d09fb8b3f 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -204,6 +204,17 @@
         <item>@string/p_alarm_clock</item>
     </string-array>
 
+    <string-array name="phone_silent_mode">
+        <item>@string/silent_mode_normal_vibrate</item>
+        <item>@string/silent_mode_normal_silent</item>
+        <item>@string/silent_mode_vibrate_silent</item>
+    </string-array>
+    <string-array name="phone_silent_mode_values">
+        <item>normal_vibrate</item>
+        <item>normal_silent</item>
+        <item>vibrate_silent</item>
+    </string-array>
+
     <string-array name="pebble_activitytracker">
         <item name="4">Pebble Health</item>
         <item name="3">Misfit</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5342d21dd..a296f777a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -964,6 +964,10 @@
     <string name="mi2_prefs_inactivity_warnings_dnd_summary">Disable inactivity warnings for a time interval</string>
     <string name="mi2_prefs_heart_rate_monitoring">Heart Rate Monitoring</string>
     <string name="mi2_prefs_heart_rate_monitoring_summary">Configure heart rate monitoring</string>
+    <string name="prefs_phone_silent_mode">Phone Silent Mode</string>
+    <string name="silent_mode_normal_vibrate">Normal / Vibrate</string>
+    <string name="silent_mode_normal_silent">Normal / Silent</string>
+    <string name="silent_mode_vibrate_silent">Vibrate / Silent</string>
     <string name="prefs_always_on_display">Always On Display</string>
     <string name="prefs_always_on_display_follow_watchface">Style follows Watchface</string>
     <string name="prefs_always_on_display_style">Style</string>
diff --git a/app/src/main/res/xml/devicesettings_phone_silent_mode.xml b/app/src/main/res/xml/devicesettings_phone_silent_mode.xml
new file mode 100644
index 000000000..1866d1036
--- /dev/null
+++ b/app/src/main/res/xml/devicesettings_phone_silent_mode.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <ListPreference
+        android:defaultValue="normal_silent"
+        android:entries="@array/phone_silent_mode"
+        android:entryValues="@array/phone_silent_mode_values"
+        android:icon="@drawable/ic_volume_off"
+        android:key="phone_silent_mode"
+        android:title="@string/prefs_phone_silent_mode"
+        app:useSimpleSummaryProvider="true" />
+</androidx.preference.PreferenceScreen>

From efc8752a6664fb580c4c9f10f4fa0a6e38e39251 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Mon, 11 Dec 2023 10:50:50 +0000
Subject: [PATCH 234/595] Zepp OS: Toggle phone silent mode from band

---
 .../devices/huami/Huami2021Coordinator.java   |  1 +
 .../devices/huami/Huami2021Support.java       | 30 +++++++++++++++----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021Coordinator.java
index 11749462b..b12bfd42e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021Coordinator.java
@@ -419,6 +419,7 @@ public abstract class Huami2021Coordinator extends HuamiCoordinator {
         }
         settings.add(R.xml.devicesettings_offline_voice);
         settings.add(R.xml.devicesettings_device_actions_without_not_wear);
+        settings.add(R.xml.devicesettings_phone_silent_mode);
         settings.add(R.xml.devicesettings_buttonactions_upper_long);
         settings.add(R.xml.devicesettings_buttonactions_lower_short);
         settings.add(R.xml.devicesettings_weardirection);
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 f495979ae..ad50e63e7 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
@@ -72,6 +72,7 @@ import nodomain.freeyourgadget.gadgetbridge.capabilities.loyaltycards.LoyaltyCar
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventDisplayMessage;
 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.Huami2021Service;
@@ -128,11 +129,11 @@ import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.service
 import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services.ZeppOsPhoneService;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services.ZeppOsWatchfaceService;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services.ZeppOsWifiService;
-import nodomain.freeyourgadget.gadgetbridge.util.DeviceHelper;
 import nodomain.freeyourgadget.gadgetbridge.util.FileUtils;
 import nodomain.freeyourgadget.gadgetbridge.util.GB;
 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);
@@ -1348,19 +1349,38 @@ public abstract class Huami2021Support extends HuamiSupport implements ZeppOsFil
                 return;
             case SILENT_MODE_CMD_QUERY:
                 LOG.info("Got silent mode query from band");
-                // TODO sendCurrentSilentMode();
+                sendPhoneSilentMode(SilentMode.isPhoneInSilenceMode(getDevice().getAddress()));
                 return;
             case SILENT_MODE_CMD_SET:
                 LOG.info("Band setting silent mode = {}", payload[1]);
-                // TODO ackSilentModeSet();
-                // TODO setSilentMode(payload[1] == 0x01);
-                // TODO sendCurrentSilentMode();
+                final boolean silentModeEnabled = (payload[1] == 1);
+                ackSilentModeSet();
+                sendPhoneSilentMode(silentModeEnabled);
+                evaluateGBDeviceEvent(new GBDeviceEventSilentMode(silentModeEnabled));
                 return;
             default:
                 LOG.warn("Unexpected silent mode payload byte {}", String.format("0x%02x", payload[0]));
         }
     }
 
+    private void ackSilentModeSet() {
+        writeToChunked2021(
+                "ack silent mode set",
+                CHUNKED2021_ENDPOINT_SILENT_MODE,
+                new byte[]{SILENT_MODE_CMD_ACK, 0x01},
+                false
+        );
+    }
+
+    private void sendPhoneSilentMode(final boolean enabled) {
+        writeToChunked2021(
+                "send phone silent mode to band",
+                CHUNKED2021_ENDPOINT_SILENT_MODE,
+                new byte[]{SILENT_MODE_CMD_NOTIFY_BAND, bool(enabled)},
+                false
+        );
+    }
+
     @Override
     public void onFileUploadFinish(final boolean success) {
         LOG.warn("Unexpected file upload finish: {}", success);

From 095b9e42d357513c00baf51da7840f5a7f640c1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Mon, 11 Dec 2023 10:51:10 +0000
Subject: [PATCH 235/595] Xiaomi: Toggle phone silent mode from band

---
 .../devices/xiaomi/XiaomiCoordinator.java     |  1 +
 .../xiaomi/XiaomiSettingsCustomizer.java      |  3 +-
 .../xiaomi/services/XiaomiSystemService.java  | 37 +++++++++++++++++++
 app/src/main/proto/xiaomi.proto               | 18 +++++++++
 4 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
index cd3b47c15..5617ce1a0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
@@ -443,6 +443,7 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
         if (supports(device, FEAT_DEVICE_ACTIONS)) {
             settings.add(R.xml.devicesettings_device_actions);
         }
+        settings.add(R.xml.devicesettings_phone_silent_mode);
 
         //
         // Developer
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSettingsCustomizer.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSettingsCustomizer.java
index af198707c..71c6a25dd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSettingsCustomizer.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSettingsCustomizer.java
@@ -54,7 +54,8 @@ public class XiaomiSettingsCustomizer implements DeviceSpecificSettingsCustomize
         hidePrefIfNoneVisible(handler, "pref_header_other", Arrays.asList(
                 "pref_contacts",
                 "camera_remote",
-                "screen_events_forwarding"
+                "screen_events_forwarding",
+                "phone_silent_mode"
         ));
     }
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
index 7557b490e..2be56f7d0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
@@ -56,6 +56,7 @@ import nodomain.freeyourgadget.gadgetbridge.util.CheckSums;
 import nodomain.freeyourgadget.gadgetbridge.util.GB;
 import nodomain.freeyourgadget.gadgetbridge.util.GBPrefs;
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
+import nodomain.freeyourgadget.gadgetbridge.util.SilentMode;
 import nodomain.freeyourgadget.gadgetbridge.util.StringUtils;
 
 public class XiaomiSystemService extends AbstractXiaomiService implements XiaomiDataUploadService.Callback {
@@ -83,6 +84,9 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
     public static final int CMD_DISPLAY_ITEMS_GET = 29;
     public static final int CMD_DISPLAY_ITEMS_SET = 30;
     public static final int CMD_MISC_SETTING_SET_FROM_BAND = 42;
+    public static final int CMD_SILENT_MODE_GET = 43;
+    public static final int CMD_SILENT_MODE_SET_FROM_PHONE = 44;
+    public static final int CMD_SILENT_MODE_SET_FROM_WATCH = 45;
     public static final int CMD_DEVICE_STATE_GET = 78;
     public static final int CMD_DEVICE_STATE = 79;
 
@@ -158,6 +162,12 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
             case CMD_MISC_SETTING_SET_FROM_BAND:
                 handleMiscSettingSet(cmd.getSystem().getMiscSettingSet());
                 return;
+            case CMD_SILENT_MODE_GET:
+                handlePhoneSilentModeGet();
+                return;
+            case CMD_SILENT_MODE_SET_FROM_WATCH:
+                handlePhoneSilentModeSet(cmd.getSystem().getPhoneSilentModeSet());
+                return;
             case CMD_DEVICE_STATE_GET:
                 handleBasicDeviceState(cmd.getSystem().hasBasicDeviceState()
                         ? cmd.getSystem().getBasicDeviceState()
@@ -634,6 +644,33 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
         currentSleepDetectionState = newState;
     }
 
+    public void handlePhoneSilentModeGet() {
+        LOG.debug("Watch requested phone silent mode");
+        sendPhoneSilentMode(SilentMode.isPhoneInSilenceMode(getSupport().getDevice().getAddress()));
+    }
+
+    public void handlePhoneSilentModeSet(final XiaomiProto.PhoneSilentModeSet phoneSilentModeSet) {
+        final boolean silent = phoneSilentModeSet.getPhoneSilentMode().getSilent();
+
+        LOG.debug("Set phone silent mode = {}", silent);
+        SilentMode.setPhoneSilentMode(getSupport().getDevice().getAddress(), silent);
+    }
+
+    private void sendPhoneSilentMode(final boolean enabled) {
+        getSupport().sendCommand(
+                "send phone silent mode = " + enabled,
+                XiaomiProto.Command.newBuilder()
+                        .setType(COMMAND_TYPE)
+                        .setSubtype(CMD_SILENT_MODE_SET_FROM_PHONE)
+                        .setSystem(XiaomiProto.System.newBuilder().setPhoneSilentModeSet(
+                                XiaomiProto.PhoneSilentModeSet.newBuilder().setPhoneSilentMode(
+                                        XiaomiProto.PhoneSilentMode.newBuilder().setSilent(enabled)
+                                )
+                        ))
+                        .build()
+        );
+    }
+
     public void handleBasicDeviceState(XiaomiProto.BasicDeviceState deviceState) {
         LOG.debug("Got basic device state: {}", deviceState);
 
diff --git a/app/src/main/proto/xiaomi.proto b/app/src/main/proto/xiaomi.proto
index 888b430f8..2a6d6796f 100644
--- a/app/src/main/proto/xiaomi.proto
+++ b/app/src/main/proto/xiaomi.proto
@@ -117,6 +117,12 @@ message System {
   // 2, 15
   optional MiscSettingSet miscSettingSet = 35;
 
+  // 2, 43
+  optional PhoneSilentModeGet phoneSilentModeGet = 36;
+
+  // 2, 44 returning to watch, 2, 45 setting from watch
+  optional PhoneSilentModeSet phoneSilentModeSet = 37;
+
   // 2, 46
   optional VibrationPatterns vibrationPatterns = 38;
 
@@ -298,6 +304,18 @@ message Password {
   optional uint32 unknown3 = 3; // 0 when set on ret
 }
 
+message PhoneSilentModeGet {
+  optional uint32 unknown1 = 1; // 1
+}
+
+message PhoneSilentModeSet {
+  optional PhoneSilentMode phoneSilentMode = 1;
+}
+
+message PhoneSilentMode {
+  optional bool silent = 1;
+}
+
 message VibrationPatterns {
   repeated VibrationNotificationType notificationType = 1;
   optional uint32 unknown2 = 2; // 50, max patterns?

From fce33329ead645ef2acb89f621cc8a537c3a7808 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Mon, 11 Dec 2023 11:07:44 +0000
Subject: [PATCH 236/595] Xiaomi: Add class size warning to xiaomi.proto

---
 app/src/main/proto/xiaomi.proto | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/proto/xiaomi.proto b/app/src/main/proto/xiaomi.proto
index 2a6d6796f..7db812883 100644
--- a/app/src/main/proto/xiaomi.proto
+++ b/app/src/main/proto/xiaomi.proto
@@ -2,6 +2,9 @@ syntax = "proto2"; // we must use proto2 to serialize default values on the wire
 
 package xiaomi;
 
+// FIXME: The generated class is very large, so Android Studio stops recognizing it
+// set idea.max.intellisense.filesize=5000 in idea.properties
+
 option java_package = "nodomain.freeyourgadget.gadgetbridge.proto.xiaomi";
 option java_outer_classname = "XiaomiProto";
 

From 621fa21367a2b71cab64a94d9ccabe646a4d5797 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Mon, 11 Dec 2023 11:25:58 +0000
Subject: [PATCH 237/595] Update changelog

---
 CHANGELOG.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 678e747d6..08793abf6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,11 +6,13 @@
 * Initial support for Femometer Vinca II
 * Initial support for Mijia LYWSD02MMC variant
 * Initial support for Sony Wena 3
+* Experimental support for Divoom Pixoo
 * Experimental support for Sony WF-1000XM5
 * Experimental support for Amazfit Active Edge
 * Experimental support for Mi Band 7 Pro (Xiaomi Smart Band 7 Pro)
 * Experimental support for Mi Band 8 (Xiaomi Smart Band 8)
 * Experimental support for Mi Watch Lite
+* Experimental support for Mi Watch Color Sport
 * Experimental support for Redmi Watch 3 Active
 * Experimental support for Xiaomi Watch S1 Active
 * Amazfit Band 7: Add alexa menu entries
@@ -20,6 +22,7 @@
 * AsteroidOS: Fix media info
 * AsteroidOS: Fix notification dismissal
 * Bangle.js: Add loyalty cards integration with Catima
+* Bangle.js: Ensure SMS messages have src field set to "SMS Message"
 * Bangle.js: Fix GPS speed
 * Bangle.js: Improve handling of chinese characters
 * Bangle.js: Lower threshold for low battery warning
@@ -30,11 +33,13 @@
 * Casio GDB-200: Fixed notification categories and default category
 * Casio GDB-200: Allow preview of notification message alongside title
 * Casio GDB-200: Fixed find my phone feature
+* Intent API: Add debug action for test new function
 * Fossil/Skagen Hybrids: Add new navigation app
 * Fossil/Skagen Hybrids: Allow configuring call rejection method
 * Fossil/Skagen Hybrids: Fix some preference crashes on the nightly
 * Fossil/Skagen Hybrids: Reduce toasts on release builds
 * Fossil/Skagen Hybrids: Show device specific settings in more logical order
+* Huami: Toggle phone silent mode from band
 * Message privacy: Add mode Hide only body
 * Mijia LYWSD02: Add battery
 * Mijia LYWSD02: Add low battery notification
@@ -47,13 +52,17 @@
 * Withings Steel HR: Fix crash when calibrating hands on the nightly
 * Zepp OS: Add blood oxygen graph
 * Zepp OS: Add workout codes for hiking and outdoor swimming
+* Zepp OS: Allow disabling app notifications per device
 * Zepp OS: Attempt to fix activity fetch operation getting stuck
 * Zepp OS: Display swimming activity data
 * Zepp OS: Fix health settings on older Zepp OS versions
 * Zepp OS: Fix setting of unknown button press apps
 * Zepp OS: Fix sunrise and moon dates being off by local time + UTC offset
 * Zepp OS: Map hiking, outdoor swimming, climbing and table tennis activity types
+* Zepp OS: Toggle phone silent mode from band
 * Add transliteration for Latvian, Hungarian, Common Symbols
+* Allow multiple device actions to be triggered for the same event
+* Allow toggling DND through device actions
 * Autodetect OsmAnd package name and make it configurable
 * Improve ASCII transliterator
 * Make GMaps navigation handler follow the "navigation forwarding" setting

From 108307c711f44754d0cd38029359417b92349f92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Mon, 11 Dec 2023 13:57:57 +0000
Subject: [PATCH 238/595] Redmi Smart Band 2: Experimental support

Characteristics taken from #3274
---
 README.md                                     |  1 +
 .../RedmiSmartBand2Coordinator.java           | 63 +++++++++++++++++++
 .../gadgetbridge/model/DeviceType.java        |  2 +
 .../devices/xiaomi/XiaomiBleUuids.java        |  1 +
 app/src/main/res/values/strings.xml           |  1 +
 5 files changed, 68 insertions(+)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmismartband2/RedmiSmartBand2Coordinator.java

diff --git a/README.md b/README.md
index a19f01fa2..3df8506be 100644
--- a/README.md
+++ b/README.md
@@ -100,6 +100,7 @@ vendor's servers.
 	- [Xiaomi Smart Band 8 (experimental)](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Mi-Band-8) [**\[!\]**](#special-pairing-procedures)
 	- Mi Watch Color Sport (experimental)
     - Mi Watch Lite (experimental)
+    - Redmi Smart Band 2 (experimental) [**\[!\]**](#special-pairing-procedures)
     - Redmi Watch 3 Active (experimental) [**\[!\]**](#special-pairing-procedures)
 	- Watch S1 Active (experimental) [**\[!\]**](#special-pairing-procedures)
 	- Xiaomi Temperature and Humidity Monitor Clock (LYWSD02/LYWSD02MMC) (partial support)
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmismartband2/RedmiSmartBand2Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmismartband2/RedmiSmartBand2Coordinator.java
new file mode 100644
index 000000000..11ed02f40
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmismartband2/RedmiSmartBand2Coordinator.java
@@ -0,0 +1,63 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.redmismartband2;
+
+import android.content.Context;
+import android.net.Uri;
+
+import androidx.annotation.Nullable;
+
+import java.util.regex.Pattern;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiInstallHandler;
+
+public class RedmiSmartBand2Coordinator extends XiaomiCoordinator {
+    @Override
+    public boolean isExperimental() {
+        return true;
+    }
+
+    @Override
+    protected Pattern getSupportedDeviceName() {
+        return Pattern.compile("^Redmi Smart Band 2 [A-Z0-9]{4}$");
+    }
+
+    @Nullable
+    @Override
+    public InstallHandler findInstallHandler(final Uri uri, final Context context) {
+        final XiaomiInstallHandler handler = new XiaomiInstallHandler(uri, context);
+        return handler.isValid() ? handler : null;
+    }
+
+    @Override
+    public int getDeviceNameResource() {
+        return R.string.devicetype_redmi_smart_band_2;
+    }
+
+    @Override
+    public int getDefaultIconResource() {
+        return R.drawable.ic_device_default;
+    }
+
+    @Override
+    public int getDisabledIconResource() {
+        return R.drawable.ic_device_default_disabled;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
index 35639310e..598bef4bd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
@@ -144,6 +144,7 @@ import nodomain.freeyourgadget.gadgetbridge.devices.withingssteelhr.WithingsStee
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.miband7pro.MiBand7ProCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.miband8.MiBand8Coordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.miwatchcolorsport.MiWatchColorSportCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.redmismartband2.RedmiSmartBand2Coordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.watchs1active.XiaomiWatchS1ActiveCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xwatch.XWatchCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.zetime.ZeTimeCoordinator;
@@ -204,6 +205,7 @@ public enum DeviceType {
     MIWATCHLITE(MiWatchLiteCoordinator.class),
     MIWATCHCOLORSPORT(MiWatchColorSportCoordinator.class),
     REDMIWATCH3ACTIVE(RedmiWatch3ActiveCoordinator.class),
+    REDMISMARTBAND2(RedmiSmartBand2Coordinator.class),
     XIAOMI_WATCH_S1_ACTIVE(XiaomiWatchS1ActiveCoordinator.class),
     AMAZFITGTS3(AmazfitGTS3Coordinator.class),
     AMAZFITGTR3(AmazfitGTR3Coordinator.class),
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiBleUuids.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiBleUuids.java
index 313e3d331..5e9b4b93b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiBleUuids.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiBleUuids.java
@@ -26,6 +26,7 @@ public class XiaomiBleUuids {
         // Mi Band 8
         // Redmi Watch 3 Active
         // Xiaomi Watch S1 Active
+        // Redmi Smart Band 2
         put(UUID.fromString("0000fe95-0000-1000-8000-00805f9b34fb"), new XiaomiBleUuidSet(
                 true,
                 UUID.fromString("00000051-0000-1000-8000-00805f9b34fb"),
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a296f777a..36a27eb71 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1415,6 +1415,7 @@
     <string name="devicetype_femometer_vinca2">Femometer Vinca II</string>
     <string name="devicetype_xiaomi_watch_lite">Xiaomi Watch Lite</string>
     <string name="devicetype_redmiwatch3active">Redmi Watch 3 Active</string>
+    <string name="devicetype_redmi_smart_band_2">Redmi Smart Band 2</string>
     <string name="choose_auto_export_location">Choose export location</string>
     <string name="notification_channel_name">General</string>
     <string name="notification_channel_high_priority_name">High-priority</string>

From 6de7af62e3321c881974d0fd8b601dbd060944d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Mon, 11 Dec 2023 22:00:16 +0000
Subject: [PATCH 239/595] Xiaomi: Manage widgets

---
 app/src/main/AndroidManifest.xml              |  10 +
 .../DeviceSettingsPreferenceConst.java        |   1 +
 .../DeviceSpecificSettingsFragment.java       |  12 +-
 .../widgets/WidgetScreenDetailsActivity.java  | 274 ++++++++++++
 .../widgets/WidgetScreenListAdapter.java      | 123 +++++
 .../widgets/WidgetScreensListActivity.java    | 183 ++++++++
 .../capabilities/widgets/WidgetLayout.java    |  48 ++
 .../capabilities/widgets/WidgetManager.java   |  70 +++
 .../capabilities/widgets/WidgetPart.java      |  97 ++++
 .../widgets/WidgetPartSubtype.java            |  48 ++
 .../capabilities/widgets/WidgetScreen.java    |  65 +++
 .../capabilities/widgets/WidgetType.java      |  24 +
 .../devices/AbstractBLEDeviceCoordinator.java |   2 +-
 .../devices/AbstractDeviceCoordinator.java    |  12 +
 .../devices/DeviceCoordinator.java            |  12 +
 .../devices/xiaomi/XiaomiCoordinator.java     |  14 +
 .../devices/xiaomi/XiaomiWidgetManager.java   | 421 ++++++++++++++++++
 .../devices/xiaomi/XiaomiWorkoutType.java     |  61 +++
 .../devices/xiaomi/XiaomiPreferences.java     |  27 ++
 .../xiaomi/services/XiaomiSystemService.java  |  84 ++++
 app/src/main/proto/xiaomi.proto               |   4 +-
 .../layout/activity_widget_screen_details.xml | 254 +++++++++++
 .../layout/activity_widget_screens_list.xml   |  27 ++
 .../main/res/layout/item_widget_screen.xml    |  52 +++
 app/src/main/res/values/strings.xml           |  21 +
 .../main/res/xml/devicesettings_widgets.xml   |   7 +
 26 files changed, 1949 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/widgets/WidgetScreenDetailsActivity.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/widgets/WidgetScreenListAdapter.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/widgets/WidgetScreensListActivity.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/widgets/WidgetLayout.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/widgets/WidgetManager.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/widgets/WidgetPart.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/widgets/WidgetPartSubtype.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/widgets/WidgetScreen.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/widgets/WidgetType.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiWidgetManager.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiWorkoutType.java
 create mode 100644 app/src/main/res/layout/activity_widget_screen_details.xml
 create mode 100644 app/src/main/res/layout/activity_widget_screens_list.xml
 create mode 100644 app/src/main/res/layout/item_widget_screen.xml
 create mode 100644 app/src/main/res/xml/devicesettings_widgets.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index dcda90c38..41bdf43b2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -593,6 +593,10 @@
             android:name=".activities.ConfigureContacts"
             android:label="@string/title_activity_set_contacts"
             android:parentActivityName=".activities.ControlCenterv2" />
+        <activity
+            android:name=".activities.widgets.WidgetScreensListActivity"
+            android:label="@string/menuitem_widgets"
+            android:parentActivityName=".activities.ControlCenterv2" />
         <activity
             android:name=".activities.ConfigureWorldClocks"
             android:label="@string/pref_world_clocks_title"
@@ -618,6 +622,12 @@
             android:parentActivityName=".activities.ConfigureReminders"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize" />
+        <activity
+            android:name=".activities.widgets.WidgetScreenDetailsActivity"
+            android:label="@string/widget_screen"
+            android:parentActivityName=".activities.widgets.WidgetScreensListActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".activities.WorldClockDetails"
             android:label="@string/title_activity_world_clock_details"
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
index 52b84d2de..1d134d257 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
@@ -243,6 +243,7 @@ public class DeviceSettingsPreferenceConst {
 
     public static final String PREF_WORLD_CLOCKS = "pref_world_clocks";
     public static final String PREF_CONTACTS = "pref_contacts";
+    public static final String PREF_WIDGETS = "pref_widgets";
 
     public static final String PREF_ANTILOST_ENABLED = "pref_antilost_enabled";
     public static final String PREF_HYDRATION_SWITCH = "pref_hydration_switch";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
index 3b4ab03fa..85ac8ae3e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
@@ -46,6 +46,7 @@ import nodomain.freeyourgadget.gadgetbridge.activities.AbstractPreferenceFragmen
 import nodomain.freeyourgadget.gadgetbridge.activities.app_specific_notifications.AppSpecificNotificationSettingsActivity;
 import nodomain.freeyourgadget.gadgetbridge.activities.loyaltycards.LoyaltyCardsSettingsActivity;
 import nodomain.freeyourgadget.gadgetbridge.activities.loyaltycards.LoyaltyCardsSettingsConst;
+import nodomain.freeyourgadget.gadgetbridge.activities.widgets.WidgetScreensListActivity;
 import nodomain.freeyourgadget.gadgetbridge.capabilities.HeartRateCapability;
 import nodomain.freeyourgadget.gadgetbridge.capabilities.password.PasswordCapabilityImpl;
 import nodomain.freeyourgadget.gadgetbridge.devices.DeviceCoordinator;
@@ -57,7 +58,6 @@ import nodomain.freeyourgadget.gadgetbridge.model.CannedMessagesSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 
-import static nodomain.freeyourgadget.gadgetbridge.GBApplication.getContext;
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.*;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst.PREF_CONTROL_CENTER_SORTABLE;
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_DEVICE_ACTION_FELL_SLEEP_BROADCAST;
@@ -774,6 +774,16 @@ public class DeviceSpecificSettingsFragment extends AbstractPreferenceFragment i
             });
         }
 
+        final Preference widgets = findPreference(PREF_WIDGETS);
+        if (widgets != null) {
+            widgets.setOnPreferenceClickListener(preference -> {
+                final Intent intent = new Intent(getContext(), WidgetScreensListActivity.class);
+                intent.putExtra(GBDevice.EXTRA_DEVICE, device);
+                startActivity(intent);
+                return true;
+            });
+        }
+
         final Preference calendarBlacklist = findPreference("blacklist_calendars");
         if (calendarBlacklist != null) {
             calendarBlacklist.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/widgets/WidgetScreenDetailsActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/widgets/WidgetScreenDetailsActivity.java
new file mode 100644
index 000000000..4dcff2f89
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/widgets/WidgetScreenDetailsActivity.java
@@ -0,0 +1,274 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.activities.widgets;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.ArrayAdapter;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.activities.AbstractGBActivity;
+import nodomain.freeyourgadget.gadgetbridge.capabilities.widgets.WidgetLayout;
+import nodomain.freeyourgadget.gadgetbridge.capabilities.widgets.WidgetManager;
+import nodomain.freeyourgadget.gadgetbridge.capabilities.widgets.WidgetPart;
+import nodomain.freeyourgadget.gadgetbridge.capabilities.widgets.WidgetPartSubtype;
+import nodomain.freeyourgadget.gadgetbridge.capabilities.widgets.WidgetScreen;
+import nodomain.freeyourgadget.gadgetbridge.capabilities.widgets.WidgetType;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.util.GB;
+
+public class WidgetScreenDetailsActivity extends AbstractGBActivity {
+    private static final Logger LOG = LoggerFactory.getLogger(WidgetScreenDetailsActivity.class);
+
+    private WidgetScreen widgetScreen;
+    private WidgetManager widgetManager;
+
+    private View cardWidgetTopLeft;
+    private View cardWidgetTopRight;
+    private View cardWidgetCenter;
+    private View cardWidgetBotLeft;
+    private View cardWidgetBotRight;
+
+    private TextView labelWidgetScreenLayout;
+    private TextView labelWidgetTopLeft;
+    private TextView labelWidgetTopRight;
+    private TextView labelWidgetCenter;
+    private TextView labelWidgetBotLeft;
+    private TextView labelWidgetBotRight;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_widget_screen_details);
+
+        final GBDevice device = getIntent().getParcelableExtra(GBDevice.EXTRA_DEVICE);
+        if (device == null) {
+            LOG.error("device must not be null");
+            finish();
+            return;
+        }
+
+        widgetScreen = (WidgetScreen) getIntent().getSerializableExtra(WidgetScreen.EXTRA_WIDGET_SCREEN);
+        if (widgetScreen == null) {
+            GB.toast("No widget screen provided to WidgetScreenDetailsActivity", Toast.LENGTH_LONG, GB.ERROR);
+            finish();
+            return;
+        }
+
+        widgetManager = device.getDeviceCoordinator().getWidgetManager(device);
+
+        // Save button
+        final FloatingActionButton fab = findViewById(R.id.fab_save);
+        fab.setOnClickListener(view -> {
+            for (final WidgetPart part : widgetScreen.getParts()) {
+                if (part.getId() == null) {
+                    GB.toast(getBaseContext().getString(R.string.widget_missing_parts), Toast.LENGTH_LONG, GB.WARN);
+                    return;
+                }
+            }
+
+            updateWidgetScreen();
+            WidgetScreenDetailsActivity.this.setResult(Activity.RESULT_OK);
+            finish();
+        });
+
+        // Layouts
+        final List<WidgetLayout> supportedLayouts = widgetManager.getSupportedWidgetLayouts();
+        final String[] layoutStrings = new String[supportedLayouts.size()];
+        for (int i = 0; i < supportedLayouts.size(); i++) {
+            layoutStrings[i] = getBaseContext().getString(supportedLayouts.get(i).getName());
+        }
+        final ArrayAdapter<String> layoutAdapter = new ArrayAdapter<>(this, android.R.layout.simple_list_item_1, layoutStrings);
+
+        final View cardLayout = findViewById(R.id.card_layout);
+        cardLayout.setOnClickListener(view -> {
+            new MaterialAlertDialogBuilder(WidgetScreenDetailsActivity.this).setAdapter(layoutAdapter, (dialogInterface, i) -> {
+                if (widgetScreen.getLayout() != supportedLayouts.get(i)) {
+                    final ArrayList<WidgetPart> defaultParts = new ArrayList<>();
+                    for (final WidgetType widgetType : supportedLayouts.get(i).getWidgetTypes()) {
+                        defaultParts.add(new WidgetPart(null, "", widgetType));
+                    }
+                    widgetScreen.setParts(defaultParts);
+                }
+                widgetScreen.setLayout(supportedLayouts.get(i));
+                updateUiFromWidget();
+            }).setTitle(R.string.widget_layout).create().show();
+        });
+
+        cardWidgetTopLeft = findViewById(R.id.card_widget_top_left);
+        cardWidgetTopRight = findViewById(R.id.card_widget_top_right);
+        cardWidgetCenter = findViewById(R.id.card_widget_center);
+        cardWidgetBotLeft = findViewById(R.id.card_widget_bottom_left);
+        cardWidgetBotRight = findViewById(R.id.card_widget_bottom_right);
+
+        labelWidgetScreenLayout = findViewById(R.id.widget_screen_layout);
+        labelWidgetTopLeft = findViewById(R.id.widget_top_left);
+        labelWidgetTopRight = findViewById(R.id.widget_top_right);
+        labelWidgetCenter = findViewById(R.id.widget_center);
+        labelWidgetBotLeft = findViewById(R.id.widget_bottom_left);
+        labelWidgetBotRight = findViewById(R.id.widget_bottom_right);
+
+        updateUiFromWidget();
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(final MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                // back button
+                // TODO confirm when exiting without saving
+                finish();
+                return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    private void updateWidgetScreen() {
+        widgetManager.saveScreen(widgetScreen);
+    }
+
+    @Override
+    protected void onSaveInstanceState(@NonNull final Bundle state) {
+        super.onSaveInstanceState(state);
+        state.putSerializable("widgetScreen", widgetScreen);
+    }
+
+    @Override
+    protected void onRestoreInstanceState(@NonNull final Bundle savedInstanceState) {
+        super.onRestoreInstanceState(savedInstanceState);
+        widgetScreen = (WidgetScreen) savedInstanceState.getSerializable("widgetScreen");
+        updateUiFromWidget();
+    }
+
+    private void updateUiFromWidget() {
+        labelWidgetScreenLayout.setText(widgetScreen.getLayout().getName());
+
+        switch (widgetScreen.getLayout()) {
+            case TOP_1_BOT_2:
+                updateWidget(cardWidgetTopLeft, labelWidgetTopLeft, -1);
+                updateWidget(cardWidgetTopRight, labelWidgetTopRight, -1);
+                updateWidget(cardWidgetCenter, labelWidgetCenter, 0);
+                updateWidget(cardWidgetBotLeft, labelWidgetBotLeft, 1);
+                updateWidget(cardWidgetBotRight, labelWidgetBotRight, 2);
+                break;
+            case TOP_2_BOT_1:
+                updateWidget(cardWidgetTopLeft, labelWidgetTopLeft, 0);
+                updateWidget(cardWidgetTopRight, labelWidgetTopRight, 1);
+                updateWidget(cardWidgetCenter, labelWidgetCenter, 2);
+                updateWidget(cardWidgetBotLeft, labelWidgetBotLeft, -1);
+                updateWidget(cardWidgetBotRight, labelWidgetBotRight, -1);
+                break;
+            case TOP_2_BOT_2:
+                updateWidget(cardWidgetTopLeft, labelWidgetTopLeft, 0);
+                updateWidget(cardWidgetTopRight, labelWidgetTopRight, 1);
+                updateWidget(cardWidgetCenter, labelWidgetCenter, -1);
+                updateWidget(cardWidgetBotLeft, labelWidgetBotLeft, 2);
+                updateWidget(cardWidgetBotRight, labelWidgetBotRight, 3);
+                break;
+            case SINGLE:
+                updateWidget(cardWidgetTopLeft, labelWidgetTopLeft, -1);
+                updateWidget(cardWidgetTopRight, labelWidgetTopRight, -1);
+                updateWidget(cardWidgetCenter, labelWidgetCenter, 0);
+                updateWidget(cardWidgetBotLeft, labelWidgetBotLeft, -1);
+                updateWidget(cardWidgetBotRight, labelWidgetBotRight, -1);
+                break;
+            case TWO:
+                updateWidget(cardWidgetTopLeft, labelWidgetTopLeft, 0);
+                updateWidget(cardWidgetTopRight, labelWidgetTopRight, 1);
+                updateWidget(cardWidgetCenter, labelWidgetCenter, -1);
+                updateWidget(cardWidgetBotLeft, labelWidgetBotLeft, -1);
+                updateWidget(cardWidgetBotRight, labelWidgetBotRight, -1);
+                break;
+            default:
+                throw new IllegalStateException("Unknown layout " + widgetScreen.getLayout());
+        }
+    }
+
+    private void updateWidget(final View card, final TextView label, final int partIdx) {
+        final boolean validPart = partIdx >= 0 && partIdx < widgetScreen.getParts().size();
+
+        card.setVisibility(validPart ? View.VISIBLE : View.GONE);
+
+        if (!validPart) {
+            card.setOnClickListener(null);
+            label.setText(R.string.not_set);
+            return;
+        }
+
+        final WidgetPart widgetPart = widgetScreen.getParts().get(partIdx);
+
+        if (widgetPart.getId() == null) {
+            label.setText(R.string.not_set);
+        } else {
+            label.setText(widgetPart.getFullName());
+        }
+
+        // Select widget part
+
+        final List<WidgetPart> supportedParts = widgetManager.getSupportedWidgetParts(widgetPart.getType());
+        final String[] layoutStrings = new String[supportedParts.size()];
+        for (int i = 0; i < supportedParts.size(); i++) {
+            layoutStrings[i] = supportedParts.get(i).getName();
+        }
+        final ArrayAdapter<String> partAdapter = new ArrayAdapter<>(this, android.R.layout.simple_list_item_1, layoutStrings);
+
+        card.setOnClickListener(view -> {
+            new MaterialAlertDialogBuilder(WidgetScreenDetailsActivity.this).setAdapter(partAdapter, (dialogInterface, i) -> {
+                final WidgetPart selectedPart = supportedParts.get(i);
+
+                final List<WidgetPartSubtype> supportedSubtypes = selectedPart.getSupportedSubtypes();
+                if (supportedSubtypes.isEmpty()) {
+                    // No subtypes selected
+
+                    widgetScreen.getParts().set(partIdx, selectedPart);
+                    updateUiFromWidget();
+                    return;
+                }
+
+                // If the selected part supports subtypes, the user must select a subtype
+
+                final String[] subtypeStrings = new String[supportedSubtypes.size()];
+                for (int j = 0; j < supportedSubtypes.size(); j++) {
+                    subtypeStrings[j] = supportedSubtypes.get(j).getName();
+                }
+                final ArrayAdapter<String> subtypesAdapter = new ArrayAdapter<>(this, android.R.layout.simple_list_item_1, subtypeStrings);
+
+                new MaterialAlertDialogBuilder(WidgetScreenDetailsActivity.this).setAdapter(subtypesAdapter, (dialogInterface1, j) -> {
+                    final WidgetPartSubtype selectedSubtype = supportedSubtypes.get(j);
+                    selectedPart.setSubtype(selectedSubtype);
+                    widgetScreen.getParts().set(partIdx, selectedPart);
+                    updateUiFromWidget();
+                }).setTitle(R.string.widget_subtype).create().show();
+            }).setTitle(R.string.widget).create().show();
+        });
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/widgets/WidgetScreenListAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/widgets/WidgetScreenListAdapter.java
new file mode 100644
index 000000000..18403ec8c
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/widgets/WidgetScreenListAdapter.java
@@ -0,0 +1,123 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.activities.widgets;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.card.MaterialCardView;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.capabilities.widgets.WidgetPart;
+import nodomain.freeyourgadget.gadgetbridge.capabilities.widgets.WidgetScreen;
+
+public class WidgetScreenListAdapter extends RecyclerView.Adapter<WidgetScreenListAdapter.ViewHolder> {
+
+    private final Context mContext;
+    private ArrayList<WidgetScreen> widgetScreenList;
+
+    public WidgetScreenListAdapter(Context context) {
+        this.mContext = context;
+    }
+
+    public void setWidgetScreenList(List<WidgetScreen> widgetScreens) {
+        this.widgetScreenList = new ArrayList<>(widgetScreens);
+    }
+
+    public ArrayList<WidgetScreen> getWidgetScreenList() {
+        return widgetScreenList;
+    }
+
+    @NonNull
+    @Override
+    public WidgetScreenListAdapter.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        final View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_widget_screen, parent, false);
+        return new ViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull ViewHolder holder, final int position) {
+        final WidgetScreen widgetScreen = widgetScreenList.get(position);
+
+        holder.container.setOnClickListener(v -> ((WidgetScreensListActivity) mContext).configureWidgetScreen(widgetScreen));
+
+        holder.container.setOnLongClickListener(v -> {
+            // TODO move up
+            // TODO move down
+            new MaterialAlertDialogBuilder(v.getContext())
+                    .setTitle(R.string.widget_screen_delete_confirm_title)
+                    .setMessage(mContext.getString(
+                            R.string.widget_screen_delete_confirm_description,
+                            mContext.getString(R.string.widget_screen_x, widgetScreen.getId())
+                    ))
+                    .setIcon(R.drawable.ic_warning)
+                    .setPositiveButton(android.R.string.yes, (dialog, whichButton) -> {
+                        ((WidgetScreensListActivity) mContext).deleteWidgetScreen(widgetScreen);
+                    })
+                    .setNegativeButton(android.R.string.no, null)
+                    .show();
+
+            return true;
+        });
+
+        holder.widgetScreenName.setText(mContext.getString(R.string.widget_screen_x, widgetScreen.getId()));
+        final List<String> widgetNames = new ArrayList<>();
+
+        for (final WidgetPart part : widgetScreen.getParts()) {
+            if (part.getId() != null) {
+                widgetNames.add(part.getFullName());
+            }
+        }
+
+        if (!widgetNames.isEmpty()) {
+            holder.widgetScreenDescription.setText(String.join(", ", widgetNames));
+        } else {
+            holder.widgetScreenDescription.setText(R.string.unknown);
+        }
+    }
+
+    @Override
+    public int getItemCount() {
+        return widgetScreenList.size();
+    }
+
+    static class ViewHolder extends RecyclerView.ViewHolder {
+        final MaterialCardView container;
+
+        final TextView widgetScreenName;
+        final TextView widgetScreenDescription;
+
+        ViewHolder(View view) {
+            super(view);
+
+            container = view.findViewById(R.id.card_widget_screen);
+
+            widgetScreenName = view.findViewById(R.id.widget_screen_name);
+            widgetScreenDescription = view.findViewById(R.id.widget_screen_description);
+        }
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/widgets/WidgetScreensListActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/widgets/WidgetScreensListActivity.java
new file mode 100644
index 000000000..f8f1b17b3
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/widgets/WidgetScreensListActivity.java
@@ -0,0 +1,183 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.activities.widgets;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.MenuItem;
+
+import androidx.activity.result.ActivityResult;
+import androidx.activity.result.ActivityResultCallback;
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.activities.AbstractGBActivity;
+import nodomain.freeyourgadget.gadgetbridge.capabilities.widgets.WidgetLayout;
+import nodomain.freeyourgadget.gadgetbridge.capabilities.widgets.WidgetManager;
+import nodomain.freeyourgadget.gadgetbridge.capabilities.widgets.WidgetPart;
+import nodomain.freeyourgadget.gadgetbridge.capabilities.widgets.WidgetScreen;
+import nodomain.freeyourgadget.gadgetbridge.capabilities.widgets.WidgetType;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+
+public class WidgetScreensListActivity extends AbstractGBActivity {
+    private static final Logger LOG = LoggerFactory.getLogger(WidgetScreensListActivity.class);
+
+    private WidgetScreenListAdapter mGBWidgetScreenListAdapter;
+    private GBDevice gbDevice;
+    private WidgetManager widgetManager;
+
+    private ActivityResultLauncher<Intent> configureWidgetScreenLauncher;
+    private final ActivityResultCallback<ActivityResult> configureWidgetCallback = result -> {
+        if (result.getResultCode() == Activity.RESULT_OK) {
+            updateWidgetScreensFromManager();
+            sendWidgetsToDevice();
+        }
+    };
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.activity_widget_screens_list);
+
+        gbDevice = getIntent().getParcelableExtra(GBDevice.EXTRA_DEVICE);
+        if (gbDevice == null) {
+            LOG.error("gbDevice must not be null");
+            finish();
+            return;
+        }
+
+        widgetManager = gbDevice.getDeviceCoordinator().getWidgetManager(gbDevice);
+        if (widgetManager == null) {
+            LOG.error("widgetManager must not be null");
+            finish();
+            return;
+        }
+
+        configureWidgetScreenLauncher = registerForActivityResult(
+                new ActivityResultContracts.StartActivityForResult(),
+                configureWidgetCallback
+        );
+
+        mGBWidgetScreenListAdapter = new WidgetScreenListAdapter(this);
+
+        final RecyclerView widgetsRecyclerView = findViewById(R.id.widget_screens_list);
+        widgetsRecyclerView.setHasFixedSize(true);
+        widgetsRecyclerView.setLayoutManager(new LinearLayoutManager(this));
+        widgetsRecyclerView.setAdapter(mGBWidgetScreenListAdapter);
+        updateWidgetScreensFromManager();
+
+        final FloatingActionButton fab = findViewById(R.id.fab);
+        fab.setOnClickListener(v -> {
+            int deviceSlots = widgetManager.getMaxScreens();
+
+            if (mGBWidgetScreenListAdapter.getItemCount() >= deviceSlots) {
+                // No more free slots
+                new MaterialAlertDialogBuilder(v.getContext())
+                        .setTitle(R.string.reminder_no_free_slots_title)
+                        .setMessage(getBaseContext().getString(R.string.widget_screen_no_free_slots_description, String.format(Locale.getDefault(), "%d", deviceSlots)))
+                        .setIcon(R.drawable.ic_warning)
+                        .setPositiveButton(android.R.string.ok, (dialog, whichButton) -> {
+                        })
+                        .show();
+                return;
+            }
+
+            final WidgetLayout defaultLayout = widgetManager.getSupportedWidgetLayouts().get(0);
+            final ArrayList<WidgetPart> defaultParts = new ArrayList<>();
+            for (final WidgetType widgetType : defaultLayout.getWidgetTypes()) {
+                defaultParts.add(new WidgetPart(null, "", widgetType));
+            }
+            final WidgetScreen widgetScreen = new WidgetScreen(
+                    null,
+                    defaultLayout,
+                    defaultParts
+            );
+
+            configureWidgetScreen(widgetScreen);
+        });
+    }
+
+    /**
+     * Reads the available widgets from the database and updates the view afterwards.
+     */
+    @SuppressLint("NotifyDataSetChanged")
+    private void updateWidgetScreensFromManager() {
+        final List<WidgetScreen> widgetScreens = widgetManager.getWidgetScreens();
+
+        mGBWidgetScreenListAdapter.setWidgetScreenList(widgetScreens);
+        mGBWidgetScreenListAdapter.notifyDataSetChanged();
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                // back button
+                finish();
+                return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    public void configureWidgetScreen(final WidgetScreen widgetScreen) {
+        final Intent startIntent = new Intent(getApplicationContext(), WidgetScreenDetailsActivity.class);
+        startIntent.putExtra(GBDevice.EXTRA_DEVICE, gbDevice);
+        startIntent.putExtra(WidgetScreen.EXTRA_WIDGET_SCREEN, widgetScreen);
+        configureWidgetScreenLauncher.launch(startIntent);
+    }
+
+    public void deleteWidgetScreen(final WidgetScreen widgetScreen) {
+        if (mGBWidgetScreenListAdapter.getItemCount() - 1 < widgetManager.getMinScreens()) {
+            // Under minimum slots
+            new MaterialAlertDialogBuilder(this.getBaseContext())
+                    .setTitle(R.string.widget_screen_delete_confirm_title)
+                    .setMessage(getBaseContext().getString(R.string.widget_screen_min_screens, String.format(Locale.getDefault(), "%d", widgetManager.getMinScreens())))
+                    .setIcon(R.drawable.ic_warning)
+                    .setPositiveButton(android.R.string.ok, (dialog, whichButton) -> {
+                    })
+                    .show();
+            return;
+        }
+
+        widgetManager.deleteScreen(widgetScreen);
+
+        updateWidgetScreensFromManager();
+        sendWidgetsToDevice();
+    }
+
+    private void sendWidgetsToDevice() {
+        if (gbDevice.isInitialized()) {
+            widgetManager.sendToDevice();
+        }
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/widgets/WidgetLayout.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/widgets/WidgetLayout.java
new file mode 100644
index 000000000..d10331d38
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/widgets/WidgetLayout.java
@@ -0,0 +1,48 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.capabilities.widgets;
+
+import androidx.annotation.StringRes;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+
+public enum WidgetLayout {
+    TOP_1_BOT_2(R.string.widget_layout_top_1_bot_2, WidgetType.WIDE, WidgetType.SMALL, WidgetType.SMALL),
+    TOP_2_BOT_1(R.string.widget_layout_top_2_bot_1, WidgetType.SMALL, WidgetType.SMALL, WidgetType.SMALL),
+    TOP_2_BOT_2(R.string.widget_layout_top_2_bot_2, WidgetType.SMALL, WidgetType.SMALL, WidgetType.SMALL, WidgetType.SMALL),
+    SINGLE(R.string.widget_layout_single, WidgetType.TALL),
+    TWO(R.string.widget_layout_two, WidgetType.SMALL, WidgetType.SMALL),
+    ;
+
+    @StringRes
+    private final int name;
+    private final WidgetType[] widgetTypes;
+
+    WidgetLayout(final int name, final WidgetType... widgetTypes) {
+        this.name = name;
+        this.widgetTypes = widgetTypes;
+    }
+
+    @StringRes
+    public int getName() {
+        return name;
+    }
+
+    public WidgetType[] getWidgetTypes() {
+        return widgetTypes;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/widgets/WidgetManager.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/widgets/WidgetManager.java
new file mode 100644
index 000000000..1ac23da96
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/widgets/WidgetManager.java
@@ -0,0 +1,70 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.capabilities.widgets;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+
+/**
+ * Provide an interface to manage a device's widgets in a device-independent manner.
+ */
+public interface WidgetManager {
+    /**
+     * The widget layouts supported by this device.
+     */
+    List<WidgetLayout> getSupportedWidgetLayouts();
+
+    /**
+     * The widget parts that can be used to build a widget screen, for a specific widget type.x
+     */
+    List<WidgetPart> getSupportedWidgetParts(WidgetType targetWidgetType);
+
+    /**
+     * The currently configured widget screens on this device.
+     */
+    List<WidgetScreen> getWidgetScreens();
+
+    GBDevice getDevice();
+
+    /**
+     * The minimum number of screens that must be present - deleting screens won't be allowed
+     * past this number.
+     */
+    int getMinScreens();
+
+    /**
+     * The maximum number of screens that can be created.
+     */
+    int getMaxScreens();
+
+    /**
+     * Saves a screen. If the screen is new, the ID will be null, otherwise it matches the
+     * screen that is being updated.
+     */
+    void saveScreen(WidgetScreen widgetScreen);
+
+    /**
+     * Deletes a screen.
+     */
+    void deleteScreen(WidgetScreen widgetScreen);
+
+    /**
+     * Send the currently configured screens to the device.
+     */
+    void sendToDevice();
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/widgets/WidgetPart.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/widgets/WidgetPart.java
new file mode 100644
index 000000000..54c10ae8c
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/widgets/WidgetPart.java
@@ -0,0 +1,97 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.capabilities.widgets;
+
+import androidx.annotation.Nullable;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+/**
+ * A widget part is a single widget in a widget screen.
+ */
+public class WidgetPart implements Serializable {
+    // Null when not selected
+    @Nullable
+    private String id;
+
+    // The human-readable part name
+    private String name;
+
+    private WidgetType type;
+
+    // Null if it has no specific subtype
+    @Nullable
+    private WidgetPartSubtype subtype;
+
+    // The list of subtypes supported by this part, if any
+    private final List<WidgetPartSubtype> supportedSubtypes = new ArrayList<>();
+
+    public WidgetPart(@Nullable final String id, final String name, final WidgetType type) {
+        this.id = id;
+        this.name = name;
+        this.type = type;
+    }
+
+    @Nullable
+    public String getId() {
+        return id;
+    }
+
+    public void setId(@Nullable final String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getFullName() {
+        if (subtype != null) {
+            return String.format(Locale.ROOT, "%s (%s)", name, subtype.getName());
+        }
+
+        return name;
+    }
+
+    public void setName(final String name) {
+        this.name = name;
+    }
+
+    public WidgetType getType() {
+        return type;
+    }
+
+    public void setType(final WidgetType type) {
+        this.type = type;
+    }
+
+    @Nullable
+    public WidgetPartSubtype getSubtype() {
+        return subtype;
+    }
+
+    public void setSubtype(@Nullable final WidgetPartSubtype subtype) {
+        this.subtype = subtype;
+    }
+
+    public List<WidgetPartSubtype> getSupportedSubtypes() {
+        return supportedSubtypes;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/widgets/WidgetPartSubtype.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/widgets/WidgetPartSubtype.java
new file mode 100644
index 000000000..7655ed020
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/widgets/WidgetPartSubtype.java
@@ -0,0 +1,48 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.capabilities.widgets;
+
+import java.io.Serializable;
+
+/**
+ * A widget part can have an optional subtype (eg. a workout type).
+ */
+public class WidgetPartSubtype implements Serializable {
+    private String id;
+    private String name;
+
+    public WidgetPartSubtype(final String id, final String name) {
+        this.id = id;
+        this.name = name;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(final String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(final String name) {
+        this.name = name;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/widgets/WidgetScreen.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/widgets/WidgetScreen.java
new file mode 100644
index 000000000..c7394d8fc
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/widgets/WidgetScreen.java
@@ -0,0 +1,65 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.capabilities.widgets;
+
+import androidx.annotation.Nullable;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class WidgetScreen implements Serializable {
+    public static final String EXTRA_WIDGET_SCREEN = "widget_screen";
+
+    // Null when creating a new screen
+    @Nullable
+    private String id;
+    private WidgetLayout layout;
+
+    // The list of parts must match what the WidgetLayout expects
+    private List<WidgetPart> parts;
+
+    public WidgetScreen(@Nullable final String id, final WidgetLayout layout, final List<WidgetPart> parts) {
+        this.id = id;
+        this.layout = layout;
+        this.parts = parts;
+    }
+
+    @Nullable
+    public String getId() {
+        return id;
+    }
+
+    public void setId(@Nullable final String id) {
+        this.id = id;
+    }
+
+    public WidgetLayout getLayout() {
+        return layout;
+    }
+
+    public void setLayout(final WidgetLayout layout) {
+        this.layout = layout;
+    }
+
+    public List<WidgetPart> getParts() {
+        return parts;
+    }
+
+    public void setParts(final List<WidgetPart> parts) {
+        this.parts = parts;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/widgets/WidgetType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/widgets/WidgetType.java
new file mode 100644
index 000000000..14be6f4f8
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/widgets/WidgetType.java
@@ -0,0 +1,24 @@
+/*  Copyright (C) 2022 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.capabilities.widgets;
+
+public enum WidgetType {
+    SMALL, // 1x1
+    TALL,  // 1x2
+    WIDE,  // 2x1
+    ;
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractBLEDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractBLEDeviceCoordinator.java
index 9ea31e016..18500a4b0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractBLEDeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractBLEDeviceCoordinator.java
@@ -1,6 +1,6 @@
 package nodomain.freeyourgadget.gadgetbridge.devices;
 
-public abstract class AbstractBLEDeviceCoordinator extends AbstractDeviceCoordinator{
+public abstract class AbstractBLEDeviceCoordinator extends AbstractDeviceCoordinator {
     @Override
     public ConnectionType getConnectionType() {
         return ConnectionType.BLE;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java
index e5d58e595..66ca3dfb2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java
@@ -51,6 +51,7 @@ import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSpecificSettingsCustomizer;
 import nodomain.freeyourgadget.gadgetbridge.capabilities.HeartRateCapability;
 import nodomain.freeyourgadget.gadgetbridge.capabilities.password.PasswordCapabilityImpl;
+import nodomain.freeyourgadget.gadgetbridge.capabilities.widgets.WidgetManager;
 import nodomain.freeyourgadget.gadgetbridge.database.DBHandler;
 import nodomain.freeyourgadget.gadgetbridge.database.DBHelper;
 import nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst;
@@ -586,6 +587,17 @@ public abstract class AbstractDeviceCoordinator implements DeviceCoordinator {
         );
     }
 
+    @Override
+    public boolean supportsWidgets(final GBDevice device) {
+        return false;
+    }
+
+    @Nullable
+    @Override
+    public WidgetManager getWidgetManager(final GBDevice device) {
+        return null;
+    }
+
     public boolean supportsNavigation() {
         return false;
     }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java
index 618e5fa6f..d39090e32 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java
@@ -38,6 +38,7 @@ import nodomain.freeyourgadget.gadgetbridge.GBException;
 import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSpecificSettingsCustomizer;
 import nodomain.freeyourgadget.gadgetbridge.capabilities.HeartRateCapability;
 import nodomain.freeyourgadget.gadgetbridge.capabilities.password.PasswordCapabilityImpl;
+import nodomain.freeyourgadget.gadgetbridge.capabilities.widgets.WidgetManager;
 import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
@@ -550,6 +551,17 @@ public interface DeviceCoordinator {
 
     List<HeartRateCapability.MeasurementInterval> getHeartRateMeasurementIntervals();
 
+    /**
+     * Whether the device supports screens with configurable widgets.
+     */
+    boolean supportsWidgets(GBDevice device);
+
+    /**
+     * Gets the {@link WidgetManager} for this device. Must not be null if supportsWidgets is true.
+     */
+    @Nullable
+    WidgetManager getWidgetManager(GBDevice device);
+
     boolean supportsNavigation();
 
     int getOrderPriority();
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
index 5617ce1a0..d3164cb49 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
@@ -42,6 +42,7 @@ import nodomain.freeyourgadget.gadgetbridge.activities.appmanager.AppManagerActi
 import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSpecificSettingsCustomizer;
 import nodomain.freeyourgadget.gadgetbridge.capabilities.HeartRateCapability;
 import nodomain.freeyourgadget.gadgetbridge.capabilities.password.PasswordCapabilityImpl;
+import nodomain.freeyourgadget.gadgetbridge.capabilities.widgets.WidgetManager;
 import nodomain.freeyourgadget.gadgetbridge.devices.AbstractBLEDeviceCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.devices.TimeSampleProvider;
@@ -371,6 +372,9 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
         if (supports(device, FEAT_DISPLAY_ITEMS)) {
             settings.add(R.xml.devicesettings_xiaomi_displayitems);
         }
+        if (this.supportsWidgets(device)) {
+            settings.add(R.xml.devicesettings_widgets);
+        }
         if (supports(device, FEAT_PASSWORD)) {
             settings.add(R.xml.devicesettings_password);
         }
@@ -514,6 +518,16 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
         );
     }
 
+    @Override
+    public boolean supportsWidgets(final GBDevice device) {
+        return getPrefs(device).getBoolean(XiaomiPreferences.FEAT_WIDGETS, false);
+    }
+
+    @Override
+    public WidgetManager getWidgetManager(final GBDevice device) {
+        return new XiaomiWidgetManager(device);
+    }
+
     protected static Prefs getPrefs(final GBDevice device) {
         return new Prefs(GBApplication.getDeviceSpecificSharedPrefs(device.getAddress()));
     }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiWidgetManager.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiWidgetManager.java
new file mode 100644
index 000000000..f0d87862c
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiWidgetManager.java
@@ -0,0 +1,421 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi;
+
+import androidx.annotation.Nullable;
+
+import com.google.protobuf.InvalidProtocolBufferException;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
+import nodomain.freeyourgadget.gadgetbridge.capabilities.widgets.WidgetLayout;
+import nodomain.freeyourgadget.gadgetbridge.capabilities.widgets.WidgetManager;
+import nodomain.freeyourgadget.gadgetbridge.capabilities.widgets.WidgetPart;
+import nodomain.freeyourgadget.gadgetbridge.capabilities.widgets.WidgetPartSubtype;
+import nodomain.freeyourgadget.gadgetbridge.capabilities.widgets.WidgetScreen;
+import nodomain.freeyourgadget.gadgetbridge.capabilities.widgets.WidgetType;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiPreferences;
+import nodomain.freeyourgadget.gadgetbridge.util.GB;
+import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
+
+public class XiaomiWidgetManager implements WidgetManager {
+    private static final Logger LOG = LoggerFactory.getLogger(XiaomiWidgetManager.class);
+
+    private final GBDevice device;
+
+    public XiaomiWidgetManager(final GBDevice device) {
+        this.device = device;
+    }
+
+    @Override
+    public List<WidgetLayout> getSupportedWidgetLayouts() {
+        final List<WidgetLayout> layouts = new ArrayList<>();
+        final Set<WidgetType> partTypes = new HashSet<>();
+
+        final XiaomiProto.WidgetParts rawWidgetParts = getRawWidgetParts();
+
+        for (final XiaomiProto.WidgetPart widgetPart : rawWidgetParts.getWidgetPartList()) {
+            partTypes.add(fromRawWidgetType(widgetPart.getType()));
+        }
+
+        if (partTypes.contains(WidgetType.WIDE) && partTypes.contains(WidgetType.SMALL)) {
+            layouts.add(WidgetLayout.TOP_1_BOT_2);
+            layouts.add(WidgetLayout.TOP_2_BOT_1);
+            layouts.add(WidgetLayout.TOP_2_BOT_2);
+        }
+
+        if (partTypes.contains(WidgetType.TALL)) {
+            layouts.add(WidgetLayout.SINGLE);
+
+            if (partTypes.contains(WidgetType.SMALL)) {
+                layouts.add(WidgetLayout.TWO);
+            }
+        }
+
+        return layouts;
+    }
+
+    @Override
+    public List<WidgetPart> getSupportedWidgetParts(final WidgetType targetWidgetType) {
+        final List<WidgetPart> parts = new LinkedList<>();
+
+        final XiaomiProto.WidgetParts rawWidgetParts = getRawWidgetParts();
+
+        for (final XiaomiProto.WidgetPart widgetPart : rawWidgetParts.getWidgetPartList()) {
+            final WidgetType type = fromRawWidgetType(widgetPart.getType());
+
+            if (type != null && type.equals(targetWidgetType)) {
+                final WidgetPart newPart = new WidgetPart(
+                        String.valueOf(widgetPart.getId()),
+                        widgetPart.getTitle(),
+                        type
+                );
+
+                // FIXME are there others?
+                if (widgetPart.getId() == 2321) {
+                    if (StringUtils.isBlank(newPart.getName())) {
+                        newPart.setName(GBApplication.getContext().getString(R.string.menuitem_workout));
+                    }
+
+                    final List<XiaomiWorkoutType> workoutTypes = XiaomiPreferences.getWorkoutTypes(getDevice());
+                    for (final XiaomiWorkoutType workoutType : workoutTypes) {
+                        newPart.getSupportedSubtypes().add(
+                                new WidgetPartSubtype(
+                                        String.valueOf(workoutType.getCode()),
+                                        workoutType.getName()
+                                )
+                        );
+                        Collections.sort(newPart.getSupportedSubtypes(), (p1, p2) -> p1.getName().compareToIgnoreCase(p2.getName()));
+                    }
+                }
+
+                parts.add(newPart);
+            }
+        }
+
+        return parts;
+    }
+
+    @Override
+    public List<WidgetScreen> getWidgetScreens() {
+        final XiaomiProto.WidgetScreens rawWidgetScreens = getRawWidgetScreens();
+
+        final List<WidgetScreen> ret = new ArrayList<>(rawWidgetScreens.getWidgetScreenCount());
+
+        final List<XiaomiWorkoutType> workoutTypes = XiaomiPreferences.getWorkoutTypes(getDevice());
+
+        for (final XiaomiProto.WidgetScreen widgetScreen : rawWidgetScreens.getWidgetScreenList()) {
+            final WidgetLayout layout = fromRawLayout(widgetScreen.getLayout());
+
+            final List<WidgetPart> parts = new ArrayList<>(widgetScreen.getWidgetPartCount());
+
+            for (final XiaomiProto.WidgetPart widgetPart : widgetScreen.getWidgetPartList()) {
+                final WidgetType type = fromRawWidgetType(widgetPart.getType());
+
+                final WidgetPart newPart = new WidgetPart(
+                        String.valueOf(widgetPart.getId()),
+                        "Unknown (" + widgetPart.getId() + ")",
+                        type
+                );
+
+                // Find the name
+                final XiaomiProto.WidgetPart rawPart1 = findRawPart(widgetPart.getType(), widgetPart.getId());
+                if (rawPart1 != null) {
+                    newPart.setName(rawPart1.getTitle());
+                }
+
+                // FIXME are there others?
+                if (widgetPart.getId() == 2321) {
+                    if (StringUtils.isBlank(newPart.getName())) {
+                        newPart.setName(GBApplication.getContext().getString(R.string.menuitem_workout));
+                    }
+                }
+
+                // Get the proper subtype, if any
+                if (widgetPart.getSubType() != 0) {
+                    for (final XiaomiWorkoutType workoutType : workoutTypes) {
+                        if (workoutType.getCode() == widgetPart.getSubType()) {
+                            newPart.setSubtype(new WidgetPartSubtype(
+                                    String.valueOf(workoutType.getCode()),
+                                    workoutType.getName()
+                            ));
+                        }
+                    }
+                }
+
+                parts.add(newPart);
+            }
+
+            ret.add(new WidgetScreen(
+                    String.valueOf(widgetScreen.getId()),
+                    layout,
+                    parts
+            ));
+        }
+
+        return ret;
+    }
+
+    @Override
+    public GBDevice getDevice() {
+        return device;
+    }
+
+    @Override
+    public int getMinScreens() {
+        return getRawWidgetScreens().getWidgetsCapabilities().getMinWidgets();
+    }
+
+    @Override
+    public int getMaxScreens() {
+        return getRawWidgetScreens().getWidgetsCapabilities().getMaxWidgets();
+    }
+
+    @Override
+    public void saveScreen(final WidgetScreen widgetScreen) {
+        final XiaomiProto.WidgetScreens rawWidgetScreens = getRawWidgetScreens();
+
+        final int layoutNum;
+        switch (widgetScreen.getLayout()) {
+            case TOP_2_BOT_2:
+                layoutNum = 1;
+                break;
+            case TOP_1_BOT_2:
+                layoutNum = 2;
+                break;
+            case TOP_2_BOT_1:
+                layoutNum = 4;
+                break;
+            case TWO:
+                layoutNum = 256;
+                break;
+            case SINGLE:
+                layoutNum = 512;
+                break;
+            default:
+                LOG.warn("Unknown widget screens layout {}", widgetScreen.getLayout());
+                return;
+        }
+
+        XiaomiProto.WidgetScreen.Builder rawScreen = null;
+        if (widgetScreen.getId() == null) {
+            // new screen
+            rawScreen = XiaomiProto.WidgetScreen.newBuilder()
+                    .setId(rawWidgetScreens.getWidgetScreenCount() + 1); // ids start at 1
+        } else {
+            for (final XiaomiProto.WidgetScreen screen : rawWidgetScreens.getWidgetScreenList()) {
+                if (String.valueOf(screen.getId()).equals(widgetScreen.getId())) {
+                    rawScreen = XiaomiProto.WidgetScreen.newBuilder(screen);
+                    break;
+                }
+
+                LOG.warn("Failed to find original screen for {}", widgetScreen.getId());
+            }
+
+            if (rawScreen == null) {
+                rawScreen = XiaomiProto.WidgetScreen.newBuilder()
+                        .setId(rawWidgetScreens.getWidgetScreenCount() + 1);
+            }
+        }
+
+        rawScreen.setLayout(layoutNum);
+        rawScreen.clearWidgetPart();
+
+        for (final WidgetPart newPart : widgetScreen.getParts()) {
+            // Find the existing raw part
+            final XiaomiProto.WidgetPart knownRawPart = findRawPart(
+                    toRawWidgetType(newPart.getType()),
+                    Integer.parseInt(Objects.requireNonNull(newPart.getId()))
+            );
+
+            final XiaomiProto.WidgetPart.Builder newRawPartBuilder = XiaomiProto.WidgetPart.newBuilder(knownRawPart);
+
+            if (newPart.getSubtype() != null) {
+                // Get the workout type as subtype
+                final List<XiaomiWorkoutType> workoutTypes = XiaomiPreferences.getWorkoutTypes(getDevice());
+                for (final XiaomiWorkoutType workoutType : workoutTypes) {
+                    if (newPart.getSubtype().getId().equals(String.valueOf(workoutType.getCode()))) {
+                        newRawPartBuilder.setSubType(workoutType.getCode());
+                        break;
+                    }
+                }
+            }
+
+            rawScreen.addWidgetPart(newRawPartBuilder);
+        }
+
+        final XiaomiProto.WidgetScreens.Builder builder = XiaomiProto.WidgetScreens.newBuilder(rawWidgetScreens);
+        if (rawScreen.getId() == rawWidgetScreens.getWidgetScreenCount() + 1) {
+            // Append at the end
+            builder.addWidgetScreen(rawScreen);
+        } else {
+            // Replace existing
+            builder.clearWidgetScreen();
+
+            for (final XiaomiProto.WidgetScreen screen : rawWidgetScreens.getWidgetScreenList()) {
+                if (screen.getId() == rawScreen.getId()) {
+                    builder.addWidgetScreen(rawScreen);
+                } else {
+                    builder.addWidgetScreen(screen);
+                }
+            }
+        }
+
+        getPrefs().getPreferences().edit()
+                .putString(XiaomiPreferences.PREF_WIDGET_SCREENS, GB.hexdump(builder.build().toByteArray()))
+                .apply();
+    }
+
+    @Override
+    public void deleteScreen(final WidgetScreen widgetScreen) {
+        if (widgetScreen.getId() == null) {
+            LOG.warn("Can't delete screen without id");
+            return;
+        }
+
+        final XiaomiProto.WidgetScreens rawWidgetScreens = getRawWidgetScreens();
+
+        final XiaomiProto.WidgetScreens.Builder builder = XiaomiProto.WidgetScreens.newBuilder(rawWidgetScreens)
+                .clearWidgetScreen();
+
+        for (final XiaomiProto.WidgetScreen screen : rawWidgetScreens.getWidgetScreenList()) {
+            if (String.valueOf(screen.getId()).equals(widgetScreen.getId())) {
+                continue;
+            }
+
+            builder.addWidgetScreen(screen);
+        }
+
+        getPrefs().getPreferences().edit()
+                .putString(XiaomiPreferences.PREF_WIDGET_SCREENS, GB.hexdump(builder.build().toByteArray()))
+                .apply();
+    }
+
+    @Override
+    public void sendToDevice() {
+        GBApplication.deviceService(getDevice()).onSendConfiguration(DeviceSettingsPreferenceConst.PREF_WIDGETS);
+    }
+
+    private Prefs getPrefs() {
+        return new Prefs(GBApplication.getDeviceSpecificSharedPrefs(getDevice().getAddress()));
+    }
+
+    @Nullable
+    private WidgetType fromRawWidgetType(final int rawType) {
+        switch (rawType) {
+            case 1:
+                return WidgetType.SMALL;
+            case 2:
+                return WidgetType.WIDE;
+            case 3:
+                return WidgetType.TALL;
+            default:
+                LOG.warn("Unknown widget type {}", rawType);
+                return null;
+        }
+    }
+
+    private int toRawWidgetType(final WidgetType widgetType) {
+        switch (widgetType) {
+            case SMALL:
+                return 1;
+            case WIDE:
+                return 2;
+            case TALL:
+                return 3;
+            default:
+                throw new IllegalArgumentException("Unknown widget type " + widgetType);
+        }
+    }
+
+    @Nullable
+    private WidgetLayout fromRawLayout(final int rawLayout) {
+        switch (rawLayout) {
+            case 1:
+                return WidgetLayout.TOP_2_BOT_2;
+            case 2:
+                return WidgetLayout.TOP_1_BOT_2;
+            case 4:
+                return WidgetLayout.TOP_2_BOT_1;
+            case 256:
+                return WidgetLayout.TWO;
+            case 512:
+                return WidgetLayout.SINGLE;
+            default:
+                LOG.warn("Unknown widget screens layout {}", rawLayout);
+                return null;
+        }
+    }
+
+    @Nullable
+    private XiaomiProto.WidgetPart findRawPart(final int type, final int id) {
+        final XiaomiProto.WidgetParts rawWidgetParts = getRawWidgetParts();
+
+        for (final XiaomiProto.WidgetPart rawPart : rawWidgetParts.getWidgetPartList()) {
+            if (rawPart.getType() == type && rawPart.getId() == id) {
+                return rawPart;
+            }
+        }
+
+        return null;
+    }
+
+    private XiaomiProto.WidgetScreens getRawWidgetScreens() {
+        final String hex = getPrefs().getString(XiaomiPreferences.PREF_WIDGET_SCREENS, null);
+        if (hex == null) {
+            LOG.warn("raw widget screens hex is null");
+            return XiaomiProto.WidgetScreens.newBuilder().build();
+        }
+
+        try {
+            return XiaomiProto.WidgetScreens.parseFrom(GB.hexStringToByteArray(hex));
+        } catch (final InvalidProtocolBufferException e) {
+            LOG.warn("failed to parse raw widget screns hex");
+            return XiaomiProto.WidgetScreens.newBuilder().build();
+        }
+    }
+
+    private XiaomiProto.WidgetParts getRawWidgetParts() {
+        final String hex = getPrefs().getString(XiaomiPreferences.PREF_WIDGET_PARTS, null);
+        if (hex == null) {
+            LOG.warn("raw widget parts hex is null");
+            return XiaomiProto.WidgetParts.newBuilder().build();
+        }
+
+        try {
+            return XiaomiProto.WidgetParts.parseFrom(GB.hexStringToByteArray(hex));
+        } catch (final InvalidProtocolBufferException e) {
+            LOG.warn("failed to parse raw widget parts hex");
+            return XiaomiProto.WidgetParts.newBuilder().build();
+        }
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiWorkoutType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiWorkoutType.java
new file mode 100644
index 000000000..f9aa663d4
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiWorkoutType.java
@@ -0,0 +1,61 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi;
+
+import androidx.annotation.StringRes;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+
+public class XiaomiWorkoutType {
+    private final int code;
+    private final String name;
+
+    public XiaomiWorkoutType(final int code, final String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    @StringRes
+    public static int mapWorkoutName(final int code) {
+        switch (code) {
+            case 1:
+                return R.string.activity_type_outdoor_running;
+            case 2:
+                return R.string.activity_type_walking;
+            case 3:
+                return R.string.activity_type_hiking;
+            case 4:
+                return R.string.activity_type_trekking;
+            case 5:
+                return R.string.activity_type_trail_run;
+            case 6:
+                return R.string.activity_type_outdoor_cycling;
+            case 501:
+                return R.string.activity_type_wrestling;
+        }
+
+        return -1;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPreferences.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPreferences.java
index 6ef16b89c..0324716ce 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPreferences.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPreferences.java
@@ -16,13 +16,18 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi;
 
+import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Collections;
 import java.util.Date;
 import java.util.GregorianCalendar;
+import java.util.List;
 import java.util.Locale;
 import java.util.TimeZone;
 
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiWorkoutType;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
@@ -32,6 +37,9 @@ public final class XiaomiPreferences {
     public static final String PREF_REMINDER_SLOTS = "reminder_slots";
     public static final String PREF_CANNED_MESSAGES_MIN = "canned_messages_min";
     public static final String PREF_CANNED_MESSAGES_MAX = "canned_messages_max";
+    public static final String PREF_WORKOUT_TYPES = "workout_types";
+    public static final String PREF_WIDGET_SCREENS = "widget_screens"; // FIXME the value is a protobuf hex string
+    public static final String PREF_WIDGET_PARTS = "widget_parts"; // FIXME the value is a protobuf hex string
 
     public static final String FEAT_WEAR_MODE = "feat_wear_mode";
     public static final String FEAT_DEVICE_ACTIONS = "feat_device_actions";
@@ -45,6 +53,7 @@ public final class XiaomiPreferences {
     public static final String FEAT_VITALITY_SCORE = "feat_vitality_score";
     public static final String FEAT_SCREEN_ON_ON_NOTIFICATIONS = "feat_screen_on_on_notifications";
     public static final String FEAT_CAMERA_REMOTE = "feat_camera_remote";
+    public static final String FEAT_WIDGETS = "feat_widgets";
 
     private XiaomiPreferences() {
         // util class
@@ -80,4 +89,22 @@ public final class XiaomiPreferences {
         final Prefs prefs = new Prefs(GBApplication.getDeviceSpecificSharedPrefs(gbDevice.getAddress()));
         return prefs.getBoolean("keep_activity_data_on_device", false);
     }
+
+    // FIXME this function should not be here
+    public static List<XiaomiWorkoutType> getWorkoutTypes(final GBDevice gbDevice) {
+        final Prefs prefs = new Prefs(GBApplication.getDeviceSpecificSharedPrefs(gbDevice.getAddress()));
+        final List<String> codes = prefs.getList(PREF_WORKOUT_TYPES, Collections.emptyList());
+        final List<XiaomiWorkoutType> ret = new ArrayList<>(codes.size());
+        for (final String code : codes) {
+            final int codeInt = Integer.parseInt(code);
+            final int codeNameStringRes = XiaomiWorkoutType.mapWorkoutName(codeInt);
+            ret.add(new XiaomiWorkoutType(
+                    codeInt,
+                    codeNameStringRes != -1 ?
+                            GBApplication.getContext().getString(codeNameStringRes) :
+                            GBApplication.getContext().getString(R.string.widget_unknown_workout, code)
+            ));
+        }
+        return ret;
+    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
index 2be56f7d0..9b88806f3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
@@ -16,6 +16,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services;
 
+import com.google.protobuf.InvalidProtocolBufferException;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -83,10 +85,14 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
     public static final int CMD_PASSWORD_SET = 21;
     public static final int CMD_DISPLAY_ITEMS_GET = 29;
     public static final int CMD_DISPLAY_ITEMS_SET = 30;
+    public static final int CMD_WORKOUT_TYPES_GET = 39;
     public static final int CMD_MISC_SETTING_SET_FROM_BAND = 42;
     public static final int CMD_SILENT_MODE_GET = 43;
     public static final int CMD_SILENT_MODE_SET_FROM_PHONE = 44;
     public static final int CMD_SILENT_MODE_SET_FROM_WATCH = 45;
+    public static final int CMD_WIDGET_SCREENS_GET = 51;
+    public static final int CMD_WIDGET_SCREENS_SET = 52;
+    public static final int CMD_WIDGET_PARTS_GET = 53;
     public static final int CMD_DEVICE_STATE_GET = 78;
     public static final int CMD_DEVICE_STATE = 79;
 
@@ -111,6 +117,9 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
         getSupport().sendCommand("get password", COMMAND_TYPE, CMD_PASSWORD_GET);
         getSupport().sendCommand("get display items", COMMAND_TYPE, CMD_DISPLAY_ITEMS_GET);
         getSupport().sendCommand("get camera remote", COMMAND_TYPE, CMD_CAMERA_REMOTE_GET);
+        getSupport().sendCommand("get widgets", COMMAND_TYPE, CMD_WIDGET_SCREENS_GET);
+        getSupport().sendCommand("get widget parts", COMMAND_TYPE, CMD_WIDGET_PARTS_GET);
+        getSupport().sendCommand("get workout types", COMMAND_TYPE, CMD_WORKOUT_TYPES_GET);
     }
 
     @Override
@@ -159,6 +168,9 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
             case CMD_DISPLAY_ITEMS_GET:
                 handleDisplayItems(cmd.getSystem().getDisplayItems());
                 return;
+            case CMD_WORKOUT_TYPES_GET:
+                handleWorkoutTypes(cmd.getSystem().getWorkoutTypes());
+                return;
             case CMD_MISC_SETTING_SET_FROM_BAND:
                 handleMiscSettingSet(cmd.getSystem().getMiscSettingSet());
                 return;
@@ -168,6 +180,15 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
             case CMD_SILENT_MODE_SET_FROM_WATCH:
                 handlePhoneSilentModeSet(cmd.getSystem().getPhoneSilentModeSet());
                 return;
+            case CMD_WIDGET_SCREENS_GET:
+                handleWidgetScreens(cmd.getSystem().getWidgetScreens());
+                return;
+            case CMD_WIDGET_SCREENS_SET:
+                LOG.debug("Got widget screens set ack, status={}", cmd.getStatus());
+                return;
+            case CMD_WIDGET_PARTS_GET:
+                handleWidgetParts(cmd.getSystem().getWidgetParts());
+                return;
             case CMD_DEVICE_STATE_GET:
                 handleBasicDeviceState(cmd.getSystem().hasBasicDeviceState()
                         ? cmd.getSystem().getBasicDeviceState()
@@ -205,6 +226,9 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
             case HuamiConst.PREF_DISPLAY_ITEMS_SORTABLE:
                 setDisplayItems();
                 return true;
+            case DeviceSettingsPreferenceConst.PREF_WIDGETS:
+                setWidgets();
+                return true;
         }
 
         return super.onSendConfiguration(config, prefs);
@@ -592,6 +616,20 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
         getSupport().evaluateGBDeviceEvent(eventUpdatePreferences);
     }
 
+    private void handleWorkoutTypes(final XiaomiProto.WorkoutTypes workoutTypes) {
+        LOG.debug("Got {} workout types", workoutTypes.getWorkoutTypeCount());
+
+        final List<String> codes = new ArrayList<>(workoutTypes.getWorkoutTypeCount());
+        for (final XiaomiProto.WorkoutType workoutType : workoutTypes.getWorkoutTypeList()) {
+            codes.add(String.valueOf(workoutType.getType()));
+        }
+
+        final GBDeviceEventUpdatePreferences eventUpdatePreferences = new GBDeviceEventUpdatePreferences()
+                .withPreference(XiaomiPreferences.PREF_WORKOUT_TYPES, String.join(",", codes));
+
+        getSupport().evaluateGBDeviceEvent(eventUpdatePreferences);
+    }
+
     private void handleWearingState(int newStateValue) {
         WearingState newState;
 
@@ -775,6 +813,52 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
         getSupport().sendCommand("request battery state", COMMAND_TYPE, CMD_BATTERY);
     }
 
+    private void handleWidgetScreens(final XiaomiProto.WidgetScreens widgetScreens) {
+        LOG.debug("Got {} widget screens", widgetScreens.getWidgetScreenCount());
+        final GBDeviceEventUpdatePreferences eventUpdatePreferences = new GBDeviceEventUpdatePreferences()
+                // FIXME we're just persisting the protobuf bytes - probably not a good idea
+                .withPreference(XiaomiPreferences.PREF_WIDGET_SCREENS, GB.hexdump(widgetScreens.toByteArray()));
+
+        getSupport().evaluateGBDeviceEvent(eventUpdatePreferences);
+    }
+
+    private void handleWidgetParts(final XiaomiProto.WidgetParts widgetParts) {
+        LOG.debug("Got {} widget parts", widgetParts.getWidgetPartCount());
+        final GBDeviceEventUpdatePreferences eventUpdatePreferences = new GBDeviceEventUpdatePreferences()
+                .withPreference(XiaomiPreferences.FEAT_WIDGETS, widgetParts.getWidgetPartCount() > 0)
+                // FIXME we're just persisting the protobuf bytes - probably not a good idea
+                .withPreference(XiaomiPreferences.PREF_WIDGET_PARTS, GB.hexdump(widgetParts.toByteArray()));
+
+        getSupport().evaluateGBDeviceEvent(eventUpdatePreferences);
+    }
+
+    private void setWidgets() {
+        final String hex = getDevicePrefs().getString(XiaomiPreferences.PREF_WIDGET_SCREENS, null);
+        if (hex == null) {
+            LOG.warn("raw widget screens hex is null");
+            return;
+        }
+
+        final XiaomiProto.WidgetScreens widgetScreens;
+        try {
+            widgetScreens = XiaomiProto.WidgetScreens.parseFrom(GB.hexStringToByteArray(hex));
+        } catch (final InvalidProtocolBufferException e) {
+            LOG.warn("failed to parse raw widget screns hex");
+            return;
+        }
+
+        LOG.debug("Setting {} widget screens", widgetScreens.getWidgetScreenCount());
+
+        getSupport().sendCommand(
+                "set widgets",
+                XiaomiProto.Command.newBuilder()
+                        .setType(COMMAND_TYPE)
+                        .setSubtype(CMD_WIDGET_SCREENS_SET)
+                        .setSystem(XiaomiProto.System.newBuilder().setWidgetScreens(widgetScreens))
+                        .build()
+        );
+    }
+
     public void onFindPhone(final boolean start) {
         LOG.debug("Find phone: {}", start);
 
diff --git a/app/src/main/proto/xiaomi.proto b/app/src/main/proto/xiaomi.proto
index 7db812883..9bf2ef411 100644
--- a/app/src/main/proto/xiaomi.proto
+++ b/app/src/main/proto/xiaomi.proto
@@ -111,7 +111,7 @@ message System {
   optional Language language = 20;
 
   // 2, 51 get | 2, 52 create
-  optional WidgetsScreens widgetScreens = 28;
+  optional WidgetScreens widgetScreens = 28;
   // 2, 53
   optional WidgetParts widgetParts = 29;
 
@@ -228,7 +228,7 @@ message WorkoutType {
   optional uint32 unknown2 = 2; // 1
 }
 
-message WidgetsScreens {
+message WidgetScreens {
   repeated WidgetScreen widgetScreen = 1;
   optional uint32 isFullList = 2; // 1 to overwrite the full list
   optional WidgetsCapabilities widgetsCapabilities = 3; // only in response
diff --git a/app/src/main/res/layout/activity_widget_screen_details.xml b/app/src/main/res/layout/activity_widget_screen_details.xml
new file mode 100644
index 000000000..5b6929dfe
--- /dev/null
+++ b/app/src/main/res/layout/activity_widget_screen_details.xml
@@ -0,0 +1,254 @@
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/constraintLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context="nodomain.freeyourgadget.gadgetbridge.activities.widgets.WidgetScreenDetailsActivity">
+
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/card_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="8dp"
+        android:foreground="?android:attr/selectableItemBackground"
+        app:cardBackgroundColor="?attr/cardview_background_color"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        card_view:cardElevation="3dp"
+        card_view:contentPadding="4dp">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="8dp">
+
+            <TextView
+                android:id="@+id/label_layout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/widget_layout"
+                android:textAppearance="?android:attr/textAppearance"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/widget_screen_layout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:text="2x1"
+                android:textAppearance="?android:attr/textAppearanceLarge"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/label_layout" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </com.google.android.material.card.MaterialCardView>
+
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/card_widget_top_left"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_margin="8dp"
+        android:foreground="?android:attr/selectableItemBackground"
+        app:cardBackgroundColor="?attr/cardview_background_color"
+        app:layout_constraintEnd_toStartOf="@id/card_widget_top_right"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/card_layout"
+        card_view:cardElevation="3dp"
+        card_view:contentPadding="4dp">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="8dp">
+
+            <TextView
+                android:id="@+id/label_widget_top_left"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/widget"
+                android:textAppearance="?android:attr/textAppearance"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/widget_top_left"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:text="TOP LEFT"
+                android:textAppearance="?android:attr/textAppearanceLarge"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/label_widget_top_left" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </com.google.android.material.card.MaterialCardView>
+
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/card_widget_top_right"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_margin="8dp"
+        android:foreground="?android:attr/selectableItemBackground"
+        app:cardBackgroundColor="?attr/cardview_background_color"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/card_widget_top_left"
+        app:layout_constraintTop_toBottomOf="@id/card_layout"
+        card_view:cardElevation="3dp"
+        card_view:contentPadding="4dp">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="8dp">
+
+            <TextView
+                android:id="@+id/label_widget_top_right"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/widget"
+                android:textAppearance="?android:attr/textAppearance"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/widget_top_right"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:text="TOP RIGHT"
+                android:textAppearance="?android:attr/textAppearanceLarge"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/label_widget_top_right" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </com.google.android.material.card.MaterialCardView>
+
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/card_widget_center"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="8dp"
+        android:foreground="?android:attr/selectableItemBackground"
+        app:cardBackgroundColor="?attr/cardview_background_color"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/card_widget_top_right"
+        card_view:cardElevation="3dp"
+        card_view:contentPadding="4dp">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="8dp">
+
+            <TextView
+                android:id="@+id/label_widget_center"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/widget"
+                android:textAppearance="?android:attr/textAppearance"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/widget_center"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:text="CENTER"
+                android:textAppearance="?android:attr/textAppearanceLarge"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/label_widget_center" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </com.google.android.material.card.MaterialCardView>
+
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/card_widget_bottom_left"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_margin="8dp"
+        android:foreground="?android:attr/selectableItemBackground"
+        app:cardBackgroundColor="?attr/cardview_background_color"
+        app:layout_constraintEnd_toStartOf="@id/card_widget_bottom_right"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/card_widget_center"
+        card_view:cardElevation="3dp"
+        card_view:contentPadding="4dp">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="8dp">
+
+            <TextView
+                android:id="@+id/label_widget_bottom_left"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/widget"
+                android:textAppearance="?android:attr/textAppearance"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/widget_bottom_left"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:text="BOT LEFT"
+                android:textAppearance="?android:attr/textAppearanceLarge"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/label_widget_bottom_left" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </com.google.android.material.card.MaterialCardView>
+
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/card_widget_bottom_right"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_margin="8dp"
+        android:foreground="?android:attr/selectableItemBackground"
+        app:cardBackgroundColor="?attr/cardview_background_color"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/card_widget_bottom_left"
+        app:layout_constraintTop_toBottomOf="@id/card_widget_center"
+        card_view:cardElevation="3dp"
+        card_view:contentPadding="4dp">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="8dp">
+
+            <TextView
+                android:id="@+id/label_widget_bottom_right"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/widget"
+                android:textAppearance="?android:attr/textAppearance"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/widget_bottom_right"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:text="BOT RIGHT"
+                android:textAppearance="?android:attr/textAppearanceLarge"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/label_widget_bottom_right" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </com.google.android.material.card.MaterialCardView>
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/fab_save"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="16dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:srcCompat="@drawable/ic_save" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_widget_screens_list.xml b/app/src/main/res/layout/activity_widget_screens_list.xml
new file mode 100644
index 000000000..0c642fba7
--- /dev/null
+++ b/app/src/main/res/layout/activity_widget_screens_list.xml
@@ -0,0 +1,27 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior"
+    tools:context="nodomain.freeyourgadget.gadgetbridge.activities.widgets.WidgetScreensListActivity">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/widget_screens_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true"
+        android:divider="@null" />
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="16dp"
+        app:srcCompat="@drawable/ic_add" />
+</RelativeLayout>
diff --git a/app/src/main/res/layout/item_widget_screen.xml b/app/src/main/res/layout/item_widget_screen.xml
new file mode 100644
index 000000000..0adc57d8d
--- /dev/null
+++ b/app/src/main/res/layout/item_widget_screen.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/card_widget_screen"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="8dp"
+        android:foreground="?android:attr/selectableItemBackground"
+        app:cardBackgroundColor="?attr/cardview_background_color"
+        card_view:cardElevation="3dp"
+        card_view:contentPadding="4dp">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="8dp">
+
+            <TextView
+                android:id="@+id/widget_screen_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentTop="true"
+                android:layout_marginStart="3dp"
+                android:layout_marginTop="0dp"
+                android:layout_marginEnd="0dp"
+                android:layout_marginBottom="4dp"
+                android:text="Screen 1"
+                android:textAppearance="?android:attr/textAppearance" />
+
+            <TextView
+                android:id="@+id/widget_screen_description"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentTop="true"
+                android:layout_marginStart="3dp"
+                android:layout_marginTop="25dp"
+                android:layout_marginEnd="0dp"
+                android:layout_marginBottom="0dp"
+                android:text="x widgets"
+                android:textAppearance="?android:attr/textAppearanceSmall" />
+
+        </RelativeLayout>
+    </com.google.android.material.card.MaterialCardView>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 36a27eb71..d6862b3e2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1280,6 +1280,9 @@
     <string name="activity_type_iceskating">Ice Skating</string>
     <string name="activity_type_golf">Golfing</string>
     <string name="activity_type_other">Other</string>
+    <string name="activity_type_trekking">Trekking</string>
+    <string name="activity_type_trail_run">Trail run</string>
+    <string name="activity_type_wrestling">Wrestling</string>
     <string name="activity_type_unknown">Unknown activity</string>
     <string name="activity_summaries">Sport Activities</string>
     <string name="activity_summary_detail">Sport Activity Detail</string>
@@ -2457,4 +2460,22 @@
     <string name="pref_vitality_score_7_day_summary">Get a notification when your vitality score reaches 30, 60 or 100 in the past 7 days</string>
     <string name="pref_vitality_score_daily_title">Daily progress</string>
     <string name="pref_vitality_score_daily_summary">Get a notification when you reached the maximum number of vitality points for the day</string>
+    <string name="widget">Widget</string>
+    <string name="widget_screen">Widget Screen</string>
+    <string name="widget_screen_delete_confirm_title">Delete widget screen</string>
+    <string name="widget_screen_delete_confirm_description">Are you sure you want to delete \'%1$s\'?</string>
+    <string name="widget_screen_no_free_slots_description">The device has no free slots for widget screens (total slots: %1$s)</string>
+    <string name="widget_screen_min_screens">There must be a minimum of %1$s screens</string>
+    <string name="widget_layout_top_1_bot_2">1 top, 2 bottom</string>
+    <string name="widget_layout_top_2_bot_1">2 top, 1 bottom</string>
+    <string name="widget_layout_top_2_bot_2">2 top, 2 bottom</string>
+    <string name="widget_layout">Widget layout</string>
+    <string name="widget_subtype">Widget Subtype</string>
+    <string name="widget_screen_x">Screen %s</string>
+    <string name="widget_layout_single">1 widget</string>
+    <string name="widget_layout_two">2 widgets</string>
+    <string name="widget_move_up">Move up</string>
+    <string name="widget_move_down">Move down</string>
+    <string name="widget_missing_parts">Please select all widgets</string>
+    <string name="widget_unknown_workout">Unknown workout - %s</string>
 </resources>
diff --git a/app/src/main/res/xml/devicesettings_widgets.xml b/app/src/main/res/xml/devicesettings_widgets.xml
new file mode 100644
index 000000000..5c137f993
--- /dev/null
+++ b/app/src/main/res/xml/devicesettings_widgets.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <Preference
+        android:icon="@drawable/ic_widgets"
+        android:key="pref_widgets"
+        android:title="@string/menuitem_widgets" />
+</androidx.preference.PreferenceScreen>

From 820956ccdc6d95690115ad44df57ba8a603a765a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Mon, 11 Dec 2023 22:16:00 +0000
Subject: [PATCH 240/595] Xiaomi: Disable activity fetching outside of Mi Band
 8

It has a lot of issues, and should not be enabled to proceed with a
release.
---
 .../devices/xiaomi/XiaomiCoordinator.java            |  8 +++++---
 .../devices/xiaomi/miband8/MiBand8Coordinator.java   | 12 ++++++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
index d3164cb49..7ec9e3247 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
@@ -217,18 +217,20 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
 
     @Override
     public boolean supportsActivityDataFetching() {
-        return true;
+        // TODO It does, but not yet fully working - only in Mi Band 8
+        return false;
     }
 
     @Override
     public boolean supportsActivityTracking() {
-        return true;
+        // TODO It does, but not yet fully working - only in Mi Band 8
+        return false;
     }
 
     @Override
     public boolean supportsActivityTracks() {
         // TODO It does, but not yet fully working
-        return BuildConfig.DEBUG;
+        return false;
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/MiBand8Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/MiBand8Coordinator.java
index 3a78f2582..eb32fc823 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/MiBand8Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/MiBand8Coordinator.java
@@ -61,6 +61,18 @@ public class MiBand8Coordinator extends XiaomiCoordinator {
         return R.drawable.ic_device_miband6_disabled;
     }
 
+    @Override
+    public boolean supportsActivityDataFetching() {
+        // FIXME still has some issues
+        return true;
+    }
+
+    @Override
+    public boolean supportsActivityTracking() {
+        // FIXME still has some issues
+        return true;
+    }
+
     @Override
     public boolean supportsMultipleWeatherLocations() {
         return true;

From 9e2e3bbebca22ab53954215b303f5d07adf38e93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Mon, 11 Dec 2023 22:17:49 +0000
Subject: [PATCH 241/595] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 08793abf6..1f2d84c2d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 * Experimental support for Mi Band 8 (Xiaomi Smart Band 8)
 * Experimental support for Mi Watch Lite
 * Experimental support for Mi Watch Color Sport
+* Experimental support for Redmi Smart Band 2
 * Experimental support for Redmi Watch 3 Active
 * Experimental support for Xiaomi Watch S1 Active
 * Amazfit Band 7: Add alexa menu entries

From 128aed005ba8c5e826919ff92ad044b522dcea97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Tue, 12 Dec 2023 14:12:00 +0000
Subject: [PATCH 242/595] Xiaomi: Parse daily summary and workout gps tracks

---
 .../devices/xiaomi/XiaomiCoordinator.java     |  14 +-
 .../xiaomi/miband8/MiBand8Coordinator.java    |   6 +
 .../export/ActivityTrackExporter.java         |   4 -
 .../gadgetbridge/export/GPXExporter.java      |   8 -
 .../gadgetbridge/model/ActivityPoint.java     |  28 +--
 .../activity/XiaomiActivityFileFetcher.java   |  23 +--
 .../xiaomi/activity/XiaomiActivityFileId.java |  48 +++++-
 .../xiaomi/activity/XiaomiActivityParser.java |  44 +++++
 .../activity/impl/DailyDetailsParser.java     |   9 +-
 .../activity/impl/DailySummaryParser.java     |  88 ++++++++++
 .../activity/impl/WorkoutGpsParser.java       | 159 ++++++++++++++++++
 .../activity/impl/WorkoutSummaryParser.java   |  15 +-
 .../xiaomi/services/XiaomiHealthService.java  |   6 +-
 13 files changed, 383 insertions(+), 69 deletions(-)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/DailySummaryParser.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutGpsParser.java

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
index 7ec9e3247..d5dc940a2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
@@ -229,7 +229,7 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
 
     @Override
     public boolean supportsActivityTracks() {
-        // TODO It does, but not yet fully working
+        // TODO It does, but not yet fully working - only in Mi Band 8
         return false;
     }
 
@@ -245,25 +245,19 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
 
     @Override
     public boolean supportsHeartRateStats() {
-        // TODO does it?
+        // TODO it does - see DailySummaryParser
         return false;
     }
 
     @Override
     public boolean supportsPai() {
-        // TODO does it?
+        // TODO it does - vitality score
         return false;
     }
 
     @Override
     public boolean supportsSleepRespiratoryRate() {
-        // TODO does it?
-        return false;
-    }
-
-    @Override
-    public boolean supportsAlarmDescription(final GBDevice device) {
-        // TODO does it?
+        // TODO it does
         return false;
     }
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/MiBand8Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/MiBand8Coordinator.java
index eb32fc823..3f070e832 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/MiBand8Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/MiBand8Coordinator.java
@@ -73,6 +73,12 @@ public class MiBand8Coordinator extends XiaomiCoordinator {
         return true;
     }
 
+    @Override
+    public boolean supportsActivityTracks() {
+        // FIXME still has some issues
+        return true;
+    }
+
     @Override
     public boolean supportsMultipleWeatherLocations() {
         return true;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/export/ActivityTrackExporter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/export/ActivityTrackExporter.java
index c590359bb..2be498adc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/export/ActivityTrackExporter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/export/ActivityTrackExporter.java
@@ -19,13 +19,9 @@ package nodomain.freeyourgadget.gadgetbridge.export;
 import java.io.File;
 import java.io.IOException;
 
-import androidx.annotation.NonNull;
 import nodomain.freeyourgadget.gadgetbridge.model.ActivityTrack;
 
 public interface ActivityTrackExporter {
-    @NonNull
-    String getDefaultFileName(@NonNull ActivityTrack track);
-
     void performExport(ActivityTrack track, File targetFile) throws IOException, GPXTrackEmptyException;
 
     class GPXTrackEmptyException extends Exception {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/export/GPXExporter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/export/GPXExporter.java
index e80f61eba..ad8ff59e9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/export/GPXExporter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/export/GPXExporter.java
@@ -19,7 +19,6 @@ package nodomain.freeyourgadget.gadgetbridge.export;
 
 import android.util.Xml;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import org.xmlpull.v1.XmlSerializer;
@@ -39,7 +38,6 @@ import nodomain.freeyourgadget.gadgetbridge.model.ActivityPoint;
 import nodomain.freeyourgadget.gadgetbridge.model.ActivityTrack;
 import nodomain.freeyourgadget.gadgetbridge.model.GPSCoordinate;
 import nodomain.freeyourgadget.gadgetbridge.util.DateTimeUtils;
-import nodomain.freeyourgadget.gadgetbridge.util.FileUtils;
 
 public class GPXExporter implements ActivityTrackExporter {
     private static final String NS_GPX_URI = "http://www.topografix.com/GPX/1/1";
@@ -56,12 +54,6 @@ public class GPXExporter implements ActivityTrackExporter {
     private boolean includeHeartRate = true;
     private boolean includeHeartRateOfNearestSample = true;
 
-    @NonNull
-    @Override
-    public String getDefaultFileName(@NonNull ActivityTrack track) {
-        return FileUtils.makeValidFileName(track.getName());
-    }
-
     @Override
     public void performExport(ActivityTrack track, File targetFile) throws IOException, GPXTrackEmptyException {
         String encoding = StandardCharsets.UTF_8.name();
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityPoint.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityPoint.java
index f87ac9bbc..cca603199 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityPoint.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityPoint.java
@@ -38,9 +38,7 @@ public class ActivityPoint {
     private Date time;
     private GPSCoordinate location;
     private int heartRate;
-    private long speed4;
-    private long speed5;
-    private long speed6;
+    private float speed = -1;
 
     // e.g. to describe a pause during the activity
     private @Nullable String description;
@@ -85,27 +83,11 @@ public class ActivityPoint {
         this.heartRate = heartRate;
     }
 
-    public long getSpeed4() {
-        return speed4;
+    public float getSpeed() {
+        return speed;
     }
 
-    public void setSpeed4(long speed4) {
-        this.speed4 = speed4;
-    }
-
-    public long getSpeed5() {
-        return speed5;
-    }
-
-    public void setSpeed5(long speed5) {
-        this.speed5 = speed5;
-    }
-
-    public long getSpeed6() {
-        return speed6;
-    }
-
-    public void setSpeed6(long speed6) {
-        this.speed6 = speed6;
+    public void setSpeed(float speed) {
+        this.speed = speed;
     }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileFetcher.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileFetcher.java
index 6b0370372..f5547dd10 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileFetcher.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileFetcher.java
@@ -28,7 +28,9 @@ import java.io.OutputStream;
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.LinkedList;
+import java.util.List;
 import java.util.Locale;
+import java.util.PriorityQueue;
 import java.util.Queue;
 import java.util.TimeZone;
 
@@ -47,7 +49,7 @@ public class XiaomiActivityFileFetcher {
 
     private final XiaomiHealthService mHealthService;
 
-    private final Queue<XiaomiActivityFileId> mFetchQueue = new LinkedList<>();
+    private final Queue<XiaomiActivityFileId> mFetchQueue = new PriorityQueue<>();
     private ByteArrayOutputStream mBuffer = new ByteArrayOutputStream();
     private boolean isFetching = false;
 
@@ -124,15 +126,15 @@ public class XiaomiActivityFileFetcher {
                     LOG.warn("Failed to parse {}", fileId);
                 }
             } catch (final Exception ex) {
-                LOG.error("addChunk(): failed to parse activity: ", ex);
+                LOG.error("Exception while parsing " + fileId, ex);
             }
 
             triggerNextFetch();
         }
     }
 
-    public void fetch(final XiaomiActivityFileId fileId) {
-        mFetchQueue.add(fileId);
+    public void fetch(final List<XiaomiActivityFileId> fileIds) {
+        mFetchQueue.addAll(fileIds);
         if (!isFetching) {
             // Currently not fetching anything, fetch the next
             isFetching = true;
@@ -163,23 +165,12 @@ public class XiaomiActivityFileFetcher {
     }
 
     protected void dumpBytesToExternalStorage(final XiaomiActivityFileId fileId, final byte[] bytes) {
-        final SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd'T'HHmmss", Locale.US);
-
         try {
             final File externalFilesDir = FileUtils.getExternalFilesDir();
             final File targetDir = new File(externalFilesDir, "rawFetchOperations");
             targetDir.mkdirs();
 
-            final String filename = String.format(
-                    Locale.ROOT,  "xiaomi_%s_%02X_%02X_%02X_v%d.bin",
-                    sdf.format(fileId.getTimestamp()),
-                    fileId.getTypeCode(),
-                    fileId.getSubtypeCode(),
-                    fileId.getDetailTypeCode(),
-                    fileId.getVersion()
-            );
-
-            final File outputFile = new File(targetDir, filename);
+            final File outputFile = new File(targetDir, fileId.getFilename());
 
             final OutputStream outputStream = new FileOutputStream(outputFile);
             outputStream.write(bytes);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java
index dfe269783..a42d536ef 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java
@@ -18,13 +18,17 @@ package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity;
 
 import androidx.annotation.NonNull;
 
+import org.apache.commons.lang3.builder.CompareToBuilder;
+
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
+import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Locale;
 
 import nodomain.freeyourgadget.gadgetbridge.util.DateTimeUtils;
 
-public class XiaomiActivityFileId {
+public class XiaomiActivityFileId implements Comparable<XiaomiActivityFileId> {
     private final Date timestamp;
     private final int timezone;
     private final int type;
@@ -133,6 +137,32 @@ public class XiaomiActivityFileId {
                 "}";
     }
 
+    @Override
+    public int compareTo(final XiaomiActivityFileId o) {
+        return new CompareToBuilder()
+                .append(timestamp, o.timestamp)
+                .append(timezone, o.timezone)
+                .append(type, o.type)
+                .append(subtype, o.subtype)
+                .append(getDetailType().getFetchOrder(), o.getDetailType().getFetchOrder())
+                .append(version, o.version)
+                .build();
+    }
+
+    public String getFilename() {
+        final SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd'T'HHmmss", Locale.US);
+
+        return String.format(
+                Locale.ROOT,
+                "xiaomi_%s_%02X_%02X_%02X_v%d.bin",
+                sdf.format(getTimestamp()),
+                getTypeCode(),
+                getSubtypeCode(),
+                getDetailTypeCode(),
+                getVersion()
+        );
+    }
+
     public enum Type {
         UNKNOWN(-1),
         ACTIVITY(0),
@@ -166,6 +196,7 @@ public class XiaomiActivityFileId {
         SPORTS_OUTDOOR_RUNNING(Type.SPORTS, 0x01),
         SPORTS_FREESTYLE(Type.SPORTS, 0x08),
         SPORTS_ELLIPTICAL(Type.SPORTS, 0x0B),
+        SPORTS_OUTDOOR_WALKING(Type.SPORTS, 0x16),
         SPORTS_OUTDOOR_CYCLING(Type.SPORTS, 0x17),
         ;
 
@@ -208,6 +239,21 @@ public class XiaomiActivityFileId {
             return code;
         }
 
+        public int getFetchOrder() {
+            // Fetch summary first, so we have the summary data for workouts
+            // before parsing the gps track
+            switch (this) {
+                case SUMMARY:
+                    return 0;
+                case DETAILS:
+                    return 1;
+                case GPS_TRACK:
+                    return 2;
+            }
+
+            return 3;
+        }
+
         public static DetailType fromCode(final int code) {
             for (final DetailType detailType : values()) {
                 if (detailType.getCode() == code) {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityParser.java
index 9de6aeb38..d4b14b040 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityParser.java
@@ -21,9 +21,20 @@ import androidx.annotation.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+
+import de.greenrobot.dao.query.QueryBuilder;
+import nodomain.freeyourgadget.gadgetbridge.entities.BaseActivitySummary;
+import nodomain.freeyourgadget.gadgetbridge.entities.BaseActivitySummaryDao;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.entities.Device;
+import nodomain.freeyourgadget.gadgetbridge.entities.User;
+import nodomain.freeyourgadget.gadgetbridge.model.ActivityKind;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl.DailyDetailsParser;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl.DailySummaryParser;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl.SleepDetailsParser;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl.WorkoutGpsParser;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl.WorkoutSummaryParser;
 
 public abstract class XiaomiActivityParser {
@@ -31,6 +42,34 @@ public abstract class XiaomiActivityParser {
 
     public abstract boolean parse(final XiaomiSupport support, final XiaomiActivityFileId fileId, final byte[] bytes);
 
+    protected BaseActivitySummary findOrCreateBaseActivitySummary(final DaoSession session,
+                                                                  final Device device,
+                                                                  final User user,
+                                                                  final XiaomiActivityFileId fileId) {
+        final BaseActivitySummaryDao summaryDao = session.getBaseActivitySummaryDao();
+        final QueryBuilder<BaseActivitySummary> qb = summaryDao.queryBuilder();
+        qb.where(BaseActivitySummaryDao.Properties.StartTime.eq(fileId.getTimestamp()));
+        qb.where(BaseActivitySummaryDao.Properties.DeviceId.eq(device.getId()));
+        qb.where(BaseActivitySummaryDao.Properties.UserId.eq(user.getId()));
+        final List<BaseActivitySummary> summaries = qb.build().list();
+        if (summaries.isEmpty()) {
+            final BaseActivitySummary summary = new BaseActivitySummary();
+            summary.setStartTime(fileId.getTimestamp());
+            summary.setDevice(device);
+            summary.setUser(user);
+
+            // These will be set later, once we parse the summary
+            summary.setEndTime(fileId.getTimestamp());
+            summary.setActivityKind(ActivityKind.TYPE_UNKNOWN);
+
+            return summary;
+        }
+        if (summaries.size() > 1) {
+            LOG.warn("Found multiple summaries for {}", fileId);
+        }
+        return summaries.get(0);
+    }
+
     @Nullable
     public static XiaomiActivityParser create(final XiaomiActivityFileId fileId) {
         switch (fileId.getType()) {
@@ -52,6 +91,9 @@ public abstract class XiaomiActivityParser {
                 if (fileId.getDetailType() == XiaomiActivityFileId.DetailType.DETAILS) {
                     return new DailyDetailsParser();
                 }
+                if (fileId.getDetailType() == XiaomiActivityFileId.DetailType.SUMMARY) {
+                    return new DailySummaryParser();
+                }
 
                 break;
             case ACTIVITY_SLEEP:
@@ -71,6 +113,8 @@ public abstract class XiaomiActivityParser {
         switch (fileId.getDetailType()) {
             case SUMMARY:
                 return new WorkoutSummaryParser();
+            case GPS_TRACK:
+                return new WorkoutGpsParser();
         }
 
         return null;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/DailyDetailsParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/DailyDetailsParser.java
index f5b7f1ad5..c3912dd9b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/DailyDetailsParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/DailyDetailsParser.java
@@ -69,6 +69,8 @@ public class DailyDetailsParser extends XiaomiActivityParser {
         final byte[] header = new byte[headerSize];
         buf.get(header);
 
+        LOG.debug("Daily Details Header: {}", GB.hexdump(header));
+
         if ((buf.limit() - buf.position()) % sampleSize != 0) {
             LOG.warn("Remaining data in the buffer is not a multiple of {}", sampleSize);
             return false;
@@ -85,8 +87,11 @@ public class DailyDetailsParser extends XiaomiActivityParser {
 
             sample.setSteps(buf.getShort());
 
-            final byte[] unknown1 = new byte[4];
-            buf.get(unknown1);  // TODO intensity and kind?
+            final int calories = buf.get() & 0xff;
+            final int unk2 = buf.get() & 0xff;
+            final int distance = buf.getShort(); // not just walking, includes workouts like cycling
+
+            // TODO persist calories and distance, add UI
 
             sample.setHeartRate(buf.get() & 0xff);
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/DailySummaryParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/DailySummaryParser.java
new file mode 100644
index 000000000..786fb23a0
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/DailySummaryParser.java
@@ -0,0 +1,88 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.XiaomiActivityFileId;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.XiaomiActivityParser;
+import nodomain.freeyourgadget.gadgetbridge.util.GB;
+
+public class DailySummaryParser extends XiaomiActivityParser {
+    private static final Logger LOG = LoggerFactory.getLogger(DailySummaryParser.class);
+
+    @Override
+    public boolean parse(final XiaomiSupport support, final XiaomiActivityFileId fileId, final byte[] bytes) {
+        final int version = fileId.getVersion();
+        final int headerSize;
+        switch (version) {
+            case 5:
+                headerSize = 4;
+                break;
+            default:
+                LOG.warn("Unable to parse daily summary version {}", fileId.getVersion());
+                return false;
+        }
+
+        final ByteBuffer buf = ByteBuffer.wrap(bytes).order(ByteOrder.LITTLE_ENDIAN);
+        final byte[] header = new byte[headerSize];
+        buf.get(header);
+
+        LOG.debug("Header: {}", GB.hexdump(header));
+
+        final int steps = buf.getInt();
+        final int unk1 = buf.get() & 0xff; // 0
+        final int unk2 = buf.get() & 0xff; // 0
+        final int unk3 = buf.get() & 0xff; // 0
+        final int hrResting = buf.get() & 0xff;
+        final int hrMax = buf.get() & 0xff;
+        final int hrMaxTs = buf.getInt();
+        final int hrMin = buf.get() & 0xff;
+        final int hrMinTs = buf.getInt();
+        final int hrAvg = buf.get() & 0xff;
+        final int stressAvg = buf.get() & 0xff;
+        final int stressMax = buf.get() & 0xff;
+        final int stressMin = buf.get() & 0xff;
+        final int unk4 = buf.get() & 0xff; // 0
+        final int unk5 = buf.get() & 0xff; // 0
+        final int unk6 = buf.get() & 0xff; // 0
+        final int calories = buf.getShort();
+        final int unk7 = buf.get() & 0xff; // 0
+        final int unk8 = buf.get() & 0xff; // 0
+        final int unk9 = buf.get() & 0xff; // 0
+        final int spo2Max = buf.get() & 0xff;
+        final int spo2MaxTs = buf.getInt();
+        final int spo2Min = buf.get() & 0xff;
+        final int spo2MinTs = buf.getInt();
+        final int spo2Avg = buf.get() & 0xff;
+        final int trainingLoadMaybe1 = buf.getShort();
+        final int trainingLoadMaybe2 = buf.getShort();
+        final int trainingLoadMaybe3 = buf.get() & 0xff;
+
+        // TODO vitality somewhere?
+        // TODO persist everything
+
+        LOG.warn("Persisting daily summary is not implemented");
+
+        return true;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutGpsParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutGpsParser.java
new file mode 100644
index 000000000..1a4ef530c
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutGpsParser.java
@@ -0,0 +1,159 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl;
+
+import android.widget.Toast;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.Date;
+
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.database.DBHandler;
+import nodomain.freeyourgadget.gadgetbridge.database.DBHelper;
+import nodomain.freeyourgadget.gadgetbridge.entities.BaseActivitySummary;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.entities.Device;
+import nodomain.freeyourgadget.gadgetbridge.entities.User;
+import nodomain.freeyourgadget.gadgetbridge.export.ActivityTrackExporter;
+import nodomain.freeyourgadget.gadgetbridge.export.GPXExporter;
+import nodomain.freeyourgadget.gadgetbridge.model.ActivityKind;
+import nodomain.freeyourgadget.gadgetbridge.model.ActivityPoint;
+import nodomain.freeyourgadget.gadgetbridge.model.ActivityTrack;
+import nodomain.freeyourgadget.gadgetbridge.model.GPSCoordinate;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.XiaomiActivityFileId;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.XiaomiActivityParser;
+import nodomain.freeyourgadget.gadgetbridge.util.DateTimeUtils;
+import nodomain.freeyourgadget.gadgetbridge.util.FileUtils;
+import nodomain.freeyourgadget.gadgetbridge.util.GB;
+
+public class WorkoutGpsParser extends XiaomiActivityParser {
+    private static final Logger LOG = LoggerFactory.getLogger(WorkoutGpsParser.class);
+
+    @Override
+    public boolean parse(final XiaomiSupport support, final XiaomiActivityFileId fileId, final byte[] bytes) {
+        final int version = fileId.getVersion();
+        final int headerSize;
+        final int sampleSize;
+        switch (version) {
+            case 1:
+            case 2:
+                headerSize = 1;
+                sampleSize = 18;
+                break;
+            default:
+                LOG.warn("Unable to parse workout gps version {}", fileId.getVersion());
+                return false;
+        }
+
+        final ByteBuffer buf = ByteBuffer.wrap(bytes).order(ByteOrder.LITTLE_ENDIAN);
+        final byte[] header = new byte[headerSize];
+        buf.get(header);
+
+        LOG.debug("Workout gps Header: {}", GB.hexdump(header));
+
+        if ((buf.limit() - buf.position()) % sampleSize != 0) {
+            LOG.warn("Remaining data in the buffer is not a multiple of {}", sampleSize);
+            return false;
+        }
+
+        final ActivityTrack activityTrack = new ActivityTrack();
+
+        while (buf.position() < buf.limit()) {
+            final int ts = buf.getInt();
+            final float longitude = buf.getFloat();
+            final float latitude = buf.getFloat();
+            final int unk1 = buf.getInt(); // 0
+            final float speed = (buf.getShort() >> 2) / 10.0f;
+
+            final ActivityPoint ap = new ActivityPoint(new Date(ts * 1000L));
+            ap.setLocation(new GPSCoordinate(longitude, latitude, 0));
+            activityTrack.addTrackPoint(ap);
+
+            LOG.trace("ActivityPoint: ts={} lon={} lat={} unk1={} speed={}", ts, longitude, latitude, unk1, speed);
+        }
+
+        try (DBHandler dbHandler = GBApplication.acquireDB()) {
+            final DaoSession session = dbHandler.getDaoSession();
+            final Device device = DBHelper.getDevice(support.getDevice(), session);
+            final User user = DBHelper.getUser(session);
+
+            // Find the matching summary
+            final BaseActivitySummary summary = findOrCreateBaseActivitySummary(session, device, user, fileId);
+
+            // Set the info on the activity track
+            activityTrack.setUser(user);
+            activityTrack.setDevice(device);
+            activityTrack.setName(ActivityKind.asString(summary.getActivityKind(), support.getContext()));
+
+            // Save the raw bytes
+            final String rawBytesPath = saveRawBytes(fileId, bytes);
+
+            // Save the gpx file
+            final GPXExporter exporter = new GPXExporter();
+            exporter.setCreator(GBApplication.app().getNameAndVersion());
+
+            final String gpxFileName = FileUtils.makeValidFileName("gadgetbridge-" + DateTimeUtils.formatIso8601(fileId.getTimestamp()) + ".gpx");
+            final File gpxTargetFile = new File(FileUtils.getExternalFilesDir(), gpxFileName);
+
+            boolean exportGpxSuccess = true;
+            try {
+                exporter.performExport(activityTrack, gpxTargetFile);
+            } catch (final ActivityTrackExporter.GPXTrackEmptyException ex) {
+                exportGpxSuccess = false;
+                GB.toast(support.getContext(), "This activity does not contain GPX tracks.", Toast.LENGTH_LONG, GB.ERROR, ex);
+            }
+
+            if (exportGpxSuccess) {
+                summary.setGpxTrack(gpxTargetFile.getAbsolutePath());
+            }
+            if (rawBytesPath != null) {
+                summary.setRawDetailsPath(rawBytesPath);
+            }
+            session.getBaseActivitySummaryDao().insertOrReplace(summary);
+        } catch (final Exception e) {
+            GB.toast(support.getContext(), "Error saving workout gps", Toast.LENGTH_LONG, GB.ERROR, e);
+            return false;
+        }
+
+        return true;
+    }
+
+    private String saveRawBytes(final XiaomiActivityFileId fileId, final byte[] bytes) {
+        try {
+            final File targetFolder = new File(FileUtils.getExternalFilesDir(), "rawDetails");
+            targetFolder.mkdirs();
+            final File targetFile = new File(targetFolder, fileId.getFilename());
+            FileOutputStream outputStream = new FileOutputStream(targetFile);
+            outputStream.write(fileId.toBytes());
+            outputStream.write(bytes);
+            outputStream.close();
+            return targetFile.getAbsolutePath();
+        } catch (final IOException e) {
+            LOG.error("Failed to save raw bytes", e);
+        }
+
+        return null;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java
index 6b9dff69d..afd3ccd1a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java
@@ -71,9 +71,14 @@ public class WorkoutSummaryParser extends XiaomiActivityParser implements Activi
             final DaoSession session = dbHandler.getDaoSession();
             final Device device = DBHelper.getDevice(support.getDevice(), session);
             final User user = DBHelper.getUser(session);
-            summary.setDevice(device);
-            summary.setUser(user);
-            session.getBaseActivitySummaryDao().insertOrReplace(summary);
+
+            final BaseActivitySummary existingSummary = findOrCreateBaseActivitySummary(session, device, user, fileId);
+            existingSummary.setEndTime(summary.getEndTime());
+            existingSummary.setActivityKind(summary.getActivityKind());
+            existingSummary.setRawSummaryData(summary.getRawSummaryData());
+            existingSummary.setSummaryData(null);  // remove json before saving to database
+
+            session.getBaseActivitySummaryDao().insertOrReplace(existingSummary);
         } catch (final Exception e) {
             GB.toast(support.getContext(), "Error saving activity summary", Toast.LENGTH_LONG, GB.ERROR, e);
             return false;
@@ -117,7 +122,9 @@ public class WorkoutSummaryParser extends XiaomiActivityParser implements Activi
         final int startTime = buf.getInt();
         final int endTime = buf.getInt();
 
-        summary.setStartTime(new Date(startTime * 1000L));
+        // We don't set the start time, since we need it to match the fileId for the WorkoutGpsParser
+        // to find it. They also seem to match.
+        //summary.setStartTime(new Date(startTime * 1000L));
         summary.setEndTime(new Date(endTime * 1000L));
 
         final int duration = buf.getInt();
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
index fb5c20cc5..2399df131 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
@@ -29,9 +29,11 @@ import org.slf4j.LoggerFactory;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
+import java.util.List;
 import java.util.Locale;
 
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
@@ -775,12 +777,14 @@ public class XiaomiHealthService extends AbstractXiaomiService {
         LOG.debug("Got {} activity file IDs", recordIds.length / 7);
 
         final ByteBuffer buf = ByteBuffer.wrap(recordIds).order(ByteOrder.LITTLE_ENDIAN);
+        final List<XiaomiActivityFileId> fileIds = new ArrayList<>();
 
         while (buf.position() < buf.limit()) {
             final XiaomiActivityFileId fileId = XiaomiActivityFileId.from(buf);
             LOG.debug("Got activity to fetch: {}", fileId);
-            activityFetcher.fetch(fileId);
+            fileIds.add(fileId);
         }
+        activityFetcher.fetch(fileIds);
 
         if (subtype == CMD_ACTIVITY_FETCH_TODAY) {
             LOG.debug("Fetch recorded data from the past");

From 2d89fdf11b664271fb2f019127939cc4fcd5a002 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Tue, 12 Dec 2023 18:45:44 +0000
Subject: [PATCH 243/595] Xiaomi: Fix widget set on some devices

---
 .../gadgetbridge/devices/xiaomi/XiaomiWidgetManager.java        | 2 ++
 app/src/main/proto/xiaomi.proto                                 | 1 +
 2 files changed, 3 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiWidgetManager.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiWidgetManager.java
index f0d87862c..c5b821c1d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiWidgetManager.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiWidgetManager.java
@@ -290,6 +290,8 @@ public class XiaomiWidgetManager implements WidgetManager {
             }
         }
 
+        builder.setIsFullList(1);
+
         getPrefs().getPreferences().edit()
                 .putString(XiaomiPreferences.PREF_WIDGET_SCREENS, GB.hexdump(builder.build().toByteArray()))
                 .apply();
diff --git a/app/src/main/proto/xiaomi.proto b/app/src/main/proto/xiaomi.proto
index 9bf2ef411..d575516ae 100644
--- a/app/src/main/proto/xiaomi.proto
+++ b/app/src/main/proto/xiaomi.proto
@@ -4,6 +4,7 @@ package xiaomi;
 
 // FIXME: The generated class is very large, so Android Studio stops recognizing it
 // set idea.max.intellisense.filesize=5000 in idea.properties
+// by clicking Help -> Edit Custom Properties
 
 option java_package = "nodomain.freeyourgadget.gadgetbridge.proto.xiaomi";
 option java_outer_classname = "XiaomiProto";

From bddec00de11fceea37aef9da66b036c94eebfd61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Tue, 12 Dec 2023 20:26:55 +0000
Subject: [PATCH 244/595] Xiaomi: Persist daily summary

---
 .../gadgetbridge/daogen/GBDaoGenerator.java   | 34 +++++++-
 .../activity/impl/DailySummaryParser.java     | 82 +++++++++++++------
 2 files changed, 90 insertions(+), 26 deletions(-)

diff --git a/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java b/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java
index 4b457d9e5..68d4846cb 100644
--- a/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java
+++ b/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java
@@ -45,7 +45,7 @@ public class GBDaoGenerator {
 
 
     public static void main(String[] args) throws Exception {
-        final Schema schema = new Schema(64, MAIN_PACKAGE + ".entities");
+        final Schema schema = new Schema(65, MAIN_PACKAGE + ".entities");
 
         Entity userAttributes = addUserAttributes(schema);
         Entity user = addUserInfo(schema, userAttributes);
@@ -72,6 +72,7 @@ public class GBDaoGenerator {
         addHuamiSleepRespiratoryRateSample(schema, user, device);
         addXiaomiActivitySample(schema, user, device);
         addXiaomiSleepTimeSamples(schema, user, device);
+        addXiaomiDailySummarySamples(schema, user, device);
         addPebbleHealthActivitySample(schema, user, device);
         addPebbleHealthActivityKindOverlay(schema, user, device);
         addPebbleMisfitActivitySample(schema, user, device);
@@ -347,6 +348,37 @@ public class GBDaoGenerator {
         return sample;
     }
 
+    private static Entity addXiaomiDailySummarySamples(Schema schema, Entity user, Entity device) {
+        Entity sample = addEntity(schema, "XiaomiDailySummarySample");
+        addCommonTimeSampleProperties("AbstractTimeSample", sample, user, device);
+        sample.addIntProperty("timezone");
+        sample.addIntProperty("steps");
+        sample.addIntProperty("hrResting");
+        sample.addIntProperty("hrMax");
+        sample.addIntProperty("hrMaxTs");
+        sample.addIntProperty("hrMin");
+        sample.addIntProperty("hrMinTs");
+        sample.addIntProperty("hrAvg");
+        sample.addIntProperty("stressAvg");
+        sample.addIntProperty("stressMax");
+        sample.addIntProperty("stressMin");
+        sample.addIntProperty("standing");
+        sample.addIntProperty("calories");
+        sample.addIntProperty("spo2Max");
+        sample.addIntProperty("spo2MaxTs");
+        sample.addIntProperty("spo2Min");
+        sample.addIntProperty("spo2MinTs");
+        sample.addIntProperty("spo2Avg");
+        sample.addIntProperty("trainingLoadDay");
+        sample.addIntProperty("trainingLoadWeek");
+        sample.addIntProperty("trainingLoadLevel");
+        sample.addIntProperty("vitalityIncreaseLight");
+        sample.addIntProperty("vitalityIncreaseModerate");
+        sample.addIntProperty("vitalityIncreaseHigh");
+        sample.addIntProperty("vitalityCurrent");
+        return sample;
+    }
+
     private static void addHeartRateProperties(Entity activitySample) {
         activitySample.addIntProperty(SAMPLE_HEART_RATE).notNull().codeBeforeGetterAndSetter(OVERRIDE);
     }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/DailySummaryParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/DailySummaryParser.java
index 786fb23a0..16a069889 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/DailySummaryParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/DailySummaryParser.java
@@ -16,12 +16,21 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl;
 
+import android.widget.Toast;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.database.DBHandler;
+import nodomain.freeyourgadget.gadgetbridge.database.DBHelper;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiDailySummarySampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.entities.XiaomiDailySummarySample;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.XiaomiActivityFileId;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.XiaomiActivityParser;
@@ -49,39 +58,62 @@ public class DailySummaryParser extends XiaomiActivityParser {
 
         LOG.debug("Header: {}", GB.hexdump(header));
 
-        final int steps = buf.getInt();
+        final XiaomiDailySummarySample sample = new XiaomiDailySummarySample();
+        sample.setTimestamp(fileId.getTimestamp().getTime());
+        sample.setTimezone(fileId.getTimezone());
+
+        sample.setSteps(buf.getInt());
         final int unk1 = buf.get() & 0xff; // 0
         final int unk2 = buf.get() & 0xff; // 0
         final int unk3 = buf.get() & 0xff; // 0
-        final int hrResting = buf.get() & 0xff;
-        final int hrMax = buf.get() & 0xff;
-        final int hrMaxTs = buf.getInt();
-        final int hrMin = buf.get() & 0xff;
-        final int hrMinTs = buf.getInt();
-        final int hrAvg = buf.get() & 0xff;
-        final int stressAvg = buf.get() & 0xff;
-        final int stressMax = buf.get() & 0xff;
-        final int stressMin = buf.get() & 0xff;
-        final int unk4 = buf.get() & 0xff; // 0
-        final int unk5 = buf.get() & 0xff; // 0
-        final int unk6 = buf.get() & 0xff; // 0
-        final int calories = buf.getShort();
+        sample.setHrResting(buf.get() & 0xff);
+        sample.setHrMax(buf.get() & 0xff);
+        sample.setHrMaxTs(buf.getInt());
+        sample.setHrMin(buf.get() & 0xff);
+        sample.setHrMinTs(buf.getInt());
+        sample.setHrAvg(buf.get() & 0xff);
+        sample.setStressAvg(buf.get() & 0xff);
+        sample.setStressMax(buf.get() & 0xff);
+        sample.setStressMin(buf.get() & 0xff);
+        final byte[] standingArr = new byte[3];
+        buf.get(standingArr);
+        // each bit represents one hour where the user was standing up for that day,
+        // starting at 00:00-01:00. Let's convert it to an int
+        int standing = (standingArr[0] | (standingArr[1] << 8) | (standingArr[2] << 16)) & 0x00FFFFFF;
+        sample.setStanding(standing);
+        sample.setCalories((int) buf.getShort());
         final int unk7 = buf.get() & 0xff; // 0
         final int unk8 = buf.get() & 0xff; // 0
         final int unk9 = buf.get() & 0xff; // 0
-        final int spo2Max = buf.get() & 0xff;
-        final int spo2MaxTs = buf.getInt();
-        final int spo2Min = buf.get() & 0xff;
-        final int spo2MinTs = buf.getInt();
-        final int spo2Avg = buf.get() & 0xff;
-        final int trainingLoadMaybe1 = buf.getShort();
-        final int trainingLoadMaybe2 = buf.getShort();
-        final int trainingLoadMaybe3 = buf.get() & 0xff;
+        sample.setSpo2Max(buf.get() & 0xff);
+        sample.setSpo2MaxTs(buf.getInt());
+        sample.setSpo2Min(buf.get() & 0xff);
+        sample.setSpo2MinTs(buf.getInt());
+        sample.setSpo2Avg(buf.get() & 0xff);
+        sample.setTrainingLoadDay((int) buf.getShort());
+        sample.setTrainingLoadWeek((int) buf.getShort());
+        sample.setTrainingLoadLevel(buf.get() & 0xff); // TODO confirm - 1 for low training load level?
+        sample.setVitalityIncreaseLight(buf.get() & 0xff);
+        sample.setVitalityIncreaseModerate(buf.get() & 0xff);
+        sample.setVitalityIncreaseHigh(buf.get() & 0xff);
+        sample.setVitalityCurrent((int) buf.getShort());
 
-        // TODO vitality somewhere?
-        // TODO persist everything
+        LOG.debug("Persisting 1 daily summary sample");
 
-        LOG.warn("Persisting daily summary is not implemented");
+        try (DBHandler handler = GBApplication.acquireDB()) {
+            final DaoSession session = handler.getDaoSession();
+            final GBDevice device = support.getDevice();
+
+            sample.setDevice(DBHelper.getDevice(device, session));
+            sample.setUser(DBHelper.getUser(session));
+
+            final XiaomiDailySummarySampleProvider sampleProvider = new XiaomiDailySummarySampleProvider(device, session);
+            sampleProvider.addSample(sample);
+        } catch (final Exception e) {
+            GB.toast(support.getContext(), "Error saving daily summary", Toast.LENGTH_LONG, GB.ERROR);
+            LOG.error("Error saving daily summary", e);
+            return false;
+        }
 
         return true;
     }

From 372cf563ea9c2e9b4af4c00b5da9222ef21fabfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Tue, 12 Dec 2023 20:27:15 +0000
Subject: [PATCH 245/595] Xiaomi: Add Vitality Score (PAI-like metric)

---
 .../charts/ActivityChartsActivity.java        |   2 +-
 .../activities/charts/PaiChartFragment.java   |   7 +-
 .../DeviceSpecificSettingsFragment.java       |  14 ++
 .../devices/AbstractDeviceCoordinator.java    |  10 ++
 .../devices/DeviceCoordinator.java            |  12 ++
 .../devices/xiaomi/XiaomiCoordinator.java     |  17 ++-
 .../XiaomiDailySummarySampleProvider.java     |  56 +++++++
 .../xiaomi/XiaomiPaiSampleProvider.java       | 144 ++++++++++++++++++
 app/src/main/res/values/strings.xml           |   4 +-
 9 files changed, 258 insertions(+), 8 deletions(-)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiDailySummarySampleProvider.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiPaiSampleProvider.java

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityChartsActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityChartsActivity.java
index d3d818bd7..3f82d9133 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityChartsActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityChartsActivity.java
@@ -172,7 +172,7 @@ public class ActivityChartsActivity extends AbstractChartsActivity {
                 case "stress":
                     return getString(R.string.menuitem_stress);
                 case "pai":
-                    return getString(R.string.menuitem_pai);
+                    return getString(getDevice().getDeviceCoordinator().getPaiName());
                 case "stepsweek":
                     return getStepsTitle();
                 case "speedzones":
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/PaiChartFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/PaiChartFragment.java
index ece6f2817..71a58c2cd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/PaiChartFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/PaiChartFragment.java
@@ -58,7 +58,6 @@ import nodomain.freeyourgadget.gadgetbridge.devices.TimeSampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.model.PaiSample;
 import nodomain.freeyourgadget.gadgetbridge.util.DateTimeUtils;
-import nodomain.freeyourgadget.gadgetbridge.util.DeviceHelper;
 import nodomain.freeyourgadget.gadgetbridge.util.Optional;
 
 public class PaiChartFragment extends AbstractChartFragment<PaiChartFragment.PaiChartsData> {
@@ -118,6 +117,12 @@ public class PaiChartFragment extends AbstractChartFragment<PaiChartFragment.Pai
         mLineHighInc = rootView.findViewById(R.id.pai_line_high_inc);
         mLineHighTime = rootView.findViewById(R.id.pai_line_high_time);
 
+        if (!getChartsHost().getDevice().getDeviceCoordinator().supportsPaiTime()) {
+            mLineLowTime.setVisibility(View.GONE);
+            mLineModerateTime.setVisibility(View.GONE);
+            mLineHighTime.setVisibility(View.GONE);
+        }
+
         setupWeekChart();
         setupTodayPieChart();
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
index 85ac8ae3e..9e28287c5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
@@ -956,6 +956,20 @@ public class DeviceSpecificSettingsFragment extends AbstractPreferenceFragment i
             }
         }
 
+        // Replace the PAI with the device-specific name
+        if (chartsTabsOrderSelection != null) {
+            final ListPreference chartsTabsListPref = (ListPreference) chartsTabsOrderSelection;
+            final CharSequence[] entries = chartsTabsListPref.getEntries();
+            final CharSequence[] entryValues = chartsTabsListPref.getEntryValues();
+            for (int i = 0; i < entries.length; i++) {
+                if ("pai".equals(entryValues[i].toString())) {
+                    entries[i] = getString(coordinator.getPaiName());
+                    break;
+                }
+            }
+            chartsTabsListPref.setEntries(entries);
+        }
+
         final Preference loyaltyCards = findPreference(LoyaltyCardsSettingsConst.PREF_KEY_LOYALTY_CARDS);
         if (loyaltyCards != null) {
             loyaltyCards.setOnPreferenceClickListener(preference -> {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java
index 66ca3dfb2..0e6f3e411 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java
@@ -398,6 +398,16 @@ public abstract class AbstractDeviceCoordinator implements DeviceCoordinator {
         return false;
     }
 
+    @Override
+    public int getPaiName() {
+        return R.string.menuitem_pai;
+    }
+
+    @Override
+    public boolean supportsPaiTime() {
+        return supportsPai();
+    }
+
     @Override
     public boolean supportsSleepRespiratoryRate() {
         return false;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java
index d39090e32..1e7b31548 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java
@@ -209,6 +209,18 @@ public interface DeviceCoordinator {
      */
     boolean supportsPai();
 
+    /**
+     * Returns the device-specific name for PAI (eg. Vitality Score).
+     */
+    @StringRes
+    int getPaiName();
+
+    /**
+     * Returns true if the device is capable of providing the time contribution for each PAI type
+     * (light, moderate, high).
+     */
+    boolean supportsPaiTime();
+
     /**
      * Returns true if sleep respiratory rate measurement and fetching is supported by
      * the device (with this coordinator).
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
index d5dc940a2..70b4db328 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
@@ -140,8 +140,7 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
 
     @Override
     public TimeSampleProvider<? extends PaiSample> getPaiSampleProvider(final GBDevice device, final DaoSession session) {
-        // TODO XiaomiPaiSampleProvider
-        return super.getPaiSampleProvider(device, session);
+        return new XiaomiPaiSampleProvider(device, session);
     }
 
     @Override
@@ -245,13 +244,23 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
 
     @Override
     public boolean supportsHeartRateStats() {
-        // TODO it does - see DailySummaryParser
+        // TODO it does, and they're persisted - see DailySummaryParser
         return false;
     }
 
     @Override
     public boolean supportsPai() {
-        // TODO it does - vitality score
+        // Vitality Score
+        return true;
+    }
+
+    @Override
+    public int getPaiName() {
+        return R.string.pref_vitality_score_title;
+    }
+
+    @Override
+    public boolean supportsPaiTime() {
         return false;
     }
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiDailySummarySampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiDailySummarySampleProvider.java
new file mode 100644
index 000000000..7543694d8
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiDailySummarySampleProvider.java
@@ -0,0 +1,56 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi;
+
+import androidx.annotation.NonNull;
+
+import de.greenrobot.dao.AbstractDao;
+import de.greenrobot.dao.Property;
+import nodomain.freeyourgadget.gadgetbridge.devices.AbstractTimeSampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.entities.XiaomiDailySummarySample;
+import nodomain.freeyourgadget.gadgetbridge.entities.XiaomiDailySummarySampleDao;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+
+public class XiaomiDailySummarySampleProvider extends AbstractTimeSampleProvider<XiaomiDailySummarySample> {
+    public XiaomiDailySummarySampleProvider(final GBDevice device, final DaoSession session) {
+        super(device, session);
+    }
+
+    @NonNull
+    @Override
+    public AbstractDao<XiaomiDailySummarySample, ?> getSampleDao() {
+        return getSession().getXiaomiDailySummarySampleDao();
+    }
+
+    @NonNull
+    @Override
+    protected Property getTimestampSampleProperty() {
+        return XiaomiDailySummarySampleDao.Properties.Timestamp;
+    }
+
+    @NonNull
+    @Override
+    protected Property getDeviceIdentifierSampleProperty() {
+        return XiaomiDailySummarySampleDao.Properties.DeviceId;
+    }
+
+    @Override
+    public XiaomiDailySummarySample createSample() {
+        return new XiaomiDailySummarySample();
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiPaiSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiPaiSampleProvider.java
new file mode 100644
index 000000000..037598948
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiPaiSampleProvider.java
@@ -0,0 +1,144 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.TimeSampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.entities.XiaomiDailySummarySample;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.model.PaiSample;
+
+public class XiaomiPaiSampleProvider implements TimeSampleProvider<PaiSample> {
+    private final XiaomiDailySummarySampleProvider dailySummarySampleProvider;
+
+    public XiaomiPaiSampleProvider(final GBDevice device, final DaoSession session) {
+        this.dailySummarySampleProvider = new XiaomiDailySummarySampleProvider(device, session);
+    }
+
+    @NonNull
+    @Override
+    public List<PaiSample> getAllSamples(final long timestampFrom, final long timestampTo) {
+        final List<XiaomiDailySummarySample> allSamples = dailySummarySampleProvider.getAllSamples(timestampFrom, timestampTo);
+        final List<PaiSample> ret = new ArrayList<>(allSamples.size());
+        for (final XiaomiDailySummarySample sample : allSamples) {
+            ret.add(new XiaomiPaiSample(sample));
+        }
+        return ret;
+    }
+
+    @Override
+    public void addSample(final PaiSample timeSample) {
+        throw new UnsupportedOperationException("This sample provider is read-only!");
+    }
+
+    @Override
+    public void addSamples(final List<PaiSample> timeSamples) {
+        throw new UnsupportedOperationException("This sample provider is read-only!");
+    }
+
+    @Override
+    public PaiSample createSample() {
+        throw new UnsupportedOperationException("This sample provider is read-only!");
+    }
+
+    @Nullable
+    @Override
+    public PaiSample getLatestSample() {
+        final XiaomiDailySummarySample sample = dailySummarySampleProvider.getLatestSample();
+        if (sample != null) {
+            return new XiaomiPaiSample(sample);
+        }
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public PaiSample getFirstSample() {
+        final XiaomiDailySummarySample sample = dailySummarySampleProvider.getFirstSample();
+        if (sample != null) {
+            return new XiaomiPaiSample(sample);
+        }
+        return null;
+    }
+
+    public static class XiaomiPaiSample implements PaiSample {
+        private final long timestamp;
+        private final int paiLow;
+        private final int paiModerate;
+        private final int paiHigh;
+        private final int paiTotal;
+
+        public XiaomiPaiSample(final XiaomiDailySummarySample sample) {
+            this.timestamp = sample.getTimestamp();
+            this.paiLow = sample.getVitalityIncreaseLight();
+            this.paiModerate = sample.getVitalityIncreaseModerate();
+            this.paiHigh = sample.getVitalityIncreaseHigh();
+            this.paiTotal = sample.getVitalityCurrent();
+        }
+
+        @Override
+        public long getTimestamp() {
+            return timestamp;
+        }
+
+        @Override
+        public float getPaiLow() {
+            return paiLow;
+        }
+
+        @Override
+        public float getPaiModerate() {
+            return paiModerate;
+        }
+
+        @Override
+        public float getPaiHigh() {
+            return paiHigh;
+        }
+
+        @Override
+        public int getTimeLow() {
+            return 0; // not supported
+        }
+
+        @Override
+        public int getTimeModerate() {
+            return 0; // not supported
+        }
+
+        @Override
+        public int getTimeHigh() {
+            return 0; // not supported
+        }
+
+        @Override
+        public float getPaiToday() {
+            return paiLow + paiModerate + paiHigh;
+        }
+
+        @Override
+        public float getPaiTotal() {
+            return paiTotal;
+        }
+    }
+}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d6862b3e2..31c2ebd81 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2043,8 +2043,8 @@
     <string name="stress_mild">Mild</string>
     <string name="stress_moderate">Moderate</string>
     <string name="stress_high">High</string>
-    <string name="pai_total">PAI Total</string>
-    <string name="pai_day">Day PAI increase</string>
+    <string name="pai_total">Total</string>
+    <string name="pai_day">Day increase</string>
     <string name="sony_ambient_sound">Mode</string>
     <string name="sony_ambient_sound_off">Off</string>
     <string name="sony_ambient_sound_noise_cancelling">Noise Cancelling</string>

From cb3e10f07ab29bbbd44a2ae8be02ac5b21637778 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Tue, 12 Dec 2023 20:46:59 +0000
Subject: [PATCH 246/595] Xiaomi: Update stress ranges to match watch

---
 .../charts/StressChartFragment.java           | 19 ++++++------
 .../devices/AbstractDeviceCoordinator.java    | 29 ++++++++++++++-----
 .../devices/DeviceCoordinator.java            |  5 ++++
 .../devices/xiaomi/XiaomiCoordinator.java     |  9 ++++++
 .../gadgetbridge/model/StressSample.java      |  6 +---
 5 files changed, 46 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/StressChartFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/StressChartFragment.java
index 2e493302f..2e42cf9e1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/StressChartFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/StressChartFragment.java
@@ -59,7 +59,6 @@ import nodomain.freeyourgadget.gadgetbridge.devices.TimeSampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.model.StressSample;
 import nodomain.freeyourgadget.gadgetbridge.util.DateTimeUtils;
-import nodomain.freeyourgadget.gadgetbridge.util.DeviceHelper;
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 
 public class StressChartFragment extends AbstractChartFragment<StressChartFragment.StressChartsData> {
@@ -97,7 +96,7 @@ public class StressChartFragment extends AbstractChartFragment<StressChartFragme
 
         ensureStartAndEndSamples((List<StressSample>) samples);
 
-        return new StressChartsDataBuilder(samples).build();
+        return new StressChartsDataBuilder(samples, device.getDeviceCoordinator().getStressRanges()).build();
     }
 
     protected LineDataSet createDataSet(final StressType stressType, final List<Entry> values) {
@@ -281,6 +280,7 @@ public class StressChartFragment extends AbstractChartFragment<StressChartFragme
         private static final int UNKNOWN_VAL = 2;
 
         private final List<? extends StressSample> samples;
+        private final int[] stressRanges;
 
         private final TimestampTranslation tsTranslation = new TimestampTranslation();
 
@@ -293,8 +293,9 @@ public class StressChartFragment extends AbstractChartFragment<StressChartFragme
         long averageSum;
         long averageNumSamples;
 
-        public StressChartsDataBuilder(final List<? extends StressSample> samples) {
+        public StressChartsDataBuilder(final List<? extends StressSample> samples, final int[] stressRanges) {
             this.samples = samples;
+            this.stressRanges = stressRanges;
         }
 
         private void reset() {
@@ -326,7 +327,7 @@ public class StressChartFragment extends AbstractChartFragment<StressChartFragme
         private void processSample(final StressSample sample) {
             //LOG.debug("Processing sample {} {}", sdf.format(new Date(sample.getTimestamp())), sample.getStress());
 
-            final StressType stressType = StressType.fromStress(sample.getStress());
+            final StressType stressType = StressType.fromStress(sample.getStress(), stressRanges);
             final int ts = tsTranslation.shorten((int) (sample.getTimestamp() / 1000L));
 
             if (ts == 0) {
@@ -460,14 +461,14 @@ public class StressChartFragment extends AbstractChartFragment<StressChartFragme
             return ContextCompat.getColor(context, colorId);
         }
 
-        public static StressType fromStress(final int stress) {
-            if (stress < 0) {
+        public static StressType fromStress(final int stress, final int[] stressRanges) {
+            if (stress < stressRanges[0]) {
                 return StressType.UNKNOWN;
-            } else if (stress < 40) {
+            } else if (stress < stressRanges[1]) {
                 return StressType.RELAXED;
-            } else if (stress < 60) {
+            } else if (stress < stressRanges[2]) {
                 return StressType.MILD;
-            } else if (stress < 80) {
+            } else if (stress < stressRanges[3]) {
                 return StressType.MODERATE;
             } else {
                 return StressType.HIGH;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java
index 0e6f3e411..d412a1717 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java
@@ -80,6 +80,7 @@ public abstract class AbstractDeviceCoordinator implements DeviceCoordinator {
     private static final Logger LOG = LoggerFactory.getLogger(AbstractDeviceCoordinator.class);
 
     private Pattern supportedDeviceName = null;
+
     /**
      * This method should return a ReGexp pattern that will matched against a found device
      * to check whether this coordinator supports that device.
@@ -87,17 +88,17 @@ public abstract class AbstractDeviceCoordinator implements DeviceCoordinator {
      * should be overridden.
      *
      * @return Pattern
-     * */
-    protected Pattern getSupportedDeviceName(){
+     */
+    protected Pattern getSupportedDeviceName() {
         return null;
     }
 
     @Override
     public boolean supports(GBDeviceCandidate candidate) {
-        if(supportedDeviceName == null){
+        if (supportedDeviceName == null) {
             supportedDeviceName = getSupportedDeviceName();
         }
-        if(supportedDeviceName == null){
+        if (supportedDeviceName == null) {
             throw new RuntimeException(getClass() + " should either override getSupportedDeviceName or supports(GBDeviceCandidate)");
         }
 
@@ -192,6 +193,15 @@ public abstract class AbstractDeviceCoordinator implements DeviceCoordinator {
         return null;
     }
 
+    @Override
+    public int[] getStressRanges() {
+        // 0-39 = relaxed
+        // 40-59 = mild
+        // 60-79 = moderate
+        // 80-100 = high
+        return new int[]{0, 40, 60, 80};
+    }
+
     @Override
     public TimeSampleProvider<? extends TemperatureSample> getTemperatureSampleProvider(GBDevice device, DaoSession session) {
         return null;
@@ -282,7 +292,9 @@ public abstract class AbstractDeviceCoordinator implements DeviceCoordinator {
     }
 
     @Override
-    public boolean supportsFlashing() { return false; }
+    public boolean supportsFlashing() {
+        return false;
+    }
 
     @Nullable
     @Override
@@ -519,15 +531,16 @@ public abstract class AbstractDeviceCoordinator implements DeviceCoordinator {
         int[] settings = new int[0];
         ConnectionType connectionType = getConnectionType();
 
-        if(connectionType.usesBluetoothLE()){
+        if (connectionType.usesBluetoothLE()) {
             settings = ArrayUtils.insert(0, settings, R.xml.devicesettings_reconnect_ble);
         }
-        if(connectionType.usesBluetoothClassic()){
+        if (connectionType.usesBluetoothClassic()) {
             settings = ArrayUtils.insert(0, settings, R.xml.devicesettings_reconnect_bl_classic);
         }
 
         return settings;
     }
+
     @Override
     public int[] getSupportedDeviceSpecificApplicationSettings() {
         return new int[0];
@@ -613,7 +626,7 @@ public abstract class AbstractDeviceCoordinator implements DeviceCoordinator {
     }
 
     @Override
-    public int getOrderPriority(){
+    public int getOrderPriority() {
         return 0;
     }
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java
index 1e7b31548..999523c29 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java
@@ -249,6 +249,11 @@ public interface DeviceCoordinator {
      */
     TimeSampleProvider<? extends StressSample> getStressSampleProvider(GBDevice device, DaoSession session);
 
+    /**
+     * Returns the stress ranges (relaxed, mild, moderate, high), so that stress can be categorized.
+     */
+    int[] getStressRanges();
+
     /**
      * Returns the sample provider for temperature data, for the device being supported.
      */
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
index 70b4db328..5881eaaf1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
@@ -115,6 +115,15 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
         return new XiaomiStressSampleProvider(device, session);
     }
 
+    @Override
+    public int[] getStressRanges() {
+        // 1-25 = relaxed
+        // 26-50 = mild
+        // 51-80 = moderate
+        // 81-100 = high
+        return new int[]{1, 26, 51, 81};
+    }
+
     @Override
     public TimeSampleProvider<? extends Spo2Sample> getSpo2SampleProvider(final GBDevice device, final DaoSession session) {
         return new XiaomiSpo2SampleProvider(device, session);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/StressSample.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/StressSample.java
index 6c6827984..a63197593 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/StressSample.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/StressSample.java
@@ -50,11 +50,7 @@ public interface StressSample extends TimeSample {
     Type getType();
 
     /**
-     * Returns the normalized stress value between 0 and 100:
-     * - 0-39 = relaxed
-     * - 40-59 = mild
-     * - 60-79 = moderate
-     * - 80-100 = high
+     * Returns the stress value between 0 and 100.
      */
     int getStress();
 }

From 1028d2c0cdffcdb9d12afa14fe16301460da467f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Tue, 12 Dec 2023 20:58:42 +0000
Subject: [PATCH 247/595] Xiaomi: Display widget id when names are repeated

---
 .../devices/xiaomi/XiaomiWidgetManager.java     | 17 +++++++++++++++++
 .../xiaomi/services/XiaomiSystemService.java    |  1 +
 .../layout/activity_widget_screen_details.xml   | 12 ++++++------
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiWidgetManager.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiWidgetManager.java
index c5b821c1d..e8d9ee0aa 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiWidgetManager.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiWidgetManager.java
@@ -29,6 +29,7 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Objects;
 import java.util.Set;
 
@@ -90,6 +91,9 @@ public class XiaomiWidgetManager implements WidgetManager {
 
         final XiaomiProto.WidgetParts rawWidgetParts = getRawWidgetParts();
 
+        final Set<String> seenNames = new HashSet<>();
+        final Set<String> duplicatedNames = new HashSet<>();
+
         for (final XiaomiProto.WidgetPart widgetPart : rawWidgetParts.getWidgetPartList()) {
             final WidgetType type = fromRawWidgetType(widgetPart.getType());
 
@@ -118,10 +122,23 @@ public class XiaomiWidgetManager implements WidgetManager {
                     }
                 }
 
+                if (seenNames.contains(newPart.getFullName())) {
+                    duplicatedNames.add(newPart.getFullName());
+                } else {
+                    seenNames.add(newPart.getFullName());
+                }
+
                 parts.add(newPart);
             }
         }
 
+        // Ensure that all names are unique
+        for (final WidgetPart part : parts) {
+            if (duplicatedNames.contains(part.getFullName())) {
+                part.setName(String.format(Locale.ROOT, "%s (%s)", part.getName(), part.getId()));
+            }
+        }
+
         return parts;
     }
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
index 9b88806f3..558bf9e22 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
@@ -833,6 +833,7 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
     }
 
     private void setWidgets() {
+        // Just take the persisted protobuf and send it (see above and XiaomiWidgetManager)
         final String hex = getDevicePrefs().getString(XiaomiPreferences.PREF_WIDGET_SCREENS, null);
         if (hex == null) {
             LOG.warn("raw widget screens hex is null");
diff --git a/app/src/main/res/layout/activity_widget_screen_details.xml b/app/src/main/res/layout/activity_widget_screen_details.xml
index 5b6929dfe..3d56ac590 100644
--- a/app/src/main/res/layout/activity_widget_screen_details.xml
+++ b/app/src/main/res/layout/activity_widget_screen_details.xml
@@ -41,7 +41,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="2dp"
                 android:text="2x1"
-                android:textAppearance="?android:attr/textAppearanceLarge"
+                android:textAppearance="?android:attr/textAppearanceMedium"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/label_layout" />
         </androidx.constraintlayout.widget.ConstraintLayout>
@@ -80,7 +80,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="2dp"
                 android:text="TOP LEFT"
-                android:textAppearance="?android:attr/textAppearanceLarge"
+                android:textAppearance="?android:attr/textAppearanceMedium"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/label_widget_top_left" />
         </androidx.constraintlayout.widget.ConstraintLayout>
@@ -119,7 +119,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="2dp"
                 android:text="TOP RIGHT"
-                android:textAppearance="?android:attr/textAppearanceLarge"
+                android:textAppearance="?android:attr/textAppearanceMedium"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/label_widget_top_right" />
         </androidx.constraintlayout.widget.ConstraintLayout>
@@ -158,7 +158,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="2dp"
                 android:text="CENTER"
-                android:textAppearance="?android:attr/textAppearanceLarge"
+                android:textAppearance="?android:attr/textAppearanceMedium"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/label_widget_center" />
         </androidx.constraintlayout.widget.ConstraintLayout>
@@ -197,7 +197,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="2dp"
                 android:text="BOT LEFT"
-                android:textAppearance="?android:attr/textAppearanceLarge"
+                android:textAppearance="?android:attr/textAppearanceMedium"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/label_widget_bottom_left" />
         </androidx.constraintlayout.widget.ConstraintLayout>
@@ -236,7 +236,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="2dp"
                 android:text="BOT RIGHT"
-                android:textAppearance="?android:attr/textAppearanceLarge"
+                android:textAppearance="?android:attr/textAppearanceMedium"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/label_widget_bottom_right" />
         </androidx.constraintlayout.widget.ConstraintLayout>

From 1c7289edfaaa3eec3cb8d233ef43f5cbaf526dc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Tue, 12 Dec 2023 21:27:50 +0000
Subject: [PATCH 248/595] Xiaomi: Fix secondary goal config

---
 .../devices/xiaomi/XiaomiCoordinator.java     |   2 +
 .../devices/xiaomi/XiaomiPreferences.java     |   1 +
 .../xiaomi/services/XiaomiHealthService.java  | 128 +++++++++++++-----
 app/src/main/proto/xiaomi.proto               |  22 ++-
 4 files changed, 117 insertions(+), 36 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
index 5881eaaf1..5ffea8ea8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
@@ -412,6 +412,8 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
         }
         if (supports(device, FEAT_GOAL_NOTIFICATION)) {
             settings.add(R.xml.devicesettings_goal_notification);
+        }
+        if (supports(device, FEAT_GOAL_SECONDARY)) {
             settings.add(R.xml.devicesettings_goal_secondary);
         }
         if (supports(device, FEAT_VITALITY_SCORE)) {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPreferences.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPreferences.java
index 0324716ce..2864ff879 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPreferences.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPreferences.java
@@ -50,6 +50,7 @@ public final class XiaomiPreferences {
     public static final String FEAT_INACTIVITY = "feat_inactivity";
     public static final String FEAT_SLEEP_MODE_SCHEDULE = "feat_sleep_mode_schedule";
     public static final String FEAT_GOAL_NOTIFICATION = "feat_goal_notification";
+    public static final String FEAT_GOAL_SECONDARY = "feat_goal_secondary";
     public static final String FEAT_VITALITY_SCORE = "feat_vitality_score";
     public static final String FEAT_SCREEN_ON_ON_NOTIFICATIONS = "feat_screen_on_on_notifications";
     public static final String FEAT_CAMERA_REMOTE = "feat_camera_remote";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
index 2399df131..1415afd47 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
@@ -33,8 +33,10 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Locale;
+import java.util.Set;
 
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
@@ -79,13 +81,15 @@ public class XiaomiHealthService extends AbstractXiaomiService {
     private static final int CMD_CONFIG_STANDING_REMINDER_SET = 13;
     private static final int CMD_CONFIG_STRESS_GET = 14;
     private static final int CMD_CONFIG_STRESS_SET = 15;
-    private static final int CMD_CONFIG_GOAL_GET = 21;
-    private static final int CMD_CONFIG_GOAL_SET = 22;
+    private static final int CMD_CONFIG_GOAL_NOTIFICATION_GET = 21;
+    private static final int CMD_CONFIG_GOAL_NOTIFICATION_SET = 22;
     private static final int CMD_WORKOUT_WATCH_STATUS = 26;
     private static final int CMD_WORKOUT_WATCH_OPEN = 30;
     private static final int CMD_CONFIG_VITALITY_SCORE_GET = 35;
     private static final int CMD_CONFIG_VITALITY_SCORE_SET = 36;
     private static final int CMD_WORKOUT_LOCATION = 48;
+    private static final int CMD_CONFIG_GOALS_GET = 42;
+    private static final int CMD_CONFIG_GOALS_SET = 43;
     private static final int CMD_REALTIME_STATS_START = 45;
     private static final int CMD_REALTIME_STATS_STOP = 46;
     private static final int CMD_REALTIME_STATS_EVENT = 47;
@@ -107,6 +111,14 @@ public class XiaomiHealthService extends AbstractXiaomiService {
     private boolean workoutStarted = false;
     private final Handler gpsTimeoutHandler = new Handler();
 
+    private final Set<Integer> currentGoals = new LinkedHashSet<>();
+    private final Set<Integer> supportedGoals = new LinkedHashSet<>();
+
+    private static final int GOAL_STEPS = 1; // TODO confirm
+    private static final int GOAL_CALORIES = 2; // TODO confirm
+    private static final int GOAL_MOVING_TIME = 3;
+    private static final int GOAL_STANDING_TIME = 4;
+
     private final XiaomiActivityFileFetcher activityFetcher = new XiaomiActivityFileFetcher(this);
 
     public XiaomiHealthService(final XiaomiSupport support) {
@@ -147,11 +159,17 @@ public class XiaomiHealthService extends AbstractXiaomiService {
             case CMD_CONFIG_STRESS_SET:
                 LOG.debug("Got stress set ack, status={}", cmd.getStatus());
                 return;
-            case CMD_CONFIG_GOAL_GET:
-                handleGoalConfig(cmd.getHealth().getAchievementReminders());
+            case CMD_CONFIG_GOAL_NOTIFICATION_GET:
+                handleGoalNotificationConfig(cmd.getHealth().getGoalNotification());
                 return;
-            case CMD_CONFIG_GOAL_SET:
-                LOG.debug("Got goal set ack, status={}", cmd.getStatus());
+            case CMD_CONFIG_GOAL_NOTIFICATION_SET:
+                LOG.debug("Got goal notification set ack, status={}", cmd.getStatus());
+                return;
+            case CMD_CONFIG_GOALS_GET:
+                handleGoalsConfig(cmd.getHealth().getGoalsConfig());
+                return;
+            case CMD_CONFIG_GOALS_SET:
+                LOG.debug("Got goals config set ack, status={}", cmd.getStatus());
                 return;
             case CMD_CONFIG_VITALITY_SCORE_GET:
                 handleVitalityScore(cmd.getHealth().getVitalityScore());
@@ -180,7 +198,8 @@ public class XiaomiHealthService extends AbstractXiaomiService {
         getSupport().sendCommand("get heart rate config", COMMAND_TYPE, CMD_CONFIG_HEART_RATE_GET);
         getSupport().sendCommand("get standing reminders config", COMMAND_TYPE, CMD_CONFIG_STANDING_REMINDER_GET);
         getSupport().sendCommand("get stress config", COMMAND_TYPE, CMD_CONFIG_STRESS_GET);
-        getSupport().sendCommand("get goal config", COMMAND_TYPE, CMD_CONFIG_GOAL_GET);
+        getSupport().sendCommand("get goal notification config", COMMAND_TYPE, CMD_CONFIG_GOAL_NOTIFICATION_GET);
+        getSupport().sendCommand("get goals config", COMMAND_TYPE, CMD_CONFIG_GOALS_GET);
         getSupport().sendCommand("get vitality score config", COMMAND_TYPE, CMD_CONFIG_VITALITY_SCORE_GET);
     }
 
@@ -198,8 +217,10 @@ public class XiaomiHealthService extends AbstractXiaomiService {
                 setUserInfo();
                 return true;
             case DeviceSettingsPreferenceConst.PREF_USER_FITNESS_GOAL_NOTIFICATION:
+                sendGoalNotificationConfig();
+                return true;
             case DeviceSettingsPreferenceConst.PREF_USER_FITNESS_GOAL_SECONDARY:
-                sendGoalConfig();
+                sendGoalsConfig();
                 return true;
             case DeviceSettingsPreferenceConst.PREF_VITALITY_SCORE_7_DAY:
             case DeviceSettingsPreferenceConst.PREF_VITALITY_SCORE_DAILY:
@@ -279,53 +300,94 @@ public class XiaomiHealthService extends AbstractXiaomiService {
         );
     }
 
-    private void handleGoalConfig(final XiaomiProto.AchievementReminders achievementReminders) {
-        LOG.debug("Got goal config");
-
-        final String secondaryValue;
-
-        switch (achievementReminders.getSuggested()) {
-            case 0:
-                secondaryValue = "active_time";
-                break;
-            case 1:
-            default:
-                secondaryValue = "standing_time";
-        }
+    private void handleGoalNotificationConfig(final XiaomiProto.GoalNotification goalNotification) {
+        LOG.debug("Got goal notification config");
 
         final GBDeviceEventUpdatePreferences eventUpdatePreferences = new GBDeviceEventUpdatePreferences()
                 .withPreference(XiaomiPreferences.FEAT_GOAL_NOTIFICATION, true)
-                .withPreference(DeviceSettingsPreferenceConst.PREF_USER_FITNESS_GOAL_NOTIFICATION, achievementReminders.getEnabled())
+                .withPreference(DeviceSettingsPreferenceConst.PREF_USER_FITNESS_GOAL_NOTIFICATION, goalNotification.getEnabled());
+
+        getSupport().evaluateGBDeviceEvent(eventUpdatePreferences);
+    }
+
+    public void sendGoalNotificationConfig() {
+        final boolean enabled = getDevicePrefs().getBoolean(DeviceSettingsPreferenceConst.PREF_USER_FITNESS_GOAL_NOTIFICATION, false);
+
+        LOG.debug("Setting goal notification enabled = {}", enabled);
+
+        final XiaomiProto.GoalNotification.Builder goalNotification = XiaomiProto.GoalNotification.newBuilder()
+                .setEnabled(enabled)
+                .setUnknown2(1);
+
+        final XiaomiProto.Health health = XiaomiProto.Health.newBuilder()
+                .setGoalNotification(goalNotification)
+                .build();
+
+        getSupport().sendCommand(
+                "set goal notification config",
+                XiaomiProto.Command.newBuilder()
+                        .setType(COMMAND_TYPE)
+                        .setSubtype(CMD_CONFIG_GOAL_NOTIFICATION_SET)
+                        .setHealth(health)
+                        .build()
+        );
+    }
+
+    private void handleGoalsConfig(final XiaomiProto.GoalsConfig goalsConfig) {
+        LOG.debug("Got goals config");
+
+        currentGoals.clear();
+        supportedGoals.clear();
+
+        for (final XiaomiProto.Goal goal : goalsConfig.getCurrentGoalsList()) {
+            currentGoals.add(goal.getId());
+        }
+        for (final XiaomiProto.Goal goal : goalsConfig.getSupportedGoalsList()) {
+            supportedGoals.add(goal.getId());
+        }
+
+        final boolean secondaryGoalSupported = supportedGoals.contains(GOAL_STANDING_TIME) || supportedGoals.contains(GOAL_MOVING_TIME);
+        final String secondaryValue = currentGoals.contains(GOAL_MOVING_TIME) ? "active_time" : "standing_time";
+
+        final GBDeviceEventUpdatePreferences eventUpdatePreferences = new GBDeviceEventUpdatePreferences()
+                .withPreference(XiaomiPreferences.FEAT_GOAL_SECONDARY, secondaryGoalSupported)
                 .withPreference(DeviceSettingsPreferenceConst.PREF_USER_FITNESS_GOAL_SECONDARY, secondaryValue);
 
         getSupport().evaluateGBDeviceEvent(eventUpdatePreferences);
     }
 
-    public void sendGoalConfig() {
-        final boolean goalNotification = getDevicePrefs().getBoolean(DeviceSettingsPreferenceConst.PREF_USER_FITNESS_GOAL_NOTIFICATION, false);
+    public void sendGoalsConfig() {
         final String goalSecondary = getDevicePrefs().getString(DeviceSettingsPreferenceConst.PREF_USER_FITNESS_GOAL_SECONDARY, "standing_time");
 
-        LOG.debug("Setting goal config, notification={}, secondary={}", goalNotification, goalSecondary);
+        LOG.debug("Setting goals config = {}", goalSecondary);
 
-        final XiaomiProto.AchievementReminders.Builder achievementReminders = XiaomiProto.AchievementReminders.newBuilder()
-                .setEnabled(goalNotification)
-                .setSuggested(1);
+        final XiaomiProto.GoalsConfig.Builder goalsConfig = XiaomiProto.GoalsConfig.newBuilder();
+
+        for (final Integer currentGoal : currentGoals) {
+            if (!currentGoal.equals(GOAL_STANDING_TIME) && !currentGoal.equals(GOAL_MOVING_TIME)) {
+                goalsConfig.addCurrentGoals(XiaomiProto.Goal.newBuilder().setId(currentGoal));
+            }
+        }
 
         if (goalSecondary.equals("active_time")) {
-            achievementReminders.setSuggested(0);
+            goalsConfig.addCurrentGoals(XiaomiProto.Goal.newBuilder().setId(GOAL_MOVING_TIME));
         } else {
-            achievementReminders.setSuggested(1);
+            goalsConfig.addCurrentGoals(XiaomiProto.Goal.newBuilder().setId(GOAL_STANDING_TIME));
+        }
+
+        for (final Integer supportedGoal : supportedGoals) {
+            goalsConfig.addSupportedGoals(XiaomiProto.Goal.newBuilder().setId(supportedGoal));
         }
 
         final XiaomiProto.Health health = XiaomiProto.Health.newBuilder()
-                .setAchievementReminders(achievementReminders)
+                .setGoalsConfig(goalsConfig)
                 .build();
 
         getSupport().sendCommand(
-                "set goal config",
+                "set goals config",
                 XiaomiProto.Command.newBuilder()
                         .setType(COMMAND_TYPE)
-                        .setSubtype(CMD_CONFIG_GOAL_SET)
+                        .setSubtype(CMD_CONFIG_GOALS_SET)
                         .setHealth(health)
                         .build()
         );
diff --git a/app/src/main/proto/xiaomi.proto b/app/src/main/proto/xiaomi.proto
index d575516ae..95465715e 100644
--- a/app/src/main/proto/xiaomi.proto
+++ b/app/src/main/proto/xiaomi.proto
@@ -441,7 +441,7 @@ message Health {
   // 8, 12 get | 8, 13 set
   optional StandingReminder standingReminder = 9;
   optional Stress stress = 10;
-  optional AchievementReminders achievementReminders = 13;
+  optional GoalNotification goalNotification = 13;
 
   // 8, 35 get | 8, 36 set
   optional VitalityScore vitalityScore = 14;
@@ -453,6 +453,9 @@ message Health {
   optional WorkoutOpenWatch workoutOpenWatch = 25;
   optional WorkoutOpenReply workoutOpenReply = 26;
 
+  // 7, 43
+  optional GoalsConfig goalsConfig = 38;
+
   // 7, 48
   optional WorkoutLocation workoutLocation = 40;
 
@@ -521,9 +524,9 @@ message Stress {
   optional RelaxReminder relaxReminder = 2;
 }
 
-message AchievementReminders {
+message GoalNotification {
   optional bool enabled = 1;
-  optional uint32 suggested = 2; // 0 moving, 1 standing
+  optional uint32 unknown2 = 2; // 1
 }
 
 message RelaxReminder {
@@ -564,6 +567,19 @@ message WorkoutOpenReply {
   optional uint32 unknown3 = 3;
 }
 
+message GoalsConfig {
+  repeated Goal currentGoals = 1;
+  repeated Goal supportedGoals = 2;
+}
+
+message Goal {
+  // 1 steps?
+  // 2 calories?
+  // 3 moving time
+  // 4 standing time
+  optional uint32 id = 1;
+}
+
 message WorkoutLocation {
   optional uint32 unknown1 = 1; // 10, sometimes 2?
   optional uint32 timestamp = 2; // seconds

From 9df3ae9c2e8d481c0347bc997ec7c4e104d7deec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Wed, 13 Dec 2023 20:45:37 +0000
Subject: [PATCH 249/595] Amazfit T-Rex Pro: Add activate display on lift
 sensitivity

---
 .../devices/huami/amazfittrexpro/AmazfitTRexProCoordinator.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 5c79275cc..575a4b929 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
@@ -82,7 +82,7 @@ public class AmazfitTRexProCoordinator extends HuamiCoordinator {
                 R.xml.devicesettings_heartrate_sleep,
                 R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_timeformat,
-                R.xml.devicesettings_liftwrist_display,
+                R.xml.devicesettings_liftwrist_display_sensitivity,
                 R.xml.devicesettings_inactivity_dnd,
                 R.xml.devicesettings_disconnectnotification,
                 R.xml.devicesettings_sync_calendar,

From 730841e9a1cea2c8a3e6e257bf20e99ced698e08 Mon Sep 17 00:00:00 2001
From: Arjan Schrijver <a_gadgetbridge@anymore.nl>
Date: Thu, 14 Dec 2023 13:23:28 +0100
Subject: [PATCH 250/595] Convert last remaining Switches to MaterialSwitch

Fixes #3454
---
 .../gadgetbridge/adapter/GBAlarmListAdapter.java            | 4 ++--
 .../devices/qhybrid/FileManagementActivity.java             | 6 +++---
 .../main/res/layout/activity_qhybrid_file_management.xml    | 4 ++--
 app/src/main/res/layout/item_alarm.xml                      | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBAlarmListAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBAlarmListAdapter.java
index 063c363a2..d24da839f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBAlarmListAdapter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBAlarmListAdapter.java
@@ -24,13 +24,13 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CheckedTextView;
 import android.widget.CompoundButton;
-import android.widget.Switch;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.google.android.material.card.MaterialCardView;
+import com.google.android.material.materialswitch.MaterialSwitch;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -128,7 +128,7 @@ public class GBAlarmListAdapter extends RecyclerView.Adapter<GBAlarmListAdapter.
         MaterialCardView container;
 
         TextView alarmTime;
-        Switch isEnabled;
+        MaterialSwitch isEnabled;
         TextView isSmartWakeup;
 
         CheckedTextView alarmDayMonday;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/FileManagementActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/FileManagementActivity.java
index 0912089db..b1d0cce8e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/FileManagementActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/FileManagementActivity.java
@@ -25,13 +25,13 @@ import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.CompoundButton;
 import android.widget.Spinner;
-import android.widget.Switch;
 import android.widget.Toast;
 
 import androidx.annotation.Nullable;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.android.material.materialswitch.MaterialSwitch;
 
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -47,7 +47,7 @@ public class FileManagementActivity extends AbstractGBActivity implements View.O
     private final int REQUEST_CODE_PICK_UPLOAD_FILE = 0;
 
     private Spinner fileTypesSpinner;
-    private Switch encryptedFile;
+    private MaterialSwitch encryptedFile;
     private boolean generateFileHeader = false;
 
     private boolean warningDisplayed = false;
@@ -107,7 +107,7 @@ public class FileManagementActivity extends AbstractGBActivity implements View.O
         findViewById(R.id.qhybrid_button_download_file).setOnClickListener(this);
         findViewById(R.id.qhybrid_button_upload_file).setOnClickListener(this);
 
-        ((Switch) findViewById(R.id.sqhybrid_switch_generate_file_header)).setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+        ((MaterialSwitch) findViewById(R.id.sqhybrid_switch_generate_file_header)).setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                 generateFileHeader = isChecked;
diff --git a/app/src/main/res/layout/activity_qhybrid_file_management.xml b/app/src/main/res/layout/activity_qhybrid_file_management.xml
index 2f9968e1d..cf12fa3d5 100644
--- a/app/src/main/res/layout/activity_qhybrid_file_management.xml
+++ b/app/src/main/res/layout/activity_qhybrid_file_management.xml
@@ -20,13 +20,13 @@
             android:layout_alignParentBottom="true"
             android:orientation="vertical">
 
-            <Switch
+            <com.google.android.material.materialswitch.MaterialSwitch
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="encrypted file"
                 android:id="@+id/qhybrid_switch_encrypted_file" />
 
-            <Switch
+            <com.google.android.material.materialswitch.MaterialSwitch
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="generate file header"
diff --git a/app/src/main/res/layout/item_alarm.xml b/app/src/main/res/layout/item_alarm.xml
index 0f72d6647..6dd427c82 100644
--- a/app/src/main/res/layout/item_alarm.xml
+++ b/app/src/main/res/layout/item_alarm.xml
@@ -42,13 +42,13 @@
                 android:text="(Smart)"
                 android:visibility="invisible" />
 
-            <Switch
+            <com.google.android.material.materialswitch.MaterialSwitch
                 android:id="@+id/alarm_item_toggle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentEnd="true"
                 android:layout_alignParentTop="true"
-                android:layout_margin="8dp" />
+                android:layout_marginEnd="8dp" />
 
             <LinearLayout
                 android:id="@+id/dowSelector"

From 48e1bc1a8a231d14b7a8260a8a5df1d3607f074e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Thu, 14 Dec 2023 21:53:27 +0000
Subject: [PATCH 251/595] ColaCao 2021 / 2023: Initial support

Reports in #3455 and #2955 mention that everything works, except HR,
which crashes the devices (they do not have an HR sensor), so we just
disable HR support.
---
 README.md                                     |  3 +
 .../fitpro/FitProDeviceCoordinator.java       |  2 -
 .../fitpro/colacao/ColaCao21Coordinator.java  | 56 +++++++++++++++++++
 .../fitpro/colacao/ColaCao23Coordinator.java  | 56 +++++++++++++++++++
 .../gadgetbridge/model/DeviceType.java        |  4 ++
 app/src/main/res/values/strings.xml           |  2 +
 6 files changed, 121 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/fitpro/colacao/ColaCao21Coordinator.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/fitpro/colacao/ColaCao23Coordinator.java

diff --git a/README.md b/README.md
index 3df8506be..f0d4d6156 100644
--- a/README.md
+++ b/README.md
@@ -67,6 +67,9 @@ vendor's servers.
     - Casio GBD-100
     - Casio GBD-200
     - Casio GBD-H1000
+- ColaCao (FitPro devices)
+  - ColaCao 2023
+  - ColaCao 2021
 - [Femometer Vinca II](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Femometer-Vinca-II)
 - [FitPro](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/FitPro)
 - Fossil
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/fitpro/FitProDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/fitpro/FitProDeviceCoordinator.java
index 16ee11baa..be5123667 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/fitpro/FitProDeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/fitpro/FitProDeviceCoordinator.java
@@ -40,9 +40,7 @@ import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.entities.FitProActivitySampleDao;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
 import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
-import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.ServiceDeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.fitpro.FitProDeviceSupport;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/fitpro/colacao/ColaCao21Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/fitpro/colacao/ColaCao21Coordinator.java
new file mode 100644
index 000000000..5428b7b1c
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/fitpro/colacao/ColaCao21Coordinator.java
@@ -0,0 +1,56 @@
+/*  Copyright (C) 2016-2023 Petr Vaněk, José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+
+package nodomain.freeyourgadget.gadgetbridge.devices.fitpro.colacao;
+
+import androidx.annotation.DrawableRes;
+
+import java.util.regex.Pattern;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.devices.fitpro.FitProDeviceCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+
+public class ColaCao21Coordinator extends FitProDeviceCoordinator {
+    @Override
+    protected Pattern getSupportedDeviceName() {
+        return Pattern.compile("ColaCao21");
+    }
+
+    @Override
+    public boolean supportsHeartRateMeasurement(final GBDevice device) {
+        // HR requests crash the device
+        return false;
+    }
+
+    @Override
+    @DrawableRes
+    public int getDefaultIconResource() {
+        return R.drawable.ic_device_amazfit_bip;
+    }
+
+    @Override
+    @DrawableRes
+    public int getDisabledIconResource() {
+        return R.drawable.ic_device_amazfit_bip_disabled;
+    }
+
+    @Override
+    public int getDeviceNameResource() {
+        return R.string.devicetype_colacao21;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/fitpro/colacao/ColaCao23Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/fitpro/colacao/ColaCao23Coordinator.java
new file mode 100644
index 000000000..cf735ec98
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/fitpro/colacao/ColaCao23Coordinator.java
@@ -0,0 +1,56 @@
+/*  Copyright (C) 2016-2023 Petr Vaněk, José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+
+package nodomain.freeyourgadget.gadgetbridge.devices.fitpro.colacao;
+
+import androidx.annotation.DrawableRes;
+
+import java.util.regex.Pattern;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.devices.fitpro.FitProDeviceCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+
+public class ColaCao23Coordinator extends FitProDeviceCoordinator {
+    @Override
+    protected Pattern getSupportedDeviceName() {
+        return Pattern.compile("ColaCao23");
+    }
+
+    @Override
+    public boolean supportsHeartRateMeasurement(final GBDevice device) {
+        // HR requests crash the device
+        return false;
+    }
+
+    @Override
+    @DrawableRes
+    public int getDefaultIconResource() {
+        return R.drawable.ic_device_amazfit_bip;
+    }
+
+    @Override
+    @DrawableRes
+    public int getDisabledIconResource() {
+        return R.drawable.ic_device_amazfit_bip_disabled;
+    }
+
+    @Override
+    public int getDeviceNameResource() {
+        return R.string.devicetype_colacao23;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
index 598bef4bd..4a9bdf251 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
@@ -34,6 +34,8 @@ import nodomain.freeyourgadget.gadgetbridge.devices.divoom.PixooCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.domyos.DomyosT540Coordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.femometer.FemometerVinca2DeviceCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.fitpro.FitProDeviceCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.fitpro.colacao.ColaCao21Coordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.fitpro.colacao.ColaCao23Coordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.flipper.zero.FlipperZeroCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.galaxy_buds.GalaxyBuds2DeviceCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.galaxy_buds.GalaxyBuds2ProDeviceCoordinator;
@@ -257,6 +259,8 @@ public enum DeviceType {
     BOHEMIC_SMART_BRACELET(BohemicSmartBraceletDeviceCoordinator.class),
     SMAQ2OSS(SMAQ2OSSCoordinator.class),
     FITPRO(FitProDeviceCoordinator.class),
+    COLACAO21(ColaCao21Coordinator.class),
+    COLACAO23(ColaCao23Coordinator.class),
     ITAG(ITagCoordinator.class),
     NUTMINI(NutCoordinator.class),
     VIVOMOVE_HR(VivomoveHrCoordinator.class),
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 31c2ebd81..c0857fced 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1404,6 +1404,8 @@
     <string name="devicetype_waspos">Wasp-os</string>
     <string name="devicetype_smaq2oss">SMA-Q2 OSS</string>
     <string name="devicetype_fitpro">FitPro</string>
+    <string name="devicetype_colacao21">ColaCao 2021</string>
+    <string name="devicetype_colacao23">ColaCao 2023</string>
     <string name="devicetype_domyos_t540">Domyos T540</string>
     <string name="devicetype_sony_wh_1000xm2">Sony WH-1000XM2</string>
     <string name="devicetype_sony_wh_1000xm3">Sony WH-1000XM3</string>

From 4b8ca275dfcfe5acb04ae6fd1d614c934482ac02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Thu, 14 Dec 2023 22:01:51 +0000
Subject: [PATCH 252/595] Update changelog

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f2d84c2d..7b9d1d085 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,8 @@
 #### Next release (WIP)
 * Initial support for Amazfit Balance
 * Initial support for Amazfit Active
+* Initial support for ColaCao 2021
+* Initial support for ColaCao 2023
 * Initial support for Femometer Vinca II
 * Initial support for Mijia LYWSD02MMC variant
 * Initial support for Sony Wena 3
@@ -19,6 +21,7 @@
 * Amazfit Band 7: Add alexa menu entries
 * Amazfit GTR 3 Pro: Fix firmware and watchface upload
 * Amazfit T-Rex: Fix activity summary parsing
+* Amazfit T-Rex Pro: Add activate display on lift sensitivity
 * AsteroidOS: Add more supported watch models
 * AsteroidOS: Fix media info
 * AsteroidOS: Fix notification dismissal

From c58d45423e32c1126808f34679652ccdd0035b25 Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Sat, 16 Dec 2023 18:28:01 +0100
Subject: [PATCH 253/595] bump version, update fastlane and xml changelog

---
 CHANGELOG.md                                  |  2 +-
 app/build.gradle                              |  4 +-
 app/src/main/res/xml/changelog_master.xml     | 80 +++++++++++++++++++
 .../metadata/android/en-US/changelogs/227.txt | 78 ++++++++++++++++++
 4 files changed, 161 insertions(+), 3 deletions(-)
 create mode 100644 src/main/fastlane/metadata/android/en-US/changelogs/227.txt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b9d1d085..2884d3041 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 ### Changelog
 
-#### Next release (WIP)
+#### 0.77.0
 * Initial support for Amazfit Balance
 * Initial support for Amazfit Active
 * Initial support for ColaCao 2021
diff --git a/app/build.gradle b/app/build.gradle
index 92bd2c669..354dd25cd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -87,8 +87,8 @@ android {
         targetSdkVersion 33
 
         // Note: always bump BOTH versionCode and versionName!
-        versionName "0.76.1"
-        versionCode 226
+        versionName "0.77.0"
+        versionCode 227
         vectorDrawables.useSupportLibrary = true
         buildConfigField "String", "GIT_HASH_SHORT", "\"${getGitHashShort()}\""
         buildConfigField "boolean", "INTERNET_ACCESS", "false"
diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
index 84dbd2343..1acf028d2 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -1,5 +1,85 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
+    <release version="0.77.0" versioncode="227">
+        <change>Initial support for Amazfit Balance</change>
+        <change>Initial support for Amazfit Active</change>
+        <change>Initial support for ColaCao 2021</change>
+        <change>Initial support for ColaCao 2023</change>
+        <change>Initial support for Femometer Vinca II</change>
+        <change>Initial support for Mijia LYWSD02MMC variant</change>
+        <change>Initial support for Sony Wena 3</change>
+        <change>Experimental support for Divoom Pixoo</change>
+        <change>Experimental support for Sony WF-1000XM5</change>
+        <change>Experimental support for Amazfit Active Edge</change>
+        <change>Experimental support for Mi Band 7 Pro (Xiaomi Smart Band 7 Pro)</change>
+        <change>Experimental support for Mi Band 8 (Xiaomi Smart Band 8)</change>
+        <change>Experimental support for Mi Watch Lite</change>
+        <change>Experimental support for Mi Watch Color Sport</change>
+        <change>Experimental support for Redmi Smart Band 2</change>
+        <change>Experimental support for Redmi Watch 3 Active</change>
+        <change>Experimental support for Xiaomi Watch S1 Active</change>
+        <change>Amazfit Band 7: Add alexa menu entries</change>
+        <change>Amazfit GTR 3 Pro: Fix firmware and watchface upload</change>
+        <change>Amazfit T-Rex: Fix activity summary parsing</change>
+        <change>Amazfit T-Rex Pro: Add activate display on lift sensitivity</change>
+        <change>AsteroidOS: Add more supported watch models</change>
+        <change>AsteroidOS: Fix media info</change>
+        <change>AsteroidOS: Fix notification dismissal</change>
+        <change>Bangle.js: Add loyalty cards integration with Catima</change>
+        <change>Bangle.js: Ensure SMS messages have src field set to "SMS Message"</change>
+        <change>Bangle.js: Fix GPS speed</change>
+        <change>Bangle.js: Improve handling of chinese characters</change>
+        <change>Bangle.js: Lower threshold for low battery warning</change>
+        <change>Bangle.js: Recover from device initialization failure</change>
+        <change>Casio GBX100/GBD-200: Fix first connect</change>
+        <change>Casio GB5600/6900/STB-1000: Fix pairing</change>
+        <change>Casio GDB-200: Fix notification timestamp</change>
+        <change>Casio GDB-200: Fixed notification categories and default category</change>
+        <change>Casio GDB-200: Allow preview of notification message alongside title</change>
+        <change>Casio GDB-200: Fixed find my phone feature</change>
+        <change>Intent API: Add debug action for test new function</change>
+        <change>Fossil/Skagen Hybrids: Add new navigation app</change>
+        <change>Fossil/Skagen Hybrids: Allow configuring call rejection method</change>
+        <change>Fossil/Skagen Hybrids: Fix some preference crashes on the nightly</change>
+        <change>Fossil/Skagen Hybrids: Reduce toasts on release builds</change>
+        <change>Fossil/Skagen Hybrids: Show device specific settings in more logical order</change>
+        <change>Huami: Toggle phone silent mode from band</change>
+        <change>Message privacy: Add mode Hide only body</change>
+        <change>Mijia LYWSD02: Add battery</change>
+        <change>Mijia LYWSD02: Add low battery notification</change>
+        <change>Mijia LYWSD02: Set temperature unit</change>
+        <change>Mijia LYWSD02: Fix battery drain while connected</change>
+        <change>PineTime: Display app name for VoIP app calls</change>
+        <change>PineTime: Honor Sync time setting on connect</change>
+        <change>PineTime: Improve notification handling</change>
+        <change>PineTime: Reduce weather memory usage</change>
+        <change>Withings Steel HR: Fix crash when calibrating hands on the nightly</change>
+        <change>Zepp OS: Add blood oxygen graph</change>
+        <change>Zepp OS: Add workout codes for hiking and outdoor swimming</change>
+        <change>Zepp OS: Allow disabling app notifications per device</change>
+        <change>Zepp OS: Attempt to fix activity fetch operation getting stuck</change>
+        <change>Zepp OS: Display swimming activity data</change>
+        <change>Zepp OS: Fix health settings on older Zepp OS versions</change>
+        <change>Zepp OS: Fix setting of unknown button press apps</change>
+        <change>Zepp OS: Fix sunrise and moon dates being off by local time + UTC offset</change>
+        <change>Zepp OS: Map hiking, outdoor swimming, climbing and table tennis activity types</change>
+        <change>Zepp OS: Toggle phone silent mode from band</change>
+        <change>Add transliteration for Latvian, Hungarian, Common Symbols</change>
+        <change>Allow multiple device actions to be triggered for the same event</change>
+        <change>Allow toggling DND through device actions</change>
+        <change>Autodetect OsmAnd package name and make it configurable</change>
+        <change>Improve ASCII transliterator</change>
+        <change>Make GMaps navigation handler follow the "navigation forwarding" setting</change>
+        <change>Support selecting enabled navigation apps</change>
+        <change>Allow ignore notifications from work profile apps</change>
+        <change>Display alias in low battery notification</change>
+        <change>Fix crash when pairing current device as companion</change>
+        <change>Fix emoji when a transliterator is enabled</change>
+        <change>Fix UV Index and rain probability for some weather apps</change>
+        <change>Improve device discovery stability and fix freezes</change>
+        <change>Improve Telegram and COL Reminder notifications</change>
+        <change>Replace old-style preference switch with Material 3 switch</change>
+    </release>
     <release version="0.76.1" versioncode="226">
         <change>Amazfit GTR Mini: Mark as not experimental</change>
         <change>Bangle.js: Improve file downloads</change>
diff --git a/src/main/fastlane/metadata/android/en-US/changelogs/227.txt b/src/main/fastlane/metadata/android/en-US/changelogs/227.txt
new file mode 100644
index 000000000..9c20dcb28
--- /dev/null
+++ b/src/main/fastlane/metadata/android/en-US/changelogs/227.txt
@@ -0,0 +1,78 @@
+* Initial support for Amazfit Balance
+* Initial support for Amazfit Active
+* Initial support for ColaCao 2021
+* Initial support for ColaCao 2023
+* Initial support for Femometer Vinca II
+* Initial support for Mijia LYWSD02MMC variant
+* Initial support for Sony Wena 3
+* Experimental support for Divoom Pixoo
+* Experimental support for Sony WF-1000XM5
+* Experimental support for Amazfit Active Edge
+* Experimental support for Mi Band 7 Pro (Xiaomi Smart Band 7 Pro)
+* Experimental support for Mi Band 8 (Xiaomi Smart Band 8)
+* Experimental support for Mi Watch Lite
+* Experimental support for Mi Watch Color Sport
+* Experimental support for Redmi Smart Band 2
+* Experimental support for Redmi Watch 3 Active
+* Experimental support for Xiaomi Watch S1 Active
+* Amazfit Band 7: Add alexa menu entries
+* Amazfit GTR 3 Pro: Fix firmware and watchface upload
+* Amazfit T-Rex: Fix activity summary parsing
+* Amazfit T-Rex Pro: Add activate display on lift sensitivity
+* AsteroidOS: Add more supported watch models
+* AsteroidOS: Fix media info
+* AsteroidOS: Fix notification dismissal
+* Bangle.js: Add loyalty cards integration with Catima
+* Bangle.js: Ensure SMS messages have src field set to "SMS Message"
+* Bangle.js: Fix GPS speed
+* Bangle.js: Improve handling of chinese characters
+* Bangle.js: Lower threshold for low battery warning
+* Bangle.js: Recover from device initialization failure
+* Casio GBX100/GBD-200: Fix first connect
+* Casio GB5600/6900/STB-1000: Fix pairing
+* Casio GDB-200: Fix notification timestamp
+* Casio GDB-200: Fixed notification categories and default category
+* Casio GDB-200: Allow preview of notification message alongside title
+* Casio GDB-200: Fixed find my phone feature
+* Intent API: Add debug action for test new function
+* Fossil/Skagen Hybrids: Add new navigation app
+* Fossil/Skagen Hybrids: Allow configuring call rejection method
+* Fossil/Skagen Hybrids: Fix some preference crashes on the nightly
+* Fossil/Skagen Hybrids: Reduce toasts on release builds
+* Fossil/Skagen Hybrids: Show device specific settings in more logical order
+* Huami: Toggle phone silent mode from band
+* Message privacy: Add mode Hide only body
+* Mijia LYWSD02: Add battery
+* Mijia LYWSD02: Add low battery notification
+* Mijia LYWSD02: Set temperature unit
+* Mijia LYWSD02: Fix battery drain while connected
+* PineTime: Display app name for VoIP app calls
+* PineTime: Honor Sync time setting on connect
+* PineTime: Improve notification handling
+* PineTime: Reduce weather memory usage
+* Withings Steel HR: Fix crash when calibrating hands on the nightly
+* Zepp OS: Add blood oxygen graph
+* Zepp OS: Add workout codes for hiking and outdoor swimming
+* Zepp OS: Allow disabling app notifications per device
+* Zepp OS: Attempt to fix activity fetch operation getting stuck
+* Zepp OS: Display swimming activity data
+* Zepp OS: Fix health settings on older Zepp OS versions
+* Zepp OS: Fix setting of unknown button press apps
+* Zepp OS: Fix sunrise and moon dates being off by local time + UTC offset
+* Zepp OS: Map hiking, outdoor swimming, climbing and table tennis activity types
+* Zepp OS: Toggle phone silent mode from band
+* Add transliteration for Latvian, Hungarian, Common Symbols
+* Allow multiple device actions to be triggered for the same event
+* Allow toggling DND through device actions
+* Autodetect OsmAnd package name and make it configurable
+* Improve ASCII transliterator
+* Make GMaps navigation handler follow the "navigation forwarding" setting
+* Support selecting enabled navigation apps
+* Allow ignore notifications from work profile apps
+* Display alias in low battery notification
+* Fix crash when pairing current device as companion
+* Fix emoji when a transliterator is enabled
+* Fix UV Index and rain probability for some weather apps
+* Improve device discovery stability and fix freezes
+* Improve Telegram and COL Reminder notifications
+* Replace old-style preference switch with Material 3 switch

From ea0817f7b68c009f791ad87e37cf71866985b0ee Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Sat, 16 Dec 2023 19:37:40 +0100
Subject: [PATCH 254/595] Use TextUtils.join intead of String.join, to make at
 least the linter happy

It is not clear to me if this would get desugarized anyway, but linter says needs API 26
---
 .../activities/AbstractPreferenceFragment.java           | 3 ++-
 .../loyaltycards/LoyaltyCardsSettingsFragment.java       | 3 ++-
 .../activities/widgets/WidgetScreenListAdapter.java      | 3 ++-
 .../gadgetbridge/service/AbstractDeviceSupport.java      | 3 ++-
 .../huami/zeppos/services/ZeppOsAlexaService.java        | 3 ++-
 .../huami/zeppos/services/ZeppOsConfigService.java       | 9 +++++----
 .../zeppos/services/ZeppOsShortcutCardsService.java      | 6 ++++--
 .../huami/zeppos/services/ZeppOsWatchfaceService.java    | 3 ++-
 .../conversation/WorkoutScreenListHandler.java           | 3 ++-
 .../devices/xiaomi/services/XiaomiSystemService.java     | 4 +++-
 10 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractPreferenceFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractPreferenceFragment.java
index 5c4c15e6d..01e34b6b5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractPreferenceFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractPreferenceFragment.java
@@ -18,6 +18,7 @@ package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.text.TextUtils;
 
 import androidx.fragment.app.DialogFragment;
 import androidx.preference.EditTextPreference;
@@ -219,7 +220,7 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragmentCompa
                                 translatedEntries.add(entries[i].toString());
                             }
                         }
-                        summary = String.join(", ", translatedEntries);
+                        summary = TextUtils.join(", ", translatedEntries);
                     }
                 } else {
                     summary = prefs.getString(key, preference.getSummary() != null ? preference.getSummary().toString() : "");
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/loyaltycards/LoyaltyCardsSettingsFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/loyaltycards/LoyaltyCardsSettingsFragment.java
index a0f7d6e10..dcc8a7dca 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/loyaltycards/LoyaltyCardsSettingsFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/loyaltycards/LoyaltyCardsSettingsFragment.java
@@ -33,6 +33,7 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.widget.Toast;
 
 import androidx.core.app.ActivityCompat;
@@ -230,7 +231,7 @@ public class LoyaltyCardsSettingsFragment extends AbstractPreferenceFragment {
                     }
                 }
                 values.removeAll(toRemove);
-                syncGroups.setSummary(String.join(", ", values));
+                syncGroups.setSummary(TextUtils.join(", ", values));
             }
         }
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/widgets/WidgetScreenListAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/widgets/WidgetScreenListAdapter.java
index 18403ec8c..d2278dfe1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/widgets/WidgetScreenListAdapter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/widgets/WidgetScreenListAdapter.java
@@ -17,6 +17,7 @@
 package nodomain.freeyourgadget.gadgetbridge.activities.widgets;
 
 import android.content.Context;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -94,7 +95,7 @@ public class WidgetScreenListAdapter extends RecyclerView.Adapter<WidgetScreenLi
         }
 
         if (!widgetNames.isEmpty()) {
-            holder.widgetScreenDescription.setText(String.join(", ", widgetNames));
+            holder.widgetScreenDescription.setText(TextUtils.join(", ", widgetNames));
         } else {
             holder.widgetScreenDescription.setText(R.string.unknown);
         }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java
index 85b27e881..9790dc2aa 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java
@@ -32,6 +32,7 @@ import android.location.Location;
 import android.net.Uri;
 import android.os.Build;
 import android.telephony.SmsManager;
+import android.text.TextUtils;
 
 import androidx.annotation.RequiresApi;
 import androidx.core.app.NotificationCompat;
@@ -553,7 +554,7 @@ public abstract class AbstractDeviceSupport implements DeviceSupport {
             return;
         }
 
-        LOG.debug("Handing device actions: {}", String.join(",", actions));
+        LOG.debug("Handing device actions: {}", TextUtils.join(",", actions));
 
         final String actionBroadcast = getContext().getString(R.string.pref_device_action_broadcast_value);
         final String actionFitnessControlStart = getContext().getString(R.string.pref_device_action_fitness_app_control_start_value);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAlexaService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAlexaService.java
index 3fa7d3772..4bc76e025 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAlexaService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAlexaService.java
@@ -20,6 +20,7 @@ import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.Dev
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_WATCHFACE;
 
 import android.os.Handler;
+import android.text.TextUtils;
 import android.widget.Toast;
 
 import org.slf4j.Logger;
@@ -386,7 +387,7 @@ public class ZeppOsAlexaService extends AbstractZeppOsService {
 
         final GBDeviceEventUpdatePreferences evt = new GBDeviceEventUpdatePreferences()
                 .withPreference(PREF_VOICE_SERVICE_LANGUAGE, currentLanguage.replace("-", "_"))
-                .withPreference(DeviceSettingsUtils.getPrefPossibleValuesKey(PREF_VOICE_SERVICE_LANGUAGE), String.join(",", allLanguages).replace("-", "_"));
+                .withPreference(DeviceSettingsUtils.getPrefPossibleValuesKey(PREF_VOICE_SERVICE_LANGUAGE), TextUtils.join(",", allLanguages).replace("-", "_"));
         getSupport().evaluateGBDeviceEvent(evt);
     }
 
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 7523dd9ca..3179997a1 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
@@ -25,6 +25,7 @@ import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PR
 import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_NIGHT_MODE_END;
 import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_NIGHT_MODE_START;
 
+import android.text.TextUtils;
 import android.widget.Toast;
 
 import androidx.annotation.Nullable;
@@ -1149,7 +1150,7 @@ public class ZeppOsConfigService extends AbstractZeppOsService {
                 if (includesConstraints) {
                     prefs.put(
                             DeviceSettingsUtils.getPrefPossibleValuesKey(configArg.getPrefKey()),
-                            String.join(",", decodeByteValues(possibleValues, decoder))
+                            TextUtils.join(",", decodeByteValues(possibleValues, decoder))
                     );
                 }
             }
@@ -1184,7 +1185,7 @@ public class ZeppOsConfigService extends AbstractZeppOsService {
                                 possibleLanguages.add(languageByteToLocale(possibleValue));
                             }
                             possibleLanguages.removeAll(Collections.singleton(null));
-                            prefs.put(DeviceSettingsUtils.getPrefPossibleValuesKey(configArg.getPrefKey()), String.join(",", possibleLanguages));
+                            prefs.put(DeviceSettingsUtils.getPrefPossibleValuesKey(configArg.getPrefKey()), TextUtils.join(",", possibleLanguages));
                         }
                     }
                     decoder = null;
@@ -1241,7 +1242,7 @@ public class ZeppOsConfigService extends AbstractZeppOsService {
                 if (includesConstraints) {
                     prefs.put(
                             DeviceSettingsUtils.getPrefPossibleValuesKey(configArg.getPrefKey()),
-                            String.join(",", decodeByteValues(possibleValues, decoder))
+                            TextUtils.join(",", decodeByteValues(possibleValues, decoder))
                     );
                 }
             }
@@ -1276,7 +1277,7 @@ public class ZeppOsConfigService extends AbstractZeppOsService {
             if (decoded.isEmpty()) {
                 return null;
             }
-            return String.join(",", decoded);
+            return TextUtils.join(",", decoded);
         }
 
         private Map<String, Object> singletonMap(final String key, final Object value) {
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 b963ae783..920ea6542 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
@@ -18,6 +18,8 @@ package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.servic
 
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.SHORTCUT_CARDS_SORTABLE;
 
+import android.text.TextUtils;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -218,8 +220,8 @@ public class ZeppOsShortcutCardsService extends AbstractZeppOsService {
         }
 
         final GBDeviceEventUpdatePreferences evt = new GBDeviceEventUpdatePreferences()
-                .withPreference(SHORTCUT_CARDS_SORTABLE, String.join(",", enabledCards))
-                .withPreference(DeviceSettingsUtils.getPrefPossibleValuesKey(SHORTCUT_CARDS_SORTABLE), String.join(",", allCards));
+                .withPreference(SHORTCUT_CARDS_SORTABLE, TextUtils.join(",", enabledCards))
+                .withPreference(DeviceSettingsUtils.getPrefPossibleValuesKey(SHORTCUT_CARDS_SORTABLE), TextUtils.join(",", allCards));
         getSupport().evaluateGBDeviceEvent(evt);
     }
 
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 d7a7c79ed..73a126e09 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
@@ -19,6 +19,7 @@ package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.servic
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_WATCHFACE;
 
 import android.content.Context;
+import android.text.TextUtils;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -229,7 +230,7 @@ public class ZeppOsWatchfaceService extends AbstractZeppOsService {
 
         // TODO broadcast something to update app manager
         final GBDeviceEventUpdatePreferences evt = new GBDeviceEventUpdatePreferences()
-                .withPreference(DeviceSettingsUtils.getPrefPossibleValuesKey(PREF_WATCHFACE), String.join(",", watchfacePrefValues));
+                .withPreference(DeviceSettingsUtils.getPrefPossibleValuesKey(PREF_WATCHFACE), TextUtils.join(",", watchfacePrefValues));
         getSupport().evaluateGBDeviceEvent(evt);
     }
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/WorkoutScreenListHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/WorkoutScreenListHandler.java
index fad7ad734..76372895c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/WorkoutScreenListHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/WorkoutScreenListHandler.java
@@ -17,6 +17,7 @@
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.conversation;
 
 import android.content.SharedPreferences;
+import android.text.TextUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -56,7 +57,7 @@ public class WorkoutScreenListHandler extends AbstractResponseHandler {
             }
          }
 
-        String workoutActivityTypes = String.join(",", prefValues);
+        String workoutActivityTypes = TextUtils.join(",", prefValues);
         GBDevice device = support.getDevice();
         final SharedPreferences prefs = GBApplication.getDeviceSpecificSharedPrefs(device.getAddress());
         prefs.edit().putString("workout_activity_types_sortable", workoutActivityTypes).apply();
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
index 558bf9e22..5b3b153b4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
@@ -16,6 +16,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services;
 
+import android.text.TextUtils;
+
 import com.google.protobuf.InvalidProtocolBufferException;
 
 import org.slf4j.Logger;
@@ -625,7 +627,7 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
         }
 
         final GBDeviceEventUpdatePreferences eventUpdatePreferences = new GBDeviceEventUpdatePreferences()
-                .withPreference(XiaomiPreferences.PREF_WORKOUT_TYPES, String.join(",", codes));
+                .withPreference(XiaomiPreferences.PREF_WORKOUT_TYPES, TextUtils.join(",", codes));
 
         getSupport().evaluateGBDeviceEvent(eventUpdatePreferences);
     }

From 275deb4d06de6b64c0d7e73d13f6f2ad2879fe25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sat, 16 Dec 2023 19:13:50 +0000
Subject: [PATCH 255/595] Fix pipeline workflow syntax

As per https://woodpecker-ci.org/docs/usage/workflow-syntax#event
---
 .woodpecker/can_master_build.yml | 7 +++++--
 .woodpecker/run_lint.yml         | 7 +++++--
 .woodpecker/run_tests.yml        | 7 +++++--
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/.woodpecker/can_master_build.yml b/.woodpecker/can_master_build.yml
index dde54fb5c..fb239d34c 100644
--- a/.woodpecker/can_master_build.yml
+++ b/.woodpecker/can_master_build.yml
@@ -12,5 +12,8 @@ steps:
 #https://github.com/woodpecker-ci/woodpecker/issues/687
 
 when:
-  event:
-    exclude: ['cron', 'deployment']
+  # Everything except cron (nightly) and deployment
+  - event: push
+  - event: pull_request
+  - event: tag
+  - event: manual
diff --git a/.woodpecker/run_lint.yml b/.woodpecker/run_lint.yml
index f78bb032c..83a6501eb 100644
--- a/.woodpecker/run_lint.yml
+++ b/.woodpecker/run_lint.yml
@@ -12,5 +12,8 @@ steps:
 #https://github.com/woodpecker-ci/woodpecker/issues/687
 
 when:
-  event:
-    exclude: ['cron', 'deployment']
+  # Everything except cron (nightly) and deployment
+  - event: push
+  - event: pull_request
+  - event: tag
+  - event: manual
diff --git a/.woodpecker/run_tests.yml b/.woodpecker/run_tests.yml
index 2c5a16fdc..cf5717f5a 100644
--- a/.woodpecker/run_tests.yml
+++ b/.woodpecker/run_tests.yml
@@ -12,5 +12,8 @@ steps:
 #https://github.com/woodpecker-ci/woodpecker/issues/687
 
 when:
-  event:
-    exclude: ['cron', 'deployment']
+  # Everything except cron (nightly) and deployment
+  - event: push
+  - event: pull_request
+  - event: tag
+  - event: manual

From 198800e0879a5950c668aa324a4ab98bfdc2e3a0 Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Tue, 19 Dec 2023 10:58:49 +0100
Subject: [PATCH 256/595] Pixoo: Decode alarms from device, support sending
 alarms

This is probably not quite right yet.

Also we need to properly chunk incoming protocol messages before decoding them
---
 .../devices/divoom/PixooCoordinator.java      |   5 +
 .../service/devices/divoom/PixooIOThread.java |   5 +
 .../service/devices/divoom/PixooProtocol.java | 112 +++++++++++++++++-
 .../service/devices/divoom/PixooSupport.java  |   1 +
 .../serial/AbstractSerialDeviceSupport.java   |   7 ++
 .../service/serial/GBDeviceProtocol.java      |   5 +
 6 files changed, 134 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/divoom/PixooCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/divoom/PixooCoordinator.java
index 0617bc37b..ac7893521 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/divoom/PixooCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/divoom/PixooCoordinator.java
@@ -61,6 +61,11 @@ public class PixooCoordinator extends AbstractBLEDeviceCoordinator {
         return true;
     }
 
+    @Override
+    public int getAlarmSlotCount(GBDevice device) {
+        return 10;
+    }
+
     @Override
     public int getDefaultIconResource() {
         return R.drawable.ic_device_lovetoy;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooIOThread.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooIOThread.java
index e4936ceae..d9fd8e1b8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooIOThread.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooIOThread.java
@@ -31,19 +31,24 @@ import java.util.Arrays;
 
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.service.btclassic.BtClassicIoThread;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.nothing.NothingProtocol;
 
 public class PixooIOThread extends BtClassicIoThread {
     private static final Logger LOG = LoggerFactory.getLogger(PixooIOThread.class);
+    private final PixooProtocol mPixooProtocol;
 
 
     @Override
     protected void initialize() {
+        write(mPixooProtocol.encodeReqestAlarms());
+
         setUpdateState(GBDevice.State.INITIALIZED);
     }
 
     public PixooIOThread(GBDevice device, Context context, PixooProtocol deviceProtocol,
                          PixooSupport PixooSupport, BluetoothAdapter bluetoothAdapter) {
         super(device, context, deviceProtocol, PixooSupport, bluetoothAdapter);
+        mPixooProtocol = deviceProtocol;
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooProtocol.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooProtocol.java
index 8cd6fa408..b3a2af975 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooProtocol.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooProtocol.java
@@ -17,8 +17,12 @@
 
 package nodomain.freeyourgadget.gadgetbridge.service.devices.divoom;
 
+import android.content.Intent;
 import android.content.SharedPreferences;
 
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+
+import org.apache.commons.lang3.ArrayUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -26,17 +30,22 @@ import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import lineageos.weather.util.WeatherUtils;
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.activities.SettingsActivity;
 import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
+import nodomain.freeyourgadget.gadgetbridge.database.DBHelper;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEvent;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventVersionInfo;
+import nodomain.freeyourgadget.gadgetbridge.entities.Alarm;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.model.CallSpec;
+import nodomain.freeyourgadget.gadgetbridge.model.DeviceService;
 import nodomain.freeyourgadget.gadgetbridge.model.NotificationSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.WeatherSpec;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.BLETypeConversions;
@@ -64,10 +73,86 @@ public class PixooProtocol extends GBDeviceProtocol {
 
         ByteBuffer incoming = ByteBuffer.wrap(responseData);
         incoming.order(ByteOrder.LITTLE_ENDIAN);
-
+        if (incoming.get() != 0x01) {
+            LOG.warn("first byte not 0x01");
+            return devEvts.toArray(new GBDeviceEvent[0]);
+        }
+        int length = incoming.getShort() & 0xffff;
+        byte status = incoming.get(); // unsure
+        if (status != 0x04) {
+            LOG.warn("status byte not 0x04");
+            return devEvts.toArray(new GBDeviceEvent[0]);
+        }
+        byte endpoint = incoming.get(); // unsure
+        LOG.info("endpoint " + endpoint);
+        if (endpoint == 0x42) {
+            decodeAlarms(incoming);
+        }
         return devEvts.toArray(new GBDeviceEvent[0]);
     }
 
+    private void decodeAlarms(ByteBuffer incoming) {
+        byte unknown = incoming.get();
+        if (unknown != 0x55) { // expected
+            LOG.warn("unexpected byte when decoding Alarms " + unknown);
+            return;
+        }
+        // Map of alarm position to Alarm, as returned by the band
+        final Map<Integer, nodomain.freeyourgadget.gadgetbridge.model.Alarm> payloadAlarms = new HashMap<>();
+
+        while (incoming.remaining() > 10) {
+            int position = incoming.get();
+            boolean enabled = incoming.get() == 1;
+            int hour = incoming.get();
+            int minute = incoming.get();
+            int repeatMask = incoming.get();
+            int unknown2 = incoming.getInt();
+            byte unknown3 = incoming.get(); // normally 0x01, on fresh alarms 0x32
+            final Alarm alarm = new nodomain.freeyourgadget.gadgetbridge.entities.Alarm();
+            alarm.setEnabled(enabled);
+            alarm.setPosition(position);
+            alarm.setHour(hour);
+            alarm.setMinute(minute);
+            alarm.setRepetition(repeatMask);
+            alarm.setUnused(unknown3 == 0x32 && !enabled);
+            payloadAlarms.put(position, alarm);
+        }
+        final List<nodomain.freeyourgadget.gadgetbridge.entities.Alarm> dbAlarms = DBHelper.getAlarms(getDevice());
+        int numUpdatedAlarms = 0;
+
+        for (nodomain.freeyourgadget.gadgetbridge.entities.Alarm alarm : dbAlarms) {
+            final int pos = alarm.getPosition();
+            final nodomain.freeyourgadget.gadgetbridge.model.Alarm updatedAlarm = payloadAlarms.get(pos);
+            final boolean alarmNeedsUpdate = updatedAlarm == null ||
+                    alarm.getUnused() != updatedAlarm.getUnused() ||
+                    alarm.getEnabled() != updatedAlarm.getEnabled() ||
+                    alarm.getSmartWakeup() != updatedAlarm.getSmartWakeup() ||
+                    alarm.getHour() != updatedAlarm.getHour() ||
+                    alarm.getMinute() != updatedAlarm.getMinute() ||
+                    alarm.getRepetition() != updatedAlarm.getRepetition();
+
+            if (alarmNeedsUpdate) {
+                numUpdatedAlarms++;
+                LOG.info("Updating alarm index={}, unused={}", pos, updatedAlarm == null);
+                alarm.setUnused(updatedAlarm == null);
+                if (updatedAlarm != null) {
+                    alarm.setEnabled(updatedAlarm.getEnabled());
+                    alarm.setUnused(updatedAlarm.getUnused());
+                    alarm.setSmartWakeup(updatedAlarm.getSmartWakeup());
+                    alarm.setHour(updatedAlarm.getHour());
+                    alarm.setMinute(updatedAlarm.getMinute());
+                    alarm.setRepetition(updatedAlarm.getRepetition());
+                }
+                DBHelper.store(alarm);
+            }
+        }
+
+        if (numUpdatedAlarms > 0) {
+            final Intent intent = new Intent(DeviceService.ACTION_SAVE_ALARMS);
+            LocalBroadcastManager.getInstance(GBApplication.getContext()).sendBroadcast(intent);
+        }
+    }
+
     @Override
     public byte[] encodeSendConfiguration(String config) {
         SharedPreferences prefs = GBApplication.getDeviceSpecificSharedPrefs(getDevice().getAddress());
@@ -171,6 +256,26 @@ public class PixooProtocol extends GBDeviceProtocol {
 
     }
 
+    @Override
+    public byte[] encodeSetAlarms(ArrayList<? extends nodomain.freeyourgadget.gadgetbridge.model.Alarm> alarms) {
+        byte[] complete_command = new byte[]{};
+        for (nodomain.freeyourgadget.gadgetbridge.model.Alarm alarm : alarms) {
+            byte[] cmd = new byte[]{
+                    0x43,
+                    (byte) alarm.getPosition(),
+                    (byte) (alarm.getEnabled() && !alarm.getUnused() ? 1 : 0),
+                    (byte) alarm.getHour(),
+                    (byte) alarm.getMinute(),
+                    (byte) alarm.getRepetition(),
+                    0, 0, 0, 0,
+                    (byte) (alarm.getUnused() ? 0x32 : 0x00)};
+
+            complete_command = ArrayUtils.addAll(complete_command, encodeProtocol(cmd));
+        }
+        return complete_command;
+    }
+
+
     @Override
     public byte[] encodeSendWeather(WeatherSpec weatherSpec) {
         byte pixooWeatherCode = 0;
@@ -238,6 +343,10 @@ public class PixooProtocol extends GBDeviceProtocol {
         });
     }
 
+    public byte[] encodeReqestAlarms() {
+        return encodeProtocol(new byte[]{0x42});
+    }
+
     @Override
     public byte[] encodeTestNewFunction() {
         //return encodeAudioModeCommand(1); // works
@@ -262,3 +371,4 @@ public class PixooProtocol extends GBDeviceProtocol {
     }
 
 }
+
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooSupport.java
index 3c5b95f9d..6fdfcb26a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooSupport.java
@@ -20,6 +20,7 @@ package nodomain.freeyourgadget.gadgetbridge.service.devices.divoom;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.service.serial.AbstractSerialDeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.serial.GBDeviceIoThread;
 import nodomain.freeyourgadget.gadgetbridge.service.serial.GBDeviceProtocol;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/AbstractSerialDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/AbstractSerialDeviceSupport.java
index 8992463f0..12dfa96df 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/AbstractSerialDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/AbstractSerialDeviceSupport.java
@@ -25,6 +25,7 @@ import java.util.UUID;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEvent;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventSendBytes;
 import nodomain.freeyourgadget.gadgetbridge.devices.EventHandler;
+import nodomain.freeyourgadget.gadgetbridge.model.Alarm;
 import nodomain.freeyourgadget.gadgetbridge.model.CalendarEventSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.CallSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.CannedMessagesSpec;
@@ -286,6 +287,12 @@ public abstract class AbstractSerialDeviceSupport extends AbstractDeviceSupport
         sendToDevice(bytes);
     }
 
+    @Override
+    public void onSetAlarms(ArrayList<? extends Alarm> alarms) {
+        byte[] bytes = gbDeviceProtocol.encodeSetAlarms(alarms);
+        sendToDevice(bytes);
+    }
+
     @Override
     public void onSetReminders(ArrayList<? extends Reminder> reminders) {
         byte[] bytes = gbDeviceProtocol.encodeReminders(reminders);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/GBDeviceProtocol.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/GBDeviceProtocol.java
index 5875623ec..8551787cd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/GBDeviceProtocol.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/GBDeviceProtocol.java
@@ -24,6 +24,7 @@ import java.util.UUID;
 
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEvent;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.model.Alarm;
 import nodomain.freeyourgadget.gadgetbridge.model.CalendarEventSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.CannedMessagesSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.NotificationSpec;
@@ -158,6 +159,10 @@ public abstract class GBDeviceProtocol {
         return null;
     }
 
+    public byte[] encodeSetAlarms(ArrayList<? extends Alarm> alarms)  {
+        return null;
+    }
+
     public byte[] encodeReminders(ArrayList<? extends Reminder> reminders) {
         return null;
     }

From 81c9aa5fafe4d71e11a8543b091caffcbfb33075 Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Tue, 19 Dec 2023 21:08:25 +0100
Subject: [PATCH 257/595] Pixoo: support "clap hands to turn off screen" and
 "sleep after silence" settings

Also fix crc calculation :P
---
 .../DeviceSettingsPreferenceConst.java           |  2 ++
 .../DeviceSpecificSettingsFragment.java          | 14 ++++++++------
 .../devices/divoom/PixooCoordinator.java         |  1 +
 .../service/devices/divoom/PixooProtocol.java    | 16 +++++++++++++++-
 app/src/main/res/values/strings.xml              |  4 ++++
 5 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
index 1d134d257..f80bf891b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
@@ -396,4 +396,6 @@ public class DeviceSettingsPreferenceConst {
     public static final String PREF_DEVICE_ACTION_WOKE_UP_BROADCAST = "prefs_events_forwarding_wokeup_broadcast";
     public static final String PREF_DEVICE_ACTION_START_NON_WEAR_SELECTIONS = "events_forwarding_startnonwear_action_selections";
     public static final String PREF_DEVICE_ACTION_START_NON_WEAR_BROADCAST = "prefs_events_forwarding_startnonwear_broadcast";
+    public static final String PREF_CLAP_HANDS_TO_WAKEUP_DEVICE = "pref_key_clap_hands_to_wakeup_device";
+    public static final String PREF_POWER_SAVING = "pref_key_power_saving";
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
index 9e28287c5..f4eadc410 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
@@ -144,10 +144,10 @@ public class DeviceSpecificSettingsFragment extends AbstractPreferenceFragment i
                     ListPreference languageListPreference = findPreference("language");
                     CharSequence[] entries = languageListPreference.getEntries();
                     CharSequence[] values = languageListPreference.getEntryValues();
-                    for (int i=entries.length-1;i>=0;i--) {
-                        if (!ArrayUtils.contains(supportedLanguages,values[i])) {
-                            entries = ArrayUtils.remove(entries,i);
-                            values = ArrayUtils.remove(values,i);
+                    for (int i = entries.length - 1; i >= 0; i--) {
+                        if (!ArrayUtils.contains(supportedLanguages, values[i])) {
+                            entries = ArrayUtils.remove(entries, i);
+                            values = ArrayUtils.remove(values, i);
                         }
                     }
                     languageListPreference.setEntries(entries);
@@ -324,7 +324,6 @@ public class DeviceSpecificSettingsFragment extends AbstractPreferenceFragment i
         }
 
 
-
         addPreferenceHandlerFor(PREF_SWIPE_UNLOCK);
         addPreferenceHandlerFor(PREF_MI2_DATEFORMAT);
         addPreferenceHandlerFor(PREF_DATEFORMAT);
@@ -566,6 +565,9 @@ public class DeviceSpecificSettingsFragment extends AbstractPreferenceFragment i
         addPreferenceHandlerFor(PREF_SLEEP_MODE_SCHEDULE_START);
         addPreferenceHandlerFor(PREF_SLEEP_MODE_SCHEDULE_END);
 
+        addPreferenceHandlerFor(PREF_CLAP_HANDS_TO_WAKEUP_DEVICE);
+        addPreferenceHandlerFor(PREF_POWER_SAVING);
+
         addPreferenceHandlerFor("lock");
 
         String sleepTimeState = prefs.getString(PREF_SLEEP_TIME, PREF_DO_NOT_DISTURB_OFF);
@@ -981,7 +983,7 @@ public class DeviceSpecificSettingsFragment extends AbstractPreferenceFragment i
         }
 
         final Preference notificationSettings = findPreference(PREFS_PER_APP_NOTIFICATION_SETTINGS);
-        if(notificationSettings != null) {
+        if (notificationSettings != null) {
             notificationSettings.setOnPreferenceClickListener(preference -> {
                 final Intent intent = new Intent(getContext(), AppSpecificNotificationSettingsActivity.class);
                 intent.putExtra(GBDevice.EXTRA_DEVICE, getDevice());
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/divoom/PixooCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/divoom/PixooCoordinator.java
index ac7893521..5b8e877fb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/divoom/PixooCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/divoom/PixooCoordinator.java
@@ -79,6 +79,7 @@ public class PixooCoordinator extends AbstractBLEDeviceCoordinator {
     @Override
     public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
         return new int[]{
+                R.xml.devicesettings_pixoo,
                 R.xml.devicesettings_screen_brightness,
                 R.xml.devicesettings_timeformat,
         };
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooProtocol.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooProtocol.java
index b3a2af975..53ce5b2c6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooProtocol.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooProtocol.java
@@ -174,6 +174,20 @@ public class PixooProtocol extends GBDeviceProtocol {
                         0x2d,
                         (byte) (is24hour ? 1 : 0),
                 });
+            case DeviceSettingsPreferenceConst.PREF_CLAP_HANDS_TO_WAKEUP_DEVICE:
+                boolean clap = prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_CLAP_HANDS_TO_WAKEUP_DEVICE, false);
+
+                return encodeProtocol(new byte[]{
+                        (byte) 0xa7,
+                        (byte) (clap ? 1 : 0),
+                });
+            case DeviceSettingsPreferenceConst.PREF_POWER_SAVING:
+                boolean power_saving = prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_POWER_SAVING, false);
+
+                return encodeProtocol(new byte[]{
+                        (byte) 0xb2,
+                        (byte) (power_saving ? 1 : 0),
+                });
 
         }
 
@@ -363,7 +377,7 @@ public class PixooProtocol extends GBDeviceProtocol {
         msgBuf.put(payload);
         short crc = (short) (((payload.length + 2) & 0xff) + ((payload.length + 2) >> 8));
         for (byte b : payload) {
-            crc += b;
+            crc += (b & 0xff);
         }
         msgBuf.putShort(crc);
         msgBuf.put((byte) 0x02);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c0857fced..47754acd3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -493,6 +493,10 @@
     <string name="zetime_signaling_beep_once">Beep once</string>
     <string name="zetime_signaling_beep_twice">Beep twice</string>
     <string name="zetime_signaling_vibrate_beep_once">Vibrate and beep once</string>
+    <!-- pixoo specific settings -->
+    <string name="clap_hands_to_wakeup_device">Clap hands to turn up screen</string>"
+    <string name="clap_hands_to_wakeup_device_summary">Clapping again will turn off the screen</string>"
+    <string name="pixoo_power_saving_summary">The screen will turn off after the microphone has detected silence for a while</string>
     <!-- Device specific settings -->
     <string name="title_activity_device_specific_settings">Device specific settings</string>
     <string name="pref_title_authkey">Auth Key</string>

From 4f75141d766bb7d34b1d97b4c472502078acef4a Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Wed, 20 Dec 2023 15:05:23 +0100
Subject: [PATCH 258/595] pixoo: add missing settings xml file

---
 app/src/main/res/xml/devicesettings_pixoo.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 app/src/main/res/xml/devicesettings_pixoo.xml

diff --git a/app/src/main/res/xml/devicesettings_pixoo.xml b/app/src/main/res/xml/devicesettings_pixoo.xml
new file mode 100644
index 000000000..6120c78cb
--- /dev/null
+++ b/app/src/main/res/xml/devicesettings_pixoo.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <SwitchPreferenceCompat
+        android:icon="@drawable/ic_power_settings_new"
+        android:key="pref_key_clap_hands_to_wakeup_device"
+        android:title="@string/clap_hands_to_wakeup_device"
+        android:summary="@string/clap_hands_to_wakeup_device_summary"
+        android:defaultValue="false" />
+    <SwitchPreferenceCompat
+        android:icon="@drawable/ic_music_note"
+        android:key="pref_key_power_saving"
+        android:title="@string/power_saving"
+        android:summary="@string/pixoo_power_saving_summary"
+        android:defaultValue="false" />
+</androidx.preference.PreferenceScreen>

From cb66cd742a87fe7bdfa61e665536e3aacbd6eb66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Wed, 20 Dec 2023 19:09:49 +0000
Subject: [PATCH 259/595] Xiaomi: Enable activity sync on debug and nightly
 builds

---
 .../freeyourgadget/gadgetbridge/GBApplication.java         | 4 ++++
 .../gadgetbridge/devices/xiaomi/XiaomiCoordinator.java     | 7 +++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
index 496ea4fde..46d7a4428 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
@@ -1562,6 +1562,10 @@ public class GBApplication extends Application {
         return BuildConfig.APPLICATION_ID.contains("nightly");
     }
 
+    public static boolean isDebug() {
+        return BuildConfig.DEBUG;
+    }
+
     public String getVersion() {
         try {
             return getPackageManager().getPackageInfo(getPackageName(), PackageManager.GET_META_DATA).versionName;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
index 5ffea8ea8..66f87d3dd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
@@ -34,7 +34,6 @@ import java.util.List;
 import java.util.UUID;
 import java.util.regex.Pattern;
 
-import nodomain.freeyourgadget.gadgetbridge.BuildConfig;
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 import nodomain.freeyourgadget.gadgetbridge.GBException;
 import nodomain.freeyourgadget.gadgetbridge.R;
@@ -226,19 +225,19 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
     @Override
     public boolean supportsActivityDataFetching() {
         // TODO It does, but not yet fully working - only in Mi Band 8
-        return false;
+        return GBApplication.isDebug() || GBApplication.isNightly();
     }
 
     @Override
     public boolean supportsActivityTracking() {
         // TODO It does, but not yet fully working - only in Mi Band 8
-        return false;
+        return GBApplication.isDebug() || GBApplication.isNightly();
     }
 
     @Override
     public boolean supportsActivityTracks() {
         // TODO It does, but not yet fully working - only in Mi Band 8
-        return false;
+        return GBApplication.isDebug() || GBApplication.isNightly();
     }
 
     @Override

From 0ca35ad935bcfa61c64a676a0831dfd907952b35 Mon Sep 17 00:00:00 2001
From: LuK1337 <priv.luk@gmail.com>
Date: Tue, 19 Dec 2023 00:15:53 +0100
Subject: [PATCH 260/595] Xiaomi: Handle find phone messages without `system`
 properly

After find phone is stopped, watch sends a `Command` message back
without `system` set, and because of missing hasSystem() check, we'd
wrongly go to condition that sets findPhoneEvent.event to START.
---
 .../xiaomi/services/XiaomiSystemService.java       | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
index 5b3b153b4..ca75467c3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
@@ -159,13 +159,15 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
                 return;
             case CMD_FIND_PHONE:
                 LOG.debug("Got find phone: {}", cmd.getSystem().getFindDevice());
-                final GBDeviceEventFindPhone findPhoneEvent = new GBDeviceEventFindPhone();
-                if (cmd.getSystem().getFindDevice() == 0) {
-                    findPhoneEvent.event = GBDeviceEventFindPhone.Event.START;
-                } else {
-                    findPhoneEvent.event = GBDeviceEventFindPhone.Event.STOP;
+                if (cmd.hasSystem()) {
+                    final GBDeviceEventFindPhone findPhoneEvent = new GBDeviceEventFindPhone();
+                    if (cmd.getSystem().getFindDevice() == 0) {
+                        findPhoneEvent.event = GBDeviceEventFindPhone.Event.START;
+                    } else {
+                        findPhoneEvent.event = GBDeviceEventFindPhone.Event.STOP;
+                    }
+                    getSupport().evaluateGBDeviceEvent(findPhoneEvent);
                 }
-                getSupport().evaluateGBDeviceEvent(findPhoneEvent);
                 return;
             case CMD_DISPLAY_ITEMS_GET:
                 handleDisplayItems(cmd.getSystem().getDisplayItems());

From 4c0750e75aaf1666d208f5085d8869cd3ab3bf2a Mon Sep 17 00:00:00 2001
From: Arjan Schrijver <a_gadgetbridge@anymore.nl>
Date: Thu, 21 Dec 2023 11:16:23 +0100
Subject: [PATCH 261/595] Add missing navigation actions to GMaps handler

---
 .../GoogleMapsNotificationHandler.java        | 274 +++++++++++++++++-
 .../model/NavigationInfoSpec.java             |   1 +
 2 files changed, 274 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/notifications/GoogleMapsNotificationHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/notifications/GoogleMapsNotificationHandler.java
index 74d68d36d..e2777ff97 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/notifications/GoogleMapsNotificationHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/notifications/GoogleMapsNotificationHandler.java
@@ -209,7 +209,75 @@ public class GoogleMapsNotificationHandler {
                 0b00000000000000000000000000000000,
                 0b00000000000000000000000000000000,
                 0b00000000000000000000000000000000
-    }));
+        }));
+        knownImages.add(new IconType(NavigationInfoSpec.ACTION_TURN_LEFT_SLIGHTLY, new int[]{
+                0b00000000000000000000000000000000,
+                0b00000000000000000000000000000000,
+                0b00000000000000000000000000000000,
+                0b00000000000000000000000000000000,
+                0b00000011111111111000000000000000,
+                0b00000111111111111000000000000000,
+                0b00000111111111111000000000000000,
+                0b00000111111100000000000000000000,
+                0b00000111111100000000000000000000,
+                0b00000111111110000000000000000000,
+                0b00000111111111000000000000000000,
+                0b00000111101111100000000000000000,
+                0b00000111100011110000000000000000,
+                0b00000111100011111000000000000000,
+                0b00000111100001111100000000000000,
+                0b00000011000000111110000000000000,
+                0b00000000000000011110000000000000,
+                0b00000000000000011111000000000000,
+                0b00000000000000001111000000000000,
+                0b00000000000000001111000000000000,
+                0b00000000000000001111000000000000,
+                0b00000000000000001111000000000000,
+                0b00000000000000001111000000000000,
+                0b00000000000000001111000000000000,
+                0b00000000000000001111000000000000,
+                0b00000000000000001111000000000000,
+                0b00000000000000001111000000000000,
+                0b00000000000000001111000000000000,
+                0b00000000000000000000000000000000,
+                0b00000000000000000000000000000000,
+                0b00000000000000000000000000000000,
+                0b00000000000000000000000000000000
+        }));
+        knownImages.add(new IconType(NavigationInfoSpec.ACTION_TURN_LEFT_SLIGHTLY, new int[]{
+                0b00000000000000000000000000000000,
+                0b00000000000000000000000000000000,
+                0b00000000000000000000000000000000,
+                0b00000000000000000000000000000000,
+                0b00000111111111111000000000000000,
+                0b00000111111111111000000000000000,
+                0b00000111111111111000000000000000,
+                0b00000111111000000000000000000000,
+                0b00000111111100000000000000000000,
+                0b00000111111110000000000000000000,
+                0b00000111111111000000000000000000,
+                0b00000111101111100000000000000000,
+                0b00000111100111110000000000000000,
+                0b00000111100011111000000000000000,
+                0b00000111100001111100000000000000,
+                0b00000011000000111100000000000000,
+                0b00000000000000011110000000000000,
+                0b00000000000000011110000000000000,
+                0b00000000000000001111000000000000,
+                0b00000000000000001111000000000000,
+                0b00000000000000001111000000000000,
+                0b00000000000000001111000000000000,
+                0b00000000000000001111000000000000,
+                0b00000000000000001111000000000000,
+                0b00000000000000001111000000000000,
+                0b00000000000000001111000000000000,
+                0b00000000000000001111000000000000,
+                0b00000000000000001111000000000000,
+                0b00000000000000000000000000000000,
+                0b00000000000000000000000000000000,
+                0b00000000000000000000000000000000,
+                0b00000000000000000000000000000000
+        }));
         knownImages.add(new IconType(NavigationInfoSpec.ACTION_TURN_RIGHT_SLIGHTLY, new int[]{
                 0b00000000000000000000000000000000,
                 0b00000000000000000000000000000000,
@@ -244,6 +312,142 @@ public class GoogleMapsNotificationHandler {
                 0b00000000000000000000000000000000,
                 0b00000000000000000000000000000000
         }));
+        knownImages.add(new IconType(NavigationInfoSpec.ACTION_TURN_RIGHT_SLIGHTLY, new int[]{
+                0b00000000000000000000000000000000,
+                0b00000000000000000000000000000000,
+                0b00000000000000000000000000000000,
+                0b00000000000000000000000000000000,
+                0b00000000000000000111110000000000,
+                0b00000000000000000111111000000000,
+                0b00000000000000000011111110000000,
+                0b00000000000000000000111111100000,
+                0b00000000000000000000011111110000,
+                0b00000000000000000001111111110000,
+                0b00000000000000001111111111110000,
+                0b00000000000000111111111111100000,
+                0b00000000000011111111101111100000,
+                0b00000000000111111100001111000000,
+                0b00000000011111100000001110000000,
+                0b00000011111110000000011110000000,
+                0b00000011111100000000111100000000,
+                0b00000011111000000000011100000000,
+                0b00000011111000000000001000000000,
+                0b00000011110000000000000000000000,
+                0b00000011100000000000000000000000,
+                0b00000111100000000000000000000000,
+                0b00000111100000000000000000000000,
+                0b00000111100000000000000000000000,
+                0b00000111100000000000000000000000,
+                0b00000111100000000000000000000000,
+                0b00000111100000000000000000000000,
+                0b00000111100000000000000000000000,
+                0b00000000000000000000000000000000,
+                0b00000000000000000000000000000000,
+                0b00000000000000000000000000000000,
+                0b00000000000000000000000000000000
+        }));
+        knownImages.add(new IconType(NavigationInfoSpec.ACTION_TURN_RIGHT_SLIGHTLY, new int[]{
+                0b00000000000000000000000000000000,
+                0b00000000000000000000000000000000,
+                0b00000000000000000000000000000000,
+                0b00000000000000000000000000000000,
+                0b00000000000000011111111111100000,
+                0b00000000000000011111111111100000,
+                0b00000000000000011111111111100000,
+                0b00000000000000000000011111100000,
+                0b00000000000000000000111111100000,
+                0b00000000000000000001111111100000,
+                0b00000000000000000011111111100000,
+                0b00000000000000000111110111100000,
+                0b00000000000000001111100111100000,
+                0b00000000000000011111000111100000,
+                0b00000000000000111110000111100000,
+                0b00000000000000111100000011000000,
+                0b00000000000001111000000000000000,
+                0b00000000000001111000000000000000,
+                0b00000000000011110000000000000000,
+                0b00000000000011110000000000000000,
+                0b00000000000011110000000000000000,
+                0b00000000000011110000000000000000,
+                0b00000000000011110000000000000000,
+                0b00000000000011110000000000000000,
+                0b00000000000011110000000000000000,
+                0b00000000000011110000000000000000,
+                0b00000000000011110000000000000000,
+                0b00000000000011110000000000000000,
+                0b00000000000000000000000000000000,
+                0b00000000000000000000000000000000,
+                0b00000000000000000000000000000000,
+                0b00000000000000000000000000000000
+        }));
+        knownImages.add(new IconType(NavigationInfoSpec.ACTION_TURN_RIGHT_SLIGHTLY, new int[]{
+                0b00000000000000000000000000000000,
+                0b00000000000000000000000000000000,
+                0b00000000000000000000000000000000,
+                0b00000000000000000011000000000000,
+                0b00000000000000000011100000000000,
+                0b00000000000000000111111000000000,
+                0b00000000000000000011111110000000,
+                0b00000000000000000000111111100000,
+                0b00000000000000000000001111110000,
+                0b00000000000000000000111111110000,
+                0b00000000000000001111111111110000,
+                0b00000000000000111111111111100000,
+                0b00000000000011111111110111100000,
+                0b00000000000111111100001111000000,
+                0b00000000001111100000001111000000,
+                0b00000000111110000000011110000000,
+                0b00000001111100000000011100000000,
+                0b00000001111000000000111100000000,
+                0b00000011111000000000001000000000,
+                0b00000011110000000000000000000000,
+                0b00000011110000000000000000000000,
+                0b00000111100000000000000000000000,
+                0b00000111100000000000000000000000,
+                0b00000111100000000000000000000000,
+                0b00000111100000000000000000000000,
+                0b00000111100000000000000000000000,
+                0b00000111100000000000000000000000,
+                0b00000111100000000000000000000000,
+                0b00000000000000000000000000000000,
+                0b00000000000000000000000000000000,
+                0b00000000000000000000000000000000,
+                0b00000000000000000000000000000000
+        }));
+        knownImages.add(new IconType(NavigationInfoSpec.ACTION_TURN_RIGHT_SLIGHTLY, new int[]{
+                0b00000000000000000000000000000000,
+                0b00000000000000000000000000000000,
+                0b00000000000000000000000000000000,
+                0b00000000000000000000000000000000,
+                0b00000000000000011111111111100000,
+                0b00000000000000011111111111100000,
+                0b00000000000000011111111111100000,
+                0b00000000000000000000011111100000,
+                0b00000000000000000000111111100000,
+                0b00000000000000000001111111100000,
+                0b00000000000000000011111111100000,
+                0b00000000000000000111110111100000,
+                0b00000000000000001111100111100000,
+                0b00000000000000011111000111100000,
+                0b00000000000000111110000111100000,
+                0b00000000000000111100000011000000,
+                0b00000000000001111000000000000000,
+                0b00000000000001111000000000000000,
+                0b00000000000011110000000000000000,
+                0b00000000000011110000000000000000,
+                0b00000000000011110000000000000000,
+                0b00000000000011110000000000000000,
+                0b00000000000011110000000000000000,
+                0b00000000000011110000000000000000,
+                0b00000000000011110000000000000000,
+                0b00000000000011110000000000000000,
+                0b00000000000011110000000000000000,
+                0b00000000000011110000000000000000,
+                0b00000000000000000000000000000000,
+                0b00000000000000000000000000000000,
+                0b00000000000000000000000000000000,
+                0b00000000000000000000000000000000
+        }));
         knownImages.add(new IconType(NavigationInfoSpec.ACTION_UTURN_LEFT, new int[]{
                 0b00000000000000000000000000000000, // LHD
                 0b00000000000000000000000000000000,
@@ -891,6 +1095,74 @@ public class GoogleMapsNotificationHandler {
                 0b00000000000000000000000000000000,
                 0b00000000000000000000000000000000,
         }));
+        knownImages.add(new IconType(NavigationInfoSpec.ACTION_MERGE, new int[]{
+                0b00000000000000000000000000000000,
+                0b00000000000000000000000000000000,
+                0b00000000000000000000000000000000,
+                0b00000000000000000000000000000000,
+                0b00000000000000011000000000000000,
+                0b00000000000000111100000000000000,
+                0b00000000000001111110000000000000,
+                0b00000000000011111111000000000000,
+                0b00000000000111111111100000000000,
+                0b00000000001111111111110000000000,
+                0b00000000011111111111111000000000,
+                0b00000000011111111111111000000000,
+                0b00000000111100111100111100000000,
+                0b00000000011000111100011000000000,
+                0b00000000000000111100000000000000,
+                0b00000000000000111100000000000000,
+                0b00000000000001111110000000000000,
+                0b00000000000001111110000000000000,
+                0b00000000000011111111000000000000,
+                0b00000000000111100111100000000000,
+                0b00000000001111100111110000000000,
+                0b00000000011111000011110000000000,
+                0b00000000011110000001111000000000,
+                0b00000000011100000000111000000000,
+                0b00000000111100000000111100000000,
+                0b00000000111100000000111100000000,
+                0b00000000111000000000011100000000,
+                0b00000000111000000000011100000000,
+                0b00000000000000000000000000000000,
+                0b00000000000000000000000000000000,
+                0b00000000000000000000000000000000,
+                0b00000000000000000000000000000000
+        }));
+        knownImages.add(new IconType(NavigationInfoSpec.ACTION_MERGE, new int[]{
+                0b00000000000000000000000000000000,
+                0b00000000000000000000000000000000,
+                0b00000000000000000000000000000000,
+                0b00000000000000000000000000000000,
+                0b00000000000000011000000000000000,
+                0b00000000000000111100000000000000,
+                0b00000000000001111110000000000000,
+                0b00000000000011111111000000000000,
+                0b00000000000111111111100000000000,
+                0b00000000001111111111110000000000,
+                0b00000000011111111111111000000000,
+                0b00000000111110111101111100000000,
+                0b00000000111100111100111100000000,
+                0b00000000011000111100011000000000,
+                0b00000000000000111100000000000000,
+                0b00000000000000111100000000000000,
+                0b00000000000001111110000000000000,
+                0b00000000000001111110000000000000,
+                0b00000000000011111111000000000000,
+                0b00000000000111100111100000000000,
+                0b00000000001111000011110000000000,
+                0b00000000001111000011110000000000,
+                0b00000000011110000001111000000000,
+                0b00000000011100000000111000000000,
+                0b00000000111100000000111100000000,
+                0b00000000111000000000011100000000,
+                0b00000000111000000000011100000000,
+                0b00000000111000000000011100000000,
+                0b00000000000000000000000000000000,
+                0b00000000000000000000000000000000,
+                0b00000000000000000000000000000000,
+                0b00000000000000000000000000000000
+        }));
     }
 
     public boolean handle(Context context, StatusBarNotification sbn) {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/NavigationInfoSpec.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/NavigationInfoSpec.java
index 297861fbc..134e37e04 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/NavigationInfoSpec.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/NavigationInfoSpec.java
@@ -34,6 +34,7 @@ public class NavigationInfoSpec {
     public static final int ACTION_ROUNDABOUT_STRAIGHT = 15;
     public static final int ACTION_ROUNDABOUT_UTURN = 16;
     public static final int ACTION_FINISH = 17;
+    public static final int ACTION_MERGE = 18;
 
     // ETA? Total Distance?
     public String instruction;

From 149b6236a0a876b1a8adb282da3cbc4bb5c4dad8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 22 Dec 2023 12:26:15 +0000
Subject: [PATCH 262/595] Mijia LYWSD: Make support class generic

---
 .../MijiaLywsd02Coordinator.java              | 78 +------------------
 .../gadgetbridge/model/DeviceType.java        |  2 +-
 .../MijiaLywsdSupport.java}                   | 39 ++++------
 3 files changed, 18 insertions(+), 101 deletions(-)
 rename app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/{mijia_lywsd02 => mijia_lywsd}/MijiaLywsd02Coordinator.java (63%)
 rename app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/{mijia_lywsd02/MijiaLywsd02Support.java => mijia_lywsd/MijiaLywsdSupport.java} (85%)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/mijia_lywsd02/MijiaLywsd02Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/mijia_lywsd/MijiaLywsd02Coordinator.java
similarity index 63%
rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/mijia_lywsd02/MijiaLywsd02Coordinator.java
rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/mijia_lywsd/MijiaLywsd02Coordinator.java
index cad6d1c1f..2e0f30281 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/mijia_lywsd02/MijiaLywsd02Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/mijia_lywsd/MijiaLywsd02Coordinator.java
@@ -15,9 +15,8 @@
 
     You should have received a copy of the GNU Affero General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.devices.mijia_lywsd02;
+package nodomain.freeyourgadget.gadgetbridge.devices.mijia_lywsd;
 
-import android.app.Activity;
 import android.content.Context;
 import android.net.Uri;
 
@@ -28,15 +27,11 @@ import java.util.regex.Pattern;
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.AbstractBLEDeviceCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
-import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
-import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
-import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.mijia_lywsd02.MijiaLywsd02Support;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.mijia_lywsd.MijiaLywsdSupport;
 
 public class MijiaLywsd02Coordinator extends AbstractBLEDeviceCoordinator {
     @Override
@@ -49,11 +44,6 @@ public class MijiaLywsd02Coordinator extends AbstractBLEDeviceCoordinator {
         return BONDING_STYLE_NONE;
     }
 
-    @Override
-    public Class<? extends Activity> getPairingActivity() {
-        return null;
-    }
-
     @Override
     public InstallHandler findInstallHandler(Uri uri, Context context) {
         return null;
@@ -64,75 +54,15 @@ public class MijiaLywsd02Coordinator extends AbstractBLEDeviceCoordinator {
         return false;
     }
 
-    @Override
-    public boolean supportsActivityTracking() {
-        return false;
-    }
-
-    @Override
-    public SampleProvider<? extends ActivitySample> getSampleProvider(GBDevice device, DaoSession session) {
-        return null;
-    }
-
-    @Override
-    public boolean supportsScreenshots() {
-        return false;
-    }
-
-    @Override
-    public int getAlarmSlotCount(GBDevice device) {
-        return 0;
-    }
-
-    @Override
-    public boolean supportsSmartWakeup(GBDevice device) {
-        return false;
-    }
-
-    @Override
-    public boolean supportsHeartRateMeasurement(GBDevice device) {
-        return false;
-    }
-
     @Override
     public String getManufacturer() {
         return "Xiaomi";
     }
 
-    @Override
-    public boolean supportsAppsManagement(final GBDevice device) {
-        return false;
-    }
-
-    @Override
-    public Class<? extends Activity> getAppsManagementActivity() {
-        return null;
-    }
-
-    @Override
-    public boolean supportsCalendarEvents() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsRealtimeData() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsWeather() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsFindDevice() {
-        return false;
-    }
-
     @NonNull
     @Override
     public Class<? extends DeviceSupport> getDeviceSupportClass() {
-        return MijiaLywsd02Support.class;
+        return MijiaLywsdSupport.class;
     }
 
     @Override
@@ -147,13 +77,11 @@ public class MijiaLywsd02Coordinator extends AbstractBLEDeviceCoordinator {
         // nothing to delete, yet
     }
 
-
     @Override
     public int getDeviceNameResource() {
         return R.string.devicetype_mijia_lywsd02;
     }
 
-
     @Override
     public int getDefaultIconResource() {
         return R.drawable.ic_device_pebble;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
index 4a9bdf251..455bb629a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
@@ -109,7 +109,7 @@ import nodomain.freeyourgadget.gadgetbridge.devices.lenovo.watchxplus.WatchXPlus
 import nodomain.freeyourgadget.gadgetbridge.devices.liveview.LiveviewCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.makibeshr3.MakibesHR3Coordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandCoordinator;
-import nodomain.freeyourgadget.gadgetbridge.devices.mijia_lywsd02.MijiaLywsd02Coordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.mijia_lywsd.MijiaLywsd02Coordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.miscale2.MiScale2DeviceCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.no1f1.No1F1Coordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.nothing.Ear1Coordinator;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/mijia_lywsd02/MijiaLywsd02Support.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/mijia_lywsd/MijiaLywsdSupport.java
similarity index 85%
rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/mijia_lywsd02/MijiaLywsd02Support.java
rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/mijia_lywsd/MijiaLywsdSupport.java
index 01a6ee7de..db83af7ad 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/mijia_lywsd02/MijiaLywsd02Support.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/mijia_lywsd/MijiaLywsdSupport.java
@@ -1,5 +1,5 @@
 /*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Sebastian
-    Kranz, Davis Mosenkovs
+    Kranz, Davis Mosenkovs, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -15,19 +15,17 @@
 
     You should have received a copy of the GNU Affero General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.service.devices.mijia_lywsd02;
+package nodomain.freeyourgadget.gadgetbridge.service.devices.mijia_lywsd;
 
 import android.bluetooth.BluetoothGatt;
 import android.bluetooth.BluetoothGattCharacteristic;
 import android.content.Intent;
-import android.net.Uri;
 import android.widget.Toast;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Objects;
 import java.util.SimpleTimeZone;
 import java.util.UUID;
@@ -37,32 +35,23 @@ import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSett
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventBatteryInfo;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventVersionInfo;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.model.Alarm;
 import nodomain.freeyourgadget.gadgetbridge.model.BatteryState;
-import nodomain.freeyourgadget.gadgetbridge.model.CalendarEventSpec;
-import nodomain.freeyourgadget.gadgetbridge.model.CallSpec;
-import nodomain.freeyourgadget.gadgetbridge.model.CannedMessagesSpec;
-import nodomain.freeyourgadget.gadgetbridge.model.MusicSpec;
-import nodomain.freeyourgadget.gadgetbridge.model.MusicStateSpec;
-import nodomain.freeyourgadget.gadgetbridge.model.NotificationSpec;
-import nodomain.freeyourgadget.gadgetbridge.model.WeatherSpec;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.AbstractBTLEDeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.GattService;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetDeviceStateAction;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.profiles.IntentListener;
-import nodomain.freeyourgadget.gadgetbridge.service.btle.profiles.battery.BatteryInfoProfile;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.profiles.deviceinfo.DeviceInfoProfile;
 import nodomain.freeyourgadget.gadgetbridge.util.GB;
 
-public class MijiaLywsd02Support extends AbstractBTLEDeviceSupport {
+public class MijiaLywsdSupport extends AbstractBTLEDeviceSupport {
 
-    private static final Logger LOG = LoggerFactory.getLogger(MijiaLywsd02Support.class);
+    private static final Logger LOG = LoggerFactory.getLogger(MijiaLywsdSupport.class);
     private static final UUID UUID_TIME = UUID.fromString("ebe0ccb7-7a0a-4b0c-8a1a-6ff2997da3a6");
     private static final UUID UUID_BATTERY = UUID.fromString("ebe0ccc4-7a0a-4b0c-8a1a-6ff2997da3a6");
     private static final UUID UUID_SCALE = UUID.fromString("ebe0ccbe-7a0a-4b0c-8a1a-6ff2997da3a6");
     private static final UUID UUID_CONN_INTERVAL = UUID.fromString("ebe0ccd8-7a0a-4b0c-8a1a-6ff2997da3a6");
-    private final DeviceInfoProfile<MijiaLywsd02Support> deviceInfoProfile;
+    private final DeviceInfoProfile<MijiaLywsdSupport> deviceInfoProfile;
     private final GBDeviceEventVersionInfo versionCmd = new GBDeviceEventVersionInfo();
     private final GBDeviceEventBatteryInfo batteryCmd = new GBDeviceEventBatteryInfo();
     private final IntentListener mListener = new IntentListener() {
@@ -75,7 +64,7 @@ public class MijiaLywsd02Support extends AbstractBTLEDeviceSupport {
         }
     };
 
-    public MijiaLywsd02Support() {
+    public MijiaLywsdSupport() {
         super(LOG);
         addSupportedService(GattService.UUID_SERVICE_GENERIC_ACCESS);
         addSupportedService(GattService.UUID_SERVICE_GENERIC_ATTRIBUTE);
@@ -102,10 +91,10 @@ public class MijiaLywsd02Support extends AbstractBTLEDeviceSupport {
     }
 
     private void setTime(TransactionBuilder builder) {
-        BluetoothGattCharacteristic timeCharacteristc = getCharacteristic(MijiaLywsd02Support.UUID_TIME);
+        BluetoothGattCharacteristic timeCharacteristc = getCharacteristic(MijiaLywsdSupport.UUID_TIME);
         long ts = System.currentTimeMillis();
         byte offsetHours = (byte) (SimpleTimeZone.getDefault().getOffset(ts) / (1000 * 60 * 60));
-        ts = ( ts + 250 + 500 ) / 1000; // round to seconds with +250 ms to compensate for BLE connection interval
+        ts = (ts + 250 + 500) / 1000; // round to seconds with +250 ms to compensate for BLE connection interval
         builder.write(timeCharacteristc, new byte[]{
                 (byte) (ts & 0xff),
                 (byte) ((ts >> 8) & 0xff),
@@ -115,18 +104,18 @@ public class MijiaLywsd02Support extends AbstractBTLEDeviceSupport {
     }
 
     private void setConnectionInterval(TransactionBuilder builder) {
-        BluetoothGattCharacteristic intervalCharacteristc = getCharacteristic(MijiaLywsd02Support.UUID_CONN_INTERVAL);
-        builder.write(intervalCharacteristc, new byte[]{ (byte) 0xf4, (byte) 0x01 }); // maximum interval of 500 ms
+        BluetoothGattCharacteristic intervalCharacteristc = getCharacteristic(MijiaLywsdSupport.UUID_CONN_INTERVAL);
+        builder.write(intervalCharacteristc, new byte[]{(byte) 0xf4, (byte) 0x01}); // maximum interval of 500 ms
     }
 
     private void getBatteryInfo(TransactionBuilder builder) {
-        BluetoothGattCharacteristic batteryCharacteristc = getCharacteristic(MijiaLywsd02Support.UUID_BATTERY);
+        BluetoothGattCharacteristic batteryCharacteristc = getCharacteristic(MijiaLywsdSupport.UUID_BATTERY);
         builder.read(batteryCharacteristc);
     }
 
     private void setTemperatureScale(TransactionBuilder builder, String scale) {
-        BluetoothGattCharacteristic scaleCharacteristc = getCharacteristic(MijiaLywsd02Support.UUID_SCALE);
-        builder.write(scaleCharacteristc, new byte[]{ (byte) ("f".equals(scale) ? 0x01 : 0xff) });
+        BluetoothGattCharacteristic scaleCharacteristc = getCharacteristic(MijiaLywsdSupport.UUID_SCALE);
+        builder.write(scaleCharacteristc, new byte[]{(byte) ("f".equals(scale) ? 0x01 : 0xff)});
     }
 
     private void handleBatteryInfo(byte[] value, int status) {
@@ -191,7 +180,7 @@ public class MijiaLywsd02Support extends AbstractBTLEDeviceSupport {
         }
         UUID characteristicUUID = characteristic.getUuid();
 
-        if(MijiaLywsd02Support.UUID_BATTERY.equals(characteristicUUID)) {
+        if (MijiaLywsdSupport.UUID_BATTERY.equals(characteristicUUID)) {
             handleBatteryInfo(characteristic.getValue(), status);
             return true;
         }

From b5357841171e1417a54926200da8fa0e24ec1f94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 22 Dec 2023 12:35:33 +0000
Subject: [PATCH 263/595] Mijia LYWSD03MMC: Initial support

Same protocol as LYWSD02, but does not support setting the time.
---
 README.md                                     |  1 +
 .../AbstractMijiaLywsdCoordinator.java        | 74 +++++++++++++++++++
 .../mijia_lywsd/MijiaLywsd02Coordinator.java  | 59 ++-------------
 .../mijia_lywsd/MijiaLywsd03Coordinator.java  | 49 ++++++++++++
 .../gadgetbridge/model/DeviceType.java        |  2 +
 .../mijia_lywsd/MijiaLywsdSupport.java        |  8 +-
 app/src/main/res/values/strings.xml           |  1 +
 7 files changed, 141 insertions(+), 53 deletions(-)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/mijia_lywsd/AbstractMijiaLywsdCoordinator.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/mijia_lywsd/MijiaLywsd03Coordinator.java

diff --git a/README.md b/README.md
index f0d4d6156..9a014c42c 100644
--- a/README.md
+++ b/README.md
@@ -107,6 +107,7 @@ vendor's servers.
     - Redmi Watch 3 Active (experimental) [**\[!\]**](#special-pairing-procedures)
 	- Watch S1 Active (experimental) [**\[!\]**](#special-pairing-procedures)
 	- Xiaomi Temperature and Humidity Monitor Clock (LYWSD02/LYWSD02MMC) (partial support)
+	- Xiaomi Mijia Temperature and Humidity Sensor 2 (LYWSD03MMC) (partial support)
 	- Scale 2 (Currently only displays a toast after stepping on the scale)
 - [MyKronoz ZeTime](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/MyKronoz-ZeTime)
 - NO.1 F1
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/mijia_lywsd/AbstractMijiaLywsdCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/mijia_lywsd/AbstractMijiaLywsdCoordinator.java
new file mode 100644
index 000000000..59bc4d0a1
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/mijia_lywsd/AbstractMijiaLywsdCoordinator.java
@@ -0,0 +1,74 @@
+/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+    Gobbetti, José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.mijia_lywsd;
+
+import android.content.Context;
+import android.net.Uri;
+
+import androidx.annotation.NonNull;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.devices.AbstractBLEDeviceCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.entities.Device;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.mijia_lywsd.MijiaLywsdSupport;
+
+public abstract class AbstractMijiaLywsdCoordinator extends AbstractBLEDeviceCoordinator {
+    @Override
+    public int getBondingStyle() {
+        return BONDING_STYLE_NONE;
+    }
+
+    @Override
+    public InstallHandler findInstallHandler(Uri uri, Context context) {
+        return null;
+    }
+
+    @Override
+    public boolean supportsActivityDataFetching() {
+        return false;
+    }
+
+    @Override
+    public String getManufacturer() {
+        return "Xiaomi";
+    }
+
+    @NonNull
+    @Override
+    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+        return MijiaLywsdSupport.class;
+    }
+
+    @Override
+    public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
+        return new int[]{
+                R.xml.devicesettings_temperature_scale_cf,
+        };
+    }
+
+    @Override
+    protected void deleteDevice(@NonNull GBDevice gbDevice, @NonNull Device device, @NonNull DaoSession session) {
+        // nothing to delete, yet
+    }
+
+    public abstract boolean supportsSetTime();
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/mijia_lywsd/MijiaLywsd02Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/mijia_lywsd/MijiaLywsd02Coordinator.java
index 2e0f30281..36aabf498 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/mijia_lywsd/MijiaLywsd02Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/mijia_lywsd/MijiaLywsd02Coordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+/*  Copyright (C) 2016-2023 Andreas Shimokawa, Carsten Pfeiffer, Daniele
     Gobbetti, José Rebelo
 
     This file is part of Gadgetbridge.
@@ -17,66 +17,16 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.mijia_lywsd;
 
-import android.content.Context;
-import android.net.Uri;
-
-import androidx.annotation.NonNull;
-
 import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
-import nodomain.freeyourgadget.gadgetbridge.devices.AbstractBLEDeviceCoordinator;
-import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
-import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
-import nodomain.freeyourgadget.gadgetbridge.entities.Device;
-import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.mijia_lywsd.MijiaLywsdSupport;
 
-public class MijiaLywsd02Coordinator extends AbstractBLEDeviceCoordinator {
+public class MijiaLywsd02Coordinator extends AbstractMijiaLywsdCoordinator {
     @Override
     protected Pattern getSupportedDeviceName() {
         return Pattern.compile("LYWSD02|LYWSD02MMC");
     }
 
-    @Override
-    public int getBondingStyle() {
-        return BONDING_STYLE_NONE;
-    }
-
-    @Override
-    public InstallHandler findInstallHandler(Uri uri, Context context) {
-        return null;
-    }
-
-    @Override
-    public boolean supportsActivityDataFetching() {
-        return false;
-    }
-
-    @Override
-    public String getManufacturer() {
-        return "Xiaomi";
-    }
-
-    @NonNull
-    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
-        return MijiaLywsdSupport.class;
-    }
-
-    @Override
-    public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
-        return new int[]{
-                R.xml.devicesettings_temperature_scale_cf,
-        };
-    }
-
-    @Override
-    protected void deleteDevice(@NonNull GBDevice gbDevice, @NonNull Device device, @NonNull DaoSession session) {
-        // nothing to delete, yet
-    }
-
     @Override
     public int getDeviceNameResource() {
         return R.string.devicetype_mijia_lywsd02;
@@ -91,4 +41,9 @@ public class MijiaLywsd02Coordinator extends AbstractBLEDeviceCoordinator {
     public int getDisabledIconResource() {
         return R.drawable.ic_device_pebble_disabled;
     }
+
+    @Override
+    public boolean supportsSetTime() {
+        return true;
+    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/mijia_lywsd/MijiaLywsd03Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/mijia_lywsd/MijiaLywsd03Coordinator.java
new file mode 100644
index 000000000..8b6faf0db
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/mijia_lywsd/MijiaLywsd03Coordinator.java
@@ -0,0 +1,49 @@
+/*  Copyright (C) 2016-2023 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+    Gobbetti, José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.mijia_lywsd;
+
+import java.util.regex.Pattern;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+
+public class MijiaLywsd03Coordinator extends AbstractMijiaLywsdCoordinator {
+    @Override
+    protected Pattern getSupportedDeviceName() {
+        return Pattern.compile("LYWSD03MMC");
+    }
+
+    @Override
+    public int getDeviceNameResource() {
+        return R.string.devicetype_mijia_lywsd03;
+    }
+
+    @Override
+    public int getDefaultIconResource() {
+        return R.drawable.ic_device_thermometer;
+    }
+
+    @Override
+    public int getDisabledIconResource() {
+        return R.drawable.ic_device_thermometer_disabled;
+    }
+
+    @Override
+    public boolean supportsSetTime() {
+        return false;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
index 455bb629a..d482e1a99 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
@@ -110,6 +110,7 @@ import nodomain.freeyourgadget.gadgetbridge.devices.liveview.LiveviewCoordinator
 import nodomain.freeyourgadget.gadgetbridge.devices.makibeshr3.MakibesHR3Coordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.mijia_lywsd.MijiaLywsd02Coordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.mijia_lywsd.MijiaLywsd03Coordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.miscale2.MiScale2DeviceCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.no1f1.No1F1Coordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.nothing.Ear1Coordinator;
@@ -255,6 +256,7 @@ public enum DeviceType {
     TLW64(TLW64Coordinator.class),
     PINETIME_JF(PineTimeJFCoordinator.class),
     MIJIA_LYWSD02(MijiaLywsd02Coordinator.class),
+    MIJIA_LYWSD03(MijiaLywsd03Coordinator.class),
     LEFUN(LefunDeviceCoordinator.class),
     BOHEMIC_SMART_BRACELET(BohemicSmartBraceletDeviceCoordinator.class),
     SMAQ2OSS(SMAQ2OSSCoordinator.class),
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/mijia_lywsd/MijiaLywsdSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/mijia_lywsd/MijiaLywsdSupport.java
index db83af7ad..98a8176f7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/mijia_lywsd/MijiaLywsdSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/mijia_lywsd/MijiaLywsdSupport.java
@@ -34,6 +34,7 @@ import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventBatteryInfo;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventVersionInfo;
+import nodomain.freeyourgadget.gadgetbridge.devices.mijia_lywsd.AbstractMijiaLywsdCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.model.BatteryState;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.AbstractBTLEDeviceSupport;
@@ -80,7 +81,8 @@ public class MijiaLywsdSupport extends AbstractBTLEDeviceSupport {
         builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.INITIALIZING, getContext()));
         requestDeviceInfo(builder);
 
-        if (GBApplication.getPrefs().getBoolean("datetime_synconconnect", true)) {
+        final boolean supportsSetTime = getCoordinator().supportsSetTime();
+        if (supportsSetTime && GBApplication.getPrefs().getBoolean("datetime_synconconnect", true)) {
             setTime(builder);
         }
 
@@ -90,6 +92,10 @@ public class MijiaLywsdSupport extends AbstractBTLEDeviceSupport {
         return builder;
     }
 
+    protected AbstractMijiaLywsdCoordinator getCoordinator() {
+        return (AbstractMijiaLywsdCoordinator) gbDevice.getDeviceCoordinator();
+    }
+
     private void setTime(TransactionBuilder builder) {
         BluetoothGattCharacteristic timeCharacteristc = getCharacteristic(MijiaLywsdSupport.UUID_TIME);
         long ts = System.currentTimeMillis();
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 47754acd3..aec63d525 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1400,6 +1400,7 @@
     <string name="devicetype_itag">iTag</string>
     <string name="devicetype_bfh16">BFH-16</string>
     <string name="devicetype_mijia_lywsd02">Mijia Smart Clock</string>
+    <string name="devicetype_mijia_lywsd03">Mijia Temperature and Humidity Sensor 2</string>
     <string name="devicetype_makibes_hr3">Makibes HR3</string>
     <string name="devicetype_banglejs">Bangle.js</string>
     <string name="devicetype_tlw64">TLW64</string>

From 3e0d3ccb435ba4d946cb9eb8533a72e5f0bc06eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 22 Dec 2023 17:49:04 +0000
Subject: [PATCH 264/595] Replace supported devices and features with link to
 website

---
 FEATURES.md |  35 ----------------
 README.md   | 118 +++-------------------------------------------------
 2 files changed, 5 insertions(+), 148 deletions(-)
 delete mode 100644 FEATURES.md

diff --git a/FEATURES.md b/FEATURES.md
deleted file mode 100644
index 636664a4c..000000000
--- a/FEATURES.md
+++ /dev/null
@@ -1,35 +0,0 @@
-## Feature Matrix
-
-|                                   | Pebble OG | Pebble Time/2 | Mi Band | Mi Band 2 | Mi Band 3 | Mi Band 4/5 | Amazfit Bip | Amazfit Cor |
-|-----------------------------------| ----------|---------------|---------|-----------|-----------|-------------|-------------|-------------|
-|Calls Notification                 | YES       | YES           | YES     | YES       | YES       | YES         | YES         | YES         |
-|Reject Calls                       | YES       | YES           | NO      | NO        | YES       | YES         | YES         | YES         |
-|Accept Calls                       | NO(2)     | NO(2)         | NO      | NO        | NO        | NO          | NO          | NO          |
-|Generic Notification               | YES       | YES           | YES     | YES       | YES       | YES         | YES         | YES         |
-|Dismiss Notifications on Phone     | YES       | YES           | NO      | NO        | NO        | NO          | NO          | NO          |
-|Predefined Replies                 | YES       | YES           | NO      | NO        | NO        | NO          | NO          | NO          |
-|Voice Replies                      | N/A       | NO(3)         | N/A     | N/A       | N/A       | N/A         | N/A         | N/A         |
-|Calendar Sync                      | YES       | YES           | NO      | NO        | NO        | NO          | NO(3)       | NO          |
-|Configure alarms from Gadgetbridge | NO        | NO            | YES     | YES       | YES       | YES(1)      | YES         | YES         |
-|Smart alarms                       | NO(1)     | YES           | YES     | NO        | NO        | NO          | NO          | NO          |
-|Weather                            | NO(1)     | YES           | NO      | NO        | YES       | YES         | YES         | YES         |
-|Activity Tracking                  | NO(1)     | YES           | YES     | YES       | YES       | YES         | YES         | YES         |
-|GPS tracks import                  | NO        | NO            | NO      | NO        | NO        | NO          | YES         | NO          |
-|Sleep Tracking                     | NO(1)     | YES           | YES     | YES       | YES       | YES         | YES         | YES         |
-|HR Tracking                        | N/A       | YES           | YES     | YES       | YES       | YES         | YES         | YES         |
-|Realtime Activity Tracking         | NO        | NO            | YES     | YES       | YES       | YES         | YES         | YES         |
-|Music Control                      | YES       | YES           | NO      | NO        | NO        | YES         | NO          | YES         |
-|Watchapp/face Installation         | YES       | YES           | NO      | NO        | NO        | YES         | YES         | YES         |
-|Firmware Installation              | YES       | YES           | YES     | YES       | YES       | YES         | YES         | YES         |
-|Taking Screenshots                 | YES       | YES           | NO      | NO        | NO        | NO          | NO          | NO          |
-|Support Android Companion Apps     | YES       | YES           | NO      | NO        | NO        | NO          | NO          | NO          |
-
-(1) Possible via 3rd Party Watchapp
-(2) Theoretically possible (works on iOS, would need lot of work)
-(3) Possible but not implemented yet
-
-
-### Notes about Pebble Firmware >=3.0
-
-* Gadgetbridge will keep track of installed watchfaces, but if the Pebble is used with another phone or another app, the information displayed in the app manager can get out of sync since it is impossible to query Firmware >= 3.x for installed apps/watchfaces.
-
diff --git a/README.md b/README.md
index 9a014c42c..39d4cdd43 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ Pebble, Mi Band, Amazfit Bip and HPlus device (and more) without the vendor's cl
 and without the need to create an account and transmit any of your data to the
 vendor's servers.
 
-[Homepage](https://gadgetbridge.org) - [Blog](https://blog.freeyourgadget.org) - [Wiki](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki) - <a rel="me" href="https://social.anoxinon.de/@gadgetbridge">Mastodon</a>
+[Homepage](https://gadgetbridge.org) - [Blog](https://blog.freeyourgadget.org) - <a rel="me" href="https://social.anoxinon.de/@gadgetbridge">Mastodon</a>
 
 [![Donate](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/Gadgetbridge/donate)
 
@@ -29,124 +29,16 @@ vendor's servers.
 
 [<img src="https://f-droid.org/badge/get-it-on.png" alt="Get it on F-Droid" height="80">](https://f-droid.org/app/nodomain.freeyourgadget.gadgetbridge)
 
-[List of changes](https://codeberg.org/Freeyourgadget/Gadgetbridge/src/master/CHANGELOG.md)
+- [Nightly releases](https://freeyourgadget.codeberg.page/fdroid/repo?fingerprint=CD381ECCC465AB324E21BCC335895615E07E70EE11E9FD1DF3C020C5194F00B2)
+- [List of changes](https://codeberg.org/Freeyourgadget/Gadgetbridge/src/master/CHANGELOG.md)
 
 ## Supported Devices
-**(WARNING: Some of them WIP and some of them without maintainer)**
 
-- Amazfit
-	- [Active](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Amazfit-Active), [Active Edge](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Amazfit-Active-Edge) [**\[!\]**](#special-pairing-procedures)
-	- [Balance](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Amazfit-Balance) [**\[!\]**](#special-pairing-procedures)
-	- [Band 5](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Amazfit-Band-5), [Band 7](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Amazfit-Band-7) [**\[!\]**](#special-pairing-procedures)
-	- [Bip](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Amazfit-Bip)
-	- [Bip Lite](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Amazfit-Bip-Lite), [Bip S](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Amazfit-Bip-S), [Bip U, Bip U Pro](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Amazfit-Bip-U) [**\[!\]**](#special-pairing-procedures)
-	- [Bip 3 Pro](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Amazfit-Bip-3-Pro) [**\[!\]**](#special-pairing-procedures)
-	- [Bip 5 (experimental)](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Amazfit-Bip-5) [**\[!\]**](#special-pairing-procedures)
-	- [Cor](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Amazfit-Cor), [Cor 2](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Amazfit-Cor-2)
-	- [Falcon (experimental)](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Amazfit-Falcon) [**\[!\]**](#special-pairing-procedures)
-	- [GTR](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Amazfit-GTR), [GTR 2/2e](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Amazfit-GTR), [GTR 3](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Amazfit-GTR-3), [GTR 3 Pro](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Amazfit-GTR-3-Pro), [GTR 4](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Amazfit-GTR-4) [**\[!\]**](#special-pairing-procedures)
-	- [GTR Mini](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Amazfit-GTR-Mini) [**\[!\]**](#special-pairing-procedures)
-	- [GTS](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Amazfit-GTS), [GTS 2/2e](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Amazfit-GTS), [GTS 3](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Amazfit-GTS-3), [GTS 4](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Amazfit-GTS-4), [GTS 4 Mini](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Amazfit-GTS-4-Mini) [**\[!\]**](#special-pairing-procedures)
-	- [Neo](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Amazfit-Neo) [**\[!\]**](#special-pairing-procedures)
-	- T-Rex, T-Rex Pro, [T-Rex 2](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Amazfit-T-Rex-2) [**\[!\]**](#special-pairing-procedures)
-	- [T-Rex Ultra](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Amazfit-T-Rex-Ultra) [**\[!\]**](#special-pairing-procedures)
-	- [Cheetah (Round/Square) (experimental)](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Amazfit-Cheetah) [**\[!\]**](#special-pairing-procedures)
-	- [Cheetah Pro](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Amazfit-Cheetah-Pro) [**\[!\]**](#special-pairing-procedures)
-	- Verge Lite [**\[!\]**](#special-pairing-procedures)
-	- [X ](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Mi-Band-5) [**\[!\]**](#special-pairing-procedures)
-- [Bangle.js](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Bangle.js)
-- BFH-16
-- [Casio](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Casio)
-    - Casio GB-X6900B
-    - Casio GB-6900B
-    - Casio GB-5600B
-    - Casio GW-B5600
-    - Casio GMW-B5000 (untested)
-    - Casio STB-1000
-    - Casio GBX-100
-    - Casio GBD-100
-    - Casio GBD-200
-    - Casio GBD-H1000
-- ColaCao (FitPro devices)
-  - ColaCao 2023
-  - ColaCao 2021
-- [Femometer Vinca II](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Femometer-Vinca-II)
-- [FitPro](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/FitPro)
-- Fossil
-	- [Hybrid HR](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Fossil-Hybrid-HR) [**\[!\]**](#special-pairing-procedures)
-	- Q Hybrid
-- [Galaxy Buds](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Galaxy-Buds)
-    - [Galaxy Buds](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Galaxy-Buds#user-content-galaxy-buds)
-    - [Galaxy Buds Live](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Galaxy-Buds#user-content-galaxy-buds-live)
-    - [Galaxy Buds Pro](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Galaxy-Buds#galaxy-buds-pro)
-    - [Galaxy Buds2](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Galaxy-Buds#galaxy-buds2)
-    - [Galaxy Buds2 Pro](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Galaxy-Buds#galaxy-buds2-pro)
-- Garmin
-    - Vívomove HR
-- [HPlus Devices (e.g. ZeBand)](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/HPlus)
-- ID115
-- [iTag](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/iTag)
-- JYou Y5
-- Lefun
-  - Lefun ID115 Plus
-  - Other clones: bohemic smart bracelet
-- Lenovo
-	- Watch 9
-	- [Watch X (Plus)](https://codeberg.org/mamutcho/Gadgetbridge/wiki)
-- Liveview
-- Makibes HR3
-- Mi
-	- [Band, Band 1A, Band 1S](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Mi-Band), [Band 2](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Mi-Band-2), [Band 3](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Mi-Band-3)
-	- [Band 4](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Mi-Band-4), [Band 5](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Mi-Band-5), [Band 6](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Mi-Band-6) [**\[!\]**](#special-pairing-procedures)
-	- Xiaomi Smart Band 7 Pro (experimental) [**\[!\]**](#special-pairing-procedures)
-	- [Xiaomi Smart Band 7](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Mi-Band-7) [**\[!\]**](#special-pairing-procedures)
-	- [Xiaomi Smart Band 8 (experimental)](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Mi-Band-8) [**\[!\]**](#special-pairing-procedures)
-	- Mi Watch Color Sport (experimental)
-    - Mi Watch Lite (experimental)
-    - Redmi Smart Band 2 (experimental) [**\[!\]**](#special-pairing-procedures)
-    - Redmi Watch 3 Active (experimental) [**\[!\]**](#special-pairing-procedures)
-	- Watch S1 Active (experimental) [**\[!\]**](#special-pairing-procedures)
-	- Xiaomi Temperature and Humidity Monitor Clock (LYWSD02/LYWSD02MMC) (partial support)
-	- Xiaomi Mijia Temperature and Humidity Sensor 2 (LYWSD03MMC) (partial support)
-	- Scale 2 (Currently only displays a toast after stepping on the scale)
-- [MyKronoz ZeTime](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/MyKronoz-ZeTime)
-- NO.1 F1
-- [Nothing Ear (1)](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Nothing-Ear-%281%29)
-- [Nut Mini 3, Nut 2 and possibly others](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Nut)
-- Pebble
-	- [Pebble, Steel, Time, Time Steel, Time Round, 2](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Pebble)
-- PineTime (InfiniTime Firmware)
-- Roidmi, Roidmi 3, Mojietu 3 (Bluetooth FM Transmitters)
-- [SMA](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/SMA) Q2 (SMA-Q2-OSS Firmware)
-- Sony
-	- [Headphones](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Sony-Headphones)
-		- LinkBuds S
-		- WH-1000XM2, WH-1000XM3, WH-1000XM4, WH-1000XM5
-		- WF-SP800N
-		- WF-1000XM3, WF-1000XM4, WF-1000XM5 (experimental)
-	- [Wena 3](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Sony-Wena-3)
-- Teclast H10, H30
-- TLW64
-- Vibratissimo (Experimental)
-- Wasp-OS devices
-- XWatch (Affordable Chinese Casio-like smartwatches)
-- [Zepp E](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Amazfit-GTR) [**\[!\]**](#special-pairing-procedures)
-- [Shell Racing cars](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/SuperCars) (BLE RC car models)
-- [Flipper Zero](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Flipper-Zero) (Multi-tool Device for Geeks)
-- VESC (BLDC controller VESC)
-- UM25 (USB Voltage meter)
-
-
-
-### Special Pairing Procedures
-
-Some Huami / Amazfit / Mi / Zepp devices can only be paired with Gadgetbridge using a secret key that has to be obtained once using the proprietary app with an account. Detailed instructions in the wiki: [Huami Server Pairing](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Huami-Server-Pairing)
-
-The Fossil Hybrid HR also requires using the proprietary app, but with a more complicated procedure. Details in the wiki: [Hybrid HR](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Fossil-Hybrid-HR).
+Please see the [Gadgets](https://gadgetbridge.org/gadgets/) page on the website for a complete list of supported devices.
 
 ## Features
 
-Please see [FEATURES.md](https://codeberg.org/Freeyourgadget/Gadgetbridge/src/master/FEATURES.md)
+Please see the [Features](https://gadgetbridge.org/basics/features/) page on the website.
 
 ## Authors
 ### Core Team (in order of first code contribution)

From feea84ea4df4d428c89cc6f2233f4dcbe6d61cf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 22 Dec 2023 17:49:54 +0000
Subject: [PATCH 265/595] Add note on nightly releases to README

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 39d4cdd43..a4d99b2cd 100644
--- a/README.md
+++ b/README.md
@@ -30,6 +30,7 @@ vendor's servers.
 [<img src="https://f-droid.org/badge/get-it-on.png" alt="Get it on F-Droid" height="80">](https://f-droid.org/app/nodomain.freeyourgadget.gadgetbridge)
 
 - [Nightly releases](https://freeyourgadget.codeberg.page/fdroid/repo?fingerprint=CD381ECCC465AB324E21BCC335895615E07E70EE11E9FD1DF3C020C5194F00B2)
+    - Nightly releases are updated more frequently and may be less stable than standard releases, and they are distributed by our F-Droid repository unlike standard releases. 
 - [List of changes](https://codeberg.org/Freeyourgadget/Gadgetbridge/src/master/CHANGELOG.md)
 
 ## Supported Devices

From 82863ff305db552b50c2d46753e6f481f5e9df18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 22 Dec 2023 19:19:56 +0000
Subject: [PATCH 266/595] Xiaomi: Add sleep stages parser

From Alice
---
 .../xiaomi/activity/XiaomiActivityFileId.java |  1 +
 .../xiaomi/activity/XiaomiActivityParser.java |  7 ++
 .../activity/impl/SleepStagesParser.java      | 80 +++++++++++++++++++
 3 files changed, 88 insertions(+)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/SleepStagesParser.java

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java
index a42d536ef..7bb4141a4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java
@@ -192,6 +192,7 @@ public class XiaomiActivityFileId implements Comparable<XiaomiActivityFileId> {
     public enum Subtype {
         UNKNOWN(Type.UNKNOWN, -1),
         ACTIVITY_DAILY(Type.ACTIVITY, 0x00),
+        ACTIVITY_SLEEP_STAGES(Type.ACTIVITY, 0x03),
         ACTIVITY_SLEEP(Type.ACTIVITY, 0x08),
         SPORTS_OUTDOOR_RUNNING(Type.SPORTS, 0x01),
         SPORTS_FREESTYLE(Type.SPORTS, 0x08),
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityParser.java
index d4b14b040..9ec8df4a9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityParser.java
@@ -34,6 +34,7 @@ import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl.DailyDetailsParser;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl.DailySummaryParser;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl.SleepDetailsParser;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl.SleepStagesParser;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl.WorkoutGpsParser;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl.WorkoutSummaryParser;
 
@@ -95,6 +96,12 @@ public abstract class XiaomiActivityParser {
                     return new DailySummaryParser();
                 }
 
+                break;
+            case ACTIVITY_SLEEP_STAGES:
+                if (fileId.getDetailType() == XiaomiActivityFileId.DetailType.DETAILS) {
+                    return new SleepStagesParser();
+                }
+
                 break;
             case ACTIVITY_SLEEP:
                 if (fileId.getDetailType() == XiaomiActivityFileId.DetailType.DETAILS) {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/SleepStagesParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/SleepStagesParser.java
new file mode 100644
index 000000000..fcf1413b2
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/SleepStagesParser.java
@@ -0,0 +1,80 @@
+/*  Copyright (C) 2023 Alice, José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.XiaomiActivityFileId;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.XiaomiActivityParser;
+
+public class SleepStagesParser extends XiaomiActivityParser {
+    private static final Logger LOG = LoggerFactory.getLogger(SleepStagesParser.class);
+
+    @Override
+    public boolean parse(final XiaomiSupport support, final XiaomiActivityFileId fileId, final byte[] bytes) {
+        if (fileId.getVersion() != 2) {
+            LOG.warn("Unknown sleep stages version {}", fileId.getVersion());
+            return false;
+        }
+
+        final ByteBuffer buf = ByteBuffer.wrap(bytes).order(ByteOrder.LITTLE_ENDIAN);
+
+        // over 4 days
+        // first 2 bytes: always FF FF
+        // bytes 3,4 small-medium
+        // byte 5 ???
+        // byte 6,7 small
+        final byte[] unk1 = new byte[7];
+        buf.get(unk1);
+
+        // total sleep duration in minutes
+        final short sleepDuration = buf.getShort();
+        // timestamp when watch counts "real" sleep start, might be later than first phase change
+        final int bedTime = buf.getInt();
+        // timestamp when sleep ended (have not observed, but may also be earlier than last phase?)
+        final int wakeUpTime = buf.getInt();
+
+        // byte 8 medium
+        // bytes 9,10 look like a short
+        final byte[] unk2 = new byte[3];
+        buf.get(unk2);
+
+        // sum of all "real" deep sleep durations
+        final short deepSleepDuration = buf.getShort();
+        // sum of all "real" light sleep durations
+        final short lightSleepDuration = buf.getShort();
+        // sum of all "real" REM durations
+        final short REMDuration = buf.getShort();
+        // sum of all "real" awake durations
+        final short wakeDuration = buf.getShort();
+
+        // byte 11 small-medium
+        final byte unk3 = buf.get();
+        while (buf.position() < buf.limit()) {
+            // when the change to the phase occurs
+            final int time = buf.getInt();
+            // what phase state changed to
+            final byte sleepPhase = buf.get();
+        }
+        return true;
+    }
+}

From 09c33b3541626f374bba9d8344b74922acff5299 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 22 Dec 2023 21:13:20 +0000
Subject: [PATCH 267/595] Xiaomi: Persist and overlay sleep stages

---
 .../gadgetbridge/daogen/GBDaoGenerator.java   | 15 ++-
 .../schema/GadgetbridgeUpdate_66.java         | 56 +++++++++++
 .../devices/xiaomi/XiaomiSampleProvider.java  | 70 ++++++++++++--
 .../XiaomiSleepStageSampleProvider.java       | 56 +++++++++++
 .../activity/impl/SleepStagesParser.java      | 95 ++++++++++++++++++-
 .../gadgetbridge/util/RangeMap.java           | 64 +++++++++++++
 6 files changed, 344 insertions(+), 12 deletions(-)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_66.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSleepStageSampleProvider.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/RangeMap.java

diff --git a/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java b/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java
index 68d4846cb..266540525 100644
--- a/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java
+++ b/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java
@@ -45,7 +45,7 @@ public class GBDaoGenerator {
 
 
     public static void main(String[] args) throws Exception {
-        final Schema schema = new Schema(65, MAIN_PACKAGE + ".entities");
+        final Schema schema = new Schema(66, MAIN_PACKAGE + ".entities");
 
         Entity userAttributes = addUserAttributes(schema);
         Entity user = addUserInfo(schema, userAttributes);
@@ -72,6 +72,7 @@ public class GBDaoGenerator {
         addHuamiSleepRespiratoryRateSample(schema, user, device);
         addXiaomiActivitySample(schema, user, device);
         addXiaomiSleepTimeSamples(schema, user, device);
+        addXiaomiSleepStageSamples(schema, user, device);
         addXiaomiDailySummarySamples(schema, user, device);
         addPebbleHealthActivitySample(schema, user, device);
         addPebbleHealthActivityKindOverlay(schema, user, device);
@@ -345,6 +346,18 @@ public class GBDaoGenerator {
         addCommonTimeSampleProperties("AbstractTimeSample", sample, user, device);
         sample.addLongProperty("wakeupTime");
         sample.addBooleanProperty("isAwake");
+        sample.addIntProperty("totalDuration");
+        sample.addIntProperty("deepSleepDuration");
+        sample.addIntProperty("lightSleepDuration");
+        sample.addIntProperty("remSleepDuration");
+        sample.addIntProperty("awakeDuration");
+        return sample;
+    }
+
+    private static Entity addXiaomiSleepStageSamples(Schema schema, Entity user, Entity device) {
+        Entity sample = addEntity(schema, "XiaomiSleepStageSample");
+        addCommonTimeSampleProperties("AbstractTimeSample", sample, user, device);
+        sample.addIntProperty("stage");
         return sample;
     }
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_66.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_66.java
new file mode 100644
index 000000000..fb08efaa1
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_66.java
@@ -0,0 +1,56 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.database.schema;
+
+import android.database.sqlite.SQLiteDatabase;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+
+import nodomain.freeyourgadget.gadgetbridge.database.DBHelper;
+import nodomain.freeyourgadget.gadgetbridge.database.DBUpdateScript;
+import nodomain.freeyourgadget.gadgetbridge.entities.XiaomiSleepTimeSampleDao;
+
+public class GadgetbridgeUpdate_66 implements DBUpdateScript {
+    @Override
+    public void upgradeSchema(final SQLiteDatabase db) {
+        final List<String> newColumns = Arrays.asList(
+                XiaomiSleepTimeSampleDao.Properties.TotalDuration.columnName,
+                XiaomiSleepTimeSampleDao.Properties.DeepSleepDuration.columnName,
+                XiaomiSleepTimeSampleDao.Properties.LightSleepDuration.columnName,
+                XiaomiSleepTimeSampleDao.Properties.RemSleepDuration.columnName,
+                XiaomiSleepTimeSampleDao.Properties.AwakeDuration.columnName
+        );
+
+        for (final String newColumn : newColumns) {
+            if (!DBHelper.existsColumn(XiaomiSleepTimeSampleDao.TABLENAME, newColumn, db)) {
+                final String SQL_ALTER_TABLE = String.format(
+                        Locale.ROOT,
+                        "ALTER TABLE %s ADD COLUMN %s INTEGER",
+                        XiaomiSleepTimeSampleDao.TABLENAME,
+                        newColumn
+                );
+                db.execSQL(SQL_ALTER_TABLE);
+            }
+        }
+    }
+
+    @Override
+    public void downgradeSchema(SQLiteDatabase db) {
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSampleProvider.java
index 917a2aadd..1b5b22376 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSampleProvider.java
@@ -30,9 +30,11 @@ import nodomain.freeyourgadget.gadgetbridge.devices.AbstractSampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.XiaomiActivitySample;
 import nodomain.freeyourgadget.gadgetbridge.entities.XiaomiActivitySampleDao;
+import nodomain.freeyourgadget.gadgetbridge.entities.XiaomiSleepStageSample;
 import nodomain.freeyourgadget.gadgetbridge.entities.XiaomiSleepTimeSample;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.model.ActivityKind;
+import nodomain.freeyourgadget.gadgetbridge.util.RangeMap;
 
 public class XiaomiSampleProvider extends AbstractSampleProvider<XiaomiActivitySample> {
     private static final Logger LOG = LoggerFactory.getLogger(XiaomiSampleProvider.class);
@@ -90,18 +92,68 @@ public class XiaomiSampleProvider extends AbstractSampleProvider<XiaomiActivityS
     protected List<XiaomiActivitySample> getGBActivitySamples(final int timestamp_from, final int timestamp_to, final int activityType) {
         final List<XiaomiActivitySample> samples = super.getGBActivitySamples(timestamp_from, timestamp_to, activityType);
 
-        // Fetch bed and wakeup times and overlay them on the activity
-        final XiaomiSleepTimeSampleProvider sleepTimeSampleProvider = new XiaomiSleepTimeSampleProvider(getDevice(), getSession());
-        final List<XiaomiSleepTimeSample> sleepSamples = sleepTimeSampleProvider.getAllSamples(timestamp_from * 1000L, timestamp_to * 1000L);
-        if (!sleepSamples.isEmpty()) {
-            LOG.debug("Found {} sleep samples between {} and {}", sleepSamples.size(), timestamp_from, timestamp_to);
+        final RangeMap<Long, Integer> stagesMap = new RangeMap<>();
+
+        final XiaomiSleepStageSampleProvider sleepStagesSampleProvider = new XiaomiSleepStageSampleProvider(getDevice(), getSession());
+        final List<XiaomiSleepStageSample> stageSamples = sleepStagesSampleProvider.getAllSamples(timestamp_from * 1000L, timestamp_to * 1000L);
+        if (!stageSamples.isEmpty()) {
+            // We got actual sleep stages
+            LOG.debug("Found {} sleep stage samples between {} and {}", stageSamples.size(), timestamp_from, timestamp_to);
+
+            for (final XiaomiSleepStageSample stageSample : stageSamples) {
+                final int activityKind;
+
+                switch (stageSample.getStage()) {
+                    case 2: // deep
+                        activityKind = ActivityKind.TYPE_DEEP_SLEEP;
+                        break;
+                    case 3: // light
+                        activityKind = ActivityKind.TYPE_LIGHT_SLEEP;
+                        break;
+                    case 4: // rem
+                        activityKind = ActivityKind.TYPE_REM_SLEEP;
+                        break;
+                    case 0: // final awake
+                    case 1: // ?
+                    case 5: // awake during the night
+                    default:
+                        activityKind = ActivityKind.TYPE_UNKNOWN;
+                        break;
+                }
+                stagesMap.put(stageSample.getTimestamp(), activityKind);
+            }
+        } else {
+            // Fetch bed and wakeup times and overlay as light sleep on the activity
+            final XiaomiSleepTimeSampleProvider sleepTimeSampleProvider = new XiaomiSleepTimeSampleProvider(getDevice(), getSession());
+            final List<XiaomiSleepTimeSample> sleepSamples = sleepTimeSampleProvider.getAllSamples(timestamp_from * 1000L, timestamp_to * 1000L);
+            if (!sleepSamples.isEmpty()) {
+                LOG.debug("Found {} sleep samples between {} and {}", sleepSamples.size(), timestamp_from, timestamp_to);
+                for (final XiaomiSleepTimeSample stageSample : sleepSamples) {
+                    stagesMap.put(stageSample.getTimestamp(), ActivityKind.TYPE_LIGHT_SLEEP);
+                    stagesMap.put(stageSample.getWakeupTime(), ActivityKind.TYPE_UNKNOWN);
+                }
+            }
+        }
+
+        if (!stagesMap.isEmpty()) {
+            LOG.debug("Found {} sleep samples between {} and {}", stagesMap.size(), timestamp_from, timestamp_to);
 
             for (final XiaomiActivitySample sample : samples) {
                 final long ts = sample.getTimestamp() * 1000L;
-                for (final XiaomiSleepTimeSample sleepSample : sleepSamples) {
-                    if (ts >= sleepSample.getTimestamp() && ts <= sleepSample.getWakeupTime()) {
-                        sample.setRawKind(ActivityKind.TYPE_LIGHT_SLEEP);
-                        sample.setRawIntensity(30);
+                final Integer sleepType = stagesMap.get(ts);
+                if (sleepType != null) {
+                    sample.setRawKind(sleepType);
+
+                    switch (sleepType) {
+                        case ActivityKind.TYPE_DEEP_SLEEP:
+                            sample.setRawIntensity(10);
+                            break;
+                        case ActivityKind.TYPE_LIGHT_SLEEP:
+                            sample.setRawIntensity(30);
+                            break;
+                        case ActivityKind.TYPE_REM_SLEEP:
+                            sample.setRawIntensity(40);
+                            break;
                     }
                 }
             }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSleepStageSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSleepStageSampleProvider.java
new file mode 100644
index 000000000..3e288f9d9
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSleepStageSampleProvider.java
@@ -0,0 +1,56 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi;
+
+import androidx.annotation.NonNull;
+
+import de.greenrobot.dao.AbstractDao;
+import de.greenrobot.dao.Property;
+import nodomain.freeyourgadget.gadgetbridge.devices.AbstractTimeSampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.entities.XiaomiSleepStageSample;
+import nodomain.freeyourgadget.gadgetbridge.entities.XiaomiSleepStageSampleDao;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+
+public class XiaomiSleepStageSampleProvider extends AbstractTimeSampleProvider<XiaomiSleepStageSample> {
+    public XiaomiSleepStageSampleProvider(final GBDevice device, final DaoSession session) {
+        super(device, session);
+    }
+
+    @NonNull
+    @Override
+    public AbstractDao<XiaomiSleepStageSample, ?> getSampleDao() {
+        return getSession().getXiaomiSleepStageSampleDao();
+    }
+
+    @NonNull
+    @Override
+    protected Property getTimestampSampleProperty() {
+        return XiaomiSleepStageSampleDao.Properties.Timestamp;
+    }
+
+    @NonNull
+    @Override
+    protected Property getDeviceIdentifierSampleProperty() {
+        return XiaomiSleepStageSampleDao.Properties.DeviceId;
+    }
+
+    @Override
+    public XiaomiSleepStageSample createSample() {
+        return new XiaomiSleepStageSample();
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/SleepStagesParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/SleepStagesParser.java
index fcf1413b2..03a5f53bd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/SleepStagesParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/SleepStagesParser.java
@@ -16,15 +16,31 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl;
 
+import android.widget.Toast;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
+import java.util.ArrayList;
+import java.util.List;
 
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.database.DBHandler;
+import nodomain.freeyourgadget.gadgetbridge.database.DBHelper;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiSleepStageSampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiSleepTimeSampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.entities.Device;
+import nodomain.freeyourgadget.gadgetbridge.entities.User;
+import nodomain.freeyourgadget.gadgetbridge.entities.XiaomiSleepStageSample;
+import nodomain.freeyourgadget.gadgetbridge.entities.XiaomiSleepTimeSample;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.XiaomiActivityFileId;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.XiaomiActivityParser;
+import nodomain.freeyourgadget.gadgetbridge.util.GB;
 
 public class SleepStagesParser extends XiaomiActivityParser {
     private static final Logger LOG = LoggerFactory.getLogger(SleepStagesParser.class);
@@ -51,7 +67,7 @@ public class SleepStagesParser extends XiaomiActivityParser {
         // timestamp when watch counts "real" sleep start, might be later than first phase change
         final int bedTime = buf.getInt();
         // timestamp when sleep ended (have not observed, but may also be earlier than last phase?)
-        final int wakeUpTime = buf.getInt();
+        final int wakeupTime = buf.getInt();
 
         // byte 8 medium
         // bytes 9,10 look like a short
@@ -67,14 +83,89 @@ public class SleepStagesParser extends XiaomiActivityParser {
         // sum of all "real" awake durations
         final short wakeDuration = buf.getShort();
 
+        LOG.debug("Sleep stages sample: bedTime: {}, wakeupTime: {}, sleepDuration: {}", bedTime, wakeupTime, sleepDuration);
+
+        if (bedTime == 0 || wakeupTime == 0 || sleepDuration == 0) {
+            LOG.warn("Ignoring sleep stages sample with no data");
+            return true;
+        }
+
+        final XiaomiSleepTimeSample sample = new XiaomiSleepTimeSample();
+        sample.setTimestamp(bedTime * 1000L);
+        sample.setWakeupTime(wakeupTime * 1000L);
+        sample.setIsAwake(false);
+        sample.setTotalDuration((int) sleepDuration);
+        sample.setDeepSleepDuration((int) deepSleepDuration);
+        sample.setLightSleepDuration((int) lightSleepDuration);
+        sample.setRemSleepDuration((int) REMDuration);
+        sample.setAwakeDuration((int) wakeDuration);
+
+        final List<XiaomiSleepStageSample> stages = new ArrayList<>();
+
         // byte 11 small-medium
         final byte unk3 = buf.get();
         while (buf.position() < buf.limit()) {
             // when the change to the phase occurs
             final int time = buf.getInt();
             // what phase state changed to
-            final byte sleepPhase = buf.get();
+            final int sleepPhase = buf.get() & 0xff;
+
+            final XiaomiSleepStageSample stageSample = new XiaomiSleepStageSample();
+            stageSample.setTimestamp(time * 1000L);
+            stageSample.setStage(sleepPhase);
+            stages.add(stageSample);
         }
+
+        // Save the sleep time sample
+        try (DBHandler handler = GBApplication.acquireDB()) {
+            final DaoSession session = handler.getDaoSession();
+            final GBDevice gbDevice = support.getDevice();
+
+            sample.setDevice(DBHelper.getDevice(gbDevice, session));
+            sample.setUser(DBHelper.getUser(session));
+
+            final XiaomiSleepTimeSampleProvider sampleProvider = new XiaomiSleepTimeSampleProvider(gbDevice, session);
+
+            // Check if there is already a later sleep sample - if so, ignore this one
+            // Samples for the same sleep will always have the same bedtime (timestamp), but we might get
+            // multiple bedtimes until the user wakes up
+            final List<XiaomiSleepTimeSample> existingSamples = sampleProvider.getAllSamples(sample.getTimestamp(), sample.getTimestamp());
+            if (!existingSamples.isEmpty()) {
+                final XiaomiSleepTimeSample existingSample = existingSamples.get(0);
+                if (existingSample.getWakeupTime() > sample.getWakeupTime()) {
+                    LOG.warn("Ignoring sleep sample - existing sample is more recent ({})", existingSample.getWakeupTime());
+                    return true;
+                }
+            }
+
+            sampleProvider.addSample(sample);
+        } catch (final Exception e) {
+            GB.toast(support.getContext(), "Error saving sleep sample", Toast.LENGTH_LONG, GB.ERROR);
+            LOG.error("Error saving sleep sample", e);
+            return false;
+        }
+
+        // Save the sleep stage samples
+        try (DBHandler handler = GBApplication.acquireDB()) {
+            final DaoSession session = handler.getDaoSession();
+            final GBDevice gbDevice = support.getDevice();
+            final Device device = DBHelper.getDevice(gbDevice, session);
+            final User user = DBHelper.getUser(session);
+
+            final XiaomiSleepStageSampleProvider sampleProvider = new XiaomiSleepStageSampleProvider(gbDevice, session);
+
+            for (final XiaomiSleepStageSample stageSample : stages) {
+                stageSample.setDevice(device);
+                stageSample.setUser(user);
+            }
+
+            sampleProvider.addSamples(stages);
+        } catch (final Exception e) {
+            GB.toast(support.getContext(), "Error saving sleep stage samples", Toast.LENGTH_LONG, GB.ERROR);
+            LOG.error("Error saving sleep stage samples", e);
+            return false;
+        }
+
         return true;
     }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/RangeMap.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/RangeMap.java
new file mode 100644
index 000000000..bf91153f3
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/RangeMap.java
@@ -0,0 +1,64 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.util;
+
+import android.util.Pair;
+
+import androidx.annotation.Nullable;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * A map of lower bounds for ranges.
+ */
+public class RangeMap<K extends Comparable<K>, V> {
+    private final List<Pair<K, V>> list = new ArrayList<>();
+    private boolean isSorted = false;
+
+    public void put(final K key, final V value) {
+        list.add(Pair.create(key, value));
+        isSorted = false;
+    }
+
+    @Nullable
+    public V get(final K key) {
+        if (!isSorted) {
+            Collections.sort(list, (a, b) -> {
+                return a.first.compareTo(b.first);
+            });
+            isSorted = true;
+        }
+
+        for (int i = list.size() - 1; i >= 0; i--) {
+            if (key.compareTo(list.get(i).first) > 0) {
+                return list.get(i).second;
+            }
+        }
+
+        return null;
+    }
+
+    public boolean isEmpty() {
+        return list.isEmpty();
+    }
+
+    public int size() {
+        return list.size();
+    }
+}

From b79f774e3e9a54e5c9e5861e21161c19189e19f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 22 Dec 2023 21:39:23 +0000
Subject: [PATCH 268/595] Xiaomi: Add debug function to parse all activity
 files from storage

---
 .../service/devices/xiaomi/XiaomiSupport.java | 75 ++++++++++++++++++-
 1 file changed, 74 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
index c7ffb8ec7..157d2a6e8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
@@ -29,12 +29,18 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
+import nodomain.freeyourgadget.gadgetbridge.BuildConfig;
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiFWHelper;
@@ -54,6 +60,8 @@ import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.AbstractBTLEDeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetDeviceStateAction;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.XiaomiActivityFileId;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.XiaomiActivityParser;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.AbstractXiaomiService;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.XiaomiCalendarService;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.XiaomiDataUploadService;
@@ -65,6 +73,7 @@ import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.Xiao
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.XiaomiSystemService;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.XiaomiWatchfaceService;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.XiaomiWeatherService;
+import nodomain.freeyourgadget.gadgetbridge.util.FileUtils;
 import nodomain.freeyourgadget.gadgetbridge.util.GB;
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 
@@ -292,7 +301,8 @@ public class XiaomiSupport extends AbstractBTLEDeviceSupport {
 
     @Override
     public void onTestNewFunction() {
-        sendCommand("test new function", 2, 29);
+        //sendCommand("test new function", 2, 29);
+        parseAllActivityFilesFromStorage();
     }
 
     @Override
@@ -510,6 +520,69 @@ public class XiaomiSupport extends AbstractBTLEDeviceSupport {
         return StringUtils.replaceEach(inputString, EMOJI_SOURCE, EMOJI_TARGET);
     }
 
+    private void parseAllActivityFilesFromStorage() {
+        // This function as-is should only be used for debug purposes
+        if (!BuildConfig.DEBUG) {
+            LOG.error("This should never be used in release builds");
+            return;
+        }
+
+        LOG.info("Parsing all activity files from storage");
+
+        try {
+            final File externalFilesDir = FileUtils.getExternalFilesDir();
+            final File targetDir = new File(externalFilesDir, "rawFetchOperations");
+
+            if (!targetDir.exists()) {
+                LOG.warn("rawFetchOperations not found");
+                return;
+            }
+
+            final File[] activityFiles = targetDir.listFiles((dir, name) -> name.startsWith("xiaomi_"));
+
+            if (activityFiles == null) {
+                LOG.warn("activityFiles is null");
+                return;
+            }
+
+            for (final File activityFile : activityFiles) {
+                LOG.debug("Parsing {}", activityFile);
+
+                // The logic below just replicates XiaomiActivityFileFetcher
+
+                final byte[] data;
+                try (InputStream in = new FileInputStream(activityFile)) {
+                    data = FileUtils.readAll(in, 999999);
+                } catch (final IOException ioe) {
+                    LOG.error("Failed to read " + activityFile, ioe);
+                    continue;
+                }
+
+                final byte[] fileIdBytes = Arrays.copyOfRange(data, 0, 7);
+                final byte[] activityData = Arrays.copyOfRange(data, 8, data.length - 4);
+                final XiaomiActivityFileId fileId = XiaomiActivityFileId.from(fileIdBytes);
+
+                final XiaomiActivityParser activityParser = XiaomiActivityParser.create(fileId);
+                if (activityParser == null) {
+                    LOG.warn("Failed to find parser for {}", fileId);
+                    continue;
+                }
+
+                try {
+                    if (activityParser.parse(this, fileId, activityData)) {
+                        LOG.info("Successfully parsed {}", fileId);
+                    } else {
+                        LOG.warn("Failed to parse {}", fileId);
+                    }
+                } catch (final Exception ex) {
+                    LOG.error("Exception while parsing " + fileId, ex);
+                }
+            }
+        } catch (final Exception e) {
+            LOG.error("Failed to parse from storage", e);
+        }
+    }
+
     private static final String[] EMOJI_SOURCE = new String[]{
             "\uD83D\uDE0D", // 😍
             "\uD83D\uDE18", // 😘

From fb803cbdda62980c8d9f8762f76551e34990fe8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 22 Dec 2023 21:45:44 +0000
Subject: [PATCH 269/595] Xiaomi: Enable REM sleep

---
 .../gadgetbridge/devices/xiaomi/XiaomiCoordinator.java         | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
index 66f87d3dd..2daa96bf1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
@@ -340,8 +340,7 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
 
     @Override
     public boolean supportsRemSleep() {
-        // TODO it does, but we don't know how to parse it yet
-        return false;
+        return true;
     }
 
     @Override

From 71b55902d0b103a0afc1c94b8e4152e9c1e12328 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 22 Dec 2023 22:42:25 +0000
Subject: [PATCH 270/595] Mi Band 7 Pro: Disable PAI

Reported not supported on matrix.
---
 .../devices/xiaomi/miband7pro/MiBand7ProCoordinator.java    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband7pro/MiBand7ProCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband7pro/MiBand7ProCoordinator.java
index 5116ff122..87d4948e5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband7pro/MiBand7ProCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband7pro/MiBand7ProCoordinator.java
@@ -62,6 +62,12 @@ public class MiBand7ProCoordinator extends XiaomiCoordinator {
         return R.drawable.ic_device_default_disabled;
     }
 
+    @Override
+    public boolean supportsPai() {
+        // no PAI nor vitality score
+        return false;
+    }
+
     @Override
     public boolean supportsMultipleWeatherLocations() {
         return true;

From a62ff4eabbbac844ff68b025aaab1af05907dd5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 22 Dec 2023 22:44:30 +0000
Subject: [PATCH 271/595] Xiaomi: Improve activity details parsing on some
 devices

---
 .../xiaomi/activity/impl/DailyDetailsParser.java | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/DailyDetailsParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/DailyDetailsParser.java
index c3912dd9b..8aed5b992 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/DailyDetailsParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/DailyDetailsParser.java
@@ -52,10 +52,13 @@ public class DailyDetailsParser extends XiaomiActivityParser {
         final int sampleSize;
         switch (version) {
             case 1:
-            case 2:
                 headerSize = 4;
                 sampleSize = 7;
                 break;
+            case 2:
+                headerSize = 4;
+                sampleSize = 10;
+                break;
             case 3:
                 headerSize = 5;
                 sampleSize = 12;
@@ -95,12 +98,15 @@ public class DailyDetailsParser extends XiaomiActivityParser {
 
             sample.setHeartRate(buf.get() & 0xff);
 
-            if (version == 3) {
+            if (version >= 2) {
                 final byte[] unknown2 = new byte[3];
-                buf.get(unknown2);  // TODO intensity and kind?
+                buf.get(unknown2);  // TODO intensity and kind? energy?
 
-                sample.setSpo2(buf.get() & 0xff);
-                sample.setStress(buf.get() & 0xff);
+                if (version == 3) {
+                    // TODO gadgets with versions 2 also should have stress, but the values don't make sense
+                    sample.setSpo2(buf.get() & 0xff);
+                    sample.setStress(buf.get() & 0xff);
+                }
             }
 
             samples.add(sample);

From 5ffed2aa62e9c953a34ab26f166f506f2d92f877 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sat, 23 Dec 2023 14:08:39 +0000
Subject: [PATCH 272/595] Xiaomi: Fix crash if device does not provide full
 stress and spo2 data

---
 .../gadgetbridge/devices/xiaomi/XiaomiSpo2SampleProvider.java   | 2 +-
 .../gadgetbridge/devices/xiaomi/XiaomiStressSampleProvider.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSpo2SampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSpo2SampleProvider.java
index c499a287d..7d50754e0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSpo2SampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSpo2SampleProvider.java
@@ -29,7 +29,7 @@ public class XiaomiSpo2SampleProvider extends AbstractSampleToTimeSampleProvider
 
     @Override
     protected Spo2Sample convertSample(final XiaomiActivitySample sample) {
-        if (sample.getSpo2() == 0) {
+        if (sample.getSpo2() == null || sample.getSpo2() == 0) {
             return null;
         }
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiStressSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiStressSampleProvider.java
index 6a8d15f67..ece71d1ad 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiStressSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiStressSampleProvider.java
@@ -29,7 +29,7 @@ public class XiaomiStressSampleProvider extends AbstractSampleToTimeSampleProvid
 
     @Override
     protected StressSample convertSample(final XiaomiActivitySample sample) {
-        if (sample.getStress() == 0) {
+        if (sample.getStress() == null || sample.getStress() == 0) {
             return null;
         }
 

From 7aeb0dd2ef5b763220767e007844df3a963f901a Mon Sep 17 00:00:00 2001
From: Arjan Schrijver <a_gadgetbridge@anymore.nl>
Date: Sat, 23 Dec 2023 22:04:56 +0100
Subject: [PATCH 273/595] Fossil/Skagen Hybrids: Update navigationApp to 1.1

Changes:
- Support locking (keep visible and let hands display time)
- Support merge navigation instruction
- Support wrist flick gesture to move hands
- Support GB-configurable foreground and vibration behaviour
---
 .../main/assets/fossil_hr/navigationApp.wapp  | Bin 39486 -> 42490 bytes
 .../devices/qhybrid/QHybridConstants.java     |   2 +-
 .../fossil_hr/FossilHRWatchAdapter.java       |   3 +++
 .../main/res/drawable/baseline_merge_24.xml   |   8 +++++++
 .../devicesettings_fossilhybridhr_all_fw.xml  |  21 ++++++++++++++++++
 external/fossil-hr-gbapps                     |   2 +-
 6 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/res/drawable/baseline_merge_24.xml

diff --git a/app/src/main/assets/fossil_hr/navigationApp.wapp b/app/src/main/assets/fossil_hr/navigationApp.wapp
index 6c48401d25a187a7e14b700182c8032c49ab05ba..d581a7f5eea97e21bcd67f1842d1a4525174fac3 100644
GIT binary patch
delta 4634
zcmb7HZERat89wLUYhT;f@re^Bx%qPJB(9yLcG}y<X_Ibiw>7!zO53&TCxz5)TsKXc
zge2`4Wpnuq111(OrR@;nV;TV=v`(pj4vC_nDUm?_fspoxA4vR&U_am&LI_cw_gtq+
z*0dd#j^F2f-simMocF%xI{Ec2<=?+ktpC=ij6Q#RlQD&JiRtSY#?>%mzx_UA?;}Rz
zpK{FYs+&9Dn>(P-9TOWihW8vic-*8J_{0K?Q3~>-Kyl^)(Uh2bwW&C$F}93R0JVrw
z@WNuu>%cz5FlPOX>BzB+p$8Ge&?}&$5dyA+7MmKZhK(@x4_Xrop2E0^@n__>k$Wfd
z{tJ1RkS}5@Jkr#0#^a4Cre>-UQ;$S!7O<INv!Kl?(q<@a3e#`;GG=AQ4BJYT-BfKi
zN9<^g-BN4E>g>2_x7OQj4R(9uZsv6lrYMTndv9~t%wml*%3EvaYq7sNxY*k~>|i}?
zgYyROj20R}V<elg{U~URLJKTLA?AF*t?YaZGvYXDD`ah`NIR;LfZYH;35>Crf~FH(
z7w|?*O*@B_uU662WCk?GB8J}W{9TC_iC*qztcxpbX#ktTN0UcDv6!OJN`spi+rd)&
z&I97}ABwvrP&r2lD8IfLyTHNZPJuhP60tSaW}YSI>uOkTZAC*TnceKXrADKxr_$jT
zF?G;_MK$#;&If9%loYmr!kFI*x(6#^%x1y$I$fG2lT#^Vb&+9yn=_$BGgKvg``UBq
z?zuTvJs!C@DzFHR-sk*E>ugxPA1W+8LU&KjT`jtAb-0jrLxnz^mhp(KDz-;k8VFzo
z&Zsi}03Bl)@#GF@Yp_9Boz4Nfyu%swSVfW~A7?Df`0f_DIgh4!nwkpWR(A_^$nq0N
zQ%*U%6P4P9bWeiAE|)1~`Et=^qV3To8GH(*+JJ$JkbD{zmz^q|RXhc6Tz7)rcyS0$
zE)@4?6_I7)RJc9M0)3V5<SN49EDQHk^;Czw{c7Yk_xH1!l$v>ur)hd^*x#?#rSI^T
zEHn4Vt0_x;JlLfvtVg68-d1T=<Lv?LjxoPH8?KDv_0!&yyHN&=<N!064Z$SFkGV7N
z%@nEqY4819u@<a_%!1m_)D%y@hg3<K$E$e)vDhs9!9nD~{Ml!4=5o!J_qb=C-|L>6
zUMN%}Iy>bq>_gr5yK5}ME-H*&c?G%MyHjLWaD(XrUHR+XyE<+T6)vj;3Pw24uLje1
z6!tc`72!+=3#FGjn825Z^;D+9@20%Jcwg&RtFl^kR*T5JyES_$%R=!W3LMulIaeF5
zxlhWElcp%+b>a379Vt8N%$q7!$SkFNKkrcMBX(nh-Q1Kmqf5Mt61AY@ew4g2Rfm$B
z_a&9PL!}g1Iox-A=$Z6MU&jMUr>T-u#pH9SOp!{3c3CMI`%&m#Ytj3f-p%x`rneKl
zy9W=Vq=$f?2R?$>QN)hJo<N?H$nyy#9YX9BG&%66!4E@o7W_GIBN*o~MiEOgR$Lr|
z-~uLkFlihXV{if-hee<CdiRH`QcAC$^1Yi<d-V>V|EAg-=rMYNy%lG|wGxKVeN5bT
z=|5ITTWPVxGZs(mv6RHKmYUdWX^D?np2R-Oo7ivZi364|@tjrkCk|SH#39Q_JZ}XP
zhpmdl5i689YKg=#t1@xi3ZL~K=O;^Hjh`r0Y5Z`hTH^;w5sg1vs?qpBsaE5=N_86F
zQ8G2&TdLQ%Rcg?9y40xgRH;ehZKY<7M@vzS*Oyu}9x25%E=qBY2TH9PKjkU4Y5lAn
z=fi7dLqcvnIqV4sT*S3h%1qi?N3S>RO?AQDXm&2B^h|y3?ZCs<b@>hjCv7DjQ5e<R
z1wZ60`|QBkv5_;QL%A1nFFI-ezLb~cF3wC06m)iJ<n&Z-CXZjav57OI`Qad&8M%-j
zn#qrijf@u-F8kk6ivc!0Gch?tfvIYiAJ3g0gJP8omwI|8H#Or*ScDCaOy4JJU>8P)
zhcR>d+ytbPQ~BxXp{e{>J~y3jV5cW$W+pDI7xQ(pa}yV*h9)Pb14uD`aVAf=dd)_M
zE=~^P7z^hsZt%(qHlDjQgv}Q6nW?cnb5zl1R<P3-vBdb0yAlpOa%L}%yzrQKIaJhL
zhy8(>W<1CZRpmN2!a=Tkfdm*u#SpFy1<BLEazv#k;0Z+~?8R8I1~egPeZflA2R?|g
zjy<7LGB>F!(1IGc_3&EV`Uz<<cj2uIzij?fV==V0BCqMUZru(323vNsy#=*~ZT<`l
z4lI5Ot5XTYPe`NtfPstvH1lAB(7XwYqlq`90to6KNL&dOkWq!`_rOHdA{XBUsF9-Y
zNKq|BT)YmM33LNo1LW6W8>Q;1R5eNbEvTYUIj}LP<`8Rz{f5*4Vd+;TZifoU*nsHQ
zz@%Vb3G$-okfK>B>Vyc$*a-V2Fd2xx0NX7!pOczRz*h(v7F0!`tx&xLn}xkBH9%PS
zMTxgT1!VLg`U038uoqz;lbYhR6g>_R7gLb!1o{-XCn1}FeM-tMNY&F4k3ls6)hIX{
zsu9>dum!0B!qT)sRFA6oaEtv@nIA2DXd-%Wrn>t3qh`eOUw@CQlezdo%8$ygn~|R1
z|9SpL)$37lxgNE3J?dV(4uJl~)BiRQx*7;wjjPox@i!%Ik@z)<<G^lzw*k4`oj@w;
zYHlQf(APj{Z1EL5-Y(cLgF#cHGrkCfwg&n<sfs#!8%xTL);B{6WNd+b8DVrbgr5a+
zJNh#;MeoH7x3{-L_i5<+VJ{(u-bSt&sX~7fGM<1%V+(3*F3{TgE-;f|=n5C{I+B2k
z@q5URX;cX?WJLfG7oqn_ErOE4`@o>vKsH2-4kXS45yORWkq$;jjd2vbw<#vh!Ahnm
zs*!*oD6*oaY|pw9qZXFycvd<XgRJRB#BkZxySxFP;-X<?hB$+T(Op=$5gcO1Y1fKo
zXem+zLBNR0Nz{s`fZRzfE;7oDh~3i+A#t5djNc^LP@gQ@HaB9BPl|TQ!!zKCgc}tn
z%Tc`lK#|ZWQ^p4PT*pgT2O}pX%l6}#4Bkk&GsKCq?I`oE-wBpxb8#H=NKXtc4xi?W
zuCgV+SSCma0lqO20!m>VE8C6blx1I}Wde9|7CdQ>f~DV)jH?z8@QrR-#W>=silW<{
zwnC6^P#RaT>BFA<siGKZ5T%WZ!)4VYd}A{$y`q+0dae6#uWMm$`^ZVf>sk2E)kZD6
z5&!#K#)!pQM}}MbVq2a4*V`QPdZTDt^A}C4^ZRQ}&XH@TbL2*M>sbEm48)taZ=?Bg
XHvWbqCc8-zFFDn(C$%4@>;CdTRrQ$!

delta 1775
zcmZ`(-%lJ>6h8OPotgc`E&~fJEG$2#vw%>&m0inHL#?nQP(<3=`YRL*tR!t9z_a^E
zVq+?qG^u^^Mb`%(H0uj}u*RlY5|dG5UyOgiz8HP?!T8--Y|z9>zB%`vbM80aIrrZA
z^Lzfy*IfS9rjdHa?-Owr41?D-yw4?we!okUMoeKcz`^;BgQd{Hl6i0~aq3BYZh85Q
z)bYA|AtJ@0=3N-|lYpb6@8HAkvV&m-Fm+hKG>Gaz#U!d>T`3F;>_>no#xWu%j=W}A
zi|9x74UkU*9|7NjD+?Y1$LGK_IFc@B$?mM)$5JAtB~wN+=~CFGh)WluF2z!zl<D#&
zw<GSR5^iU++hw`w7Pq_A?Mb?sHn+EZM)4`(I_KOlo(h71{TA;w8)z@JLQ@j@@aYn)
z*$&&`Jz^sn2X*fQ^-f4m!wopyuz=I!MY+tCdaxpc)j++MsMwDV48RUz4pfFfVI#+Z
zFN^UomX3J4{DT&?v_1m&DBM78)JtfYvT|3RAsS_zj%HPp2wgw!J#ntSWR4L{QI<XY
zpLpp%@kR?Y#?S)AUqf6K7bqPk8fHA{3e6?`$ooRG0%`x`s7i|C-Va(Pb8@LFZXZj{
z)3E4f?X(va13`-OEL=e8Ik*8wg5eB&&wKMi2IQ(0L3hDWn(*$3%(&`OZQ|c`nT@&`
z({x>Z97l`xbI8kizlxErlX_HR)fP51dA)jO@nqORqgBYsqgrA~SL3cOj%FkH0wdL#
za72|+LA?F~a$Asl7L+Kj1Y0@l-PUDUrPL>ha>QoRfjC_VJ(Y3_$Mqba7Ii`@Q=mDf
zES`h-7eS{0l@(AbN$N6~(`b)6F0eHYi*b(YC8OWWadT|L>dEm?DQv}Z<SiIhc?rSQ
zcz-y@6FEv;x6(O^Og2AQZL&fI%{pY^0<~nd@yE<jEUi|!pe4s1vQD+Etv@y@I87w7
z?O$n@QP4ULgCi6UYQYuZMp$XBpGVm*!2&MyZUgs#VdCCz#&B63d8NI;xU9<RcvUNq
zmStm)!KMdX0*`5`JuY5o)R*I;q+4b|Gsc2*%Y!_eXgo^9nP6^0g5#Jo=mk(gKyA9}
znd%LF7AO38%8fsdfdoX=y;FalS`ij%ojHu>QNTsS7h#t`vJ4TIupyTbyMmmn@Lz-f
zP2{`<|2y!l0M{|coh_~+_Aa0!AGUY{e<z+dvgUVLEnhZ<&Cr)xK0Fbbh~{HAtayQ%
z4ja=avB1V9*)x*avy$6IsoAa+_A64i=cHlJOVeJEA^V~X+lw+{zbd2ll8o7}$tHVQ
z#_dZoVPBTb8{y0Bs-F<-ir*~Ql5Yt%@3#mx>z7*vJMSk2oATQP%lqwuNxws|F+U|(
z*6$Q-(C-o~<EI7d^t%O1`aOar{ET1`zgIBb?-K>;M>)6&g9Cx!p*7u#G)7Eh?bMJf
zPE|FvF+`zYYtUkDn(9cmt36SJr$2R^>;0&=6>+^sk%ekL`aqlLqFbA5Yd6<dcHi6D
z*<0D(S>N4V*;&82zPh^}q20Z$?UlXFTkAVfj8~BmOse-2A2aWQHCerDy&tds(f3Qb
ay7}_P+q_p)fBGaXyq`ZE6w%j5@B9s3Xd`9-

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridConstants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridConstants.java
index 24189411d..14a457a97 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridConstants.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridConstants.java
@@ -39,7 +39,7 @@ public final class QHybridConstants {
             put("weatherApp", "3.11");
             put("wellnessApp", "3.16");
             put("AlexaApp", "3.11");
-            put("navigationApp", "1.0");
+            put("navigationApp", "1.1");
         }
     };
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil_hr/FossilHRWatchAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil_hr/FossilHRWatchAdapter.java
index 858dc08d6..5bafe005c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil_hr/FossilHRWatchAdapter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil_hr/FossilHRWatchAdapter.java
@@ -2082,6 +2082,7 @@ public class FossilHRWatchAdapter extends FossilWatchAdapter {
     }
 
     public void onSetNavigationInfo(NavigationInfoSpec navigationInfoSpec) {
+        SharedPreferences prefs = getDeviceSpecificPreferences();
         String installedAppsJson = getDeviceSupport().getDevice().getDeviceInfo("INSTALLED_APPS").getDetails();
         if (installedAppsJson == null || !installedAppsJson.contains("navigationApp")) {
             if (!notifiedAboutMissingNavigationApp) {
@@ -2106,6 +2107,8 @@ public class FossilHRWatchAdapter extends FossilWatchAdapter {
                                             .put("eta", navigationInfoSpec.ETA)
                                             .put("instruction", navigationInfoSpec.instruction)
                                             .put("nextAction", navigationInfoSpec.nextAction)
+                                            .put("autoFg", prefs.getBoolean("fossil_hr_nav_auto_foreground", true))
+                                            .put("vibrate", prefs.getBoolean("fossil_hr_nav_vibrate", true))
                                     )
                             )
                     );
diff --git a/app/src/main/res/drawable/baseline_merge_24.xml b/app/src/main/res/drawable/baseline_merge_24.xml
new file mode 100644
index 000000000..29fb1bfa7
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_merge_24.xml
@@ -0,0 +1,8 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#7E7E7E"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
+    <path android:fillColor="#000000" android:pathData="M6.41,21L5,19.59l4.83,-4.83c0.75,-0.75 1.17,-1.77 1.17,-2.83v-5.1L9.41,8.41L8,7l4,-4l4,4l-1.41,1.41L13,6.83v5.1c0,1.06 0.42,2.08 1.17,2.83L19,19.59L17.59,21L12,15.41L6.41,21z"/>
+</vector>
diff --git a/app/src/main/res/xml/devicesettings_fossilhybridhr_all_fw.xml b/app/src/main/res/xml/devicesettings_fossilhybridhr_all_fw.xml
index c05326e6c..5ba429610 100644
--- a/app/src/main/res/xml/devicesettings_fossilhybridhr_all_fw.xml
+++ b/app/src/main/res/xml/devicesettings_fossilhybridhr_all_fw.xml
@@ -131,4 +131,25 @@
             android:targetClass="nodomain.freeyourgadget.gadgetbridge.devices.qhybrid.CalibrationActivity" />
     </Preference>
 
+    <PreferenceScreen
+        android:icon="@drawable/baseline_merge_24"
+        android:title="Navigation instructions"
+        android:summary="Configure on-watch navigation app behavior"
+        android:key="navigation_app_config">
+
+        <SwitchPreferenceCompat
+            android:defaultValue="true"
+            android:key="fossil_hr_nav_auto_foreground"
+            android:title="Come to foreground"
+            android:summary="Whether the navigation app should automatically come to the foreground when it receives a navigation instruction"
+            android:icon="@drawable/ic_info"/>
+        <SwitchPreferenceCompat
+            android:defaultValue="true"
+            android:key="fossil_hr_nav_vibrate"
+            android:title="Vibrate on new instruction"
+            android:summary="Whether the watch should vibrate on every new or changed navigation instruction (only when the app is in the foreground)"
+            android:icon="@drawable/ic_action_find_lost_device"/>
+
+    </PreferenceScreen>
+
 </androidx.preference.PreferenceScreen>
diff --git a/external/fossil-hr-gbapps b/external/fossil-hr-gbapps
index 1675b3898..3c9007742 160000
--- a/external/fossil-hr-gbapps
+++ b/external/fossil-hr-gbapps
@@ -1 +1 @@
-Subproject commit 1675b38983b78ac306b0ee860806b754230d9f55
+Subproject commit 3c900774207d9dd904886433d672d22d5bd0dea4

From 9c619c6c7c773f82e8e15eb9f8b7d932a5c4c9b0 Mon Sep 17 00:00:00 2001
From: Arjan Schrijver <a_gadgetbridge@anymore.nl>
Date: Sat, 23 Dec 2023 22:13:20 +0100
Subject: [PATCH 274/595] Fossil/Skagen Hybrids: Make navigation options texts
 translatable

---
 app/src/main/res/values/strings.xml                  |  6 ++++++
 .../res/xml/devicesettings_fossilhybridhr_all_fw.xml | 12 ++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index aec63d525..370012219 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2485,4 +2485,10 @@
     <string name="widget_move_down">Move down</string>
     <string name="widget_missing_parts">Please select all widgets</string>
     <string name="widget_unknown_workout">Unknown workout - %s</string>
+    <string name="pref_title_fossil_hr_navigation_instructions">Navigation instructions</string>
+    <string name="pref_summary_fossil_hr_navigation_instructions">Configure on-watch navigation app behavior</string>
+    <string name="pref_title_fossil_hr_nav_foreground">Come to foreground</string>
+    <string name="pref_summary_fossil_hr_nav_foreground">Whether the navigation app should automatically come to the foreground when it receives a navigation instruction</string>
+    <string name="pref_title_fossil_hr_nav_vibrate">Vibrate on new instruction</string>
+    <string name="pref_summary_fossil_hr_nav_vibrate">Whether the watch should vibrate on every new or changed navigation instruction (only when the app is in the foreground)</string>
 </resources>
diff --git a/app/src/main/res/xml/devicesettings_fossilhybridhr_all_fw.xml b/app/src/main/res/xml/devicesettings_fossilhybridhr_all_fw.xml
index 5ba429610..13b70bb60 100644
--- a/app/src/main/res/xml/devicesettings_fossilhybridhr_all_fw.xml
+++ b/app/src/main/res/xml/devicesettings_fossilhybridhr_all_fw.xml
@@ -133,21 +133,21 @@
 
     <PreferenceScreen
         android:icon="@drawable/baseline_merge_24"
-        android:title="Navigation instructions"
-        android:summary="Configure on-watch navigation app behavior"
+        android:title="@string/pref_title_fossil_hr_navigation_instructions"
+        android:summary="@string/pref_summary_fossil_hr_navigation_instructions"
         android:key="navigation_app_config">
 
         <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="fossil_hr_nav_auto_foreground"
-            android:title="Come to foreground"
-            android:summary="Whether the navigation app should automatically come to the foreground when it receives a navigation instruction"
+            android:title="@string/pref_title_fossil_hr_nav_foreground"
+            android:summary="@string/pref_summary_fossil_hr_nav_foreground"
             android:icon="@drawable/ic_info"/>
         <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="fossil_hr_nav_vibrate"
-            android:title="Vibrate on new instruction"
-            android:summary="Whether the watch should vibrate on every new or changed navigation instruction (only when the app is in the foreground)"
+            android:title="@string/pref_title_fossil_hr_nav_vibrate"
+            android:summary="@string/pref_summary_fossil_hr_nav_vibrate"
             android:icon="@drawable/ic_action_find_lost_device"/>
 
     </PreferenceScreen>

From 4a7a201971adcbbd020f10591756e06da055f92f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sat, 23 Dec 2023 21:27:53 +0000
Subject: [PATCH 275/595] Pixoo: Support custom device name

---
 .../devicesettings/DeviceSettingsPreferenceConst.java  |  1 +
 .../devicesettings/DeviceSpecificSettingsFragment.java |  1 +
 .../gadgetbridge/devices/divoom/PixooCoordinator.java  | 10 +++++++---
 .../devices/huami/Huami2021Coordinator.java            |  1 -
 .../service/devices/divoom/PixooProtocol.java          |  9 +++++++++
 app/src/main/res/values/strings.xml                    |  1 +
 app/src/main/res/xml/devicesettings_device_name.xml    |  9 +++++++++
 7 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/res/xml/devicesettings_device_name.xml

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
index f80bf891b..8fab653be 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
@@ -47,6 +47,7 @@ public class DeviceSettingsPreferenceConst {
     public static final String PREF_LANGUAGE = "language";
     public static final String PREF_LANGUAGE_AUTO = "auto";
     public static final String PREF_DEVICE_REGION = "device_region";
+    public static final String PREF_DEVICE_NAME = "pref_device_name";
     public static final String PREF_DATEFORMAT = "dateformat";
     public static final String PREF_TIMEFORMAT = "timeformat";
     public static final String PREF_TIMEFORMAT_24H = "24h";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
index f4eadc410..8df6db0fc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
@@ -339,6 +339,7 @@ public class DeviceSpecificSettingsFragment extends AbstractPreferenceFragment i
         addPreferenceHandlerFor(PREF_WEARLOCATION);
         addPreferenceHandlerFor(PREF_VIBRATION_ENABLE);
         addPreferenceHandlerFor(PREF_NOTIFICATION_ENABLE);
+        addPreferenceHandlerFor(PREF_DEVICE_NAME);
         addPreferenceHandlerFor(PREF_SCREEN_BRIGHTNESS);
         addPreferenceHandlerFor(PREF_SCREEN_AUTO_BRIGHTNESS);
         addPreferenceHandlerFor(PREF_SCREEN_ORIENTATION);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/divoom/PixooCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/divoom/PixooCoordinator.java
index 5b8e877fb..2f3ab8e81 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/divoom/PixooCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/divoom/PixooCoordinator.java
@@ -32,7 +32,7 @@ import nodomain.freeyourgadget.gadgetbridge.service.devices.divoom.PixooSupport;
 public class PixooCoordinator extends AbstractBLEDeviceCoordinator {
     @Override
     protected Pattern getSupportedDeviceName() {
-        return Pattern.compile("Pixoo");
+        return Pattern.compile("Pixoo(-.+)?");
     }
 
     @Override
@@ -79,10 +79,14 @@ public class PixooCoordinator extends AbstractBLEDeviceCoordinator {
     @Override
     public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
         return new int[]{
-                R.xml.devicesettings_pixoo,
+                R.xml.devicesettings_header_display,
                 R.xml.devicesettings_screen_brightness,
+                R.xml.devicesettings_header_time,
                 R.xml.devicesettings_timeformat,
+                R.xml.devicesettings_header_other,
+                R.xml.devicesettings_pixoo,
+                R.xml.devicesettings_header_connection,
+                R.xml.devicesettings_device_name,
         };
     }
-
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021Coordinator.java
index b12bfd42e..0ddbebe14 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021Coordinator.java
@@ -29,7 +29,6 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Locale;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.activities.appmanager.AppManagerActivity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooProtocol.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooProtocol.java
index 53ce5b2c6..d9dcdc99c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooProtocol.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooProtocol.java
@@ -52,6 +52,7 @@ import nodomain.freeyourgadget.gadgetbridge.service.btle.BLETypeConversions;
 import nodomain.freeyourgadget.gadgetbridge.service.serial.GBDeviceProtocol;
 import nodomain.freeyourgadget.gadgetbridge.util.GBPrefs;
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
+import nodomain.freeyourgadget.gadgetbridge.util.StringUtils;
 
 public class PixooProtocol extends GBDeviceProtocol {
     private static final Logger LOG = LoggerFactory.getLogger(PixooProtocol.class);
@@ -158,6 +159,14 @@ public class PixooProtocol extends GBDeviceProtocol {
         SharedPreferences prefs = GBApplication.getDeviceSpecificSharedPrefs(getDevice().getAddress());
 
         switch (config) {
+            case DeviceSettingsPreferenceConst.PREF_DEVICE_NAME:
+                final byte[] deviceName = StringUtils.truncateToBytes(prefs.getString(DeviceSettingsPreferenceConst.PREF_DEVICE_NAME, ""), 26);
+                return encodeProtocol(ByteBuffer.allocate(2 + deviceName.length)
+                        .order(ByteOrder.LITTLE_ENDIAN)
+                        .put((byte) 0x75)
+                        .put((byte) deviceName.length)
+                        .put(deviceName)
+                        .array());
             case DeviceSettingsPreferenceConst.PREF_SCREEN_BRIGHTNESS:
                 byte brightness = (byte) prefs.getInt(DeviceSettingsPreferenceConst.PREF_SCREEN_BRIGHTNESS, 50);
                 LOG.debug("setting brightness to " + brightness);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 370012219..fb9df11c6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -976,6 +976,7 @@
     <string name="prefs_always_on_display_follow_watchface">Style follows Watchface</string>
     <string name="prefs_always_on_display_style">Style</string>
     <string name="prefs_always_on_display_summary">Keep the band\'s display always on</string>
+    <string name="prefs_device_name">Device name</string>
     <string name="prefs_password">Password</string>
     <string name="prefs_password_summary">Lock the band with a password when removed from the wrist</string>
     <string name="prefs_password_enabled">Password Enabled</string>
diff --git a/app/src/main/res/xml/devicesettings_device_name.xml b/app/src/main/res/xml/devicesettings_device_name.xml
new file mode 100644
index 000000000..c37d90679
--- /dev/null
+++ b/app/src/main/res/xml/devicesettings_device_name.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <EditTextPreference
+        android:icon="@drawable/ic_bluetooth"
+        android:key="pref_device_name"
+        android:title="@string/prefs_device_name"
+        app:useSimpleSummaryProvider="true" />
+</androidx.preference.PreferenceScreen>

From 1cfd00c924a3897b2769061137550af1775b41fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sat, 23 Dec 2023 21:51:54 +0000
Subject: [PATCH 276/595] Pixoo: Add setting to disable notifications

---
 .../gadgetbridge/devices/divoom/PixooCoordinator.java       | 2 ++
 .../gadgetbridge/service/devices/divoom/PixooProtocol.java  | 5 +++++
 .../gadgetbridge/service/serial/GBDeviceProtocol.java       | 6 ++++++
 3 files changed, 13 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/divoom/PixooCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/divoom/PixooCoordinator.java
index 2f3ab8e81..5996da4b9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/divoom/PixooCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/divoom/PixooCoordinator.java
@@ -83,6 +83,8 @@ public class PixooCoordinator extends AbstractBLEDeviceCoordinator {
                 R.xml.devicesettings_screen_brightness,
                 R.xml.devicesettings_header_time,
                 R.xml.devicesettings_timeformat,
+                R.xml.devicesettings_header_notifications,
+                R.xml.devicesettings_send_app_notifications,
                 R.xml.devicesettings_header_other,
                 R.xml.devicesettings_pixoo,
                 R.xml.devicesettings_header_connection,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooProtocol.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooProtocol.java
index d9dcdc99c..760d2cf5a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooProtocol.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooProtocol.java
@@ -216,6 +216,11 @@ public class PixooProtocol extends GBDeviceProtocol {
 
     @Override
     public byte[] encodeNotification(NotificationSpec notificationSpec) {
+        if (!getDevicePrefs().getBoolean(DeviceSettingsPreferenceConst.PREF_SEND_APP_NOTIFICATIONS, true)) {
+            LOG.debug("App notifications disabled - ignoring");
+            return null;
+        }
+
         byte iconID;
         switch (notificationSpec.type) {
             case KAKAO_TALK:
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/GBDeviceProtocol.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/GBDeviceProtocol.java
index 8551787cd..1b1389bc6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/GBDeviceProtocol.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/GBDeviceProtocol.java
@@ -22,6 +22,7 @@ import android.location.Location;
 import java.util.ArrayList;
 import java.util.UUID;
 
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEvent;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.model.Alarm;
@@ -31,6 +32,7 @@ import nodomain.freeyourgadget.gadgetbridge.model.NotificationSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.Reminder;
 import nodomain.freeyourgadget.gadgetbridge.model.WeatherSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.WorldClock;
+import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 
 public abstract class GBDeviceProtocol {
 
@@ -178,4 +180,8 @@ public abstract class GBDeviceProtocol {
     public byte[] encodeGpsLocation(Location location) {
         return null;
     }
+
+    protected Prefs getDevicePrefs() {
+        return new Prefs(GBApplication.getDeviceSpecificSharedPrefs(getDevice().getAddress()));
+    }
 }

From 09fbc2665bf603e9f639fa5cb224ffd4ae8dc439 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sun, 24 Dec 2023 16:38:11 +0000
Subject: [PATCH 277/595] Redmi Watch 2 Lite: Experimental support

---
 .../redmiwatch2lite/RedmiWatch2Lite.java      | 63 +++++++++++++++++++
 .../gadgetbridge/model/DeviceType.java        |  2 +
 .../devices/xiaomi/XiaomiBleUuids.java        |  1 +
 app/src/main/res/values/strings.xml           |  1 +
 4 files changed, 67 insertions(+)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch2lite/RedmiWatch2Lite.java

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch2lite/RedmiWatch2Lite.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch2lite/RedmiWatch2Lite.java
new file mode 100644
index 000000000..a1a4ee3a9
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch2lite/RedmiWatch2Lite.java
@@ -0,0 +1,63 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.redmiwatch2lite;
+
+import android.content.Context;
+import android.net.Uri;
+
+import androidx.annotation.Nullable;
+
+import java.util.regex.Pattern;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiInstallHandler;
+
+public class RedmiWatch2Lite extends XiaomiCoordinator {
+    @Override
+    public boolean isExperimental() {
+        return true;
+    }
+
+    @Override
+    protected Pattern getSupportedDeviceName() {
+        return Pattern.compile("^Redmi Watch 2 Lite [A-Z0-9]{4}$");
+    }
+
+    @Nullable
+    @Override
+    public InstallHandler findInstallHandler(final Uri uri, final Context context) {
+        final XiaomiInstallHandler handler = new XiaomiInstallHandler(uri, context);
+        return handler.isValid() ? handler : null;
+    }
+
+    @Override
+    public int getDeviceNameResource() {
+        return R.string.devicetype_redmi_watch_2_lite;
+    }
+
+    @Override
+    public int getDefaultIconResource() {
+        return R.drawable.ic_device_amazfit_bip;
+    }
+
+    @Override
+    public int getDisabledIconResource() {
+        return R.drawable.ic_device_amazfit_bip_disabled;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
index d482e1a99..2daf3be23 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
@@ -148,6 +148,7 @@ import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.miband7pro.MiBand7Pro
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.miband8.MiBand8Coordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.miwatchcolorsport.MiWatchColorSportCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.redmismartband2.RedmiSmartBand2Coordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.redmiwatch2lite.RedmiWatch2Lite;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.watchs1active.XiaomiWatchS1ActiveCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xwatch.XWatchCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.zetime.ZeTimeCoordinator;
@@ -209,6 +210,7 @@ public enum DeviceType {
     MIWATCHCOLORSPORT(MiWatchColorSportCoordinator.class),
     REDMIWATCH3ACTIVE(RedmiWatch3ActiveCoordinator.class),
     REDMISMARTBAND2(RedmiSmartBand2Coordinator.class),
+    REDMIWATCH2LITE(RedmiWatch2Lite.class),
     XIAOMI_WATCH_S1_ACTIVE(XiaomiWatchS1ActiveCoordinator.class),
     AMAZFITGTS3(AmazfitGTS3Coordinator.class),
     AMAZFITGTR3(AmazfitGTR3Coordinator.class),
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiBleUuids.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiBleUuids.java
index 5e9b4b93b..feef9bddc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiBleUuids.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiBleUuids.java
@@ -27,6 +27,7 @@ public class XiaomiBleUuids {
         // Redmi Watch 3 Active
         // Xiaomi Watch S1 Active
         // Redmi Smart Band 2
+        // Redmi Watch 2 Lite
         put(UUID.fromString("0000fe95-0000-1000-8000-00805f9b34fb"), new XiaomiBleUuidSet(
                 true,
                 UUID.fromString("00000051-0000-1000-8000-00805f9b34fb"),
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fb9df11c6..06cc32d84 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1427,6 +1427,7 @@
     <string name="devicetype_xiaomi_watch_lite">Xiaomi Watch Lite</string>
     <string name="devicetype_redmiwatch3active">Redmi Watch 3 Active</string>
     <string name="devicetype_redmi_smart_band_2">Redmi Smart Band 2</string>
+    <string name="devicetype_redmi_watch_2_lite">Redmi Watch 2 Lite</string>
     <string name="choose_auto_export_location">Choose export location</string>
     <string name="notification_channel_name">General</string>
     <string name="notification_channel_high_priority_name">High-priority</string>

From f4d7a6b4900fb8ed254e613ec2bb50fbc2b9a7c5 Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Tue, 26 Dec 2023 01:14:16 +0100
Subject: [PATCH 278/595] Pixoo: implement sending bitmaps

Not really used right not - mapped to "test new functionality"
---
 .../service/devices/divoom/PixooProtocol.java | 76 ++++++++++++++++++-
 1 file changed, 75 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooProtocol.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooProtocol.java
index 760d2cf5a..01a26d618 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooProtocol.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooProtocol.java
@@ -19,6 +19,10 @@ package nodomain.freeyourgadget.gadgetbridge.service.devices.divoom;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
 
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
@@ -31,6 +35,7 @@ import java.nio.ByteOrder;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 
@@ -50,7 +55,9 @@ import nodomain.freeyourgadget.gadgetbridge.model.NotificationSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.WeatherSpec;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.BLETypeConversions;
 import nodomain.freeyourgadget.gadgetbridge.service.serial.GBDeviceProtocol;
+import nodomain.freeyourgadget.gadgetbridge.util.BitmapUtil;
 import nodomain.freeyourgadget.gadgetbridge.util.GBPrefs;
+import nodomain.freeyourgadget.gadgetbridge.util.NotificationUtils;
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 import nodomain.freeyourgadget.gadgetbridge.util.StringUtils;
 
@@ -334,6 +341,71 @@ public class PixooProtocol extends GBDeviceProtocol {
         });
     }
 
+    private byte[] encodeDrawIcon(String packageName) {
+        Drawable icon = NotificationUtils.getAppIcon(GBApplication.getContext(), packageName);
+        if (icon == null) {
+            LOG.warn("could not get icon for package: " + packageName);
+            return null;
+        }
+        final Bitmap bmp = BitmapUtil.toBitmap(icon);
+        final Bitmap bmpResized = Bitmap.createBitmap(16, 16, Bitmap.Config.ARGB_8888);
+        final Canvas canvas = new Canvas(bmpResized);
+        final Rect rect = new Rect(0, 0, 16, 16);
+        canvas.drawBitmap(bmp, null, rect, null);
+
+
+        // construct palette with unique colors
+        HashSet<Integer> palette = new HashSet<>();
+        for (int y = 0; y < 16; y++) {
+            for (int x = 0; x < 16; x++) {
+                int pixel = bmpResized.getPixel(x, y);
+                palette.add(pixel);
+            }
+        }
+        // convert to lookup of index
+        HashMap<Integer, Integer> paletteLookup = new HashMap<>();
+        int index = 0;
+        for (int color : palette) {
+            paletteLookup.put(color, index++);
+        }
+
+        int paletteMaxIndex = palette.size() - 1;
+        int bpp = 1;
+        while ((paletteMaxIndex >>= 1) != 0) {
+            bpp++;
+        }
+        LOG.info("got palette of {} colors, will need {}bpp", palette.size(), bpp);
+        byte[] header = new byte[]{0x44, 0x00, 0x0a, 0x0a, 0x04, (byte) 0xaa, 0x53, 0x00, (byte) 0xf4, 0x01, 0x00, (byte) palette.size()};
+        int pixels_size = (bpp * 16 * 16) / 8;
+        byte[] pixels = new byte[pixels_size];
+        ByteBuffer buf = ByteBuffer.allocate(palette.size() * 3 + header.length + pixels_size);
+        buf.put(header);
+        for (int color : palette) {
+            buf.put((byte) ((color >> 16) & 0xff));
+            buf.put((byte) ((color >> 8) & 0xff));
+            buf.put((byte) (color & 0xff));
+        }
+        int bitposition = 0;
+        for (int y = 0; y < 16; y++) {
+            for (int x = 0; x < 16; x++) {
+                int pixel = bmpResized.getPixel(x, y);
+                index = paletteLookup.get(pixel);
+                int pos = bitposition / 8;
+                int shift = bitposition % 8;
+                pixels[pos] = (byte) (pixels[pos] | (byte) (index << shift));
+                if (shift + bpp > 8) {
+                    shift = -shift + 8;
+                    pos++;
+                    pixels[pos] = (byte) (pixels[pos] | (byte) (index >> shift));
+                }
+                bitposition += bpp;
+            }
+        }
+        buf.put(pixels);
+
+        return encodeProtocol(buf.array());
+    }
+
     private byte[] encodeClockModeCommand(int clockMode, boolean showTime, boolean showWeather, boolean showTemperature, boolean showDate,
                                           int r, int g, int b) {
 
@@ -379,7 +451,9 @@ public class PixooProtocol extends GBDeviceProtocol {
     public byte[] encodeTestNewFunction() {
         //return encodeAudioModeCommand(1); // works
         //return encodeEffectModeCommand(5); // does nothing
-        return encodeClockModeCommand(0, true, true, false, true, 127, 127, 127); // works r,g,b up to 127
+        //return encodeClockModeCommand(0, true, true, false, true, 127, 127, 127); // works r,g,b up to 127
+        return encodeDrawIcon("nodomain.freeyourgadget.gadgetbridge");
+        //return encodeDrawIcon("com.benny.openlauncher");
     }
 
     byte[] encodeProtocol(byte[] payload) {

From b77ba8b74c6d48c9b54c4bd457bb3478b27dfb4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Tue, 26 Dec 2023 16:48:59 +0000
Subject: [PATCH 279/595] Pebble: Attempt to fix app configuration webview

See #3373 and possibly #3424
---
 .../freeyourgadget/gadgetbridge/util/WebViewSingleton.java     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/WebViewSingleton.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/WebViewSingleton.java
index 505c107e0..af7d486f7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/WebViewSingleton.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/WebViewSingleton.java
@@ -104,6 +104,9 @@ public class WebViewSingleton {
             webSettings.setDomStorageEnabled(true);
             //needed for localstorage
             webSettings.setDatabaseEnabled(true);
+            // #3373 #3424 - Fix configuration for pebble apps
+            // TODO: this should use a WebViewAssetLoader
+            webSettings.setAllowFileAccess(true);
         }
     }
 

From 177fa56bb9cafeae2a2f2093bcd418751e9cbc4c Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Tue, 26 Dec 2023 20:38:13 +0100
Subject: [PATCH 280/595] Pixoo: Quick hack to "install" any image on the pixoo

---
 .../devices/divoom/PixooCoordinator.java      |  9 ++++
 .../devices/divoom/PixooInstallHandler.java   | 50 +++++++++++++++++++
 .../service/devices/divoom/PixooIOThread.java |  2 +-
 .../service/devices/divoom/PixooProtocol.java | 20 +++++++-
 .../service/devices/divoom/PixooSupport.java  |  7 +++
 5 files changed, 86 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/divoom/PixooInstallHandler.java

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/divoom/PixooCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/divoom/PixooCoordinator.java
index 5996da4b9..05682a3ad 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/divoom/PixooCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/divoom/PixooCoordinator.java
@@ -16,6 +16,9 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.divoom;
 
+import android.content.Context;
+import android.net.Uri;
+
 import androidx.annotation.NonNull;
 
 import java.util.regex.Pattern;
@@ -23,6 +26,7 @@ import java.util.regex.Pattern;
 import nodomain.freeyourgadget.gadgetbridge.GBException;
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.AbstractBLEDeviceCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
 import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
@@ -51,6 +55,11 @@ public class PixooCoordinator extends AbstractBLEDeviceCoordinator {
         return PixooSupport.class;
     }
 
+    @Override
+    public InstallHandler findInstallHandler(final Uri uri, final Context context) {
+        PixooInstallHandler installHandler = new PixooInstallHandler(uri, context);
+        return installHandler.isValid() ? installHandler : null;
+    }
     @Override
     public int getDeviceNameResource() {
         return R.string.devicetype_pixoo;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/divoom/PixooInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/divoom/PixooInstallHandler.java
new file mode 100644
index 000000000..0155dd41a
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/divoom/PixooInstallHandler.java
@@ -0,0 +1,50 @@
+/*  Copyright (C) 2023 Andreas Shimokawa
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+
+package nodomain.freeyourgadget.gadgetbridge.devices.divoom;
+
+import android.content.Context;
+import android.net.Uri;
+
+import nodomain.freeyourgadget.gadgetbridge.activities.InstallActivity;
+import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+
+public class PixooInstallHandler implements InstallHandler {
+    private final Context mContext;
+    private final Uri mUri;
+
+    public PixooInstallHandler(Uri uri, Context context) {
+        mContext = context;
+        mUri = uri;
+    }
+
+    @Override
+    public boolean isValid() {
+        return true;
+    }
+
+    @Override
+    public void validateInstallation(InstallActivity installActivity, GBDevice device) {
+        installActivity.setInstallEnabled(true);
+    }
+
+    @Override
+    public void onStartInstall(GBDevice device) {
+
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooIOThread.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooIOThread.java
index d9fd8e1b8..e6fc3fa17 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooIOThread.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooIOThread.java
@@ -21,6 +21,7 @@ import static nodomain.freeyourgadget.gadgetbridge.util.GB.hexdump;
 
 import android.bluetooth.BluetoothAdapter;
 import android.content.Context;
+import android.net.Uri;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -58,5 +59,4 @@ public class PixooIOThread extends BtClassicIoThread {
         LOG.debug("read " + bytes + " bytes. " + hexdump(buffer, 0, bytes));
         return Arrays.copyOf(buffer, bytes);
     }
-
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooProtocol.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooProtocol.java
index 01a26d618..97258a5d8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooProtocol.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooProtocol.java
@@ -23,6 +23,8 @@ import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.provider.MediaStore;
 
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
@@ -30,6 +32,7 @@ import org.apache.commons.lang3.ArrayUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.ArrayList;
@@ -348,10 +351,25 @@ public class PixooProtocol extends GBDeviceProtocol {
             return null;
         }
         final Bitmap bmp = BitmapUtil.toBitmap(icon);
+
+        return encodeShowFrame(bmp);
+    }
+
+    protected byte[] encodeShowFrame(Uri uri) {
+        try {
+            Bitmap bitmap = MediaStore.Images.Media.getBitmap(GBApplication.getContext().getContentResolver(), uri);
+            return encodeShowFrame(bitmap);
+        } catch (IOException e) {
+            LOG.error("could not decode Image",e);
+        }
+        return null;
+    }
+
+    private byte[] encodeShowFrame(Bitmap bitmap) {
         final Bitmap bmpResized = Bitmap.createBitmap(16, 16, Bitmap.Config.ARGB_8888);
         final Canvas canvas = new Canvas(bmpResized);
         final Rect rect = new Rect(0, 0, 16, 16);
-        canvas.drawBitmap(bmp, null, rect, null);
+        canvas.drawBitmap(bitmap, null, rect, null);
 
 
         // construct palette with unique colors
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooSupport.java
index 6fdfcb26a..e595899b1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooSupport.java
@@ -17,6 +17,8 @@
 
 package nodomain.freeyourgadget.gadgetbridge.service.devices.divoom;
 
+import android.net.Uri;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -54,6 +56,11 @@ public class PixooSupport extends AbstractSerialDeviceSupport {
         return new PixooProtocol(getDevice());
     }
 
+    @Override
+    public void onInstallApp(Uri uri) {
+        getDeviceIOThread().write(((PixooProtocol) getDeviceProtocol()).encodeShowFrame(uri));
+    }
+
     @Override
     protected GBDeviceIoThread createDeviceIOThread() {
         return new PixooIOThread(getDevice(), getContext(), (PixooProtocol) getDeviceProtocol(),

From aa7c2b1731558af40a3d8fc1753f700cbd6acbe0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Tue, 26 Dec 2023 22:02:43 +0000
Subject: [PATCH 281/595] Xiaomi: Improve workout summary parsing

Outdoor walking on the Mi Band 8, but does not seem to match the summary
from the Mi Band 7 Pro.
---
 .../activity/impl/WorkoutSummaryParser.java   | 88 +++++++++++++++++++
 1 file changed, 88 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java
index afd3ccd1a..bc29628fd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java
@@ -95,6 +95,94 @@ public class WorkoutSummaryParser extends XiaomiActivityParser implements Activi
 
         final XiaomiActivityFileId fileId = XiaomiActivityFileId.from(buf);
 
+        switch (fileId.getSubtype()) {
+            case SPORTS_OUTDOOR_RUNNING:
+                break;
+            case SPORTS_FREESTYLE:
+                break;
+            case SPORTS_ELLIPTICAL:
+                break;
+            case SPORTS_OUTDOOR_WALKING:
+                return parseOutdoorWalking(summary, fileId, buf);
+            case SPORTS_OUTDOOR_CYCLING:
+                return parseOutdoorCycling(summary, fileId, buf);
+        }
+
+        LOG.warn("Unable to parse {}", fileId.getSubtype());
+
+        return null;
+    }
+
+    private BaseActivitySummary parseOutdoorWalking(final BaseActivitySummary summary, final XiaomiActivityFileId fileId, final ByteBuffer buf) {
+        final JSONObject summaryData = new JSONObject();
+
+        final int version = fileId.getVersion();
+        final int headerSize;
+        switch (version) {
+            case 4:
+                headerSize = 7;
+                break;
+            default:
+                LOG.warn("Unable to parse workout summary version {}", fileId.getVersion());
+                return null;
+        }
+
+        final byte[] header = new byte[headerSize];
+        buf.get(header);
+
+        final short workoutType = buf.getShort();
+
+        switch (workoutType) {
+            case 2:
+                summary.setActivityKind(ActivityKind.TYPE_WALKING);
+                break;
+            default:
+                summary.setActivityKind(ActivityKind.TYPE_UNKNOWN);
+        }
+
+        final int startTime = buf.getInt();
+        final int endTime = buf.getInt();
+
+        // We don't set the start time, since we need it to match the fileId for the WorkoutGpsParser
+        // to find it. They also seem to match.
+        //summary.setStartTime(new Date(startTime * 1000L));
+        summary.setEndTime(new Date(endTime * 1000L));
+
+        final int duration = buf.getInt();
+        addSummaryData(summaryData, "activeSeconds", duration, "seconds");
+
+        final int unknown1 = buf.getInt();
+        final int distance = buf.getInt();
+        addSummaryData(summaryData, "distanceMeters", distance, "meters");
+
+        final int unknown2 = buf.getShort();
+
+        final int calories = buf.getShort();
+        addSummaryData(summaryData, "caloriesBurnt", calories, "calories_unit");
+
+        final int unknown3 = buf.getInt(); // pace?
+        final int unknown4 = buf.getInt(); // pace?
+        final int unknown5 = buf.getInt(); // pace?
+        final int steps = buf.getInt();
+        addSummaryData(summaryData, "steps", steps, "steps_unit");
+        final int unknown6 = buf.getShort(); // pace?
+
+        final int averageHR = buf.get() & 0xff;
+        final int maxHR = buf.get() & 0xff;
+        final int minHR = buf.get() & 0xff;
+
+        addSummaryData(summaryData, "averageHR", averageHR, "bpm");
+        addSummaryData(summaryData, "maxHR", maxHR, "bpm");
+        addSummaryData(summaryData, "minHR", minHR, "bpm");
+
+        summary.setSummaryData(summaryData.toString());
+
+        return summary;
+    }
+
+    private BaseActivitySummary parseOutdoorCycling(final BaseActivitySummary summary, final XiaomiActivityFileId fileId, final ByteBuffer buf) {
+        final JSONObject summaryData = new JSONObject();
+
         final int version = fileId.getVersion();
         final int headerSize;
         switch (version) {

From c9fec4e33a0e6546784cbff82a788fe8f93066aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Tue, 26 Dec 2023 22:07:35 +0000
Subject: [PATCH 282/595] Xiaomi: Identify strength training, elliptical and
 outdoor running

---
 .../activity/impl/WorkoutSummaryParser.java   | 32 ++++++++++++++++---
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java
index bc29628fd..452be44c3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java
@@ -89,19 +89,17 @@ public class WorkoutSummaryParser extends XiaomiActivityParser implements Activi
 
     @Override
     public BaseActivitySummary parseBinaryData(final BaseActivitySummary summary) {
-        final JSONObject summaryData = new JSONObject();
-
         final ByteBuffer buf = ByteBuffer.wrap(summary.getRawSummaryData()).order(ByteOrder.LITTLE_ENDIAN);
 
         final XiaomiActivityFileId fileId = XiaomiActivityFileId.from(buf);
 
         switch (fileId.getSubtype()) {
             case SPORTS_OUTDOOR_RUNNING:
-                break;
+                return parseOutdoorRunning(summary, fileId, buf);
             case SPORTS_FREESTYLE:
-                break;
+                return parseFreestyle(summary, fileId, buf);
             case SPORTS_ELLIPTICAL:
-                break;
+                return parseElliptical(summary, fileId, buf);
             case SPORTS_OUTDOOR_WALKING:
                 return parseOutdoorWalking(summary, fileId, buf);
             case SPORTS_OUTDOOR_CYCLING:
@@ -113,6 +111,30 @@ public class WorkoutSummaryParser extends XiaomiActivityParser implements Activi
         return null;
     }
 
+    private BaseActivitySummary parseOutdoorRunning(final BaseActivitySummary summary, final XiaomiActivityFileId fileId, final ByteBuffer buf) {
+        summary.setActivityKind(ActivityKind.TYPE_RUNNING);
+
+        // TODO
+
+        return summary;
+    }
+
+    private BaseActivitySummary parseFreestyle(final BaseActivitySummary summary, final XiaomiActivityFileId fileId, final ByteBuffer buf) {
+        summary.setActivityKind(ActivityKind.TYPE_STRENGTH_TRAINING);
+
+        // TODO
+
+        return summary;
+    }
+
+    private BaseActivitySummary parseElliptical(final BaseActivitySummary summary, final XiaomiActivityFileId fileId, final ByteBuffer buf) {
+        summary.setActivityKind(ActivityKind.TYPE_ELLIPTICAL_TRAINER);
+
+        // TODO
+
+        return summary;
+    }
+
     private BaseActivitySummary parseOutdoorWalking(final BaseActivitySummary summary, final XiaomiActivityFileId fileId, final ByteBuffer buf) {
         final JSONObject summaryData = new JSONObject();
 

From e14b2fc38245150db2174aa85cdbfa775ec3accf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Tue, 26 Dec 2023 22:12:22 +0000
Subject: [PATCH 283/595] Pixoo: Enable flashing

---
 .../gadgetbridge/devices/divoom/PixooCoordinator.java       | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/divoom/PixooCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/divoom/PixooCoordinator.java
index 05682a3ad..4b94afb61 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/divoom/PixooCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/divoom/PixooCoordinator.java
@@ -65,6 +65,12 @@ public class PixooCoordinator extends AbstractBLEDeviceCoordinator {
         return R.string.devicetype_pixoo;
     }
 
+    @Override
+    public boolean supportsFlashing() {
+        // To install bitmaps
+        return true;
+    }
+
     @Override
     public boolean supportsWeather() {
         return true;

From 1907912bd2716444458040c36c60a208e1fafc8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 29 Dec 2023 19:54:37 +0000
Subject: [PATCH 284/595] Xiaomi: Fix outdoor walking parsing on some watches

---
 .../xiaomi/activity/XiaomiActivityFileId.java |  3 +-
 .../activity/impl/WorkoutSummaryParser.java   | 67 ++++++++++++++++++-
 2 files changed, 66 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java
index 7bb4141a4..acb85b85b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java
@@ -195,9 +195,10 @@ public class XiaomiActivityFileId implements Comparable<XiaomiActivityFileId> {
         ACTIVITY_SLEEP_STAGES(Type.ACTIVITY, 0x03),
         ACTIVITY_SLEEP(Type.ACTIVITY, 0x08),
         SPORTS_OUTDOOR_RUNNING(Type.SPORTS, 0x01),
+        SPORTS_OUTDOOR_WALKING_V1(Type.SPORTS, 0x02),
         SPORTS_FREESTYLE(Type.SPORTS, 0x08),
         SPORTS_ELLIPTICAL(Type.SPORTS, 0x0B),
-        SPORTS_OUTDOOR_WALKING(Type.SPORTS, 0x16),
+        SPORTS_OUTDOOR_WALKING_V2(Type.SPORTS, 0x16),
         SPORTS_OUTDOOR_CYCLING(Type.SPORTS, 0x17),
         ;
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java
index 452be44c3..57a4b21e6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java
@@ -94,14 +94,16 @@ public class WorkoutSummaryParser extends XiaomiActivityParser implements Activi
         final XiaomiActivityFileId fileId = XiaomiActivityFileId.from(buf);
 
         switch (fileId.getSubtype()) {
+            case SPORTS_OUTDOOR_WALKING_V1:
+                return parseOutdoorWalkingV1(summary, fileId, buf);
             case SPORTS_OUTDOOR_RUNNING:
                 return parseOutdoorRunning(summary, fileId, buf);
             case SPORTS_FREESTYLE:
                 return parseFreestyle(summary, fileId, buf);
             case SPORTS_ELLIPTICAL:
                 return parseElliptical(summary, fileId, buf);
-            case SPORTS_OUTDOOR_WALKING:
-                return parseOutdoorWalking(summary, fileId, buf);
+            case SPORTS_OUTDOOR_WALKING_V2:
+                return parseOutdoorWalkingV2(summary, fileId, buf);
             case SPORTS_OUTDOOR_CYCLING:
                 return parseOutdoorCycling(summary, fileId, buf);
         }
@@ -135,7 +137,66 @@ public class WorkoutSummaryParser extends XiaomiActivityParser implements Activi
         return summary;
     }
 
-    private BaseActivitySummary parseOutdoorWalking(final BaseActivitySummary summary, final XiaomiActivityFileId fileId, final ByteBuffer buf) {
+    private BaseActivitySummary parseOutdoorWalkingV1(final BaseActivitySummary summary, final XiaomiActivityFileId fileId, final ByteBuffer buf) {
+        final JSONObject summaryData = new JSONObject();
+
+        final int version = fileId.getVersion();
+        final int headerSize;
+        switch (version) {
+            case 4:
+                headerSize = 4;
+                break;
+            default:
+                LOG.warn("Unable to parse workout summary version {}", fileId.getVersion());
+                return null;
+        }
+
+        final byte[] header = new byte[headerSize];
+        buf.get(header);
+
+        summary.setActivityKind(ActivityKind.TYPE_WALKING);
+
+        final int startTime = buf.getInt();
+        final int endTime = buf.getInt();
+
+        // We don't set the start time, since we need it to match the fileId for the WorkoutGpsParser
+        // to find it. They also seem to match.
+        //summary.setStartTime(new Date(startTime * 1000L));
+        summary.setEndTime(new Date(endTime * 1000L));
+
+        final int duration = buf.getInt();
+        addSummaryData(summaryData, "activeSeconds", duration, "seconds");
+
+        final int distance = buf.getInt();
+        addSummaryData(summaryData, "distanceMeters", distance, "meters");
+
+        final int calories = buf.getShort();
+        addSummaryData(summaryData, "caloriesBurnt", calories, "calories_unit");
+
+
+        final int maxPace = buf.getInt();
+        addSummaryData(summaryData, "maxPace", maxPace, "seconds_m");
+        final int minPace = buf.getInt();
+        addSummaryData(summaryData, "minPace", minPace, "seconds_m");
+        final int unknown1 = buf.getInt(); // ?
+        final int steps = buf.getInt();
+        addSummaryData(summaryData, "steps", steps, "steps_unit");
+        final int unknown6 = buf.getShort(); // pace?
+
+        final int averageHR = buf.get() & 0xff;
+        final int maxHR = buf.get() & 0xff;
+        final int minHR = buf.get() & 0xff;
+
+        addSummaryData(summaryData, "averageHR", averageHR, "bpm");
+        addSummaryData(summaryData, "maxHR", maxHR, "bpm");
+        addSummaryData(summaryData, "minHR", minHR, "bpm");
+
+        summary.setSummaryData(summaryData.toString());
+
+        return summary;
+    }
+
+    private BaseActivitySummary parseOutdoorWalkingV2(final BaseActivitySummary summary, final XiaomiActivityFileId fileId, final ByteBuffer buf) {
         final JSONObject summaryData = new JSONObject();
 
         final int version = fileId.getVersion();

From 70e1d852ba4cb6252f2b30b1989fa3236fcac887 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sat, 30 Dec 2023 18:37:22 +0000
Subject: [PATCH 285/595] Xiaomi: Fix crash when parsing unknown workout
 summary

---
 .../activity/impl/WorkoutSummaryParser.java   | 55 +++++++++----------
 1 file changed, 25 insertions(+), 30 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java
index 57a4b21e6..3264af7b4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java
@@ -95,49 +95,50 @@ public class WorkoutSummaryParser extends XiaomiActivityParser implements Activi
 
         switch (fileId.getSubtype()) {
             case SPORTS_OUTDOOR_WALKING_V1:
-                return parseOutdoorWalkingV1(summary, fileId, buf);
+                parseOutdoorWalkingV1(summary, fileId, buf);
+                break;
             case SPORTS_OUTDOOR_RUNNING:
-                return parseOutdoorRunning(summary, fileId, buf);
+                parseOutdoorRunning(summary, fileId, buf);
+                break;
             case SPORTS_FREESTYLE:
-                return parseFreestyle(summary, fileId, buf);
+                parseFreestyle(summary, fileId, buf);
+                break;
             case SPORTS_ELLIPTICAL:
-                return parseElliptical(summary, fileId, buf);
+                parseElliptical(summary, fileId, buf);
+                break;
             case SPORTS_OUTDOOR_WALKING_V2:
-                return parseOutdoorWalkingV2(summary, fileId, buf);
+                parseOutdoorWalkingV2(summary, fileId, buf);
+                break;
             case SPORTS_OUTDOOR_CYCLING:
-                return parseOutdoorCycling(summary, fileId, buf);
+                parseOutdoorCycling(summary, fileId, buf);
+                break;
+            default:
+                LOG.warn("No workout summary parser for {}", fileId.getSubtypeCode());
+                break;
         }
 
-        LOG.warn("Unable to parse {}", fileId.getSubtype());
-
-        return null;
+        return summary;
     }
 
-    private BaseActivitySummary parseOutdoorRunning(final BaseActivitySummary summary, final XiaomiActivityFileId fileId, final ByteBuffer buf) {
+    private void parseOutdoorRunning(final BaseActivitySummary summary, final XiaomiActivityFileId fileId, final ByteBuffer buf) {
         summary.setActivityKind(ActivityKind.TYPE_RUNNING);
 
         // TODO
-
-        return summary;
     }
 
-    private BaseActivitySummary parseFreestyle(final BaseActivitySummary summary, final XiaomiActivityFileId fileId, final ByteBuffer buf) {
+    private void parseFreestyle(final BaseActivitySummary summary, final XiaomiActivityFileId fileId, final ByteBuffer buf) {
         summary.setActivityKind(ActivityKind.TYPE_STRENGTH_TRAINING);
 
         // TODO
-
-        return summary;
     }
 
-    private BaseActivitySummary parseElliptical(final BaseActivitySummary summary, final XiaomiActivityFileId fileId, final ByteBuffer buf) {
+    private void parseElliptical(final BaseActivitySummary summary, final XiaomiActivityFileId fileId, final ByteBuffer buf) {
         summary.setActivityKind(ActivityKind.TYPE_ELLIPTICAL_TRAINER);
 
         // TODO
-
-        return summary;
     }
 
-    private BaseActivitySummary parseOutdoorWalkingV1(final BaseActivitySummary summary, final XiaomiActivityFileId fileId, final ByteBuffer buf) {
+    private void parseOutdoorWalkingV1(final BaseActivitySummary summary, final XiaomiActivityFileId fileId, final ByteBuffer buf) {
         final JSONObject summaryData = new JSONObject();
 
         final int version = fileId.getVersion();
@@ -148,7 +149,7 @@ public class WorkoutSummaryParser extends XiaomiActivityParser implements Activi
                 break;
             default:
                 LOG.warn("Unable to parse workout summary version {}", fileId.getVersion());
-                return null;
+                return;
         }
 
         final byte[] header = new byte[headerSize];
@@ -192,11 +193,9 @@ public class WorkoutSummaryParser extends XiaomiActivityParser implements Activi
         addSummaryData(summaryData, "minHR", minHR, "bpm");
 
         summary.setSummaryData(summaryData.toString());
-
-        return summary;
     }
 
-    private BaseActivitySummary parseOutdoorWalkingV2(final BaseActivitySummary summary, final XiaomiActivityFileId fileId, final ByteBuffer buf) {
+    private void parseOutdoorWalkingV2(final BaseActivitySummary summary, final XiaomiActivityFileId fileId, final ByteBuffer buf) {
         final JSONObject summaryData = new JSONObject();
 
         final int version = fileId.getVersion();
@@ -207,7 +206,7 @@ public class WorkoutSummaryParser extends XiaomiActivityParser implements Activi
                 break;
             default:
                 LOG.warn("Unable to parse workout summary version {}", fileId.getVersion());
-                return null;
+                return;
         }
 
         final byte[] header = new byte[headerSize];
@@ -259,11 +258,9 @@ public class WorkoutSummaryParser extends XiaomiActivityParser implements Activi
         addSummaryData(summaryData, "minHR", minHR, "bpm");
 
         summary.setSummaryData(summaryData.toString());
-
-        return summary;
     }
 
-    private BaseActivitySummary parseOutdoorCycling(final BaseActivitySummary summary, final XiaomiActivityFileId fileId, final ByteBuffer buf) {
+    private void parseOutdoorCycling(final BaseActivitySummary summary, final XiaomiActivityFileId fileId, final ByteBuffer buf) {
         final JSONObject summaryData = new JSONObject();
 
         final int version = fileId.getVersion();
@@ -274,7 +271,7 @@ public class WorkoutSummaryParser extends XiaomiActivityParser implements Activi
                 break;
             default:
                 LOG.warn("Unable to parse workout summary version {}", fileId.getVersion());
-                return null;
+                return;
         }
 
         final byte[] header = new byte[headerSize];
@@ -322,8 +319,6 @@ public class WorkoutSummaryParser extends XiaomiActivityParser implements Activi
         addSummaryData(summaryData, "minHR", minHr, "bpm");
 
         summary.setSummaryData(summaryData.toString());
-
-        return summary;
     }
 
     protected void addSummaryData(final JSONObject summaryData, final String key, final float value, final String unit) {

From fa6489b300be7fb1a00cdd86c2660909931a842f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Mon, 1 Jan 2024 12:18:36 +0000
Subject: [PATCH 286/595] Redmi Smart Band Pro: Experimental support

---
 .../RedmiSmartBandProCoordinator.java         | 63 +++++++++++++++++++
 .../gadgetbridge/model/DeviceType.java        |  2 +
 app/src/main/res/values/strings.xml           |  1 +
 3 files changed, 66 insertions(+)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmismartbandpro/RedmiSmartBandProCoordinator.java

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmismartbandpro/RedmiSmartBandProCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmismartbandpro/RedmiSmartBandProCoordinator.java
new file mode 100644
index 000000000..1a8b5c161
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmismartbandpro/RedmiSmartBandProCoordinator.java
@@ -0,0 +1,63 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.redmismartbandpro;
+
+import android.content.Context;
+import android.net.Uri;
+
+import androidx.annotation.Nullable;
+
+import java.util.regex.Pattern;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiInstallHandler;
+
+public class RedmiSmartBandProCoordinator extends XiaomiCoordinator {
+    @Override
+    public boolean isExperimental() {
+        return true;
+    }
+
+    @Override
+    protected Pattern getSupportedDeviceName() {
+        return Pattern.compile("^Redmi Band Pro [A-Z0-9]{4}$");
+    }
+
+    @Nullable
+    @Override
+    public InstallHandler findInstallHandler(final Uri uri, final Context context) {
+        final XiaomiInstallHandler handler = new XiaomiInstallHandler(uri, context);
+        return handler.isValid() ? handler : null;
+    }
+
+    @Override
+    public int getDeviceNameResource() {
+        return R.string.devicetype_redmi_smart_band_pro;
+    }
+
+    @Override
+    public int getDefaultIconResource() {
+        return R.drawable.ic_device_default;
+    }
+
+    @Override
+    public int getDisabledIconResource() {
+        return R.drawable.ic_device_default_disabled;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
index 2daf3be23..a4ed75b2e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
@@ -148,6 +148,7 @@ import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.miband7pro.MiBand7Pro
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.miband8.MiBand8Coordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.miwatchcolorsport.MiWatchColorSportCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.redmismartband2.RedmiSmartBand2Coordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.redmismartbandpro.RedmiSmartBandProCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.redmiwatch2lite.RedmiWatch2Lite;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.watchs1active.XiaomiWatchS1ActiveCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xwatch.XWatchCoordinator;
@@ -211,6 +212,7 @@ public enum DeviceType {
     REDMIWATCH3ACTIVE(RedmiWatch3ActiveCoordinator.class),
     REDMISMARTBAND2(RedmiSmartBand2Coordinator.class),
     REDMIWATCH2LITE(RedmiWatch2Lite.class),
+    REDMISMARTBANDPRO(RedmiSmartBandProCoordinator.class),
     XIAOMI_WATCH_S1_ACTIVE(XiaomiWatchS1ActiveCoordinator.class),
     AMAZFITGTS3(AmazfitGTS3Coordinator.class),
     AMAZFITGTR3(AmazfitGTR3Coordinator.class),
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 06cc32d84..207073c3f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1428,6 +1428,7 @@
     <string name="devicetype_redmiwatch3active">Redmi Watch 3 Active</string>
     <string name="devicetype_redmi_smart_band_2">Redmi Smart Band 2</string>
     <string name="devicetype_redmi_watch_2_lite">Redmi Watch 2 Lite</string>
+    <string name="devicetype_redmi_smart_band_pro">Redmi Smart Band Pro</string>
     <string name="choose_auto_export_location">Choose export location</string>
     <string name="notification_channel_name">General</string>
     <string name="notification_channel_high_priority_name">High-priority</string>

From 6cc57a15f5375d0eff72de8093a36b39bd2f6468 Mon Sep 17 00:00:00 2001
From: "Roberto P. Rubio" <outtakes_handgun090@familiapm.com>
Date: Tue, 26 Dec 2023 05:46:24 +0100
Subject: [PATCH 287/595] Adds a specific Notifications Channel to Connection
 Status Notifications

---
 .../nodomain/freeyourgadget/gadgetbridge/util/GB.java | 11 +++++++++--
 app/src/main/res/values/strings.xml                   |  1 +
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GB.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GB.java
index 12b5aa18c..e920204b2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GB.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GB.java
@@ -68,6 +68,7 @@ import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_REC
 public class GB {
 
     public static final String NOTIFICATION_CHANNEL_ID = "gadgetbridge";
+    public static final String NOTIFICATION_CHANNEL_ID_CONNECTION_STATUS = "gadgetbridge connection status";
     public static final String NOTIFICATION_CHANNEL_HIGH_PRIORITY_ID = "gadgetbridge_high_priority";
     public static final String NOTIFICATION_CHANNEL_ID_TRANSFER = "gadgetbridge transfer";
     public static final String NOTIFICATION_CHANNEL_ID_LOW_BATTERY = "low_battery";
@@ -115,6 +116,12 @@ public class GB {
                     NotificationManager.IMPORTANCE_LOW);
             notificationManager.createNotificationChannel(channelGeneral);
 
+            NotificationChannel channelConnwectionStatus = new NotificationChannel(
+                    NOTIFICATION_CHANNEL_ID_CONNECTION_STATUS,
+                    context.getString(R.string.notification_channel_connection_status_name),
+                    NotificationManager.IMPORTANCE_LOW);
+            notificationManager.createNotificationChannel(channelConnwectionStatus);
+
             NotificationChannel channelHighPriority = new NotificationChannel(
                     NOTIFICATION_CHANNEL_HIGH_PRIORITY_ID,
                     context.getString(R.string.notification_channel_high_priority_name),
@@ -154,7 +161,7 @@ public class GB {
     }
 
     public static Notification createNotification(List<GBDevice> devices, Context context) {
-        NotificationCompat.Builder builder = new NotificationCompat.Builder(context, NOTIFICATION_CHANNEL_ID);
+        NotificationCompat.Builder builder = new NotificationCompat.Builder(context, NOTIFICATION_CHANNEL_ID_CONNECTION_STATUS);
         if(devices.size() == 0){
             builder.setContentTitle(context.getString(R.string.info_no_devices_connected))
                     .setSmallIcon(R.drawable.ic_notification_disconnected)
@@ -258,7 +265,7 @@ public class GB {
     }
 
     public static Notification createNotification(String text, Context context) {
-        NotificationCompat.Builder builder = new NotificationCompat.Builder(context, NOTIFICATION_CHANNEL_ID);
+        NotificationCompat.Builder builder = new NotificationCompat.Builder(context, NOTIFICATION_CHANNEL_ID_CONNECTION_STATUS);
         builder.setTicker(text)
                 .setContentText(text)
                 .setSmallIcon(R.drawable.ic_notification_disconnected)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 207073c3f..1b25fb5cd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2494,4 +2494,5 @@
     <string name="pref_summary_fossil_hr_nav_foreground">Whether the navigation app should automatically come to the foreground when it receives a navigation instruction</string>
     <string name="pref_title_fossil_hr_nav_vibrate">Vibrate on new instruction</string>
     <string name="pref_summary_fossil_hr_nav_vibrate">Whether the watch should vibrate on every new or changed navigation instruction (only when the app is in the foreground)</string>
+    <string name="notification_channel_connection_status_name">Connection Status</string>
 </resources>

From 73a3a4b60330f90898631f9e932b2d2d885cf494 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Milants?= <jf@codingfield.com>
Date: Sun, 31 Dec 2023 10:46:19 +0100
Subject: [PATCH 288/595] Fix DFU MTU value for PineTime

Explicitely disable the request MTU feature from the NRF DFU library to ensure that it'll send 20 bytes packets (instead of 253B, which will crash InfiniTime).
---
 .../service/devices/pinetime/PineTimeJFSupport.java             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pinetime/PineTimeJFSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pinetime/PineTimeJFSupport.java
index e7ed1f60b..cb55ba0ac 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pinetime/PineTimeJFSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pinetime/PineTimeJFSupport.java
@@ -458,7 +458,7 @@ public class PineTimeJFSupport extends AbstractBTLEDeviceSupport implements DfuL
                         .setKeepBond(true)
                         .setForeground(false)
                         .setUnsafeExperimentalButtonlessServiceInSecureDfuEnabled(false)
-                        .setMtu(23)
+                        .disableMtuRequest()
                         .setZip(uri);
 
                 controller = starter.start(getContext(), PineTimeDFUService.class);

From 951d8f25b790a16b6df8afd833b53a0ecc7fbbe9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Wed, 3 Jan 2024 21:35:18 +0000
Subject: [PATCH 289/595] Xiaomi: Add indoor cycling

---
 .../xiaomi/activity/XiaomiActivityFileId.java |  1 +
 .../activity/impl/WorkoutSummaryParser.java   | 51 +++++++++++++++++++
 2 files changed, 52 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java
index acb85b85b..ebd5e1160 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java
@@ -196,6 +196,7 @@ public class XiaomiActivityFileId implements Comparable<XiaomiActivityFileId> {
         ACTIVITY_SLEEP(Type.ACTIVITY, 0x08),
         SPORTS_OUTDOOR_RUNNING(Type.SPORTS, 0x01),
         SPORTS_OUTDOOR_WALKING_V1(Type.SPORTS, 0x02),
+        SPORTS_INDOOR_CYCLING(Type.SPORTS, 0x07),
         SPORTS_FREESTYLE(Type.SPORTS, 0x08),
         SPORTS_ELLIPTICAL(Type.SPORTS, 0x0B),
         SPORTS_OUTDOOR_WALKING_V2(Type.SPORTS, 0x16),
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java
index 3264af7b4..eb4f82d5b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java
@@ -100,6 +100,9 @@ public class WorkoutSummaryParser extends XiaomiActivityParser implements Activi
             case SPORTS_OUTDOOR_RUNNING:
                 parseOutdoorRunning(summary, fileId, buf);
                 break;
+            case SPORTS_INDOOR_CYCLING:
+                parseIndoorCycling(summary, fileId, buf);
+                break;
             case SPORTS_FREESTYLE:
                 parseFreestyle(summary, fileId, buf);
                 break;
@@ -126,6 +129,54 @@ public class WorkoutSummaryParser extends XiaomiActivityParser implements Activi
         // TODO
     }
 
+    private void parseIndoorCycling(final BaseActivitySummary summary, final XiaomiActivityFileId fileId, final ByteBuffer buf) {
+        final JSONObject summaryData = new JSONObject();
+
+        final int version = fileId.getVersion();
+        final int headerSize;
+        switch (version) {
+            case 8:
+                headerSize = 7;
+                break;
+            default:
+                LOG.warn("Unable to parse workout summary version {}", fileId.getVersion());
+                return;
+        }
+
+        final byte[] header = new byte[headerSize];
+        buf.get(header);
+
+        summary.setActivityKind(ActivityKind.TYPE_INDOOR_CYCLING);
+
+        final int startTime = buf.getInt();
+        final int endTime = buf.getInt();
+
+        // We don't set the start time, since we need it to match the fileId for the WorkoutGpsParser
+        // to find it. They also seem to match.
+        //summary.setStartTime(new Date(startTime * 1000L));
+        summary.setEndTime(new Date(endTime * 1000L));
+
+        final int duration = buf.getInt();
+        addSummaryData(summaryData, "activeSeconds", duration, "seconds");
+
+        final int distance = buf.getInt();
+        addSummaryData(summaryData, "distanceMeters", distance, "meters");
+
+        final int calories = buf.getShort();
+        addSummaryData(summaryData, "caloriesBurnt", calories, "calories_unit");
+
+        final int unknown1 = buf.getInt();
+
+        final float avgHr = buf.get() & 0xff;
+        final float maxHr = buf.get() & 0xff;
+        final float minHr = buf.get() & 0xff;
+        addSummaryData(summaryData, "averageHR", avgHr, "bpm");
+        addSummaryData(summaryData, "maxHR", maxHr, "bpm");
+        addSummaryData(summaryData, "minHR", minHr, "bpm");
+
+        summary.setSummaryData(summaryData.toString());
+    }
+
     private void parseFreestyle(final BaseActivitySummary summary, final XiaomiActivityFileId fileId, final ByteBuffer buf) {
         summary.setActivityKind(ActivityKind.TYPE_STRENGTH_TRAINING);
 

From 932ec8336c1ec7e795d1c06a740679a379f3de97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Wed, 3 Jan 2024 21:37:27 +0000
Subject: [PATCH 290/595] Xiaomi: Fix persisting unknown workouts

---
 .../devices/xiaomi/activity/impl/WorkoutSummaryParser.java     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java
index eb4f82d5b..30c9c0c71 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java
@@ -50,6 +50,8 @@ public class WorkoutSummaryParser extends XiaomiActivityParser implements Activi
         BaseActivitySummary summary = new BaseActivitySummary();
 
         summary.setStartTime(fileId.getTimestamp()); // due to a bug this has to be set
+        summary.setEndTime(fileId.getTimestamp()); // due to a bug this has to be set
+        summary.setActivityKind(ActivityKind.TYPE_UNKNOWN);
         summary.setRawSummaryData(ArrayUtils.addAll(fileId.toBytes(), bytes));
 
         try {
@@ -62,6 +64,7 @@ public class WorkoutSummaryParser extends XiaomiActivityParser implements Activi
 
         // parseBinaryData may return null in case the version is not supported
         if (summary == null) {
+            LOG.warn("summary is null - should never happen {}", fileId);
             return false;
         }
 

From 59027fb5f767291ba2fb3f8ca6bb61fbc55ba88e Mon Sep 17 00:00:00 2001
From: License Bot <license-bot@freeyourgadget.org>
Date: Thu, 4 Jan 2024 16:45:35 +0100
Subject: [PATCH 291/595] Update contributors list

---
 CONTRIBUTORS.rst | 278 +++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 235 insertions(+), 43 deletions(-)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 732608c8c..c5e6d3ecb 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -24,89 +24,143 @@
 
 * Andreas Shimokawa <shimokawa@fsfe.org>
 * Carsten Pfeiffer <cpfeiffer@users.noreply.github.com>
+* José Rebelo <joserebelo@outlook.com>
 * Daniele Gobbetti <daniele+github@gobbetti.name>
-* Daniel Dakhno <dakhnod@gmail.com>
 * Petr Vaněk <petr@linuks.cz>
 * Yaron Shahrabani <sh.yaron@gmail.com>
-* Allan Nordhøy <epost@anotheragency.no>
-* Taavi Eomäe <taavi.eomae+github@gmail.com>
+* Daniel Dakhno <dakhnod@gmail.com>
 * 陈少举 <oshirisu.red@gmail.com>
-* Rafael Fontenelle <rafaelff@gnome.org>
-* João Paulo Barraca <jpbarraca@gmail.com>
-* Sebastian Kranz <tklightforce@googlemail.com>
+* Vincèn PUJOL <vincen@vincen.org>
+* Oğuz Ersen <oguzersen@protonmail.com>
+* Allan Nordhøy <epost@anotheragency.no>
+* Ihor Hordiichuk <igor_ck@outlook.com>
+* Arjan Schrijver <arjan.schrijver@foxcrypto.com>
 * nautilusx <mail.ka@mailbox.org>
+* Taavi Eomäe <taavi.eomae+github@gmail.com>
+* Gordon Williams <gw@pur3.co.uk>
+* arjan-s <a_gitlab@anymore.nl>
+* Rafael Fontenelle <rafaelff@gnome.org>
+* Michal L <michalrmsmi@wp.pl>
+* Sebastian Kranz <lightwars@web.de>
+* João Paulo Barraca <jpbarraca@gmail.com>
+* Linerly <linerly@protonmail.com>
+* Rex_sa <rex.sa@pm.me>
 * mamucho <mamut_killer@yahoo.com>
 * postsorino <postsorino@krutt.org>
-* Oğuz Ersen <oguzersen@protonmail.com>
-* FransM <fransmeulenbroeks@yahoo.com>
+* Manuel-Senpai <senpai99@hotmail.com>
 * Andreas Böhler <dev@aboehler.at>
+* FransM <fransmeulenbroeks@yahoo.com>
 * Jonas <jonasdcdm@posteo.net>
+* HenRy <helge1o1o1@gmail.com>
 * Yukai Li <yukaili.geek@gmail.com>
 * Roi Greenberg <roigreenberg@gmail.com>
-* HenRy <helge1o1o1@gmail.com>
+* gallegonovato <fran-carro@hotmail.es>
+* Nikita Epifanov <nikgreens@protonmail.com>
+* kirill blaze <kirillblaze2@gmail.com>
+* Óscar Fernández Díaz <oscfdezdz@tuta.io>
+* Jeannette L <j.lavoie@net-c.ca>
 * Vadim Kaushan <admin@disasm.info>
 * protomors <protomors@gmail.com>
 * Cre3per <lukas96s@web.de>
-* Michal L <michalrmsmi@wp.pl>
-* José Rebelo <joserebelo@outlook.com>
-* Vincèn PUJOL <vincen@vincen.org>
-* Nikita Epifanov <nikgreens@protonmail.com>
+* ssantos <ssantos@web.de>
 * Michael <quelbs@gmail.com>
+* glemco <glemco@codeberg>
 * 115ek <e.blosz@hotmail.de>
+* 0que <0que@users.noreply.hosted.weblate.org>
+* Саша Петровић <salepetronije@gmail.com>
 * naofum <naofum@gmail.com>
-* Gordon Williams <gw@pur3.co.uk>
+* My Random Thoughts <weblate@myrandomthoughts.co.uk>
+* Davis Mosenkovs <davikovs@gmail.com>
+* 0eoc <0eoc@users.noreply.hosted.weblate.org>
 * mesnevi <shams@airpost.net>
-* Jeannette L <j.lavoie@net-c.ca>
+* Kintu <kintukp@gmail.com>
 * youzhiran <2668760098@qq.com>
 * mueller-ma <mueller-ma@users.noreply.github.com>
 * ivanovlev <ivanovlev@mail.ru>
+* Damien 'Psolyca' Gaignon <damien.gaignon@gmail.com>
 * Tijl Schepens <tijl.schepens@hotmail.com>
-* ssantos <ssantos@web.de>
 * Sophanimus <sennamails@googlemail.com>
 * Pavel Elagin <elagin.pasha@gmail.com>
+* NekoBox <nekobox@noreply.codeberg.org>
+* MPeter <>
+* MrYoranimo <yvulker@gmail.com>
 * mondstern <hello@mondstern.tk>
 * Hadrián Candela <hadrian.candela@gmail.com>
+* Ács Zoltán <acszoltan111@gmail.com>
 * Zhong Jianxin <azuwis@gmail.com>
-* Kintu <kintukp@gmail.com>
+* Milo Ivir <mail@milotype.de>
+* Gabriele Monaco <monaco@eit.uni-kl.de>
+* foxstidious <foxstidious@gmail.com>
+* Andy Yang <a962702@yahoo.com>
 * Abdullah Manaz <manaz@noreply.codeberg.org>
+* Richard de Boer <git@tubul.net>
 * mkusnierz <>
 * Julien Pivotto <roidelapluie@inuits.eu>
+* tomechio <tomasz@salamon.fi>
 * Steffen Liebergeld <perl@gmx.org>
+* Skrripy <rozihrash.ya6w7@simplelogin.com>
+* Petr Kadlec <mormegil@centrum.cz>
+* Pavel <pavel.gorbanj@gmail.com>
 * Lem Dulfo <lemuel.dulfo@gmail.com>
+* Dmitriy Bogdanov <di72nn@gmail.com>
+* Olexandr Nesterenko <olexn@ukr.net>
 * Nevena Mircheva <nevena.mircheva@gmail.com>
+* musover <meoberto@mthree.es>
 * Matthieu Baerts <matttbe@gmail.com>
-* J. Lavoie <j.lavoie@net-c.ca>
 * Felix Konstantin Maurer <maufl@maufl.de>
-* Andy Yang <a962702@yahoo.com>
+* Axus Wizix <aw.ts@bk.ru>
+* Xtremo3 <a.lewicki95@gmail.com>
 * Utsob Roy <uroybd@gmail.com>
 * taras3333 <taras3333@gmail.com>
 * Sergey Trofimov <sarg@sarg.org.ru>
+* Sebastian Krey <sebastian@skrey.net>
+* Noodlez <contact@nathanielbarragan.xyz>
 * M. Hadi <hhhadddi@yahoo.com>
+* Martin Boonk <martin@boonk.info>
+* Lukas <lukas.edi@gmx.net>
+* Ganblejs <ganblejs@noreply.codeberg.org>
+* Deixondit <jperals@protonmail.com>
 * Szylu <chipolade@gmail.com>
 * Robert Barat <rbarat07@gmail.com>
-* Pavel <pavel.gorbanj@gmail.com>
+* Reza Almanda <rezaalmanda27@gmail.com>
 * Mario <mariomobla@gmail.com>
 * ksiwczynski <k.siwczynski@gmail.com>
 * JohnnySun <bmy001@gmail.com>
 * Gilles Émilien MOREL <contact@gilles-morel.fr>
-* Deixondit <jperals@protonmail.com>
+* firekonstantin <firekonstantin@mail.ru>
+* bruh <quangtrung02hn16@gmail.com>
 * Uwe Hermann <uwe@hermann-uwe.de>
+* Patric Gruber <me@patric-gruber.at>
 * opavlov <forpoststuff@gmail.com>
-* Olexandr Nesterenko <olexn@ukr.net>
+* Michalis <michalisntovas@yahoo.gr>
+* Mario Rossi <kk1o2n+61euckrwqwqecz3pme3@sharklasers.com>
+* ifurther <i.further.5.4@gmail.com>
 * Edoardo Rosa <edoardo.rosa90@gmail.com>
-* Dmitriy Bogdanov <di72nn@gmail.com>
+* d <dmanye@gmail.com>
 * Bożydar <trening302@o2.pl>
 * Alberto <albertsal83@gmail.com>
+* AiLab <vpuhoff92@gmail.com>
 * zsolt3991 <zsolt_93@yahoo.com>
+* winver <kirillstuzhuk@gmail.com>
 * Vladislav Serkov <vladserkoff@protonmail.com>
 * Vebryn <vebryn@gmail.com>
+* uli <cybuzuma@vnxs.de>
 * Ted Stein <me@tedstein.net>
+* sinore <sinoren263@niekie.com>
+* Shimon <simonfarm0@gmail.com>
+* Reiner Herrmann <reiner@reiner-h.de>
 * NicoBuntu <nicolas__du95@hotmail.fr>
+* Nee Sorry <sven.fasterding@posteo.de>
+* Marc Nause <marc.nause@audioattack.de>
 * Louis-Marie Croisez <louis.croisez@gmail.com>
+* Kryštof Černý <cleverline1mc@gmail.com>
+* Johannes Krude <johannes@krude.de>
 * Jean-François Greffier <jf.greffier@gmail.com>
+* Hasan Ammar <ammarh@gmail.com>
 * Giuseppe Caliendo <giuseppe.caliendo@gmail.com>
 * Gergely Peidl <gergely@peidl.net>
 * Fabio Parri <parrif_ibb@yahoo.com>
+* Evo <weblate@verahawk.com>
 * Emre <wenigerpluesch@mailbox.org>
 * Elwood <elwood21@gmail.com>
 * Dmitry Markin <dmitry@markin.tech>
@@ -114,157 +168,239 @@
 * ce4 <ce4@posteo.de>
 * Baka Gaijin <lewdwarrior@waifu.club>
 * AndrewBedscastle <1462953+AndrewBedscastle@users.noreply.github.com>
+* akasaka <akasaka@nezumi.local>
 * abettenburg <a.bettenburg@gmail.com>
 * 0nse <0nse@users.noreply.github.com>
 * Максим Якимчук <xpinovo@gmail.com>
 * Ye Wint Htut Kyaw <oxygen.2521998@gmail.com>
+* xaos <xaos@noreply.codeberg.org>
+* Thomas <tutonis@gmail.com>
+* TheScientistPT <joao.ed.reis.gomes@gmail.com>
 * SnowCat <kittythesnowcat@protonmail.com>
+* Sergio Varela <sergitroll9@gmail.com>
 * Sebastian Obrusiewicz <sobrus2@o2.pl>
+* Sebastian Espinosa <hipypuff@gmail.com>
+* Robbert Gurdeep Singh <git@beardhatcode.be>
 * Rimas Raguliūnas <rarimas@gmail.com>
+* mvn23 <schopdiedwaas@gmail.com>
 * Minori Hiraoka (미노리) <minori@mnetwork.co.kr>
+* MASVA <masva10@gmail.com>
 * masakoodaa <masakoodaa@protonmail.com>
 * Marius Cornescu <marius_cornescu@yahoo.com>
-* Mario Rossi <kk1o2n+61euckrwqwqecz3pme3@sharklasers.com>
+* mantas-p <megaliuz@gmail.com>
 * Lukas Veneziano <fs@venezilu.de>
 * LL <lu.lecocq@free.fr>
+* LizardWithHat <martin.betcher@gmail.com>
+* Lesur Frederic <contact@memiks.fr>
 * leela <53352@protonmail.com>
+* kukuruzka <anton.dan1657@gmail.com>
 * Kompact <joaorafael123@hotmail.com>
+* Kalle <hiwokey596@vip4e.com>
 * K0L0B0G <github@gorobav.ru>
 * Johann C. Rode <jcrode@ece.ucsb.edu>
+* jimman2003 <jim41825@gmail.com>
 * jfgreffier <jfgreffier@users.noreply.github.com>
 * Jasper <jespiex456@hotmail.com>
+* ITCactus <itcactus@noreply.codeberg.org>
+* illis <illis@beyond8labs.com>
 * Francesco Marinucci <francesco.marinucci@posteo.net>
+* Doma Gergő <domag02@gmail.com>
 * Dikay900 <dark900@xyz.de>
 * Denis <korden@sky-play.ru>
 * Christian Fischer <sw-dev@computerlyrik.de>
+* Benjamin Swartley <reep236@gmail.com>
 * Asbesbopispa <c.alfano+github@outlook.it>
-* AiLab <vpuhoff92@gmail.com>
 * Adolfo Jayme Barrientos <fitojb@ubuntu.com>
 * 6arms1leg <m.brnsfld@googlemail.com>
+* Your Name <you@example.com>
 * XqweX <xqwex@seznam.cz>
 * walkjivefly <mark@walkjivefly.com>
 * WaldiS <admin@sto.ugu.pl>
 * Vytenis <slivinskasvytenis@gmail.com>
 * Vladislav Glinsky <cl0ne@mithril.org.ua>
 * vishnu <vishnu012@protonmail.com>
-* Thomas <tutonis@gmail.com>
-* Sebastian Espinosa <hipypuff@gmail.com>
+* Vianney le Clément de Saint-Marcq <vianney@noreply.codeberg.org>
+* Toby Murray <toby.murray+gitkraken@protonmail.com>
+* thyttan <6uuxstm66@mozmail.com>
+* Thorsten <js1_531b3pm29ng2@byom.de>
+* Stephan Lachnit <stephanlachnit@protonmail.com>
+* Sebastian Reichel <sre@ring0.de>
 * Saul Nunez <saul.nunez99@gmail.com>
 * Rui Mendes <xz9@protonmail.com>
+* roolx <rbzikadze@gmail.com>
+* rarder44 <rarder44@noreply.codeberg.org>
+* rany <ranygh@riseup.net>
 * Ranved Sticon <the7bulk@gmail.com>
 * Rajesh Kumbhakar <sssraj.sssraj@gmail.com>
+* Ptilopsis Leucotis <PtilopsisLeucotis@yandex.com>
 * petronovak <petro.novak@gmail.com>
-* Petr Kadlec <mormegil@centrum.cz>
 * Pascal <pascal.tannich@gmail.com>
 * odavo32nof <odavo32nof@noreply.codeberg.org>
+* octospacc <octo@tutamail.com>
 * NotAFIle <nota@notafile.com>
 * Normano64 <per.bergqwist@gmail.com>
+* Nikolay Korotkiy <sikmir@gmail.com>
 * Nick Spacek <peter.spacek@siemens.com>
-* Nee Sorry <sven.fasterding@posteo.de>
+* Nekromanser <ari.taitto@protonmail.com>
 * Nathan <bonnemainsnathan@gmail.com>
+* narektor <narektor@noreply.codeberg.org>
 * MyTimeKill <26295589+MyTimeKill@users.noreply.github.com>
 * Molnár Barnabás <nsd4rkn3ss@gmail.com>
 * Moarc <aldwulf@gmail.com>
 * Michal Novotny <mignov@gmail.com>
+* maxvel <maxvel@noreply.codeberg.org>
+* Maxime Reyrolle <dev@reyrolle.fr>
 * Mattias Münster <mattiasmun@gmail.com>
 * Mattherix <mattherix@protonmail.com>
 * Martin <ritualz@users.noreply.github.com>
 * marco.altomonte <marco.altomonte@gmail.com>
-* LizardWithHat <martin.betcher@gmail.com>
 * Le Poisson Libre <services@spika.xyz>
+* Krzysztof Marcinek <krzymar2002@gmail.com>
 * krzys_h <krzys_h@interia.pl>
 * Konrad Iturbe <KonradIT@users.noreply.github.com>
+* Kamalei Zestri <38802353+KamaleiZestri@users.noreply.github.com>
+* Joel Beckmeyer <joel@beckmeyer.us>
 * Jesús <zaagur@gmail.com>
 * Jesús F <jfmiguel@wanadoo.es>
 * Irul <wedesignthing@gmail.com>
-* ifurther <i.further.5.4@gmail.com>
+* Igor Polyakov <igorpolyakov@protonmail.com>
 * homocomputeris <homocomputeris+git@gmail.com>
+* Grzegorz <grzesjam@duck.com>
+* GeekosaurusR3x <skad@protonmail.com>
 * Francesco Franchina <cescus92@gmail.com>
 * fparri <fparri@noreply.codeberg.org>
+* Fabien Brachere <fabien@brachere.net>
 * exit-failure <hakrala@web.de>
+* Ertu (Er2, Err) <er2official@outlook.com>
+* Er2 <er2@dismail.de>
 * Dreamwalker <aristojeff@gmail.com>
+* DAWID <aggregate_diffused400@simplelogin.com>
 * Dario Lopez-Kästen <cl2dlope@gmail.com>
 * Da Pa <da.pa@noreply.codeberg.org>
 * DanialHanif <danialhanif@outlook.com>
 * Cristian Alfano <c.alfano@outlook.it>
 * criogenic <criogenic@gmail.com>
 * chabotsi <chabotsi+github@chabotsi.fr>
+* bowornsin <bowornsin@gmail.com>
 * Avamander <Avamander@users.noreply.github.com>
+* Artem <KovalevArtem.ru@gmail.com>
 * AnthonyDiGirolamo <anthony.digirolamo@gmail.com>
 * Anonymous <noreply@weblate.org>
 * Andreas Kromke <Andreas.Kromke@web.de>
+* Alex <leha-bot@yandex.ru>
+* Albert <albert@avdm043>
+* Akasaka Ryuunosuke <vladkorotnev@gmail.com>
 * Ainārs <ainars71@inbox.lv>
+* عبدالرئوف عابدی <abdolraoofabedi@gmail.com>
+* Егор Ермаков <eg.ermakov2016@yandex.ru>
 * Ⲇⲁⲛⲓ Φi <daniphii@outlook.com>
-* Your Name <you@example.com>
+* Yusuf Cihan <yusufcihandemirbas@gmail.com>
+* yk <bivol21883@cyadp.com>
 * Yar <yaroslav.isakov@gmail.com>
 * xzovy <caleb@caleb-cooper.net>
 * xphnx <xphnx@users.noreply.github.com>
+* Xosé M <xosem@disroot.org>
+* Xeoy <arventh@pm.me>
 * Xavier RENE-CORAIL <xavier.renecorail@gmail.com>
-* xaos <xaos@noreply.codeberg.org>
+* x29a <x29a@noreply.codeberg.org>
 * w2q <w2q@noreply.codeberg.org>
+* vladkorotnev <vladkorotnev@noreply.codeberg.org>
 * Vitaliy Shuruta <vshuruta@gmail.com>
 * veecue <veecue@ventos.tk>
 * Unixware <csynt@hotmail.com>
+* TylerWilliamson <tyler.williamson51@gmail.com>
 * Triet Pham <triet.phm@gmail.com>
+* Traladarer <Traladarer@users.noreply.hosted.weblate.org>
 * Tomer Rosenfeld <tomerosenfeld007@gmail.com>
 * Tomas Radej <tradej@redhat.com>
-* Toby Murray <toby.murray+gitkraken@protonmail.com>
 * t-m-w <t-m-w-codeberg@galac.tk>
 * tiparega <11555126+tiparega@users.noreply.github.com>
 * TinfoilSubmarine <tinfoilsubmarine@noreply.codeberg.org>
+* thirschbuechler <thirschbuechler@github.com>
 * Thiago Rodrigues <thiaguinho.the@gmail.com>
+* thermatk <thermatk@noreply.codeberg.org>
+* theghostofheathledger <theghostofheathledger@noreply.codeberg.org>
+* Temuri Doghonadze <temuri.doghonadze@gmail.com>
 * Tarik Sekmen <tarik@ilixi.org>
 * Szymon Tomasz Stefanek <s.stefanek@gmail.com>
 * szilardx <15869670+szilardx@users.noreply.github.com>
 * Swann Martinet <swann.ranskassa@laposte.net>
+* Stefan Bora <stefan.bora@outlook.de>
 * Stan Gomin <stan@gomin.me>
+* ssilverr <ssilverr@noreply.codeberg.org>
+* Sky233ml <sky233@sky233.ml>
 * SinMan <emilio.galvan@gmail.com>
+* Simon Sievert <ssievert@protonmail.com>
 * Sergio Lopez <slp@sinrega.org>
+* Sergey Vasilyev <koniponi@gmail.com>
+* sedy89 <sedy89@noreply.codeberg.org>
+* Sebastian Nilsson <sebbe_kompis@hotmail.com>
 * S Dantas <dantasosteney@gmail.com>
 * Santiago Benalcázar <santiagosdbc@gmail.com>
 * Samuel Carvalho de Araújo <samuelnegro12345@gmail.com>
 * Sami Alaoui <4ndroidgeek@gmail.com>
+* Saman rsh <sasan.r75@gmail.com>
+* Salif Mehmed <mail@salif.eu>
+* SalavatR <salavat.rakhmanov@gmail.com>
 * Roxystar <roxystar@arcor.de>
 * Roman Plevka <rplevka@redhat.com>
+* rom4nik <codeberg@rom4nik.pl>
+* Robin Davidsson <robindavidsson@outlook.com>
+* Roberto P. Rubio <outtakes_handgun090@familiapm.com>
 * rober <rober@prtl.nodomain.net>
 * Rivo Zängov <rivozangov@gmail.com>
 * rimasx <riks_12@hot.ee>
+* rikka356 <rikka356@outlook.com>
 * Richard Finegold <goldfndr+git@gmail.com>
 * Retew <salau@tutanota.com>
 * redking <redking974@gmail.com>
+* Ray <RayL-er@outlook.com>
+* RandomItalianGuy <donatoperruso@protonmail.com>
+* Raghd Hamzeh <raghd@rhamzeh.com>
+* Quang Ngô <ngoquang2708@gmail.com>
 * Quallenauge <Hamsi2k@freenet.de>
 * Q-er <9142398+Q-er@users.noreply.github.com>
+* pommes <pommes@noreply.codeberg.org>
+* pishite <pishite@meta.ua>
 * Perflyst <mail@perflyst.de>
 * Pavel Motyrev <legioner.r@gmail.com>
 * Pauli Salmenrinne <susundberg@gmail.com>
 * pangwalla <pangwalla@noreply.codeberg.org>
 * Pander <pander@users.sourceforge.net>
+* ozkanpakdil <ozkan.pakdil@gmail.com>
 * Ondřej Sedláček <ond.sedlacek@gmail.com>
 * Olivier Bloch <blochjunior@gmail.com>
+* Oleg Vasilev <oleg.vasilev@virtuozzo.com>
+* Oleg <oleg.invisibleman@protonmail.com>
 * Nur Aiman Fadel <nuraiman@gmail.com>
 * Nikolai Sinyov <nikolay.sinyov@yandex.ru>
 * Nicolò Balzarotti <anothersms@gmail.com>
 * Nephiel <Nephiel@users.noreply.github.com>
+* Nathan Philipp Bo Seddig <natpbs@gmail.com>
 * Natanael Arndt <arndtn@gmail.com>
 * Nabil BENDAFI <nabil@bendafi.fr>
+* Morten Rieger Hannemose <mohan@dtu.dk>
 * Mirko Covizzi <mrkcvzz@gmail.com>
-* Milo Ivir <mail@milotype.de>
+* Milan Šalka <salka.milan@googlemail.com>
 * Mike van Rossum <mike@vanrossum.net>
+* mika laka <Mikhaila.Eaddy@easymailer.live>
 * Michal Novak <michal.novak@post.cz>
+* Michael Wiesinger <michw2014@gmail.com>
 * michaelneu <git@michaeln.eu>
-* Lesur Frederic <contact@memiks.fr>
+* MedusasSphinx <medusassphinx@noreply.codeberg.org>
 * McSym28 <McSym28@users.noreply.github.com>
 * MaxL <z60loa8qw3umzu3@my10minutemail.com>
 * maxirnilian <maxirnilian@users.noreply.github.com>
 * Maxim Baz <git@maximbaz.com>
+* Mave95 <mave95@noreply.codeberg.org>
 * Matej Drobnič <matejdro@gmail.com>
 * Marvin D <mave95@posteo.de>
 * Martin Piatka <chachacha2323@gmail.com>
+* Martin.JM <>
 * Margreet <margreetkeelan@gmail.com>
 * Marc Schlaich <marc.schlaich@googlemail.com>
 * Marco Alberto Diosdado Nava <betoxxdiosnava@gmail.com>
 * Marco A <35718078+TomasCartman@users.noreply.github.com>
-* Marc Nause <marc.nause@audioattack.de>
 * Marc Laporte <marc@laporte.name>
 * Marcin <ml.cichy@gmail.com>
 * Marcel pl (m4rcel) <marcel.garbarczyk@gmail.com>
@@ -274,87 +410,143 @@
 * magimel.francois <magimel.francois@gmail.com>
 * Maciej Kuśnierz <>
 * m4sk1n <me@m4sk.in>
+* LukasEdl <lukasedl@noreply.codeberg.org>
+* LuK1337 <priv.luk@gmail.com>
 * Luiz Felipe das Neves Lopes <androidfelipe23@gmail.com>
 * Luis zas <dalues@gmail.com>
+* Ludovic Jozeau <unifai@protonmail.com>
 * luca sain <luca.sain@outlook.com>
 * lucanomax <lucano.valo@gmail.com>
+* Liao junchao <liaojunchao@outlook.com>
+* Leon Omelan <rozpierog@gmail.com>
 * Leonardo Amaral <contato@leonardoamaral.com.br>
 * Leo bonilla <leo_lf9@hotmail.com>
+* LeJun <lejun@gmx.fr>
 * Lejun <adrienzhang@hotmail.com>
 * lazarosfs <lazarosfs@csd.auth.gr>
+* Lars Vogdt <lars.vogdt@suse.com>
 * ladbsoft <30509719+ladbsoft@users.noreply.github.com>
+* Kyaw Min Khant <kyawmink@gmail.com>
+* Krisztián Gáncs <990024@gmail.com>
 * Kristjan Räts <kristjanrats@gmail.com>
+* Kornél Schmidt <kornel.schmidt@clubspot.app>
+* kirk1984 <kirk1984@noreply.codeberg.org>
+* kieranc001 <kieranc001@noreply.codeberg.org>
 * kevlarcade <kevlarcade@gmail.com>
 * Kevin Richter <me@kevinrichter.nl>
+* Kevin MacMartin <prurigro@gmail.com>
 * keeshii <keeshii@ptcg.eu>
 * Kaz Wolfe <root@kazwolfe.io>
 * Kasha <kasha_malaga@hotmail.com>
 * kalaee <alex.kalaee@gmail.com>
+* Julien Winning <heijulien@web.de>
 * Julian Lam <julian@nodebb.org>
 * jugendhacker <jugendhacker@gmail.com>
 * Joseph Kim <official.jkim@gmail.com>
 * jonnsoft <>
 * Johannes Tysiak <vinyl@users.sf.net>
-* Joan Perals <jperals@protonmail.com>
+* Jochen S <tsalin@noreply.codeberg.org>
+* joaquim.org <joaquim.org@gmail.com>
+* jhey <jhey@noreply.codeberg.org>
 * JF <jf@codingfield.com>
+* Jean-François Milants <jf@codingfield.com>
 * jcrode <46062294+jcrode@users.noreply.github.com>
 * Jan Lolek <janlolek@seznam.cz>
 * Jakub Jelínek <jakub.jelinek@gmail.com>
+* Jacque Fresco <aidter@use.startmail.com>
 * Izzy <izzy@qumran.org>
 * iwonder <hosted.weblate.org@heychris.eu>
 * Ivan <ivan_tizhanin@mail.ru>
-* Igor Polyakov <igorpolyakov@protonmail.com>
+* InternalErrorX <internalerrorx@noreply.codeberg.org>
 * Hüseyin Aslan <ha098784@gmail.com>
+* Hugel <qihu@nfschina.com>
 * hr-sales <hericsonregis@hotmail.com>
+* hrglpfrmpf <hrglpfrmpf@noreply.codeberg.org>
 * Hirnchirurg <anonymous11@posteo.net>
-* Hasan Ammar <ammarh@gmail.com>
+* Hen Ry <nobo@go4more.de>
+* HelloCodeberg <hellocodeberg@noreply.codeberg.org>
 * HardLight <hardlightxda@gmail.com>
 * Hanhan Husna <matcherapy@gmail.com>
+* halemmerich <halemmerich@noreply.codeberg.org>
 * hackoder <hackoder@noreply.codeberg.org>
+* Gustavo Ramires <gustavo.nramires@gmail.com>
+* gsbhat <>
 * Grzegorz Dznsk <grantmlody96@gmail.com>
+* Golbinex <2061409-Golbinex@users.noreply.gitlab.com>
+* gnufella <gnufella@noreply.codeberg.org>
+* gnu-ewm <gnu.ewm@protonmail.com>
 * Gleb Chekushin <mail@glebchek.com>
 * Giuseppe <giuseppe.parasilitipalumbo@studium.unict.it>
 * Gideão Gomes Ferreira <trjctr@gmail.com>
+* gfwilliams <gfwilliams@noreply.codeberg.org>
 * GabO <gabosuelto@gmail.com>
 * Gabe Schrecker <gabe@pbrb.co.uk>
 * freezed-or-frozen <freezed.or.frozen@gmail.com>
 * Frank Slezak <KazWolfe@users.noreply.github.com>
 * Florian Beuscher <florianbeuscher@gmail.com>
+* Fabian Hof <weblate@fabian-hof.de>
 * Étienne Deparis <etienne@depar.is>
 * Estébastien Robespi <estebastien@mailbox.org>
+* Ernst <ernst@seebens.de>
+* Enrico Brambilla <enricobilla@noreply.codeberg.org>
 * Edoardo Tronconi <edoardo.tronconi@gmail.com>
 * Dougal19 <4662351+Dougal19@users.noreply.github.com>
+* Donato <pread.xa4mx@simplelogin.com>
 * Dmytro Bielik <mitrandir.hex@gmail.com>
+* djurik <dirceu.semighini@protonmail.com>
+* DESKTOP-IF738U6\Tim <tim.w1995@gmail.com>
 * DerFetzer <kontakt@der-fetzer.de>
+* Dean <3114661520@qq.com>
 * Deactivated Account <diastasis@gmail.com>
-* Davis Mosenkovs <davikovs@gmail.com>
+* David Girón <contacto@duhowpi.net>
+* Davide Corradini <updates+weblate.org@corradinidavi.de>
+* Daniel Thompson <daniel@redfelineninja.org.uk>
 * Daniel Hauck <maill@dhauck.eu>
+* Dam BOND <dambond2001@gmail.com>
+* 이정희 <daemul72@gmail.com>
+* Dachi G <duchy007@yahoo.com>
+* C <weblate@wolki.de>
 * cokecodecock <lights1140977891@163.com>
+* CodeSpoof <nao.s_l_t_e_e_l@protonmail.com>
 * C O <cosmin.oprisan@gmail.com>
 * clach04 <Chris.Clark@actian.com>
 * Chris Perelstein <chris.perelstein@gmail.com>
+* chklump <chklump@noreply.codeberg.org>
+* Cédric Bellegarde <cedric.bellegarde@adishatz.org>
 * Carlos Ferreira <calbertoferreira@gmail.com>
 * C0rn3j <spleefer90@gmail.com>
 * ButterflyOfFire <ButterflyOfFire@protonmail.com>
 * bucala <marcel.bucala@gmail.com>
 * boun <boun@gmx.de>
+* BobIsMyManager <bobismymanager@noreply.codeberg.org>
+* Bilel MEDIMEGH <bilel.medimegh@gmail.com>
 * Benjamin Kahlau <nyhkkbjyek@roanapur.de>
+* Ben <ben.david.wallner@gmail.com>
+* beardhatcode <beardhatcode@noreply.codeberg.org>
 * batataspt@gmail.com <batataspt@gmail.com>
 * atkyritsis <at.kyritsis@gmail.com>
-* Artem <KovalevArtem.ru@gmail.com>
+* Ascense <ascense@noreply.codeberg.org>
+* Aprilhoomie <Aprilhoomie@gmail.com>
 * apre <adrienpre+github@gmail.com>
+* Ann Test <testkimochiaz@gmail.com>
 * Aniruddha Adhikary <aniruddha@adhikary.net>
 * angelpup <angelpup@noreply.codeberg.org>
+* Anemograph <dyraybn@gmail.com>
 * Andrzej Surowiec <emeryth@gmail.com>
+* Andrew Watkins <randnv20@noreply.codeberg.org>
 * andrewlytvyn <indusfreelancer@gmail.com>
 * AndrewH <36428679+andrewheadricke@users.noreply.github.com>
 * andre <andre.buesgen@yahoo.de>
+* Andrea Lepori <mafaldo@hotmail.it>
 * Allen B <28495335+Allen-B1@users.noreply.github.com>
 * Alfeu Lucas Guedes dos Santos <alfeugds@gmail.com>
-* Alex <leha-bot@yandex.ru>
 * Alexey Afanasev <avafanasiev@gmail.com>
 * Alexandra Sevostyanova <asevostyanova@gmail.com>
+* Aidan Crane <aidancrane78@gmail.com>
+* ahormann <ahormann@gmx.net>
 * aerowolf <aerowolf@tom.com>
+* Adam Büchner <buechner.adam@gmx.de>
+* a b <65567823+abb128@users.noreply.github.com>
 
 And all the former Transifex translators, who cannot be listed automatically.
 

From 4d5ce069aa4dac08a66094abab0a1f47922375a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Thu, 4 Jan 2024 19:15:04 +0000
Subject: [PATCH 292/595] Nothing Ear (2): Initial support

---
 .../devices/nothing/Ear1Coordinator.java      |  73 -------------
 .../devices/nothing/Ear2Coordinator.java      | 103 ++++++++++++++++++
 .../gadgetbridge/model/DeviceType.java        |   2 +
 app/src/main/res/values/strings.xml           |   1 +
 4 files changed, 106 insertions(+), 73 deletions(-)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/Ear2Coordinator.java

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/Ear1Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/Ear1Coordinator.java
index 678538951..8fd1b844a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/Ear1Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/Ear1Coordinator.java
@@ -1,11 +1,9 @@
 package nodomain.freeyourgadget.gadgetbridge.devices.nothing;
 
-import android.app.Activity;
 import android.content.Context;
 import android.net.Uri;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 
 import java.util.regex.Pattern;
 
@@ -13,14 +11,10 @@ import nodomain.freeyourgadget.gadgetbridge.GBException;
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.AbstractBLClassicDeviceCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
-import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
-import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
 import nodomain.freeyourgadget.gadgetbridge.model.BatteryConfig;
-import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.nothing.Ear1Support;
 
@@ -30,82 +24,16 @@ public class Ear1Coordinator extends AbstractBLClassicDeviceCoordinator {
         return Pattern.compile("Nothing ear (1)", Pattern.LITERAL);
     }
 
-    @Nullable
-    @Override
-    public Class<? extends Activity> getPairingActivity() {
-        return null;
-    }
-
-    @Override
-    public boolean supportsActivityDataFetching() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsActivityTracking() {
-        return false;
-    }
-
-    @Override
-    public SampleProvider<? extends ActivitySample> getSampleProvider(GBDevice device, DaoSession session) {
-        return null;
-    }
-
     @Override
     public InstallHandler findInstallHandler(Uri uri, Context context) {
         return null;
     }
 
-    @Override
-    public boolean supportsScreenshots() {
-        return false;
-    }
-
-    @Override
-    public int getAlarmSlotCount(GBDevice device) {
-        return 0;
-    }
-
-    @Override
-    public boolean supportsSmartWakeup(GBDevice device) {
-        return false;
-    }
-
-    @Override
-    public boolean supportsHeartRateMeasurement(GBDevice device) {
-        return false;
-    }
-
     @Override
     public String getManufacturer() {
         return "Nothing";
     }
 
-    @Override
-    public boolean supportsAppsManagement(final GBDevice device) {
-        return false;
-    }
-
-    @Override
-    public Class<? extends Activity> getAppsManagementActivity() {
-        return null;
-    }
-
-    @Override
-    public boolean supportsCalendarEvents() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsRealtimeData() {
-        return false;
-    }
-
-    @Override
-    public boolean supportsWeather() {
-        return false;
-    }
-
     @Override
     public boolean supportsFindDevice() {
         return true;
@@ -147,7 +75,6 @@ public class Ear1Coordinator extends AbstractBLClassicDeviceCoordinator {
         return R.string.devicetype_nothingear1;
     }
 
-
     @Override
     public int getDefaultIconResource() {
         return R.drawable.ic_device_nothingear;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/Ear2Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/Ear2Coordinator.java
new file mode 100644
index 000000000..367f9ac42
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/Ear2Coordinator.java
@@ -0,0 +1,103 @@
+/*  Copyright (C) 2023 Daniele Gobbetti, José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.nothing;
+
+import android.content.Context;
+import android.net.Uri;
+
+import androidx.annotation.NonNull;
+
+import java.util.regex.Pattern;
+
+import nodomain.freeyourgadget.gadgetbridge.GBException;
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.devices.AbstractBLClassicDeviceCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.entities.Device;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.model.BatteryConfig;
+import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.nothing.Ear1Support;
+
+public class Ear2Coordinator extends AbstractBLClassicDeviceCoordinator {
+    @Override
+    protected Pattern getSupportedDeviceName() {
+        return Pattern.compile("Ear (2)", Pattern.LITERAL);
+    }
+
+    @Override
+    public InstallHandler findInstallHandler(Uri uri, Context context) {
+        return null;
+    }
+
+    @Override
+    public String getManufacturer() {
+        return "Nothing";
+    }
+
+    @Override
+    public boolean supportsFindDevice() {
+        return true;
+    }
+
+    @Override
+    protected void deleteDevice(@NonNull GBDevice gbDevice, @NonNull Device device, @NonNull DaoSession session) throws GBException {
+
+    }
+
+    @Override
+    public int getBatteryCount() {
+        return 3;
+    }
+
+    @Override
+    public BatteryConfig[] getBatteryConfig() {
+        BatteryConfig battery1 = new BatteryConfig(0, R.drawable.ic_tws_case, R.string.battery_case);
+        BatteryConfig battery2 = new BatteryConfig(1, R.drawable.ic_nothing_ear_l, R.string.left_earbud);
+        BatteryConfig battery3 = new BatteryConfig(2, R.drawable.ic_nothing_ear_r, R.string.right_earbud);
+        return new BatteryConfig[]{battery1, battery2, battery3};
+    }
+
+    @NonNull
+    @Override
+    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+        return Ear1Support.class;
+    }
+
+    @Override
+    public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
+        return new int[] {
+                R.xml.devicesettings_nothing_ear1
+        };
+    }
+
+    @Override
+    public int getDeviceNameResource() {
+        return R.string.devicetype_nothingear2;
+    }
+
+    @Override
+    public int getDefaultIconResource() {
+        return R.drawable.ic_device_nothingear;
+    }
+
+    @Override
+    public int getDisabledIconResource() {
+        return R.drawable.ic_device_nothingear_disabled;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
index a4ed75b2e..b1a9777f5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
@@ -114,6 +114,7 @@ import nodomain.freeyourgadget.gadgetbridge.devices.mijia_lywsd.MijiaLywsd03Coor
 import nodomain.freeyourgadget.gadgetbridge.devices.miscale2.MiScale2DeviceCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.no1f1.No1F1Coordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.nothing.Ear1Coordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.nothing.Ear2Coordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.nut.NutCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.pebble.PebbleCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.pinetime.PineTimeJFCoordinator;
@@ -277,6 +278,7 @@ public enum DeviceType {
     UM25(UM25Coordinator.class),
     DOMYOS_T540(DomyosT540Coordinator.class),
     NOTHING_EAR1(Ear1Coordinator.class),
+    NOTHING_EAR2(Ear2Coordinator.class),
     GALAXY_BUDS_PRO(GalaxyBudsProDeviceCoordinator.class),
     GALAXY_BUDS_LIVE(GalaxyBudsLiveDeviceCoordinator.class),
     GALAXY_BUDS(GalaxyBudsDeviceCoordinator.class),
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1b25fb5cd..aa487bdfe 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1960,6 +1960,7 @@
     <string name="prefs_autoheartrate_sleep">Take measurements during sleep</string>
     <string name="prefs_autoheartrate_interval">Frequency of measurements</string>
     <string name="devicetype_nothingear1">Nothing Ear (1)</string>
+    <string name="devicetype_nothingear2">Nothing Ear (2)</string>
     <string name="devicetype_galaxybuds">Galaxy Buds</string>
     <string name="devicetype_galaxybuds_live">Galaxy Buds Live</string>
     <string name="devicetype_galaxybuds_pro">Galaxy Buds Pro</string>

From 127867441adcde426164e482f9e69becc563fb89 Mon Sep 17 00:00:00 2001
From: FintasticMan <finlay.neon.kid@gmail.com>
Date: Sun, 24 Dec 2023 03:58:43 +0100
Subject: [PATCH 293/595] Add support for InfiniTime's new simple weather
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Jean-François Milants <jf@codingfield.com>
---
 .../devices/pinetime/PineTimeJFConstants.java |   3 +
 .../devices/pinetime/PineTimeJFSupport.java   | 538 ++++++++++--------
 2 files changed, 299 insertions(+), 242 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/PineTimeJFConstants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/PineTimeJFConstants.java
index 78fde2c87..d2375839e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/PineTimeJFConstants.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/PineTimeJFConstants.java
@@ -48,6 +48,9 @@ public class PineTimeJFConstants {
     public static final UUID UUID_CHARACTERISTIC_WEATHER_DATA = UUID.fromString("00040001-78fc-48fe-8e23-433b3a1942d0");
     public static final UUID UUID_CHARACTERISTIC_WEATHER_CONTROL = UUID.fromString("00040002-78fc-48fe-8e23-433b3a1942d0");
 
+    public static final UUID UUID_SERVICE_SIMPLE_WEATHER = UUID.fromString("00050000-78fc-48fe-8e23-433b3a1942d0");
+    public static final UUID UUID_CHARACTERISTIC_SIMPLE_WEATHER_DATA = UUID.fromString("00050001-78fc-48fe-8e23-433b3a1942d0");
+
     // since 1.7. https://github.com/InfiniTimeOrg/InfiniTime/blob/develop/doc/MotionService.md
     public static final UUID UUID_SERVICE_MOTION = UUID.fromString("00030000-78fc-48fe-8e23-433b3a1942d0");
     public static final UUID UUID_CHARACTERISTIC_MOTION_STEP_COUNT = UUID.fromString("00030001-78fc-48fe-8e23-433b3a1942d0");
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pinetime/PineTimeJFSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pinetime/PineTimeJFSupport.java
index cb55ba0ac..8174fdc8f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pinetime/PineTimeJFSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pinetime/PineTimeJFSupport.java
@@ -38,6 +38,7 @@ import org.slf4j.LoggerFactory;
 
 import java.io.ByteArrayOutputStream;
 import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -264,6 +265,7 @@ public class PineTimeJFSupport extends AbstractBTLEDeviceSupport implements DfuL
         addSupportedService(GattService.UUID_SERVICE_BATTERY_SERVICE);
         addSupportedService(PineTimeJFConstants.UUID_SERVICE_MUSIC_CONTROL);
         addSupportedService(PineTimeJFConstants.UUID_SERVICE_WEATHER);
+        addSupportedService(PineTimeJFConstants.UUID_SERVICE_SIMPLE_WEATHER);
         addSupportedService(PineTimeJFConstants.UUID_SERVICE_NAVIGATION);
         addSupportedService(PineTimeJFConstants.UUID_CHARACTERISTIC_ALERT_NOTIFICATION_EVENT);
         addSupportedService(PineTimeJFConstants.UUID_SERVICE_MOTION);
@@ -731,253 +733,305 @@ public class PineTimeJFSupport extends AbstractBTLEDeviceSupport implements DfuL
         return false;
     }
 
+    private void onSendWeatherCBOR(WeatherSpec weatherSpec) {
+        if (weatherSpec.location != null) {
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            try {
+                new CborEncoder(baos).encode(new CborBuilder()
+                        .startMap() // This map is not fixed-size, which is not great, but it might come in a library update
+                        .put("Timestamp", System.currentTimeMillis() / 1000L)
+                        .put("Expires", 60 * 60 * 1 + WEATHER_GRACE_TIME) // 1h
+                        .put("EventType", WeatherData.EventType.Location.value)
+                        .put("Location", weatherSpec.location)
+                        .put("Altitude", 0)
+                        .put("Latitude", 0)
+                        .put("Longitude", 0)
+                        .end()
+                        .build()
+                );
+            } catch (Exception e) {
+                LOG.warn(String.valueOf(e));
+            }
+            byte[] encodedBytes = baos.toByteArray();
+            TransactionBuilder builder = createTransactionBuilder("WeatherData");
+            safeWriteToCharacteristic(builder,
+                    PineTimeJFConstants.UUID_CHARACTERISTIC_WEATHER_DATA,
+                    encodedBytes);
+
+            builder.queue(getQueue());
+        }
+
+        // Current condition
+        if (weatherSpec.currentCondition != null) {
+            // We can't do anything with this?
+        }
+
+        // Current humidity
+        if (weatherSpec.currentHumidity > 0) {
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            try {
+                new CborEncoder(baos).encode(new CborBuilder()
+                        .startMap() // This map is not fixed-size, which is not great, but it might come in a library update
+                        .put("Timestamp", System.currentTimeMillis() / 1000L)
+                        .put("Expires", 60 * 60 * 1 + WEATHER_GRACE_TIME) // 1h this should be the weather provider's interval, really
+                        .put("EventType", WeatherData.EventType.Humidity.value)
+                        .put("Humidity", (int) weatherSpec.currentHumidity)
+                        .end()
+                        .build()
+                );
+            } catch (Exception e) {
+                LOG.warn(String.valueOf(e));
+            }
+            byte[] encodedBytes = baos.toByteArray();
+            TransactionBuilder builder = createTransactionBuilder("WeatherData");
+            safeWriteToCharacteristic(builder,
+                    PineTimeJFConstants.UUID_CHARACTERISTIC_WEATHER_DATA,
+                    encodedBytes);
+
+            builder.queue(getQueue());
+        }
+
+        // Current temperature
+        if (weatherSpec.currentTemp >= -273.15) {
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            try {
+                new CborEncoder(baos).encode(new CborBuilder()
+                        .startMap() // This map is not fixed-size, which is not great, but it might come in a library update
+                        .put("Timestamp", System.currentTimeMillis() / 1000L)
+                        .put("Expires", 60 * 60 * 1 + WEATHER_GRACE_TIME) // 1h this should be the weather provider's interval, really
+                        .put("EventType", WeatherData.EventType.Temperature.value)
+                        .put("Temperature", (int) ((weatherSpec.currentTemp - 273.15) * 100))
+                        .put("DewPoint", (int) (-32768))
+                        .end()
+                        .build()
+                );
+            } catch (Exception e) {
+                LOG.warn(String.valueOf(e));
+            }
+            byte[] encodedBytes = baos.toByteArray();
+            TransactionBuilder builder = createTransactionBuilder("WeatherData");
+            safeWriteToCharacteristic(builder,
+                    PineTimeJFConstants.UUID_CHARACTERISTIC_WEATHER_DATA,
+                    encodedBytes);
+
+            builder.queue(getQueue());
+        }
+
+        // 24h temperature forecast
+        // TODO: This is disabled until WeatherSpec contains how often this data is pushed
+        /*
+        if (weatherSpec.todayMinTemp >= -273.15 &&
+                weatherSpec.todayMaxTemp >= -273.15) { // Some sanity checking, should really be nullable
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            try {
+                new CborEncoder(baos).encode(new CborBuilder()
+                        .startMap() // This map is not fixed-size, which is not great, but it might come in a library update
+                        .put("Timestamp", System.currentTimeMillis() / 1000L)
+                        .put("Expires", 60 * 60 * 24) // 24h, because the temperature is today's
+                        .put("EventType", WeatherData.EventType.Temperature.value)
+                        .put("Temperature", (int) ((((weatherSpec.todayMinTemp - 273.15) + (weatherSpec.todayMaxTemp - 273.15)) / 2) * 100))
+                        .put("DewPoint", (int) (-32768))
+                        .end()
+                        .build()
+                );
+            } catch (Exception e) {
+                LOG.warn(String.valueOf(e));
+            }
+            byte[] encodedBytes = baos.toByteArray();
+            TransactionBuilder builder = createTransactionBuilder("WeatherData");
+            safeWriteToCharacteristic(builder,
+                    PineTimeJFConstants.UUID_CHARACTERISTIC_WEATHER_DATA,
+                    encodedBytes);
+
+            builder.queue(getQueue());
+        }
+        */
+
+        // Wind speed
+        if (weatherSpec.windSpeed != 0.0f) {
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            try {
+                new CborEncoder(baos).encode(new CborBuilder()
+                        .startMap() // This map is not fixed-size, which is not great, but it might come in a library update
+                        .put("Timestamp", System.currentTimeMillis() / 1000L)
+                        .put("Expires", 60 * 60 * 1 + WEATHER_GRACE_TIME) // 1h
+                        .put("EventType", WeatherData.EventType.Wind.value)
+                        .put("SpeedMin", (int) (weatherSpec.windSpeed / 60 / 60 * 1000))
+                        .put("SpeedMax", (int) (weatherSpec.windSpeed / 60 / 60 * 1000))
+                        .put("DirectionMin", (int) (0.71 * weatherSpec.windDirection))
+                        .put("DirectionMax", (int) (0.71 * weatherSpec.windDirection))
+                        .end()
+                        .build()
+                );
+            } catch (Exception e) {
+                LOG.warn(String.valueOf(e));
+            }
+            byte[] encodedBytes = baos.toByteArray();
+            TransactionBuilder builder = createTransactionBuilder("WeatherData");
+            safeWriteToCharacteristic(builder,
+                    PineTimeJFConstants.UUID_CHARACTERISTIC_WEATHER_DATA,
+                    encodedBytes);
+
+            builder.queue(getQueue());
+        }
+
+        // Current weather condition
+        if (mapOpenWeatherConditionToPineTimePrecipitation(weatherSpec.currentConditionCode) != WeatherData.PrecipitationType.Length) {
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            try {
+                new CborEncoder(baos).encode(new CborBuilder()
+                        .startMap() // This map is not fixed-size, which is not great, but it might come in a library update
+                        .put("Timestamp", System.currentTimeMillis() / 1000L)
+                        .put("Expires", 60 * 60 * 1 + WEATHER_GRACE_TIME) // 1h
+                        .put("EventType", WeatherData.EventType.Precipitation.value)
+                        .put("Type", (int) mapOpenWeatherConditionToPineTimePrecipitation(weatherSpec.currentConditionCode).value)
+                        .put("Amount", (int) 0)
+                        .end()
+                        .build()
+                );
+            } catch (Exception e) {
+                LOG.warn(String.valueOf(e));
+            }
+            byte[] encodedBytes = baos.toByteArray();
+            TransactionBuilder builder = createTransactionBuilder("WeatherData");
+            safeWriteToCharacteristic(builder,
+                    PineTimeJFConstants.UUID_CHARACTERISTIC_WEATHER_DATA,
+                    encodedBytes);
+
+            builder.queue(getQueue());
+        }
+
+        if (mapOpenWeatherConditionToPineTimeObscuration(weatherSpec.currentConditionCode) != WeatherData.ObscurationType.Length) {
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            try {
+                new CborEncoder(baos).encode(new CborBuilder()
+                        .startMap() // This map is not fixed-size, which is not great, but it might come in a library update
+                        .put("Timestamp", System.currentTimeMillis() / 1000L)
+                        .put("Expires", 60 * 60 * 1 + WEATHER_GRACE_TIME) // 1h
+                        .put("EventType", WeatherData.EventType.Obscuration.value)
+                        .put("Type", (int) mapOpenWeatherConditionToPineTimeObscuration(weatherSpec.currentConditionCode).value)
+                        .put("Amount", (int) 65535)
+                        .end()
+                        .build()
+                );
+            } catch (Exception e) {
+                LOG.warn(String.valueOf(e));
+            }
+            byte[] encodedBytes = baos.toByteArray();
+            TransactionBuilder builder = createTransactionBuilder("WeatherData");
+            safeWriteToCharacteristic(builder,
+                    PineTimeJFConstants.UUID_CHARACTERISTIC_WEATHER_DATA,
+                    encodedBytes);
+
+            builder.queue(getQueue());
+        }
+
+        if (mapOpenWeatherConditionToPineTimeSpecial(weatherSpec.currentConditionCode) != WeatherData.SpecialType.Length) {
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            try {
+                new CborEncoder(baos).encode(new CborBuilder()
+                        .startMap() // This map is not fixed-size, which is not great, but it might come in a library update
+                        .put("Timestamp", System.currentTimeMillis() / 1000L)
+                        .put("Expires", 60 * 60 * 1 + WEATHER_GRACE_TIME) // 1h
+                        .put("EventType", WeatherData.EventType.Special.value)
+                        .put("Type", mapOpenWeatherConditionToPineTimeSpecial(weatherSpec.currentConditionCode).value)
+                        .end()
+                        .build()
+                );
+            } catch (Exception e) {
+                LOG.warn(String.valueOf(e));
+            }
+            byte[] encodedBytes = baos.toByteArray();
+            TransactionBuilder builder = createTransactionBuilder("WeatherData");
+            safeWriteToCharacteristic(builder,
+                    PineTimeJFConstants.UUID_CHARACTERISTIC_WEATHER_DATA,
+                    encodedBytes);
+
+            builder.queue(getQueue());
+        }
+
+        if (mapOpenWeatherConditionToCloudCover(weatherSpec.currentConditionCode) != -1) {
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            try {
+                new CborEncoder(baos).encode(new CborBuilder()
+                        .startMap() // This map is not fixed-size, which is not great, but it might come in a library update
+                        .put("Timestamp", System.currentTimeMillis() / 1000L)
+                        .put("Expires", 60 * 60 * 1 + WEATHER_GRACE_TIME) // 1h
+                        .put("EventType", WeatherData.EventType.Clouds.value)
+                        .put("Amount", (int) (mapOpenWeatherConditionToCloudCover(weatherSpec.currentConditionCode)))
+                        .end()
+                        .build()
+                );
+            } catch (Exception e) {
+                LOG.warn(String.valueOf(e));
+            }
+            byte[] encodedBytes = baos.toByteArray();
+            TransactionBuilder builder = createTransactionBuilder("WeatherData");
+            safeWriteToCharacteristic(builder,
+                    PineTimeJFConstants.UUID_CHARACTERISTIC_WEATHER_DATA,
+                    encodedBytes);
+
+            builder.queue(getQueue());
+        }
+
+        LOG.debug("Wrote weather data");
+    }
+
+    private void onSendWeatherSimple(WeatherSpec weatherSpec) {
+        ByteBuffer currentPacket = ByteBuffer.allocate(49).order(ByteOrder.LITTLE_ENDIAN);
+        currentPacket.putLong(2, (long) weatherSpec.timestamp * 1000000000L); // 10^9, for nanoseconds
+        currentPacket.putShort(10, (short) ((weatherSpec.currentTemp - 273.15) * 100));
+        currentPacket.putShort(12, (short) ((weatherSpec.todayMinTemp - 273.15) * 100));
+        currentPacket.putShort(14, (short) ((weatherSpec.todayMaxTemp - 273.15) * 100));
+        if (weatherSpec.location != null) {
+            byte[] locationBytes = nodomain.freeyourgadget.gadgetbridge.util.StringUtils.truncateToBytes(weatherSpec.location, 32);
+            for (int i = 0; i < locationBytes.length; i++) {
+                currentPacket.put(16 + i, locationBytes[i]);
+            }
+        }
+        // currentPacket.put(48, ); // condition
+
+        TransactionBuilder currentBuilder = createTransactionBuilder("SimpleWeatherData");
+        safeWriteToCharacteristic(currentBuilder,
+            PineTimeJFConstants.UUID_CHARACTERISTIC_SIMPLE_WEATHER_DATA,
+            currentPacket.array());
+
+        currentBuilder.queue(getQueue());
+
+        if (weatherSpec.forecasts == null) {
+            return;
+        }
+
+        ByteBuffer forecastPacket = ByteBuffer.allocate(36).order(ByteOrder.LITTLE_ENDIAN);
+        forecastPacket.put(0, (byte) 1);
+        forecastPacket.putLong(2, (long) weatherSpec.timestamp * 1000000000L); // 10^9, for nanoseconds
+        byte nbDays = (byte) Math.min(weatherSpec.forecasts.size(), 5);
+        forecastPacket.put(10, nbDays);
+        for (int i = 0; i < nbDays; i++) {
+            forecastPacket.putShort(11 + i * 5, (short) ((weatherSpec.forecasts.get(i).minTemp - 273.15) * 100));
+            forecastPacket.putShort(11 + i * 5 + 2, (short) ((weatherSpec.forecasts.get(i).maxTemp - 273.15) * 100));
+            // forecastPacket.put(11 + i * 5 + 4, ); // condition
+        }
+
+        TransactionBuilder forecastBuilder = createTransactionBuilder("SimpleWeatherData");
+        safeWriteToCharacteristic(forecastBuilder,
+                PineTimeJFConstants.UUID_CHARACTERISTIC_SIMPLE_WEATHER_DATA,
+                currentPacket.array());
+
+        forecastBuilder.queue(getQueue());
+    }
+
     @Override
     public void onSendWeather(WeatherSpec weatherSpec) {
-        if (this.firmwareVersionMajor != 1 || this.firmwareVersionMinor <= 7) {
+        if (this.firmwareVersionMajor < 1 || (this.firmwareVersionMajor == 1 && this.firmwareVersionMinor <= 7)) {
             // Not supported
             return;
+        }
+
+        if (this.firmwareVersionMajor == 1 && this.firmwareVersionMinor <= 13) {
+            this.onSendWeatherCBOR(weatherSpec);
         } else {
-            if (weatherSpec.location != null) {
-                ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                try {
-                    new CborEncoder(baos).encode(new CborBuilder()
-                            .startMap() // This map is not fixed-size, which is not great, but it might come in a library update
-                            .put("Timestamp", System.currentTimeMillis() / 1000L)
-                            .put("Expires", 60 * 60 * 1 + WEATHER_GRACE_TIME) // 1h
-                            .put("EventType", WeatherData.EventType.Location.value)
-                            .put("Location", weatherSpec.location)
-                            .put("Altitude", 0)
-                            .put("Latitude", 0)
-                            .put("Longitude", 0)
-                            .end()
-                            .build()
-                    );
-                } catch (Exception e) {
-                    LOG.warn(String.valueOf(e));
-                }
-                byte[] encodedBytes = baos.toByteArray();
-                TransactionBuilder builder = createTransactionBuilder("WeatherData");
-                safeWriteToCharacteristic(builder,
-                        PineTimeJFConstants.UUID_CHARACTERISTIC_WEATHER_DATA,
-                        encodedBytes);
-
-                builder.queue(getQueue());
-            }
-
-            // Current condition
-            if (weatherSpec.currentCondition != null) {
-                // We can't do anything with this?
-            }
-
-            // Current humidity
-            if (weatherSpec.currentHumidity > 0) {
-                ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                try {
-                    new CborEncoder(baos).encode(new CborBuilder()
-                            .startMap() // This map is not fixed-size, which is not great, but it might come in a library update
-                            .put("Timestamp", System.currentTimeMillis() / 1000L)
-                            .put("Expires", 60 * 60 * 1 + WEATHER_GRACE_TIME) // 1h this should be the weather provider's interval, really
-                            .put("EventType", WeatherData.EventType.Humidity.value)
-                            .put("Humidity", (int) weatherSpec.currentHumidity)
-                            .end()
-                            .build()
-                    );
-                } catch (Exception e) {
-                    LOG.warn(String.valueOf(e));
-                }
-                byte[] encodedBytes = baos.toByteArray();
-                TransactionBuilder builder = createTransactionBuilder("WeatherData");
-                safeWriteToCharacteristic(builder,
-                        PineTimeJFConstants.UUID_CHARACTERISTIC_WEATHER_DATA,
-                        encodedBytes);
-
-                builder.queue(getQueue());
-            }
-
-            // Current temperature
-            if (weatherSpec.currentTemp >= -273.15) {
-                ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                try {
-                    new CborEncoder(baos).encode(new CborBuilder()
-                            .startMap() // This map is not fixed-size, which is not great, but it might come in a library update
-                            .put("Timestamp", System.currentTimeMillis() / 1000L)
-                            .put("Expires", 60 * 60 * 1 + WEATHER_GRACE_TIME) // 1h this should be the weather provider's interval, really
-                            .put("EventType", WeatherData.EventType.Temperature.value)
-                            .put("Temperature", (int) ((weatherSpec.currentTemp - 273.15) * 100))
-                            .put("DewPoint", (int) (-32768))
-                            .end()
-                            .build()
-                    );
-                } catch (Exception e) {
-                    LOG.warn(String.valueOf(e));
-                }
-                byte[] encodedBytes = baos.toByteArray();
-                TransactionBuilder builder = createTransactionBuilder("WeatherData");
-                safeWriteToCharacteristic(builder,
-                        PineTimeJFConstants.UUID_CHARACTERISTIC_WEATHER_DATA,
-                        encodedBytes);
-
-                builder.queue(getQueue());
-            }
-
-            // 24h temperature forecast
-            // TODO: This is disabled until WeatherSpec contains how often this data is pushed
-            /*
-            if (weatherSpec.todayMinTemp >= -273.15 &&
-                    weatherSpec.todayMaxTemp >= -273.15) { // Some sanity checking, should really be nullable
-                ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                try {
-                    new CborEncoder(baos).encode(new CborBuilder()
-                            .startMap() // This map is not fixed-size, which is not great, but it might come in a library update
-                            .put("Timestamp", System.currentTimeMillis() / 1000L)
-                            .put("Expires", 60 * 60 * 24) // 24h, because the temperature is today's
-                            .put("EventType", WeatherData.EventType.Temperature.value)
-                            .put("Temperature", (int) ((((weatherSpec.todayMinTemp - 273.15) + (weatherSpec.todayMaxTemp - 273.15)) / 2) * 100))
-                            .put("DewPoint", (int) (-32768))
-                            .end()
-                            .build()
-                    );
-                } catch (Exception e) {
-                    LOG.warn(String.valueOf(e));
-                }
-                byte[] encodedBytes = baos.toByteArray();
-                TransactionBuilder builder = createTransactionBuilder("WeatherData");
-                safeWriteToCharacteristic(builder,
-                        PineTimeJFConstants.UUID_CHARACTERISTIC_WEATHER_DATA,
-                        encodedBytes);
-
-                builder.queue(getQueue());
-            }
-            */
-
-            // Wind speed
-            if (weatherSpec.windSpeed != 0.0f) {
-                ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                try {
-                    new CborEncoder(baos).encode(new CborBuilder()
-                            .startMap() // This map is not fixed-size, which is not great, but it might come in a library update
-                            .put("Timestamp", System.currentTimeMillis() / 1000L)
-                            .put("Expires", 60 * 60 * 1 + WEATHER_GRACE_TIME) // 1h
-                            .put("EventType", WeatherData.EventType.Wind.value)
-                            .put("SpeedMin", (int) (weatherSpec.windSpeed / 60 / 60 * 1000))
-                            .put("SpeedMax", (int) (weatherSpec.windSpeed / 60 / 60 * 1000))
-                            .put("DirectionMin", (int) (0.71 * weatherSpec.windDirection))
-                            .put("DirectionMax", (int) (0.71 * weatherSpec.windDirection))
-                            .end()
-                            .build()
-                    );
-                } catch (Exception e) {
-                    LOG.warn(String.valueOf(e));
-                }
-                byte[] encodedBytes = baos.toByteArray();
-                TransactionBuilder builder = createTransactionBuilder("WeatherData");
-                safeWriteToCharacteristic(builder,
-                        PineTimeJFConstants.UUID_CHARACTERISTIC_WEATHER_DATA,
-                        encodedBytes);
-
-                builder.queue(getQueue());
-            }
-
-            // Current weather condition
-            if (mapOpenWeatherConditionToPineTimePrecipitation(weatherSpec.currentConditionCode) != WeatherData.PrecipitationType.Length) {
-                ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                try {
-                    new CborEncoder(baos).encode(new CborBuilder()
-                            .startMap() // This map is not fixed-size, which is not great, but it might come in a library update
-                            .put("Timestamp", System.currentTimeMillis() / 1000L)
-                            .put("Expires", 60 * 60 * 1 + WEATHER_GRACE_TIME) // 1h
-                            .put("EventType", WeatherData.EventType.Precipitation.value)
-                            .put("Type", (int) mapOpenWeatherConditionToPineTimePrecipitation(weatherSpec.currentConditionCode).value)
-                            .put("Amount", (int) 0)
-                            .end()
-                            .build()
-                    );
-                } catch (Exception e) {
-                    LOG.warn(String.valueOf(e));
-                }
-                byte[] encodedBytes = baos.toByteArray();
-                TransactionBuilder builder = createTransactionBuilder("WeatherData");
-                safeWriteToCharacteristic(builder,
-                        PineTimeJFConstants.UUID_CHARACTERISTIC_WEATHER_DATA,
-                        encodedBytes);
-
-                builder.queue(getQueue());
-            }
-
-            if (mapOpenWeatherConditionToPineTimeObscuration(weatherSpec.currentConditionCode) != WeatherData.ObscurationType.Length) {
-                ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                try {
-                    new CborEncoder(baos).encode(new CborBuilder()
-                            .startMap() // This map is not fixed-size, which is not great, but it might come in a library update
-                            .put("Timestamp", System.currentTimeMillis() / 1000L)
-                            .put("Expires", 60 * 60 * 1 + WEATHER_GRACE_TIME) // 1h
-                            .put("EventType", WeatherData.EventType.Obscuration.value)
-                            .put("Type", (int) mapOpenWeatherConditionToPineTimeObscuration(weatherSpec.currentConditionCode).value)
-                            .put("Amount", (int) 65535)
-                            .end()
-                            .build()
-                    );
-                } catch (Exception e) {
-                    LOG.warn(String.valueOf(e));
-                }
-                byte[] encodedBytes = baos.toByteArray();
-                TransactionBuilder builder = createTransactionBuilder("WeatherData");
-                safeWriteToCharacteristic(builder,
-                        PineTimeJFConstants.UUID_CHARACTERISTIC_WEATHER_DATA,
-                        encodedBytes);
-
-                builder.queue(getQueue());
-            }
-
-            if (mapOpenWeatherConditionToPineTimeSpecial(weatherSpec.currentConditionCode) != WeatherData.SpecialType.Length) {
-                ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                try {
-                    new CborEncoder(baos).encode(new CborBuilder()
-                            .startMap() // This map is not fixed-size, which is not great, but it might come in a library update
-                            .put("Timestamp", System.currentTimeMillis() / 1000L)
-                            .put("Expires", 60 * 60 * 1 + WEATHER_GRACE_TIME) // 1h
-                            .put("EventType", WeatherData.EventType.Special.value)
-                            .put("Type", mapOpenWeatherConditionToPineTimeSpecial(weatherSpec.currentConditionCode).value)
-                            .end()
-                            .build()
-                    );
-                } catch (Exception e) {
-                    LOG.warn(String.valueOf(e));
-                }
-                byte[] encodedBytes = baos.toByteArray();
-                TransactionBuilder builder = createTransactionBuilder("WeatherData");
-                safeWriteToCharacteristic(builder,
-                        PineTimeJFConstants.UUID_CHARACTERISTIC_WEATHER_DATA,
-                        encodedBytes);
-
-                builder.queue(getQueue());
-            }
-
-            if (mapOpenWeatherConditionToCloudCover(weatherSpec.currentConditionCode) != -1) {
-                ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                try {
-                    new CborEncoder(baos).encode(new CborBuilder()
-                            .startMap() // This map is not fixed-size, which is not great, but it might come in a library update
-                            .put("Timestamp", System.currentTimeMillis() / 1000L)
-                            .put("Expires", 60 * 60 * 1 + WEATHER_GRACE_TIME) // 1h
-                            .put("EventType", WeatherData.EventType.Clouds.value)
-                            .put("Amount", (int) (mapOpenWeatherConditionToCloudCover(weatherSpec.currentConditionCode)))
-                            .end()
-                            .build()
-                    );
-                } catch (Exception e) {
-                    LOG.warn(String.valueOf(e));
-                }
-                byte[] encodedBytes = baos.toByteArray();
-                TransactionBuilder builder = createTransactionBuilder("WeatherData");
-                safeWriteToCharacteristic(builder,
-                        PineTimeJFConstants.UUID_CHARACTERISTIC_WEATHER_DATA,
-                        encodedBytes);
-
-                builder.queue(getQueue());
-            }
-
-            LOG.debug("Wrote weather data");
+            this.onSendWeatherSimple(weatherSpec);
         }
     }
 

From 655d202512385e89118562dd17af8264e0266f49 Mon Sep 17 00:00:00 2001
From: FintasticMan <finlay.neon.kid@gmail.com>
Date: Tue, 2 Jan 2024 01:38:03 +0100
Subject: [PATCH 294/595] Add simple weather condition

Co-authored-by: Victor Kareh <vkareh@redhat.com>
---
 .../devices/pinetime/weather/WeatherData.java | 132 ++++++++++++++++++
 .../devices/pinetime/PineTimeJFSupport.java   |   5 +-
 2 files changed, 135 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/weather/WeatherData.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/weather/WeatherData.java
index 84915a2ff..453a58151 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/weather/WeatherData.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/weather/WeatherData.java
@@ -472,6 +472,92 @@ public class WeatherData {
 
     ;
 
+    /**
+     * List of weather condition codes used to determine display
+     * https://openweathermap.org/weather-conditions
+     */
+    public static final ConditionType mapOpenWeatherConditionToPineTimeCondition(int openWeatherMapCondition) {
+        switch (openWeatherMapCondition) {
+            // Group 2xx: Thunderstorm
+            case 200:  // Thunderstorm with light rain
+            case 201:  // Thunderstorm with rain
+            case 202:  // Thunderstorm with heavy rain
+            case 210:  // Light thunderstorm
+            case 211:  // Thunderstorm
+            case 212:  // Heavy thunderstorm
+            case 221:  // Ragged thunderstorm
+            case 230:  // Thunderstorm with light drizzle
+            case 231:  // Thunderstorm with drizzle
+            case 232:  // Thunderstorm with heavy drizzle
+                return ConditionType.Thunderstorm;
+            // Group 3xx: Drizzle
+            case 300:  // Light intensity drizzle
+            case 301:  // Drizzle
+            case 302:  // Heavy intensity drizzle
+            case 310:  // Light intensity drizzle rain
+            case 311:  // Drizzle rain
+            case 312:  // Heavy intensity drizzle rain
+            case 313:  // Shower rain and drizzle
+            case 314:  // Heavy shower rain and drizzle
+            case 321:  // Shower drizzle
+                return ConditionType.CloudsAndRain;
+            // Group 5xx: Rain
+            case 500:  // Light rain
+            case 501:  // Moderate rain
+            case 502:  // Heavy intensity rain
+            case 503:  // Very heavy rain
+            case 504:  // Extreme rain
+                return ConditionType.Rain;
+            case 511:  // Freezing rain
+                return ConditionType.Snow;
+            case 520:  // Light intensity shower rain
+            case 521:  // Shower rain
+            case 522:  // Heavy intensity shower rain
+            case 531:  // Ragged shower rain
+                return ConditionType.CloudsAndRain;
+            // Group 6xx: Snow
+            case 600:  // Light snow
+            case 601:  // Snow
+            case 602:  // Heavy snow
+            case 611:  // Sleet
+            case 612:  // Light shower sleet
+            case 613:  // Shower sleet
+            case 615:  // Light rain and snow
+            case 616:  // Rain and snow
+            case 620:  // Light shower snow
+            case 621:  // Shower snow
+            case 622:  // Heavy shower snow
+                return ConditionType.Snow;
+            // Group 7xx: Atmosphere
+            case 701:  // Mist
+            case 711:  // Smoke
+            case 721:  // Haze
+            case 731:  // Sandcase/dust whirls
+            case 741:  // Fog
+            case 751:  // Sand
+            case 761:  // Dust
+            case 762:  // Volcanic ash
+            case 771:  // Squalls
+            case 781:  // Tornado
+                return ConditionType.Mist;
+            // Group 800: Clear
+            case 800:  // Clear sky
+                return ConditionType.ClearSky;
+            // Group 80x: Clouds
+            case 801:  // Few clouds
+                return ConditionType.FewClouds;
+            case 802:  // Scattered clouds
+                return ConditionType.Clouds;
+            case 803:  // Broken clouds
+            case 804:  // Overcast clouds
+                return ConditionType.HeavyClouds;
+            default:
+                return ConditionType.Length;
+        }
+    }
+
+    ;
+
     /**
      * Visibility obscuration types
      */
@@ -614,6 +700,52 @@ public class WeatherData {
         }
     }
 
+    /**
+     * List of weather condition codes used to determine display
+     */
+    public enum ConditionType {
+        /**
+         * Clear sky
+         */
+        ClearSky(0),
+        /**
+         * Few clouds
+         */
+        FewClouds(1),
+        /**
+         * Scattered clouds
+         */
+        Clouds(2),
+        /**
+         * Broken/heavy clouds
+         */
+        HeavyClouds(3),
+        /**
+         * Shower rain
+         */
+        CloudsAndRain(4),
+        /**
+         * Rain
+         */
+        Rain(5),
+        /**
+         * Thunderstorm
+         */
+        Thunderstorm(6),
+        /**
+         * Snow
+         */
+        Snow(7),
+        /**
+         * Mist
+         */
+        Mist(8),
+        Length(9);
+        public final byte value;
+
+        ConditionType(int value) { this.value = (byte) value; }
+    }
+
     /**
      * These are used for weather timeline manipulation
      * that isn't just adding to the stack of weather events
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pinetime/PineTimeJFSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pinetime/PineTimeJFSupport.java
index 8174fdc8f..079827cdb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pinetime/PineTimeJFSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pinetime/PineTimeJFSupport.java
@@ -21,6 +21,7 @@ import static nodomain.freeyourgadget.gadgetbridge.devices.pinetime.weather.Weat
 import static nodomain.freeyourgadget.gadgetbridge.devices.pinetime.weather.WeatherData.mapOpenWeatherConditionToPineTimeObscuration;
 import static nodomain.freeyourgadget.gadgetbridge.devices.pinetime.weather.WeatherData.mapOpenWeatherConditionToPineTimePrecipitation;
 import static nodomain.freeyourgadget.gadgetbridge.devices.pinetime.weather.WeatherData.mapOpenWeatherConditionToPineTimeSpecial;
+import static nodomain.freeyourgadget.gadgetbridge.devices.pinetime.weather.WeatherData.mapOpenWeatherConditionToPineTimeCondition;
 
 import android.bluetooth.BluetoothGatt;
 import android.bluetooth.BluetoothGattCharacteristic;
@@ -989,7 +990,7 @@ public class PineTimeJFSupport extends AbstractBTLEDeviceSupport implements DfuL
                 currentPacket.put(16 + i, locationBytes[i]);
             }
         }
-        // currentPacket.put(48, ); // condition
+        currentPacket.put(48, mapOpenWeatherConditionToPineTimeCondition(weatherSpec.currentConditionCode).value);
 
         TransactionBuilder currentBuilder = createTransactionBuilder("SimpleWeatherData");
         safeWriteToCharacteristic(currentBuilder,
@@ -1010,7 +1011,7 @@ public class PineTimeJFSupport extends AbstractBTLEDeviceSupport implements DfuL
         for (int i = 0; i < nbDays; i++) {
             forecastPacket.putShort(11 + i * 5, (short) ((weatherSpec.forecasts.get(i).minTemp - 273.15) * 100));
             forecastPacket.putShort(11 + i * 5 + 2, (short) ((weatherSpec.forecasts.get(i).maxTemp - 273.15) * 100));
-            // forecastPacket.put(11 + i * 5 + 4, ); // condition
+            forecastPacket.put(11 + i * 5 + 4, mapOpenWeatherConditionToPineTimeCondition(weatherSpec.forecasts.get(i).conditionCode).value);
         }
 
         TransactionBuilder forecastBuilder = createTransactionBuilder("SimpleWeatherData");

From ecd13b4d8e3a2a4226f22c34ab239814271ccc58 Mon Sep 17 00:00:00 2001
From: FintasticMan <finlay.neon.kid@gmail.com>
Date: Thu, 4 Jan 2024 13:57:17 +0100
Subject: [PATCH 295/595] Update to new simple weather spec

---
 .../service/devices/pinetime/PineTimeJFSupport.java         | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pinetime/PineTimeJFSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pinetime/PineTimeJFSupport.java
index 079827cdb..2504d1cb6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pinetime/PineTimeJFSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pinetime/PineTimeJFSupport.java
@@ -979,8 +979,10 @@ public class PineTimeJFSupport extends AbstractBTLEDeviceSupport implements DfuL
     }
 
     private void onSendWeatherSimple(WeatherSpec weatherSpec) {
+        long timestampLocal = weatherSpec.timestamp + Calendar.getInstance().getTimeZone().getOffset(Calendar.getInstance(TimeZone.getTimeZone("UTC")).getTimeInMillis()) / 1000L;
+
         ByteBuffer currentPacket = ByteBuffer.allocate(49).order(ByteOrder.LITTLE_ENDIAN);
-        currentPacket.putLong(2, (long) weatherSpec.timestamp * 1000000000L); // 10^9, for nanoseconds
+        currentPacket.putLong(2, timestampLocal);
         currentPacket.putShort(10, (short) ((weatherSpec.currentTemp - 273.15) * 100));
         currentPacket.putShort(12, (short) ((weatherSpec.todayMinTemp - 273.15) * 100));
         currentPacket.putShort(14, (short) ((weatherSpec.todayMaxTemp - 273.15) * 100));
@@ -1005,7 +1007,7 @@ public class PineTimeJFSupport extends AbstractBTLEDeviceSupport implements DfuL
 
         ByteBuffer forecastPacket = ByteBuffer.allocate(36).order(ByteOrder.LITTLE_ENDIAN);
         forecastPacket.put(0, (byte) 1);
-        forecastPacket.putLong(2, (long) weatherSpec.timestamp * 1000000000L); // 10^9, for nanoseconds
+        forecastPacket.putLong(2, timestampLocal);
         byte nbDays = (byte) Math.min(weatherSpec.forecasts.size(), 5);
         forecastPacket.put(10, nbDays);
         for (int i = 0; i < nbDays; i++) {

From fa9c474e61de3b86254d3362cccc1cd9160c7104 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Thu, 4 Jan 2024 22:44:39 +0000
Subject: [PATCH 296/595] Update changelog

---
 CHANGELOG.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2884d3041..73bfb482e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,25 @@
 ### Changelog
 
+#### Next version (WIP)
+
+* Initial support for Mijia LYWSD03MMC
+* Initial support for Nothing Ear (2)
+* Experimental support for Redmi Watch 2 Lite
+* Experimental support for Redmi Smart Band Pro
+* Fossil/Skagen Hybrids: Update navigationApp to 1.1
+* Pebble: Attempt to fix app configuration webview
+* PineTime: Add support for InfiniTime's new simple weather
+* PineTime: Fix freeze and reboot when upgrading firmware
+* Pixoo: Enable sending images (non-persistent)
+* Pixoo: Get and send alarms
+* Pixoo: Set custom device name
+* Pixoo: support "clap hands to turn off screen" and "sleep after silence" settings
+* Xiaomi: Improve activity and workout parsing
+* Xiaomi: Improve stability and fix some crashes
+* Xiaomi: Parse sleep stages on some devices
+* Add a notifications channel for connection status notifications
+* Map some missing Google Maps navigation actions
+
 #### 0.77.0
 * Initial support for Amazfit Balance
 * Initial support for Amazfit Active

From 05d8f99312bdead38808af0a1bd5e4b60daa303c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 5 Jan 2024 09:35:03 +0000
Subject: [PATCH 297/595] Nothing Ear (Stick): Initial support

- Refactor common coordinator logic to AbstractEarCoordinator
- Increment message counter on the stick
- Make audio modes translatable
---
 .../nothing/AbstractEarCoordinator.java       | 101 ++++++++++++++++++
 .../devices/nothing/Ear1Coordinator.java      |  70 +-----------
 .../devices/nothing/Ear2Coordinator.java      |  70 +-----------
 .../nothing/EarSettingsCustomizer.java        |  92 ++++++++++++++++
 .../devices/nothing/EarStickCoordinator.java  |  43 ++++++++
 .../gadgetbridge/model/DeviceType.java        |   2 +
 .../devices/nothing/NothingProtocol.java      |  19 +++-
 app/src/main/res/values/arrays.xml            |  11 +-
 app/src/main/res/values/strings.xml           |   3 +
 .../res/xml/devicesettings_nothing_ear1.xml   |   4 +-
 10 files changed, 279 insertions(+), 136 deletions(-)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/AbstractEarCoordinator.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/EarSettingsCustomizer.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/EarStickCoordinator.java

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/AbstractEarCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/AbstractEarCoordinator.java
new file mode 100644
index 000000000..8da21877c
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/AbstractEarCoordinator.java
@@ -0,0 +1,101 @@
+/*  Copyright (C) 2023 Daniele Gobbetti, José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.nothing;
+
+import android.content.Context;
+import android.net.Uri;
+
+import androidx.annotation.NonNull;
+
+import nodomain.freeyourgadget.gadgetbridge.GBException;
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSpecificSettingsCustomizer;
+import nodomain.freeyourgadget.gadgetbridge.devices.AbstractBLClassicDeviceCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.entities.Device;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.model.BatteryConfig;
+import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.nothing.Ear1Support;
+
+public abstract class AbstractEarCoordinator extends AbstractBLClassicDeviceCoordinator {
+    @Override
+    public InstallHandler findInstallHandler(Uri uri, Context context) {
+        return null;
+    }
+
+    @Override
+    public String getManufacturer() {
+        return "Nothing";
+    }
+
+    @Override
+    public boolean supportsFindDevice() {
+        return true;
+    }
+
+    @Override
+    protected void deleteDevice(@NonNull GBDevice gbDevice, @NonNull Device device, @NonNull DaoSession session) throws GBException {
+
+    }
+
+    @Override
+    public int getBatteryCount() {
+        return 3;
+    }
+
+    @Override
+    public BatteryConfig[] getBatteryConfig() {
+        BatteryConfig battery1 = new BatteryConfig(0, R.drawable.ic_tws_case, R.string.battery_case);
+        BatteryConfig battery2 = new BatteryConfig(1, R.drawable.ic_nothing_ear_l, R.string.left_earbud);
+        BatteryConfig battery3 = new BatteryConfig(2, R.drawable.ic_nothing_ear_r, R.string.right_earbud);
+        return new BatteryConfig[]{battery1, battery2, battery3};
+    }
+
+    @NonNull
+    @Override
+    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+        return Ear1Support.class;
+    }
+
+    @Override
+    public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
+        return new int[]{
+                R.xml.devicesettings_nothing_ear1
+        };
+    }
+
+    @Override
+    public int getDefaultIconResource() {
+        return R.drawable.ic_device_nothingear;
+    }
+
+    @Override
+    public int getDisabledIconResource() {
+        return R.drawable.ic_device_nothingear_disabled;
+    }
+
+    @Override
+    public DeviceSpecificSettingsCustomizer getDeviceSpecificSettingsCustomizer(final GBDevice device) {
+        return new EarSettingsCustomizer();
+    }
+
+    public abstract boolean incrementCounter();
+
+    public abstract boolean supportsLightAncAndTransparency();
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/Ear1Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/Ear1Coordinator.java
index 8fd1b844a..0c688a262 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/Ear1Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/Ear1Coordinator.java
@@ -1,87 +1,27 @@
 package nodomain.freeyourgadget.gadgetbridge.devices.nothing;
 
-import android.content.Context;
-import android.net.Uri;
-
-import androidx.annotation.NonNull;
-
 import java.util.regex.Pattern;
 
-import nodomain.freeyourgadget.gadgetbridge.GBException;
 import nodomain.freeyourgadget.gadgetbridge.R;
-import nodomain.freeyourgadget.gadgetbridge.devices.AbstractBLClassicDeviceCoordinator;
-import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
-import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
-import nodomain.freeyourgadget.gadgetbridge.entities.Device;
-import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.model.BatteryConfig;
-import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.nothing.Ear1Support;
 
-public class Ear1Coordinator extends AbstractBLClassicDeviceCoordinator {
+public class Ear1Coordinator extends AbstractEarCoordinator {
     @Override
     protected Pattern getSupportedDeviceName() {
         return Pattern.compile("Nothing ear (1)", Pattern.LITERAL);
     }
 
-    @Override
-    public InstallHandler findInstallHandler(Uri uri, Context context) {
-        return null;
-    }
-
-    @Override
-    public String getManufacturer() {
-        return "Nothing";
-    }
-
-    @Override
-    public boolean supportsFindDevice() {
-        return true;
-    }
-
-    @Override
-    protected void deleteDevice(@NonNull GBDevice gbDevice, @NonNull Device device, @NonNull DaoSession session) throws GBException {
-
-    }
-
-    @Override
-    public int getBatteryCount() {
-        return 3;
-    }
-
-    @Override
-    public BatteryConfig[] getBatteryConfig() {
-        BatteryConfig battery1 = new BatteryConfig(0, R.drawable.ic_tws_case, R.string.battery_case);
-        BatteryConfig battery2 = new BatteryConfig(1, R.drawable.ic_nothing_ear_l, R.string.left_earbud);
-        BatteryConfig battery3 = new BatteryConfig(2, R.drawable.ic_nothing_ear_r, R.string.right_earbud);
-        return new BatteryConfig[]{battery1, battery2, battery3};
-    }
-
-    @NonNull
-    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
-        return Ear1Support.class;
-    }
-
-    @Override
-    public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
-        return new int[] {
-                R.xml.devicesettings_nothing_ear1
-        };
-    }
-
     @Override
     public int getDeviceNameResource() {
         return R.string.devicetype_nothingear1;
     }
 
     @Override
-    public int getDefaultIconResource() {
-        return R.drawable.ic_device_nothingear;
+    public boolean incrementCounter() {
+        return false;
     }
 
     @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_nothingear_disabled;
+    public boolean supportsLightAncAndTransparency() {
+        return true;
     }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/Ear2Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/Ear2Coordinator.java
index 367f9ac42..33c074700 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/Ear2Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/Ear2Coordinator.java
@@ -16,88 +16,28 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.nothing;
 
-import android.content.Context;
-import android.net.Uri;
-
-import androidx.annotation.NonNull;
-
 import java.util.regex.Pattern;
 
-import nodomain.freeyourgadget.gadgetbridge.GBException;
 import nodomain.freeyourgadget.gadgetbridge.R;
-import nodomain.freeyourgadget.gadgetbridge.devices.AbstractBLClassicDeviceCoordinator;
-import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
-import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
-import nodomain.freeyourgadget.gadgetbridge.entities.Device;
-import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.model.BatteryConfig;
-import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.nothing.Ear1Support;
 
-public class Ear2Coordinator extends AbstractBLClassicDeviceCoordinator {
+public class Ear2Coordinator extends AbstractEarCoordinator {
     @Override
     protected Pattern getSupportedDeviceName() {
         return Pattern.compile("Ear (2)", Pattern.LITERAL);
     }
 
-    @Override
-    public InstallHandler findInstallHandler(Uri uri, Context context) {
-        return null;
-    }
-
-    @Override
-    public String getManufacturer() {
-        return "Nothing";
-    }
-
-    @Override
-    public boolean supportsFindDevice() {
-        return true;
-    }
-
-    @Override
-    protected void deleteDevice(@NonNull GBDevice gbDevice, @NonNull Device device, @NonNull DaoSession session) throws GBException {
-
-    }
-
-    @Override
-    public int getBatteryCount() {
-        return 3;
-    }
-
-    @Override
-    public BatteryConfig[] getBatteryConfig() {
-        BatteryConfig battery1 = new BatteryConfig(0, R.drawable.ic_tws_case, R.string.battery_case);
-        BatteryConfig battery2 = new BatteryConfig(1, R.drawable.ic_nothing_ear_l, R.string.left_earbud);
-        BatteryConfig battery3 = new BatteryConfig(2, R.drawable.ic_nothing_ear_r, R.string.right_earbud);
-        return new BatteryConfig[]{battery1, battery2, battery3};
-    }
-
-    @NonNull
-    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
-        return Ear1Support.class;
-    }
-
-    @Override
-    public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
-        return new int[] {
-                R.xml.devicesettings_nothing_ear1
-        };
-    }
-
     @Override
     public int getDeviceNameResource() {
         return R.string.devicetype_nothingear2;
     }
 
     @Override
-    public int getDefaultIconResource() {
-        return R.drawable.ic_device_nothingear;
+    public boolean incrementCounter() {
+        return false;
     }
 
     @Override
-    public int getDisabledIconResource() {
-        return R.drawable.ic_device_nothingear_disabled;
+    public boolean supportsLightAncAndTransparency() {
+        return true;
     }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/EarSettingsCustomizer.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/EarSettingsCustomizer.java
new file mode 100644
index 000000000..5c0277953
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/EarSettingsCustomizer.java
@@ -0,0 +1,92 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.nothing;
+
+import android.os.Parcel;
+
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSpecificSettingsCustomizer;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSpecificSettingsHandler;
+import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
+
+public class EarSettingsCustomizer implements DeviceSpecificSettingsCustomizer {
+    @Override
+    public void onPreferenceChange(final Preference preference, final DeviceSpecificSettingsHandler handler) {
+    }
+
+    @Override
+    public void customizeSettings(final DeviceSpecificSettingsHandler handler, final Prefs prefs) {
+        final AbstractEarCoordinator earCoordinator = (AbstractEarCoordinator) handler.getDevice().getDeviceCoordinator();
+
+        if (!earCoordinator.supportsLightAncAndTransparency()) {
+            // If light anc and transparency is not supported, remove the values from the preference
+            final Preference audioModePref = handler.findPreference(DeviceSettingsPreferenceConst.PREF_NOTHING_EAR1_AUDIOMODE);
+
+            if (audioModePref != null) {
+                final CharSequence[] originalEntries = ((ListPreference) audioModePref).getEntries();
+                final CharSequence[] originalEntryValues = ((ListPreference) audioModePref).getEntryValues();
+
+                final List<CharSequence> entries = new ArrayList<>();
+                final List<CharSequence> entryValues = new ArrayList<>();
+
+                for (int i = 0; i < originalEntries.length; i++) {
+                    if ("anc".equals(originalEntryValues[i].toString()) || "off".equals(originalEntryValues[i].toString())) {
+                        entries.add(originalEntries[i]);
+                        entryValues.add(originalEntryValues[i]);
+                    }
+                }
+
+                ((ListPreference) audioModePref).setEntries(entries.toArray(new CharSequence[0]));
+                ((ListPreference) audioModePref).setEntryValues(entryValues.toArray(new CharSequence[0]));
+            }
+        }
+    }
+
+    @Override
+    public Set<String> getPreferenceKeysWithSummary() {
+        return Collections.emptySet();
+    }
+
+    public static final Creator<EarSettingsCustomizer> CREATOR = new Creator<EarSettingsCustomizer>() {
+        @Override
+        public EarSettingsCustomizer createFromParcel(final Parcel in) {
+            return new EarSettingsCustomizer();
+        }
+
+        @Override
+        public EarSettingsCustomizer[] newArray(final int size) {
+            return new EarSettingsCustomizer[size];
+        }
+    };
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(final Parcel dest, final int flags) {
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/EarStickCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/EarStickCoordinator.java
new file mode 100644
index 000000000..11c718198
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/EarStickCoordinator.java
@@ -0,0 +1,43 @@
+/*  Copyright (C) 2023 Daniele Gobbetti, José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.nothing;
+
+import java.util.regex.Pattern;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+
+public class EarStickCoordinator extends AbstractEarCoordinator {
+    @Override
+    protected Pattern getSupportedDeviceName() {
+        return Pattern.compile("Ear (stick)", Pattern.LITERAL);
+    }
+
+    @Override
+    public int getDeviceNameResource() {
+        return R.string.devicetype_nothingearstick;
+    }
+
+    @Override
+    public boolean incrementCounter() {
+        return true;
+    }
+
+    @Override
+    public boolean supportsLightAncAndTransparency() {
+        return false;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
index b1a9777f5..7d8a03bb8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
@@ -115,6 +115,7 @@ import nodomain.freeyourgadget.gadgetbridge.devices.miscale2.MiScale2DeviceCoord
 import nodomain.freeyourgadget.gadgetbridge.devices.no1f1.No1F1Coordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.nothing.Ear1Coordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.nothing.Ear2Coordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.nothing.EarStickCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.nut.NutCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.pebble.PebbleCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.pinetime.PineTimeJFCoordinator;
@@ -279,6 +280,7 @@ public enum DeviceType {
     DOMYOS_T540(DomyosT540Coordinator.class),
     NOTHING_EAR1(Ear1Coordinator.class),
     NOTHING_EAR2(Ear2Coordinator.class),
+    NOTHING_EAR_STICK(EarStickCoordinator.class),
     GALAXY_BUDS_PRO(GalaxyBudsProDeviceCoordinator.class),
     GALAXY_BUDS_LIVE(GalaxyBudsLiveDeviceCoordinator.class),
     GALAXY_BUDS(GalaxyBudsDeviceCoordinator.class),
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/nothing/NothingProtocol.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/nothing/NothingProtocol.java
index 9f773553c..e3de16717 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/nothing/NothingProtocol.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/nothing/NothingProtocol.java
@@ -20,6 +20,7 @@ import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSett
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEvent;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventBatteryInfo;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventVersionInfo;
+import nodomain.freeyourgadget.gadgetbridge.devices.nothing.AbstractEarCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.model.BatteryState;
 import nodomain.freeyourgadget.gadgetbridge.service.serial.GBDeviceProtocol;
@@ -61,6 +62,8 @@ public class NothingProtocol extends GBDeviceProtocol {
     private static final short in_ear_detection = (short) 0xf004;
     private static final short audio_mode = (short) 0xf00f;
 
+    private final boolean incrementCounter;
+    private int messageCounter = 0x00;
 
     private HashMap<Byte, GBDeviceEventBatteryInfo> batteries;
     private static final byte battery_earphone_left = 0x02;
@@ -133,10 +136,16 @@ public class NothingProtocol extends GBDeviceProtocol {
         ByteBuffer msgBuf = ByteBuffer.allocate(8 + payload.length);
         msgBuf.order(ByteOrder.LITTLE_ENDIAN);
         msgBuf.put((byte) 0x55); //sof
-        msgBuf.putShort(control);
+        msgBuf.putShort((short) (incrementCounter ? (control | 0x40) : control));
         msgBuf.putShort(command);
         msgBuf.putShort((short) payload.length);
-        msgBuf.put((byte) 0x00); //fsn TODO: is this always 0?
+        msgBuf.put((byte) messageCounter); //fsn
+        if (incrementCounter) {
+            messageCounter++;
+            if ((byte) messageCounter == (byte) 0xfd) {
+                messageCounter = 0x00;
+            }
+        }
         msgBuf.put(payload);
 
         if (isCrcNeeded(control)) {
@@ -294,8 +303,13 @@ public class NothingProtocol extends GBDeviceProtocol {
         return (byte) ((control & MASK_DEVICE_TYPE) >> 8);
     }
 
+    private AbstractEarCoordinator getCoordinator() {
+        return (AbstractEarCoordinator) getDevice().getDeviceCoordinator();
+    }
+
     protected NothingProtocol(GBDevice device) {
         super(device);
+
         batteries = new HashMap<>(3);
 
         batteries.put(battery_earphone_left, new GBDeviceEventBatteryInfo());
@@ -306,5 +320,6 @@ public class NothingProtocol extends GBDeviceProtocol {
         batteries.get(battery_earphone_left).batteryIndex=1;
         batteries.get(battery_earphone_right).batteryIndex=2;
 
+        incrementCounter = getCoordinator().incrementCounter();
     }
 }
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index d09fb8b3f..c57150f86 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -2820,8 +2820,15 @@
         <item>2</item>
         <item>3</item>
     </string-array>
-    
-    <string-array name="nothing_ear1_audio_mode">
+
+    <string-array name="nothing_ear1_audio_mode_names">
+        <item>@string/prefs_active_noise_cancelling</item>
+        <item>@string/prefs_active_noise_cancelling_light</item>
+        <item>@string/prefs_active_noise_cancelling_transparency</item>
+        <item>@string/off</item>
+    </string-array>
+
+    <string-array name="nothing_ear1_audio_mode_values">
         <item>anc</item>
         <item>anc-light</item>
         <item>transparency</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index aa487bdfe..c7e09d949 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1961,6 +1961,7 @@
     <string name="prefs_autoheartrate_interval">Frequency of measurements</string>
     <string name="devicetype_nothingear1">Nothing Ear (1)</string>
     <string name="devicetype_nothingear2">Nothing Ear (2)</string>
+    <string name="devicetype_nothingearstick">Nothing Ear (Stick)</string>
     <string name="devicetype_galaxybuds">Galaxy Buds</string>
     <string name="devicetype_galaxybuds_live">Galaxy Buds Live</string>
     <string name="devicetype_galaxybuds_pro">Galaxy Buds Pro</string>
@@ -2001,6 +2002,8 @@
     <string name="prefs_ambient_mode">Ambient Mode</string>
     <string name="prefs_ambient_settings_title">Ambient Sound Options</string>
     <string name="prefs_active_noise_cancelling">Active Noise Cancelling</string>
+    <string name="prefs_active_noise_cancelling_light">Light Active Noise Cancelling</string>
+    <string name="prefs_active_noise_cancelling_transparency">Transparency</string>
     <string name="prefs_active_noise_cancelling_level">Active Noise Cancelling Level</string>
     <string name="prefs_active_noise_cancelling_level_high">High</string>
     <string name="prefs_active_noise_cancelling_level_low">Low</string>
diff --git a/app/src/main/res/xml/devicesettings_nothing_ear1.xml b/app/src/main/res/xml/devicesettings_nothing_ear1.xml
index 746624935..05dd62534 100644
--- a/app/src/main/res/xml/devicesettings_nothing_ear1.xml
+++ b/app/src/main/res/xml/devicesettings_nothing_ear1.xml
@@ -8,8 +8,8 @@
         android:title="@string/nothing_prefs_inear_title" />
     <ListPreference
         android:icon="@drawable/ic_extension"
-        android:entryValues="@array/nothing_ear1_audio_mode"
-        android:entries="@array/nothing_ear1_audio_mode"
+        android:entryValues="@array/nothing_ear1_audio_mode_values"
+        android:entries="@array/nothing_ear1_audio_mode_names"
         android:key="pref_nothing_audiomode"
         android:summary="%s"
         android:title="@string/nothing_prefs_audiomode_title" />

From f7258034cc894d24f2c0135c1560e8b4d7897edc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 5 Jan 2024 21:04:19 +0000
Subject: [PATCH 298/595] Xiaomi: Refactor workout summary parsing

---
 .../activity/impl/WorkoutSummaryParser.java   | 343 ++++++------------
 .../impl/XiaomiSimpleActivityParser.java      | 144 ++++++++
 .../activity/impl/XiaomiSimpleDataEntry.java  |  47 +++
 3 files changed, 305 insertions(+), 229 deletions(-)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/XiaomiSimpleActivityParser.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/XiaomiSimpleDataEntry.java

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java
index 30c9c0c71..fbd93b712 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java
@@ -18,6 +18,8 @@ package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.imp
 
 import android.widget.Toast;
 
+import androidx.annotation.Nullable;
+
 import org.apache.commons.lang3.ArrayUtils;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -26,7 +28,6 @@ import org.slf4j.LoggerFactory;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
-import java.util.Date;
 
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 import nodomain.freeyourgadget.gadgetbridge.database.DBHandler;
@@ -96,45 +97,48 @@ public class WorkoutSummaryParser extends XiaomiActivityParser implements Activi
 
         final XiaomiActivityFileId fileId = XiaomiActivityFileId.from(buf);
 
+        XiaomiSimpleActivityParser parser = null;
+
         switch (fileId.getSubtype()) {
             case SPORTS_OUTDOOR_WALKING_V1:
-                parseOutdoorWalkingV1(summary, fileId, buf);
+                summary.setActivityKind(ActivityKind.TYPE_WALKING);
+                parser = getOutdoorWalkingV1Parser(fileId);
                 break;
             case SPORTS_OUTDOOR_RUNNING:
-                parseOutdoorRunning(summary, fileId, buf);
+                summary.setActivityKind(ActivityKind.TYPE_RUNNING);
+                // TODO
                 break;
             case SPORTS_INDOOR_CYCLING:
-                parseIndoorCycling(summary, fileId, buf);
+                parser = getIndoorCyclingParser(fileId);
                 break;
             case SPORTS_FREESTYLE:
-                parseFreestyle(summary, fileId, buf);
+                summary.setActivityKind(ActivityKind.TYPE_STRENGTH_TRAINING);
+                // TODO
                 break;
             case SPORTS_ELLIPTICAL:
-                parseElliptical(summary, fileId, buf);
+                summary.setActivityKind(ActivityKind.TYPE_ELLIPTICAL_TRAINER);
+                // TODO
                 break;
             case SPORTS_OUTDOOR_WALKING_V2:
-                parseOutdoorWalkingV2(summary, fileId, buf);
+                parser = getOutdoorWalkingV2Parser(fileId);
                 break;
             case SPORTS_OUTDOOR_CYCLING:
-                parseOutdoorCycling(summary, fileId, buf);
+                parser = getOutdoorCyclingParser(fileId);
                 break;
             default:
                 LOG.warn("No workout summary parser for {}", fileId.getSubtypeCode());
                 break;
         }
 
+        if (parser != null) {
+            parser.parse(summary, buf);
+        }
+
         return summary;
     }
 
-    private void parseOutdoorRunning(final BaseActivitySummary summary, final XiaomiActivityFileId fileId, final ByteBuffer buf) {
-        summary.setActivityKind(ActivityKind.TYPE_RUNNING);
-
-        // TODO
-    }
-
-    private void parseIndoorCycling(final BaseActivitySummary summary, final XiaomiActivityFileId fileId, final ByteBuffer buf) {
-        final JSONObject summaryData = new JSONObject();
-
+    @Nullable
+    private XiaomiSimpleActivityParser getIndoorCyclingParser(final XiaomiActivityFileId fileId) {
         final int version = fileId.getVersion();
         final int headerSize;
         switch (version) {
@@ -143,58 +147,26 @@ public class WorkoutSummaryParser extends XiaomiActivityParser implements Activi
                 break;
             default:
                 LOG.warn("Unable to parse workout summary version {}", fileId.getVersion());
-                return;
+                return null;
         }
 
-        final byte[] header = new byte[headerSize];
-        buf.get(header);
+        final XiaomiSimpleActivityParser.Builder builder = new XiaomiSimpleActivityParser.Builder();
+        builder.setHeaderSize(headerSize);
+        builder.addInt("startTime", "seconds");
+        builder.addInt("endTime", "seconds");
+        builder.addInt("activeSeconds", "seconds");
+        builder.addInt("distanceMeters", "meters");
+        builder.addShort("caloriesBurnt", "calories_unit");
+        builder.addUnknown(4);
+        builder.addByte("averageHR", "bpm");
+        builder.addByte("maxHR", "bpm");
+        builder.addByte("minHR", "bpm");
 
-        summary.setActivityKind(ActivityKind.TYPE_INDOOR_CYCLING);
-
-        final int startTime = buf.getInt();
-        final int endTime = buf.getInt();
-
-        // We don't set the start time, since we need it to match the fileId for the WorkoutGpsParser
-        // to find it. They also seem to match.
-        //summary.setStartTime(new Date(startTime * 1000L));
-        summary.setEndTime(new Date(endTime * 1000L));
-
-        final int duration = buf.getInt();
-        addSummaryData(summaryData, "activeSeconds", duration, "seconds");
-
-        final int distance = buf.getInt();
-        addSummaryData(summaryData, "distanceMeters", distance, "meters");
-
-        final int calories = buf.getShort();
-        addSummaryData(summaryData, "caloriesBurnt", calories, "calories_unit");
-
-        final int unknown1 = buf.getInt();
-
-        final float avgHr = buf.get() & 0xff;
-        final float maxHr = buf.get() & 0xff;
-        final float minHr = buf.get() & 0xff;
-        addSummaryData(summaryData, "averageHR", avgHr, "bpm");
-        addSummaryData(summaryData, "maxHR", maxHr, "bpm");
-        addSummaryData(summaryData, "minHR", minHr, "bpm");
-
-        summary.setSummaryData(summaryData.toString());
+        return builder.build();
     }
 
-    private void parseFreestyle(final BaseActivitySummary summary, final XiaomiActivityFileId fileId, final ByteBuffer buf) {
-        summary.setActivityKind(ActivityKind.TYPE_STRENGTH_TRAINING);
-
-        // TODO
-    }
-
-    private void parseElliptical(final BaseActivitySummary summary, final XiaomiActivityFileId fileId, final ByteBuffer buf) {
-        summary.setActivityKind(ActivityKind.TYPE_ELLIPTICAL_TRAINER);
-
-        // TODO
-    }
-
-    private void parseOutdoorWalkingV1(final BaseActivitySummary summary, final XiaomiActivityFileId fileId, final ByteBuffer buf) {
-        final JSONObject summaryData = new JSONObject();
-
+    @Nullable
+    private XiaomiSimpleActivityParser getOutdoorWalkingV1Parser(final XiaomiActivityFileId fileId) {
         final int version = fileId.getVersion();
         final int headerSize;
         switch (version) {
@@ -203,55 +175,41 @@ public class WorkoutSummaryParser extends XiaomiActivityParser implements Activi
                 break;
             default:
                 LOG.warn("Unable to parse workout summary version {}", fileId.getVersion());
-                return;
+                return null;
         }
 
-        final byte[] header = new byte[headerSize];
-        buf.get(header);
+        final XiaomiSimpleActivityParser.Builder builder = new XiaomiSimpleActivityParser.Builder();
+        builder.setHeaderSize(headerSize);
+        builder.addInt("startTime", "seconds");
+        builder.addInt("endTime", "seconds");
+        builder.addInt("activeSeconds", "seconds");
+        builder.addInt("distanceMeters", "meters");
+        builder.addInt("caloriesBurnt", "calories_unit");
+        builder.addInt("maxPace", "seconds_m");
+        builder.addInt("minPace", "seconds_m");
+        builder.addUnknown(4);
+        builder.addInt("steps", "steps_unit");
+        builder.addUnknown(2); // pace?
+        builder.addByte("averageHR", "bpm");
+        builder.addByte("maxHR", "bpm");
+        builder.addByte("minHR", "bpm");
+        builder.addUnknown(20);
+        builder.addFloat("recoveryValue", "recoveryValue");
+        builder.addUnknown(9);
+        builder.addByte("recoveryTime", "seconds");
+        builder.addUnknown(2);
+        builder.addInt("vo2max", "seconds");
+        builder.addInt("hrZoneAnaerobic", "seconds");
+        builder.addInt("hrZoneAerobic", "seconds");
+        builder.addInt("hrZoneFatBurn", "seconds");
+        builder.addInt("hrZoneWarmUp", "seconds");
+        builder.addInt("configured_time_goal", "seconds");
 
-        summary.setActivityKind(ActivityKind.TYPE_WALKING);
-
-        final int startTime = buf.getInt();
-        final int endTime = buf.getInt();
-
-        // We don't set the start time, since we need it to match the fileId for the WorkoutGpsParser
-        // to find it. They also seem to match.
-        //summary.setStartTime(new Date(startTime * 1000L));
-        summary.setEndTime(new Date(endTime * 1000L));
-
-        final int duration = buf.getInt();
-        addSummaryData(summaryData, "activeSeconds", duration, "seconds");
-
-        final int distance = buf.getInt();
-        addSummaryData(summaryData, "distanceMeters", distance, "meters");
-
-        final int calories = buf.getShort();
-        addSummaryData(summaryData, "caloriesBurnt", calories, "calories_unit");
-
-
-        final int maxPace = buf.getInt();
-        addSummaryData(summaryData, "maxPace", maxPace, "seconds_m");
-        final int minPace = buf.getInt();
-        addSummaryData(summaryData, "minPace", minPace, "seconds_m");
-        final int unknown1 = buf.getInt(); // ?
-        final int steps = buf.getInt();
-        addSummaryData(summaryData, "steps", steps, "steps_unit");
-        final int unknown6 = buf.getShort(); // pace?
-
-        final int averageHR = buf.get() & 0xff;
-        final int maxHR = buf.get() & 0xff;
-        final int minHR = buf.get() & 0xff;
-
-        addSummaryData(summaryData, "averageHR", averageHR, "bpm");
-        addSummaryData(summaryData, "maxHR", maxHR, "bpm");
-        addSummaryData(summaryData, "minHR", minHR, "bpm");
-
-        summary.setSummaryData(summaryData.toString());
+        return builder.build();
     }
 
-    private void parseOutdoorWalkingV2(final BaseActivitySummary summary, final XiaomiActivityFileId fileId, final ByteBuffer buf) {
-        final JSONObject summaryData = new JSONObject();
-
+    @Nullable
+    private XiaomiSimpleActivityParser getOutdoorWalkingV2Parser(final XiaomiActivityFileId fileId) {
         final int version = fileId.getVersion();
         final int headerSize;
         switch (version) {
@@ -260,63 +218,42 @@ public class WorkoutSummaryParser extends XiaomiActivityParser implements Activi
                 break;
             default:
                 LOG.warn("Unable to parse workout summary version {}", fileId.getVersion());
-                return;
+                return null;
         }
 
-        final byte[] header = new byte[headerSize];
-        buf.get(header);
+        final XiaomiSimpleActivityParser.Builder builder = new XiaomiSimpleActivityParser.Builder();
+        builder.setHeaderSize(headerSize);
+        builder.addShort("xiaomiActivityType", "xiaomiActivityType");
+        builder.addInt("startTime", "seconds");
+        builder.addInt("endTime", "seconds");
+        builder.addInt("activeSeconds", "seconds");
+        builder.addUnknown(4);
+        builder.addInt("distanceMeters", "meters");
+        builder.addUnknown(2);
+        builder.addShort("caloriesBurnt", "calories_unit");
+        builder.addUnknown(12);
+        builder.addInt("steps", "steps_unit");
+        builder.addUnknown(2);
+        builder.addByte("averageHR", "bpm");
+        builder.addByte("maxHR", "bpm");
+        builder.addByte("minHR", "bpm");
+        builder.addUnknown(20);
+        builder.addFloat("recoveryValue", "?");
+        builder.addUnknown(9);
+        builder.addByte("recoveryTime", "seconds");
+        builder.addUnknown(2);
+        builder.addInt("vo2max", "ml/kg/min");
+        builder.addInt("hrZoneAnaerobic", "seconds");
+        builder.addInt("hrZoneAerobic", "seconds");
+        builder.addInt("hrZoneFatBurn", "seconds");
+        builder.addInt("hrZoneWarmUp", "seconds");
+        builder.addInt("configured_time_goal", "seconds");
 
-        final short workoutType = buf.getShort();
-
-        switch (workoutType) {
-            case 2:
-                summary.setActivityKind(ActivityKind.TYPE_WALKING);
-                break;
-            default:
-                summary.setActivityKind(ActivityKind.TYPE_UNKNOWN);
-        }
-
-        final int startTime = buf.getInt();
-        final int endTime = buf.getInt();
-
-        // We don't set the start time, since we need it to match the fileId for the WorkoutGpsParser
-        // to find it. They also seem to match.
-        //summary.setStartTime(new Date(startTime * 1000L));
-        summary.setEndTime(new Date(endTime * 1000L));
-
-        final int duration = buf.getInt();
-        addSummaryData(summaryData, "activeSeconds", duration, "seconds");
-
-        final int unknown1 = buf.getInt();
-        final int distance = buf.getInt();
-        addSummaryData(summaryData, "distanceMeters", distance, "meters");
-
-        final int unknown2 = buf.getShort();
-
-        final int calories = buf.getShort();
-        addSummaryData(summaryData, "caloriesBurnt", calories, "calories_unit");
-
-        final int unknown3 = buf.getInt(); // pace?
-        final int unknown4 = buf.getInt(); // pace?
-        final int unknown5 = buf.getInt(); // pace?
-        final int steps = buf.getInt();
-        addSummaryData(summaryData, "steps", steps, "steps_unit");
-        final int unknown6 = buf.getShort(); // pace?
-
-        final int averageHR = buf.get() & 0xff;
-        final int maxHR = buf.get() & 0xff;
-        final int minHR = buf.get() & 0xff;
-
-        addSummaryData(summaryData, "averageHR", averageHR, "bpm");
-        addSummaryData(summaryData, "maxHR", maxHR, "bpm");
-        addSummaryData(summaryData, "minHR", minHR, "bpm");
-
-        summary.setSummaryData(summaryData.toString());
+        return builder.build();
     }
 
-    private void parseOutdoorCycling(final BaseActivitySummary summary, final XiaomiActivityFileId fileId, final ByteBuffer buf) {
-        final JSONObject summaryData = new JSONObject();
-
+    @Nullable
+    private XiaomiSimpleActivityParser getOutdoorCyclingParser(final XiaomiActivityFileId fileId) {
         final int version = fileId.getVersion();
         final int headerSize;
         switch (version) {
@@ -325,77 +262,25 @@ public class WorkoutSummaryParser extends XiaomiActivityParser implements Activi
                 break;
             default:
                 LOG.warn("Unable to parse workout summary version {}", fileId.getVersion());
-                return;
+                return null;
         }
 
-        final byte[] header = new byte[headerSize];
-        buf.get(header);
+        final XiaomiSimpleActivityParser.Builder builder = new XiaomiSimpleActivityParser.Builder();
+        builder.setHeaderSize(headerSize);
+        builder.addShort("xiaomiWorkoutType", "xiaomiWorkoutType");
+        builder.addInt("startTime", "seconds");
+        builder.addInt("endTime", "seconds");
+        builder.addInt("activeSeconds", "seconds");
+        builder.addUnknown(4);
+        builder.addInt("distanceMeters", "meters");
+        builder.addUnknown(2);
+        builder.addShort("caloriesBurnt", "calories_unit");
+        builder.addUnknown(8);
+        builder.addFloat("maxSpeed", "km_h");
+        builder.addByte("averageHR", "bpm");
+        builder.addByte("maxHR", "bpm");
+        builder.addByte("minHR", "bpm");
 
-        final short workoutType = buf.getShort();
-
-        switch (workoutType) {
-            case 6:
-                summary.setActivityKind(ActivityKind.TYPE_CYCLING);
-                break;
-            default:
-                summary.setActivityKind(ActivityKind.TYPE_UNKNOWN);
-        }
-
-        final int startTime = buf.getInt();
-        final int endTime = buf.getInt();
-
-        // We don't set the start time, since we need it to match the fileId for the WorkoutGpsParser
-        // to find it. They also seem to match.
-        //summary.setStartTime(new Date(startTime * 1000L));
-        summary.setEndTime(new Date(endTime * 1000L));
-
-        final int duration = buf.getInt();
-        addSummaryData(summaryData, "activeSeconds", duration, "seconds");
-
-        final int unknown1 = buf.getInt();
-        final int distance = buf.getInt();
-        addSummaryData(summaryData, "distanceMeters", distance, "meters");
-
-        final int unknown2 = buf.getShort();
-
-        final int calories = buf.getShort();
-        addSummaryData(summaryData, "caloriesBurnt", calories, "calories_unit");
-
-        final int unknown3 = buf.getInt();
-        final int unknown4 = buf.getInt();
-        final float maxSpeed = buf.getFloat();
-
-        final float avgHr = buf.get() & 0xff;
-        final float maxHr = buf.get() & 0xff;
-        final float minHr = buf.get() & 0xff;
-        addSummaryData(summaryData, "averageHR", avgHr, "bpm");
-        addSummaryData(summaryData, "maxHR", maxHr, "bpm");
-        addSummaryData(summaryData, "minHR", minHr, "bpm");
-
-        summary.setSummaryData(summaryData.toString());
-    }
-
-    protected void addSummaryData(final JSONObject summaryData, final String key, final float value, final String unit) {
-        if (value > 0) {
-            try {
-                final JSONObject innerData = new JSONObject();
-                innerData.put("value", value);
-                innerData.put("unit", unit);
-                summaryData.put(key, innerData);
-            } catch (final JSONException ignore) {
-            }
-        }
-    }
-
-    protected void addSummaryData(final JSONObject summaryData, final String key, final String value) {
-        if (key != null && !key.equals("") && value != null && !value.equals("")) {
-            try {
-                final JSONObject innerData = new JSONObject();
-                innerData.put("value", value);
-                innerData.put("unit", "string");
-                summaryData.put(key, innerData);
-            } catch (final JSONException ignore) {
-            }
-        }
+        return builder.build();
     }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/XiaomiSimpleActivityParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/XiaomiSimpleActivityParser.java
new file mode 100644
index 000000000..203171ede
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/XiaomiSimpleActivityParser.java
@@ -0,0 +1,144 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.entities.BaseActivitySummary;
+import nodomain.freeyourgadget.gadgetbridge.model.ActivityKind;
+
+public class XiaomiSimpleActivityParser {
+    private final int headerSize;
+    private final List<XiaomiSimpleDataEntry> dataEntries;
+
+    public XiaomiSimpleActivityParser(final int headerSize, final List<XiaomiSimpleDataEntry> dataEntries) {
+        this.headerSize = headerSize;
+        this.dataEntries = dataEntries;
+    }
+
+    public void parse(final BaseActivitySummary summary, final ByteBuffer buf) {
+        final JSONObject summaryData = new JSONObject();
+
+        final byte[] header = new byte[headerSize];
+        buf.get(header);
+
+        for (final XiaomiSimpleDataEntry dataEntry : dataEntries) {
+            final Number value = dataEntry.get(buf);
+            if (value == null) {
+                continue;
+            }
+
+            if (dataEntry.getKey().equals("endTime")) {
+                if (dataEntry.getUnit().equals("seconds")) {
+                    summary.setEndTime(new Date(value.intValue() * 1000L));
+                } else {
+                    throw new IllegalArgumentException("endTime should be in seconds");
+                }
+            } if (dataEntry.getKey().equals("xiaomiWorkoutType")) {
+                // TODO use XiaomiWorkoutType
+                switch (value.intValue()) {
+                    case 2:
+                        summary.setActivityKind(ActivityKind.TYPE_WALKING);
+                        break;
+                    case 6:
+                        summary.setActivityKind(ActivityKind.TYPE_CYCLING);
+                        break;
+                    default:
+                        summary.setActivityKind(ActivityKind.TYPE_UNKNOWN);
+                }
+            } else {
+                addSummaryData(summaryData, dataEntry.getKey(), value.floatValue(), dataEntry.getUnit());
+            }
+        }
+
+        summary.setSummaryData(summaryData.toString());
+    }
+
+    protected void addSummaryData(final JSONObject summaryData, final String key, final float value, final String unit) {
+        if (value > 0) {
+            try {
+                final JSONObject innerData = new JSONObject();
+                innerData.put("value", value);
+                innerData.put("unit", unit);
+                summaryData.put(key, innerData);
+            } catch (final JSONException ignore) {
+            }
+        }
+    }
+
+    protected void addSummaryData(final JSONObject summaryData, final String key, final String value) {
+        if (key != null && !key.equals("") && value != null && !value.equals("")) {
+            try {
+                final JSONObject innerData = new JSONObject();
+                innerData.put("value", value);
+                innerData.put("unit", "string");
+                summaryData.put(key, innerData);
+            } catch (final JSONException ignore) {
+            }
+        }
+    }
+
+    public static class Builder {
+        private int headerSize;
+        private List<XiaomiSimpleDataEntry> dataEntries = new ArrayList<>();
+
+        public Builder setHeaderSize(final int headerSize) {
+            this.headerSize = headerSize;
+            return this;
+        }
+
+        public Builder addByte(final String key, final String unit) {
+            dataEntries.add(new XiaomiSimpleDataEntry(key, unit, buf -> buf.get() & 0xff));
+            return this;
+        }
+
+        public Builder addShort(final String key, final String unit) {
+            dataEntries.add(new XiaomiSimpleDataEntry(key, unit, ByteBuffer::getShort));
+            return this;
+        }
+
+        public Builder addInt(final String key, final String unit) {
+            dataEntries.add(new XiaomiSimpleDataEntry(key, unit, ByteBuffer::getInt));
+            return this;
+        }
+
+        public Builder addFloat(final String key, final String unit) {
+            dataEntries.add(new XiaomiSimpleDataEntry(key, unit, ByteBuffer::getFloat));
+            return this;
+        }
+
+        public Builder addUnknown(final int sizeBytes) {
+            dataEntries.add(new XiaomiSimpleDataEntry(null, null, buf -> {
+                for (int i = 0; i < sizeBytes; i++) {
+                    buf.get();
+                }
+                return null;
+            }));
+            return this;
+        }
+
+        public XiaomiSimpleActivityParser build() {
+            return new XiaomiSimpleActivityParser(headerSize, dataEntries);
+        }
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/XiaomiSimpleDataEntry.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/XiaomiSimpleDataEntry.java
new file mode 100644
index 000000000..3ec131cdf
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/XiaomiSimpleDataEntry.java
@@ -0,0 +1,47 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl;
+
+import java.nio.ByteBuffer;
+
+public class XiaomiSimpleDataEntry {
+    private final String key;
+    private final String unit;
+    private final Getter getter;
+
+    public XiaomiSimpleDataEntry(final String key, final String unit, final Getter getter) {
+        this.key = key;
+        this.unit = unit;
+        this.getter = getter;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public Number get(final ByteBuffer buf) {
+        return getter.get(buf);
+    }
+
+    public interface Getter {
+        Number get(ByteBuffer buf);
+    }
+}

From dd1843505e1dff6ea4e177ec05378d0b132da43f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 5 Jan 2024 21:07:22 +0000
Subject: [PATCH 299/595] Xiaomi: Fix extreme hr zone parsing

---
 .../devices/xiaomi/activity/impl/WorkoutSummaryParser.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java
index fbd93b712..8f7ecab43 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java
@@ -242,7 +242,7 @@ public class WorkoutSummaryParser extends XiaomiActivityParser implements Activi
         builder.addUnknown(9);
         builder.addByte("recoveryTime", "seconds");
         builder.addUnknown(2);
-        builder.addInt("vo2max", "ml/kg/min");
+        builder.addInt("hrZoneExtreme", "seconds");
         builder.addInt("hrZoneAnaerobic", "seconds");
         builder.addInt("hrZoneAerobic", "seconds");
         builder.addInt("hrZoneFatBurn", "seconds");

From a61f7d70d546265d4a017c14a886fe8e54d9895b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 5 Jan 2024 21:25:17 +0000
Subject: [PATCH 300/595] Xiaomi: Parse indoor cycling

---
 .../activity/impl/WorkoutSummaryParser.java   | 39 ++++++++++++++++++-
 1 file changed, 37 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java
index 8f7ecab43..78dcc22fc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java
@@ -155,12 +155,47 @@ public class WorkoutSummaryParser extends XiaomiActivityParser implements Activi
         builder.addInt("startTime", "seconds");
         builder.addInt("endTime", "seconds");
         builder.addInt("activeSeconds", "seconds");
-        builder.addInt("distanceMeters", "meters");
+        builder.addUnknown(4);
         builder.addShort("caloriesBurnt", "calories_unit");
         builder.addUnknown(4);
         builder.addByte("averageHR", "bpm");
         builder.addByte("maxHR", "bpm");
         builder.addByte("minHR", "bpm");
+        builder.addFloat("aerobicTrainingEffect", "");
+        builder.addUnknown(2);
+        builder.addShort("recoveryTime", "hours");
+        builder.addInt("hrZoneExtreme", "seconds");
+        builder.addInt("hrZoneAnaerobic", "seconds");
+        builder.addInt("hrZoneAerobic", "seconds");
+        builder.addInt("hrZoneFatBurn", "seconds");
+        builder.addInt("hrZoneWarmUp", "seconds");
+        builder.addUnknown(6);
+        builder.addFloat("anaerobicTrainingEffect", "");
+        builder.addUnknown(3);
+        builder.addInt("configuredTimeGoal", "seconds");
+        builder.addShort("configuredCaloriesGoal", "calories_unit");
+        builder.addShort("maximumCaloriesGoal", "calories_unit");  // TODO: mhm?
+        builder.addUnknown(28);
+        builder.addShort("trainingLoad", "");
+        builder.addUnknown(24);
+        builder.addByte("configuredSets", "");
+        builder.addUnknown(13);
+        builder.addInt("startTime2", "seconds");
+        builder.addInt("endTime2", "seconds");
+        builder.addInt("goal", ""); // TODO match against goalType
+        builder.addInt("duration2", "seconds");
+        builder.addInt("intervalTime", "seconds");
+        builder.addUnknown(56);
+        builder.addInt("hrZoneExtreme2", "seconds");
+        builder.addInt("hrZoneAnaerobic2", "seconds");
+        builder.addInt("hrZoneAerobic2", "seconds");
+        builder.addInt("hrZoneFatBurn2", "seconds");
+        builder.addInt("hrZoneWarmUp2", "seconds");
+        builder.addUnknown(16);
+        builder.addShort("vitality_gain", "");
+        builder.addShort("training_load2", "");
+        builder.addShort("recovery_time2", "hours");
+
 
         return builder.build();
     }
@@ -198,7 +233,7 @@ public class WorkoutSummaryParser extends XiaomiActivityParser implements Activi
         builder.addUnknown(9);
         builder.addByte("recoveryTime", "seconds");
         builder.addUnknown(2);
-        builder.addInt("vo2max", "seconds");
+        builder.addInt("hrZoneExtreme", "seconds");
         builder.addInt("hrZoneAnaerobic", "seconds");
         builder.addInt("hrZoneAerobic", "seconds");
         builder.addInt("hrZoneFatBurn", "seconds");

From 4e54f8137dd7cc512376e6ad035804dbcca14713 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 5 Jan 2024 21:29:12 +0000
Subject: [PATCH 301/595] Xiaomi: Improve walking v2 parsing

---
 .../xiaomi/activity/impl/WorkoutSummaryParser.java | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java
index 78dcc22fc..9618a0745 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java
@@ -275,14 +275,24 @@ public class WorkoutSummaryParser extends XiaomiActivityParser implements Activi
         builder.addUnknown(20);
         builder.addFloat("recoveryValue", "?");
         builder.addUnknown(9);
-        builder.addByte("recoveryTime", "seconds");
+        builder.addByte("recoveryTime", "hours");
         builder.addUnknown(2);
         builder.addInt("hrZoneExtreme", "seconds");
         builder.addInt("hrZoneAnaerobic", "seconds");
         builder.addInt("hrZoneAerobic", "seconds");
         builder.addInt("hrZoneFatBurn", "seconds");
         builder.addInt("hrZoneWarmUp", "seconds");
-        builder.addInt("configured_time_goal", "seconds");
+        builder.addInt("configuredTimeGoal", "seconds");
+        builder.addShort("configuredCaloriesGoal", "calories_unit");
+        builder.addInt("configuredDistanceGoal", "meters");
+        builder.addUnknown(11);
+        builder.addShort("trainingLoad", "");
+        builder.addUnknown(24);
+        builder.addByte("averageHR2", "bpm");
+        builder.addByte("maxHR2", "bpm");
+        builder.addByte("minHR2", "bpm");
+        builder.addUnknown(2);
+        builder.addByte("averageCadence", "spm");
 
         return builder.build();
     }

From ab894ae4335aedbad7ca4c384461fc265a02a0ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sat, 6 Jan 2024 13:54:06 +0000
Subject: [PATCH 302/595] Extract hardcoded activity summary entries to
 constants

---
 .../activities/ActivitySummaryDetail.java     |  13 +-
 .../huami/Huami2021ActivitySummaryParser.java |  83 +++----
 .../huami/HuamiActivitySummaryParser.java     |  90 ++++----
 .../model/ActivitySummaryEntries.java         | 109 +++++++++
 .../model/ActivitySummaryJsonSummary.java     |  32 +--
 .../activity/impl/WorkoutSummaryParser.java   | 217 ++++++++++--------
 .../impl/XiaomiSimpleActivityParser.java      |  37 ++-
 7 files changed, 381 insertions(+), 200 deletions(-)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySummaryEntries.java

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummaryDetail.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummaryDetail.java
index c066cdd33..eb3e2c95d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummaryDetail.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummaryDetail.java
@@ -17,6 +17,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
+import static nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries.*;
+
 import android.annotation.SuppressLint;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
@@ -86,7 +88,6 @@ import nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryJsonSummary;
 import nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryParser;
 import nodomain.freeyourgadget.gadgetbridge.util.AndroidUtils;
 import nodomain.freeyourgadget.gadgetbridge.util.DateTimeUtils;
-import nodomain.freeyourgadget.gadgetbridge.util.DeviceHelper;
 import nodomain.freeyourgadget.gadgetbridge.util.FileUtils;
 import nodomain.freeyourgadget.gadgetbridge.util.GB;
 import nodomain.freeyourgadget.gadgetbridge.util.SwipeEvents;
@@ -464,13 +465,13 @@ public class ActivitySummaryDetail extends AbstractGBActivity {
                         if (!show_raw_data) {
                             //special casing here + imperial units handling
                             switch (unit) {
-                                case "cm":
+                                case UNIT_CM:
                                     if (units.equals(UNIT_IMPERIAL)) {
                                         value = value * 0.0328084;
                                         unit = "ft";
                                     }
                                     break;
-                                case "meters_second":
+                                case UNIT_METERS_PER_SECOND:
                                     if (units.equals(UNIT_IMPERIAL)) {
                                         value = value * 2.236936D;
                                         unit = "mi_h";
@@ -479,7 +480,7 @@ public class ActivitySummaryDetail extends AbstractGBActivity {
                                         unit = "km_h";
                                     }
                                     break;
-                                case "seconds_m":
+                                case UNIT_SECONDS_PER_M:
                                     if (units.equals(UNIT_IMPERIAL)) {
                                         value = value * (1609.344 / 60D);
                                         unit = "minutes_mi";
@@ -488,7 +489,7 @@ public class ActivitySummaryDetail extends AbstractGBActivity {
                                         unit = "minutes_km";
                                     }
                                     break;
-                                case "seconds_km":
+                                case UNIT_SECONDS_PER_KM:
                                     if (units.equals(UNIT_IMPERIAL)) {
                                         value = value / 60D * 1.609344;
                                         unit = "minutes_mi";
@@ -497,7 +498,7 @@ public class ActivitySummaryDetail extends AbstractGBActivity {
                                         unit = "minutes_km";
                                     }
                                     break;
-                                case "meters":
+                                case UNIT_METERS:
                                     if (units.equals(UNIT_IMPERIAL)) {
                                         value = value * 3.28084D;
                                         unit = "ft";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021ActivitySummaryParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021ActivitySummaryParser.java
index 9dde63c0d..f0bd87c9b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021ActivitySummaryParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021ActivitySummaryParser.java
@@ -16,6 +16,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami;
 
+import static nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries.*;
+
 import com.google.protobuf.InvalidProtocolBufferException;
 
 import org.apache.commons.lang3.ArrayUtils;
@@ -73,7 +75,7 @@ public class Huami2021ActivitySummaryParser extends HuamiActivitySummaryParser {
         if (summaryProto.hasTime()) {
             int totalDuration = summaryProto.getTime().getTotalDuration();
             summary.setEndTime(new Date(startTime.getTime() + totalDuration * 1000L));
-            addSummaryData("activeSeconds", summaryProto.getTime().getWorkoutDuration(), "seconds");
+            addSummaryData(ACTIVE_SECONDS, summaryProto.getTime().getWorkoutDuration(), UNIT_SECONDS);
             // TODO pause durations
         }
 
@@ -82,93 +84,94 @@ public class Huami2021ActivitySummaryParser extends HuamiActivitySummaryParser {
             summary.setBaseLatitude(summaryProto.getLocation().getBaseLatitude());
             summary.setBaseAltitude(summaryProto.getLocation().getBaseAltitude() / 2);
             // TODO: Min/Max Latitude/Longitude
-            addSummaryData("baseAltitude", summaryProto.getLocation().getBaseAltitude() / 2, "meters");
+            addSummaryData(ALTITUDE_BASE, summaryProto.getLocation().getBaseAltitude() / 2, UNIT_METERS);
         }
 
         if (summaryProto.hasHeartRate()) {
-            addSummaryData("averageHR", summaryProto.getHeartRate().getAvg(), "bpm");
-            addSummaryData("maxHR", summaryProto.getHeartRate().getMax(), "bpm");
-            addSummaryData("minHR", summaryProto.getHeartRate().getMin(), "bpm");
+            addSummaryData(HR_AVG, summaryProto.getHeartRate().getAvg(), UNIT_BPM);
+            addSummaryData(HR_MAX, summaryProto.getHeartRate().getMax(), UNIT_BPM);
+            addSummaryData(HR_MIN, summaryProto.getHeartRate().getMin(), UNIT_BPM);
         }
 
         if (summaryProto.hasSteps()) {
-            addSummaryData("maxCadence", summaryProto.getSteps().getMaxCadence() * 60, "spm");
-            addSummaryData("averageCadence", summaryProto.getSteps().getAvgCadence() * 60, "spm");
-            addSummaryData("averageStride", summaryProto.getSteps().getAvgStride(), "cm");
-            addSummaryData("steps", summaryProto.getSteps().getSteps(), "steps_unit");
+            addSummaryData(CADENCE_MAX, summaryProto.getSteps().getMaxCadence() * 60, UNIT_SPM);
+            addSummaryData(CADENCE_AVG, summaryProto.getSteps().getAvgCadence() * 60, UNIT_SPM);
+            addSummaryData(STRIDE_AVG, summaryProto.getSteps().getAvgStride(), UNIT_CM);
+            addSummaryData(STEPS, summaryProto.getSteps().getSteps(), UNIT_STEPS);
         }
 
         if (summaryProto.hasDistance()) {
-            addSummaryData("distanceMeters", summaryProto.getDistance().getDistance(), "meters");
+            addSummaryData(DISTANCE_METERS, summaryProto.getDistance().getDistance(), UNIT_METERS);
         }
 
         if (summaryProto.hasPace()) {
-            addSummaryData("maxPace", summaryProto.getPace().getBest(), "seconds_m");
-            addSummaryData("averageKMPaceSeconds", summaryProto.getPace().getAvg() * 1000, "seconds_km");
+            addSummaryData(PACE_MAX, summaryProto.getPace().getBest(), UNIT_SECONDS_PER_M);
+            addSummaryData(PACE_AVG_SECONDS_KM, summaryProto.getPace().getAvg() * 1000, UNIT_SECONDS_PER_KM);
         }
 
         if (summaryProto.hasCalories()) {
-            addSummaryData("caloriesBurnt", summaryProto.getCalories().getCalories(), "calories_unit");
+            addSummaryData(CALORIES_BURNT, summaryProto.getCalories().getCalories(), UNIT_KCAL);
         }
 
         if (summaryProto.hasHeartRateZones()) {
             // TODO hr zones bpm?
             if (summaryProto.getHeartRateZones().getZoneTimeCount() == 6) {
-                addSummaryData("hrZoneNa", summaryProto.getHeartRateZones().getZoneTime(0), "seconds");
-                addSummaryData("hrZoneWarmUp", summaryProto.getHeartRateZones().getZoneTime(1), "seconds");
-                addSummaryData("hrZoneFatBurn", summaryProto.getHeartRateZones().getZoneTime(2), "seconds");
-                addSummaryData("hrZoneAerobic", summaryProto.getHeartRateZones().getZoneTime(3), "seconds");
-                addSummaryData("hrZoneAnaerobic", summaryProto.getHeartRateZones().getZoneTime(4), "seconds");
-                addSummaryData("hrZoneExtreme", summaryProto.getHeartRateZones().getZoneTime(5), "seconds");
+                addSummaryData(HR_ZONE_NA, summaryProto.getHeartRateZones().getZoneTime(0), UNIT_SECONDS);
+                addSummaryData(HR_ZONE_WARM_UP, summaryProto.getHeartRateZones().getZoneTime(1), UNIT_SECONDS);
+                addSummaryData(HR_ZONE_FAT_BURN, summaryProto.getHeartRateZones().getZoneTime(2), UNIT_SECONDS);
+                addSummaryData(HR_ZONE_AEROBIC, summaryProto.getHeartRateZones().getZoneTime(3), UNIT_SECONDS);
+                addSummaryData(HR_ZONE_ANAEROBIC, summaryProto.getHeartRateZones().getZoneTime(4), UNIT_SECONDS);
+                addSummaryData(HR_ZONE_EXTREME, summaryProto.getHeartRateZones().getZoneTime(5), UNIT_SECONDS);
             } else {
                 LOG.warn("Unexpected number of HR zones {}", summaryProto.getHeartRateZones().getZoneTimeCount());
             }
         }
 
         if (summaryProto.hasTrainingEffect()) {
-            addSummaryData("aerobicTrainingEffect", summaryProto.getTrainingEffect().getAerobicTrainingEffect(), "");
-            addSummaryData("anaerobicTrainingEffect", summaryProto.getTrainingEffect().getAnaerobicTrainingEffect(), "");
-            addSummaryData("currentWorkoutLoad", summaryProto.getTrainingEffect().getCurrentWorkoutLoad(), "");
-            addSummaryData("maximumOxygenUptake", summaryProto.getTrainingEffect().getMaximumOxygenUptake(), "ml/kg/min");
+            addSummaryData(TRAINING_EFFECT_AEROBIC, summaryProto.getTrainingEffect().getAerobicTrainingEffect(), UNIT_NONE);
+            addSummaryData(TRAINING_EFFECT_ANAEROBIC, summaryProto.getTrainingEffect().getAnaerobicTrainingEffect(), UNIT_NONE);
+            addSummaryData(WORKOUT_LOAD, summaryProto.getTrainingEffect().getCurrentWorkoutLoad(), UNIT_NONE);
+            addSummaryData(MAXIMUM_OXYGEN_UPTAKE, summaryProto.getTrainingEffect().getMaximumOxygenUptake(), UNIT_ML_KG_MIN);
         }
 
         if (summaryProto.hasAltitude()) {
-            addSummaryData("maxAltitude", summaryProto.getAltitude().getMaxAltitude() / 200, "meters");
-            addSummaryData("minAltitude", summaryProto.getAltitude().getMinAltitude() / 200, "meters");
-            addSummaryData("averageAltitude", summaryProto.getAltitude().getAvgAltitude() / 200, "meters");
+            addSummaryData(ALTITUDE_MAX, summaryProto.getAltitude().getMaxAltitude() / 200, UNIT_METERS);
+            addSummaryData(ALTITUDE_MIN, summaryProto.getAltitude().getMinAltitude() / 200, UNIT_METERS);
+            addSummaryData(ALTITUDE_AVG, summaryProto.getAltitude().getAvgAltitude() / 200, UNIT_METERS);
             // TODO totalClimbing
-            addSummaryData("elevationGain", summaryProto.getAltitude().getElevationGain() / 100, "meters");
-            addSummaryData("elevationLoss", summaryProto.getAltitude().getElevationLoss() / 100, "meters");
+            addSummaryData(ELEVATION_GAIN, summaryProto.getAltitude().getElevationGain() / 100, UNIT_METERS);
+            addSummaryData(ELEVATION_LOSS, summaryProto.getAltitude().getElevationLoss() / 100, UNIT_METERS);
         }
 
         if (summaryProto.hasElevation()) {
-            addSummaryData("ascentSeconds", summaryProto.getElevation().getUphillTime(), "seconds");
-            addSummaryData("descentSeconds", summaryProto.getElevation().getDownhillTime(), "seconds");
+            addSummaryData(ASCENT_SECONDS, summaryProto.getElevation().getUphillTime(), UNIT_SECONDS);
+            addSummaryData(DESCENT_SECONDS, summaryProto.getElevation().getDownhillTime(), UNIT_SECONDS);
         }
 
         if (summaryProto.hasSwimmingData()) {
-            addSummaryData("laps", summaryProto.getSwimmingData().getLaps(), "laps_unit");
+            addSummaryData(LAPS, summaryProto.getSwimmingData().getLaps(), UNIT_LAPS);
             switch (summaryProto.getSwimmingData().getLaneLengthUnit()) {
                 case 0:
-                    addSummaryData("laneLength", summaryProto.getSwimmingData().getLaneLength(), "meters");
+                    addSummaryData(LANE_LENGTH, summaryProto.getSwimmingData().getLaneLength(), UNIT_METERS);
                     break;
                 case 1:
-                    addSummaryData("laneLength", summaryProto.getSwimmingData().getLaneLength(), "yard");
+                    addSummaryData(LANE_LENGTH, summaryProto.getSwimmingData().getLaneLength(), UNIT_YARD);
                     break;
             }
             switch (summaryProto.getSwimmingData().getStyle()) {
+                // TODO i18n these
                 case 1:
-                    addSummaryData("swimStyle", "breaststroke");
+                    addSummaryData(SWIM_STYLE, "breaststroke");
                     break;
                 case 2:
-                    addSummaryData("swimStyle", "freestyle");
+                    addSummaryData(SWIM_STYLE, "freestyle");
                     break;
             }
-            addSummaryData("strokes", summaryProto.getSwimmingData().getStrokes(), "strokes_unit");
-            addSummaryData("avgStrokeRate", summaryProto.getSwimmingData().getAvgStrokeRate(), "strokes_minute");
-            addSummaryData("maxStrokeRate", summaryProto.getSwimmingData().getMaxStrokeRate(), "strokes_minute");
-            addSummaryData("averageStrokeDistance", summaryProto.getSwimmingData().getAvgDps(), "cm");
-            addSummaryData("swolfIndex", summaryProto.getSwimmingData().getSwolf(), "");
+            addSummaryData(STROKES, summaryProto.getSwimmingData().getStrokes(), UNIT_STROKES);
+            addSummaryData(STROKE_RATE_AVG, summaryProto.getSwimmingData().getAvgStrokeRate(), UNIT_STROKES_PER_MINUTE);
+            addSummaryData(STROKE_RATE_MAX, summaryProto.getSwimmingData().getMaxStrokeRate(), UNIT_STROKES_PER_MINUTE);
+            addSummaryData(STROKE_DISTANCE_AVG, summaryProto.getSwimmingData().getAvgDps(), UNIT_CM);
+            addSummaryData(SWOLF_INDEX, summaryProto.getSwimmingData().getSwolf(), UNIT_NONE);
         }
     }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiActivitySummaryParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiActivitySummaryParser.java
index b6761edd9..fa354e72b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiActivitySummaryParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiActivitySummaryParser.java
@@ -17,6 +17,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami;
 
+import static nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries.*;
+
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.slf4j.Logger;
@@ -273,9 +275,9 @@ public class HuamiActivitySummaryParser implements ActivitySummaryParser {
                 buffer.getInt(); // unknown probably flatDistance = buffer.getFloat();
                 flatSeconds = buffer.getInt() / 1000; // ms?
 
-                addSummaryData("ascentSeconds", ascentSeconds, "seconds");
-                addSummaryData("descentSeconds", descentSeconds, "seconds");
-                addSummaryData("flatSeconds", flatSeconds, "seconds");
+                addSummaryData(ASCENT_SECONDS, ascentSeconds, UNIT_SECONDS);
+                addSummaryData(DESCENT_SECONDS, descentSeconds, UNIT_SECONDS);
+                addSummaryData(FLAT_SECONDS, flatSeconds, UNIT_SECONDS);
             }
 
             averageHR = buffer.getShort();
@@ -308,62 +310,62 @@ public class HuamiActivitySummaryParser implements ActivitySummaryParser {
 //        summary.setAveragePace(BLETypeConversions.toUnsigned(averagePace);
 //        summary.setAverageStride(BLETypeConversions.toUnsigned(averageStride);
 
-        addSummaryData("ascentSeconds", ascentSeconds, "seconds");
-        addSummaryData("descentSeconds", descentSeconds, "seconds");
-        addSummaryData("flatSeconds", flatSeconds, "seconds");
-        addSummaryData("ascentDistance", ascentDistance, "meters");
-        addSummaryData("descentDistance", descentDistance, "meters");
-        addSummaryData("flatDistance", flatDistance, "meters");
+        addSummaryData(ASCENT_SECONDS, ascentSeconds, UNIT_SECONDS);
+        addSummaryData(DESCENT_SECONDS, descentSeconds, UNIT_SECONDS);
+        addSummaryData(FLAT_SECONDS, flatSeconds, UNIT_SECONDS);
+        addSummaryData(ASCENT_DISTANCE, ascentDistance, UNIT_METERS);
+        addSummaryData(DESCENT_DISTANCE, descentDistance, UNIT_METERS);
+        addSummaryData(FLAT_DISTANCE, flatDistance, UNIT_METERS);
 
-        addSummaryData("distanceMeters", distanceMeters, "meters");
-        // addSummaryData("distanceMeters2", distanceMeters2, "meters");
-        addSummaryData("ascentMeters", ascentMeters, "meters");
-        addSummaryData("descentMeters", descentMeters, "meters");
+        addSummaryData(DISTANCE_METERS, distanceMeters, UNIT_METERS);
+        // addSummaryData("distanceMeters2", distanceMeters2, UNIT_METERS);
+        addSummaryData(ASCENT_METERS, ascentMeters, UNIT_METERS);
+        addSummaryData(DESCENT_METERS, descentMeters, UNIT_METERS);
         if (maxAltitude != -100000) {
-            addSummaryData("maxAltitude", maxAltitude, "meters");
+            addSummaryData(ALTITUDE_MAX, maxAltitude, UNIT_METERS);
         }
         if (minAltitude != 100000) {
-            addSummaryData("minAltitude", minAltitude, "meters");
+            addSummaryData(ALTITUDE_MIN, minAltitude, UNIT_METERS);
         }
         if (minAltitude != 100000) {
-            addSummaryData("averageAltitude", averageAltitude, "meters");
+            addSummaryData(ALTITUDE_AVG, averageAltitude, UNIT_METERS);
         }
-        addSummaryData("steps", steps, "steps_unit");
-        addSummaryData("activeSeconds", activeSeconds, "seconds");
-        addSummaryData("caloriesBurnt", caloriesBurnt, "calories_unit");
-        addSummaryData("maxSpeed", maxSpeed, "meters_second");
-        addSummaryData("minSpeed", minSpeed, "meters_second");
-        addSummaryData("averageSpeed", averageSpeed, "meters_second");
-        addSummaryData("maxCadence", maxCadence, "spm");
-        addSummaryData("minCadence", minCadence, "spm");
-        addSummaryData("averageCadence", averageCadence, "spm");
+        addSummaryData(STEPS, steps, UNIT_STEPS);
+        addSummaryData(ACTIVE_SECONDS, activeSeconds, UNIT_SECONDS);
+        addSummaryData(CALORIES_BURNT, caloriesBurnt, UNIT_KCAL);
+        addSummaryData(SPEED_MAX, maxSpeed, UNIT_METERS_PER_SECOND);
+        addSummaryData(SPEED_MIN, minSpeed, UNIT_METERS_PER_SECOND);
+        addSummaryData(SPEED_AVG, averageSpeed, UNIT_METERS_PER_SECOND);
+        addSummaryData(CADENCE_MAX, maxCadence, UNIT_SPM);
+        addSummaryData(CADENCE_MIN, minCadence, UNIT_SPM);
+        addSummaryData(CADENCE_AVG, averageCadence, UNIT_SPM);
 
         if (!(activityKind == ActivityKind.TYPE_ELLIPTICAL_TRAINER ||
                 activityKind == ActivityKind.TYPE_JUMP_ROPING ||
                 activityKind == ActivityKind.TYPE_EXERCISE ||
                 activityKind == ActivityKind.TYPE_YOGA ||
                 activityKind == ActivityKind.TYPE_INDOOR_CYCLING)) {
-            addSummaryData("minPace", minPace, "seconds_m");
-            addSummaryData("maxPace", maxPace, "seconds_m");
-            // addSummaryData("averagePace", averagePace, "seconds_m");
+            addSummaryData(PACE_MIN, minPace, UNIT_SECONDS_PER_M);
+            addSummaryData(PACE_MAX, maxPace, UNIT_SECONDS_PER_M);
+            // addSummaryData("averagePace", averagePace, UNIT_SECONDS_PER_M);
         }
 
-        addSummaryData("totalStride", totalStride, "meters");
-        addSummaryData("averageHR", averageHR, "bpm");
-        addSummaryData("maxHR", maxHR, "bpm");
-        addSummaryData("minHR", minHR, "bpm");
-        addSummaryData("averageKMPaceSeconds", averageKMPaceSeconds, "seconds_km");
-        addSummaryData("averageStride", averageStride, "cm");
-        addSummaryData("maxStride", maxStride, "cm");
-        addSummaryData("minStride", minStride, "cm");
-        // addSummaryData("averageStride2", averageStride2, "cm");
+        addSummaryData(STRIDE_TOTAL, totalStride, UNIT_METERS);
+        addSummaryData(HR_AVG, averageHR, UNIT_BPM);
+        addSummaryData(HR_MAX, maxHR, UNIT_BPM);
+        addSummaryData(HR_MIN, minHR, UNIT_BPM);
+        addSummaryData(PACE_AVG_SECONDS_KM, averageKMPaceSeconds, UNIT_SECONDS_PER_KM);
+        addSummaryData(STRIDE_AVG, averageStride, UNIT_CM);
+        addSummaryData(STRIDE_MAX, maxStride, UNIT_CM);
+        addSummaryData(STRIDE_MIN, minStride, UNIT_CM);
+        // addSummaryData("averageStride2", averageStride2, UNIT_CM);
 
         if (activityKind == ActivityKind.TYPE_SWIMMING || activityKind == ActivityKind.TYPE_SWIMMING_OPENWATER) {
-            addSummaryData("averageStrokeDistance", averageStrokeDistance, "meters");
-            addSummaryData("averageStrokesPerSecond", averageStrokesPerSecond, "strokes_second");
-            addSummaryData("averageLapPace", averageLapPace, "second");
-            addSummaryData("strokes", strokes, "strokes");
-            addSummaryData("swolfIndex", swolfIndex, "swolf_index");
+            addSummaryData(STROKE_DISTANCE_AVG, averageStrokeDistance, UNIT_METERS);
+            addSummaryData(STROKE_AVG_PER_SECOND, averageStrokesPerSecond, UNIT_STROKES_PER_SECOND);
+            addSummaryData(LAP_PACE_AVERAGE, averageLapPace, "second");
+            addSummaryData(STROKES, strokes, "strokes");
+            addSummaryData(SWOLF_INDEX, swolfIndex, "swolf_index");
             String swimStyleName = "unknown"; // TODO: translate here or keep as string identifier here?
             switch (swimStyle) {
                 case 1:
@@ -379,8 +381,8 @@ public class HuamiActivitySummaryParser implements ActivitySummaryParser {
                     swimStyleName = "medley";
                     break;
             }
-            addSummaryData("swimStyle", swimStyleName);
-            addSummaryData("laps", laps, "laps");
+            addSummaryData(SWIM_STYLE, swimStyleName);
+            addSummaryData(LAPS, laps, "laps");
         }
     }
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySummaryEntries.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySummaryEntries.java
new file mode 100644
index 000000000..525c94d4d
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySummaryEntries.java
@@ -0,0 +1,109 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.model;
+
+public class ActivitySummaryEntries {
+    public static final String TIME_START = "startTime";
+    public static final String TIME_END = "endTime";
+    public static final String ACTIVE_SECONDS = "activeSeconds";
+
+    public static final String ALTITUDE_AVG = "averageAltitude";
+    public static final String ALTITUDE_BASE = "baseAltitude";
+    public static final String ALTITUDE_MAX = "maxAltitude";
+    public static final String ALTITUDE_MIN = "minAltitude";
+
+    public static final String ASCENT_DISTANCE = "ascentDistance";
+    public static final String ASCENT_METERS = "ascentMeters";
+    public static final String ASCENT_SECONDS = "ascentSeconds";
+    public static final String DESCENT_DISTANCE = "descentDistance";
+    public static final String DESCENT_METERS = "descentMeters";
+    public static final String DESCENT_SECONDS = "descentSeconds";
+    public static final String FLAT_DISTANCE = "flatDistance";
+    public static final String FLAT_SECONDS = "flatSeconds";
+
+    public static final String CADENCE_AVG = "averageCadence";
+    public static final String CADENCE_MAX = "maxCadence";
+    public static final String CADENCE_MIN = "minCadence";
+
+    public static final String SPEED_AVG = "averageSpeed";
+    public static final String SPEED_MAX = "maxSpeed";
+    public static final String SPEED_MIN = "minSpeed";
+
+    public static final String DISTANCE_METERS = "distanceMeters";
+    public static final String ELEVATION_GAIN = "elevationGain";
+    public static final String ELEVATION_LOSS = "elevationLoss";
+
+    public static final String HR_AVG = "averageHR";
+    public static final String HR_MAX = "maxHR";
+    public static final String HR_MIN = "minHR";
+    public static final String HR_ZONE_NA = "hrZoneNa";
+    public static final String HR_ZONE_WARM_UP = "hrZoneWarmUp";
+    public static final String HR_ZONE_FAT_BURN = "hrZoneFatBurn";
+    public static final String HR_ZONE_AEROBIC = "hrZoneAerobic";
+    public static final String HR_ZONE_ANAEROBIC = "hrZoneAnaerobic";
+    public static final String HR_ZONE_EXTREME = "hrZoneExtreme";
+
+    public static final String LANE_LENGTH = "laneLength";
+    public static final String LAPS = "laps";
+    public static final String LAP_PACE_AVERAGE = "averageLapPace";
+
+    public static final String PACE_AVG_SECONDS_KM = "averageKMPaceSeconds";
+    public static final String PACE_MAX = "maxPace";
+    public static final String PACE_MIN = "minPace";
+    public static final String STEPS = "steps";
+    public static final String STRIDE_AVG = "averageStride";
+    public static final String STRIDE_MAX = "maxStride";
+    public static final String STRIDE_MIN = "minStride";
+    public static final String STRIDE_TOTAL = "totalStride";
+
+    public static final String STROKE_DISTANCE_AVG = "averageStrokeDistance";
+    public static final String STROKE_AVG_PER_SECOND = "averageStrokesPerSecond";
+    public static final String STROKE_RATE_AVG = "avgStrokeRate";
+    public static final String STROKE_RATE_MAX = "maxStrokeRate";
+    public static final String STROKES = "strokes";
+
+    public static final String SWIM_STYLE = "swimStyle";
+    public static final String SWOLF_INDEX = "swolfIndex";
+
+    public static final String CALORIES_BURNT = "caloriesBurnt";
+    public static final String TRAINING_EFFECT_AEROBIC = "aerobicTrainingEffect";
+    public static final String TRAINING_EFFECT_ANAEROBIC = "anaerobicTrainingEffect";
+    public static final String WORKOUT_LOAD = "currentWorkoutLoad";
+    public static final String MAXIMUM_OXYGEN_UPTAKE = "maximumOxygenUptake";
+    public static final String RECOVERY_TIME = "recoveryTime";
+
+    public static final String UNIT_BPM = "bpm";
+    public static final String UNIT_CM = "cm";
+    public static final String UNIT_UNIX_EPOCH_SECONDS = "unix_epoch_seconds";
+    public static final String UNIT_KCAL = "calories_unit";
+    public static final String UNIT_LAPS = "laps_unit";
+    public static final String UNIT_METERS = "meters";
+    public static final String UNIT_ML_KG_MIN = "ml/kg/min";
+    public static final String UNIT_NONE = "";
+    public static final String UNIT_HOURS = "hours";
+    public static final String UNIT_SECONDS = "seconds";
+    public static final String UNIT_SECONDS_PER_KM = "seconds_km";
+    public static final String UNIT_SECONDS_PER_M = "seconds_m";
+    public static final String UNIT_METERS_PER_SECOND = "meters_second";
+    public static final String UNIT_KMPH = "km_h";
+    public static final String UNIT_SPM = "spm";
+    public static final String UNIT_STEPS = "steps_unit";
+    public static final String UNIT_STROKES = "strokes_unit";
+    public static final String UNIT_STROKES_PER_MINUTE = "strokes_minute";
+    public static final String UNIT_STROKES_PER_SECOND = "strokes_second";
+    public static final String UNIT_YARD = "yard";
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySummaryJsonSummary.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySummaryJsonSummary.java
index e511f5efb..5dbfd8ab5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySummaryJsonSummary.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySummaryJsonSummary.java
@@ -1,5 +1,7 @@
 package nodomain.freeyourgadget.gadgetbridge.model;
 
+import static nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries.*;
+
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -153,35 +155,35 @@ public class ActivitySummaryJsonSummary {
     private JSONObject createActivitySummaryGroups(){
         final Map<String, List<String>> groupDefinitions = new HashMap<String, List<String>>() {{
             put("Strokes", Arrays.asList(
-                    "averageStrokeDistance", "averageStrokesPerSecond", "strokes",
-                    "avgStrokeRate", "maxStrokeRate"
+                    STROKE_DISTANCE_AVG, STROKE_AVG_PER_SECOND, STROKES,
+                    STROKE_RATE_AVG, STROKE_RATE_MAX
             ));
             put("Swimming", Arrays.asList(
-                    "swolfIndex", "swimStyle"
+                    SWOLF_INDEX, SWIM_STYLE
             ));
             put("Elevation", Arrays.asList(
-                    "ascentMeters", "descentMeters", "maxAltitude", "minAltitude", "averageAltitude",
-                    "baseAltitude", "ascentSeconds", "descentSeconds", "flatSeconds", "ascentDistance",
-                    "descentDistance", "flatDistance", "elevationGain", "elevationLoss"
+                    ASCENT_METERS, DESCENT_METERS, ALTITUDE_MAX, ALTITUDE_MIN, ALTITUDE_AVG,
+                    ALTITUDE_BASE, ASCENT_SECONDS, DESCENT_SECONDS, FLAT_SECONDS, ASCENT_DISTANCE,
+                    DESCENT_DISTANCE, FLAT_DISTANCE, ELEVATION_GAIN, ELEVATION_LOSS
             ));
             put("Speed", Arrays.asList(
-                    "averageSpeed", "maxSpeed", "minSpeed", "averageKMPaceSeconds", "minPace",
-                    "maxPace", "averageSpeed2", "averageCadence", "maxCadence", "minCadence"
+                    SPEED_AVG, SPEED_MAX, SPEED_MIN, PACE_AVG_SECONDS_KM, PACE_MIN,
+                    PACE_MAX, "averageSpeed2", CADENCE_AVG, CADENCE_MAX, CADENCE_MIN
             ));
             put("Activity", Arrays.asList(
-                    "distanceMeters", "steps", "activeSeconds", "caloriesBurnt", "totalStride",
-                    "averageHR", "maxHR", "minHR", "averageStride", "maxStride", "minStride"
+                    DISTANCE_METERS, STEPS, ACTIVE_SECONDS, CALORIES_BURNT, STRIDE_TOTAL,
+                    HR_AVG, HR_MAX, HR_MIN, STRIDE_AVG, STRIDE_MAX, STRIDE_MIN
             ));
             put("HeartRateZones", Arrays.asList(
-                    "hrZoneNa", "hrZoneWarmUp", "hrZoneFatBurn", "hrZoneAerobic", "hrZoneAnaerobic",
-                    "hrZoneExtreme"
+                    HR_ZONE_NA, HR_ZONE_WARM_UP, HR_ZONE_FAT_BURN, HR_ZONE_AEROBIC, HR_ZONE_ANAEROBIC,
+                    HR_ZONE_EXTREME
             ));
             put("TrainingEffect", Arrays.asList(
-                    "aerobicTrainingEffect", "anaerobicTrainingEffect", "currentWorkoutLoad",
-                    "maximumOxygenUptake"
+                    TRAINING_EFFECT_AEROBIC, TRAINING_EFFECT_ANAEROBIC, WORKOUT_LOAD,
+                    MAXIMUM_OXYGEN_UPTAKE
             ));
             put("laps", Arrays.asList(
-                    "averageLapPace", "laps", "laneLength"
+                    LAP_PACE_AVERAGE, LAPS, LANE_LENGTH
             ));
         }};
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java
index 9618a0745..223b6ec3c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java
@@ -16,13 +16,46 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl;
 
+import static nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries.ACTIVE_SECONDS;
+import static nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries.CADENCE_AVG;
+import static nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries.CALORIES_BURNT;
+import static nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries.DISTANCE_METERS;
+import static nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries.HR_AVG;
+import static nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries.HR_MAX;
+import static nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries.HR_MIN;
+import static nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries.HR_ZONE_AEROBIC;
+import static nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries.HR_ZONE_ANAEROBIC;
+import static nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries.HR_ZONE_EXTREME;
+import static nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries.HR_ZONE_FAT_BURN;
+import static nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries.HR_ZONE_WARM_UP;
+import static nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries.PACE_MAX;
+import static nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries.PACE_MIN;
+import static nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries.RECOVERY_TIME;
+import static nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries.SPEED_MAX;
+import static nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries.STEPS;
+import static nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries.TIME_END;
+import static nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries.TIME_START;
+import static nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries.TRAINING_EFFECT_AEROBIC;
+import static nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries.TRAINING_EFFECT_ANAEROBIC;
+import static nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries.UNIT_BPM;
+import static nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries.UNIT_HOURS;
+import static nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries.UNIT_KCAL;
+import static nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries.UNIT_KMPH;
+import static nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries.UNIT_METERS;
+import static nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries.UNIT_NONE;
+import static nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries.UNIT_SECONDS;
+import static nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries.UNIT_SECONDS_PER_M;
+import static nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries.UNIT_SPM;
+import static nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries.UNIT_STEPS;
+import static nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries.UNIT_UNIX_EPOCH_SECONDS;
+import static nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries.WORKOUT_LOAD;
+import static nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl.XiaomiSimpleActivityParser.XIAOMI_WORKOUT_TYPE;
+
 import android.widget.Toast;
 
 import androidx.annotation.Nullable;
 
 import org.apache.commons.lang3.ArrayUtils;
-import org.json.JSONException;
-import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -152,50 +185,52 @@ public class WorkoutSummaryParser extends XiaomiActivityParser implements Activi
 
         final XiaomiSimpleActivityParser.Builder builder = new XiaomiSimpleActivityParser.Builder();
         builder.setHeaderSize(headerSize);
-        builder.addInt("startTime", "seconds");
-        builder.addInt("endTime", "seconds");
-        builder.addInt("activeSeconds", "seconds");
+        builder.addInt(TIME_START, UNIT_UNIX_EPOCH_SECONDS);
+        builder.addInt(TIME_END, UNIT_UNIX_EPOCH_SECONDS);
+        builder.addInt(ACTIVE_SECONDS, UNIT_SECONDS);
         builder.addUnknown(4);
-        builder.addShort("caloriesBurnt", "calories_unit");
+        builder.addShort(CALORIES_BURNT, UNIT_KCAL);
         builder.addUnknown(4);
-        builder.addByte("averageHR", "bpm");
-        builder.addByte("maxHR", "bpm");
-        builder.addByte("minHR", "bpm");
-        builder.addFloat("aerobicTrainingEffect", "");
+        builder.addByte(HR_AVG, UNIT_BPM);
+        builder.addByte(HR_MAX, UNIT_BPM);
+        builder.addByte(HR_MIN, UNIT_BPM);
+        builder.addFloat(TRAINING_EFFECT_AEROBIC, UNIT_NONE);
+        builder.addUnknown(1);
+        builder.addUnknown(1);
+        builder.addShort(RECOVERY_TIME, UNIT_HOURS);
+        builder.addInt(HR_ZONE_EXTREME, UNIT_SECONDS);
+        builder.addInt(HR_ZONE_ANAEROBIC, UNIT_SECONDS);
+        builder.addInt(HR_ZONE_AEROBIC, UNIT_SECONDS);
+        builder.addInt(HR_ZONE_FAT_BURN, UNIT_SECONDS);
+        builder.addInt(HR_ZONE_WARM_UP, UNIT_SECONDS);
         builder.addUnknown(2);
-        builder.addShort("recoveryTime", "hours");
-        builder.addInt("hrZoneExtreme", "seconds");
-        builder.addInt("hrZoneAnaerobic", "seconds");
-        builder.addInt("hrZoneAerobic", "seconds");
-        builder.addInt("hrZoneFatBurn", "seconds");
-        builder.addInt("hrZoneWarmUp", "seconds");
-        builder.addUnknown(6);
-        builder.addFloat("anaerobicTrainingEffect", "");
+        builder.addUnknown(4);
+        builder.addFloat(TRAINING_EFFECT_ANAEROBIC, UNIT_NONE);
+        // FIXME identify field lengths to align with the header
         builder.addUnknown(3);
-        builder.addInt("configuredTimeGoal", "seconds");
-        builder.addShort("configuredCaloriesGoal", "calories_unit");
-        builder.addShort("maximumCaloriesGoal", "calories_unit");  // TODO: mhm?
+        builder.addInt("configuredTimeGoal", UNIT_SECONDS);
+        builder.addShort("configuredCaloriesGoal", UNIT_KCAL);
+        builder.addShort("maximumCaloriesGoal", UNIT_KCAL);  // TODO: mhm?
         builder.addUnknown(28);
-        builder.addShort("trainingLoad", "");
+        builder.addShort(WORKOUT_LOAD, UNIT_NONE); // training load
         builder.addUnknown(24);
-        builder.addByte("configuredSets", "");
+        builder.addByte("configuredSets", UNIT_NONE);
         builder.addUnknown(13);
-        builder.addInt("startTime2", "seconds");
-        builder.addInt("endTime2", "seconds");
-        builder.addInt("goal", ""); // TODO match against goalType
-        builder.addInt("duration2", "seconds");
-        builder.addInt("intervalTime", "seconds");
+        builder.addInt("startTime2", UNIT_SECONDS);
+        builder.addInt("endTime2", UNIT_SECONDS);
+        builder.addInt("goal", UNIT_NONE); // TODO match against goalType
+        builder.addInt("duration2", UNIT_SECONDS);
+        builder.addInt("intervalTime", UNIT_SECONDS);
         builder.addUnknown(56);
-        builder.addInt("hrZoneExtreme2", "seconds");
-        builder.addInt("hrZoneAnaerobic2", "seconds");
-        builder.addInt("hrZoneAerobic2", "seconds");
-        builder.addInt("hrZoneFatBurn2", "seconds");
-        builder.addInt("hrZoneWarmUp2", "seconds");
+        builder.addInt("hrZoneExtreme2", UNIT_SECONDS);
+        builder.addInt("hrZoneAnaerobic2", UNIT_SECONDS);
+        builder.addInt("hrZoneAerobic2", UNIT_SECONDS);
+        builder.addInt("hrZoneFatBurn2", UNIT_SECONDS);
+        builder.addInt("hrZoneWarmUp2", UNIT_SECONDS);
         builder.addUnknown(16);
-        builder.addShort("vitality_gain", "");
-        builder.addShort("training_load2", "");
-        builder.addShort("recovery_time2", "hours");
-
+        builder.addShort("vitality_gain", UNIT_NONE);
+        builder.addShort("training_load2", UNIT_NONE);
+        builder.addShort("recovery_time2", UNIT_HOURS);
 
         return builder.build();
     }
@@ -215,30 +250,31 @@ public class WorkoutSummaryParser extends XiaomiActivityParser implements Activi
 
         final XiaomiSimpleActivityParser.Builder builder = new XiaomiSimpleActivityParser.Builder();
         builder.setHeaderSize(headerSize);
-        builder.addInt("startTime", "seconds");
-        builder.addInt("endTime", "seconds");
-        builder.addInt("activeSeconds", "seconds");
-        builder.addInt("distanceMeters", "meters");
-        builder.addInt("caloriesBurnt", "calories_unit");
-        builder.addInt("maxPace", "seconds_m");
-        builder.addInt("minPace", "seconds_m");
+        builder.addInt(TIME_START, UNIT_UNIX_EPOCH_SECONDS);
+        builder.addInt(TIME_END, UNIT_UNIX_EPOCH_SECONDS);
+        builder.addInt(ACTIVE_SECONDS, UNIT_SECONDS);
+        builder.addInt(DISTANCE_METERS, UNIT_METERS);
+        builder.addInt(CALORIES_BURNT, UNIT_KCAL);
+        builder.addInt(PACE_MAX, UNIT_SECONDS_PER_M);
+        builder.addInt(PACE_MIN, UNIT_SECONDS_PER_M);
         builder.addUnknown(4);
-        builder.addInt("steps", "steps_unit");
+        builder.addInt(STEPS, UNIT_STEPS);
         builder.addUnknown(2); // pace?
-        builder.addByte("averageHR", "bpm");
-        builder.addByte("maxHR", "bpm");
-        builder.addByte("minHR", "bpm");
+        builder.addByte(HR_AVG, UNIT_BPM);
+        builder.addByte(HR_MAX, UNIT_BPM);
+        builder.addByte(HR_MIN, UNIT_BPM);
+        // FIXME identify field lengths to align with the header
         builder.addUnknown(20);
         builder.addFloat("recoveryValue", "recoveryValue");
         builder.addUnknown(9);
-        builder.addByte("recoveryTime", "seconds");
+        builder.addByte(RECOVERY_TIME, UNIT_SECONDS);
         builder.addUnknown(2);
-        builder.addInt("hrZoneExtreme", "seconds");
-        builder.addInt("hrZoneAnaerobic", "seconds");
-        builder.addInt("hrZoneAerobic", "seconds");
-        builder.addInt("hrZoneFatBurn", "seconds");
-        builder.addInt("hrZoneWarmUp", "seconds");
-        builder.addInt("configured_time_goal", "seconds");
+        builder.addInt(HR_ZONE_EXTREME, UNIT_SECONDS);
+        builder.addInt(HR_ZONE_ANAEROBIC, UNIT_SECONDS);
+        builder.addInt(HR_ZONE_AEROBIC, UNIT_SECONDS);
+        builder.addInt(HR_ZONE_FAT_BURN, UNIT_SECONDS);
+        builder.addInt(HR_ZONE_WARM_UP, UNIT_SECONDS);
+        builder.addInt("configured_time_goal", UNIT_SECONDS);
 
         return builder.build();
     }
@@ -258,41 +294,41 @@ public class WorkoutSummaryParser extends XiaomiActivityParser implements Activi
 
         final XiaomiSimpleActivityParser.Builder builder = new XiaomiSimpleActivityParser.Builder();
         builder.setHeaderSize(headerSize);
-        builder.addShort("xiaomiActivityType", "xiaomiActivityType");
-        builder.addInt("startTime", "seconds");
-        builder.addInt("endTime", "seconds");
-        builder.addInt("activeSeconds", "seconds");
+        builder.addShort(XIAOMI_WORKOUT_TYPE, XIAOMI_WORKOUT_TYPE);
+        builder.addInt(TIME_START, UNIT_UNIX_EPOCH_SECONDS);
+        builder.addInt(TIME_END, UNIT_UNIX_EPOCH_SECONDS);
+        builder.addInt(ACTIVE_SECONDS, UNIT_SECONDS);
         builder.addUnknown(4);
-        builder.addInt("distanceMeters", "meters");
+        builder.addInt(DISTANCE_METERS, UNIT_METERS);
         builder.addUnknown(2);
-        builder.addShort("caloriesBurnt", "calories_unit");
+        builder.addShort(CALORIES_BURNT, UNIT_KCAL);
         builder.addUnknown(12);
-        builder.addInt("steps", "steps_unit");
+        builder.addInt(STEPS, UNIT_STEPS);
         builder.addUnknown(2);
-        builder.addByte("averageHR", "bpm");
-        builder.addByte("maxHR", "bpm");
-        builder.addByte("minHR", "bpm");
+        builder.addByte(HR_AVG, UNIT_BPM);
+        builder.addByte(HR_MAX, UNIT_BPM);
+        builder.addByte(HR_MIN, UNIT_BPM);
         builder.addUnknown(20);
         builder.addFloat("recoveryValue", "?");
         builder.addUnknown(9);
-        builder.addByte("recoveryTime", "hours");
+        builder.addByte(RECOVERY_TIME, UNIT_HOURS);
         builder.addUnknown(2);
-        builder.addInt("hrZoneExtreme", "seconds");
-        builder.addInt("hrZoneAnaerobic", "seconds");
-        builder.addInt("hrZoneAerobic", "seconds");
-        builder.addInt("hrZoneFatBurn", "seconds");
-        builder.addInt("hrZoneWarmUp", "seconds");
-        builder.addInt("configuredTimeGoal", "seconds");
-        builder.addShort("configuredCaloriesGoal", "calories_unit");
-        builder.addInt("configuredDistanceGoal", "meters");
+        builder.addInt(HR_ZONE_EXTREME, UNIT_SECONDS);
+        builder.addInt(HR_ZONE_ANAEROBIC, UNIT_SECONDS);
+        builder.addInt(HR_ZONE_AEROBIC, UNIT_SECONDS);
+        builder.addInt(HR_ZONE_FAT_BURN, UNIT_SECONDS);
+        builder.addInt(HR_ZONE_WARM_UP, UNIT_SECONDS);
+        builder.addInt("configuredTimeGoal", UNIT_SECONDS);
+        builder.addShort("configuredCaloriesGoal", UNIT_KCAL);
+        builder.addInt("configuredDistanceGoal", UNIT_METERS);
         builder.addUnknown(11);
-        builder.addShort("trainingLoad", "");
+        builder.addShort(WORKOUT_LOAD, UNIT_NONE); // training load
         builder.addUnknown(24);
-        builder.addByte("averageHR2", "bpm");
-        builder.addByte("maxHR2", "bpm");
-        builder.addByte("minHR2", "bpm");
+        builder.addByte("averageHR2", UNIT_BPM);
+        builder.addByte("maxHR2", UNIT_BPM);
+        builder.addByte("minHR2", UNIT_BPM);
         builder.addUnknown(2);
-        builder.addByte("averageCadence", "spm");
+        builder.addByte(CADENCE_AVG, UNIT_SPM);
 
         return builder.build();
     }
@@ -312,19 +348,20 @@ public class WorkoutSummaryParser extends XiaomiActivityParser implements Activi
 
         final XiaomiSimpleActivityParser.Builder builder = new XiaomiSimpleActivityParser.Builder();
         builder.setHeaderSize(headerSize);
-        builder.addShort("xiaomiWorkoutType", "xiaomiWorkoutType");
-        builder.addInt("startTime", "seconds");
-        builder.addInt("endTime", "seconds");
-        builder.addInt("activeSeconds", "seconds");
+        builder.addShort(XIAOMI_WORKOUT_TYPE, XIAOMI_WORKOUT_TYPE);
+        builder.addInt(TIME_START, UNIT_UNIX_EPOCH_SECONDS);
+        builder.addInt(TIME_END, UNIT_UNIX_EPOCH_SECONDS);
+        builder.addInt(ACTIVE_SECONDS, UNIT_SECONDS);
         builder.addUnknown(4);
-        builder.addInt("distanceMeters", "meters");
+        builder.addInt(DISTANCE_METERS, UNIT_METERS);
         builder.addUnknown(2);
-        builder.addShort("caloriesBurnt", "calories_unit");
-        builder.addUnknown(8);
-        builder.addFloat("maxSpeed", "km_h");
-        builder.addByte("averageHR", "bpm");
-        builder.addByte("maxHR", "bpm");
-        builder.addByte("minHR", "bpm");
+        builder.addShort(CALORIES_BURNT, UNIT_KCAL);
+        builder.addUnknown(4);
+        builder.addUnknown(4);
+        builder.addFloat(SPEED_MAX, UNIT_KMPH);
+        builder.addByte(HR_AVG, UNIT_BPM);
+        builder.addByte(HR_MAX, UNIT_BPM);
+        builder.addByte(HR_MIN, UNIT_BPM);
 
         return builder.build();
     }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/XiaomiSimpleActivityParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/XiaomiSimpleActivityParser.java
index 203171ede..ec5f21654 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/XiaomiSimpleActivityParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/XiaomiSimpleActivityParser.java
@@ -16,8 +16,14 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl;
 
+import static nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries.TIME_END;
+import static nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries.TIME_START;
+import static nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries.UNIT_UNIX_EPOCH_SECONDS;
+
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
@@ -26,8 +32,13 @@ import java.util.List;
 
 import nodomain.freeyourgadget.gadgetbridge.entities.BaseActivitySummary;
 import nodomain.freeyourgadget.gadgetbridge.model.ActivityKind;
+import nodomain.freeyourgadget.gadgetbridge.util.GB;
 
 public class XiaomiSimpleActivityParser {
+    private static final Logger LOG = LoggerFactory.getLogger(XiaomiSimpleActivityParser.class);
+
+    public static final String XIAOMI_WORKOUT_TYPE = "xiaomiWorkoutType";
+
     private final int headerSize;
     private final List<XiaomiSimpleDataEntry> dataEntries;
 
@@ -42,19 +53,35 @@ public class XiaomiSimpleActivityParser {
         final byte[] header = new byte[headerSize];
         buf.get(header);
 
-        for (final XiaomiSimpleDataEntry dataEntry : dataEntries) {
+        LOG.debug("Header: {}", GB.hexdump(header));
+
+        for (int i = 0; i < dataEntries.size(); i++) {
+            final XiaomiSimpleDataEntry dataEntry = dataEntries.get(i);
+
             final Number value = dataEntry.get(buf);
             if (value == null) {
+                LOG.debug("Skipping unknown field {}", i);
                 continue;
             }
 
-            if (dataEntry.getKey().equals("endTime")) {
-                if (dataEntry.getUnit().equals("seconds")) {
+            // Each bit in the header marks whether the data is valid or not, in order of the fields
+            final boolean validData = (header[i / 8] & (1 << (7 - (i % 8)))) != 0;
+            // FIXME: We can't use the header before identifying the correct field lenggths for unknown fields
+            // or parsing gets out of sync with the header and we will potentially ignore valid data
+            //if (!validData) {
+            //    LOG.debug("Ignoring non-valid data {}", i);
+            //    continue;
+            //}
+
+            if (dataEntry.getKey().equals(TIME_END)) {
+                if (dataEntry.getUnit().equals(UNIT_UNIX_EPOCH_SECONDS)) {
                     summary.setEndTime(new Date(value.intValue() * 1000L));
                 } else {
-                    throw new IllegalArgumentException("endTime should be in seconds");
+                    throw new IllegalArgumentException("endTime should be an unix epoch");
                 }
-            } if (dataEntry.getKey().equals("xiaomiWorkoutType")) {
+            } else if (dataEntry.getKey().equals(TIME_START)) {
+                // ignored
+            } else if (dataEntry.getKey().equals(XIAOMI_WORKOUT_TYPE)) {
                 // TODO use XiaomiWorkoutType
                 switch (value.intValue()) {
                     case 2:

From 0c22ecdd5183db3126e41e27cef174fb3ea0fbcf Mon Sep 17 00:00:00 2001
From: Damien 'Psolyca' Gaignon <damien.gaignon@gmail.com>
Date: Sun, 7 Jan 2024 23:18:08 +0100
Subject: [PATCH 303/595] Huawei: Add initial support for Huawei-Honor

---
 .../gadgetbridge/daogen/GBDaoGenerator.java   |  103 +-
 .../DeviceSettingsPreferenceConst.java        |   22 +
 .../DeviceSpecificSettingsFragment.java       |   14 +
 .../devices/huawei/HuaweiBRCoordinator.java   |  225 +++
 .../devices/huawei/HuaweiConstants.java       |   74 +
 .../devices/huawei/HuaweiCoordinator.java     |  429 +++++
 .../huawei/HuaweiCoordinatorSupplier.java     |   48 +
 .../devices/huawei/HuaweiCrypto.java          |  248 +++
 .../devices/huawei/HuaweiLECoordinator.java   |  225 +++
 .../devices/huawei/HuaweiPacket.java          |  665 +++++++
 .../devices/huawei/HuaweiSampleProvider.java  |  530 +++++
 .../huawei/HuaweiSettingsCustomizer.java      |  254 +++
 .../huawei/HuaweiSpo2SampleProvider.java      |  223 +++
 .../devices/huawei/HuaweiTLV.java             |  400 ++++
 .../devices/huawei/HuaweiUtil.java            |   60 +
 .../honorband3/HonorBand3Coordinator.java     |   74 +
 .../honorband4/HonorBand4Coordinator.java     |   72 +
 .../honorband5/HonorBand5Coordinator.java     |   89 +
 .../honorband6/HonorBand6Coordinator.java     |   84 +
 .../honorband7/HonorBand7Coordinator.java     |   84 +
 .../HuaweiBand4ProCoordinator.java            |   87 +
 .../huaweiband6/HuaweiBand6Coordinator.java   |   84 +
 .../huaweiband7/HuaweiBand7Coordinator.java   |   84 +
 .../huaweiband8/HuaweiBand8Coordinator.java   |   84 +
 .../HuaweiBandAw70Coordinator.java            |   71 +
 .../HuaweiTalkBandB6Coordinator.java          |   60 +
 .../HuaweiWatchGTCoordinator.java             |   90 +
 .../HuaweiWatchGT2Coordinator.java            |   83 +
 .../HuaweiWatchGT2eCoordinator.java           |   94 +
 .../HuaweiWatchGT3Coordinator.java            |   67 +
 .../huawei/packets/AccountRelated.java        |   48 +
 .../devices/huawei/packets/Alarms.java        |  278 +++
 .../devices/huawei/packets/Calls.java         |   65 +
 .../devices/huawei/packets/DeviceConfig.java  | 1710 +++++++++++++++++
 .../packets/DisconnectNotification.java       |   45 +
 .../devices/huawei/packets/FindPhone.java     |   63 +
 .../devices/huawei/packets/FitnessData.java   |  563 ++++++
 .../devices/huawei/packets/LocaleConfig.java  |   53 +
 .../devices/huawei/packets/Menstrual.java     |   75 +
 .../devices/huawei/packets/MusicControl.java  |  185 ++
 .../devices/huawei/packets/Notifications.java |  298 +++
 .../devices/huawei/packets/WorkMode.java      |   58 +
 .../devices/huawei/packets/Workout.java       |  575 ++++++
 .../gadgetbridge/model/DeviceType.java        |   30 +
 .../btbr/AbstractBTBRDeviceSupport.java       |    3 +
 .../devices/huawei/AsynchronousResponse.java  |  378 ++++
 .../devices/huawei/HuaweiBRSupport.java       |  121 ++
 .../devices/huawei/HuaweiLESupport.java       |  129 ++
 .../devices/huawei/HuaweiSupportProvider.java | 1636 ++++++++++++++++
 .../devices/huawei/HuaweiWorkoutGbParser.java |  496 +++++
 .../devices/huawei/ResponseManager.java       |  115 ++
 .../huawei/requests/AlarmsRequest.java        |   95 +
 .../devices/huawei/requests/DebugRequest.java |  221 +++
 .../requests/GetActivityTypeRequest.java      |   58 +
 .../huawei/requests/GetAuthRequest.java       |  115 ++
 .../requests/GetBatteryLevelRequest.java      |   62 +
 .../huawei/requests/GetBondParamsRequest.java |   64 +
 .../huawei/requests/GetBondRequest.java       |   58 +
 .../requests/GetConnectStatusRequest.java     |   51 +
 .../requests/GetDeviceStatusRequest.java      |   60 +
 .../requests/GetDndLiftWristTypeRequest.java  |   64 +
 .../huawei/requests/GetEventAlarmList.java    |  102 +
 .../requests/GetExpandCapabilityRequest.java  |   62 +
 .../requests/GetFitnessTotalsRequest.java     |   57 +
 .../huawei/requests/GetHiChainRequest.java    |  250 +++
 .../huawei/requests/GetLinkParamsRequest.java |   87 +
 .../GetNotificationCapabilitiesRequest.java   |   56 +
 .../GetNotificationConstraintsRequest.java    |   56 +
 .../huawei/requests/GetPhoneInfoRequest.java  |   55 +
 .../huawei/requests/GetPincodeRequest.java    |   57 +
 .../GetProductInformationRequest.java         |   58 +
 .../GetSecurityNegotiationRequest.java        |   66 +
 .../requests/GetSettingRelatedRequest.java    |   51 +
 .../requests/GetSleepDataCountRequest.java    |   85 +
 .../huawei/requests/GetSleepDataRequest.java  |   98 +
 .../huawei/requests/GetSmartAlarmList.java    |   93 +
 .../requests/GetStepDataCountRequest.java     |   62 +
 .../huawei/requests/GetStepDataRequest.java   |   97 +
 .../requests/GetSupportedCommandsRequest.java |  106 +
 .../requests/GetSupportedServicesRequest.java |   69 +
 .../huawei/requests/GetWearStatusRequest.java |   51 +
 .../requests/GetWorkoutCountRequest.java      |   89 +
 .../requests/GetWorkoutDataRequest.java       |  129 ++
 .../requests/GetWorkoutPaceRequest.java       |  106 +
 .../requests/GetWorkoutTotalsRequest.java     |  120 ++
 .../devices/huawei/requests/Request.java      |  304 +++
 .../huawei/requests/SendAccountRequest.java   |   51 +
 .../huawei/requests/SendDndAddRequest.java    |   88 +
 .../huawei/requests/SendDndDeleteRequest.java |   51 +
 .../requests/SendFactoryResetRequest.java     |   51 +
 .../requests/SendFitnessGoalRequest.java      |   63 +
 .../SendMenstrualCapabilityRequest.java       |   51 +
 .../SendMenstrualModifyTimeRequest.java       |   51 +
 .../requests/SendNotificationRequest.java     |  110 ++
 .../SendNotifyHeartRateCapabilityRequest.java |   51 +
 ...dNotifyRestHeartRateCapabilityRequest.java |   51 +
 .../SendSetUpDeviceStatusRequest.java         |   53 +
 .../requests/SetActivateOnLiftRequest.java    |   56 +
 .../requests/SetActivityReminderRequest.java  |   82 +
 .../SetAutomaticHeartrateRequest.java         |   55 +
 .../requests/SetAutomaticSpoRequest.java      |   55 +
 .../huawei/requests/SetDateFormatRequest.java |   79 +
 .../requests/SetDisconnectNotification.java   |   60 +
 .../requests/SetLanguageSettingRequest.java   |   77 +
 .../SetMediumToStrengthThresholdRequest.java  |   60 +
 .../huawei/requests/SetMusicRequest.java      |  104 +
 .../requests/SetMusicStatusRequest.java       |   45 +
 .../requests/SetNavigateOnRotateRequest.java  |   56 +
 .../requests/SetNotificationRequest.java      |   56 +
 .../huawei/requests/SetTimeRequest.java       |   51 +
 .../huawei/requests/SetTimeZoneIdRequest.java |   51 +
 .../huawei/requests/SetTruSleepRequest.java   |   56 +
 .../requests/SetWearLocationRequest.java      |   57 +
 .../requests/SetWearMessagePushRequest.java   |   56 +
 .../huawei/requests/SetWorkModeRequest.java   |   57 +
 .../huawei/requests/StopFindPhoneRequest.java |   40 +
 .../requests/StopNotificationRequest.java     |   53 +
 .../gadgetbridge/util/CryptoUtils.java        |   89 +
 app/src/main/res/values/arrays.xml            |   15 +
 app/src/main/res/values/strings.xml           |   62 +
 ...vicesettings_allow_accept_reject_calls.xml |   15 +
 ...cesettings_disable_find_phone_with_dnd.xml |    8 +
 ...settings_donotdisturb_allday_liftwirst.xml |   75 +
 .../res/xml/devicesettings_force_options.xml  |   46 +
 ...icesettings_heartrate_automatic_enable.xml |    9 +
 .../main/res/xml/devicesettings_huawei.xml    |  241 +++
 .../res/xml/devicesettings_huawei_debug.xml   |   11 +
 ...cesettings_huawei_reparse_workout_data.xml |   10 +
 .../devicesettings_inactivity_sheduled.xml    |   73 +
 .../devicesettings_spo_automatic_enable.xml   |    9 +
 .../main/res/xml/devicesettings_trusleep.xml  |   19 +
 .../main/res/xml/devicesettings_workmode.xml  |   13 +
 .../devices/huawei/TestHuaweiCrypto.java      |   77 +
 .../devices/huawei/TestHuaweiPacket.java      |  269 +++
 .../devices/huawei/TestHuaweiTLV.java         |  532 +++++
 .../devices/huawei/TestVarInt.java            |   72 +
 .../devices/huawei/packets/TestAlarms.java    |  167 ++
 .../devices/huawei/packets/TestCalls.java     |   68 +
 .../huawei/packets/TestDeviceConfig.java      |  498 +++++
 .../packets/TestDisconnectNotification.java   |  104 +
 .../devices/huawei/packets/TestFindPhone.java |  120 ++
 .../huawei/packets/TestFitnessData.java       |  502 +++++
 .../huawei/packets/TestLocaleConfig.java      |   87 +
 .../huawei/packets/TestMusicControl.java      |  338 ++++
 .../huawei/packets/TestNotifications.java     |  197 ++
 .../devices/huawei/packets/TestWorkMode.java  |   94 +
 .../devices/huawei/packets/TestWorkout.java   |  437 +++++
 .../huawei/TestDebugRequestParser.java        |  396 ++++
 .../devices/huawei/TestResponseManager.java   |  449 +++++
 149 files changed, 21842 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiBRCoordinator.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiConstants.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCoordinator.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCoordinatorSupplier.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCrypto.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiLECoordinator.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiPacket.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSampleProvider.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSettingsCustomizer.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSpo2SampleProvider.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiTLV.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiUtil.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband3/HonorBand3Coordinator.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband4/HonorBand4Coordinator.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband5/HonorBand5Coordinator.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband6/HonorBand6Coordinator.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband7/HonorBand7Coordinator.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband4pro/HuaweiBand4ProCoordinator.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband6/HuaweiBand6Coordinator.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband7/HuaweiBand7Coordinator.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband8/HuaweiBand8Coordinator.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweibandaw70/HuaweiBandAw70Coordinator.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweitalkbandb6/HuaweiTalkBandB6Coordinator.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt/HuaweiWatchGTCoordinator.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt2/HuaweiWatchGT2Coordinator.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt2e/HuaweiWatchGT2eCoordinator.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt3/HuaweiWatchGT3Coordinator.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/AccountRelated.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Alarms.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Calls.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DeviceConfig.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DisconnectNotification.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/FindPhone.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/FitnessData.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/LocaleConfig.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Menstrual.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/MusicControl.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Notifications.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/WorkMode.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Workout.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/AsynchronousResponse.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiBRSupport.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiLESupport.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiSupportProvider.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiWorkoutGbParser.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/ResponseManager.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/AlarmsRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/DebugRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetActivityTypeRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetAuthRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetBatteryLevelRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetBondParamsRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetBondRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetConnectStatusRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetDeviceStatusRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetDndLiftWristTypeRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetEventAlarmList.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetExpandCapabilityRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetFitnessTotalsRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetHiChainRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetLinkParamsRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetNotificationCapabilitiesRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetNotificationConstraintsRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetPhoneInfoRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetPincodeRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetProductInformationRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSecurityNegotiationRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSettingRelatedRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSleepDataCountRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSleepDataRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSmartAlarmList.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetStepDataCountRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetStepDataRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSupportedCommandsRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSupportedServicesRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWearStatusRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWorkoutCountRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWorkoutDataRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWorkoutPaceRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWorkoutTotalsRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/Request.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendAccountRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendDndAddRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendDndDeleteRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendFactoryResetRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendFitnessGoalRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendMenstrualCapabilityRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendMenstrualModifyTimeRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendNotificationRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendNotifyHeartRateCapabilityRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendNotifyRestHeartRateCapabilityRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendSetUpDeviceStatusRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetActivateOnLiftRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetActivityReminderRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetAutomaticHeartrateRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetAutomaticSpoRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetDateFormatRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetDisconnectNotification.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetLanguageSettingRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetMediumToStrengthThresholdRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetMusicRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetMusicStatusRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetNavigateOnRotateRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetNotificationRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetTimeRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetTimeZoneIdRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetTruSleepRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetWearLocationRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetWearMessagePushRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetWorkModeRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/StopFindPhoneRequest.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/StopNotificationRequest.java
 create mode 100644 app/src/main/res/xml/devicesettings_allow_accept_reject_calls.xml
 create mode 100644 app/src/main/res/xml/devicesettings_disable_find_phone_with_dnd.xml
 create mode 100644 app/src/main/res/xml/devicesettings_donotdisturb_allday_liftwirst.xml
 create mode 100644 app/src/main/res/xml/devicesettings_force_options.xml
 create mode 100644 app/src/main/res/xml/devicesettings_heartrate_automatic_enable.xml
 create mode 100644 app/src/main/res/xml/devicesettings_huawei.xml
 create mode 100644 app/src/main/res/xml/devicesettings_huawei_debug.xml
 create mode 100644 app/src/main/res/xml/devicesettings_huawei_reparse_workout_data.xml
 create mode 100644 app/src/main/res/xml/devicesettings_inactivity_sheduled.xml
 create mode 100644 app/src/main/res/xml/devicesettings_spo_automatic_enable.xml
 create mode 100644 app/src/main/res/xml/devicesettings_trusleep.xml
 create mode 100644 app/src/main/res/xml/devicesettings_workmode.xml
 create mode 100644 app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/TestHuaweiCrypto.java
 create mode 100644 app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/TestHuaweiPacket.java
 create mode 100644 app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/TestHuaweiTLV.java
 create mode 100644 app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/TestVarInt.java
 create mode 100644 app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestAlarms.java
 create mode 100644 app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestCalls.java
 create mode 100644 app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestDeviceConfig.java
 create mode 100644 app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestDisconnectNotification.java
 create mode 100644 app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestFindPhone.java
 create mode 100644 app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestFitnessData.java
 create mode 100644 app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestLocaleConfig.java
 create mode 100644 app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestMusicControl.java
 create mode 100644 app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestNotifications.java
 create mode 100644 app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestWorkMode.java
 create mode 100644 app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestWorkout.java
 create mode 100644 app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/TestDebugRequestParser.java
 create mode 100644 app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/TestResponseManager.java

diff --git a/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java b/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java
index 266540525..ce2001cd0 100644
--- a/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java
+++ b/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java
@@ -45,7 +45,7 @@ public class GBDaoGenerator {
 
 
     public static void main(String[] args) throws Exception {
-        final Schema schema = new Schema(66, MAIN_PACKAGE + ".entities");
+        final Schema schema = new Schema(67, MAIN_PACKAGE + ".entities");
 
         Entity userAttributes = addUserAttributes(schema);
         Entity user = addUserInfo(schema, userAttributes);
@@ -109,6 +109,12 @@ public class GBDaoGenerator {
         addWena3StressSample(schema, user, device);
         addFemometerVinca2TemperatureSample(schema, user, device);
 
+        addHuaweiActivitySample(schema, user, device);
+
+        Entity huaweiWorkoutSummary = addHuaweiWorkoutSummarySample(schema, user, device);
+        addHuaweiWorkoutDataSample(schema, user, device, huaweiWorkoutSummary);
+        addHuaweiWorkoutPaceSample(schema, user, device, huaweiWorkoutSummary);
+
         addCalendarSyncState(schema, device);
         addAlarms(schema, user, device);
         addReminders(schema, user, device);
@@ -930,6 +936,7 @@ public class GBDaoGenerator {
         return activitySample;
     }
 
+
     private static Entity addWithingsSteelHRActivitySample(Schema schema, Entity user, Entity device) {
         Entity activitySample = addEntity(schema, "WithingsSteelHRActivitySample");
         activitySample.implementsSerializable();
@@ -1011,6 +1018,99 @@ public class GBDaoGenerator {
         return perAppSetting;
     }
 
+    private static Entity addHuaweiActivitySample(Schema schema, Entity user, Entity device) {
+        Entity activitySample = addEntity(schema, "HuaweiActivitySample");
+        addCommonActivitySampleProperties("AbstractActivitySample", activitySample, user, device);
+        activitySample.addIntProperty("otherTimestamp").notNull().primaryKey();
+        activitySample.addByteProperty("source").notNull().primaryKey();
+        activitySample.addIntProperty(SAMPLE_RAW_KIND).notNull().codeBeforeGetterAndSetter(OVERRIDE);
+        activitySample.addIntProperty(SAMPLE_RAW_INTENSITY).notNull().codeBeforeGetterAndSetter(OVERRIDE);
+        activitySample.addIntProperty(SAMPLE_STEPS).notNull().codeBeforeGetterAndSetter(OVERRIDE);
+        activitySample.addIntProperty("calories").notNull();
+        activitySample.addIntProperty("distance").notNull();
+        activitySample.addIntProperty("spo").notNull();
+        activitySample.addIntProperty("heartRate").notNull();
+        return activitySample;
+    }
+
+    private static Entity addHuaweiWorkoutSummarySample(Schema schema, Entity user, Entity device) {
+        Entity workoutSummary = addEntity(schema, "HuaweiWorkoutSummarySample");
+
+        workoutSummary.setJavaDoc("Contains Huawei Workout Summary samples (one per workout)");
+
+        workoutSummary.addLongProperty("workoutId").primaryKey().autoincrement();
+
+        Property deviceId = workoutSummary.addLongProperty("deviceId").notNull().getProperty();
+        workoutSummary.addToOne(device, deviceId);
+        Property userId = workoutSummary.addLongProperty("userId").notNull().getProperty();
+        workoutSummary.addToOne(user, userId);
+
+        workoutSummary.addShortProperty("workoutNumber").notNull();
+        workoutSummary.addByteProperty("status").notNull();
+        workoutSummary.addIntProperty("startTimestamp").notNull();
+        workoutSummary.addIntProperty("endTimestamp").notNull();
+        workoutSummary.addIntProperty("calories").notNull();
+        workoutSummary.addIntProperty("distance").notNull();
+        workoutSummary.addIntProperty("stepCount").notNull();
+        workoutSummary.addIntProperty("totalTime").notNull();
+        workoutSummary.addIntProperty("duration").notNull();
+        workoutSummary.addByteProperty("type").notNull();
+        workoutSummary.addShortProperty("strokes").notNull();
+        workoutSummary.addShortProperty("avgStrokeRate").notNull();
+        workoutSummary.addShortProperty("poolLength").notNull();
+        workoutSummary.addShortProperty("laps").notNull();
+        workoutSummary.addShortProperty("avgSwolf").notNull();
+
+        workoutSummary.addByteArrayProperty("rawData");
+
+        return workoutSummary;
+    }
+
+    private static Entity addHuaweiWorkoutDataSample(Schema schema, Entity user, Entity device, Entity summaryEntity) {
+        Entity workoutDataSample = addEntity(schema, "HuaweiWorkoutDataSample");
+
+        workoutDataSample.setJavaDoc("Contains Huawei Workout data samples (multiple per workout)");
+
+        Property id = workoutDataSample.addLongProperty("workoutId").primaryKey().notNull().getProperty();
+        workoutDataSample.addToOne(summaryEntity, id);
+
+        workoutDataSample.addIntProperty("timestamp").notNull().primaryKey();
+        workoutDataSample.addByteProperty("heartRate").notNull();
+        workoutDataSample.addShortProperty("speed").notNull();
+        workoutDataSample.addByteProperty("stepRate").notNull();
+        workoutDataSample.addShortProperty("cadence").notNull();
+        workoutDataSample.addShortProperty("stepLength").notNull();
+        workoutDataSample.addShortProperty("groundContactTime").notNull();
+        workoutDataSample.addByteProperty("impact").notNull();
+        workoutDataSample.addShortProperty("swingAngle").notNull();
+        workoutDataSample.addByteProperty("foreFootLanding").notNull();
+        workoutDataSample.addByteProperty("midFootLanding").notNull();
+        workoutDataSample.addByteProperty("backFootLanding").notNull();
+        workoutDataSample.addByteProperty("eversionAngle").notNull();
+        workoutDataSample.addByteProperty("swolf").notNull();
+        workoutDataSample.addShortProperty("strokeRate").notNull();
+
+        workoutDataSample.addByteArrayProperty("dataErrorHex");
+
+        return workoutDataSample;
+    }
+
+    private static Entity addHuaweiWorkoutPaceSample(Schema schema, Entity user, Entity device, Entity summaryEntity) {
+        Entity workoutPaceSample = addEntity(schema, "HuaweiWorkoutPaceSample");
+
+        workoutPaceSample.setJavaDoc("Contains Huawei Workout pace data samples (one per workout)");
+
+        Property id = workoutPaceSample.addLongProperty("workoutId").primaryKey().notNull().getProperty();
+        workoutPaceSample.addToOne(summaryEntity, id);
+
+        workoutPaceSample.addIntProperty("distance").notNull().primaryKey();
+        workoutPaceSample.addByteProperty("type").notNull().primaryKey();
+        workoutPaceSample.addIntProperty("pace").notNull();
+        workoutPaceSample.addIntProperty("correction").notNull();
+
+        return workoutPaceSample;
+    }
+
     private static void addTemperatureProperties(Entity activitySample) {
         activitySample.addFloatProperty(SAMPLE_TEMPERATURE).notNull().codeBeforeGetter(OVERRIDE);
         activitySample.addIntProperty(SAMPLE_TEMPERATURE_TYPE).notNull().codeBeforeGetter(OVERRIDE);
@@ -1022,5 +1122,4 @@ public class GBDaoGenerator {
         addTemperatureProperties(sample);
         return sample;
     }
-
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
index 8fab653be..58951d2c4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
@@ -197,10 +197,19 @@ public class DeviceSettingsPreferenceConst {
     public static final String PREF_DO_NOT_DISTURB_START = "do_not_disturb_start";
     public static final String PREF_DO_NOT_DISTURB_END = "do_not_disturb_end";
     public static final String PREF_DO_NOT_DISTURB_LIFT_WRIST = "do_not_disturb_lift_wrist";
+    public static final String PREF_DO_NOT_DISTURB_NOT_WEAR = "do_not_disturb_not_wear";
     public static final String PREF_DO_NOT_DISTURB_OFF = "off";
     public static final String PREF_DO_NOT_DISTURB_AUTOMATIC = "automatic";
     public static final String PREF_DO_NOT_DISTURB_ALWAYS = "always";
     public static final String PREF_DO_NOT_DISTURB_SCHEDULED = "scheduled";
+    public static final String PREF_DO_NOT_DISTURB_MO = "pref_do_not_disturb_mo";
+    public static final String PREF_DO_NOT_DISTURB_TU = "pref_do_not_disturb_tu";
+    public static final String PREF_DO_NOT_DISTURB_WE = "pref_do_not_disturb_we";
+    public static final String PREF_DO_NOT_DISTURB_TH = "pref_do_not_disturb_th";
+    public static final String PREF_DO_NOT_DISTURB_FR = "pref_do_not_disturb_fr";
+    public static final String PREF_DO_NOT_DISTURB_SA = "pref_do_not_disturb_sa";
+    public static final String PREF_DO_NOT_DISTURB_SU = "pref_do_not_disturb_su";
+
     public static final String PREF_CAMERA_REMOTE = "camera_remote";
 
     public static final String PREF_WORKOUT_START_ON_PHONE = "workout_start_on_phone";
@@ -387,6 +396,19 @@ public class DeviceSettingsPreferenceConst {
     public static final String PREF_VOICE_SERVICE_LANGUAGE = "voice_service_language";
 
     public static final String PREF_TEMPERATURE_SCALE_CF = "temperature_scale_cf";
+
+    public static final String PREF_FAKE_ANDROID_ID = "fake_android_id";
+
+    public static final String PREF_HEARTRATE_AUTOMATIC_ENABLE = "heartrate_automatic_enable";
+    public static final String PREF_SPO_AUTOMATIC_ENABLE = "spo_automatic_enable";
+
+    public static final String PREF_FORCE_OPTIONS = "pref_force_options";
+    public static final String PREF_FORCE_ENABLE_SMART_ALARM = "pref_force_enable_smart_alarm";
+    public static final String PREF_FORCE_ENABLE_WEAR_LOCATION = "pref_force_enable_wear_location";
+    public static final String PREF_FORCE_DND_SUPPORT = "pref_force_dnd_support";
+    public static final String PREF_IGNORE_WAKEUP_STATUS_START = "pref_force_ignore_wakeup_status_start";
+    public static final String PREF_IGNORE_WAKEUP_STATUS_END = "pref_force_ignore_wakeup_status_end";
+
     public static final String PREF_FEMOMETER_MEASUREMENT_MODE = "femometer_measurement_mode";
 
     public static final String PREF_PREFIX_NOTIFICATION_WITH_APP = "pref_prefix_notification_with_app";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
index 8df6db0fc..1ac588f72 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
@@ -392,7 +392,18 @@ public class DeviceSpecificSettingsFragment extends AbstractPreferenceFragment i
         addPreferenceHandlerFor(PREF_DO_NOT_DISTURB_NOAUTO);
         addPreferenceHandlerFor(PREF_DO_NOT_DISTURB_NOAUTO_START);
         addPreferenceHandlerFor(PREF_DO_NOT_DISTURB_NOAUTO_END);
+        addPreferenceHandlerFor(PREF_DO_NOT_DISTURB);
+        addPreferenceHandlerFor(PREF_DO_NOT_DISTURB_START);
+        addPreferenceHandlerFor(PREF_DO_NOT_DISTURB_END);
+        addPreferenceHandlerFor(PREF_DO_NOT_DISTURB_MO);
+        addPreferenceHandlerFor(PREF_DO_NOT_DISTURB_TU);
+        addPreferenceHandlerFor(PREF_DO_NOT_DISTURB_WE);
+        addPreferenceHandlerFor(PREF_DO_NOT_DISTURB_TH);
+        addPreferenceHandlerFor(PREF_DO_NOT_DISTURB_FR);
+        addPreferenceHandlerFor(PREF_DO_NOT_DISTURB_SA);
+        addPreferenceHandlerFor(PREF_DO_NOT_DISTURB_SU);
         addPreferenceHandlerFor(PREF_DO_NOT_DISTURB_LIFT_WRIST);
+        addPreferenceHandlerFor(PREF_DO_NOT_DISTURB_NOT_WEAR);
         addPreferenceHandlerFor(PREF_FIND_PHONE);
         addPreferenceHandlerFor(PREF_FIND_PHONE_DURATION);
         addPreferenceHandlerFor(PREF_AUTOLIGHT);
@@ -569,6 +580,9 @@ public class DeviceSpecificSettingsFragment extends AbstractPreferenceFragment i
         addPreferenceHandlerFor(PREF_CLAP_HANDS_TO_WAKEUP_DEVICE);
         addPreferenceHandlerFor(PREF_POWER_SAVING);
 
+        addPreferenceHandlerFor(PREF_HEARTRATE_AUTOMATIC_ENABLE);
+        addPreferenceHandlerFor(PREF_SPO_AUTOMATIC_ENABLE);
+
         addPreferenceHandlerFor("lock");
 
         String sleepTimeState = prefs.getString(PREF_SLEEP_TIME, PREF_DO_NOT_DISTURB_OFF);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiBRCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiBRCoordinator.java
new file mode 100644
index 000000000..c856aab85
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiBRCoordinator.java
@@ -0,0 +1,225 @@
+/*  Copyright (C) 2023 Gaignon Damien
+    Copyright (C) 2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei;
+
+import android.app.Activity;
+import android.bluetooth.le.ScanFilter;
+import android.content.Context;
+import android.net.Uri;
+import android.os.ParcelUuid;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import de.greenrobot.dao.query.QueryBuilder;
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSpecificSettingsCustomizer;
+import nodomain.freeyourgadget.gadgetbridge.GBException;
+import nodomain.freeyourgadget.gadgetbridge.devices.AbstractBLClassicDeviceCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
+import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.entities.AbstractActivitySample;
+import nodomain.freeyourgadget.gadgetbridge.entities.BaseActivitySummaryDao;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.entities.Device;
+import nodomain.freeyourgadget.gadgetbridge.entities.HuaweiActivitySampleDao;
+import nodomain.freeyourgadget.gadgetbridge.entities.HuaweiWorkoutDataSampleDao;
+import nodomain.freeyourgadget.gadgetbridge.entities.HuaweiWorkoutSummarySample;
+import nodomain.freeyourgadget.gadgetbridge.entities.HuaweiWorkoutSummarySampleDao;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiBRSupport;
+
+public abstract class HuaweiBRCoordinator extends AbstractBLClassicDeviceCoordinator implements HuaweiCoordinatorSupplier {
+
+    private final HuaweiCoordinator huaweiCoordinator = new HuaweiCoordinator(this);
+    private GBDevice device;
+
+    @Override
+    public HuaweiCoordinator getHuaweiCoordinator() {
+        return huaweiCoordinator;
+    }
+
+    @NonNull
+    @Override
+    public Collection<? extends ScanFilter> createBLEScanFilters() {
+        ParcelUuid huaweiService = new ParcelUuid(HuaweiConstants.UUID_SERVICE_HUAWEI_SERVICE);
+        ScanFilter filter = new ScanFilter.Builder().setServiceUuid(huaweiService).build();
+        return Collections.singletonList(filter);
+    }
+
+    @Override
+    public DeviceSpecificSettingsCustomizer getDeviceSpecificSettingsCustomizer(final GBDevice device) {
+        return new HuaweiSettingsCustomizer(device);
+    }
+
+    @Nullable
+    @Override
+    public Class<? extends Activity> getPairingActivity() {
+        return null;
+    }
+    
+    @Override
+    public int getBondingStyle(){
+        return BONDING_STYLE_NONE;
+    }
+
+    @Override
+    protected void deleteDevice(@NonNull GBDevice gbDevice, @NonNull Device device, @NonNull DaoSession session) throws GBException {
+        long deviceId = device.getId();
+        QueryBuilder<?> qb = session.getHuaweiActivitySampleDao().queryBuilder();
+        qb.where(HuaweiActivitySampleDao.Properties.DeviceId.eq(deviceId)).buildDelete().executeDeleteWithoutDetachingEntities();
+
+        QueryBuilder<HuaweiWorkoutSummarySample> qb2 = session.getHuaweiWorkoutSummarySampleDao().queryBuilder();
+        List<HuaweiWorkoutSummarySample> workouts = qb2.where(HuaweiWorkoutSummarySampleDao.Properties.DeviceId.eq(deviceId)).build().list();
+        for (HuaweiWorkoutSummarySample sample : workouts) {
+            session.getHuaweiWorkoutDataSampleDao().queryBuilder().where(
+                    HuaweiWorkoutDataSampleDao.Properties.WorkoutId.eq(sample.getWorkoutId())
+            ).buildDelete().executeDeleteWithoutDetachingEntities();
+        }
+
+        session.getHuaweiWorkoutSummarySampleDao().queryBuilder().where(HuaweiWorkoutSummarySampleDao.Properties.DeviceId.eq(deviceId)).buildDelete().executeDeleteWithoutDetachingEntities();
+
+        session.getBaseActivitySummaryDao().queryBuilder().where(BaseActivitySummaryDao.Properties.DeviceId.eq(deviceId)).buildDelete().executeDeleteWithoutDetachingEntities();
+    }
+
+    @Override
+    public String getManufacturer() {
+        return "Huawei";
+    }
+
+    @Override
+    public boolean supportsScreenshots() {
+        return false;
+    }
+
+    @Override
+    public boolean supportsSmartWakeup(GBDevice device) {
+        return huaweiCoordinator.supportsSmartAlarm(device);
+    }
+
+    @Override
+    public boolean supportsFindDevice() {
+        return false;
+    }
+
+    @Override
+    public boolean supportsAlarmSnoozing() {
+        return false;
+    }
+
+    @Override
+    public boolean supportsAlarmDescription(GBDevice device) {
+        // TODO: only name is supported
+        return true;
+    }
+
+    @Override
+    public boolean supportsWeather() {
+        return false;
+    }
+
+    @Override
+    public boolean supportsRealtimeData() {
+        return false;
+    }
+
+    @Override
+    public boolean supportsCalendarEvents() {
+        return false;
+    }
+
+    @Override
+    public Class<? extends Activity> getAppsManagementActivity() {
+        return null;
+    }
+
+    @Override
+    public boolean supportsAppsManagement(GBDevice device) {
+        return false;
+    }
+
+    @Override
+    public int getAlarmSlotCount(GBDevice device) {
+        return huaweiCoordinator.getAlarmSlotCount(device);
+    }
+
+    @Override
+    public boolean supportsActivityDataFetching() {
+        return true;
+    }
+
+    @Override
+    public boolean supportsActivityTracking() {
+        return true;
+    }
+
+    @Override
+    public boolean supportsActivityTracks() {
+        return true;
+    }
+
+    @Override
+    public boolean supportsHeartRateMeasurement(GBDevice device) {
+        return false;
+    }
+
+    @Override
+    public boolean supportsMusicInfo() {
+        return getHuaweiCoordinator().supportsMusic();
+    }
+
+    @Override
+    public InstallHandler findInstallHandler(Uri uri, Context context) {
+        return null;
+    }
+
+    @Override
+    public SampleProvider<? extends AbstractActivitySample> getSampleProvider(GBDevice device, DaoSession session) {
+        return new HuaweiSampleProvider(device, session);
+    }
+
+    public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
+        return new int[]{};
+    }
+
+    @Override
+    public HuaweiDeviceType getHuaweiType() {
+        return HuaweiDeviceType.BR;
+    }
+
+    @Override
+    public void setDevice(GBDevice device) {
+        this.device = device;
+    }
+
+    @Override
+    public GBDevice getDevice() {
+        return this.device;
+    }
+
+    @NonNull
+    @Override
+    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+        return HuaweiBRSupport.class;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiConstants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiConstants.java
new file mode 100644
index 000000000..13e551327
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiConstants.java
@@ -0,0 +1,74 @@
+/*  Copyright (C) 2021-2023 Gaignon Damien
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei;
+
+import java.util.UUID;
+
+import static nodomain.freeyourgadget.gadgetbridge.service.btle.AbstractBTLEDeviceSupport.BASE_UUID;
+
+public final class HuaweiConstants {
+
+    public static final UUID UUID_SERVICE_HUAWEI_SERVICE = UUID.fromString(String.format(BASE_UUID, "FE86"));
+    public static final UUID UUID_CHARACTERISTIC_HUAWEI_WRITE = UUID.fromString(String.format(BASE_UUID, "FE01"));
+    public static final UUID UUID_CHARACTERISTIC_HUAWEI_READ = UUID.fromString(String.format(BASE_UUID, "FE02"));
+    public static final UUID UUID_SERVICE_HUAWEI_SDP = UUID.fromString("82FF3820-8411-400C-B85A-55BDB32CF060");
+
+    public static final String GROUP_ID = "7B0BC0CBCE474F6C238D9661C63400B797B166EA7849B3A370FC73A9A236E989";
+    public static final byte[] KEY_TYPE = new byte[]{0x00, 0x07};
+
+    public static final byte HUAWEI_MAGIC = 0x5A;
+
+    public static final byte PROTOCOL_VERSION = 0x02;
+
+    public static final int TAG_RESULT = 127;
+    public static final byte[] RESULT_SUCCESS = new byte[]{0x00, 0x01, (byte)0x86, (byte)0xA0};
+
+    public static class CryptoTags {
+        public static final int encryption = 124;
+        public static final int initVector = 125;
+        public static final int cipherText = 126;
+    }
+
+    public static final String HO_BAND3_NAME = "honor band 3-";
+    public static final String HO_BAND4_NAME = "honor band 4-";
+    public static final String HO_BAND5_NAME = "honor band 5-";
+    public static final String HO_BAND6_NAME = "honor band 6-";
+    public static final String HO_BAND7_NAME = "honor band 7-";
+    public static final String HU_BAND3E_NAME = "huawei band 3e-";
+    public static final String HU_BAND4E_NAME = "huawei band 4e-";
+    public static final String HU_BAND6_NAME = "huawei band 6-";
+    public static final String HU_WATCHGT_NAME = "huawei watch gt-";
+    public static final String HU_BAND4_NAME = "huawei band 4-";
+    public static final String HU_BAND4PRO_NAME = "huawei band 4 pro-";
+    public static final String HU_WATCHGT2_NAME = "huawei watch gt 2-";
+    public static final String HU_WATCHGT2E_NAME = "huawei watch gt 2e-";
+    public static final String HU_WATCHGT2PRO_NAME = "huawei watch gt 2 pro-";
+    public static final String HU_TALKBANDB6_NAME = "huawei b6-";
+    public static final String HU_BAND7_NAME = "huawei band 7-";
+    public static final String HU_BAND8_NAME = "huawei band 8-";
+    public static final String HU_WATCHGT3_NAME = "huawei watch gt 3-";
+    public static final String HU_WATCHGT3PRO_NAME = "huawei watch gt 3 pro-";
+
+    public static final String PREF_HUAWEI_ADDRESS = "huawei_address";
+    public static final String PREF_HUAWEI_WORKMODE = "workmode";
+    public static final String PREF_HUAWEI_TRUSLEEP = "trusleep";
+    public static final String PREF_HUAWEI_DND_LIFT_WRIST_TYPE = "dnd_lift_wrist_type"; // SharedPref for 0x01 0x1D
+    public static final String PREF_HUAWEI_DEBUG = "debug_huawei";
+    public static final String PREF_HUAWEI_DEBUG_REQUEST = "debug_huawei_request";
+
+    public static final String PKG_NAME = "com.huawei.devicegroupmanage";
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCoordinator.java
new file mode 100644
index 000000000..22ee428be
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCoordinator.java
@@ -0,0 +1,429 @@
+/*  Copyright (C) 2021-2023 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
+
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.Notifications.NotificationConstraintsType;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.util.GB;
+
+import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.*;
+
+public class HuaweiCoordinator {
+    Logger LOG = LoggerFactory.getLogger(HuaweiCoordinator.class);
+
+    TreeMap<Integer, byte[]> commandsPerService = new TreeMap<>();
+    // Each byte of expandCapabilities represent a "service"
+    // Each bit in a "service" represent a feature so 1 or 0 is used to check is support or not
+    byte[] expandCapabilities = null;
+    byte notificationCapabilities = -0x01;
+    ByteBuffer notificationConstraints = null;
+
+    private final HuaweiCoordinatorSupplier parent;
+    private boolean transactionCrypted=true;
+
+    public HuaweiCoordinator(HuaweiCoordinatorSupplier parent) {
+        this.parent = parent;
+        for (String key : getCapabilitiesSharedPreferences().getAll().keySet()) {
+            int service;
+            try {
+                service = Integer.parseInt(key);
+                byte[] commands = GB.hexStringToByteArray(getCapabilitiesSharedPreferences().getString(key, "00"));
+                this.commandsPerService.put(service, commands);
+            } catch (NumberFormatException e) {
+                if (key == "expandCapabilities")
+                    this.expandCapabilities = GB.hexStringToByteArray(getCapabilitiesSharedPreferences().getString(key, "00"));
+                if (key == "notificationCapabilities")
+                    this.notificationCapabilities = (byte)getCapabilitiesSharedPreferences().getInt(key, -0x01);
+                if (key == "notificationConstraints")
+                    this.notificationConstraints = ByteBuffer.wrap(GB.hexStringToByteArray(
+                                    getCapabilitiesSharedPreferences().getString(
+                                            key,
+                                            "00F00002001E0002001E0002001E")
+                    ));
+            }
+        }
+    }
+
+    private SharedPreferences getCapabilitiesSharedPreferences() {
+        return GBApplication.getContext().getSharedPreferences("huawei_coordinator_capatilities" + parent.getDeviceType().name(), Context.MODE_PRIVATE);
+    }
+
+    private SharedPreferences getDeviceSpecificSharedPreferences(GBDevice gbDevice) {
+        return GBApplication.getDeviceSpecificSharedPrefs(gbDevice.getAddress());
+    }
+
+    public boolean getForceOption(GBDevice gbDevice, String option) {
+        return getDeviceSpecificSharedPreferences(gbDevice).getBoolean(option, false);
+    }
+
+    private void saveCommandsForService(int service, byte[] commands) {
+        commandsPerService.put(service, commands);
+        getCapabilitiesSharedPreferences().edit().putString(String.valueOf(service), GB.hexdump(commands)).apply();
+    }
+
+    public void saveExpandCapabilities(byte[] capabilities) {
+        expandCapabilities = capabilities;
+        getCapabilitiesSharedPreferences().edit().putString("expandCapabilities", GB.hexdump(capabilities)).apply();
+    }
+
+    public void saveNotificationCapabilities(byte capabilities) {
+        notificationCapabilities = capabilities;
+        getCapabilitiesSharedPreferences().edit().putInt("notificationCapabilities", (int)capabilities).apply();
+    }
+
+    public void saveNotificationConstraints(ByteBuffer constraints) {
+        notificationConstraints = constraints;
+        getCapabilitiesSharedPreferences().edit().putString("notificationConstraints", GB.hexdump(constraints.array())).apply();
+    }
+
+    public void addCommandsForService(int service, byte[] commands) {
+        if (!commandsPerService.containsKey(service)) {
+            saveCommandsForService(service, commands);
+            return;
+        }
+        byte[] saved = commandsPerService.get(service);
+        if (saved == null) {
+            saveCommandsForService(service, commands);
+            return;
+        }
+        if (saved.length != commands.length) {
+            saveCommandsForService(service, commands);
+            return;
+        }
+        boolean changed = false;
+        for (int i = 0; i < saved.length; i++) {
+            if (saved[i] != commands[i]) {
+                changed = true;
+                break;
+            }
+        }
+        if (changed)
+            saveCommandsForService(service, commands);
+    }
+
+    public byte[] getCommandsForService(int service) {
+        return commandsPerService.get(service);
+    }
+
+    // Print all Services ID and Commands ID
+    public void printCommandsPerService() {
+        StringBuilder msg = new StringBuilder();
+        for(Map.Entry<Integer, byte[]> entry : commandsPerService.entrySet()) {
+            msg.append("ServiceID: ").append(entry.getKey()).append(" => Commands: ");
+            for (byte b: entry.getValue()) {
+                msg.append(Integer.toHexString(b)).append(" ");
+            }
+            msg.append("\n");
+        }
+        LOG.info(msg.toString());
+    }
+
+    private boolean supportsCommandForService(int service, int command) {
+        byte[] commands = commandsPerService.get(service);
+        if (commands == null)
+            return false;
+        for (byte b : commands)
+            if (b == (byte) command)
+                return true;
+        return false;
+    }
+
+    private boolean supportsExpandCapability(int which) {
+        // capability is a number containing :
+        //  - the index of the "service"
+        //  - the real capability number
+        if (which >= expandCapabilities.length * 8) {
+            LOG.debug("Capability is not supported");
+            return false;
+        }
+        int capability = 1 << (which % 8);
+        if ((expandCapabilities[which / 8] & capability) == capability) return true;
+        return false;
+    }
+
+    private boolean supportsNotificationConstraint(byte which) {
+        return notificationConstraints.get(which) == 0x01;
+    }
+
+    private int getNotificationConstraint(byte which) {
+        return notificationConstraints.get(which);
+    }
+
+    public int[] genericHuaweiSupportedDeviceSpecificSettings(int[] additionalDeviceSpecificSettings) {
+        // Add all settings in the default table
+        // Hide / show table in HuaweiSettingsCustommizer
+        List<Integer> dynamicSupportedDeviceSpecificSettings = new ArrayList<>();
+
+        // Could be limited to 0x04 0x01, but I don't know if that'll work properly
+        dynamicSupportedDeviceSpecificSettings.add(R.xml.devicesettings_allow_accept_reject_calls);
+
+        // Only supported on specific devices
+        dynamicSupportedDeviceSpecificSettings.add(R.xml.devicesettings_huawei);
+        dynamicSupportedDeviceSpecificSettings.add(R.xml.devicesettings_trusleep);
+        dynamicSupportedDeviceSpecificSettings.add(R.xml.devicesettings_wearlocation);
+        dynamicSupportedDeviceSpecificSettings.add(R.xml.devicesettings_dateformat);
+        dynamicSupportedDeviceSpecificSettings.add(R.xml.devicesettings_timeformat);
+        dynamicSupportedDeviceSpecificSettings.add(R.xml.devicesettings_workmode);
+        dynamicSupportedDeviceSpecificSettings.add(R.xml.devicesettings_liftwrist_display_noshed);
+        dynamicSupportedDeviceSpecificSettings.add(R.xml.devicesettings_rotatewrist_cycleinfo);
+
+        int size = dynamicSupportedDeviceSpecificSettings.size();
+        if (additionalDeviceSpecificSettings != null)
+            size += additionalDeviceSpecificSettings.length;
+        int[] result = new int[size];
+
+        for (int i = 0; i < dynamicSupportedDeviceSpecificSettings.size(); i++)
+            result[i] = dynamicSupportedDeviceSpecificSettings.get(i);
+
+        if (additionalDeviceSpecificSettings != null)
+            System.arraycopy(additionalDeviceSpecificSettings, 0, result, dynamicSupportedDeviceSpecificSettings.size(), additionalDeviceSpecificSettings.length);
+
+        return result;
+    }
+
+    public boolean supportsDateFormat() {
+        return supportsCommandForService(0x01, 0x04);
+    }
+
+    public boolean supportsActivateOnLift() {
+        return supportsCommandForService(0x01, 0x09);
+    }
+
+    public boolean supportsDoNotDisturb() {
+        return supportsCommandForService(0x01, 0x0a);
+    }
+    public boolean supportsDoNotDisturb(GBDevice gbDevice) {
+        return supportsDoNotDisturb() || getForceOption(gbDevice, PREF_FORCE_DND_SUPPORT);
+    }
+
+    public boolean supportsActivityType() {
+        return supportsCommandForService(0x01, 0x12);
+    }
+
+    public boolean supportsWearLocation() {
+        return supportsCommandForService(0x01, 0x1a);
+    }
+    public boolean supportsWearLocation(GBDevice gbDevice) {
+        return supportsWearLocation() || getForceOption(gbDevice, PREF_FORCE_ENABLE_WEAR_LOCATION);
+    }
+
+    public boolean supportsRotateToCycleInfo() {
+        return supportsCommandForService(0x01, 0x1b);
+    }
+
+    public boolean supportsQueryDndLiftWristDisturbType() {
+        return supportsCommandForService(0x01, 0x1d);
+    }
+
+    public boolean supportsSettingRelated() {
+        return supportsCommandForService(0x01, 0x31);
+    }
+
+    public boolean supportsTimeAndZoneId() {
+        return supportsCommandForService(0x01, 0x32);
+    }
+
+    public boolean supportsConnectStatus() {
+        return supportsCommandForService(0x01, 0x35);
+    }
+
+    public boolean supportsExpandCapability() {
+        return supportsCommandForService(0x01, 0x37);
+    }
+
+    public boolean supportsNotificationAlert() {
+        return supportsCommandForService(0x02, 0x01);
+    }
+
+    public boolean supportsNotification() {
+        return supportsCommandForService(0x02, 0x04);
+    }
+
+    public boolean supportsWearMessagePush() {
+        return supportsCommandForService(0x02, 0x08);
+    }
+
+
+    public boolean supportsMotionGoal() {
+        return supportsCommandForService(0x07, 0x01);
+    }
+    
+    public boolean supportsInactivityWarnings() {
+        return supportsCommandForService(0x07, 0x06);
+    }
+
+    public boolean supportsActivityReminder() {
+        return supportsCommandForService(0x07, 0x07);
+    }
+
+    public boolean supportsTruSleep() {
+        return supportsCommandForService(0x07, 0x16);
+    }
+
+    public boolean supportsHeartRate() {
+        // TODO: this is not correct
+        return supportsCommandForService(0x07, 0x17);
+    }
+
+    public boolean supportsFitnessRestHeartRate() {
+        return supportsCommandForService(0x07, 0x23);
+    }
+
+    public boolean supportsFitnessThresholdValue() {
+        return supportsCommandForService(0x07, 0x29);
+    }
+
+    public boolean supportsEventAlarm() {
+        return supportsCommandForService(0x08, 0x01);
+    }
+
+    public boolean supportsSmartAlarm() {
+        return supportsCommandForService(0x08, 0x02) ;
+    }
+    public boolean supportsSmartAlarm(GBDevice gbDevice) {
+        return supportsSmartAlarm() || getForceOption(gbDevice, PREF_FORCE_ENABLE_SMART_ALARM);
+    }
+
+    /**
+     * @return True if alarms can be changed on the device, false otherwise
+     */
+    public boolean supportsChangingAlarm() {
+        return supportsCommandForService(0x08, 0x03);
+    }
+
+    public boolean supportsNotificationOnBluetoothLoss() {
+        return supportsCommandForService(0x0b, 0x03);
+    }
+
+    public boolean supportsLanguageSetting() {
+        return supportsCommandForService(0x0c, 0x01);
+    }
+
+    public boolean supportsWorkouts() {
+        return supportsCommandForService(0x17, 0x01);
+    }
+
+    public boolean supportsWorkoutsTrustHeartRate() {
+        return supportsCommandForService(0x17, 0x17);
+    }
+
+    public boolean supportsAccount() {
+        return supportsCommandForService(0x1A, 0x05) || supportsCommandForService(0x1A, 0x06);
+    }
+
+    public boolean supportsMusic() {
+        return supportsCommandForService(0x25, 0x02);
+    }
+
+    public boolean supportsAutoWorkMode() {
+        return supportsCommandForService(0x26, 0x02);
+    }
+
+    public boolean supportsMenstrual() {
+        return supportsCommandForService(0x32, 0x01);
+    }
+
+    public boolean supportsMultiDevice() {
+        if (supportsExpandCapability())
+            return supportsExpandCapability(109);
+        return false;
+    }
+
+    public boolean supportsPromptPushMessage () {
+//              do not ask for capabilities under specific condition
+//                  if (deviceType == 10 && deviceVersion == 73617766697368 && deviceSoftVersion == 372E312E31) -> leo device
+//                  if V1V0Device
+//                  if (serviceId = 0x01 && commandId = 0x03) && productType == 3
+        return (((notificationCapabilities >> 1) & 1) == 0);
+    }
+
+    public boolean supportsOutgoingCall () {
+        return (((notificationCapabilities >> 2) & 1) == 0);
+    }
+
+    public boolean supportsYellowPages() {
+        return supportsNotificationConstraint(NotificationConstraintsType.yellowPagesSupport);
+    }
+
+    public boolean supportsContentSIgn() {
+        return supportsNotificationConstraint(NotificationConstraintsType.contentSignSupport);
+    }
+
+    public boolean supportsIncomingNumber() {
+        return supportsNotificationConstraint(NotificationConstraintsType.incomingNumberSupport);
+    }
+
+    public byte getYellowPagesFormat() {
+        return (byte)getNotificationConstraint(NotificationConstraintsType.yellowPagesFormat);
+    }
+
+    public byte getContentSignFormat() {
+        return (byte)getNotificationConstraint(NotificationConstraintsType.contentSignFormat);
+    }
+
+    public byte getIncomingFormatFormat() {
+        return (byte)getNotificationConstraint(NotificationConstraintsType.incomingNumberFormat);
+    }
+
+    public short getContentLength() {
+        return (short)getNotificationConstraint(NotificationConstraintsType.contentLength);
+    }
+
+    public short getYellowPagesLength() {
+        return (short)getNotificationConstraint(NotificationConstraintsType.yellowPagesLength);
+    }
+
+    public short getContentSignLength() {
+        return (short)getNotificationConstraint(NotificationConstraintsType.contentSignLength);
+    }
+
+    public short getIncomingNumberLength() {
+        return (short)getNotificationConstraint(NotificationConstraintsType.incomingNumberLength);
+    }
+
+    public int getAlarmSlotCount(GBDevice gbDevice) {
+        int alarmCount = 0;
+        if (supportsEventAlarm())
+            alarmCount += 5; // Always five event alarms
+        if (supportsSmartAlarm(gbDevice))
+            alarmCount += 1; // Always a single smart alarm
+        return alarmCount;
+    }
+
+    public void setTransactionCrypted(boolean crypted) {
+        this.transactionCrypted = crypted;
+    }
+
+    public boolean isTransactionCrypted() {
+        return this.transactionCrypted;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCoordinatorSupplier.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCoordinatorSupplier.java
new file mode 100644
index 000000000..3709ed031
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCoordinatorSupplier.java
@@ -0,0 +1,48 @@
+/*  Copyright (C) 2021-2023 Gaignon Damien
+    Copyright (C) 2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei;
+
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
+
+public interface HuaweiCoordinatorSupplier {
+
+    enum HuaweiDeviceType {
+        AW(0),     //BLE behind
+        BR(1),
+        BLE(2),
+        SMART(5)   //BLE behind
+        ;
+
+        final int huaweiType;
+
+        HuaweiDeviceType(int huaweiType) {
+            this.huaweiType = huaweiType;
+        }
+
+        public int getType(){
+            return huaweiType;
+        }
+    }
+
+    HuaweiCoordinator getHuaweiCoordinator();
+    HuaweiDeviceType getHuaweiType();
+    DeviceType getDeviceType();
+    void setDevice(GBDevice Device);
+    GBDevice getDevice();
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCrypto.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCrypto.java
new file mode 100644
index 000000000..d22047a5a
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCrypto.java
@@ -0,0 +1,248 @@
+/*  Copyright (C) 2021-2023 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei;
+
+import nodomain.freeyourgadget.gadgetbridge.util.CryptoUtils;
+
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.NoSuchAlgorithmException;
+import java.security.InvalidKeyException;
+import java.security.SecureRandom;
+import java.util.Arrays;
+
+import javax.crypto.BadPaddingException;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class HuaweiCrypto {
+    private static final Logger LOG = LoggerFactory.getLogger(HuaweiCrypto.class);
+
+    public static class CryptoException extends Exception {
+        CryptoException(Exception e) {
+            super(e);
+        }
+    }
+
+    public static final byte[] SECRET_KEY_1_v1 = new byte[]{ 0x6F, 0x75, 0x6A, 0x79,
+                                                            0x6D, 0x77, 0x71, 0x34,
+                                                            0x63, 0x6C, 0x76, 0x39,
+                                                            0x33, 0x37, 0x38, 0x79};
+    public static final byte[] SECRET_KEY_2_v1 = new byte[]{ 0x62, 0x31, 0x30, 0x6A,
+                                                            0x67, 0x66, 0x64, 0x39,
+                                                            0x79, 0x37, 0x76, 0x73,
+                                                            0x75, 0x64, 0x61, 0x39};
+    public static final byte[] SECRET_KEY_1_v23 = new byte[]{ 0x55, 0x53, (byte)0x86, (byte)0xFC,
+                                                            0x63, 0x20, 0x07, (byte)0xAA,
+                                                            (byte)0x86, 0x49, 0x35, 0x22,
+                                                            (byte)0xB8, 0x6A, (byte)0xE2, 0x5C};
+    public static final byte[] SECRET_KEY_2_v23 = new byte[]{ 0x33, 0x07, (byte)0x9B, (byte)0xC5,
+                                                            0x7A, (byte)0x88, 0x6D, 0x3C,
+                                                            (byte)0xF5, 0x61, 0x37, 0x09,
+                                                            0x6F, 0x22, (byte)0x80, 0x00};
+
+    public static final byte[] DIGEST_SECRET_v1 = new byte[]{ 0x70, (byte)0xFB, 0x6C, 0x24,
+                                                            0x03, 0x5F, (byte)0xDB, 0x55,
+                                                            0x2F, 0x38, (byte)0x89, (byte)0x8A,
+                                                            (byte) 0xEE, (byte)0xDE, 0x3F, 0x69};
+    public static final byte[] DIGEST_SECRET_v2 = new byte[]{ (byte)0x93, (byte)0xAC, (byte)0xDE, (byte)0xF7,
+                                                            0x6A, (byte)0xCB, 0x09, (byte)0x85,
+                                                            0x7D, (byte)0xBF, (byte)0xE5, 0x26,
+                                                            0x1A, (byte)0xAB, (byte)0xCD, 0x78};
+    public static final byte[] DIGEST_SECRET_v3 = new byte[]{ (byte)0x9C, 0x27, 0x63, (byte)0xA9,
+                                                            (byte)0xCC, (byte)0xE1, 0x34, 0x76,
+                                                            0x6D, (byte)0xE3, (byte)0xFF, 0x61,
+                                                            0x18, 0x20, 0x05, 0x53};
+
+    public static final byte[] MESSAGE_RESPONSE = new byte[]{0x01, 0x10};
+    public static final byte[] MESSAGE_CHALLENGE = new byte[]{0x01, 0x00};
+
+    public static final long ENCRYPTION_COUNTER_MAX = 0xFFFFFFFF;
+
+    protected int authVersion;
+    protected boolean isHiChainLite = false;
+
+    public HuaweiCrypto(int authVersion) {
+        this.authVersion = authVersion;
+    }
+
+    public HuaweiCrypto(int authVersion, boolean isHiChainLite) {
+        this(authVersion);
+        this.isHiChainLite = isHiChainLite;
+    }
+
+    public static byte[] generateNonce() {
+        // While technically not a nonce, we need it to be random and rely on the length for the chance of repitition to be small
+        byte[] returnValue = new byte[16];
+        (new SecureRandom()).nextBytes(returnValue);
+        return returnValue;
+    }
+
+    private byte[] getDigestSecret() {
+        if (authVersion == 1) {
+            return DIGEST_SECRET_v1;
+        } else if (authVersion == 2) {
+            return DIGEST_SECRET_v2;
+        } else {
+            return DIGEST_SECRET_v3;
+        }
+    }
+    public byte[] computeDigest(byte[] message, byte[] nonce) throws NoSuchAlgorithmException, InvalidKeyException {
+        byte[] digestSecret = getDigestSecret();
+        byte[] msgToDigest = ByteBuffer.allocate(16 + message.length)
+                                                .put(digestSecret)
+                                                .put(message)
+                                                .array();
+        byte[] digestStep1 = CryptoUtils.calcHmacSha256(msgToDigest, nonce);
+        return CryptoUtils.calcHmacSha256(digestStep1, nonce);
+    }
+
+    public byte[] computeDigestHiChainLite(byte[] message, byte[] key, byte[] nonce) throws NoSuchAlgorithmException, InvalidKeyException {
+        byte[] hashKey = CryptoUtils.digest(key);
+        byte[] digestSecret = getDigestSecret();
+        for (int i = 0; i < digestSecret.length; i++) {
+            digestSecret[i] = (byte) (((0xFF & hashKey[i]) ^ (digestSecret[i] & 0xFF)) & 0xFF);
+        }
+        // 2 possibilities:
+        // - type 1 : Pbk (SDK_INT>= 0x17) fallback to MacSha
+        // - type 2 : MacSha
+        // We force type 2 to avoid a new calculation
+        byte[] msgToDigest = ByteBuffer.allocate(18)
+                .put(digestSecret)
+                .put(message)
+                .array();
+        byte[] digestStep1 = CryptoUtils.calcHmacSha256(msgToDigest, nonce) ;
+        return CryptoUtils.calcHmacSha256(digestStep1, nonce);
+    }
+
+    public byte[] digestChallenge(byte[] secretKey, byte[] nonce) throws NoSuchAlgorithmException, InvalidKeyException {
+        if (isHiChainLite) {
+            if (secretKey == null)
+                return null;
+            if (authVersion == 0x02) {
+                byte[] key = ByteBuffer.allocate(18)
+                        .put(secretKey)
+                        .put(MESSAGE_CHALLENGE)
+                        .array();
+                return CryptoUtils.calcHmacSha256(key, nonce);
+            }
+            return computeDigestHiChainLite(MESSAGE_CHALLENGE, secretKey, nonce);
+        }
+        return computeDigest(MESSAGE_CHALLENGE, nonce);
+    }
+
+    public byte[] digestResponse(byte[] secretKey, byte[] nonce) throws NoSuchAlgorithmException, InvalidKeyException {
+        if (isHiChainLite) {
+            if (secretKey == null)
+                return null;
+            if (authVersion == 0x02) {
+                byte[] key = ByteBuffer.allocate(18)
+                        .put(secretKey)
+                        .put(MESSAGE_RESPONSE)
+                        .array();
+                return CryptoUtils.calcHmacSha256(key, nonce);
+            }
+            return computeDigestHiChainLite(MESSAGE_RESPONSE, secretKey, nonce);
+        }
+        return computeDigest(MESSAGE_RESPONSE, nonce);
+    }
+
+    public static ByteBuffer initializationVector(long counter) {
+        if (counter == ENCRYPTION_COUNTER_MAX) {
+            counter = 1;
+        } else {
+            counter += 1;
+        }
+        ByteBuffer ivCounter = ByteBuffer.allocate(16);
+        ivCounter.put(generateNonce(), 0, 12);
+        ivCounter.put(ByteBuffer.allocate(8).putLong(counter).array(), 4, 4);
+        ivCounter.rewind();
+        return ivCounter;
+    }
+
+    public byte[] createSecretKey(String macAddress) throws NoSuchAlgorithmException {
+        byte[] secret_key_1 = SECRET_KEY_1_v23;
+        byte[] secret_key_2 = SECRET_KEY_2_v23;
+        if (authVersion == 1) {
+            secret_key_1 = SECRET_KEY_1_v1;
+            secret_key_2 = SECRET_KEY_2_v1;
+        }
+
+        byte[] macAddressKey = (macAddress.replace(":", "") + "0000").getBytes(StandardCharsets.UTF_8);
+
+        byte[] mixedSecretKey = new byte[16];
+        for (int i = 0; i < 16; i++) {
+            mixedSecretKey[i] = (byte)((((0xFF & secret_key_1[i]) << 4) ^ (0xFF & secret_key_2[i])) & 0xFF);
+        }
+
+        byte[] mixedSecretKeyHash = CryptoUtils.digest(mixedSecretKey);
+        byte[] finalMixedKey = new byte[16];
+        for (int i = 0; i < 16; i++) {
+            finalMixedKey[i] = (byte)((((0xFF & mixedSecretKeyHash[i]) >> 6) ^ (0xFF & macAddressKey[i])) & 0xFF);
+        }
+        byte[] finalMixedKeyHash = CryptoUtils.digest(finalMixedKey);
+        return Arrays.copyOfRange(finalMixedKeyHash, 0, 16);
+    }
+
+    public byte[] encryptBondingKey(byte[] data, String mac, byte[] iv) throws NoSuchAlgorithmException, InvalidAlgorithmParameterException, NoSuchPaddingException, IllegalBlockSizeException, BadPaddingException, InvalidKeyException, IllegalArgumentException {
+        byte[] encryptionKey = createSecretKey(mac);
+        return CryptoUtils.encryptAES_CBC_Pad(data, encryptionKey, iv);
+    }
+
+    public byte[] decryptBondingKey(byte[] data, String mac, byte[] iv) throws NoSuchAlgorithmException, InvalidAlgorithmParameterException, NoSuchPaddingException, IllegalBlockSizeException, BadPaddingException, InvalidKeyException, IllegalArgumentException {
+        byte[] encryptionKey = createSecretKey(mac);
+        return CryptoUtils.decryptAES_CBC_Pad(data, encryptionKey, iv);
+    }
+
+    public byte[] decryptPinCode(byte[] message, byte[] iv) throws CryptoException {
+        byte[] secretKey = getDigestSecret();
+        try {
+            return CryptoUtils.decryptAES_CBC_Pad(message, secretKey, iv);
+        } catch (Exception e) {
+            throw new CryptoException(e);
+        }
+    }
+
+    public static byte[] encrypt(byte authMode, byte[] message, byte[] key, byte[] iv) throws CryptoException {
+        try {
+            if (authMode == 0x04) {
+                return CryptoUtils.encryptAES_GCM_NoPad(message, key, iv, null);
+            } else {
+                return CryptoUtils.encryptAES_CBC_Pad(message, key, iv);
+            }
+        } catch (InvalidAlgorithmParameterException | NoSuchPaddingException | IllegalBlockSizeException | NoSuchAlgorithmException | BadPaddingException | InvalidKeyException | IllegalArgumentException e) {
+            throw new CryptoException(e);
+        }
+    }
+
+    public static byte[] decrypt(byte authMode, byte[] message, byte[] key, byte[] iv) throws CryptoException {
+        try {
+            if (authMode == 0x04) {
+                return CryptoUtils.decryptAES_GCM_NoPad(message, key, iv, null);
+            } else {
+                return CryptoUtils.decryptAES_CBC_Pad(message, key, iv);
+            }
+        } catch (InvalidAlgorithmParameterException | NoSuchPaddingException | IllegalBlockSizeException | NoSuchAlgorithmException | BadPaddingException | InvalidKeyException | IllegalArgumentException e) {
+            throw new CryptoException(e);
+        }
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiLECoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiLECoordinator.java
new file mode 100644
index 000000000..2c359fe01
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiLECoordinator.java
@@ -0,0 +1,225 @@
+/*  Copyright (C) 2023 Gaignon Damien
+    Copyright (C) 2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei;
+
+import android.app.Activity;
+import android.bluetooth.le.ScanFilter;
+import android.content.Context;
+import android.net.Uri;
+import android.os.ParcelUuid;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import de.greenrobot.dao.query.QueryBuilder;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSpecificSettingsCustomizer;
+import nodomain.freeyourgadget.gadgetbridge.GBException;
+import nodomain.freeyourgadget.gadgetbridge.devices.AbstractBLEDeviceCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
+import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.entities.AbstractActivitySample;
+import nodomain.freeyourgadget.gadgetbridge.entities.BaseActivitySummaryDao;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.entities.Device;
+import nodomain.freeyourgadget.gadgetbridge.entities.HuaweiActivitySampleDao;
+import nodomain.freeyourgadget.gadgetbridge.entities.HuaweiWorkoutDataSampleDao;
+import nodomain.freeyourgadget.gadgetbridge.entities.HuaweiWorkoutSummarySample;
+import nodomain.freeyourgadget.gadgetbridge.entities.HuaweiWorkoutSummarySampleDao;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
+import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiLESupport;
+
+public abstract class HuaweiLECoordinator extends AbstractBLEDeviceCoordinator implements HuaweiCoordinatorSupplier {
+
+    private final HuaweiCoordinator huaweiCoordinator = new HuaweiCoordinator(this);
+    private GBDevice device;
+
+    @Override
+    public HuaweiCoordinator getHuaweiCoordinator() {
+        return huaweiCoordinator;
+    }
+
+    @NonNull
+    @Override
+    public Collection<? extends ScanFilter> createBLEScanFilters() {
+        ParcelUuid huaweiService = new ParcelUuid(HuaweiConstants.UUID_SERVICE_HUAWEI_SERVICE);
+        ScanFilter filter = new ScanFilter.Builder().setServiceUuid(huaweiService).build();
+        return Collections.singletonList(filter);
+    }
+
+    @Override
+    public DeviceSpecificSettingsCustomizer getDeviceSpecificSettingsCustomizer(final GBDevice device) {
+        return new HuaweiSettingsCustomizer(device);
+    }
+
+    @Nullable
+    @Override
+    public Class<? extends Activity> getPairingActivity() {
+        return null;
+    }
+    
+    @Override
+    public int getBondingStyle(){
+        return BONDING_STYLE_NONE;
+    }
+
+    @Override
+    protected void deleteDevice(@NonNull GBDevice gbDevice, @NonNull Device device, @NonNull DaoSession session) throws GBException {
+        long deviceId = device.getId();
+        QueryBuilder<?> qb = session.getHuaweiActivitySampleDao().queryBuilder();
+        qb.where(HuaweiActivitySampleDao.Properties.DeviceId.eq(deviceId)).buildDelete().executeDeleteWithoutDetachingEntities();
+
+        QueryBuilder<HuaweiWorkoutSummarySample> qb2 = session.getHuaweiWorkoutSummarySampleDao().queryBuilder();
+        List<HuaweiWorkoutSummarySample> workouts = qb2.where(HuaweiWorkoutSummarySampleDao.Properties.DeviceId.eq(deviceId)).build().list();
+        for (HuaweiWorkoutSummarySample sample : workouts) {
+            session.getHuaweiWorkoutDataSampleDao().queryBuilder().where(
+                    HuaweiWorkoutDataSampleDao.Properties.WorkoutId.eq(sample.getWorkoutId())
+            ).buildDelete().executeDeleteWithoutDetachingEntities();
+        }
+
+        session.getHuaweiWorkoutSummarySampleDao().queryBuilder().where(HuaweiWorkoutSummarySampleDao.Properties.DeviceId.eq(deviceId)).buildDelete().executeDeleteWithoutDetachingEntities();
+
+        session.getBaseActivitySummaryDao().queryBuilder().where(BaseActivitySummaryDao.Properties.DeviceId.eq(deviceId)).buildDelete().executeDeleteWithoutDetachingEntities();
+    }
+
+    @Override
+    public String getManufacturer() {
+        return "Huawei";
+    }
+
+    @Override
+    public boolean supportsScreenshots() {
+        return false;
+    }
+
+    @Override
+    public boolean supportsSmartWakeup(GBDevice device) {
+        return huaweiCoordinator.supportsSmartAlarm(device);
+    }
+
+    @Override
+    public boolean supportsFindDevice() {
+        return false;
+    }
+
+    @Override
+    public boolean supportsAlarmSnoozing() {
+        return false;
+    }
+
+    @Override
+    public boolean supportsAlarmDescription(GBDevice device) {
+        // TODO: only name is supported
+        return true;
+    }
+
+    @Override
+    public boolean supportsWeather() {
+        return false;
+    }
+
+    @Override
+    public boolean supportsRealtimeData() {
+        return false;
+    }
+
+    @Override
+    public boolean supportsCalendarEvents() {
+        return false;
+    }
+
+    @Override
+    public Class<? extends Activity> getAppsManagementActivity() {
+        return null;
+    }
+
+    @Override
+    public boolean supportsAppsManagement(GBDevice device) {
+        return false;
+    }
+
+    @Override
+    public int getAlarmSlotCount(GBDevice device) {
+        return huaweiCoordinator.getAlarmSlotCount(device);
+    }
+
+    @Override
+    public boolean supportsActivityDataFetching() {
+        return true;
+    }
+
+    @Override
+    public boolean supportsActivityTracking() {
+        return true;
+    }
+
+    @Override
+    public boolean supportsActivityTracks() {
+        return true;
+    }
+
+    @Override
+    public boolean supportsHeartRateMeasurement(GBDevice device) {
+        return false;
+    }
+
+    @Override
+    public boolean supportsMusicInfo() {
+        return getHuaweiCoordinator().supportsMusic();
+    }
+
+    @Override
+    public InstallHandler findInstallHandler(Uri uri, Context context) {
+        return null;
+    }
+
+    @Override
+    public SampleProvider<? extends AbstractActivitySample> getSampleProvider(GBDevice device, DaoSession session) {
+        return new HuaweiSampleProvider(device, session);
+    }
+
+    public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
+        return new int[]{};
+    }
+
+    @Override
+    public HuaweiDeviceType getHuaweiType() {
+        return HuaweiDeviceType.BLE;
+    }
+
+    @Override
+    public void setDevice(GBDevice device) {
+        this.device = device;
+    }
+
+    @Override
+    public GBDevice getDevice() {
+        return this.device;
+    }
+
+    @NonNull
+    @Override
+    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+        return HuaweiLESupport.class;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiPacket.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiPacket.java
new file mode 100644
index 000000000..3001c6b6d
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiPacket.java
@@ -0,0 +1,665 @@
+/*  Copyright (C) 2021-2023 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei;
+
+import static nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants.HUAWEI_MAGIC;
+
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.Alarms;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.AccountRelated;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.Calls;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.Workout;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.DeviceConfig;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.FindPhone;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.FitnessData;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.MusicControl;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.Notifications;
+import nodomain.freeyourgadget.gadgetbridge.util.CheckSums;
+
+public class HuaweiPacket {
+    private static final Logger LOG = LoggerFactory.getLogger(HuaweiPacket.class);
+
+    public static class ParamsProvider {
+        protected byte authVersion;
+        protected byte authMode;
+        protected byte[] secretKey;
+        protected int slicesize = 0xf4;
+        protected boolean transactionsCrypted = true;
+        protected int mtu = 65535;
+        protected long encryptionCounter = 0;
+
+        protected byte[] pinCode = null;
+
+        protected byte interval;
+
+        public void setAuthVersion(byte authVersion) {
+            this.authVersion = authVersion;
+        }
+
+        public byte getAuthVersion() {
+            return this.authVersion;
+        }
+
+        public void setAuthMode(byte authMode) {
+            this.authMode = authMode;
+        }
+
+        public byte getAuthMode(){
+            return this.authMode;
+        }
+
+        public void setSecretKey(byte[] secretKey) {
+            this.secretKey = secretKey;
+        }
+
+        public byte[] getSecretKey() {
+            return this.secretKey;
+        }
+
+        public void setTransactionsCrypted(boolean transactionsCrypted) {
+            this.transactionsCrypted = transactionsCrypted;
+        }
+
+        public boolean areTransactionsCrypted() {
+            return this.transactionsCrypted;
+        }
+
+        public void setMtu(int mtu) {
+            this.mtu = mtu;
+        }
+
+        public int getMtu() {
+            return this.mtu;
+        }
+
+        public void setSliceSize(int sliceSize) {
+            this.slicesize = sliceSize;
+        }
+
+        public int getSliceSize() {
+            return this.slicesize;
+        }
+        public void setPinCode(byte[] pinCode) {
+            this.pinCode = pinCode;
+        }
+
+        public byte[] getPinCode() {
+            return this.pinCode;
+        }
+
+        public void setInterval(byte interval) {
+            this.interval = interval;
+        }
+
+        public byte getInterval() {
+            return this.interval;
+        }
+
+        public byte[] getIv() {
+            byte[] iv = null;
+            if (this.authMode == 0x04) {
+                iv = HuaweiCrypto.generateNonce();
+            } else {
+                ByteBuffer ivCounter = HuaweiCrypto.initializationVector(this.encryptionCounter);
+                iv = ivCounter.array();
+                this.encryptionCounter = (long)ivCounter.getInt(12) & 0xFFFFFFFFL;
+            }
+            return iv;
+        }
+
+        public void setEncryptionCounter(long counter) {
+            this.encryptionCounter = counter;
+        }
+    }
+
+    public static abstract class ParseException extends Exception {
+        ParseException(String message) {
+            super(message);
+        }
+
+        ParseException(String message, Exception e) {
+            super(message, e);
+        }
+    }
+
+    public static class LengthMismatchException extends ParseException {
+        public LengthMismatchException(String message) {
+            super(message);
+        }
+    }
+
+    public static class MagicMismatchException extends ParseException {
+        MagicMismatchException(String message) {
+            super(message);
+        }
+    }
+
+    public static class ChecksumIncorrectException extends ParseException {
+        ChecksumIncorrectException(String message) {
+            super(message);
+        }
+    }
+
+    public static class MissingTagException extends ParseException {
+        public MissingTagException(int tag) {
+            super("Missing tag: " + Integer.toHexString(tag));
+        }
+    }
+
+    public static class CryptoException extends ParseException {
+        public CryptoException(String message, Exception e) {
+            super(message, e);
+        }
+    }
+
+    public static class JsonException extends ParseException {
+        public JsonException(String message, Exception e) {
+            super(message, e);
+        }
+    }
+
+    public static class SupportedCommandsListException extends ParseException {
+        public SupportedCommandsListException(String message) {
+            super(message);
+        }
+    }
+
+    public static class SerializeException extends Exception {
+        public SerializeException(String message, Exception e) {
+            super(message, e);
+        }
+    }
+
+    protected static final int PACKET_MINIMAL_SIZE = 6;
+
+    protected ParamsProvider paramsProvider;
+
+    public byte serviceId = 0;
+    public byte commandId = 0;
+    protected HuaweiTLV tlv = null;
+
+    private byte[] partialPacket = null;
+    private byte[] payload = null;
+
+    public boolean complete = false;
+
+    // Encryption is enabled by default, packets which don't use it must disable it
+    protected boolean isEncrypted = true;
+
+    protected boolean isSliced = false;
+
+    public HuaweiPacket(ParamsProvider paramsProvider) {
+        this.paramsProvider = paramsProvider;
+    }
+
+    public boolean attemptDecrypt() throws ParseException {
+        if (this.tlv == null)
+            return false;
+        if (this.tlv.contains(0x7C) && this.tlv.getBoolean(0x7C)) {
+            try {
+                this.tlv.decrypt(paramsProvider);
+                return true;
+            } catch (HuaweiCrypto.CryptoException e) {
+                throw new CryptoException("Decrypt exception", e);
+            }
+        } else {
+            if (this.isEncrypted && paramsProvider.areTransactionsCrypted()) {
+                // TODO: potentially a log message? We expect it to be encrypted, but it isn't.
+            }
+        }
+        return false;
+    }
+
+    /*
+     * This function is to convert the Packet into the proper subclass
+     */
+    protected HuaweiPacket fromPacket(HuaweiPacket packet) throws ParseException {
+        this.paramsProvider = packet.paramsProvider;
+        this.serviceId = packet.serviceId;
+        this.commandId = packet.commandId;
+        this.tlv = packet.tlv;
+        this.partialPacket = packet.partialPacket;
+        this.payload = packet.payload;
+        this.complete = packet.complete;
+
+        if (packet.isEncrypted)
+            this.isEncrypted = true;
+        else
+            this.isEncrypted = this.attemptDecrypt();
+
+        return this;
+    }
+
+    /*
+     * This function is to set up the subclass for easy usage
+     * Needs to be called separately so the exceptions can be used more easily
+     */
+    public void parseTlv() throws ParseException {}
+
+    private void parseData(byte[] data) throws ParseException {
+        if (partialPacket != null) {
+            int newCapacity = partialPacket.length + data.length;
+            data = ByteBuffer.allocate(newCapacity)
+                    .put(partialPacket)
+                    .put(data)
+                    .array();
+        }
+
+        ByteBuffer buffer = ByteBuffer.wrap(data);
+
+        if (buffer.capacity() < PACKET_MINIMAL_SIZE) {
+            throw new LengthMismatchException("Packet length mismatch : "
+                    + buffer.capacity()
+                    + " != 6");
+        }
+
+        byte magic = buffer.get();
+        short expectedSize = buffer.getShort();
+        int isSliced = buffer.get();
+        if (isSliced == 1 || isSliced == 2 || isSliced == 3) {
+            buffer.get(); // Throw away slice flag
+        }
+        byte[] newPayload = new byte[buffer.remaining() - 2];
+        buffer.get(newPayload, 0, buffer.remaining() - 2);
+        short expectedChecksum = buffer.getShort();
+        buffer.rewind();
+
+        if (magic != HUAWEI_MAGIC) {
+            throw new MagicMismatchException("Magic mismatch : "
+                    + Integer.toHexString(magic)
+                    + " != 0x5A");
+        }
+
+        int newPayloadLen = newPayload.length + 1;
+        if (isSliced == 1 || isSliced == 2 || isSliced == 3) {
+            newPayloadLen = newPayload.length + 2;
+        }
+        if (expectedSize != (short) newPayloadLen) {
+            if (expectedSize > (short) newPayloadLen) {
+                // Older band and BT version do not handle message with more than 256 bits.
+                this.partialPacket = data;
+                return;
+            } else {
+                throw new LengthMismatchException("Expected length mismatch : "
+                    + expectedSize
+                    + " < "
+                    + (short) newPayloadLen);
+            }
+        }
+        this.partialPacket = null;
+
+        byte[] dataNoCRC = new byte[buffer.capacity() - 2];
+        buffer.get(dataNoCRC, 0, buffer.capacity() - 2);
+        short actualChecksum = (short) CheckSums.getCRC16(dataNoCRC, 0x0000);
+        if (actualChecksum != expectedChecksum) {
+            throw new ChecksumIncorrectException("Checksum mismatch : "
+                    + String.valueOf(actualChecksum)
+                    + " != "
+                    + String.valueOf(expectedChecksum));
+        }
+
+        if (isSliced == 1 || isSliced == 2 || isSliced == 3) {
+            if (payload != null) {
+                int newCapacity = payload.length + newPayload.length;
+                newPayload = ByteBuffer.allocate(newCapacity)
+                        .put(payload)
+                        .put(newPayload)
+                        .array();
+            }
+
+            if (isSliced != 3) {
+                // Sliced packet isn't complete yet
+                this.payload = newPayload;
+                return;
+            }
+        }
+
+        this.serviceId = newPayload[0];
+        this.commandId = newPayload[1];
+        this.complete = true;
+
+        if (
+                (serviceId == 0x0a && commandId == 0x05) ||
+                (serviceId == 0x28 && commandId == 0x06)
+        ) {
+            // TODO: this doesn't seem to be TLV
+            return;
+        }
+
+        this.tlv = new HuaweiTLV();
+        this.tlv.parse(newPayload, 2, newPayload.length - 2);
+    }
+
+    public HuaweiPacket parse(byte[] data) throws ParseException {
+        this.isEncrypted = false; // Will be changed if decrypt has been performed
+
+        parseData(data);
+        if (!this.complete)
+            return this;
+
+        switch (this.serviceId) {
+            case DeviceConfig.id:
+                switch (this.commandId) {
+                    case DeviceConfig.LinkParams.id:
+                        return new DeviceConfig.LinkParams.Response(paramsProvider).fromPacket(this);
+                    case DeviceConfig.SupportedServices.id:
+                        return new DeviceConfig.SupportedServices.Response(paramsProvider).fromPacket(this);
+                    case DeviceConfig.SupportedCommands.id:
+                        return new DeviceConfig.SupportedCommands.Response(paramsProvider).fromPacket(this);
+                    case DeviceConfig.ProductInfo.id:
+                        return new DeviceConfig.ProductInfo.Response(paramsProvider).fromPacket(this);
+                    case DeviceConfig.BondParams.id:
+                        return new DeviceConfig.BondParams.Response(paramsProvider).fromPacket(this);
+                    case DeviceConfig.Auth.id:
+                        return new DeviceConfig.Auth.Response(paramsProvider).fromPacket(this);
+                    case DeviceConfig.BatteryLevel.id:
+                        return new DeviceConfig.BatteryLevel.Response(paramsProvider).fromPacket(this);
+                    case DeviceConfig.DeviceStatus.id:
+                        return new DeviceConfig.DeviceStatus.Response(paramsProvider).fromPacket(this);
+                    case DeviceConfig.DndLiftWristType.id:
+                        return new DeviceConfig.DndLiftWristType.Response(paramsProvider).fromPacket(this);
+                    case DeviceConfig.HiChain.id:
+                        return new DeviceConfig.HiChain.Response(paramsProvider).fromPacket(this);
+                    case DeviceConfig.PinCode.id:
+                        return new DeviceConfig.PinCode.Response(paramsProvider).fromPacket(this);
+                    case DeviceConfig.ExpandCapability.id:
+                        return new DeviceConfig.ExpandCapability.Response(paramsProvider).fromPacket(this);
+                    case DeviceConfig.ActivityType.id:
+                        return new DeviceConfig.ActivityType.Response(paramsProvider).fromPacket(this);
+                    case DeviceConfig.SettingRelated.id:
+                        return new DeviceConfig.SettingRelated.Response(paramsProvider).fromPacket(this);
+                    case DeviceConfig.SecurityNegotiation.id:
+                        return new DeviceConfig.SecurityNegotiation.Response(paramsProvider).fromPacket(this);
+                    case DeviceConfig.WearStatus.id:
+                        return new DeviceConfig.WearStatus.Response(paramsProvider).fromPacket(this);
+                    default:
+                        this.isEncrypted = this.attemptDecrypt(); // Helps with debugging
+                        return this;
+                }
+            case Notifications.id:
+                switch (this.commandId) {
+                    case Notifications.NotificationConstraints.id:
+                        return new Notifications.NotificationConstraints.Response(paramsProvider).fromPacket(this);
+                    case Notifications.NotificationCapabilities.id:
+                        return new Notifications.NotificationCapabilities.Response(paramsProvider).fromPacket(this);
+                    default:
+                        return this;
+                }
+            case Calls.id:
+                if (this.commandId == Calls.AnswerCallResponse.id)
+                    return new Calls.AnswerCallResponse(paramsProvider).fromPacket(this);
+                this.isEncrypted = this.attemptDecrypt(); // Helps with debugging
+                return this;
+            case FitnessData.id:
+                switch (this.commandId) {
+                    case FitnessData.FitnessTotals.id:
+                        return new FitnessData.FitnessTotals.Response(paramsProvider).fromPacket(this);
+                    case FitnessData.MessageCount.stepId:
+                        return new FitnessData.MessageCount.Response(paramsProvider).fromPacket(this);
+                    case FitnessData.MessageData.stepId:
+                        return new FitnessData.MessageData.StepResponse(paramsProvider).fromPacket(this);
+                    case FitnessData.MessageCount.sleepId:
+                        return new FitnessData.MessageCount.Response(paramsProvider).fromPacket(this);
+                    case FitnessData.MessageData.sleepId:
+                        return new FitnessData.MessageData.SleepResponse(paramsProvider).fromPacket(this);
+                    default:
+                        this.isEncrypted = this.attemptDecrypt(); // Helps with debugging
+                        return this;
+                }
+            case Alarms.id:
+                switch (this.commandId) {
+                    case Alarms.EventAlarmsList.id:
+                        return new Alarms.EventAlarmsList.Response(paramsProvider).fromPacket(this);
+                    case Alarms.SmartAlarmList.id:
+                        return new Alarms.SmartAlarmList.Response(paramsProvider).fromPacket(this);
+                    default:
+                        this.isEncrypted = this.attemptDecrypt(); // Helps with debugging
+                        return this;
+                }
+            case FindPhone.id:
+                if (this.commandId == FindPhone.Response.id)
+                    return new FindPhone.Response(paramsProvider).fromPacket(this);
+                this.isEncrypted = this.attemptDecrypt(); // Helps with debugging
+                return this;
+            case Workout.id:
+                switch (this.commandId) {
+                    case Workout.WorkoutCount.id:
+                        return new Workout.WorkoutCount.Response(paramsProvider).fromPacket(this);
+                    case Workout.WorkoutTotals.id:
+                        return new Workout.WorkoutTotals.Response(paramsProvider).fromPacket(this);
+                    case Workout.WorkoutData.id:
+                        return new Workout.WorkoutData.Response(paramsProvider).fromPacket(this);
+                    case Workout.WorkoutPace.id:
+                        return new Workout.WorkoutPace.Response(paramsProvider).fromPacket(this);
+                    default:
+                        this.isEncrypted = this.attemptDecrypt(); // Helps with debugging
+                        return this;
+                }
+            case MusicControl.id:
+                switch (this.commandId) {
+                    case MusicControl.MusicStatusResponse.id:
+                        return new MusicControl.MusicStatusResponse(paramsProvider).fromPacket(this);
+                    case MusicControl.MusicInfo.id:
+                        return new MusicControl.MusicInfo.Response(paramsProvider).fromPacket(this);
+                    case MusicControl.Control.id:
+                        return new MusicControl.Control.Response(paramsProvider).fromPacket(this);
+                    default:
+                        this.isEncrypted = this.attemptDecrypt(); // Helps with debugging
+                        return this;
+                }
+            case AccountRelated.id:
+                switch(this.commandId) {
+                    case AccountRelated.SendAccountToDevice.id:
+                        return new AccountRelated.SendAccountToDevice.Response(paramsProvider).fromPacket(this);
+                    default:
+                        this.isEncrypted = this.attemptDecrypt(); // Helps with debugging
+                        return this;
+                }
+            default:
+                this.isEncrypted = this.attemptDecrypt(); // Helps with debugging
+                return this;
+        }
+    }
+
+    public HuaweiPacket parseOutgoing(byte[] data) throws ParseException {
+        parseData(data);
+        if (!this.complete)
+            return this;
+
+        // TODO: complete
+
+        switch (this.serviceId) {
+            case DeviceConfig.id:
+                switch (this.commandId) {
+                    case DeviceConfig.SupportedServices.id:
+                        return new DeviceConfig.SupportedServices.OutgoingRequest(paramsProvider).fromPacket(this);
+                    case DeviceConfig.DateFormat.id:
+                        return new DeviceConfig.DateFormat.OutgoingRequest(paramsProvider).fromPacket(this);
+                    case DeviceConfig.Bond.id:
+                        return new DeviceConfig.Bond.OutgoingRequest(paramsProvider).fromPacket(this);
+                    case DeviceConfig.HiChain.id:
+                        return new DeviceConfig.HiChain.OutgoingRequest(paramsProvider).fromPacket(this);
+                    default:
+                        return this;
+                }
+            default:
+                return this;
+        }
+    }
+
+    private List<byte[]> serializeSliced(byte[] serializedTLV) {
+        List<byte[]> retv = new ArrayList<>();
+        int headerLength = 5; // Magic + (short)(bodyLength + 1) + 0x00 + extra slice info
+        int bodyHeaderLength = 2; // sID + cID
+        int footerLength = 2; //CRC16
+        int maxBodySize = paramsProvider.getSliceSize() - headerLength - footerLength;
+        int packetCount = (int) Math.ceil(((double) serializedTLV.length + (double) bodyHeaderLength) / (double) maxBodySize);
+
+        if (packetCount == 1)
+            return serializeUnsliced(serializedTLV);
+
+        ByteBuffer buffer = ByteBuffer.wrap(serializedTLV);
+        byte slice = 0x01;
+        byte flag = 0x00;
+        for (int i = 0; i < packetCount; i++) {
+            short packetSize = (short) Math.min(paramsProvider.getSliceSize(), buffer.remaining() + headerLength + footerLength);
+
+            ByteBuffer packet = ByteBuffer.allocate(packetSize);
+
+            short contentSize = (short) (packetSize - headerLength - footerLength);
+            int start = packet.position();
+
+            packet.put((byte) 0x5a);                                // Magic byte
+            packet.putShort((short) (packetSize - headerLength));   // Length
+
+            if (i == packetCount - 1)
+                slice = 0x03;
+
+            packet.put(slice);                                      // Slice
+            packet.put(flag);                                       // Flag
+            flag += 1;
+
+            if (slice == 0x01) {
+                packet.put(this.serviceId);                         // Service ID
+                packet.put(this.commandId);                         // Command ID
+                slice = 0x02;
+                contentSize -= 2; // To prevent taking too much data
+            }
+
+            byte[] packetContent = new byte[contentSize];
+            buffer.get(packetContent);
+            packet.put(packetContent);                              // Packet data
+
+            int length = packet.position() - start;
+            if (length != packetSize - footerLength) {
+                // TODO: exception?
+                LOG.error(String.format(GBApplication.getLanguage(), "Packet lengths don't match! %d != %d", length, packetSize + headerLength));
+            }
+
+            byte[] complete = new byte[length];
+            packet.position(start);
+            packet.get(complete, 0, length);
+            int crc16 = CheckSums.getCRC16(complete, 0x0000);
+
+            packet.putShort((short) crc16);                         // CRC16
+
+            retv.add(packet.array());
+        }
+        return retv;
+    }
+
+    private List<byte[]> serializeUnsliced(byte[] serializedTLV) {
+        List<byte[]> retv = new ArrayList<>();
+        int headerLength = 4; // Magic + (short)(bodyLength + 1) + 0x00
+        int bodyHeaderLength = 2; // sID + cID
+        int footerLength = 2; //CRC16
+        int bodyLength = bodyHeaderLength + serializedTLV.length;
+        ByteBuffer buffer = ByteBuffer.allocate(headerLength + bodyLength);
+        buffer.put((byte) 0x5A);
+        buffer.putShort((short)(bodyLength + 1));
+        buffer.put((byte) 0x00);
+        buffer.put(this.serviceId);
+        buffer.put(this.commandId);
+        buffer.put(serializedTLV);
+        int crc16 = CheckSums.getCRC16(buffer.array(), 0x0000);
+        ByteBuffer finalBuffer = ByteBuffer.allocate(buffer.capacity() + footerLength);
+        finalBuffer.put(buffer.array());
+        finalBuffer.putShort((short)crc16);
+        retv.add(finalBuffer.array());
+        return retv;
+    }
+
+    public List<byte[]> serialize() throws CryptoException {
+        // TODO: necessary for this to work:
+        //       - serviceId
+        //       - commandId
+        //       - tlv
+        // TODO: maybe use the complete flag to know if it can be serialized?
+
+        HuaweiTLV serializableTlv;
+        if (this.isEncrypted && this.paramsProvider.areTransactionsCrypted()) {
+            try {
+                serializableTlv = this.tlv.encrypt(paramsProvider);
+            } catch (HuaweiCrypto.CryptoException e) {
+                throw new CryptoException("Encrypt exception", e);
+            }
+        } else {
+            serializableTlv = this.tlv;
+        }
+
+        byte[] serializedTLV = serializableTlv.serialize();
+        List<byte[]> retv;
+        if (isSliced) {
+            retv = serializeSliced(serializedTLV);
+        } else {
+            retv = serializeUnsliced(serializedTLV);
+        }
+        return retv;
+    }
+
+    public HuaweiTLV getTlv() {
+        return this.tlv;
+    }
+
+    public void setTlv(HuaweiTLV tlv) {
+        this.tlv = tlv;
+    }
+
+    public void setEncryption(boolean b) {
+        this.isEncrypted = b;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        HuaweiPacket that = (HuaweiPacket) o;
+
+        if (serviceId != that.serviceId) return false;
+        if (commandId != that.commandId) return false;
+        if (complete != that.complete) return false;
+        if (isEncrypted != that.isEncrypted) return false;
+        return Objects.equals(tlv, that.tlv);
+    }
+
+    @Override
+    public String toString() {
+        return "HuaweiPacket{" +
+                "paramsProvider=" + paramsProvider +
+                ", serviceId=" + serviceId +
+                ", commandId=" + commandId +
+                ", tlv=" + tlv +
+                ", partialPacket=" + Arrays.toString(partialPacket) +
+                ", payload=" + Arrays.toString(payload) +
+                ", complete=" + complete +
+                ", isEncrypted=" + isEncrypted +
+                ", isSliced=" + isSliced +
+                '}';
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSampleProvider.java
new file mode 100644
index 000000000..d93e71e96
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSampleProvider.java
@@ -0,0 +1,530 @@
+/*  Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei;
+
+import android.content.SharedPreferences;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import de.greenrobot.dao.AbstractDao;
+import de.greenrobot.dao.Property;
+import de.greenrobot.dao.query.QueryBuilder;
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
+import nodomain.freeyourgadget.gadgetbridge.database.DBHelper;
+import nodomain.freeyourgadget.gadgetbridge.devices.AbstractSampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.entities.Device;
+import nodomain.freeyourgadget.gadgetbridge.entities.HuaweiActivitySample;
+import nodomain.freeyourgadget.gadgetbridge.entities.HuaweiActivitySampleDao;
+import nodomain.freeyourgadget.gadgetbridge.entities.HuaweiWorkoutDataSample;
+import nodomain.freeyourgadget.gadgetbridge.entities.HuaweiWorkoutDataSampleDao;
+import nodomain.freeyourgadget.gadgetbridge.entities.HuaweiWorkoutSummarySample;
+import nodomain.freeyourgadget.gadgetbridge.entities.HuaweiWorkoutSummarySampleDao;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.model.ActivityKind;
+import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.FitnessData;
+
+public class HuaweiSampleProvider extends AbstractSampleProvider<HuaweiActivitySample> {
+
+    /*
+     * We save all data by saving a marker at the begin and end.
+     * Meaning of fields that are not self-explanatory:
+     *  - `otherTimestamp`
+     *    The timestamp of the other marker, if it's larger this is the begin, otherwise the end
+     *  - `source`
+     *    The source of the data, which Huawei Band message the data came from
+     */
+
+    private static class RawTypes {
+        public static final int NOT_MEASURED = -1;
+
+        public static final int UNKNOWN = 1;
+
+        public static final int DEEP_SLEEP = 0x07;
+        public static final int LIGHT_SLEEP = 0x06;
+    }
+
+    public HuaweiSampleProvider(GBDevice device, DaoSession session) {
+        super(device, session);
+    }
+
+    @Override
+    public int normalizeType(int rawType) {
+        switch (rawType) {
+            case RawTypes.DEEP_SLEEP:
+                return ActivityKind.TYPE_DEEP_SLEEP;
+            case RawTypes.LIGHT_SLEEP:
+                return ActivityKind.TYPE_LIGHT_SLEEP;
+            default:
+                return ActivityKind.TYPE_UNKNOWN;
+        }
+    }
+
+    @Override
+    public int toRawActivityKind(int activityKind) {
+        switch (activityKind) {
+            case ActivityKind.TYPE_DEEP_SLEEP:
+                return RawTypes.DEEP_SLEEP;
+            case ActivityKind.TYPE_LIGHT_SLEEP:
+                return RawTypes.LIGHT_SLEEP;
+            default:
+                return RawTypes.NOT_MEASURED;
+        }
+    }
+
+    @Override
+    public float normalizeIntensity(int rawIntensity) {
+        return rawIntensity;
+    }
+
+    @Override
+    public AbstractDao<HuaweiActivitySample, ?> getSampleDao() {
+        return getSession().getHuaweiActivitySampleDao();
+    }
+
+    @Nullable
+    @Override
+    protected Property getRawKindSampleProperty() {
+        return HuaweiActivitySampleDao.Properties.RawKind;
+    }
+
+    @NonNull
+    @Override
+    protected Property getTimestampSampleProperty() {
+        return HuaweiActivitySampleDao.Properties.Timestamp;
+    }
+
+    @NonNull
+    @Override
+    protected Property getDeviceIdentifierSampleProperty() {
+        return HuaweiActivitySampleDao.Properties.DeviceId;
+    }
+
+    @Override
+    public HuaweiActivitySample createActivitySample() {
+        return new HuaweiActivitySample();
+    }
+
+    private int getLastFetchTimestamp(QueryBuilder<HuaweiActivitySample> qb) {
+        Device dbDevice = DBHelper.findDevice(getDevice(), getSession());
+        if (dbDevice == null)
+            return 0;
+        Property deviceProperty = HuaweiActivitySampleDao.Properties.DeviceId;
+        Property timestampProperty = HuaweiActivitySampleDao.Properties.Timestamp;
+
+        qb.where(deviceProperty.eq(dbDevice.getId()))
+                .orderDesc(timestampProperty)
+                .limit(1);
+
+        List<HuaweiActivitySample> samples = qb.build().list();
+        if (samples.isEmpty())
+            return 0;
+
+        HuaweiActivitySample sample = samples.get(0);
+        return sample.getTimestamp();
+    }
+
+    /**
+     * Gets last timestamp where the sleep data has been fully synchronized
+     * @return Last fully synchronized timestamp for sleep data
+     */
+    public int getLastSleepFetchTimestamp() {
+        QueryBuilder<HuaweiActivitySample> qb = getSampleDao().queryBuilder();
+        Property sourceProperty = HuaweiActivitySampleDao.Properties.Source;
+        Property activityTypeProperty = HuaweiActivitySampleDao.Properties.RawKind;
+
+        qb.where(sourceProperty.eq(0x0d), activityTypeProperty.eq(0x01));
+
+        return getLastFetchTimestamp(qb);
+    }
+
+    /**
+     * Gets last timestamp where the step data has been fully synchronized
+     * @return Last fully synchronized timestamp for step data
+     */
+    public int getLastStepFetchTimestamp() {
+        QueryBuilder<HuaweiActivitySample> qb = getSampleDao().queryBuilder();
+        Property sourceProperty = HuaweiActivitySampleDao.Properties.Source;
+
+        qb.where(sourceProperty.eq(0x0b));
+
+        return getLastFetchTimestamp(qb);
+    }
+
+    /**
+     * Makes a copy of a sample
+     * @param sample The sample to copy
+     * @return The copy of the sample
+     */
+    private HuaweiActivitySample copySample(HuaweiActivitySample sample) {
+        HuaweiActivitySample sampleCopy = new HuaweiActivitySample(
+                sample.getTimestamp(),
+                sample.getDeviceId(),
+                sample.getUserId(),
+                sample.getOtherTimestamp(),
+                sample.getSource(),
+                sample.getRawKind(),
+                sample.getRawIntensity(),
+                sample.getSteps(),
+                sample.getCalories(),
+                sample.getDistance(),
+                sample.getSpo(),
+                sample.getHeartRate()
+        );
+        sampleCopy.setProvider(sample.getProvider());
+        return sampleCopy;
+    }
+
+    @Override
+    public void addGBActivitySample(HuaweiActivitySample activitySample) {
+        HuaweiActivitySample start = copySample(activitySample);
+        HuaweiActivitySample end = copySample(activitySample);
+        end.setTimestamp(start.getOtherTimestamp());
+        end.setSteps(ActivitySample.NOT_MEASURED);
+        end.setCalories(ActivitySample.NOT_MEASURED);
+        end.setDistance(ActivitySample.NOT_MEASURED);
+        end.setSpo(ActivitySample.NOT_MEASURED);
+        end.setHeartRate(ActivitySample.NOT_MEASURED);
+        end.setOtherTimestamp(start.getTimestamp());
+
+        getSampleDao().insertOrReplace(start);
+        getSampleDao().insertOrReplace(end);
+    }
+
+    @Override
+    public void addGBActivitySamples(HuaweiActivitySample[] activitySamples) {
+        List<HuaweiActivitySample> newSamples = new ArrayList<>();
+        for (HuaweiActivitySample sample : activitySamples) {
+            HuaweiActivitySample start = copySample(sample);
+            HuaweiActivitySample end = copySample(sample);
+            end.setTimestamp(start.getOtherTimestamp());
+            end.setSteps(ActivitySample.NOT_MEASURED);
+            end.setCalories(ActivitySample.NOT_MEASURED);
+            end.setDistance(ActivitySample.NOT_MEASURED);
+            end.setSpo(ActivitySample.NOT_MEASURED);
+            end.setHeartRate(ActivitySample.NOT_MEASURED);
+            end.setOtherTimestamp(start.getTimestamp());
+
+            newSamples.add(start);
+            newSamples.add(end);
+        }
+        getSampleDao().insertOrReplaceInTx(newSamples);
+    }
+
+    /**
+     * Gets the activity samples, ordered by timestamp
+     * @param timestampFrom Start timestamp
+     * @param timestampTo End timestamp
+     * @return List of activities between the timestamps, ordered by timestamp
+     */
+    private List<HuaweiActivitySample> getRawOrderedActivitySamples(int timestampFrom, int timestampTo) {
+        QueryBuilder<HuaweiActivitySample> qb = getSampleDao().queryBuilder();
+        Property timestampProperty = getTimestampSampleProperty();
+        Device dbDevice = DBHelper.findDevice(getDevice(), getSession());
+        if (dbDevice == null) {
+            // no device, no samples
+            return Collections.emptyList();
+        }
+        Property deviceProperty = getDeviceIdentifierSampleProperty();
+        qb.where(deviceProperty.eq(dbDevice.getId()), timestampProperty.ge(timestampFrom))
+                .where(timestampProperty.le(timestampTo))
+                .orderAsc(timestampProperty);
+        List<HuaweiActivitySample> samples = qb.build().list();
+        for (HuaweiActivitySample sample : samples) {
+            sample.setProvider(this);
+        }
+        detachFromSession();
+        return samples;
+    }
+
+    private List<HuaweiWorkoutDataSample> getRawOrderedWorkoutSamplesWithHeartRate(int timestampFrom, int timestampTo) {
+        Device dbDevice = DBHelper.findDevice(getDevice(), getSession());
+        if (dbDevice == null)
+            return Collections.emptyList();
+
+        QueryBuilder<HuaweiWorkoutDataSample> qb = getSession().getHuaweiWorkoutDataSampleDao().queryBuilder();
+        Property timestampProperty = HuaweiWorkoutDataSampleDao.Properties.Timestamp;
+        Property heartRateProperty = HuaweiWorkoutDataSampleDao.Properties.HeartRate;
+        Property deviceProperty = HuaweiWorkoutSummarySampleDao.Properties.DeviceId;
+        qb.join(HuaweiWorkoutDataSampleDao.Properties.WorkoutId, HuaweiWorkoutSummarySample.class, HuaweiWorkoutSummarySampleDao.Properties.WorkoutId)
+                .where(deviceProperty.eq(dbDevice.getId()));
+        qb.where(
+                timestampProperty.ge(timestampFrom),
+                timestampProperty.le(timestampTo),
+                heartRateProperty.notEq(ActivitySample.NOT_MEASURED)
+        ).orderAsc(timestampProperty);
+        List<HuaweiWorkoutDataSample> samples = qb.build().list();
+        getSession().getHuaweiWorkoutSummarySampleDao().detachAll();
+        return samples;
+    }
+
+    private static class SampleLoopState {
+        public long deviceId = 0;
+        public long userId = 0;
+
+        int[] activityTypes = {};
+
+        public int sleepModifier = 0;
+    }
+
+    /*
+     * Note that this does a lot more than the normal implementation, as it takes care of everything
+     * that is necessary for proper displaying of data.
+     *
+     * This essentially boils down to four things:
+     *  - It adds in the workout heart rate data
+     *  - It adds a sample with intensity zero before start markers (start of block)
+     *  - It adds a sample with intensity zero after end markers (end of block)
+     *  - It modifies some blocks so the sleep data gets handled correctly
+     * The second and fourth are necessary for proper stats calculation, the third is mostly for
+     * nicer graphs.
+     *
+     * Note that the data in the database isn't changed, as the samples are detached.
+     */
+    @Override
+    protected List<HuaweiActivitySample> getGBActivitySamples(int timestamp_from, int timestamp_to, int activityType) {
+        // Note that the result of this function has to be sorted by timestamp!
+
+        List<HuaweiActivitySample> rawSamples = getRawOrderedActivitySamples(timestamp_from, timestamp_to);
+        List<HuaweiWorkoutDataSample> workoutSamples = getRawOrderedWorkoutSamplesWithHeartRate(timestamp_from, timestamp_to);
+
+        List<HuaweiActivitySample> processedSamples = new ArrayList<>();
+
+        Iterator<HuaweiActivitySample> itRawSamples = rawSamples.iterator();
+        Iterator<HuaweiWorkoutDataSample> itWorkoutSamples = workoutSamples.iterator();
+
+        HuaweiActivitySample nextRawSample = null;
+        if (itRawSamples.hasNext())
+            nextRawSample = itRawSamples.next();
+        HuaweiWorkoutDataSample nextWorkoutSample = null;
+        if (itWorkoutSamples.hasNext())
+            nextWorkoutSample = itWorkoutSamples.next();
+
+        SampleLoopState state = new SampleLoopState();
+        if (nextRawSample != null) {
+            state.deviceId = nextRawSample.getDeviceId();
+            state.userId = nextRawSample.getUserId();
+        }
+        state.activityTypes = ActivityKind.mapToDBActivityTypes(activityType, this);
+
+        while (nextRawSample != null || nextWorkoutSample != null) {
+            if (nextRawSample == null) {
+                processWorkoutSample(processedSamples, state, nextWorkoutSample);
+
+                nextWorkoutSample = null;
+                if (itWorkoutSamples.hasNext())
+                    nextWorkoutSample = itWorkoutSamples.next();
+            } else if (nextWorkoutSample == null) {
+                processRawSample(processedSamples, state, nextRawSample);
+
+                nextRawSample = null;
+                if (itRawSamples.hasNext())
+                    nextRawSample = itRawSamples.next();
+            } else if (nextRawSample.getTimestamp() > nextWorkoutSample.getTimestamp()) {
+                processWorkoutSample(processedSamples, state, nextWorkoutSample);
+
+                nextWorkoutSample = null;
+                if (itWorkoutSamples.hasNext())
+                    nextWorkoutSample = itWorkoutSamples.next();
+            } else {
+                processRawSample(processedSamples, state, nextRawSample);
+
+                nextRawSample = null;
+                if (itRawSamples.hasNext())
+                    nextRawSample = itRawSamples.next();
+            }
+        }
+
+        processedSamples = interpolate(processedSamples);
+
+        return processedSamples;
+    }
+
+    private List<HuaweiActivitySample> interpolate(List<HuaweiActivitySample> processedSamples) {
+        List<HuaweiActivitySample> retv = new ArrayList<>();
+
+        if (processedSamples.size() == 0)
+            return retv;
+
+        HuaweiActivitySample lastSample = processedSamples.get(0);
+        retv.add(lastSample);
+        for (int i = 1; i < processedSamples.size() - 1; i++) {
+            HuaweiActivitySample sample = processedSamples.get(i);
+
+            int timediff = sample.getTimestamp() - lastSample.getTimestamp();
+            if (timediff > 60) {
+                if (lastSample.getRawKind() != -1 && sample.getRawKind() != lastSample.getRawKind()) {
+                    HuaweiActivitySample postSample = new HuaweiActivitySample(
+                            lastSample.getTimestamp() + 1,
+                            lastSample.getDeviceId(),
+                            lastSample.getUserId(),
+                            0,
+                            (byte) 0x00,
+                            ActivitySample.NOT_MEASURED,
+                            0,
+                            ActivitySample.NOT_MEASURED,
+                            ActivitySample.NOT_MEASURED,
+                            ActivitySample.NOT_MEASURED,
+                            ActivitySample.NOT_MEASURED,
+                            ActivitySample.NOT_MEASURED
+                    );
+                    postSample.setProvider(this);
+                    retv.add(postSample);
+                }
+
+                if (sample.getRawKind() != -1 && sample.getRawKind() != lastSample.getRawKind()) {
+                    HuaweiActivitySample preSample = new HuaweiActivitySample(
+                            sample.getTimestamp() - 1,
+                            sample.getDeviceId(),
+                            sample.getUserId(),
+                            0,
+                            (byte) 0x00,
+                            ActivitySample.NOT_MEASURED,
+                            0,
+                            ActivitySample.NOT_MEASURED,
+                            ActivitySample.NOT_MEASURED,
+                            ActivitySample.NOT_MEASURED,
+                            ActivitySample.NOT_MEASURED,
+                            ActivitySample.NOT_MEASURED
+                    );
+                    preSample.setProvider(this);
+                    retv.add(preSample);
+                }
+            }
+
+            retv.add(sample);
+            lastSample = sample;
+        }
+
+        if (lastSample.getRawKind() != -1) {
+            HuaweiActivitySample postSample = new HuaweiActivitySample(
+                    lastSample.getTimestamp() + 1,
+                    lastSample.getDeviceId(),
+                    lastSample.getUserId(),
+                    0,
+                    (byte) 0x00,
+                    ActivitySample.NOT_MEASURED,
+                    0,
+                    ActivitySample.NOT_MEASURED,
+                    ActivitySample.NOT_MEASURED,
+                    ActivitySample.NOT_MEASURED,
+                    ActivitySample.NOT_MEASURED,
+                    ActivitySample.NOT_MEASURED
+            );
+            postSample.setProvider(this);
+            retv.add(postSample);
+        }
+
+        return retv;
+    }
+
+    private void processRawSample(List<HuaweiActivitySample> processedSamples, SampleLoopState state, HuaweiActivitySample sample) {
+        // Filter on Source 0x0d, Type 0x01, until we know what it is and how we should handle them.
+        // Just showing them currently has some issues.
+        if (sample.getSource() == FitnessData.MessageData.sleepId && sample.getRawKind() == RawTypes.UNKNOWN)
+            return;
+
+        HuaweiActivitySample lastSample = null;
+
+        boolean isStartMarker = sample.getTimestamp() < sample.getOtherTimestamp();
+
+        // Handle preferences for wakeup status ignore - can fix some quirks on some devices
+        if (sample.getRawKind() == 0x08) {
+            SharedPreferences prefs = GBApplication.getDeviceSpecificSharedPrefs(getDevice().getAddress());
+            if (isStartMarker && prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_IGNORE_WAKEUP_STATUS_START, false))
+                return;
+            if (!isStartMarker && prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_IGNORE_WAKEUP_STATUS_END, false))
+                return;
+        }
+
+        // Backdate the end marker by one - otherwise the interpolation fails
+        if (sample.getTimestamp() > sample.getOtherTimestamp())
+            sample.setTimestamp(sample.getTimestamp() - 1);
+
+        if (processedSamples.size() > 0)
+            lastSample = processedSamples.get(processedSamples.size() - 1);
+        if (lastSample != null && lastSample.getTimestamp() == sample.getTimestamp()) {
+            // Merge the samples - only if there isn't any data yet, except the kind
+
+            if (lastSample.getRawKind() == -1)
+                lastSample.setRawKind(sample.getRawKind());
+            // Do overwrite the kind if the new sample is a starting sample
+            if (isStartMarker && sample.getRawKind() != -1) {
+                lastSample.setRawKind(sample.getRawKind());
+                lastSample.setOtherTimestamp(sample.getOtherTimestamp()); // Necessary for interpolation
+            }
+
+            if (lastSample.getRawIntensity() == -1)
+                lastSample.setRawIntensity(sample.getRawIntensity());
+            if (lastSample.getSteps() == -1)
+                lastSample.setSteps(sample.getSteps());
+            if (lastSample.getCalories() == -1)
+                lastSample.setCalories(sample.getCalories());
+            if (lastSample.getDistance() == -1)
+                lastSample.setDistance(sample.getDistance());
+            if (lastSample.getSpo() == -1)
+                lastSample.setSpo(sample.getSpo());
+            if (lastSample.getHeartRate() == -1)
+                lastSample.setHeartRate(sample.getHeartRate());
+            if (lastSample.getSource() != sample.getSource())
+                lastSample.setSource((byte) 0x00);
+        } else {
+            if (state.sleepModifier != 0)
+                sample.setRawKind(state.sleepModifier);
+            processedSamples.add(sample);
+        }
+
+        if (sample.getSource() == FitnessData.MessageData.sleepId && (sample.getRawKind() == RawTypes.LIGHT_SLEEP || sample.getRawKind() == RawTypes.DEEP_SLEEP)) {
+            if (isStartMarker)
+                state.sleepModifier = sample.getRawKind();
+            else
+                state.sleepModifier = 0;
+        }
+    }
+
+    private void processWorkoutSample(List<HuaweiActivitySample> processedSamples, SampleLoopState state, HuaweiWorkoutDataSample workoutSample) {
+        processRawSample(processedSamples, state, convertWorkoutSampleToActivitySample(workoutSample, state));
+    }
+
+    private HuaweiActivitySample convertWorkoutSampleToActivitySample(HuaweiWorkoutDataSample workoutSample, SampleLoopState state) {
+        int hr = workoutSample.getHeartRate() & 0xFF;
+        HuaweiActivitySample newSample = new HuaweiActivitySample(
+                workoutSample.getTimestamp(),
+                state.deviceId,
+                state.userId,
+                0,
+                (byte) 0x00,
+                ActivitySample.NOT_MEASURED,
+                ActivitySample.NOT_MEASURED,
+                ActivitySample.NOT_MEASURED,
+                ActivitySample.NOT_MEASURED,
+                ActivitySample.NOT_MEASURED,
+                ActivitySample.NOT_MEASURED,
+                hr
+        );
+        newSample.setProvider(this);
+        return newSample;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSettingsCustomizer.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSettingsCustomizer.java
new file mode 100644
index 000000000..1cbff4028
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSettingsCustomizer.java
@@ -0,0 +1,254 @@
+/*  Copyright (C) 2021 José Rebelo
+    Copyright (C) 2022 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei;
+
+import android.content.SharedPreferences;
+import android.os.Parcel;
+import android.widget.Toast;
+
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.SwitchPreferenceCompat;
+
+import java.util.Set;
+import java.util.Collections;
+
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSpecificSettingsCustomizer;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSpecificSettingsHandler;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiWorkoutGbParser;
+import nodomain.freeyourgadget.gadgetbridge.util.GB;
+import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
+import nodomain.freeyourgadget.gadgetbridge.util.XTimePreference;
+
+import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.*;
+import static nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants.PREF_HUAWEI_DEBUG;
+import static nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants.PREF_HUAWEI_DEBUG_REQUEST;
+import static nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants.PREF_HUAWEI_TRUSLEEP;
+import static nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants.PREF_HUAWEI_WORKMODE;
+import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_MI2_ROTATE_WRIST_TO_SWITCH_INFO;
+
+public class HuaweiSettingsCustomizer implements DeviceSpecificSettingsCustomizer {
+    final GBDevice device;
+    final HuaweiCoordinator coordinator;
+
+    public HuaweiSettingsCustomizer(final GBDevice device) {
+        this.device = device;
+        this.coordinator = ((HuaweiCoordinatorSupplier) this.device.getDeviceCoordinator()).getHuaweiCoordinator();
+    }
+
+    @Override
+    public void onPreferenceChange(final Preference preference, final DeviceSpecificSettingsHandler handler) {
+        if (preference.getKey().equals(PREF_DO_NOT_DISTURB)) {
+            final String dndState = ((ListPreference) preference).getValue();
+            final XTimePreference dndStart = handler.findPreference(PREF_DO_NOT_DISTURB_START);
+            final XTimePreference dndEnd = handler.findPreference(PREF_DO_NOT_DISTURB_END);
+            final SwitchPreferenceCompat dndLifWrist = handler.findPreference(PREF_DO_NOT_DISTURB_LIFT_WRIST);
+            final SwitchPreferenceCompat dndNotWear = handler.findPreference(PREF_DO_NOT_DISTURB_NOT_WEAR);
+            SharedPreferences sharedPrefs = GBApplication.getDeviceSpecificSharedPrefs(device.getAddress());
+            boolean statusLiftWrist = sharedPrefs.getBoolean(PREF_LIFTWRIST_NOSHED, false);
+
+            dndStart.setEnabled(false);
+            dndEnd.setEnabled(false);
+            dndNotWear.setEnabled(false);
+            dndLifWrist.setEnabled(false);
+            if (dndState.equals("scheduled")) {
+                dndStart.setEnabled(true);
+                dndEnd.setEnabled(true);
+            }
+            if (statusLiftWrist && !dndState.equals("off")) {
+                dndLifWrist.setEnabled(true);
+            }
+            if (dndState.equals("off")) {
+                dndNotWear.setEnabled(true);
+            }
+        }
+        if (preference.getKey().equals("huawei_reparse_workout_data")) {
+            if (((SwitchPreferenceCompat) preference).isChecked()) {
+                GB.toast("Starting workout reparse", Toast.LENGTH_SHORT, 0);
+                HuaweiWorkoutGbParser.parseAllWorkouts();
+                GB.toast("Workout reparse is complete", Toast.LENGTH_SHORT, 0);
+
+                ((SwitchPreferenceCompat) preference).setChecked(false);
+            }
+        }
+        if (preference.getKey().equals(PREF_FORCE_OPTIONS)) {
+            final Preference dnd = handler.findPreference("screen_do_not_disturb");
+            if (dnd != null) {
+                dnd.setVisible(false);
+                if (this.coordinator.supportsDoNotDisturb(handler.getDevice()))
+                    dnd.setVisible(true);
+            }
+            final ListPreference wearLocation = handler.findPreference(PREF_WEARLOCATION);
+            wearLocation.setVisible(false);
+            if (this.coordinator.supportsWearLocation(handler.getDevice())) {
+                wearLocation.setVisible(true);
+            }
+        }
+    }
+
+    @Override
+    public void customizeSettings(final DeviceSpecificSettingsHandler handler, Prefs prefs) {
+
+        handler.addPreferenceHandlerFor(PREF_FORCE_OPTIONS);
+        handler.addPreferenceHandlerFor(PREF_FORCE_ENABLE_SMART_ALARM);
+        handler.addPreferenceHandlerFor(PREF_FORCE_ENABLE_WEAR_LOCATION);
+
+        handler.addPreferenceHandlerFor(PREF_HUAWEI_WORKMODE);
+        handler.addPreferenceHandlerFor(PREF_HUAWEI_TRUSLEEP);
+        handler.addPreferenceHandlerFor(PREF_HUAWEI_DEBUG);
+        handler.addPreferenceHandlerFor(PREF_HUAWEI_DEBUG_REQUEST);
+
+        // Only supported on specific devices
+        final ListPreference languageSetting = handler.findPreference(PREF_LANGUAGE);
+        if (languageSetting != null) {
+            languageSetting.setVisible(false);
+            if (this.coordinator.supportsLanguageSetting())
+                languageSetting.setVisible(true);
+        }
+
+        final Preference dnd = handler.findPreference("screen_do_not_disturb");
+        if (dnd != null) {
+            dnd.setVisible(false);
+            if (this.coordinator.supportsDoNotDisturb(handler.getDevice()))
+                dnd.setVisible(true);
+        }
+
+        final Preference trusleep = handler.findPreference(PREF_HUAWEI_TRUSLEEP);
+        if (trusleep != null) {
+            trusleep.setVisible(false);
+            if (this.coordinator.supportsTruSleep())
+                trusleep.setVisible(true);
+        }
+
+//        if (this.coordinator.supportsHeartRate())
+//            dynamicSupportedDeviceSpecificSettings.add(R.xml.devicesettings_heartrate_automatic_enable);
+
+        final Preference inactivity = handler.findPreference("screen_inactivity");
+        if (inactivity != null) {
+            inactivity.setVisible(false);
+            if (this.coordinator.supportsInactivityWarnings())
+                inactivity.setVisible(true);
+        }
+
+        final ListPreference wearLocation = handler.findPreference(PREF_WEARLOCATION);
+        if (wearLocation != null) {
+            wearLocation.setVisible(false);
+            if (this.coordinator.supportsWearLocation(handler.getDevice()))
+                wearLocation.setVisible(true);
+        }
+
+        final ListPreference date = handler.findPreference(PREF_DATEFORMAT);
+        final ListPreference time = handler.findPreference(PREF_TIMEFORMAT);
+        if (date != null) {
+            date.setVisible(false);
+            time.setVisible(false);
+            if (this.coordinator.supportsDateFormat()) {
+                date.setVisible(true);
+                time.setVisible(true);
+            }
+        }
+
+        final ListPreference workmode = handler.findPreference(PREF_HUAWEI_WORKMODE);
+        if (workmode != null) {
+            workmode.setVisible(false);
+            if (this.coordinator.supportsAutoWorkMode())
+                workmode.setVisible(true);
+        }
+
+        final SwitchPreferenceCompat liftwirst = handler.findPreference(PREF_LIFTWRIST_NOSHED);
+        if (liftwirst != null) {
+            liftwirst.setVisible(false);
+            if (this.coordinator.supportsActivateOnLift())
+                liftwirst.setVisible(true);
+        }
+
+        final SwitchPreferenceCompat rotatewirst = handler.findPreference(PREF_MI2_ROTATE_WRIST_TO_SWITCH_INFO);
+        if (rotatewirst != null) {
+            rotatewirst.setVisible(false);
+            if (this.coordinator.supportsRotateToCycleInfo())
+                rotatewirst.setVisible(true);
+        }
+
+        final Preference forceOptions = handler.findPreference(PREF_FORCE_OPTIONS);
+        if (forceOptions != null) {
+            forceOptions.setVisible(false);
+            boolean supportsSmartAlarm = this.coordinator.supportsSmartAlarm();
+            boolean supportsWearLocation = this.coordinator.supportsWearLocation();
+            if (!supportsSmartAlarm || !supportsWearLocation) {
+                forceOptions.setVisible(true);
+                final SwitchPreferenceCompat forceSmartAlarm = handler.findPreference(PREF_FORCE_ENABLE_SMART_ALARM);
+                forceSmartAlarm.setVisible(false);
+                if (!supportsSmartAlarm) {
+                    forceSmartAlarm.setVisible(true);
+                }
+                final SwitchPreferenceCompat forceWearLocation = handler.findPreference(PREF_FORCE_ENABLE_WEAR_LOCATION);
+                forceWearLocation.setVisible(false);
+                if (!supportsWearLocation) {
+                    forceWearLocation.setVisible(true);
+                }
+            }
+        }
+
+        final SwitchPreferenceCompat disconnectNotification = handler.findPreference(PREF_DISCONNECTNOTIF_NOSHED);
+        if (disconnectNotification != null) {
+            disconnectNotification.setVisible(false);
+            if (this.coordinator.supportsNotificationOnBluetoothLoss())
+                disconnectNotification.setVisible(true);
+        }
+
+        final SwitchPreferenceCompat reparseWorkout = handler.findPreference("huawei_reparse_workout_data");
+        if (reparseWorkout != null) {
+            reparseWorkout.setVisible(false);
+            if (this.coordinator.supportsWorkouts())
+                reparseWorkout.setVisible(true);
+        }
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(final Parcel dest, final int flags) {
+        dest.writeParcelable(device, 0);
+    }
+
+    @Override
+    public Set<String> getPreferenceKeysWithSummary() {
+        return Collections.emptySet();
+    }
+
+
+    public static final Creator<HuaweiSettingsCustomizer> CREATOR= new Creator<HuaweiSettingsCustomizer>() {
+
+        @Override
+        public HuaweiSettingsCustomizer createFromParcel(Parcel parcel) {
+            final GBDevice device = parcel.readParcelable(HuaweiSettingsCustomizer.class.getClassLoader());
+            return new HuaweiSettingsCustomizer(device);
+        }
+
+        @Override
+        public HuaweiSettingsCustomizer[] newArray(int i) {
+            return new HuaweiSettingsCustomizer[0];
+        }
+    };
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSpo2SampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSpo2SampleProvider.java
new file mode 100644
index 000000000..4451309d5
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSpo2SampleProvider.java
@@ -0,0 +1,223 @@
+/*  Copyright (C) 2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import de.greenrobot.dao.AbstractDao;
+import de.greenrobot.dao.Property;
+import de.greenrobot.dao.query.QueryBuilder;
+import nodomain.freeyourgadget.gadgetbridge.database.DBHelper;
+import nodomain.freeyourgadget.gadgetbridge.devices.AbstractTimeSampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.entities.AbstractSpo2Sample;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.entities.Device;
+import nodomain.freeyourgadget.gadgetbridge.entities.HuaweiActivitySample;
+import nodomain.freeyourgadget.gadgetbridge.entities.HuaweiActivitySampleDao;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+
+public class HuaweiSpo2SampleProvider extends AbstractTimeSampleProvider<HuaweiSpo2SampleProvider.HuaweiSpo2Sample> {
+    private static final Logger LOG = LoggerFactory.getLogger(HuaweiSpo2SampleProvider.class);
+
+    private final HuaweiSampleProvider huaweiSampleProvider;
+
+    public HuaweiSpo2SampleProvider(GBDevice device, DaoSession session) {
+        super(device, session);
+        this.huaweiSampleProvider = new HuaweiSampleProvider(this.getDevice(), this.getSession());
+    }
+
+    /**
+     * Converts an Huawei activity sample to an SpO2 sample
+     * @param sample Activity sample to convert
+     * @return SpO sample containing the SpO value, timestamp, userID, and deviceID of the activity sample
+     */
+    @NonNull
+    private HuaweiSpo2Sample activityToSpo2Sample(HuaweiActivitySample sample) {
+        return new HuaweiSpo2Sample(
+                -1, // No difference between auto and manual for Huawei
+                sample.getTimestamp() * 1000L,
+                sample.getUserId(),
+                sample.getDeviceId(),
+                sample.getSpo()
+        );
+    }
+
+    @NonNull
+    @Override
+    public List<HuaweiSpo2Sample> getAllSamples(long timestampFrom, long timestampTo) {
+        List<HuaweiActivitySample> activitySamples = huaweiSampleProvider.getAllActivitySamples((int) (timestampFrom / 1000L), (int) (timestampTo / 1000L));
+        List<HuaweiSpo2Sample> spo2Samples = new ArrayList<>(activitySamples.size());
+        for (HuaweiActivitySample sample : activitySamples) {
+            if (sample.getSpo() == -1)
+                continue;
+            spo2Samples.add(activityToSpo2Sample(sample));
+        }
+        return spo2Samples;
+    }
+
+    @Override
+    public void addSample(HuaweiSpo2Sample activitySample) {
+        LOG.error("Huawei Spo2 sample provider addSample called!");
+    }
+
+    @Override
+    public void addSamples(List<HuaweiSpo2Sample> activitySamples) {
+        LOG.error("Huawei Spo2 sample provider addSamples called!");
+    }
+
+    @Nullable
+    @Override
+    public HuaweiSpo2Sample getLatestSample() {
+        QueryBuilder<HuaweiActivitySample> qb = this.huaweiSampleProvider.getSampleDao().queryBuilder();
+        final Device dbDevice = DBHelper.findDevice(getDevice(), getSession());
+        if (dbDevice == null)
+            return null;
+        final Property deviceProperty = this.huaweiSampleProvider.getDeviceIdentifierSampleProperty();
+        qb
+                .where(deviceProperty.eq(dbDevice.getId()))
+                .where(HuaweiActivitySampleDao.Properties.Spo.notEq(-1))
+                .orderDesc(this.huaweiSampleProvider.getTimestampSampleProperty())
+                .limit(1);
+        final List<HuaweiActivitySample> samples = qb.build().list();
+        if (samples.isEmpty())
+            return null;
+        return activityToSpo2Sample(samples.get(0));
+    }
+
+    @Nullable
+    @Override
+    public HuaweiSpo2Sample getFirstSample() {
+        QueryBuilder<HuaweiActivitySample> qb = this.huaweiSampleProvider.getSampleDao().queryBuilder();
+        final Device dbDevice = DBHelper.findDevice(getDevice(), getSession());
+        if (dbDevice == null)
+            return null;
+        final Property deviceProperty = this.huaweiSampleProvider.getDeviceIdentifierSampleProperty();
+        qb
+                .where(deviceProperty.eq(dbDevice.getId()))
+                .where(HuaweiActivitySampleDao.Properties.Spo.notEq(-1))
+                .orderAsc(this.huaweiSampleProvider.getTimestampSampleProperty())
+                .limit(1);
+        final List<HuaweiActivitySample> samples = qb.build().list();
+        if (samples.isEmpty())
+            return null;
+        return activityToSpo2Sample(samples.get(0));
+    }
+
+    @Override
+    protected void detachFromSession() {
+        // Not necessary to do anything here
+        LOG.warn("Huawei Spo2 sample provider detachFromSession called!");
+    }
+
+    @NonNull
+    @Override
+    public AbstractDao<HuaweiSpo2Sample, ?> getSampleDao() {
+        // This not existing is not an issue (at the time of writing), as this is only used in
+        // methods that are overwritten by this class itself.
+        LOG.error("Huawei Spo2 sample provider getSampleDao called!");
+        return null;
+    }
+
+    @NonNull
+    @Override
+    protected Property getTimestampSampleProperty() {
+        LOG.warn("Huawei Spo2 sample provider getTimestampSampleProperty called!");
+        return this.huaweiSampleProvider.getTimestampSampleProperty();
+    }
+
+    @NonNull
+    @Override
+    protected Property getDeviceIdentifierSampleProperty() {
+        LOG.warn("Huawei Spo2 sample provider getDeviceIdentifierSampleProperty called!");
+        return this.huaweiSampleProvider.getDeviceIdentifierSampleProperty();
+    }
+
+    @Override
+    public HuaweiSpo2Sample createSample() {
+        return new HuaweiSpo2Sample();
+    }
+
+    public static class HuaweiSpo2Sample extends AbstractSpo2Sample {
+        private int typeNum;
+        private long timestamp;
+        private long userId;
+        private long deviceId;
+        private int spo2;
+
+        public HuaweiSpo2Sample() { }
+
+        public HuaweiSpo2Sample(int typeNum, long timestamp, long userId, long deviceId, int spo2) {
+            this.typeNum = typeNum;
+            this.timestamp = timestamp;
+            this.userId = userId;
+            this.deviceId = deviceId;
+            this.spo2 = spo2;
+        }
+
+        @Override
+        public int getTypeNum() {
+            return typeNum;
+        }
+
+        @Override
+        public void setTypeNum(int num) {
+            this.typeNum = num;
+        }
+
+        @Override
+        public void setTimestamp(long timestamp) {
+            this.timestamp = timestamp;
+        }
+
+        @Override
+        public long getUserId() {
+            return userId;
+        }
+
+        @Override
+        public void setUserId(long userId) {
+            this.userId = userId;
+        }
+
+        @Override
+        public long getDeviceId() {
+            return deviceId;
+        }
+
+        @Override
+        public void setDeviceId(long deviceId) {
+            this.deviceId = deviceId;
+        }
+
+        @Override
+        public int getSpo2() {
+            return spo2;
+        }
+
+        @Override
+        public long getTimestamp() {
+            return timestamp;
+        }
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiTLV.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiTLV.java
new file mode 100644
index 000000000..8c4cb6c6c
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiTLV.java
@@ -0,0 +1,400 @@
+/*  Copyright (C) 2021-2022 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+
+/* TLV parsing and serialisation thanks to https://github.com/yihleego/tlv */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei;
+
+import static nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants.CryptoTags;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiCrypto.CryptoException;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket.ParamsProvider;
+import nodomain.freeyourgadget.gadgetbridge.util.StringUtils;
+
+public class HuaweiTLV {
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        HuaweiTLV huaweiTLV = (HuaweiTLV) o;
+        return Objects.equals(valueMap, huaweiTLV.valueMap);
+    }
+
+    public static class TLV {
+        private final byte tag;
+        private final byte[] value;
+
+        public TLV(byte tag, byte[] value) {
+            this.tag = tag;
+            this.value = value;
+        }
+
+        public byte getTag() {
+            return tag;
+        }
+
+        public byte[] getValue() {
+            return value;
+        }
+
+        public int length() {
+            return 1 + VarInt.getVarIntSize(value.length) + value.length;
+        }
+
+        public byte[] serialize() {
+            return ByteBuffer.allocate(this.length())
+                    .put(tag)
+                    .put(VarInt.putVarIntValue(value.length))
+                    .put(value)
+                    .array();
+        }
+
+        public String toString() {
+            return "{tag: " + Integer.toHexString(tag & 0xFF) + " - Value: " + StringUtils.bytesToHex(value) + "} - ";
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            TLV tlv = (TLV) o;
+            return tag == tlv.tag && Arrays.equals(value, tlv.value);
+        }
+    }
+
+    private static final Logger LOG = LoggerFactory.getLogger(HuaweiTLV.class);
+
+    protected List<TLV> valueMap;
+
+    public HuaweiTLV() {
+        this.valueMap = new ArrayList<>();
+    }
+
+    public int length() {
+        int length = 0;
+        for (TLV tlv : valueMap)
+            length += tlv.length();
+        return length;
+    }
+
+    /**
+     * Parse byte buffer into this HuaweiTLV
+     * @param buffer The buffer to parse
+     * @param offset The offset to start parsing at
+     * @param length The length to parse
+     * @return The HuaweiTLV object itself
+     * @throws ArrayIndexOutOfBoundsException There are two general cases in which this exception
+     *  can be thrown:
+     *    1. offset + length is greater than the buffer length
+     *    2. The buffer is malformed which causes an element size to be larger than the remaining
+     *       buffer length
+     */
+    public HuaweiTLV parse(byte[] buffer, int offset, int length)  {
+        if (buffer == null)
+            return null;
+        int parsed = 0;
+        while (parsed < length) {
+            // Tag is 1 byte
+            byte tag = buffer[offset + parsed];
+            parsed += 1;
+            // It seems that there can be an extra null byte at the end of something encrypted
+            // If that happens we ignore it
+            if (parsed == length && tag == 0)
+                break;
+            // Size is a VarInt >= 1 byte
+            VarInt varInt = new VarInt(buffer, offset + parsed);
+            int size = varInt.dValue;
+            parsed += varInt.size;
+            byte[] value = new byte[size];
+            System.arraycopy(buffer, offset + parsed, value, 0, size);
+            put(tag, value);
+            parsed += size;
+        }
+        LOG.debug("Parsed TLV: " + this);
+        return this;
+    }
+
+    public HuaweiTLV parse(byte[] buffer) {
+        if (buffer == null) {
+            return null;
+        }
+        return parse(buffer, 0, buffer.length);
+    }
+
+    public byte[] serialize() {
+        int length = this.length();
+        if (length == 0)
+            return new byte[0];
+        ByteBuffer buffer = ByteBuffer.allocate(length);
+        for (TLV entry : valueMap)
+            buffer.put(entry.serialize());
+        LOG.debug("Serialized TLV: " + this);
+        return buffer.array();
+    }
+
+    public HuaweiTLV put(int tag) {
+        byte[] value = new byte[0];
+        valueMap.add(new TLV((byte)tag, value));
+        return this;
+    }
+
+    public HuaweiTLV put(int tag, byte[] value) {
+        if (value == null) {
+            return this;
+        }
+        valueMap.add(new TLV((byte)tag, value));
+        return this;
+    }
+
+    public HuaweiTLV put(int tag, byte value) {
+        return put(tag, new byte[]{value});
+    }
+
+    public HuaweiTLV put(int tag, boolean value) {
+        return put(tag, new byte[]{value ? (byte) 1 : (byte) 0});
+    }
+
+    public HuaweiTLV put(int tag, Long value) {
+        return put(tag, ByteBuffer.allocate(8).putLong(value).array());
+    }
+
+    public HuaweiTLV put(int tag, int value) {
+        return put(tag, ByteBuffer.allocate(4).putInt(value).array());
+    }
+
+    public HuaweiTLV put(int tag, short value) {
+        return put(tag, ByteBuffer.allocate(2).putShort(value).array());
+    }
+
+    public HuaweiTLV put(int tag, String value) {
+        if (value == null) {
+            return this;
+        }
+        return put(tag, value.getBytes(StandardCharsets.UTF_8));
+    }
+
+    public HuaweiTLV put(int tag, HuaweiTLV value) {
+        if (value == null) {
+            return this;
+        }
+        return put(tag, value.serialize());
+    }
+
+    public List<TLV> get() {
+        return this.valueMap;
+    }
+
+    public byte[] getBytes(int tag) {
+        for (TLV item : valueMap)
+            if (item.getTag() == (byte) tag)
+                return item.getValue();
+        return null;
+    }
+
+    public Byte getByte(int tag) {
+        byte[] bytes = getBytes(tag);
+        if (bytes == null) {
+            return null;
+        }
+        return bytes[0];
+    }
+
+    public Boolean getBoolean(int tag) {
+        byte[] bytes = getBytes(tag);
+        if (bytes == null) {
+            return null;
+        }
+        return bytes[0] == 1;
+    }
+
+    public Integer getInteger(int tag) {
+        byte[] bytes = getBytes(tag);
+        if (bytes == null) {
+            return null;
+        }
+        return ByteBuffer.wrap(bytes).getInt();
+    }
+
+    public Short getShort(int tag) {
+        byte[] bytes = getBytes(tag);
+        if (bytes == null)
+            return null;
+        return ByteBuffer.wrap(bytes).getShort();
+    }
+
+    public String getString(int tag) {
+        byte[] bytes = getBytes(tag);
+        if (bytes == null) {
+            return null;
+        }
+        return new String(bytes, StandardCharsets.UTF_8);
+    }
+
+    public HuaweiTLV getObject(int tag) {
+        byte[] bytes = getBytes(tag);
+        if (bytes == null) {
+            return null;
+        }
+        return new HuaweiTLV().parse(bytes, 0, bytes.length);
+    }
+
+    public List<HuaweiTLV> getObjects(int tag) {
+        List<HuaweiTLV> returnValue = new ArrayList<>();
+        for (TLV tlv : valueMap) {
+            if (tlv.getTag() == (byte) tag)
+                returnValue.add(new HuaweiTLV().parse(tlv.getValue()));
+        }
+        return returnValue;
+    }
+
+    public boolean contains(int tag) {
+        for (TLV item : valueMap)
+            if (item.getTag() == (byte) tag)
+                return true;
+        return false;
+    }
+
+    /**
+     * Removes the last element that was added with the specified tag
+     * @param tag The tag of the element that should be removed
+     * @return The value contained in the removed tag
+     */
+    public byte[] remove(int tag) {
+        TLV foundItem = null;
+        for (TLV item : valueMap)
+            if (item.getTag() == (byte) tag)
+                foundItem = item;
+        if (foundItem != null) {
+            valueMap.remove(foundItem);
+            return foundItem.getValue();
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Get string representation of HuaweiTLV, "Empty" when no elements are present
+     * @return String
+     */
+    public String toString() {
+        if (valueMap.isEmpty())
+            return "Empty";
+
+        StringBuilder msg = new StringBuilder();
+        for (TLV entry : valueMap)
+            msg.append(entry.toString());
+        return msg.substring(0, msg.length() - 3);
+    }
+
+    public HuaweiTLV encrypt(ParamsProvider paramsProvider) throws CryptoException {
+        byte[] serializedTLV = serialize();
+        byte[] key = paramsProvider.getSecretKey();
+        byte[] nonce = paramsProvider.getIv();
+        byte[] encryptedTLV = HuaweiCrypto.encrypt(paramsProvider.getAuthMode(), serializedTLV, key, nonce);
+        return new HuaweiTLV()
+                .put(CryptoTags.encryption, (byte) 0x01)
+                .put(CryptoTags.initVector, nonce)
+                .put(CryptoTags.cipherText, encryptedTLV);
+    }
+
+    public void decrypt(ParamsProvider paramsProvider) throws CryptoException {
+        byte[] key = paramsProvider.getSecretKey();
+        byte[] decryptedTLV = HuaweiCrypto.decrypt(paramsProvider.getAuthMode(), getBytes(CryptoTags.cipherText), key, getBytes(CryptoTags.initVector));
+        this.valueMap = new ArrayList<>();
+        parse(decryptedTLV);
+    }
+}
+
+final class VarInt {
+    int dValue; // Decoded value of the VarInt
+    int size; // Size of the encoded value
+    byte[] eValue; // Encoded value of the VarInt
+
+    public VarInt(byte[] src, int offset) {
+        this.dValue = getVarIntValue(src, offset);
+        this.eValue = putVarIntValue(this.dValue);
+        this.size = this.eValue.length;
+    }
+
+    public String toString() {
+        return "VarInt(dValue: " + this.dValue + ", size: " + this.size + ", eValue: " + StringUtils.bytesToHex(this.eValue) + ")";
+    }
+    
+    /**
+    * Returns the size of the encoded input value.
+    *
+    * @param value the integer to be measured
+    * @return the encoding size of the input value
+    */
+    public static int getVarIntSize(int value) {
+        int result = 0;
+        do {
+        result++;
+        value >>>= 7;
+        } while (value != 0);
+        return result;
+    }
+
+    /**
+    * Decode a byte array of a variable-length encoding from start,
+    * 7 bits per byte.
+    * Return the decoded value in int.
+    *
+    * @param src the byte array to get the var int from
+    * @return the decoded value in int
+    */
+    public static int getVarIntValue(byte[] src, int offset) {
+        int result = 0;
+        int b;
+        while (true) {
+            b = src[offset];
+            result += (b & 0x7F);
+            if ((b & 0x80) == 0) { break; }
+            result <<= 7;
+            offset++;
+        }
+        return result;
+    }
+
+    /**
+    * Encode an integer in a variable-length encoding, 7 bits per byte.
+    * Return the encoded value in byte[]
+    *
+    * @param value the int value to encode
+    * @return the encoded value in byte[]
+    */
+    public static byte[] putVarIntValue(int value) {
+        int size = getVarIntSize(value);
+        byte[] result = new byte[size];
+        result[size - 1] = (byte)(value & 0x7F);
+        for (int offset = size - 2; offset >= 0; offset--) {
+            value >>>= 7;
+            result[offset] = (byte)((value & 0x7F) | 0x80);
+        }
+        return result;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiUtil.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiUtil.java
new file mode 100644
index 000000000..7cb7c1904
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiUtil.java
@@ -0,0 +1,60 @@
+/*  Copyright (C) 2021 Gaignon Damien
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei;
+
+import java.nio.ByteBuffer;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Locale;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class HuaweiUtil {
+    private static final Logger LOG = LoggerFactory.getLogger(HuaweiUtil.class);
+
+    public static byte[] timeToByte(String time) {
+        Calendar calendar = Calendar.getInstance();
+        DateFormat df = new SimpleDateFormat("HH:mm", Locale.ENGLISH);
+        try {
+            Date t = df.parse(time);
+            assert t != null;
+            calendar.setTime(t);
+        } catch (ParseException e) {
+            LOG.error("Time conversion error: " + e);
+            return null;
+        }
+        return new byte[]{
+            (byte)calendar.get(Calendar.HOUR_OF_DAY),
+            (byte)calendar.get(Calendar.MINUTE)};
+    }
+
+    public static byte[] getTimeAndZoneId() {
+        Calendar now = Calendar.getInstance();
+        int zoneRawOffset = (now.get(Calendar.ZONE_OFFSET) + now.get(Calendar.DST_OFFSET)) / 1000;
+        byte[] id = now.getTimeZone().getID().getBytes();
+        return ByteBuffer.allocate(6 + id.length)
+            .putInt((int)(now.getTimeInMillis() / 1000))
+            .put((byte)(zoneRawOffset < 0 ? (zoneRawOffset / 3600 + 128) : zoneRawOffset / 3600) )
+            .put((byte)(zoneRawOffset / 60 % 60))
+            .put(id)
+            .array();
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband3/HonorBand3Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband3/HonorBand3Coordinator.java
new file mode 100644
index 000000000..b960f3f4e
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband3/HonorBand3Coordinator.java
@@ -0,0 +1,74 @@
+/*  Copyright (C) 2021-2023 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei.honorband3;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiLECoordinator;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
+import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
+
+public class HonorBand3Coordinator extends HuaweiLECoordinator {
+    private static final Logger LOG = LoggerFactory.getLogger(HonorBand3Coordinator.class);
+
+    @Override
+    public String getManufacturer() {
+        return "Honor";
+    }
+
+    @Override
+    public DeviceType getDeviceType() {
+        return DeviceType.HONORBAND3;
+    }
+
+    @Override
+    public boolean supports(GBDeviceCandidate candidate) {
+        try {
+            String name = candidate.getName();
+            if (name != null && name.toLowerCase().startsWith(HuaweiConstants.HO_BAND3_NAME)) {
+                return true;
+            }
+        } catch (Exception ex) {
+            LOG.error("unable to check device support", ex);
+        }
+        return false;
+    }
+
+    @Override
+    public boolean supportsHeartRateMeasurement(GBDevice device) {
+        return true;
+    }
+
+    @Override
+    public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
+        return getHuaweiCoordinator().genericHuaweiSupportedDeviceSpecificSettings(new int[]{
+                R.xml.devicesettings_heartrate_automatic_enable,
+                R.xml.devicesettings_find_phone,
+                R.xml.devicesettings_disable_find_phone_with_dnd,
+        });
+    }
+
+    @Override
+    public int getDeviceNameResource() {
+        return R.string.devicetype_honor_band3;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband4/HonorBand4Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband4/HonorBand4Coordinator.java
new file mode 100644
index 000000000..3066cceb3
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband4/HonorBand4Coordinator.java
@@ -0,0 +1,72 @@
+/*  Copyright (C) 2021-2023 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei.honorband4;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiLECoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
+import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
+
+public class HonorBand4Coordinator extends HuaweiLECoordinator {
+    private static final Logger LOG = LoggerFactory.getLogger(HonorBand4Coordinator.class);
+
+    public HonorBand4Coordinator() {
+        super();
+    }
+
+    @Override
+    public String getManufacturer() {
+        return "Honor";
+    }
+
+    @Override
+    public DeviceType getDeviceType() {
+        return DeviceType.HONORBAND4;
+    }
+
+    @Override
+    public boolean supports(GBDeviceCandidate candidate) {
+        try {
+            String name = candidate.getName();
+            if (name != null && name.toLowerCase().startsWith(HuaweiConstants.HO_BAND4_NAME)) {
+                return true;
+            }
+        } catch (Exception ex) {
+            LOG.error("unable to check device support", ex);
+        }
+        return false;
+    }
+
+    @Override
+    public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
+        return getHuaweiCoordinator().genericHuaweiSupportedDeviceSpecificSettings(new int[]{
+                R.xml.devicesettings_find_phone,
+                R.xml.devicesettings_disable_find_phone_with_dnd,
+        });
+    }
+
+    @Override
+    public int getDeviceNameResource() {
+        return R.string.devicetype_honor_band4;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband5/HonorBand5Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband5/HonorBand5Coordinator.java
new file mode 100644
index 000000000..179788cc1
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband5/HonorBand5Coordinator.java
@@ -0,0 +1,89 @@
+/*  Copyright (C) 2021-2023 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei.honorband5;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.devices.TimeSampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiLECoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiSpo2SampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
+import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
+import nodomain.freeyourgadget.gadgetbridge.model.Spo2Sample;
+
+public class HonorBand5Coordinator extends HuaweiLECoordinator {
+    private static final Logger LOG = LoggerFactory.getLogger(HonorBand5Coordinator.class);
+
+    @Override
+    public String getManufacturer() {
+        return "Honor";
+    }
+
+    @Override
+    public DeviceType getDeviceType() {
+        return DeviceType.HONORBAND5;
+    }
+
+    @Override
+    public boolean supports(GBDeviceCandidate candidate) {
+        try {
+            String name = candidate.getName();
+            if (name != null && name.toLowerCase().startsWith(HuaweiConstants.HO_BAND5_NAME)) {
+                return true;
+            }
+        } catch (Exception ex) {
+            LOG.error("unable to check device support", ex);
+        }
+        return false;
+    }
+
+    @Override
+    public boolean supportsHeartRateMeasurement(GBDevice device) {
+        return true;
+    }
+
+    @Override
+    public boolean supportsSpo2() {
+        return true;
+    }
+
+    @Override
+    public TimeSampleProvider<? extends Spo2Sample> getSpo2SampleProvider(GBDevice device, DaoSession session) {
+        return new HuaweiSpo2SampleProvider(device, session);
+    }
+
+    @Override
+    public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
+        return getHuaweiCoordinator().genericHuaweiSupportedDeviceSpecificSettings(new int[]{
+                R.xml.devicesettings_heartrate_automatic_enable,
+                R.xml.devicesettings_spo_automatic_enable,
+                R.xml.devicesettings_find_phone,
+                R.xml.devicesettings_disable_find_phone_with_dnd,
+        });
+    }
+
+    @Override
+    public int getDeviceNameResource() {
+        return R.string.devicetype_honor_band5;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband6/HonorBand6Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband6/HonorBand6Coordinator.java
new file mode 100644
index 000000000..dcb89dcb2
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband6/HonorBand6Coordinator.java
@@ -0,0 +1,84 @@
+/*  Copyright (C) 2021-2023 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei.honorband6;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.devices.TimeSampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiLECoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiSpo2SampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
+import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
+import nodomain.freeyourgadget.gadgetbridge.model.Spo2Sample;
+
+public class HonorBand6Coordinator extends HuaweiLECoordinator {
+    private static final Logger LOG = LoggerFactory.getLogger(HonorBand6Coordinator.class);
+
+    @Override
+    public DeviceType getDeviceType() {
+        return DeviceType.HONORBAND6;
+    }
+
+    @Override
+    public boolean supports(GBDeviceCandidate candidate) {
+        try {
+            String name = candidate.getName();
+            if (name != null && name.toLowerCase().startsWith(HuaweiConstants.HO_BAND6_NAME)) {
+                return true;
+            }
+        } catch (Exception ex) {
+            LOG.error("unable to check device support", ex);
+        }
+        return false;
+    }
+
+    @Override
+    public boolean supportsHeartRateMeasurement(GBDevice device) {
+        return true;
+    }
+
+    @Override
+    public boolean supportsSpo2() {
+        return true;
+    }
+
+    @Override
+    public TimeSampleProvider<? extends Spo2Sample> getSpo2SampleProvider(GBDevice device, DaoSession session) {
+        return new HuaweiSpo2SampleProvider(device, session);
+    }
+
+    @Override
+    public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
+        return getHuaweiCoordinator().genericHuaweiSupportedDeviceSpecificSettings(new int[]{
+                R.xml.devicesettings_heartrate_automatic_enable,
+                R.xml.devicesettings_spo_automatic_enable,
+                R.xml.devicesettings_find_phone,
+                R.xml.devicesettings_disable_find_phone_with_dnd,
+        });
+    }
+
+    @Override
+    public int getDeviceNameResource() {
+        return R.string.devicetype_honor_band6;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband7/HonorBand7Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband7/HonorBand7Coordinator.java
new file mode 100644
index 000000000..df75023c1
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband7/HonorBand7Coordinator.java
@@ -0,0 +1,84 @@
+/*  Copyright (C) 2021-2023 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei.honorband7;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.devices.TimeSampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiLECoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiSpo2SampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
+import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
+import nodomain.freeyourgadget.gadgetbridge.model.Spo2Sample;
+
+public class HonorBand7Coordinator extends HuaweiLECoordinator {
+    private static final Logger LOG = LoggerFactory.getLogger(HonorBand7Coordinator.class);
+
+    @Override
+    public DeviceType getDeviceType() {
+        return DeviceType.HUAWEIBAND7;
+    }
+
+    @Override
+    public boolean supports(GBDeviceCandidate candidate) {
+        try {
+            String name = candidate.getName();
+            if (name != null && name.toLowerCase().startsWith(HuaweiConstants.HO_BAND7_NAME)) {
+                return true;
+            }
+        } catch (Exception ex) {
+            LOG.error("unable to check device support", ex);
+        }
+        return false;
+    }
+
+    @Override
+    public boolean supportsHeartRateMeasurement(GBDevice device) {
+        return true;
+    }
+
+    @Override
+    public boolean supportsSpo2() {
+        return true;
+    }
+
+    @Override
+    public TimeSampleProvider<? extends Spo2Sample> getSpo2SampleProvider(GBDevice device, DaoSession session) {
+        return new HuaweiSpo2SampleProvider(device, session);
+    }
+
+    @Override
+    public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
+        return getHuaweiCoordinator().genericHuaweiSupportedDeviceSpecificSettings(new int[]{
+                R.xml.devicesettings_heartrate_automatic_enable,
+                R.xml.devicesettings_spo_automatic_enable,
+                R.xml.devicesettings_find_phone,
+                R.xml.devicesettings_disable_find_phone_with_dnd,
+        });
+    }
+
+    @Override
+    public int getDeviceNameResource() {
+        return R.string.devicetype_honor_band7;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband4pro/HuaweiBand4ProCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband4pro/HuaweiBand4ProCoordinator.java
new file mode 100644
index 000000000..dfb4ddb2e
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband4pro/HuaweiBand4ProCoordinator.java
@@ -0,0 +1,87 @@
+/*  Copyright (C) 2021-2023 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei.huaweiband4pro;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.devices.TimeSampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiLECoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiSpo2SampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
+import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
+import nodomain.freeyourgadget.gadgetbridge.model.Spo2Sample;
+
+public class HuaweiBand4ProCoordinator extends HuaweiLECoordinator {
+    private static final Logger LOG = LoggerFactory.getLogger(HuaweiBand4ProCoordinator.class);
+
+    @Override
+    public DeviceType getDeviceType() {
+        return DeviceType.HUAWEIBAND4PRO;
+    }
+
+    @Override
+    public boolean supports(GBDeviceCandidate candidate) {
+        try {
+            String name = candidate.getName();
+            if (name != null && (
+                        name.toLowerCase().startsWith(HuaweiConstants.HU_BAND4_NAME) ||
+                        name.toLowerCase().startsWith(HuaweiConstants.HU_BAND4PRO_NAME)
+            )) {
+                return true;
+            }
+        } catch (Exception ex) {
+            LOG.error("unable to check device support", ex);
+        }
+        return false;
+    }
+
+    @Override
+    public boolean supportsHeartRateMeasurement(GBDevice device) {
+        return true;
+    }
+
+    @Override
+    public boolean supportsSpo2() {
+        return true;
+    }
+
+    @Override
+    public TimeSampleProvider<? extends Spo2Sample> getSpo2SampleProvider(GBDevice device, DaoSession session) {
+        return new HuaweiSpo2SampleProvider(device, session);
+    }
+
+    @Override
+    public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
+        return getHuaweiCoordinator().genericHuaweiSupportedDeviceSpecificSettings(new int[]{
+                R.xml.devicesettings_heartrate_automatic_enable,
+                R.xml.devicesettings_spo_automatic_enable,
+                R.xml.devicesettings_find_phone,
+                R.xml.devicesettings_disable_find_phone_with_dnd,
+        });
+    }
+
+    @Override
+    public int getDeviceNameResource() {
+        return R.string.devicetype_huawei_band4pro;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband6/HuaweiBand6Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband6/HuaweiBand6Coordinator.java
new file mode 100644
index 000000000..6277c775e
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband6/HuaweiBand6Coordinator.java
@@ -0,0 +1,84 @@
+/*  Copyright (C) 2021-2023 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei.huaweiband6;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.devices.TimeSampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiLECoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiSpo2SampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
+import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
+import nodomain.freeyourgadget.gadgetbridge.model.Spo2Sample;
+
+public class HuaweiBand6Coordinator extends HuaweiLECoordinator {
+    private static final Logger LOG = LoggerFactory.getLogger(HuaweiBand6Coordinator.class);
+
+    @Override
+    public DeviceType getDeviceType() {
+        return DeviceType.HUAWEIBAND6;
+    }
+
+    @Override
+    public boolean supports(GBDeviceCandidate candidate) {
+        try {
+            String name = candidate.getName();
+            if (name != null && name.toLowerCase().startsWith(HuaweiConstants.HU_BAND6_NAME)) {
+                return true;
+            }
+        } catch (Exception ex) {
+            LOG.error("unable to check device support", ex);
+        }
+        return false;
+    }
+
+    @Override
+    public boolean supportsHeartRateMeasurement(GBDevice device) {
+        return true;
+    }
+
+    @Override
+    public boolean supportsSpo2() {
+        return true;
+    }
+
+    @Override
+    public TimeSampleProvider<? extends Spo2Sample> getSpo2SampleProvider(GBDevice device, DaoSession session) {
+        return new HuaweiSpo2SampleProvider(device, session);
+    }
+
+    @Override
+    public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
+        return getHuaweiCoordinator().genericHuaweiSupportedDeviceSpecificSettings(new int[]{
+                R.xml.devicesettings_heartrate_automatic_enable,
+                R.xml.devicesettings_spo_automatic_enable,
+                R.xml.devicesettings_find_phone,
+                R.xml.devicesettings_disable_find_phone_with_dnd,
+        });
+    }
+
+    @Override
+    public int getDeviceNameResource() {
+        return R.string.devicetype_huawei_band6;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband7/HuaweiBand7Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband7/HuaweiBand7Coordinator.java
new file mode 100644
index 000000000..770932498
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband7/HuaweiBand7Coordinator.java
@@ -0,0 +1,84 @@
+/*  Copyright (C) 2021-2023 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei.huaweiband7;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.devices.TimeSampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiLECoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiSpo2SampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
+import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
+import nodomain.freeyourgadget.gadgetbridge.model.Spo2Sample;
+
+public class HuaweiBand7Coordinator extends HuaweiLECoordinator {
+    private static final Logger LOG = LoggerFactory.getLogger(HuaweiBand7Coordinator.class);
+
+    @Override
+    public DeviceType getDeviceType() {
+        return DeviceType.HUAWEIBAND7;
+    }
+
+    @Override
+    public boolean supports(GBDeviceCandidate candidate) {
+        try {
+            String name = candidate.getName();
+            if (name != null && name.toLowerCase().startsWith(HuaweiConstants.HU_BAND7_NAME)) {
+                return true;
+            }
+        } catch (Exception ex) {
+            LOG.error("unable to check device support", ex);
+        }
+        return false;
+    }
+
+    @Override
+    public boolean supportsHeartRateMeasurement(GBDevice device) {
+        return true;
+    }
+
+    @Override
+    public boolean supportsSpo2() {
+        return true;
+    }
+
+    @Override
+    public TimeSampleProvider<? extends Spo2Sample> getSpo2SampleProvider(GBDevice device, DaoSession session) {
+        return new HuaweiSpo2SampleProvider(device, session);
+    }
+
+    @Override
+    public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
+        return getHuaweiCoordinator().genericHuaweiSupportedDeviceSpecificSettings(new int[]{
+                R.xml.devicesettings_heartrate_automatic_enable,
+                R.xml.devicesettings_spo_automatic_enable,
+                R.xml.devicesettings_find_phone,
+                R.xml.devicesettings_disable_find_phone_with_dnd,
+        });
+    }
+
+    @Override
+    public int getDeviceNameResource() {
+        return R.string.devicetype_huawei_band7;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband8/HuaweiBand8Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband8/HuaweiBand8Coordinator.java
new file mode 100644
index 000000000..d1acf5a08
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband8/HuaweiBand8Coordinator.java
@@ -0,0 +1,84 @@
+/*  Copyright (C) 2023 Gaignon Damien
+    Copyright (C) 2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei.huaweiband8;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.devices.TimeSampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiLECoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiSpo2SampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
+import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
+import nodomain.freeyourgadget.gadgetbridge.model.Spo2Sample;
+
+public class HuaweiBand8Coordinator extends HuaweiLECoordinator {
+    private static final Logger LOG = LoggerFactory.getLogger(HuaweiBand8Coordinator.class);
+
+    @Override
+    public DeviceType getDeviceType() {
+        return DeviceType.HUAWEIBAND8;
+    }
+
+    @Override
+    public boolean supports(GBDeviceCandidate candidate) {
+        try {
+            String name = candidate.getName();
+            if (name != null && name.toLowerCase().startsWith(HuaweiConstants.HU_BAND8_NAME)) {
+                return true;
+            }
+        } catch (Exception ex) {
+            LOG.error("unable to check device support", ex);
+        }
+        return false;
+    }
+
+    @Override
+    public boolean supportsHeartRateMeasurement(GBDevice device) {
+        return true;
+    }
+
+    @Override
+    public boolean supportsSpo2() {
+        return true;
+    }
+
+    @Override
+    public TimeSampleProvider<? extends Spo2Sample> getSpo2SampleProvider(GBDevice device, DaoSession session) {
+        return new HuaweiSpo2SampleProvider(device, session);
+    }
+
+    @Override
+    public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
+        return getHuaweiCoordinator().genericHuaweiSupportedDeviceSpecificSettings(new int[]{
+                R.xml.devicesettings_heartrate_automatic_enable,
+                R.xml.devicesettings_spo_automatic_enable,
+                R.xml.devicesettings_find_phone,
+                R.xml.devicesettings_disable_find_phone_with_dnd,
+        });
+    }
+
+    @Override
+    public int getDeviceNameResource() {
+        return R.string.devicetype_huawei_band8;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweibandaw70/HuaweiBandAw70Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweibandaw70/HuaweiBandAw70Coordinator.java
new file mode 100644
index 000000000..9c8d90d61
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweibandaw70/HuaweiBandAw70Coordinator.java
@@ -0,0 +1,71 @@
+/*  Copyright (C) 2021-2023 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei.huaweibandaw70;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiLECoordinator;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
+import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
+
+public class HuaweiBandAw70Coordinator extends HuaweiLECoordinator {
+    private static final Logger LOG = LoggerFactory.getLogger(HuaweiBandAw70Coordinator.class);
+
+    @Override
+    public DeviceType getDeviceType() {
+        return DeviceType.HUAWEIBANDAW70;
+    }
+
+    @Override
+    public boolean supports(GBDeviceCandidate candidate) {
+        try {
+            String name = candidate.getName();
+            if (name != null && (
+                name.toLowerCase().startsWith(HuaweiConstants.HU_BAND3E_NAME) ||
+                name.toLowerCase().startsWith(HuaweiConstants.HU_BAND4E_NAME)
+            )) {
+                return true;
+            }
+        } catch (Exception ex) {
+            LOG.error("unable to check device support", ex);
+        }
+        return false;
+    }
+
+    @Override
+    public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
+        return getHuaweiCoordinator().genericHuaweiSupportedDeviceSpecificSettings(new int[]{
+                R.xml.devicesettings_find_phone,
+                R.xml.devicesettings_disable_find_phone_with_dnd,
+        });
+    }
+
+    @Override
+    public int getDeviceNameResource() {
+        return R.string.devicetype_huawei_band_aw70;
+    }
+
+    @Override
+    public HuaweiDeviceType getHuaweiType() {
+        return HuaweiDeviceType.AW;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweitalkbandb6/HuaweiTalkBandB6Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweitalkbandb6/HuaweiTalkBandB6Coordinator.java
new file mode 100644
index 000000000..9f9a65e74
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweitalkbandb6/HuaweiTalkBandB6Coordinator.java
@@ -0,0 +1,60 @@
+/*  Copyright (C) 2021-2023 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei.huaweitalkbandb6;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiBRCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
+import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
+
+public class HuaweiTalkBandB6Coordinator extends HuaweiBRCoordinator {
+    private static final Logger LOG = LoggerFactory.getLogger(HuaweiTalkBandB6Coordinator.class);
+
+    @Override
+    public DeviceType getDeviceType() {
+        return DeviceType.HUAWEITALKBANDB6;
+    }
+
+    @Override
+    public boolean supports(GBDeviceCandidate candidate) {
+        try {
+            String name = candidate.getName();
+            if (name != null && name.toLowerCase().startsWith(HuaweiConstants.HU_TALKBANDB6_NAME)) {
+                return true;
+            }
+        } catch (Exception ex) {
+            LOG.error("unable to check device support", ex);
+        }
+        return false;
+    }
+
+    @Override
+    public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
+        return getHuaweiCoordinator().genericHuaweiSupportedDeviceSpecificSettings(null);
+    }
+
+    @Override
+    public int getDeviceNameResource() {
+        return R.string.devicetype_huawei_talk_band_b6;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt/HuaweiWatchGTCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt/HuaweiWatchGTCoordinator.java
new file mode 100644
index 000000000..022b161ff
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt/HuaweiWatchGTCoordinator.java
@@ -0,0 +1,90 @@
+/*  Copyright (C) 2021-2023 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei.huaweiwatchgt;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.devices.TimeSampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiLECoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiSpo2SampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
+import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
+import nodomain.freeyourgadget.gadgetbridge.model.Spo2Sample;
+
+public class HuaweiWatchGTCoordinator extends HuaweiLECoordinator {
+    private static final Logger LOG = LoggerFactory.getLogger(HuaweiWatchGTCoordinator.class);
+
+    @Override
+    public DeviceType getDeviceType() {
+        return DeviceType.HUAWEIWATCHGT;
+    }
+
+    @Override
+    public boolean supports(GBDeviceCandidate candidate) {
+        try {
+            String name = candidate.getName();
+            if (name != null && name.toLowerCase().startsWith(HuaweiConstants.HU_WATCHGT_NAME)) {
+                return true;
+            }
+        } catch (Exception ex) {
+            LOG.error("unable to check device support", ex);
+        }
+        return false;
+    }
+
+    @Override
+    public boolean supportsHeartRateMeasurement(GBDevice device) {
+        return true;
+    }
+
+    @Override
+    public boolean supportsSpo2() {
+        return true;
+    }
+
+    @Override
+    public TimeSampleProvider<? extends Spo2Sample> getSpo2SampleProvider(GBDevice device, DaoSession session) {
+        return new HuaweiSpo2SampleProvider(device, session);
+    }
+
+    @Override
+    public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
+        return getHuaweiCoordinator().genericHuaweiSupportedDeviceSpecificSettings(new int[]{
+                R.xml.devicesettings_heartrate_automatic_enable,
+                R.xml.devicesettings_spo_automatic_enable,
+                R.xml.devicesettings_find_phone,
+                R.xml.devicesettings_disable_find_phone_with_dnd,
+        });
+    }
+
+    @Override
+    public int getDeviceNameResource() {
+        return R.string.devicetype_huawei_watch_gt;
+    }
+
+    //@Override
+    //public HuaweiDeviceType getHuaweiType() {
+        // Could be SMART
+    //    return HuaweiDeviceType.BLE;
+    //}
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt2/HuaweiWatchGT2Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt2/HuaweiWatchGT2Coordinator.java
new file mode 100644
index 000000000..a0c9f4607
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt2/HuaweiWatchGT2Coordinator.java
@@ -0,0 +1,83 @@
+/*  Copyright (C) 2021-2023 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei.huaweiwatchgt2;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.devices.TimeSampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiBRCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiSpo2SampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
+import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
+import nodomain.freeyourgadget.gadgetbridge.model.Spo2Sample;
+
+public class HuaweiWatchGT2Coordinator extends HuaweiBRCoordinator {
+    private static final Logger LOG = LoggerFactory.getLogger(HuaweiWatchGT2Coordinator.class);
+
+    public HuaweiWatchGT2Coordinator() {
+        super();
+    }
+
+    @Override
+    public DeviceType getDeviceType() {
+        return DeviceType.HUAWEIWATCHGT2;
+    }
+
+    @Override
+    public boolean supports(GBDeviceCandidate candidate) {
+        try {
+            String name = candidate.getName();
+            if (name != null && (
+                        name.toLowerCase().startsWith(HuaweiConstants.HU_WATCHGT2_NAME) ||
+                        name.toLowerCase().startsWith(HuaweiConstants.HU_WATCHGT2PRO_NAME)
+            )) {
+                return true;
+            }
+        } catch (Exception ex) {
+            LOG.error("unable to check device support", ex);
+        }
+        return false;
+    }
+
+    @Override
+    public boolean supportsSpo2() {
+        return true;
+    }
+
+    @Override
+    public TimeSampleProvider<? extends Spo2Sample> getSpo2SampleProvider(GBDevice device, DaoSession session) {
+        return new HuaweiSpo2SampleProvider(device, session);
+    }
+
+    @Override
+    public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
+        return getHuaweiCoordinator().genericHuaweiSupportedDeviceSpecificSettings(new int[]{
+                R.xml.devicesettings_spo_automatic_enable,
+        });
+    }
+
+    @Override
+    public int getDeviceNameResource() {
+        return R.string.devicetype_huawei_watchgt2;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt2e/HuaweiWatchGT2eCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt2e/HuaweiWatchGT2eCoordinator.java
new file mode 100644
index 000000000..594256377
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt2e/HuaweiWatchGT2eCoordinator.java
@@ -0,0 +1,94 @@
+/*  Copyright (C) 2021-2023 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei.huaweiwatchgt2e;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.devices.TimeSampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiLECoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiSpo2SampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
+import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
+import nodomain.freeyourgadget.gadgetbridge.model.Spo2Sample;
+
+public class HuaweiWatchGT2eCoordinator extends HuaweiLECoordinator {
+    private static final Logger LOG = LoggerFactory.getLogger(HuaweiWatchGT2eCoordinator.class);
+
+    public HuaweiWatchGT2eCoordinator() {
+        super();
+    }
+
+    @Override
+    public DeviceType getDeviceType() {
+        return DeviceType.HUAWEIWATCHGT2E;
+    }
+
+    @Override
+    public boolean supports(GBDeviceCandidate candidate) {
+        try {
+            String name = candidate.getName();
+            if (name != null && name.toLowerCase().startsWith(HuaweiConstants.HU_WATCHGT2E_NAME)) {
+                return true;
+            }
+        } catch (Exception ex) {
+            LOG.error("unable to check device support", ex);
+        }
+        return false;
+    }
+
+    @Override
+    public boolean supportsHeartRateMeasurement(GBDevice device) {
+        return true;
+    }
+
+    @Override
+    public boolean supportsSpo2() {
+        return true;
+    }
+
+    @Override
+    public TimeSampleProvider<? extends Spo2Sample> getSpo2SampleProvider(GBDevice device, DaoSession session) {
+        return new HuaweiSpo2SampleProvider(device, session);
+    }
+
+    @Override
+    public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
+        return getHuaweiCoordinator().genericHuaweiSupportedDeviceSpecificSettings(new int[]{
+                R.xml.devicesettings_heartrate_automatic_enable,
+                R.xml.devicesettings_spo_automatic_enable,
+                R.xml.devicesettings_find_phone,
+                R.xml.devicesettings_disable_find_phone_with_dnd,
+        });
+    }
+
+    @Override
+    public int getDeviceNameResource() {
+        return R.string.devicetype_huawei_watchgt2e;
+    }
+
+    //@Override
+    //public HuaweiDeviceType getHuaweiType() {
+        // Could be SMART
+    //    return HuaweiDeviceType.BLE;
+    //}
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt3/HuaweiWatchGT3Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt3/HuaweiWatchGT3Coordinator.java
new file mode 100644
index 000000000..5ce883734
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt3/HuaweiWatchGT3Coordinator.java
@@ -0,0 +1,67 @@
+/*  Copyright (C) 2023 Gaignon Damien
+    Copyright (C) 2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei.huaweiwatchgt3;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiBRCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
+import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
+
+public class HuaweiWatchGT3Coordinator extends HuaweiBRCoordinator {
+    private static final Logger LOG = LoggerFactory.getLogger(HuaweiWatchGT3Coordinator.class);
+
+    public HuaweiWatchGT3Coordinator() {
+        super();
+    }
+
+    @Override
+    public DeviceType getDeviceType() {
+        return DeviceType.HUAWEIWATCHGT3;
+    }
+
+    @Override
+    public boolean supports(GBDeviceCandidate candidate) {
+        try {
+            String name = candidate.getName();
+            if (name != null && (
+                        name.toLowerCase().startsWith(HuaweiConstants.HU_WATCHGT3_NAME) ||
+                        name.toLowerCase().startsWith(HuaweiConstants.HU_WATCHGT3PRO_NAME)
+            )) {
+                return true;
+            }
+        } catch (Exception ex) {
+            LOG.error("unable to check device support", ex);
+        }
+        return false;
+    }
+
+    @Override
+    public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
+        return getHuaweiCoordinator().genericHuaweiSupportedDeviceSpecificSettings(null);
+    }
+
+    @Override
+    public int getDeviceNameResource() {
+        return R.string.devicetype_huawei_watchgt3;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/AccountRelated.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/AccountRelated.java
new file mode 100644
index 000000000..7462e7801
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/AccountRelated.java
@@ -0,0 +1,48 @@
+/*	Copyright (C) 2023 Gaignon Damien
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiTLV;
+
+public class AccountRelated {
+	public static final byte id = 0x1A;
+
+	public static class SendAccountToDevice {
+		public static final byte id = 0x01;
+
+		public static class Request extends HuaweiPacket {
+			public Request (ParamsProvider paramsProvider) {
+				super(paramsProvider);
+
+				this.serviceId = AccountRelated.id;
+				this.commandId = id;
+
+				this.tlv = new HuaweiTLV()
+						.put(0x01);
+
+				this.complete = true;
+			}
+		}
+
+		public static class Response extends HuaweiPacket {
+			public Response (ParamsProvider paramsProvider) {
+				super(paramsProvider);
+			}
+		}
+	}
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Alarms.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Alarms.java
new file mode 100644
index 000000000..da90532f4
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Alarms.java
@@ -0,0 +1,278 @@
+/*  Copyright (C) 2022 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiTLV;
+
+// TODO: complete responses
+
+public class Alarms {
+
+    public static class EventAlarm {
+        public byte index;
+        public boolean status;
+        public byte startHour;
+        public byte startMinute;
+        public byte repeat;
+        public String name;
+
+        public EventAlarm(HuaweiTLV tlv) throws HuaweiPacket.MissingTagException {
+            if (!tlv.contains(0x03))
+                throw new HuaweiPacket.MissingTagException(0x03);
+            if (!tlv.contains(0x04))
+                throw new HuaweiPacket.MissingTagException(0x04);
+            if (!tlv.contains(0x05))
+                throw new HuaweiPacket.MissingTagException(0x05);
+            if (!tlv.contains(0x06))
+                throw new HuaweiPacket.MissingTagException(0x06);
+            if (!tlv.contains(0x07))
+                throw new HuaweiPacket.MissingTagException(0x07);
+
+            this.index = tlv.getByte(0x03);
+            this.status = tlv.getBoolean(0x04);
+            this.startHour = (byte) ((tlv.getShort(0x05) >> 8) & 0xFF);
+            this.startMinute = (byte) (tlv.getShort(0x05) & 0xFF);
+            this.repeat = tlv.getByte(0x06);
+            this.name = tlv.getString(0x07);
+        }
+
+        public EventAlarm(byte index, boolean status, byte startHour, byte startMinute, byte repeat, String name) {
+            this.index = index;
+            this.status = status;
+            this.startHour = startHour;
+            this.startMinute = startMinute;
+            this.repeat = repeat;
+            this.name = name;
+        }
+
+        public HuaweiTLV asTlv() {
+            return new HuaweiTLV()
+                    .put(0x03, index)
+                    .put(0x04, status)
+                    .put(0x05, (short) ((startHour << 8) | (startMinute & 0xFF)))
+                    .put(0x06, repeat)
+                    .put(0x07, name);
+        }
+
+        @Override
+        public String toString() {
+            return "EventAlarm{" +
+                    "index=" + index +
+                    ", status=" + status +
+                    ", startHour=" + startHour +
+                    ", startMinute=" + startMinute +
+                    ", repeat=" + repeat +
+                    ", name='" + name + '\'' +
+                    '}';
+        }
+    }
+
+    public static class SmartAlarm {
+        public byte index;
+        public boolean status;
+        public byte startHour;
+        public byte startMinute;
+        public byte repeat;
+        public byte aheadTime;
+
+        public SmartAlarm(HuaweiTLV tlv) throws HuaweiPacket.MissingTagException {
+            if (!tlv.contains(0x03))
+                throw new HuaweiPacket.MissingTagException(0x03);
+            if (!tlv.contains(0x04))
+                throw new HuaweiPacket.MissingTagException(0x04);
+            if (!tlv.contains(0x05))
+                throw new HuaweiPacket.MissingTagException(0x05);
+            if (!tlv.contains(0x06))
+                throw new HuaweiPacket.MissingTagException(0x06);
+            if (!tlv.contains(0x07))
+                throw new HuaweiPacket.MissingTagException(0x07);
+
+            this.index = tlv.getByte(0x03);
+            this.status = tlv.getBoolean(0x04);
+            this.startHour = (byte) ((tlv.getShort(0x05) >> 8) & 0xFF);
+            this.startMinute = (byte) (tlv.getShort(0x05) & 0xFF);
+            this.repeat = tlv.getByte(0x06);
+            this.aheadTime = tlv.getByte(0x07);
+        }
+
+        public SmartAlarm(boolean status, byte startHour, byte startMinute, byte repeat, byte aheadTime) {
+            this.index = 1;
+            this.status = status;
+            this.startHour = startHour;
+            this.startMinute = startMinute;
+            this.repeat = repeat;
+            this.aheadTime = aheadTime;
+        }
+
+        public HuaweiTLV asTlv() {
+            return new HuaweiTLV()
+                    .put(0x03, index)
+                    .put(0x04, status)
+                    .put(0x05, (short) ((startHour << 8) | (startMinute & 0xFF)))
+                    .put(0x06, repeat)
+                    .put(0x07, aheadTime);
+        }
+
+        @Override
+        public String toString() {
+            return "SmartAlarm{" +
+                    "index=" + index +
+                    ", status=" + status +
+                    ", startHour=" + startHour +
+                    ", startMinute=" + startMinute +
+                    ", repeat=" + repeat +
+                    ", aheadTime=" + aheadTime +
+                    '}';
+        }
+    }
+
+    public static final byte id = 0x08;
+
+    public static class EventAlarmsRequest extends HuaweiPacket {
+        public static final byte id = 0x01;
+
+        // TODO: move to list
+        private final HuaweiTLV alarms;
+
+        public EventAlarmsRequest(ParamsProvider paramsProvider) {
+            super(paramsProvider);
+
+            this.serviceId = Alarms.id;
+            this.commandId = id;
+
+            alarms = new HuaweiTLV();
+        }
+
+        public void addEventAlarm(EventAlarm alarm) {
+            // TODO: 5 is a max and we may need to check for that and throw an exception if passed
+            alarms.put(0x82, alarm.asTlv());
+        }
+
+        @Override
+        public List<byte[]> serialize() throws CryptoException {
+            if (this.alarms.get().size() == 0) {
+                // Empty alarms - this will disable them all
+                this.alarms.put(0x82, new HuaweiTLV().put(0x03, (byte) 0x01));
+            }
+
+            this.tlv = new HuaweiTLV().put(0x81, this.alarms);
+            this.complete = true;
+
+            return super.serialize();
+        }
+    }
+
+    public static class SmartAlarmRequest extends HuaweiPacket {
+        public static final int id = 0x02;
+
+        public SmartAlarmRequest(
+                ParamsProvider paramsProvider,
+                SmartAlarm smartAlarm
+        ) {
+            super(paramsProvider);
+
+            this.serviceId = Alarms.id;
+            this.commandId = id;
+            this.tlv = new HuaweiTLV()
+                    .put(0x81, new HuaweiTLV()
+                            .put(0x82, smartAlarm.asTlv())
+                    );
+            this.complete = true;
+        }
+    }
+
+    public static class EventAlarmsList {
+        public static final int id = 0x03;
+
+        public static class Request extends HuaweiPacket {
+            public Request(ParamsProvider paramsProvider) {
+                super(paramsProvider);
+
+                this.serviceId = Alarms.id;
+                this.commandId = id;
+
+                this.tlv = new HuaweiTLV().put(0x01);
+
+                this.complete = true;
+            }
+        }
+
+        public static class Response extends HuaweiPacket {
+            public List<EventAlarm> eventAlarms;
+
+            public Response(ParamsProvider paramsProvider) {
+                super(paramsProvider);
+            }
+
+            @Override
+            public void parseTlv() throws ParseException {
+                if (!this.tlv.contains(0x81))
+                    throw new MissingTagException(0x81);
+
+                eventAlarms = new ArrayList<>();
+
+                HuaweiTLV tlv = this.tlv.getObject(0x81);
+                for (HuaweiTLV subTlv : tlv.getObjects(0x82)) {
+                    eventAlarms.add(new EventAlarm(subTlv));
+                }
+            }
+        }
+    }
+
+    public static class SmartAlarmList {
+        public static final int id = 0x04;
+
+        public static class Request extends HuaweiPacket {
+            public Request(ParamsProvider paramsProvider) {
+                super(paramsProvider);
+
+                this.serviceId = Alarms.id;
+                this.commandId = id;
+
+                this.tlv = new HuaweiTLV().put(0x01);
+
+                this.complete = true;
+            }
+        }
+
+        public static class Response extends HuaweiPacket {
+            public SmartAlarm smartAlarm;
+
+            public Response(ParamsProvider paramsProvider) {
+                super(paramsProvider);
+            }
+
+            @Override
+            public void parseTlv() throws ParseException {
+                if (!this.tlv.contains(0x81))
+                    throw new MissingTagException(0x81);
+
+                HuaweiTLV tlv = this.tlv.getObject(0x81);
+                if (tlv.contains(0x82)) {
+                    this.smartAlarm = new SmartAlarm(tlv.getObject(0x82));
+                } else {
+                    this.smartAlarm = null;
+                }
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Calls.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Calls.java
new file mode 100644
index 000000000..d513902cd
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Calls.java
@@ -0,0 +1,65 @@
+/*  Copyright (C) 2022 Gaignon Damien
+    Copyright (C) 2022 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+
+public class Calls {
+
+    // This doesn't include the initial calling notification, as that is handled
+    // by the Notifications class.
+
+    public static final byte id = 0x04;
+
+    // TODO: tests
+
+    public static class AnswerCallResponse extends HuaweiPacket {
+        public static final byte id = 0x01;
+
+        public enum Action {
+            CALL_ACCEPT,
+            CALL_REJECT,
+            UNKNOWN
+        }
+
+        public Action action = Action.UNKNOWN;
+
+        public AnswerCallResponse(ParamsProvider paramsProvider) {
+            super(paramsProvider);
+
+            this.serviceId = Calls.id;
+            this.commandId = id;
+
+            this.isEncrypted = false;
+        }
+
+        @Override
+        public void parseTlv() throws MissingTagException {
+            if (this.tlv.contains(0x01)) {
+                if (this.tlv.getByte(0x01) == 0x01) {
+                    this.action = Action.CALL_REJECT;
+                } else if (this.tlv.getByte(0x01) == 0x02) {
+                    this.action = Action.CALL_ACCEPT;
+                }
+                // TODO: find more values, if there are any
+            } else {
+                throw new MissingTagException(0x01);
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DeviceConfig.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DeviceConfig.java
new file mode 100644
index 000000000..11e0b2ab3
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DeviceConfig.java
@@ -0,0 +1,1710 @@
+/*  Copyright (C) 2021-2023 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets;
+
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.TreeMap;
+
+import javax.crypto.BadPaddingException;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiCrypto;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiTLV;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiUtil;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiCoordinatorSupplier.HuaweiDeviceType;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiTLV.TLV;
+import nodomain.freeyourgadget.gadgetbridge.util.GB;
+import nodomain.freeyourgadget.gadgetbridge.util.StringUtils;
+
+// TODO: complete responses
+
+public class DeviceConfig {
+    public static final byte id = 0x01;
+
+    public static class LinkParams {
+        public static final byte id = 0x01;
+
+        public static class Request extends HuaweiPacket {
+            public Request(ParamsProvider paramsProvider, HuaweiDeviceType deviceType) {
+                super(paramsProvider);
+                this.serviceId = DeviceConfig.id;
+                this.commandId = id;
+                this.tlv = new HuaweiTLV()
+                        .put(0x01)
+                        .put(0x02)
+                        .put(0x03)
+                        .put(0x04);
+                if (deviceType == HuaweiDeviceType.AW) {
+                    this.tlv.put(0x06);
+                }
+                this.complete = true;
+                this.isEncrypted = false;
+            }
+        }
+
+        public static class Response extends HuaweiPacket {
+            public byte protocolVersion = 0x00;
+            public short mtu = 0x0014;
+            public short sliceSize = 0x00f4;
+            public byte authVersion = 0x00;
+            public byte[] serverNonce = new byte[16];
+            public byte authMode = 0x00;
+            public byte authAlgo = 0x00;
+            public byte bondState = 0x00;
+            public short interval = 0x0;
+
+            public Response(ParamsProvider paramsProvider) {
+                super(paramsProvider);
+                this.serviceId = DeviceConfig.id;
+                this.commandId = id;
+                this.isEncrypted = false;
+            }
+
+            @Override
+            public void parseTlv() throws ParseException {
+                if (this.tlv.contains(0x01))
+                    this.protocolVersion = this.tlv.getByte(0x01);
+
+                if (this.tlv.contains(0x02))
+                    this.sliceSize = this.tlv.getShort(0x02);
+
+                if (this.tlv.contains(0x03))
+                    this.mtu = this.tlv.getShort(0x03);
+
+                if (this.tlv.contains(0x04))
+                    this.interval = this.tlv.getShort(0x04);
+
+                if (this.tlv.contains(0x05)) {
+                    System.arraycopy(this.tlv.getBytes(0x05), 2, this.serverNonce, 0, 16);
+                    this.authVersion = (byte)this.tlv.getBytes(0x05)[1];
+                } else
+                    throw new MissingTagException(0x05);
+
+                if (this.tlv.contains(0x07))
+                    this.authMode = this.tlv.getByte(0x07);
+
+                if (this.tlv.contains(0x08))
+                    this.authAlgo = this.tlv.getByte(0x08);
+
+                if (this.tlv.contains(0x09))
+                    this.bondState = this.tlv.getByte(0x09);
+            }
+        }
+    }
+
+    public static class SupportedServices {
+        public static final byte id = 0x02;
+
+	    // notDeviceCapabilities = 0x1C, 0x1E, 0x1F, 0x28, 0x29, 0x2C, 0x2F, 0x31
+        // but services = 0x1E, 0x28, 0x2C, 0x31
+        // service 0x21 depends on MiddleWear support
+        public static final byte[] knownSupportedServices = new byte[] {
+            0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A,
+            0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14,
+            0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1D, 0x20,
+            0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x2A, 0x2B, 0x2D, 0x2E,
+            0x30, 0x32, 0x33, 0x34, 0x35
+        };
+
+        public static class Request extends HuaweiPacket {
+            public Request(ParamsProvider paramsProvider, byte[] allSupportedServices) {
+                super(paramsProvider);
+                this.serviceId = DeviceConfig.id;
+                this.commandId = id;
+                this.tlv = new HuaweiTLV()
+                        .put(0x01, allSupportedServices);
+                this.complete = true;
+            }
+        }
+
+        public static class Response extends HuaweiPacket {
+            public byte[] supportedServices;
+
+            public Response(ParamsProvider paramsProvider) {
+                super(paramsProvider);
+            }
+
+            @Override
+            public void parseTlv() throws ParseException {
+                if (this.tlv.contains(0x02)) {
+                    this.supportedServices = this.tlv.getBytes(0x02);
+                } else {
+                    throw new MissingTagException(0x02);
+                }
+            }
+        }
+
+        public static class OutgoingRequest extends HuaweiPacket {
+            public byte[] allSupportedServices = null;
+
+            public OutgoingRequest(ParamsProvider paramsProvider) {
+                super(paramsProvider);
+                this.complete = false;
+            }
+
+            @Override
+            public List<byte[]> serialize() throws CryptoException {
+                return null;
+            }
+
+            @Override
+            public void parseTlv() throws ParseException {
+                if (this.tlv.contains(0x01))
+                    this.allSupportedServices = this.tlv.getBytes(0x01);
+                else
+                    throw new MissingTagException(0x01);
+            }
+        }
+    }
+
+    public static class SupportedCommands {
+        public static final byte id = 0x03;
+
+        public static final TreeMap<Integer, byte[]> commandsPerService = new TreeMap<Integer, byte[]>() {{
+            put(0x01, new byte[] {0x04, 0x07, 0x08, 0x09, 0x0A, 0x0D, 0x0E, 0x10, 0x11, 0x12, 0x13, 0x14, 0x1B, 0x1A, 0x1D, 0x21, 0x22, 0x23, 0x24, 0x29, 0x2A, 0x2B, 0x32, 0x2E, 0x31, 0x30, 0x35, 0x36, 0x37, 0x2F});
+            put(0x02, new byte[] {0x01, 0x04, 0x05, 0x06, 0x07, 0x08});
+            put(0x03, new byte[] {0x01, 0x03, 0x04});
+            put(0x04, new byte[] {0x01});
+            put(0x05, new byte[] {0x01});
+            put(0x06, new byte[] {0x01});
+            put(0x07, new byte[] {0x01, 0x03, 0x05, 0x07, 0x08, 0x09, 0x0A, 0x0E, 0x10, 0x13, 0x16, 0x15, 0x17, 0x18, 0x1B, 0x1C, 0x1D, 0x1E, 0x21, 0x22, 0x23, 0x24, 0x25, 0x28, 0x29, 0x06, 0x1F});
+            put(0x08, new byte[] {0x01, 0x02, 0x03});
+            put(0x09, new byte[] {0x01, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F});
+            put(0x0A, new byte[] {0x01, 0x09, 0x0A});
+            put(0x0B, new byte[] {0x01, 0x03});
+            put(0x0C, new byte[] {0x01});
+            put(0x0D, new byte[] {0x01});
+            put(0x0F, new byte[] {0x01, 0x03, 0x05, 0x06, 0x07, 0x08, 0x0A, 0x0B, 0x0C});
+            put(0x10, new byte[] {0x01});
+            put(0x11, new byte[] {0x01});
+            put(0x12, new byte[] {0x01});
+            put(0x13, new byte[] {0x01});
+            put(0x14, new byte[] {0x01});
+            put(0x15, new byte[] {0x01});
+            put(0x16, new byte[] {0x01, 0x03, 0x07});
+            put(0x17, new byte[] {0x01, 0x04, 0x06, 0x07, 0x0B, 0x0C, 0x10, 0x12, 0x15, 0x17});
+            put(0x18, new byte[] {0x01, 0x02, 0x04, 0x05, 0x06, 0x09});
+            put(0x19, new byte[] {0x01, 0x04});
+            put(0x1A, new byte[] {0x01, 0x03, 0x07, 0x05, 0x06});
+            put(0x1B, new byte[] {0x01, 0x0F, 0x19, 0x1A});
+            // No 0x1C
+            put(0x1D, new byte[] {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A});
+            // No 0x1E
+            // No 0x1F
+            put(0x20, new byte[] {0x01, 0x02, 0x03, 0x04, 0x09, 0x0A});
+            //put(0x21, new byte[] {0x01});
+            put(0x22, new byte[] {0x01});
+            put(0x23, new byte[] {0x02, 0x0B});
+            put(0x24, new byte[] {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C});
+            put(0x25, new byte[] {0x02, 0x04, 0x0E});
+            put(0x26, new byte[] {0x02, 0x03});
+            put(0x27, new byte[] {0x01, 0x0E});
+            // No 0x28
+            // No 0x29
+            put(0x2A, new byte[] {0x01, 0x06});
+            put(0x2B, new byte[] {0x12});
+            // No 0x2C
+            put(0x2D, new byte[] {0x01});
+            put(0x2E, new byte[] {0x01, 0x02, 0x03});
+            // No 0x2F
+            put(0x30, new byte[] {0x01});
+            // No 0x31
+            put(0x32, new byte[] {0x01});
+            put(0x33, new byte[] {0x01, 0x2});
+            put(0x34, new byte[] {0x01});
+            put(0x35, new byte[] {0x03, 0x04});
+        }};
+
+
+        public static class Request extends HuaweiPacket {
+            private int maxSize;
+
+            public Request(ParamsProvider paramsProvider) {
+                super(paramsProvider);
+                this.serviceId = DeviceConfig.id;
+                this.commandId = id;
+                this.tlv = new HuaweiTLV();
+
+                // slice size is the max size
+                // But there is a 4 byte header,
+                // a two byte body header,
+                // a two byte footer,
+                // three bytes get added for the 0x81 tag,
+                // and 21 for the encryption stuff
+                this.maxSize = this.paramsProvider.getSliceSize() - 32;
+                // Now it gets aligned to 16 byte blocks
+                // And it gets a header and two length bytes
+                // For CBC there is also at least one byte padding
+                this.maxSize = this.maxSize - (this.maxSize % 16) - 4;
+            }
+
+            public boolean addCommandsForService(byte service, byte[] commands) {
+                // tlv length is what we have already
+                // commands is what we'll add
+                // together with a 3-byte 0x02 tag and two bytes for length
+                if (this.tlv.length() + commands.length + 5 > this.maxSize) { //this.paramsProvider.mtu - 5 - 2 - 2 - 2 - 21) {
+                    return false;
+                }
+                this.tlv.put(0x02, service).put(0x03, commands);
+                return true;
+            }
+
+            @Override
+            public List<byte[]> serialize() throws CryptoException {
+                this.tlv = new HuaweiTLV()
+                        .put(0x81, this.tlv);
+                this.complete = true;
+                return super.serialize();
+            }
+        }
+
+        public static class Response extends HuaweiPacket {
+            public static class CommandsList {
+                public int service;
+                public byte[] commands;
+
+                @Override
+                public String toString() {
+                    StringBuilder sb = new StringBuilder();
+                    sb.append("CommandsList{service=");
+                    sb.append(Integer.toHexString(service));
+                    sb.append(", commands=[");
+                    for (byte b : commands) {
+                        sb.append(Integer.toHexString(b));
+                        if (b != commands[commands.length - 1]) // Elements should be unique
+                            sb.append(", ");
+                    }
+                    sb.append("]}");
+                    return sb.toString();
+                }
+            }
+
+            public List<CommandsList> commandsLists;
+
+            public Response(ParamsProvider paramsProvider) {
+                super(paramsProvider);
+                this.serviceId = DeviceConfig.id;
+                this.commandId = id;
+                this.isEncrypted = false;
+            }
+
+            @Override
+            public void parseTlv() throws ParseException {
+                this.commandsLists = new ArrayList<>();
+                CommandsList commandsList = null;
+                HuaweiTLV containerTLV = this.tlv.getObject(0x81);
+
+                if (!containerTLV.contains(0x02)) {
+                    throw new MissingTagException(0x02);
+                }
+                if (!containerTLV.contains(0x04)) {
+                    throw new MissingTagException(0x04);
+                }
+
+                for (HuaweiTLV.TLV tlv : containerTLV.get()) {
+                    if ((int) tlv.getTag() == 0x02) {
+                        commandsList = new CommandsList();
+                        commandsList.service = ByteBuffer.wrap(tlv.getValue()).get();
+                    } else if ((int) tlv.getTag() == 0x04) {
+                        if (commandsList == null)
+                            throw new SupportedCommandsListException("Commandslist is not yet set");
+                        ByteBuffer buffer = ByteBuffer.allocate(tlv.getValue().length);
+                        for (int i = 0; i < tlv.getValue().length; i++) {
+                            if ((int) tlv.getValue()[i] == 1)
+                                buffer.put((byte) (commandsPerService.get(commandsList.service)[i]));
+                        }
+                        commandsList.commands = new byte[buffer.position()];
+                        ((ByteBuffer) buffer.rewind()).get(commandsList.commands);
+                        this.commandsLists.add(commandsList);
+                    } else
+                        throw new SupportedCommandsListException("Unknown tag encountered");
+                }
+            }
+        }
+
+        // TODO: LogRequest
+    }
+
+    public static class DateFormat {
+        public static final byte id = 0x04;
+
+        public static class Request extends HuaweiPacket {
+            public Request(
+                    ParamsProvider paramsProvider,
+                    byte dateFormat,
+                    byte timeFormat
+            ) {
+                super(paramsProvider);
+                this.serviceId = DeviceConfig.id;
+                this.commandId = id;
+                this.tlv = new HuaweiTLV()
+                        .put(0x81, new HuaweiTLV()
+                                .put(0x02, dateFormat)
+                                .put(0x03, timeFormat)
+                        );
+                this.complete = true;
+            }
+        }
+
+        public static class OutgoingRequest extends HuaweiPacket {
+            public byte dateFormat;
+            public byte timeFormat;
+
+            public OutgoingRequest(ParamsProvider paramsProvider) {
+                super(paramsProvider);
+                this.complete = false;
+            }
+
+            @Override
+            public void parseTlv() throws ParseException {
+                if (this.tlv.contains(0x02))
+                    this.dateFormat = this.tlv.getByte(0x02);
+
+                if (this.tlv.contains(0x03))
+                    this.timeFormat = this.tlv.getByte(0x03);
+            }
+        }
+    }
+
+    public static class TimeRequest extends HuaweiPacket {
+        public static final byte id = 0x05;
+
+        public TimeRequest(ParamsProvider paramsProvider) {
+            super(paramsProvider);
+            this.serviceId = DeviceConfig.id;
+            this.commandId = id;
+            ByteBuffer timeAndZoneId = ByteBuffer.wrap(HuaweiUtil.getTimeAndZoneId());
+            this.tlv = new HuaweiTLV()
+                    .put(0x01, timeAndZoneId.getInt(0))
+                    .put(0x02, timeAndZoneId.getShort(4));
+            this.complete = true;
+        }
+
+        // TODO: implement parsing this request for the log parser support
+    }
+
+    public static class ProductInfo {
+        public static final byte id = 0x07;
+
+        public static class Request extends HuaweiPacket {
+
+            public Request(ParamsProvider paramsProvider, HuaweiDeviceType deviceType) {
+                super(paramsProvider);
+                this.serviceId = DeviceConfig.id;
+                this.commandId = id;
+                this.tlv = new HuaweiTLV();
+                if (deviceType == HuaweiDeviceType.AW) {
+                    int[] tags = {0x01, 0x02, 0x03, 0x07, 0x09, 0x0A, 0x0c, 0x11};
+                    for (int i: tags) {
+                        this.tlv.put(i);
+                    }
+                } else {
+                    int[] tags = {0x01, 0x02, 0x07, 0x09, 0x0A, 0x11, 0x12, 0x16, 0x1A, 0x1D, 0x1E, 0x1F, 0x20, 0x21, 0x22, 0x23};
+                    for (int i : tags) {
+                        this.tlv.put(i);
+                    }
+                } // else if (AW Compatible)
+                //  this.tlv).put(0x01).put(0x02).put(0x07).put(0x09);
+                // }
+                this.complete = true;
+            }
+        }
+
+        public static class Response extends HuaweiPacket {
+            // TODO: extend:
+            //        public static final int BTVersion = 0x01;
+            //        public static final int productType = 0x02;
+            //        public static final int phoneNumber = 0x04;
+            //        public static final int macAddress = 0x05;
+            //        public static final int IMEI = 0x06;
+            //        public static final int openSourceVersion = 0x08;
+            //        public static final int serialNumber = 0x09;
+            //        public static final int eMMCId = 0x0B;
+            //        public static final int healthAppSupport = 0x0D;
+
+            public String hardwareVersion;
+            public String softwareVersion;
+            public String productModel;
+
+            public Response(ParamsProvider paramsProvider) {
+                super(paramsProvider);
+                this.serviceId = DeviceConfig.id;
+                this.commandId = id;
+                this.isEncrypted = false;
+            }
+
+            @Override
+            public void parseTlv() throws ParseException {
+                if (!this.tlv.contains(0x07))
+                    throw new MissingTagException(0x07);
+                if (!this.tlv.contains(0x0A))
+                    throw new MissingTagException(0x0A);
+                if (this.tlv.contains(0x03))
+                    this.hardwareVersion = this.tlv.getString(0x03);
+                this.softwareVersion = this.tlv.getString(0x07);
+                this.productModel = this.tlv.getString(0x0A).trim();
+            }
+        }
+
+        // TODO: implement parsing this request for the log parser support
+    }
+
+    public static class Bond {
+        public static final byte id = 0x0E;
+
+        public static class Request extends HuaweiPacket {
+            public Request(
+                    ParamsProvider paramsProvider,
+                    byte[] clientSerial,
+                    String mac,
+                    HuaweiCrypto huaweiCrypto
+            ) throws CryptoException {
+                super(paramsProvider);
+                this.serviceId = DeviceConfig.id;
+                this.commandId = id;
+                byte[] iv = paramsProvider.getIv();
+
+                try {
+                    this.tlv = new HuaweiTLV()
+                            .put(0x01)
+                            .put(0x03, (byte) 0x00)
+                            .put(0x05, clientSerial)
+                            .put(0x06, huaweiCrypto.encryptBondingKey(paramsProvider.getSecretKey(), mac, iv))
+                            .put(0x07, iv);
+                    this.isEncrypted = false;
+                    this.complete = true;
+                } catch (InvalidAlgorithmParameterException | NoSuchPaddingException | IllegalBlockSizeException | NoSuchAlgorithmException | BadPaddingException | InvalidKeyException e) {
+                    throw new CryptoException("Bonding key creation exception", e);
+                }
+            }
+        }
+
+        public static class OutgoingRequest extends HuaweiPacket {
+            public byte[] clientSerial;
+            public byte[] bondingKey;
+            public byte[] iv;
+
+            public OutgoingRequest(ParamsProvider paramsProvider) {
+                super(paramsProvider);
+                this.complete = false;
+            }
+
+            @Override
+            public void parseTlv() throws ParseException {
+                if (this.tlv.contains(0x05))
+                    this.clientSerial = this.tlv.getBytes(0x05);
+                else
+                    throw new MissingTagException(0x05);
+
+                if (this.tlv.contains(0x06))
+                    this.bondingKey = this.tlv.getBytes(0x06);
+                else
+                    throw new MissingTagException(0x06);
+
+                if (this.tlv.contains(0x07))
+                    this.iv = this.tlv.getBytes(0x07);
+                else
+                    throw new MissingTagException(0x07);
+            }
+        }
+    }
+
+    public static class BondParams {
+        public static final byte id = 0x0F;
+
+        public static class Request extends HuaweiPacket {
+            public Request(
+                    ParamsProvider paramsProvider,
+                    byte[] clientSerial,
+                    byte[] mac
+            ) {
+                super(paramsProvider);
+
+                this.serviceId = DeviceConfig.id;
+                this.commandId = id;
+
+                this.tlv = new HuaweiTLV()
+                        .put(0x01)
+                        .put(0x03, clientSerial)
+                        .put(0x04, (byte) 0x02)
+                        .put(0x05)
+                        .put(0x07, mac)
+                        .put(0x09);
+                this.isEncrypted = false;
+                this.complete = true;
+            }
+        }
+
+        public static class Response extends HuaweiPacket {
+            public byte status;
+            public long encryptionCounter;
+
+            public Response(ParamsProvider paramsProvider) {
+                super(paramsProvider);
+
+                this.serviceId = DeviceConfig.id;
+                this.commandId = id;
+
+                this.isEncrypted = false;
+            }
+
+            @Override
+            public void parseTlv() {
+                this.status = this.tlv.getByte(0x01);
+                this.encryptionCounter = this.tlv.getInteger(0x09) & 0xFFFFFFFFL;
+            }
+        }
+        // TODO: implement parsing this request for the log parser support
+    }
+
+    public static class ActivityType {
+        public static final int id = 0x12;
+
+        public static class Request extends HuaweiPacket {
+            public Request(ParamsProvider paramsProvider) {
+                super(paramsProvider);
+
+                this.serviceId = DeviceConfig.id;
+                this.commandId = id;
+
+                this.tlv = new HuaweiTLV()
+                    .put(0x01);
+
+                this.complete = true;
+            }
+        }
+
+        public static class Response extends HuaweiPacket {
+            public Response(ParamsProvider paramsProvider) {
+                super(paramsProvider);
+                this.serviceId = DeviceConfig.id;
+                this.commandId = id;
+            }
+
+            @Override
+            public void parseTlv() throws ParseException {
+            }
+        }
+
+    }
+
+    public static class Auth {
+        public static final byte id = 0x13;
+
+        public static class Request extends HuaweiPacket {
+            public Request(
+                    ParamsProvider paramsProvider,
+                    byte[] challenge,
+                    byte[] nonce,
+                    boolean isHiChainLite
+            ) {
+                super(paramsProvider);
+
+                this.serviceId = DeviceConfig.id;
+                this.commandId = id;
+
+                this.tlv = new HuaweiTLV()
+                        .put(0x01, challenge)
+                        .put(0x02, nonce);
+                if (isHiChainLite)
+                    this.tlv.put(0x03, (byte)0x02); // Force type 2
+                this.isEncrypted = false;
+                this.complete = true;
+            }
+        }
+
+        public static class Response extends HuaweiPacket {
+            public byte[] challengeResponse;
+
+            public Response(ParamsProvider paramsProvider) {
+                super(paramsProvider);
+
+                this.serviceId = DeviceConfig.id;
+                this.commandId = id;
+
+                this.isEncrypted = false;
+            }
+
+            @Override
+            public void parseTlv() {
+                this.challengeResponse = this.tlv.getBytes(0x01);
+            }
+        }
+        // TODO: implement parsing this request for the log parser support
+    }
+
+    public static class BatteryLevel {
+        public static final byte id = 0x08;
+
+        public static class Request extends HuaweiPacket {
+            public Request(ParamsProvider paramsProvider) {
+                super(paramsProvider);
+
+                this.serviceId = DeviceConfig.id;
+                this.commandId = id;
+
+                this.tlv = new HuaweiTLV()
+                        .put(0x01);
+                this.complete = true;
+            }
+        }
+
+        public static class Response extends HuaweiPacket {
+            public byte level;
+
+            public Response(ParamsProvider paramsProvider) {
+                super(paramsProvider);
+
+                // This differs per watch, so we handle it ourselves in parseTlv
+                this.isEncrypted = false;
+            }
+
+            @Override
+            public void parseTlv() throws ParseException {
+                if (this.tlv.contains(0x01))
+                    this.level = this.tlv.getByte(0x01);
+                else
+                    throw new MissingTagException(0x01);
+            }
+        }
+        // TODO: implement parsing this request for the log parser support
+    }
+
+    public static class ActivateOnLiftRequest extends HuaweiPacket {
+        public static final byte id = 0x09;
+
+        public ActivateOnLiftRequest(ParamsProvider paramsProvider, boolean activate) {
+            super(paramsProvider);
+
+            this.serviceId = DeviceConfig.id;
+            this.commandId = id;
+
+            this.tlv = new HuaweiTLV()
+                    .put(0x01, activate);
+
+            this.complete = true;
+        }
+        // TODO: implement parsing this request for the log parser support
+    }
+
+    public static class DndDeleteRequest extends HuaweiPacket {
+        public static final int id = 0x0B;
+
+        public DndDeleteRequest(HuaweiPacket.ParamsProvider paramsProvider) {
+            super(paramsProvider);
+
+            this.serviceId = DeviceConfig.id;
+            this.commandId = id;
+
+            this.tlv = new HuaweiTLV()
+                .put(0x81, new HuaweiTLV()
+                    .put(0x02, (byte) 0x01)
+                );
+            this.complete = true;
+        }
+        // TODO: implement parsing this request for the log parser support
+    }
+
+    public static class DndAddRequest extends HuaweiPacket {
+        public static final int id = 0x0C;
+
+        public DndAddRequest(
+            HuaweiPacket.ParamsProvider paramsProvider,
+            boolean dndEnable,
+            byte[] start,
+            byte[] end,
+            int cycle,
+            int dndLiftWristType,
+            boolean allowDndLiftWrist
+        ) {
+            super(paramsProvider);
+
+            this.serviceId = DeviceConfig.id;
+            this.commandId = id;
+
+            HuaweiTLV dndPacket = new HuaweiTLV()
+                    .put(0x02, (byte) 0x01)
+                    .put(0x03, dndEnable)
+                    .put(0x04, (byte) 0x00)
+                    .put(0x05, start)
+                    .put(0x06, end)
+                    .put(0x07, (byte) cycle);
+
+            if (allowDndLiftWrist) {
+                dndPacket.put(0x08, (short) (dndLiftWristType));
+            }
+            this.tlv = new HuaweiTLV()
+                    .put(0x81, dndPacket);
+            this.complete = true;
+        }
+        // TODO: implement parsing this request for the log parser support
+    }
+
+    public static class FactoryResetRequest extends HuaweiPacket {
+        public static final byte id = 0x0D;
+
+        public FactoryResetRequest(HuaweiPacket.ParamsProvider paramsProvider) {
+            super(paramsProvider);
+
+            this.serviceId = DeviceConfig.id;
+            this.commandId = id;
+
+            this.tlv = new HuaweiTLV()
+                    .put(0x01, (byte) 0x01);
+
+            this.complete = true;
+        }
+        // TODO: implement parsing this request for the log parser support
+    }
+
+    public static class PhoneInfo {
+        public static final byte id = 0x10;
+
+        public static class Request extends HuaweiPacket {
+            public Request(HuaweiPacket.ParamsProvider paramsProvider, byte[] phoneInfo) {
+                super(paramsProvider);
+
+                this.serviceId = DeviceConfig.id;
+                this.commandId = id;
+
+                this.tlv = new HuaweiTLV();
+                for (byte b : phoneInfo) {
+                    switch (b) {
+                        case 0xf:
+                            break;
+                        case 0x11:
+                            this.tlv.put((int)b, "1200107310"); // Force AppVersion to 12.1.7.310
+                            break;
+                        case 0x15:
+                            this.tlv.put((int)b, ""); // Force buildOSPlatformVersion to ""
+                            break;
+                        case 0x10: // Force EmuiBuildVersion to 0x00
+                        case 0x13: // Force buildOsEnable to 0x00
+                        case 0x14: // Force buildOSApiVersion to 0x00
+                        default:
+                            this.tlv.put((int)b, "00");
+                    }
+                }
+                this.complete = true;
+            }
+        }
+
+        public static class Response extends HuaweiPacket {
+            public byte[] info;
+
+            public Response(ParamsProvider paramsProvider) {
+                super(paramsProvider);
+
+                this.serviceId = DeviceConfig.id;
+                this.commandId = id;
+            }
+
+            @Override
+            public void parseTlv() {
+                info = new byte[this.tlv.length()];
+                int i = 0;
+                for (TLV tlv : this.tlv.get()) {
+                    info[i] = tlv.getTag();
+                    i += 1;
+                }
+            }
+        }
+
+        // TODO: implement parsing this request for the log parser support
+    }
+
+    public static class DeviceStatus {
+        public static final byte id = 0x16;
+
+        public static class Request extends HuaweiPacket {
+            public Request(HuaweiPacket.ParamsProvider paramsProvider, boolean askStatus) { // status or notify
+                super(paramsProvider);
+
+                this.serviceId = DeviceConfig.id;
+                this.commandId = id;
+
+                this.tlv = new HuaweiTLV();
+                if (askStatus) {
+                    this.tlv.put(0x01);
+                } else {
+                    this.tlv.put(0x02, (byte)0x00);
+                }
+                this.isEncrypted = false;
+                this.complete = true;
+            }
+        }
+
+        public static class Response extends HuaweiPacket {
+            public byte status = -1;
+
+            public Response(ParamsProvider paramsProvider) {
+                super(paramsProvider);
+
+                this.serviceId = DeviceConfig.id;
+                this.commandId = id;
+
+                this.isEncrypted = false;
+            }
+
+            @Override
+            public void parseTlv() {
+                // AW70 doesn't seem to have this
+                if (this.tlv.contains(0x01))
+                    this.status = this.tlv.getByte(0x01);
+            }
+        }
+
+        // TODO: implement parsing this request for the log parser support
+    }
+
+    public static class NavigateOnRotateRequest extends HuaweiPacket {
+        public static final byte id = 0x1B;
+
+        public NavigateOnRotateRequest(HuaweiPacket.ParamsProvider paramsProvider, boolean navigate) {
+            super(paramsProvider);
+
+            this.serviceId = DeviceConfig.id;
+            this.commandId = id;
+
+            this.tlv = new HuaweiTLV()
+                    .put(0x01, navigate);
+
+            this.complete = true;
+        }
+        // TODO: implement parsing this request for the log parser support
+    }
+
+    public static class WearLocationRequest extends HuaweiPacket {
+        public static final byte id = 0x1A;
+
+        public WearLocationRequest(HuaweiPacket.ParamsProvider paramsProvider, byte location) {
+            super(paramsProvider);
+
+            this.serviceId = DeviceConfig.id;
+            this.commandId = id;
+
+            this.tlv = new HuaweiTLV()
+                    .put(0x01, location);
+
+            this.complete = true;
+        }
+        // TODO: implement parsing this request for the log parser support
+    }
+
+    public static class DndLiftWristType {
+        public static final int id = 0x1D;
+
+        public static class Request extends HuaweiPacket {
+            public Request(HuaweiPacket.ParamsProvider paramsProvider) {
+                super(paramsProvider);
+
+                this.serviceId = DeviceConfig.id;
+                this.commandId = id;
+
+                this.tlv = new HuaweiTLV()
+                    .put(0x01);
+                this.complete = true;
+            }
+        }
+
+        public static class Response extends HuaweiPacket {
+            public int dndLiftWristType;
+
+            public Response(ParamsProvider paramsProvider) {
+                super(paramsProvider);
+            }
+
+            @Override
+            public void parseTlv() {
+                this.dndLiftWristType = (int) this.tlv.getShort(0x01);
+            }
+        }
+        // TODO: implement parsing this request for the log parser support
+    }
+
+    public static class HiChain {
+        public static final int id = 0x28;
+
+        public static class Request {
+            private final int operationCode;
+            private final long requestId;
+            private final byte[] selfAuthId;
+            private final String groupId;
+            private JSONObject version = null;
+            private JSONObject payload = null;
+            private JSONObject value = null;
+
+            public Request (int operationCode, long requestId, byte[] selfAuthId, String groupId) {
+                this.operationCode = operationCode;
+                this.requestId = requestId;
+                this.selfAuthId = selfAuthId;
+                this.groupId = groupId;
+            }
+
+            public class BaseStep extends HuaweiPacket {
+                public BaseStep (HuaweiPacket.ParamsProvider paramsProvider, int messageId) throws SerializeException {
+                    super(paramsProvider);
+                    this.serviceId = DeviceConfig.id;
+                    this.commandId = HiChain.id;
+                    this.isSliced = true;
+                    this.isEncrypted = false;
+                    this.complete = true;
+                    version = new JSONObject();
+                    payload = new JSONObject();
+                    value = new JSONObject();
+                    createJson(messageId);
+                }
+            }
+
+            public class StepOne extends BaseStep {
+
+                public StepOne (
+                    HuaweiPacket.ParamsProvider paramsProvider,
+                    int messageId,
+                    byte[] isoSalt,
+                    byte[] seed
+                ) throws SerializeException {
+                    super(paramsProvider, messageId);
+                    // createJson(1); //messageId);
+                    try {
+                        payload
+                            .put("isoSalt", StringUtils.bytesToHex(isoSalt))
+                            .put("peerAuthId",  StringUtils.bytesToHex(selfAuthId))
+                            .put("operationCode", operationCode)
+                            .put("seed", StringUtils.bytesToHex(seed))
+                            .put("peerUserType", 0x00);
+                        if (operationCode == 0x02) {
+                            payload
+                                .put("pkgName", "com.huawei.devicegroupmanage")
+                                .put("serviceType", groupId)
+                                .put("keyLength", 0x20);
+                            value.put("isDeviceLevel", false);
+                        }
+                        this.tlv = new HuaweiTLV()
+                            .put(0x01, value.toString())
+                            .put(0x02, (byte)operationCode)
+                            .put(0x03, ByteBuffer.allocate(8).putLong(requestId).array());
+                            //.put(0x04, 0x00)
+                            //.put(0x05, 0x00);
+                    } catch (JSONException e) {
+                        throw new SerializeException("HiChain Step1 JSON exception", e);
+                    }
+                }
+            }
+
+            public class StepTwo extends BaseStep {
+                public StepTwo (
+                    HuaweiPacket.ParamsProvider paramsProvider,
+                    int messageId,
+                    byte[] token
+                ) throws SerializeException {
+                    super(paramsProvider, messageId);
+                    // createJson(2); //messageId);
+                    try {
+                        payload
+                            .put("peerAuthId", StringUtils.bytesToHex(selfAuthId))
+                            .put("token", StringUtils.bytesToHex(token));
+                        if (operationCode == 0x02) value.put("isDeviceLevel", false);
+                        this.tlv = new HuaweiTLV()
+                            .put(0x01, value.toString())
+                            .put(0x02, (byte)operationCode)
+                            .put(0x03, ByteBuffer.allocate(8).putLong(requestId).array());
+                    } catch (JSONException e) {
+                        throw new SerializeException("HiChain Step 2 JSON exception", e);
+                    }
+                }
+            }
+
+            public class StepThree extends BaseStep {
+                public StepThree (
+                    HuaweiPacket.ParamsProvider paramsProvider,
+                    int messageId,
+                    byte[] nonce,
+                    byte[] encData
+                ) throws SerializeException {
+                    super(paramsProvider, messageId);
+                    // createJson(3);
+                    try {
+                        payload
+                            .put("nonce", StringUtils.bytesToHex(nonce))
+                            .put("encData", StringUtils.bytesToHex(encData));
+                        this.tlv = new HuaweiTLV()
+                            .put(0x01, value.toString())
+                            .put(0x02, (byte)operationCode)
+                            .put(0x03, ByteBuffer.allocate(8).putLong(requestId).array());
+                    } catch (JSONException e) {
+                        throw new SerializeException("HiChain Step 3 JSON exception", e);
+                    }
+                }
+            }
+
+            public class StepFour extends BaseStep {
+                public StepFour (
+                    HuaweiPacket.ParamsProvider paramsProvider,
+                    int messageId,
+                    byte[] nonce,
+                    byte[] encResult
+                ) throws SerializeException {
+                    super(paramsProvider, messageId);
+                    // if (operationCode == 0x01) {
+                    //     createJson(4); //messageId);
+                    // } else {
+                    //     createJson(3);
+                    // }
+                    try {
+                        payload
+                            .put("nonce", StringUtils.bytesToHex(nonce)) //generateRandom
+                            .put("encResult", StringUtils.bytesToHex(encResult))
+                            .put("operationCode", operationCode);
+                        this.tlv = new HuaweiTLV()
+                            .put(0x01, value.toString())
+                            .put(0x02, (byte)operationCode)
+                            .put(0x03, ByteBuffer.allocate(8).putLong(requestId).array());
+                    } catch (JSONException e) {
+                        throw new SerializeException("HiChain Step 4 JSON exception", e);
+                    }
+                }
+            }
+
+            private void createJson(int messageId) throws HuaweiPacket.SerializeException {
+                if (operationCode == 0x02) {
+                    messageId |= 0x10;
+                }
+                try {
+                    version
+                        .put("minVersion", "1.0.0")
+                        .put("currentVersion", "2.0.16");
+                    payload
+                        .put("version", version);
+                    value
+                        .put("authForm", 0x00)
+                        .put("payload", payload)
+                        .put("groupAndModuleVersion", "2.0.1")
+                        .put("message", messageId);
+                    if (operationCode == 0x01) {
+                        value
+                            .put("requestId", Long.toString(requestId))
+                            .put("groupId", groupId)
+                            .put("groupName", "health_group_name")
+                            .put("groupOp", 2)
+                            .put("groupType", 256)
+                            .put("peerDeviceId", new String(selfAuthId, StandardCharsets.UTF_8)) 
+                            .put("connDeviceId", new String(selfAuthId, StandardCharsets.UTF_8))
+                            .put("appId", "com.huawei.health")
+                            .put("ownerName", "");
+                    }
+                } catch (JSONException e) {
+                    throw new HuaweiPacket.SerializeException("Create json Exception", e);
+                }
+            }
+        }
+
+        public static class Response extends HuaweiPacket {
+            // TODO: get rid of GB import...
+            // TODO: add operation code
+
+            public static class Step1Data {
+                public byte[] isoSalt;
+                public byte[] peerAuthId;
+                public int peerUserType;
+                public byte[] token;
+
+                public Step1Data(JSONObject payload) throws JSONException {
+                    this.isoSalt = GB.hexStringToByteArray(payload.getString("isoSalt"));
+                    this.peerAuthId = GB.hexStringToByteArray(payload.getString("peerAuthId"));
+                    this.peerUserType = payload.getInt("peerUserType");
+                    this.token = GB.hexStringToByteArray(payload.getString("token"));
+                }
+
+                @Override
+                public String toString() {
+                    return "Step1Data{" +
+                            "isoSalt=" + StringUtils.bytesToHex(isoSalt) +
+                            ", peerAuthId=" + StringUtils.bytesToHex(peerAuthId) +
+                            ", peerUserType=" + peerUserType +
+                            ", token=" + StringUtils.bytesToHex(token) +
+                            '}';
+                }
+            }
+
+            public static class Step2Data {
+                public byte[] returnCodeMac;
+
+                public Step2Data(JSONObject payload) throws JSONException {
+                    this.returnCodeMac = GB.hexStringToByteArray(payload.getString("returnCodeMac"));
+                }
+
+                @Override
+                public String toString() {
+                    return "Step2Data{" +
+                            "returnCodeMac=" + StringUtils.bytesToHex(returnCodeMac) +
+                            '}';
+                }
+            }
+
+            public static class Step3Data {
+                public byte[] nonce;
+                public byte[] encAuthToken;
+
+                public Step3Data(JSONObject payload) throws JSONException {
+                    this.nonce = GB.hexStringToByteArray(payload.getString("nonce"));
+                    this.encAuthToken = GB.hexStringToByteArray(payload.getString("encAuthToken"));
+                }
+
+                @Override
+                public String toString() {
+                    return "Step3Data{" +
+                            "nonce=" + StringUtils.bytesToHex(nonce) +
+                            ", encAuthToken=" + StringUtils.bytesToHex(encAuthToken) +
+                            '}';
+                }
+            }
+
+            public static class Step4Data {
+                public String data;
+
+                public Step4Data(HuaweiTLV tlv) {
+                    if (tlv.contains(0x01))
+                        this.data = tlv.getString(0x01);
+                }
+
+                @Override
+                public String toString() {
+                    return "Step4Data{" +
+                            "data='" + data + '\'' +
+                            '}';
+                }
+            }
+
+            // TODO: enum?
+            // 0 is json?
+            // 2 is raw string?
+            public byte type;
+
+            public JSONObject value;
+            public JSONObject payload;
+            public JSONObject version;
+
+            public byte step;
+            // public int operationCode; // TODO
+
+            public Step1Data step1Data;
+            public Step2Data step2Data;
+            public Step3Data step3Data;
+            public Step4Data step4Data;
+
+            public Response(ParamsProvider paramsProvider) {
+                super(paramsProvider);
+                this.serviceId = DeviceConfig.id;
+                this.commandId = HiChain.id;
+                this.isEncrypted = false;
+            }
+
+            @Override
+            public void parseTlv() throws ParseException {
+                if (!this.tlv.contains(0x01))
+                    throw new MissingTagException(0x01);
+                if (!this.tlv.contains(0x04))
+                    throw new MissingTagException(0x04);
+
+                this.type = this.tlv.getByte(0x04);
+
+                if (this.type == 0x00) {
+                    try {
+                        this.value = new JSONObject(this.tlv.getString(0x01));
+                        this.payload = value.getJSONObject("payload");
+                        this.version = payload.getJSONObject("version");
+
+                        // Ugly, but should work
+                        if (payload.has("isoSalt")) {
+                            this.step = 0x01;
+                            this.step1Data = new Step1Data(payload);
+                        } else if (payload.has("returnCodeMac")) {
+                            this.step = 0x02;
+                            this.step2Data = new Step2Data(payload);
+                        } else if (payload.has("encAuthToken")) {
+                            this.step = 0x03;
+                            this.step3Data = new Step3Data(payload);
+                        }
+                    } catch (JSONException e) {
+                        throw new JsonException("", e);
+                    }
+                } else {
+                    this.step = 0x04;
+                    this.step4Data = new Step4Data(this.tlv);
+                }
+            }
+        }
+
+        public static class OutgoingRequest extends HuaweiPacket {
+            public static class Step1Data {
+                public byte[] isoSalt;
+                public byte[] peerAuthId;
+                public byte[] seed;
+                public int peerUserType;
+
+                String serviceType; // Optional
+
+                public Step1Data(JSONObject payload) throws JSONException {
+                    this.isoSalt = GB.hexStringToByteArray(payload.getString("isoSalt"));
+                    this.peerAuthId = GB.hexStringToByteArray(payload.getString("peerAuthId"));
+                    this.seed = GB.hexStringToByteArray(payload.getString("seed"));
+                    this.peerUserType = payload.getInt("peerUserType");
+
+                    if (payload.has("serviceType"))
+                        this.serviceType = payload.getString("serviceType");
+                }
+
+                @Override
+                public String toString() {
+                    return "Step1Data{" +
+                            "isoSalt=" + StringUtils.bytesToHex(isoSalt) +
+                            ", peerAuthId=" + StringUtils.bytesToHex(peerAuthId) +
+                            ", seed=" + StringUtils.bytesToHex(seed) +
+                            ", peerUserType=" + peerUserType +
+                            ", serviceType='" + serviceType + '\'' +
+                            '}';
+                }
+            }
+
+            public static class Step2Data {
+                public byte[] peerAuthId;
+                public byte[] token;
+
+                public boolean isDeviceLevel = false; // Optional
+
+                public Step2Data(JSONObject payload) throws JSONException {
+                    this.peerAuthId = GB.hexStringToByteArray(payload.getString("peerAuthId"));
+                    this.token = GB.hexStringToByteArray(payload.getString("token"));
+
+                    if (payload.has("isDeviceLevel"))
+                        this.isDeviceLevel = payload.getBoolean("isDeviceLevel");
+                }
+
+                @Override
+                public String toString() {
+                    return "Step2Data{" +
+                            "peerAuthId=" + StringUtils.bytesToHex(peerAuthId) +
+                            ", token=" + StringUtils.bytesToHex(token) +
+                            ", isDeviceLevel=" + isDeviceLevel +
+                            '}';
+                }
+            }
+
+            public static class Step3Data {
+                public byte[] nonce;
+                public byte[] encData;
+
+                public Step3Data(JSONObject payload) throws JSONException {
+                    this.nonce = GB.hexStringToByteArray(payload.getString("nonce"));
+                    this.encData = GB.hexStringToByteArray(payload.getString("encData"));
+                }
+
+                @Override
+                public String toString() {
+                    return "Step3Data{" +
+                            "nonce=" + StringUtils.bytesToHex(nonce) +
+                            ", encData=" + StringUtils.bytesToHex(encData) +
+                            '}';
+                }
+            }
+
+            public static class Step4Data {
+                public byte[] nonce;
+                public byte[] encResult;
+
+                public Step4Data(JSONObject payload) throws JSONException {
+                    this.nonce = GB.hexStringToByteArray(payload.getString("nonce"));
+                    this.encResult = GB.hexStringToByteArray(payload.getString("encResult"));
+                }
+
+                @Override
+                public String toString() {
+                    return "Step4Data{" +
+                            "nonce=" + StringUtils.bytesToHex(nonce) +
+                            ", encResult=" + StringUtils.bytesToHex(encResult) +
+                            '}';
+                }
+            }
+
+            public int step;
+
+            public long requestId;
+            public byte[] selfAuthId;
+            public String groupId;
+            public JSONObject version = null;
+            public JSONObject payload = null;
+            public JSONObject value = null;
+
+            public Step1Data step1Data;
+            public Step2Data step2Data;
+            public Step3Data step3Data;
+            public Step4Data step4Data;
+
+            public OutgoingRequest(ParamsProvider paramsProvider) {
+                super(paramsProvider);
+                this.complete = false;
+            }
+
+            @Override
+            public void parseTlv() throws ParseException {
+                if (!this.tlv.contains(0x01))
+                    throw new MissingTagException(0x01);
+                if (!this.tlv.contains(0x02))
+                    throw new MissingTagException(0x02);
+
+                try {
+                    value = new JSONObject(this.tlv.getString(0x01));
+                    payload = value.getJSONObject("payload");
+                    version = payload.getJSONObject("version");
+
+                    if (payload.has("isoSalt")) {
+                        this.step = 1;
+                        this.step1Data = new Step1Data(payload);
+                    } else if (payload.has("token")) {
+                        this.step = 2;
+                        this.step2Data = new Step2Data(payload);
+                    } else if (payload.has("encData")) {
+                        this.step = 3;
+                        this.step3Data = new Step3Data(payload);
+                    } else if (payload.has("encResult")) {
+                        this.step = 4;
+                        this.step4Data = new Step4Data(payload);
+                    }
+                } catch (JSONException e) {
+                    throw new JsonException("Cannot parse JSON", e);
+                }
+
+                if (this.tlv.contains(0x03))
+                    this.requestId = ByteBuffer.wrap(this.tlv.getBytes(0x03)).getLong();
+            }
+        }
+    }
+
+    public static class PinCode {
+        public static final int id = 0x2C;
+
+        public static class Request extends HuaweiPacket {
+
+            public Request(HuaweiPacket.ParamsProvider paramsProvider) {
+                super(paramsProvider);
+
+                this.serviceId = DeviceConfig.id;
+                this.commandId = id;
+
+                this.tlv = new HuaweiTLV()
+                    .put(0x01);
+                this.complete = true;
+                this.isEncrypted = false;
+            }
+        }
+
+        public static class Response extends HuaweiPacket {
+            public byte[] pinCode;
+
+            public Response(HuaweiPacket.ParamsProvider paramsProvider) {
+                super(paramsProvider);
+                this.serviceId = DeviceConfig.id;
+                this.commandId = id;
+                this.isEncrypted = false;
+            }
+
+            @Override
+            public void parseTlv() throws ParseException {
+                byte[] message;
+                byte[] iv;
+                if (this.tlv.contains(0x01))
+                    message = this.tlv.getBytes(0x01);
+                else
+                    throw new MissingTagException(0x01);
+                if (this.tlv.contains(0x02))
+                    iv = this.tlv.getBytes(0x02);
+                else
+                    throw new MissingTagException(0x02);
+                HuaweiCrypto huaweiCrypto = new HuaweiCrypto(paramsProvider.getAuthVersion());
+                try {
+                    pinCode = huaweiCrypto.decryptPinCode(message, iv);
+                } catch (HuaweiCrypto.CryptoException e) {
+                    throw new CryptoException("Could not decrypt pinCode", e);
+                }
+            }
+        }
+        // TODO: implement parsing this request for the log parser support
+    }
+
+    public static class SettingRelated {
+        public static final int id = 0x31;
+
+        public static class Request extends HuaweiPacket {
+            public Request(ParamsProvider paramsProvider) {
+                super(paramsProvider);
+
+                this.serviceId = DeviceConfig.id;
+                this.commandId = id;
+
+                this.tlv = new HuaweiTLV()
+                    .put(0x01)
+                    .put(0x02)
+                    .put(0x03)
+                    .put(0x04)
+                    .put(0x05)
+                    .put(0x06);
+
+                this.complete = true;
+            }
+        }
+
+        public static class Response extends HuaweiPacket {
+            public Response(ParamsProvider paramsProvider) {
+                super(paramsProvider);
+                this.serviceId = DeviceConfig.id;
+                this.commandId = id;
+            }
+
+            @Override
+            public void parseTlv() throws ParseException {
+                // Tag 1 -> LegalStuff
+                // Tag 2 -> File support
+                // Tag 3 -> SmartWatchVersion
+                // Tag 4 to 6 are HMS related
+            }
+        }
+
+    }
+
+    public static class TimeZoneIdRequest extends HuaweiPacket {
+        public static final byte id = 0x32;
+
+        public TimeZoneIdRequest(
+                ParamsProvider paramsProvider) {
+            super(paramsProvider);
+            this.serviceId = DeviceConfig.id;
+            this.commandId = id;
+            ByteBuffer timeAndZoneId = ByteBuffer.wrap(HuaweiUtil.getTimeAndZoneId());
+            this.tlv = new HuaweiTLV()
+                    .put(0x01, timeAndZoneId.getInt())
+                    .put(0x02, timeAndZoneId.getShort());
+            byte[] zoneId = new byte[timeAndZoneId.remaining()];
+            timeAndZoneId.get(zoneId, 0, timeAndZoneId.remaining());
+            this.tlv.put(0x03, zoneId);
+            this.complete = true;
+        }
+
+        // TODO: implement parsing this request for the log parser support
+    }
+
+    public static class SecurityNegotiation {
+        public static final int id = 0x33;
+
+        public static class Request extends HuaweiPacket {
+
+            public Request (
+                    HuaweiPacket.ParamsProvider paramsProvider,
+                    byte authMode,
+                    byte[] deviceUUID,
+                    String phoneModel) {
+                super(paramsProvider);
+
+                this.serviceId = DeviceConfig.id;
+                this.commandId = id;
+
+                this.tlv = new HuaweiTLV()
+                    .put(0x01, authMode);
+                if (authMode == 0x02 || authMode == 0x04)
+                    this.tlv.put(0x02, (byte)0x01);
+                this.tlv.put(0x05, deviceUUID)
+                        .put(0x03, (byte)0x01)
+                        .put(0x04, (byte)0x00);
+                if (authMode == 0x04)
+                    this.tlv.put(0x06)
+                            .put(0x07, phoneModel);
+                this.complete = true;
+                this.isEncrypted = false;
+            }
+            // TODO: implement parsing this request for the log parser support
+        }
+
+        public static class Response extends HuaweiPacket {
+            public int authType;
+
+            public Response(ParamsProvider paramsProvider) {
+                super(paramsProvider);
+                this.serviceId = DeviceConfig.id;
+                this.commandId = id;
+            }
+
+            @Override
+            public void parseTlv() throws ParseException {
+                this.authType = -0x1;
+                int pw = -0x1;
+                if (this.tlv.contains(0x01)) {
+                    if (this.tlv.getByte(0x01) == 0x01)
+                        this.authType = 0x0186A0;
+                    if (this.tlv.getByte(0x01) == 0x04)
+                        pw = 4;
+                }
+                if (this.tlv.contains(0x02)) {
+                    this.authType = (int)this.tlv.getByte(0x02);
+                    if (pw != -0x1)
+                        this.authType ^= pw;
+                }
+                if (this.tlv.contains(0x7F))
+                    this.authType = (int)this.tlv.getByte(0x7F);
+            }
+        }
+    }
+
+    public static class ConnectStatusRequest extends HuaweiPacket {
+        public static final int id = 0x35;
+
+        public ConnectStatusRequest (HuaweiPacket.ParamsProvider paramsProvider) {
+            super(paramsProvider);
+
+            this.serviceId = DeviceConfig.id;
+            this.commandId = id;
+
+            this.tlv = new HuaweiTLV()
+                .put(0x01,(byte)0x01);
+            this.complete = true;
+        }
+        // TODO: implement parsing this request for the log parser support
+    }
+
+
+    public static class ExpandCapability {
+        public static final int id = 0x37;
+
+        public static class Request extends HuaweiPacket {
+            public Request(ParamsProvider paramsProvider) {
+                super(paramsProvider);
+
+                this.serviceId = DeviceConfig.id;
+                this.commandId = id;
+
+                this.tlv = new HuaweiTLV()
+                    .put(0x01);
+
+                this.complete = true;
+            }
+        }
+
+        public static class Response extends HuaweiPacket {
+            public byte[] expandCapabilities;
+
+            public Response(ParamsProvider paramsProvider) {
+                super(paramsProvider);
+                this.serviceId = DeviceConfig.id;
+                this.commandId = id;
+            }
+
+            @Override
+            public void parseTlv() throws ParseException {
+                if (this.tlv.contains(0x01)) {
+                   this.expandCapabilities = this.tlv.getBytes(0x01);
+                } else
+                    throw new MissingTagException(0x01);
+            }
+        }
+
+    }
+
+    public static class WearStatus {
+        public static final int id = 0x3D;
+
+        public static class Request extends HuaweiPacket {
+            public Request(ParamsProvider paramsProvider) {
+                super(paramsProvider);
+
+                this.serviceId = DeviceConfig.id;
+                this.commandId = id;
+
+                this.tlv = new HuaweiTLV()
+                    .put(0x01);
+
+                this.complete = true;
+            }
+        }
+
+        public static class Response extends HuaweiPacket {
+
+            public Response(ParamsProvider paramsProvider) {
+                super(paramsProvider);
+                this.serviceId = DeviceConfig.id;
+                this.commandId = id;
+            }
+
+            @Override
+            public void parseTlv() throws ParseException {
+            }
+        }
+
+    }
+
+    public static class SetUpDeviceStatusRequest extends HuaweiPacket {
+        public static final int id = 0x3E;
+
+        public SetUpDeviceStatusRequest(ParamsProvider paramsProvider, int relationShip, String deviceName) {
+            super(paramsProvider);
+
+            this.serviceId = DeviceConfig.id;
+            this.commandId = id;
+
+            this.tlv = new HuaweiTLV()
+                .put(0x01, (byte) relationShip)
+                .put(0x02, deviceName)
+                .put(0x03, (byte)0x00);
+
+            this.complete = true;
+        }
+    }
+
+    // TODO: wear location enum?
+
+    public static class Date {
+        // TODO: enum?
+
+        public static final int yearFirst = 0x01;
+        public static final int monthFirst = 0x02;
+        public static final int dayFirst = 0x03;
+    }
+
+    public static class Time {
+        // TODO: enum?
+
+        public static final int hours12 = 0x01;
+        public static final int hours24 = 0x02;
+    }
+
+    public static class HiChainStep {
+        public static final int one = 0x01;
+        public static final int two = 0x02;
+        public static final int three = 0x03;
+        public static final int four = 0x04;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DisconnectNotification.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DisconnectNotification.java
new file mode 100644
index 000000000..8ebcbcaa4
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DisconnectNotification.java
@@ -0,0 +1,45 @@
+/*  Copyright (C) 2022 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets;
+
+/*
+ * TODO: It isn't clear if this class should handle more at this point, and thus might need a
+ *       different name later
+ */
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiTLV;
+
+public class DisconnectNotification {
+    public static final byte id = 0x0b;
+
+    public static class DisconnectNotificationSetting {
+        public static final byte id = 0x03;
+
+        public static class Request extends HuaweiPacket {
+            public Request(ParamsProvider paramsProvider, boolean enable) {
+                super(paramsProvider);
+
+                this.serviceId = DisconnectNotification.id;
+                this.commandId = id;
+                this.tlv = new HuaweiTLV()
+                        .put(0x01, enable);
+                this.complete = true;
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/FindPhone.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/FindPhone.java
new file mode 100644
index 000000000..701b2bd36
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/FindPhone.java
@@ -0,0 +1,63 @@
+/*  Copyright (C) 2022-2023 Martin.JM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiTLV;
+
+public class FindPhone {
+    public static final byte id = 0x0b;
+
+    public static class Response extends HuaweiPacket {
+        public static final byte id = 0x01;
+
+        public boolean start = false;
+
+        public Response(ParamsProvider paramsProvider) {
+            super(paramsProvider);
+
+            this.serviceId = FindPhone.id;
+            this.commandId = id;
+
+            this.isEncrypted = false;
+        }
+
+        @Override
+        public void parseTlv() {
+            if (this.tlv.contains(0x01)) {
+                this.start = this.tlv.getBoolean(0x01);
+            }
+            // No missing tag exception so it will stop by default
+        }
+    }
+
+    public static class StopRequest extends HuaweiPacket {
+        public static final byte id = 0x02;
+
+        public StopRequest(ParamsProvider paramsProvider) {
+            super(paramsProvider);
+
+            this.serviceId = FindPhone.id;
+            this.commandId = id;
+
+            this.tlv = new HuaweiTLV()
+                    .put(0x01, (byte) 2);
+
+            this.complete = true;
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/FitnessData.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/FitnessData.java
new file mode 100644
index 000000000..e0dc297b2
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/FitnessData.java
@@ -0,0 +1,563 @@
+/*  Copyright (C) 2022 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiTLV;
+
+public class FitnessData {
+
+    public static final byte id = 0x07;
+
+    public static class MotionGoal {
+        public static final byte id = 0x01;
+
+        public static class Request extends HuaweiPacket {
+            public Request(ParamsProvider paramsProvider,
+                           byte goalType,
+                           byte frameType,
+                           int stepGoal,
+                           int calorieGoal,
+                           short durationGoal) {
+                super(paramsProvider);
+
+                this.serviceId = FitnessData.id;
+                this.commandId = id;
+
+                frameType = (frameType == 0x01) ? 0x01 : Type.motion;
+                HuaweiTLV subTlv = new HuaweiTLV()
+                        .put(0x03, goalType)
+                        .put(0x04, frameType);
+                stepGoal = ((Type.data & 0x01) != 0x00) ? stepGoal : 0xffffffff;
+                if (stepGoal != 0xffffffff)
+                        subTlv.put(0x05, stepGoal);
+                int calorieGoalFinal = ((Type.data & 0x02) != 0x00) ? calorieGoal : 0xffffffff;
+                if (calorieGoalFinal != 0xffffffff) {
+                    subTlv.put(0x06, calorieGoalFinal);
+                } else if (frameType == 0x01) {
+                    subTlv.put(0x06, stepGoal / 0x1e);
+                }
+                int distanceGoal = ((Type.data & 0x04) != 0x00) ? durationGoal : 0xffffffff;
+                if (distanceGoal != 0xffffffff) {
+                    subTlv.put(0x07, distanceGoal);
+                } else if (frameType == 0x01) {
+                    subTlv.put(0x06, stepGoal);
+                }
+                short durationGoalFinal = ((Type.data & 0x08) != 0x00) ? durationGoal : 0xffffffff;
+                if (durationGoalFinal != 0xffffffff) {
+                    subTlv.put(0x08, durationGoalFinal);
+                }
+                HuaweiTLV containerTlv = new HuaweiTLV().put(0x82, subTlv);
+                this.tlv = new HuaweiTLV()
+                        .put(0x81, containerTlv);
+            }
+        }
+    }
+    public static class MessageCount {
+        public static final byte sleepId = 0x0C;
+        public static final byte stepId = 0x0A;
+
+        public static class Request extends HuaweiPacket {
+            public Request(
+                    ParamsProvider paramsProvider,
+                    byte commandId,
+                    int start,
+                    int end
+            ) {
+                super(paramsProvider);
+
+                this.serviceId = FitnessData.id;
+                this.commandId = commandId;
+
+                this.tlv = new HuaweiTLV()
+                        .put(0x81)
+                        .put(0x03, start)
+                        .put(0x04, end);
+
+                this.complete = true;
+            }
+        }
+
+        public static class Response extends HuaweiPacket {
+            public short count;
+
+            public Response(ParamsProvider paramsProvider) {
+                super(paramsProvider);
+            }
+
+            @Override
+            public void parseTlv() {
+                this.count = this.tlv.getObject(0x81).getShort(0x02);
+                this.complete = true;
+            }
+        }
+    }
+
+    public static class MessageData {
+        public static final byte sleepId = 0x0D;
+        public static final byte stepId = 0x0B;
+
+        public static class Request extends HuaweiPacket {
+            public Request(ParamsProvider paramsProvider, byte commandId, short count) {
+                super(paramsProvider);
+
+                this.serviceId = FitnessData.id;
+                this.commandId = commandId;
+
+                this.tlv = new HuaweiTLV()
+                        .put(0x81, new HuaweiTLV()
+                                .put(0x02, count)
+                        );
+
+                this.complete = true;
+            }
+        }
+
+        public static class SleepResponse extends HuaweiPacket {
+            public static class SubContainer {
+                public byte type;
+                public byte[] timestamp;
+
+                @Override
+                public String toString() {
+                    return "SubContainer{" +
+                            "type=" + type +
+                            ", timestamp=" + Arrays.toString(timestamp) +
+                            '}';
+                }
+            }
+
+            public short number;
+            public List<SubContainer> containers;
+
+            public SleepResponse(ParamsProvider paramsProvider) {
+                super(paramsProvider);
+
+                this.serviceId = FitnessData.id;
+                this.commandId = sleepId;
+            }
+
+            @Override
+            public void parseTlv() {
+                HuaweiTLV container = this.tlv.getObject(0x81);
+                List<HuaweiTLV> subContainers = container.getObjects(0x83);
+
+                this.number = container.getShort(0x02);
+                this.containers = new ArrayList<>();
+                for (HuaweiTLV subContainerTlv : subContainers) {
+                    SubContainer subContainer = new SubContainer();
+                    subContainer.type = subContainerTlv.getByte(0x04);
+                    subContainer.timestamp = subContainerTlv.getBytes(0x05);
+                    this.containers.add(subContainer);
+                }
+            }
+        }
+
+        public static class StepResponse extends HuaweiPacket {
+            public static class SubContainer {
+                public static class TV {
+                    public final byte bitmap;
+                    public final byte tag;
+                    public final short value;
+
+                    public TV(byte bitmap, byte tag, short value) {
+                        this.bitmap = bitmap;
+                        this.tag = tag;
+                        this.value = value;
+                    }
+
+                    @Override
+                    public String toString() {
+                        return "TV{" +
+                                "bitmap=" + bitmap +
+                                ", tag=" + tag +
+                                ", value=" + value +
+                                '}';
+                    }
+                }
+
+                /*
+                 * Data directly from packet
+                 */
+                public byte timestampOffset;
+                public byte[] data;
+
+                /*
+                 * Inferred data
+                 */
+                public int timestamp;
+
+                public List<TV> parsedData = null;
+                public String parsedDataError = "";
+
+                public int steps = -1;
+                public int calories = -1;
+                public int distance = -1;
+                public int heartrate = -1;
+
+                public int spo = -1;
+
+                public List<TV> unknownTVs = null;
+
+                @Override
+                public String toString() {
+                    return "SubContainer{" +
+                            "timestampOffset=" + timestampOffset +
+                            ", data=" + Arrays.toString(data) +
+                            ", timestamp=" + timestamp +
+                            ", parsedData=" + parsedData +
+                            ", parsedDataError='" + parsedDataError + '\'' +
+                            ", steps=" + steps +
+                            ", calories=" + calories +
+                            ", distance=" + distance +
+                            ", spo=" + spo +
+                            ", unknownTVs=" + unknownTVs +
+                            '}';
+                }
+            }
+
+            public short number;
+            public int timestamp;
+            public List<SubContainer> containers;
+
+            private static final List<Byte> singleByteTagListBitmap1 = new ArrayList<>();
+            static {
+                singleByteTagListBitmap1.add((byte) 0x20);
+                singleByteTagListBitmap1.add((byte) 0x40);
+            }
+
+            public StepResponse(ParamsProvider paramsProvider) {
+                super(paramsProvider);
+
+                this.serviceId = FitnessData.id;
+                this.commandId = stepId;
+            }
+
+            @Override
+            public void parseTlv() throws ParseException {
+                HuaweiTLV container = this.tlv.getObject(0x81);
+                List<HuaweiTLV> subContainers = container.getObjects(0x84);
+
+                if (!container.contains(0x02))
+                    throw new MissingTagException(0x02);
+                if (!container.contains(0x03))
+                    throw new MissingTagException(0x03);
+
+                this.number = container.getShort(0x02);
+                this.timestamp = container.getInteger(0x03);
+                this.containers = new ArrayList<>();
+                for (HuaweiTLV subContainerTlv : subContainers) {
+                    SubContainer subContainer = new SubContainer();
+                    subContainer.timestampOffset = subContainerTlv.getByte(0x05);
+                    subContainer.timestamp = this.timestamp + 60 * subContainer.timestampOffset;
+                    subContainer.data = subContainerTlv.getBytes(0x06);
+                    parseData(subContainer, subContainer.data);
+                    this.containers.add(subContainer);
+                }
+            }
+
+            private static void parseData(SubContainer returnValue, byte[] data) {
+                int i = 0;
+
+                if (data.length <= 0) {
+                    returnValue.parsedData = null;
+                    returnValue.parsedDataError = "Data is missing feature bitmap.";
+                    return;
+                }
+                byte featureBitmap1 = data[i++];
+
+                byte featureBitmap2 = 0;
+                if ((featureBitmap1 & 128) != 0) {
+                    if (data.length <= i) {
+                        returnValue.parsedData = null;
+                        returnValue.parsedDataError = "Data is missing second feature bitmap.";
+                        return;
+                    }
+                    featureBitmap2 = data[i++];
+                }
+
+                returnValue.parsedData = new ArrayList<>();
+                returnValue.unknownTVs = new ArrayList<>();
+
+                // The greater than zero check is because Java is always signed, so we only check 7 bits
+                for (byte bitToCheck = 1; bitToCheck > 0; bitToCheck <<= 1) {
+                    if ((featureBitmap1 & bitToCheck) != 0) {
+                        short value;
+
+                        if (singleByteTagListBitmap1.contains(bitToCheck)) {
+                            if (data.length - 1 < i) {
+                                returnValue.parsedData = null;
+                                returnValue.parsedDataError = "Data is too short for selected features.";
+                                return;
+                            }
+
+                            value = data[i++];
+                        } else {
+                            if (data.length - 2 < i) {
+                                returnValue.parsedData = null;
+                                returnValue.parsedDataError = "Data is too short for selected features.";
+                                return;
+                            }
+
+                            value = (short) ((data[i++] & 0xFF) << 8 | (data[i++] & 0xFF));
+                        }
+
+                        // The bitToCheck is used as tag, which may not be optimal, but works
+                        SubContainer.TV tv = new SubContainer.TV((byte) 1, bitToCheck, value);
+                        returnValue.parsedData.add(tv);
+
+                        if (bitToCheck == 0x02)
+                            returnValue.steps = value;
+                        else if (bitToCheck == 0x04)
+                            returnValue.calories = value;
+                        else if (bitToCheck == 0x08)
+                            returnValue.distance = value;
+                        else if (bitToCheck == 0x40)
+                            returnValue.heartrate = value;
+                        else
+                            returnValue.unknownTVs.add(tv);
+                    }
+                }
+
+                if (featureBitmap2 != 0) {
+                    // We want to check 8 bits here, and java is java, so we use a short
+                    for (short bitToCheck = 1; bitToCheck < 0x0100; bitToCheck <<= 1) {
+                        if ((featureBitmap2 & bitToCheck) != 0) {
+                            if (data.length - 1 < i) {
+                                returnValue.parsedData = null;
+                                returnValue.parsedDataError = "Data is too short for selected features.";
+                                return;
+                            }
+
+                            byte value = data[i++];
+
+                            SubContainer.TV tv = new SubContainer.TV((byte) 2, (byte) bitToCheck, value);
+                            returnValue.parsedData.add(tv);
+
+                            if (bitToCheck == 0x01)
+                                returnValue.spo = value;
+                            else
+                                returnValue.unknownTVs.add(tv);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    public static class FitnessTotals {
+        public static final byte id = 0x03;
+
+        public static class Request extends HuaweiPacket {
+            public Request(ParamsProvider paramsProvider) {
+                super(paramsProvider);
+
+                this.serviceId = FitnessData.id;
+                this.commandId = id;
+
+                this.tlv = new HuaweiTLV()
+                        .put(0x01);
+
+                this.complete = true;
+            }
+        }
+
+        public static class Response extends HuaweiPacket {
+
+            public int totalSteps = 0;
+            public int totalCalories = 0;
+            public int totalDistance = 0;
+
+            public Response(ParamsProvider paramsProvider) {
+                super(paramsProvider);
+
+                this.serviceId = FitnessData.id;
+                this.commandId = id;
+            }
+
+            @Override
+            public void parseTlv() {
+                HuaweiTLV container = this.tlv.getObject(0x81);
+                List<HuaweiTLV> containers = container.getObjects(0x83);
+
+                for (HuaweiTLV tlv : containers) {
+                    if (tlv.contains(0x05))
+                        totalSteps += tlv.getInteger(0x05);
+                    if (tlv.contains(0x06))
+                        totalCalories += tlv.getShort(0x06);
+                    if (tlv.contains(0x07))
+                        totalDistance += tlv.getInteger(0x07);
+                }
+
+                this.complete = true;
+            }
+        }
+    }
+
+    public static class ActivityReminder {
+        public static final byte id = 0x07;
+
+        public static class Request extends HuaweiPacket {
+            public Request(
+                    ParamsProvider paramsProvider,
+                    boolean longSitSwitch,
+                    byte longSitInterval,
+                    byte[] longSitStart,
+                    byte[] longSitEnd,
+                    byte cycle
+            ) {
+                super(paramsProvider);
+
+                this.serviceId = FitnessData.id;
+                this.commandId = id;
+
+                this.tlv = new HuaweiTLV()
+                        .put(0x81, new HuaweiTLV()
+                                .put(0x02, longSitSwitch)
+                                .put(0x03, longSitInterval)
+                                .put(0x04, longSitStart)
+                                .put(0x05, longSitEnd)
+                                .put(0x06, cycle)
+                        );
+
+                this.complete = true;
+            }
+        }
+    }
+
+    public static class TruSleep {
+        public static final byte id = 0x16;
+
+        public static class Request extends HuaweiPacket {
+            public Request(ParamsProvider paramsProvider, boolean truSleepSwitch) {
+                super(paramsProvider);
+
+                this.serviceId = FitnessData.id;
+                this.commandId = id;
+
+                this.tlv = new HuaweiTLV()
+                        .put(0x01, truSleepSwitch);
+
+                this.complete = true;
+            }
+        }
+    }
+
+    public static class EnableAutomaticHeartrate {
+        public static final byte id = 0x17;
+
+        public static class Request extends HuaweiPacket {
+            public Request(ParamsProvider paramsProvider, boolean enableAutomaticHeartrate) {
+                super(paramsProvider);
+
+                this.serviceId = FitnessData.id;
+                this.commandId = id;
+
+                this.tlv = new HuaweiTLV()
+                        .put(0x01, enableAutomaticHeartrate);
+
+                this.isEncrypted = true;
+                this.complete = true;
+            }
+        }
+    }
+
+    public static class NotifyRestHeartRate {
+        public static final byte id = 0x23;
+
+        public static class Request extends HuaweiPacket {
+            public Request(ParamsProvider paramsProvider) {
+                super(paramsProvider);
+
+                this.serviceId = FitnessData.id;
+                this.commandId = id;
+
+                this.tlv = new HuaweiTLV()
+                        .put(0x01, 0x01);
+
+                this.complete = true;
+            }
+        }
+    }
+
+    public static class EnableAutomaticSpo {
+        public static final byte id = 0x24;
+
+        public static class Request extends HuaweiPacket {
+            public Request(ParamsProvider paramsProvider, boolean enableAutomaticSpo) {
+                super(paramsProvider);
+
+                this.serviceId = FitnessData.id;
+                this.commandId = id;
+
+                this.tlv = new HuaweiTLV()
+                        .put(0x01, enableAutomaticSpo);
+
+                this.isEncrypted = true;
+                this.complete = true;
+            }
+        }
+    }
+
+    public static class MediumToStrengthThreshold {
+        public static final byte id = 0x23;
+
+        public static class Request extends HuaweiPacket {
+            public Request(ParamsProvider paramsProvider,
+                           byte walkRun,
+                           byte climb,
+                           byte heartRate,
+                           byte cycleSpeed,
+                           byte sample,
+                           byte countLength) {
+                super(paramsProvider);
+
+                this.serviceId = FitnessData.id;
+                this.commandId = id;
+
+                if (walkRun < 0x00 || walkRun > 0xc8) walkRun = 0x6E;
+                if (climb < 0x0 || climb > 0xc8)  climb = 0x3c;
+                if (heartRate < 0x0 || heartRate > 0x64) heartRate = 0x40;
+                if (cycleSpeed < 0x0 || cycleSpeed > 0xff) cycleSpeed = 0x50;
+                if (sample < 0x1 || sample > 0xa) sample = 0x3;
+                if (countLength < 0x1 || countLength > 0xa) countLength = 0x5;
+                if (countLength < sample) countLength = sample;
+
+                this.tlv = new HuaweiTLV()
+                        .put(0x01, walkRun)
+                        .put(0x02, climb)
+                        .put(0x03, heartRate)
+                        .put(0x04, cycleSpeed)
+                        .put(0x05, sample)
+                        .put(0x06, countLength);
+
+                this.complete = true;
+            }
+        }
+    }
+
+    public static class Type {
+        public static final byte  goal = 0x01;
+        public static final byte  motion = 0x00;
+        public static final byte  data = 0x01;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/LocaleConfig.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/LocaleConfig.java
new file mode 100644
index 000000000..f625ebbbd
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/LocaleConfig.java
@@ -0,0 +1,53 @@
+/*  Copyright (C) 2021-2022 Gaignon Damien
+    Copyright (C) 2022 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiTLV;
+
+public class LocaleConfig {
+    public static final byte id = 0x0C;
+
+    public static class SetLanguageSetting extends HuaweiPacket {
+        public static final byte id = 0x01;
+
+        public SetLanguageSetting(
+                ParamsProvider paramsProvider,
+                byte[] locale,
+                byte measurement
+        ) {
+            super(paramsProvider);
+
+            this.serviceId = LocaleConfig.id;
+            this.commandId = id;
+
+            this.tlv = new HuaweiTLV()
+                    .put(0x01, locale)
+                    .put(0x02, measurement);
+
+            this.complete = true;
+        }
+    }
+
+    public static class MeasurementSystem {
+        // TODO: enum?
+
+        public static final byte metric = 0x00;
+        public static final byte imperial = 0x01;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Menstrual.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Menstrual.java
new file mode 100644
index 000000000..2d74e383e
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Menstrual.java
@@ -0,0 +1,75 @@
+/*  Copyright (C) 2023 Gaignon Damien
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiTLV;
+
+public class Menstrual {
+    public static final byte id = 0x32;
+
+    public static class ModifyTime {
+        public static final byte id = 0x02;
+
+        public static class Request extends HuaweiPacket {
+            public Request(ParamsProvider paramsProvider, int errorCode, long time) {
+                super(paramsProvider);
+
+                this.serviceId = Menstrual.id;
+                this.commandId = id;
+
+                this.tlv = new HuaweiTLV();
+                if (errorCode == 0) {
+                    this.tlv.put(0x01, time);
+                } else {
+                    this.tlv.put(0x7f, (int)0x249F1);
+                }
+                this.complete = true;
+            }
+        }
+
+        public static class Response extends HuaweiPacket {
+            public Response(ParamsProvider paramsProvider) {
+                super(paramsProvider);
+
+                this.serviceId = Menstrual.id;
+                this.commandId = id;
+            }
+
+            @Override
+            public void parseTlv() throws ParseException {
+                // Do not know data yet
+            }
+        }
+    }
+
+    public static class CapabilityRequest extends HuaweiPacket {
+        public static final byte id = 0x05;
+
+        public CapabilityRequest(ParamsProvider paramsProvider) {
+            super(paramsProvider);
+
+            this.serviceId = Menstrual.id;
+            this.commandId = id;
+
+            this.tlv = new HuaweiTLV()
+                    .put(0x01, (byte)0x02);
+
+            this.complete = true;
+        }
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/MusicControl.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/MusicControl.java
new file mode 100644
index 000000000..81ae1b56d
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/MusicControl.java
@@ -0,0 +1,185 @@
+/*  Copyright (C) 2022 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiTLV;
+
+public class MusicControl {
+    public static final byte id = 0x25;
+
+    // TODO: should this be in HuaweiConstants?
+    public static final int successValue = 0x000186A0;
+
+    public static class MusicStatusRequest extends HuaweiPacket {
+        public MusicStatusRequest(ParamsProvider paramsProvider, byte commandId, int returnValue) {
+            super(paramsProvider);
+
+            this.serviceId = MusicControl.id;
+            this.commandId = commandId;
+            this.tlv = new HuaweiTLV()
+                    .put(0x7F, returnValue);
+            this.isEncrypted = true;
+            this.complete = true;
+        }
+    }
+
+    public static class MusicStatusResponse extends HuaweiPacket {
+        public static final byte id = 0x01;
+
+        public int status = -1;
+
+        public MusicStatusResponse(ParamsProvider paramsProvider) {
+            super(paramsProvider);
+
+            this.serviceId = MusicControl.id;
+            this.commandId = id;
+        }
+
+        @Override
+        public void parseTlv() {
+            if (this.tlv.contains(0x7F) && this.tlv.getBytes(0x7F).length == 4)
+                this.status = this.tlv.getInteger(0x7F);
+        }
+    }
+
+    public static class MusicInfo {
+        public static final byte id = 0x02;
+
+        public static class Request extends HuaweiPacket {
+            public Request(
+                    ParamsProvider paramsProvider,
+                    String artistName,
+                    String songName,
+                    byte playState,
+                    byte maxVolume,
+                    byte currentVolume
+            ) {
+                super(paramsProvider);
+                this.serviceId = MusicControl.id;
+                this.commandId = id;
+                this.tlv = new HuaweiTLV()
+                        .put(0x01, artistName)
+                        .put(0x02, songName)
+                        .put(0x03, playState)
+                        .put(0x04, maxVolume)
+                        .put(0x05, currentVolume);
+                this.complete = true;
+            }
+        }
+
+        public static class Response extends HuaweiPacket {
+            public boolean ok = false;
+            public String error = "No input has been parsed yet";
+
+            public Response(ParamsProvider paramsProvider) {
+                super(paramsProvider);
+
+                this.serviceId = MusicControl.id;
+                this.commandId = id;
+
+                this.isEncrypted = true;
+            }
+
+            @Override
+            public void parseTlv() {
+                if (this.tlv.contains(0x7F)) {
+                    if (this.tlv.getInteger(0x7F) == successValue) {
+                        this.ok = true;
+                        this.error = "";
+                    } else {
+                        this.ok = false;
+                        this.error = "Music information error code: " + Integer.toHexString(this.tlv.getInteger(0x7F));
+                    }
+                } else {
+                    this.ok = false;
+                    this.error = "Music information response no status tag";
+                }
+            }
+        }
+    }
+
+    public static class Control {
+        public static final byte id = 0x03;
+
+        public static class Response extends HuaweiPacket {
+            public enum Button {
+                Unknown,
+                Play,
+                Pause,
+                Previous,
+                Next,
+                Volume_up,
+                Volume_down
+            }
+
+            public boolean buttonPresent = false;
+            public byte rawButton = 0x00;
+            public boolean volumePresent = false;
+            public byte volume = 0x00;
+
+            public Button button = null;
+
+            public Response(ParamsProvider paramsProvider) {
+                super(paramsProvider);
+
+                this.serviceId = MusicControl.id;
+                this.commandId = id;
+
+                this.isEncrypted = false;
+            }
+
+            @Override
+            public void parseTlv() {
+                if (this.tlv.contains(0x01)) {
+                    this.buttonPresent = true;
+                    this.rawButton = this.tlv.getByte(0x01);
+                    switch (this.rawButton) {
+                        case 1:
+                            this.button = Button.Play;
+                            break;
+                        case 2:
+                            this.button = Button.Pause;
+                            break;
+                        case 3:
+                            this.button = Button.Previous;
+                            break;
+                        case 4:
+                            this.button = Button.Next;
+                            break;
+                        case 5:
+                            this.button = Button.Volume_up;
+                            break;
+                        case 6:
+                            this.button = Button.Volume_down;
+                            break;
+                        case 64:
+                            // Unknown button on Huawei Band 4
+                        default:
+                            this.button = Button.Unknown;
+                    }
+                }
+
+                if (this.tlv.contains(0x02)) {
+                    this.volumePresent = true;
+                    this.volume = this.tlv.getByte(0x02);
+                }
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Notifications.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Notifications.java
new file mode 100644
index 000000000..2f9e00711
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Notifications.java
@@ -0,0 +1,298 @@
+/*  Copyright (C) 2022 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets;
+
+import java.nio.ByteBuffer;
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiTLV;
+
+public class Notifications {
+    public static final byte id = 0x02;
+
+    public static class NotificationActionRequest extends HuaweiPacket {
+        public static final byte id = 0x01;
+
+        // TODO: support other types of notifications
+        //        public static final int send = 0x01;
+        //        public static final int notificationId = 0x01;
+        //        public static final int notificationType = 0x02;
+        //        public static final int vibrate = 0x03;
+        //        public static final int payloadEmpty = 0x04;
+        //        public static final int imageHeight = 0x08;
+        //        public static final int imageWidth = 0x09;
+        //        public static final int imageColor = 0x0A;
+        //        public static final int imageData = 0x0B;
+        //        public static final int textType = 0x0E;
+        //        public static final int textEncoding = 0x0F;
+        //        public static final int textContent = 0x10;
+        //        public static final int sourceAppId = 0x11;
+        //        public static final int payloadText = 0x84;
+        //        public static final int payloadImage = 0x86;
+        //        public static final int textList = 0x8C;
+        //        public static final int textItem = 0x8D;
+
+        public NotificationActionRequest(
+                ParamsProvider paramsProvider,
+                short notificationId,
+                byte notificationType,
+                byte titleEncoding,
+                String titleContent,
+                byte senderEncoding,
+                String senderContent,
+                byte bodyEncoding,
+                String bodyContent,
+                String sourceAppId
+        ) {
+            super(paramsProvider);
+
+            this.serviceId = Notifications.id;
+            this.commandId = id;
+
+            // TODO: Add notification information per type if necessary
+
+            this.tlv = new HuaweiTLV()
+                    .put(0x01, notificationId)
+                    .put(0x02, notificationType)
+                    .put(0x03, true); // This used to be vibrate, but doesn't work
+
+            HuaweiTLV subTlv = new HuaweiTLV();
+            if (titleContent != null)
+                subTlv.put(0x8D, new HuaweiTLV()
+                        .put(0x0E, (byte) 0x03)
+                        .put(0x0F, titleEncoding)
+                        .put(0x10, titleContent)
+                );
+
+            if (senderContent != null)
+                subTlv.put(0x8D, new HuaweiTLV()
+                        .put(0x0E, (byte) 0x02)
+                        .put(0x0F, senderEncoding)
+                        .put(0x10, senderContent)
+                );
+
+            if (bodyContent != null)
+                subTlv.put(0x8D, new HuaweiTLV()
+                        .put(0x0E, (byte) 0x01)
+                        .put(0x0F, bodyEncoding)
+                        .put(0x10, bodyContent)
+                );
+
+            if (subTlv.length() != 0) {
+                this.tlv.put(0x84, new HuaweiTLV().put(0x8C, subTlv));
+            } else {
+                this.tlv.put(0x04);
+            }
+
+            if (sourceAppId != null)
+                this.tlv.put(0x11, sourceAppId);
+
+            this.complete = true;
+        }
+    }
+
+    public static class NotificationConstraints {
+        public static final byte id = 0x02;
+
+        public static class Request extends HuaweiPacket {
+            public Request(ParamsProvider paramsProvider) {
+                super(paramsProvider);
+                this.serviceId = Notifications.id;
+                this.commandId = id;
+                this.tlv = new HuaweiTLV()
+                    .put(0x01);
+                this.complete = true;
+            }
+        }
+
+        public static class Response extends HuaweiPacket {
+            public ByteBuffer constraints;
+
+            public Response(ParamsProvider paramsProvider) {
+                super(paramsProvider);
+                this.serviceId = Notifications.id;
+                this.commandId = id;
+                this.complete = true;
+            }
+
+            private void putByteBuffer(ByteBuffer bBuffer, byte position, byte[] value) {
+                ByteBuffer bValue = ByteBuffer.wrap(value);
+                if (bValue.capacity() == 2)
+                    bBuffer.putShort(position, bValue.getShort());
+                bBuffer.put(position, (byte)0x00);
+                bBuffer.put(bValue.get());
+            }
+
+            @Override
+            public void parseTlv() throws ParseException {
+                this.constraints = ByteBuffer.allocate(14);
+                List<HuaweiTLV> subContainers = this.tlv
+                        .getObject(0x81)
+                        .getObject(0x82)
+                        .getObjects(0x90);
+                for (HuaweiTLV subContainer : subContainers) {
+                    HuaweiTLV subSubContainer = subContainer.getObject(0x91);
+                    if (subSubContainer.getByte(0x12) == 0x01)
+                        putByteBuffer(constraints, NotificationConstraintsType.contentLength,subSubContainer.getBytes(0x14));
+                    if (subSubContainer.getByte(0x12) == 0x05) {
+                        constraints.put(NotificationConstraintsType.yellowPagesSupport,(byte)0x01);
+                        constraints.put(NotificationConstraintsType.yellowPagesFormat,subSubContainer.getByte(0x13));
+                        putByteBuffer(constraints, NotificationConstraintsType.yellowPagesLength,subSubContainer.getBytes(0x14));
+                    }
+                    if (subSubContainer.getByte(0x12) == 0x06) {
+                        constraints.put(NotificationConstraintsType.contentSignSupport,(byte)0x01);
+                        constraints.put(NotificationConstraintsType.contentSignFormat,subSubContainer.getByte(0x13));
+                        putByteBuffer(constraints, NotificationConstraintsType.contentSignLength,subSubContainer.getBytes(0x14));
+                    }
+                    if (subSubContainer.getByte(0x12) == 0x07 ) {
+                        constraints.put(NotificationConstraintsType.incomingNumberSupport,(byte)0x01);
+                        constraints.put(NotificationConstraintsType.incomingNumberFormat,subSubContainer.getByte(0x13));
+                        putByteBuffer(constraints, NotificationConstraintsType.incomingNumberLength,subSubContainer.getBytes(0x14));
+                    }
+                }
+                constraints.rewind();
+            }
+        }
+    }
+
+    public static class NotificationConstraintsType {
+        // TODO: enum?
+
+        public static final byte contentLength = 0x00;
+        public static final byte yellowPagesSupport = 0x02;
+        public static final byte yellowPagesFormat = 0x03;
+        public static final byte yellowPagesLength = 0x04;
+        public static final byte contentSignSupport = 0x06;
+        public static final byte contentSignFormat = 0x07;
+        public static final byte contentSignLength = 0x08;
+        public static final byte incomingNumberSupport = 0x0A;
+        public static final byte incomingNumberFormat = 0x0B;
+        public static final byte incomingNumberLength = 0x0C;
+    }
+
+    public static class NotificationType {
+        // TODO: enum?
+
+        public static final byte call = 0x01;
+        public static final byte sms = 0x02;
+        public static final byte weChat = 0x03;
+        public static final byte qq = 0x0B;
+        public static final byte stopNotification = 0x0C; // To stop showing a (call) notification
+        public static final byte missedCall = 0x0E;
+        public static final byte email = 0x0F;
+        public static final byte generic = 0x7F;
+    }
+
+    public static class TextType {
+        // TODO: enum?
+
+        public static final int text = 0x01;
+        public static final int sender = 0x02;
+        public static final int title = 0x03;
+        public static final int yellowPage = 0x05;
+        public static final int contentSign = 0x06;
+        public static final int flight = 0x07;
+        public static final int train = 0x08;
+        public static final int warmRemind = 0x09;
+        public static final int weather = 0x0A;
+    }
+
+    public static class TextEncoding {
+        // TODO: enum?
+
+        public static final byte unknown = 0x01;
+        public static final byte standard = 0x02;
+    }
+
+    public static class NotificationStateRequest extends HuaweiPacket {
+        public static final byte id = 0x04;
+
+        public NotificationStateRequest(
+                ParamsProvider paramsProvider,
+                boolean status
+        ) {
+            super(paramsProvider);
+
+            this.serviceId = Notifications.id;
+            this.commandId = id;
+
+            this.tlv = new HuaweiTLV()
+                    .put(0x81, new HuaweiTLV()
+                            .put(0x02, status)
+                            .put(0x03, status)
+                    );
+
+            this.complete = true;
+        }
+    }
+
+    public static class NotificationCapabilities {
+        public static final byte id = 0x05;
+
+        public static class Request extends HuaweiPacket {
+            public Request(
+                    ParamsProvider paramsProvider
+            ){
+                super(paramsProvider);
+                this.serviceId = Notifications.id;
+                this.commandId = id;
+                this.tlv = new HuaweiTLV()
+                        .put(0x01);
+
+                this.complete = true;
+            }
+        }
+
+        public static class Response extends HuaweiPacket {
+            public byte capabilities = 0x00;
+
+            public Response(ParamsProvider paramsProvider) {
+                super(paramsProvider);
+                this.serviceId = DeviceConfig.id;
+                this.commandId = id;
+            }
+
+            @Override
+            public void parseTlv() throws ParseException {
+                if (this.tlv.contains(0x01))
+                    this.capabilities = this.tlv.getByte(0x01);
+            }
+        }
+    }
+
+    public static class WearMessagePushRequest extends HuaweiPacket {
+        public static final byte id = 0x08;
+
+        public WearMessagePushRequest(
+                ParamsProvider paramsProvider,
+                boolean status
+        ) {
+            super(paramsProvider);
+
+            this.serviceId = Notifications.id;
+            this.commandId = id;
+
+            /* Value sent is the opposite of the switch status */
+            this.tlv = new HuaweiTLV()
+                    .put(0x01, !status);
+
+            this.complete = true;
+        }
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/WorkMode.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/WorkMode.java
new file mode 100644
index 000000000..8469996cc
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/WorkMode.java
@@ -0,0 +1,58 @@
+/*  Copyright (C) 2021-2022 Gaignon Damien
+    Copyright (C) 2022 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiTLV;
+
+public class WorkMode {
+    public static final byte id = 0x26;
+
+    /*
+     * public static class ModeStatus {
+     *     public static final byte id = 0x01;
+     *     public static final int autoDetectMode  = 0x01;
+     *     public static final int footWear  = 0x02;
+     * }
+     */
+
+    public static class SwitchStatusRequest extends HuaweiPacket {
+        public static final byte id = 0x02;
+        public static final int setStatus  = 0x01;
+
+        public SwitchStatusRequest(ParamsProvider paramsProvider, boolean autoWorkMode) {
+            super(paramsProvider);
+
+            this.serviceId = WorkMode.id;
+            this.commandId = id;
+
+            this.tlv = new HuaweiTLV()
+                    .put(0x01, autoWorkMode);
+
+            this.complete = true;
+        }
+    }
+
+    /*
+     * public static class FootWear {
+     *     public static final byte id = 0x03;
+     *     public static final int AutoDetectMode  = 0x01;
+     *     public static final int FootWear  = 0x02;
+     * }
+     */
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Workout.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Workout.java
new file mode 100644
index 000000000..e95b6d02a
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Workout.java
@@ -0,0 +1,575 @@
+/*  Copyright (C) 2022 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets;
+
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiTLV;
+
+public class Workout {
+    public static final byte id = 0x17;
+
+    public static class WorkoutCount {
+        public static final byte id = 0x07;
+
+        public static class Request extends HuaweiPacket {
+            public Request(
+                    ParamsProvider paramsProvider,
+                    int start,
+                    int end
+            ) {
+                super(paramsProvider);
+
+                this.serviceId = Workout.id;
+                this.commandId = id;
+
+                this.tlv = new HuaweiTLV()
+                        .put(0x81, new HuaweiTLV()
+                                .put(0x03, start)
+                                .put(0x04, end)
+                        );
+
+                this.complete = true;
+            }
+        }
+
+        public static class Response extends HuaweiPacket {
+            public static class WorkoutNumbers {
+                public byte[] rawData;
+
+                public short workoutNumber;
+                public short dataCount;
+                public short paceCount;
+            }
+
+            public short count;
+            public List<WorkoutNumbers> workoutNumbers;
+
+            public Response(ParamsProvider paramsProvider) {
+                super(paramsProvider);
+            }
+
+            @Override
+            public void parseTlv() throws ParseException {
+                if (!this.tlv.contains(0x81))
+                    throw new MissingTagException(0x81);
+
+                HuaweiTLV container = this.tlv.getObject(0x81);
+
+                if (!container.contains(0x02))
+                    throw new MissingTagException(0x02);
+
+                this.count = container.getShort(0x02);
+                this.workoutNumbers = new ArrayList<>();
+
+                if (this.count == 0)
+                    return;
+
+                if (!container.contains(0x85))
+                    throw new MissingTagException(0x85);
+
+                List<HuaweiTLV> subContainers = container.getObjects(0x85);
+                for (HuaweiTLV subContainerTlv : subContainers) {
+                    if (!subContainerTlv.contains(0x06))
+                        throw new MissingTagException(0x06);
+                    if (!subContainerTlv.contains(0x07))
+                        throw new MissingTagException(0x07);
+                    if (!subContainerTlv.contains(0x08))
+                        throw new MissingTagException(0x08);
+
+                    WorkoutNumbers workoutNumber = new WorkoutNumbers();
+                    workoutNumber.rawData = subContainerTlv.serialize();
+                    workoutNumber.workoutNumber = subContainerTlv.getShort(0x06);
+                    workoutNumber.dataCount = subContainerTlv.getShort(0x07);
+                    workoutNumber.paceCount = subContainerTlv.getShort(0x08);
+                    this.workoutNumbers.add(workoutNumber);
+                }
+            }
+        }
+    }
+
+    public static class WorkoutTotals {
+        public static final byte id = 0x08;
+
+        public static class Request extends HuaweiPacket {
+
+            public Request(ParamsProvider paramsProvider, short number) {
+                super(paramsProvider);
+
+                this.serviceId = Workout.id;
+                this.commandId = id;
+
+                this.tlv = new HuaweiTLV().put(0x81, new HuaweiTLV()
+                        .put(0x02, number)
+                );
+
+                this.complete = true;
+            }
+        }
+
+        public static class Response extends HuaweiPacket {
+            public byte[] rawData;
+
+            public short number;
+            public byte status = -1; // TODO: enum?
+            public int startTime;
+            public int endTime;
+            public int calories = -1;
+            public int distance = -1;
+            public int stepCount = -1;
+            public int totalTime = -1;
+            public int duration = -1;
+            public byte type = -1; // TODO: enum?
+            public short strokes = -1;
+            public short avgStrokeRate = -1;
+            public short poolLength = -1; // In cm
+            public short laps = -1;
+            public short avgSwolf = -1;
+
+            public Response(ParamsProvider paramsProvider) {
+                super(paramsProvider);
+            }
+
+            @Override
+            public void parseTlv() throws ParseException {
+                if (!this.tlv.contains(0x81))
+                    throw new MissingTagException(0x81);
+
+                HuaweiTLV container = this.tlv.getObject(0x81);
+
+                if (!container.contains(0x02))
+                    throw new MissingTagException(0x02);
+                if (!container.contains(0x04))
+                    throw new MissingTagException(0x04);
+                if (!container.contains(0x05))
+                    throw new MissingTagException(0x05);
+
+                this.rawData = container.serialize();
+                this.number = container.getShort(0x02);
+                if (container.contains(0x03))
+                    this.status = container.getByte(0x03);
+                this.startTime = container.getInteger(0x04);
+                this.endTime = container.getInteger(0x05);
+
+                if (container.contains(0x06))
+                    this.calories = container.getInteger(0x06);
+                if (container.contains(0x07))
+                    this.distance = container.getInteger(0x07);
+                if (container.contains(0x08))
+                    this.stepCount = container.getInteger(0x08);
+                if (container.contains(0x09))
+                    this.totalTime = container.getInteger(0x09);
+                if (container.contains(0x12))
+                    this.duration = container.getInteger(0x12);
+                if (container.contains(0x14))
+                    this.type = container.getByte(0x14);
+                // TODO: I'm guessing 0x15 is Main style for swimming, but cannot confirm.
+                if (container.contains(0x16))
+                    this.strokes = container.getShort(0x16);
+                if (container.contains(0x17))
+                    this.avgStrokeRate = container.getShort(0x17);
+                if (container.contains(0x18))
+                    this.poolLength = container.getShort(0x18);
+                if (container.contains(0x19))
+                    this.laps = container.getShort(0x19);
+                if (container.contains(0x1a))
+                    this.avgSwolf = container.getShort(0x1a);
+            }
+        }
+    }
+
+    public static class WorkoutData {
+        public static final int id = 0x0a;
+
+        public static class Request extends HuaweiPacket {
+
+            public Request(
+                    ParamsProvider paramsProvider,
+                    short workoutNumber,
+                    short dataNumber
+            ) {
+                super(paramsProvider);
+
+                this.serviceId = Workout.id;
+                this.commandId = id;
+
+                this.tlv = new HuaweiTLV().put(0x81, new HuaweiTLV()
+                        .put(0x02, workoutNumber)
+                        .put(0x03, dataNumber)
+                );
+
+                this.complete = true;
+            }
+        }
+
+        public static class Response extends HuaweiPacket {
+            public static class Header {
+                public short workoutNumber;
+                public short dataNumber;
+                public int timestamp;
+                public byte interval;
+                public short dataCount;
+                public byte dataLength;
+                public short bitmap; // TODO: can this be enum-like?
+
+                @Override
+                public String toString() {
+                    return "Header{" +
+                            "workoutNumber=" + workoutNumber +
+                            ", dataNumber=" + dataNumber +
+                            ", timestamp=" + timestamp +
+                            ", interval=" + interval +
+                            ", dataCount=" + dataCount +
+                            ", dataLength=" + dataLength +
+                            ", bitmap=" + bitmap +
+                            '}';
+                }
+            }
+
+            public static class Data {
+                // If unknown data is encountered, the whole tlv will be in here so it can be parsed again later
+                public byte[] unknownData = null;
+
+                public byte heartRate = -1;
+                public short speed = -1;
+                public byte stepRate = -1;
+
+                public short cadence = -1;
+                public short stepLength = -1;
+                public short groundContactTime = -1;
+                public byte impact = -1;
+                public short swingAngle = -1;
+                public byte foreFootLanding = -1;
+                public byte midFootLanding = -1;
+                public byte backFootLanding = -1;
+                public byte eversionAngle = -1;
+
+                public byte swolf = -1;
+                public short strokeRate = -1;
+
+                public int timestamp = -1; // Calculated timestamp for this data point
+
+                @Override
+                public String toString() {
+                    return "Data{" +
+                            "unknownData=" + unknownData +
+                            ", heartRate=" + heartRate +
+                            ", speed=" + speed +
+                            ", stepRate=" + stepRate +
+                            ", cadence=" + cadence +
+                            ", stepLength=" + stepLength +
+                            ", groundContactTime=" + groundContactTime +
+                            ", impact=" + impact +
+                            ", swingAngle=" + swingAngle +
+                            ", foreFootLanding=" + foreFootLanding +
+                            ", midFootLanding=" + midFootLanding +
+                            ", backFootLanding=" + backFootLanding +
+                            ", eversionAngle=" + eversionAngle +
+                            ", swolf=" + swolf +
+                            ", strokeRate=" + strokeRate +
+                            ", timestamp=" + timestamp +
+                            '}';
+                }
+            }
+
+            // TODO: I'm not sure about the lengths
+            private final byte[] bitmapLengths = {1, 2, 1, 2, 2, 4, -1, 2, 2, 1, 1, 1, 1, 1, 1, 1};
+            private final byte[] innerBitmapLengths = {2, 2, 2, 1, 2, 1, 1, 1, 1, 2, 2, 1, 1, 1, 1, 1};
+
+            public short workoutNumber;
+            public short dataNumber;
+            public byte[] rawHeader;
+            public byte[] rawData;
+            public short innerBitmap;
+
+            public Header header;
+            public List<Data> dataList;
+
+            public Response(ParamsProvider paramsProvider) {
+                super(paramsProvider);
+            }
+
+            /**
+             * This is to be able to easily reparse the error data, only accepts tlv bytes
+             * @param rawData The TLV bytes
+             */
+            public Response(byte[] rawData) throws ParseException {
+                super(null);
+                this.tlv = new HuaweiTLV().parse(rawData);
+                this.parseTlv();
+            }
+
+            @Override
+            public void parseTlv() throws ParseException {
+                if (!this.tlv.contains(0x81))
+                    throw new MissingTagException(0x81);
+
+                HuaweiTLV container = this.tlv.getObject(0x81);
+
+                if (!container.contains(0x02))
+                    throw new MissingTagException(0x02);
+                if (!container.contains(0x03))
+                    throw new MissingTagException(0x03);
+                if (!container.contains(0x04))
+                    throw new MissingTagException(0x04);
+                if (!container.contains(0x05))
+                    throw new MissingTagException(0x05); // TODO: not sure if 5 can also be omitted
+
+                this.workoutNumber = container.getShort(0x02);
+                this.dataNumber = container.getShort(0x03);
+                this.rawHeader = container.getBytes(0x04);
+                this.rawData = container.getBytes(0x05);
+
+                if (container.contains(0x09))
+                    innerBitmap = container.getShort(0x09);
+                else
+                    innerBitmap = 0x01FF; // This seems to be the default
+
+                int innerDataLength = 0;
+                for (byte i = 0; i < 16; i++) {
+                    if ((innerBitmap & (1 << i)) != 0) {
+                        innerDataLength += innerBitmapLengths[i];
+                    }
+                }
+
+                if (this.rawHeader.length != 14)
+                    throw new LengthMismatchException("Workout data header length mismatch.");
+
+                this.header = new Header();
+                ByteBuffer buf = ByteBuffer.wrap(this.rawHeader);
+                header.workoutNumber = buf.getShort();
+                header.dataNumber = buf.getShort();
+                header.timestamp = buf.getInt();
+                header.interval = buf.get();
+                header.dataCount = buf.getShort();
+                header.dataLength = buf.get();
+                header.bitmap = buf.getShort();
+
+                // Check data lengths from header
+                if (this.header.dataCount * this.header.dataLength != this.rawData.length)
+                    throw new LengthMismatchException("Workout data length mismatch with header.");
+
+                // Check data lengths from bitmap
+                int dataLength = 0;
+                for (byte i = 0; i < 16; i++) {
+                    if ((header.bitmap & (1 << i)) != 0) {
+                        if (i == 6) {
+                            dataLength += innerDataLength;
+                        } else {
+                            dataLength += bitmapLengths[i];
+                        }
+                    }
+                }
+                dataLength = dataLength * header.dataCount;
+                if (dataLength != this.rawData.length)
+                    throw new LengthMismatchException("Workout data length mismatch with bitmap.");
+
+                this.dataList = new ArrayList<>();
+                buf = ByteBuffer.wrap(this.rawData);
+                for (short i = 0; i < header.dataCount; i++) {
+                    Data data = new Data();
+                    data.timestamp = header.timestamp + header.interval * i;
+                    for (byte j = 0; j < 16; j++) {
+                        if ((header.bitmap & (1 << j)) != 0) {
+                            switch (j) {
+                                case 0:
+                                    data.heartRate = buf.get();
+                                    break;
+                                case 1:
+                                    data.speed = buf.getShort();
+                                    break;
+                                case 2:
+                                    data.stepRate = buf.get();
+                                    break;
+                                case 3:
+                                    data.swolf = buf.get();
+                                    break;
+                                case 4:
+                                    data.strokeRate = buf.getShort();
+                                    break;
+                                case 6:
+                                    // Inner data, parsing into data
+                                    // TODO: function for readability?
+                                    for (byte k = 0; k < 16; k++) {
+                                        if ((innerBitmap & (1 << k)) != 0) {
+                                            switch (k) {
+                                                case 0:
+                                                    data.cadence = buf.getShort();
+                                                    break;
+                                                case 1:
+                                                    data.stepLength = buf.getShort();
+                                                    break;
+                                                case 2:
+                                                    data.groundContactTime = buf.getShort();
+                                                    break;
+                                                case 3:
+                                                    data.impact = buf.get();
+                                                    break;
+                                                case 4:
+                                                    data.swingAngle = buf.getShort();
+                                                    break;
+                                                case 5:
+                                                    data.foreFootLanding = buf.get();
+                                                    break;
+                                                case 6:
+                                                    data.midFootLanding = buf.get();
+                                                    break;
+                                                case 7:
+                                                    data.backFootLanding = buf.get();
+                                                    break;
+                                                case 8:
+                                                    data.eversionAngle = buf.get();
+                                                    break;
+                                                default:
+                                                    data.unknownData = this.tlv.serialize();
+                                                    // Fix alignment
+                                                    for (int l = 0; l < innerBitmapLengths[k]; l++)
+                                                        buf.get();
+                                                    break;
+                                            }
+                                        }
+                                    }
+                                    break;
+                                default:
+                                    data.unknownData = this.tlv.serialize();
+                                    // Fix alignment
+                                    for (int k = 0; k < bitmapLengths[j]; k++)
+                                        buf.get();
+                                    break;
+                            }
+                        }
+                    }
+                    this.dataList.add(data);
+                }
+            }
+        }
+    }
+
+    public static class WorkoutPace {
+        public static final int id = 0x0c;
+
+        public static class Request extends HuaweiPacket {
+
+            public Request(
+                    ParamsProvider paramsProvider,
+                    short workoutNumber,
+                    short paceNumber
+            ) {
+                super(paramsProvider);
+
+                this.serviceId = Workout.id;
+                this.commandId = id;
+
+                this.tlv = new HuaweiTLV().put(0x81, new HuaweiTLV()
+                        .put(0x02, workoutNumber)
+                        .put(0x08, paceNumber)
+                );
+
+                this.complete = true;
+            }
+        }
+
+        public static class Response extends HuaweiPacket {
+            public static class Block {
+                public short distance = -1;
+                public byte type = -1;
+                public int pace = -1;
+                public short correction = 0;
+
+                @Override
+                public String toString() {
+                    return "Block{" +
+                            "distance=" + distance +
+                            ", type=" + type +
+                            ", pace=" + pace +
+                            ", correction=" + correction +
+                            '}';
+                }
+            }
+
+            public short workoutNumber;
+            public short paceNumber;
+            public List<Block> blocks;
+
+            public Response(ParamsProvider paramsProvider) {
+                super(paramsProvider);
+            }
+
+            @Override
+            public void parseTlv() throws ParseException {
+                if (!this.tlv.contains(0x81))
+                    throw new MissingTagException(0x81);
+
+                HuaweiTLV container = this.tlv.getObject(0x81);
+
+                if (!container.contains(0x02))
+                    throw new MissingTagException(0x02);
+                if (!container.contains(0x08))
+                    throw new MissingTagException(0x08);
+                // TODO: not sure what happens with an empty workout here...
+                if (!container.contains(0x83))
+                    throw new MissingTagException(0x83);
+
+                this.workoutNumber = container.getShort(0x02);
+                this.paceNumber = container.getShort(0x08);
+
+                this.blocks = new ArrayList<>();
+                for (HuaweiTLV blockTlv : container.getObjects(0x83)) {
+                    if (!blockTlv.contains(0x04))
+                        throw new MissingTagException(0x04);
+                    if (!blockTlv.contains(0x05))
+                        throw new MissingTagException(0x05);
+                    if (!blockTlv.contains(0x06))
+                        throw new MissingTagException(0x06);
+
+                    Block block = new Block();
+                    block.distance = blockTlv.getShort(0x04);
+                    block.type = blockTlv.getByte(0x05);
+                    block.pace = blockTlv.getInteger(0x06);
+                    if (blockTlv.contains(0x09))
+                        block.correction = blockTlv.getShort(0x09);
+                    blocks.add(block);
+                }
+            }
+        }
+    }
+
+    public static class NotifyHeartRate {
+        public static final int id = 0x17;
+
+        public static class Request extends HuaweiPacket {
+            public Request(ParamsProvider paramsProvider) {
+                super(paramsProvider);
+
+                this.serviceId = Workout.id;
+                this.commandId = id;
+
+                this.tlv = new HuaweiTLV().put(0x01, 0x03);
+
+                this.complete = true;
+            }
+        }
+
+    }
+
+
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
index 7d8a03bb8..acd163f66 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
@@ -98,6 +98,21 @@ import nodomain.freeyourgadget.gadgetbridge.devices.huami.miband5.MiBand5Coordin
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.miband6.MiBand6Coordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.miband7.MiBand7Coordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppe.ZeppECoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.honorband3.HonorBand3Coordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.honorband4.HonorBand4Coordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.honorband5.HonorBand5Coordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.honorband6.HonorBand6Coordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.honorband7.HonorBand7Coordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.huaweiband4pro.HuaweiBand4ProCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.huaweiband6.HuaweiBand6Coordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.huaweiband7.HuaweiBand7Coordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.huaweiband8.HuaweiBand8Coordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.huaweibandaw70.HuaweiBandAw70Coordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.huaweitalkbandb6.HuaweiTalkBandB6Coordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.huaweiwatchgt.HuaweiWatchGTCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.huaweiwatchgt2.HuaweiWatchGT2Coordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.huaweiwatchgt2e.HuaweiWatchGT2eCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.huaweiwatchgt3.HuaweiWatchGT3Coordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.id115.ID115Coordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.itag.ITagCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.jyou.BFH16DeviceCoordinator;
@@ -296,6 +311,21 @@ public enum DeviceType {
     SONY_WH_1000XM5(SonyWH1000XM5Coordinator.class),
     SONY_WF_1000XM5(SonyWF1000XM5Coordinator.class),
     BOSE_QC35(QC35Coordinator.class),
+    HONORBAND3(HonorBand3Coordinator.class),
+    HONORBAND4(HonorBand4Coordinator.class),
+    HONORBAND5(HonorBand5Coordinator.class),
+    HUAWEIBANDAW70(HuaweiBandAw70Coordinator.class),
+    HUAWEIBAND6(HuaweiBand6Coordinator.class),
+    HUAWEIWATCHGT(HuaweiWatchGTCoordinator.class),
+    HUAWEIBAND4PRO(HuaweiBand4ProCoordinator.class),
+    HUAWEIWATCHGT2(HuaweiWatchGT2Coordinator.class),
+    HUAWEIWATCHGT2E(HuaweiWatchGT2eCoordinator.class),
+    HUAWEITALKBANDB6(HuaweiTalkBandB6Coordinator.class),
+    HUAWEIBAND7(HuaweiBand7Coordinator.class),
+    HONORBAND6(HonorBand6Coordinator.class),
+    HONORBAND7(HonorBand7Coordinator.class),
+    HUAWEIWATCHGT3(HuaweiWatchGT3Coordinator.class),
+    HUAWEIBAND8(HuaweiBand8Coordinator.class),
     VESC(VescCoordinator.class),
     BINARY_SENSOR(BinarySensorCoordinator.class),
     FLIPPER_ZERO(FlipperZeroCoordinator.class),
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/AbstractBTBRDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/AbstractBTBRDeviceSupport.java
index 7cc0e260c..282f3525a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/AbstractBTBRDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/AbstractBTBRDeviceSupport.java
@@ -140,6 +140,9 @@ public abstract class AbstractBTBRDeviceSupport extends AbstractDeviceSupport im
        initializeDevice(createTransactionBuilder("Initializing device")).queue(getQueue());
     }
 
+    @Override
+    public void onFindPhone(boolean start) {}
+
     @Override
     public void onSetFmFrequency(float frequency) {}
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/AsynchronousResponse.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/AsynchronousResponse.java
new file mode 100644
index 000000000..3ef607468
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/AsynchronousResponse.java
@@ -0,0 +1,378 @@
+/*  Copyright (C) 2022-2023 Martin.JM
+    Copyright (C) 2022-2023 Gaignon Damien
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.media.AudioManager;
+import android.os.Build;
+import android.os.Handler;
+import android.widget.Toast;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.LocalTime;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
+import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventCallControl;
+import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventFindPhone;
+import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventMusicControl;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.Calls;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.DeviceConfig;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.FindPhone;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.Menstrual;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.MusicControl;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.Request;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.GetPhoneInfoRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.SendMenstrualModifyTimeRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.SetMusicStatusRequest;
+import nodomain.freeyourgadget.gadgetbridge.util.GB;
+
+/**
+ * Handles responses that are not a reply to a request
+ *
+ */
+public class AsynchronousResponse {
+    private static final Logger LOG = LoggerFactory.getLogger(AsynchronousResponse.class);
+
+    private final HuaweiSupportProvider support;
+    private final Handler mFindPhoneHandler = new Handler();
+    private final static HashMap<Integer, String> dayOfWeekMap = new HashMap<>();
+    static {
+        dayOfWeekMap.put(Calendar.MONDAY, DeviceSettingsPreferenceConst.PREF_DO_NOT_DISTURB_MO);
+        dayOfWeekMap.put(Calendar.TUESDAY, DeviceSettingsPreferenceConst.PREF_DO_NOT_DISTURB_TU);
+        dayOfWeekMap.put(Calendar.WEDNESDAY, DeviceSettingsPreferenceConst.PREF_DO_NOT_DISTURB_WE);
+        dayOfWeekMap.put(Calendar.THURSDAY, DeviceSettingsPreferenceConst.PREF_DO_NOT_DISTURB_TH);
+        dayOfWeekMap.put(Calendar.FRIDAY, DeviceSettingsPreferenceConst.PREF_DO_NOT_DISTURB_FR);
+        dayOfWeekMap.put(Calendar.SATURDAY, DeviceSettingsPreferenceConst.PREF_DO_NOT_DISTURB_SA);
+        dayOfWeekMap.put(Calendar.SUNDAY, DeviceSettingsPreferenceConst.PREF_DO_NOT_DISTURB_SU);
+    }
+
+    public AsynchronousResponse(HuaweiSupportProvider support) {
+        this.support = support;
+    }
+
+    public void handleResponse(HuaweiPacket response) {
+        try {
+            response.parseTlv();
+        } catch (HuaweiPacket.ParseException e) {
+            LOG.error("Parse TLV exception", e);
+            return;
+        }
+
+        try {
+            handleFindPhone(response);
+            handleMusicControls(response);
+            handleCallControls(response);
+            handlePhoneInfo(response);
+            handleMenstrualModifyTime(response);
+        } catch (Request.ResponseParseException e) {
+            LOG.error("Response parse exception", e);
+        }
+    }
+
+    private void handleFindPhone(HuaweiPacket response) throws Request.ResponseParseException {
+        if (response.serviceId == FindPhone.id && response.commandId == FindPhone.Response.id) {
+            if (!(response instanceof FindPhone.Response))
+                throw new Request.ResponseTypeMismatchException(response, FindPhone.Response.class);
+
+            SharedPreferences sharedPreferences = GBApplication.getDeviceSpecificSharedPrefs(support.getDeviceMac());
+
+            String findPhone = sharedPreferences.getString(DeviceSettingsPreferenceConst.PREF_FIND_PHONE, support.getContext().getString(R.string.p_off));
+
+            if (findPhone.equals(support.getContext().getString(R.string.p_off))) {
+                LOG.debug("Find phone command received, but it is disabled");
+                // TODO: hide applet on device
+                return;
+            }
+
+            if (sharedPreferences.getBoolean("disable_find_phone_with_dnd", false) && dndActive()) {
+                LOG.debug("Find phone command received, ringing prevented because of DND");
+                // TODO: stop the band from showing as ringing
+                return;
+            }
+
+            if (!findPhone.equals(support.getContext().getString(R.string.p_on))) {
+                // Duration set, stop after specified time
+                String strDuration = sharedPreferences.getString(DeviceSettingsPreferenceConst.PREF_FIND_PHONE_DURATION, "0");
+
+                int duration = Integer.parseInt(strDuration);
+                if (duration > 0) {
+                    mFindPhoneHandler.postDelayed(new Runnable() {
+                        @Override
+                        public void run() {
+                            GBDeviceEventFindPhone findPhoneEvent = new GBDeviceEventFindPhone();
+                            findPhoneEvent.event = GBDeviceEventFindPhone.Event.STOP;
+                            support.evaluateGBDeviceEvent(findPhoneEvent);
+
+                            // TODO: stop the band from showing as ringing
+                        }
+                    }, duration * 1000L);
+                }
+            }
+
+            GBDeviceEventFindPhone findPhoneEvent = new GBDeviceEventFindPhone();
+            if (((FindPhone.Response) response).start)
+                findPhoneEvent.event = GBDeviceEventFindPhone.Event.START;
+            else
+                findPhoneEvent.event = GBDeviceEventFindPhone.Event.STOP;
+            support.evaluateGBDeviceEvent(findPhoneEvent);
+        }
+    }
+
+    private boolean dndActive() {
+        SharedPreferences sharedPreferences = GBApplication.getDeviceSpecificSharedPrefs(support.getDeviceMac());
+
+        String dndSwitch = sharedPreferences.getString(DeviceSettingsPreferenceConst.PREF_DO_NOT_DISTURB, "off");
+        if (dndSwitch.equals(DeviceSettingsPreferenceConst.PREF_DO_NOT_DISTURB_OFF))
+            return false;
+
+        String startStr = sharedPreferences.getString(DeviceSettingsPreferenceConst.PREF_DO_NOT_DISTURB_START, "00:00");
+        if (dndSwitch.equals("automatic")) startStr = "00:00";
+        String endStr = sharedPreferences.getString(DeviceSettingsPreferenceConst.PREF_DO_NOT_DISTURB_END, "23:59");
+        if (dndSwitch.equals("automatic")) endStr = "23:59";
+
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
+            LocalTime currentTime = LocalTime.now();
+            LocalTime start = LocalTime.parse(startStr);
+            LocalTime end = LocalTime.parse(endStr);
+
+            if (start.isAfter(currentTime))
+                return false;
+            if (end.isBefore(currentTime))
+                return false;
+        } else {
+            @SuppressLint("SimpleDateFormat") SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm");
+            try {
+                Date currentTime = dateFormat.parse(String.format(GBApplication.getLanguage(), "%d:%d",
+                        Calendar.getInstance().get(Calendar.HOUR_OF_DAY),
+                        Calendar.getInstance().get(Calendar.MINUTE)));
+                Date start = dateFormat.parse(startStr);
+                Date end = dateFormat.parse(endStr);
+
+                assert start != null;
+                if (start.after(currentTime))
+                    return false;
+                assert end != null;
+                if (end.before(currentTime))
+                    return false;
+            } catch (ParseException e) {
+                LOG.error("Parse exception for DnD", e);
+            }
+        }
+
+        Calendar date = Calendar.getInstance();
+        String preferenceString = dayOfWeekMap.get(date.get(Calendar.DAY_OF_WEEK));
+
+        return sharedPreferences.getBoolean(preferenceString, true);
+    }
+
+    /**
+     * Handles asynchronous music packet, for the following events:
+     *  - The app is opened on the band (sends back music info)
+     *  - A button is clicked
+     *    - Play
+     *    - Pause
+     *    - Previous
+     *    - Next
+     *  - The volume is adjusted
+     * @param response Packet to be handled
+     */
+    private void handleMusicControls(HuaweiPacket response) throws Request.ResponseParseException {
+        if (response.serviceId == MusicControl.id) {
+            AudioManager audioManager = (AudioManager) this.support.getContext().getSystemService(Context.AUDIO_SERVICE);
+
+            if (response.commandId == MusicControl.MusicStatusResponse.id) {
+                if (!(response instanceof MusicControl.MusicStatusResponse))
+                    throw new Request.ResponseTypeMismatchException(response, MusicControl.MusicStatusResponse.class);
+
+                MusicControl.MusicStatusResponse resp = (MusicControl.MusicStatusResponse) response;
+                if (resp.status != -1 && resp.status != 0x000186A0) {
+                    LOG.warn("Music information error, will stop here: " + Integer.toHexString(resp.status));
+                    return;
+                }
+
+                LOG.debug("Music information requested, sending acknowledgement and music info.");
+                SetMusicStatusRequest setMusicStatusRequest = new SetMusicStatusRequest(this.support, MusicControl.MusicStatusResponse.id, MusicControl.successValue);
+                try {
+                    setMusicStatusRequest.doPerform();
+                } catch (IOException e) {
+                    GB.toast("Failed to send music status request", Toast.LENGTH_SHORT, GB.ERROR, e);
+                    LOG.error("Failed to send music status request (1)", e);
+                }
+                // Send Music Info
+                this.support.sendSetMusic();
+            } else if (response.commandId == MusicControl.Control.id) {
+                if (!(response instanceof MusicControl.Control.Response))
+                    throw new Request.ResponseTypeMismatchException(response, MusicControl.Control.Response.class);
+
+                MusicControl.Control.Response resp = (MusicControl.Control.Response) response;
+
+                if (resp.buttonPresent) {
+                    if (resp.button != MusicControl.Control.Response.Button.Unknown) {
+                        GBDeviceEventMusicControl musicControl = new GBDeviceEventMusicControl();
+                        switch (resp.button) {
+                            case Play:
+                                LOG.debug("Music - Play button event received");
+                                musicControl.event = GBDeviceEventMusicControl.Event.PLAY;
+                                break;
+                            case Pause:
+                                LOG.debug("Music - Pause button event received");
+                                musicControl.event = GBDeviceEventMusicControl.Event.PAUSE;
+                                break;
+                            case Previous:
+                                LOG.debug("Music - Previous button event received");
+                                musicControl.event = GBDeviceEventMusicControl.Event.PREVIOUS;
+                                break;
+                            case Next:
+                                LOG.debug("Music - Next button event received");
+                                musicControl.event = GBDeviceEventMusicControl.Event.NEXT;
+                                break;
+                            case Volume_up:
+                                LOG.debug("Music - Volume up button event received");
+                                musicControl.event = GBDeviceEventMusicControl.Event.VOLUMEUP;
+                                break;
+                            case Volume_down:
+                                LOG.debug("Music - Volume down button event received");
+                                musicControl.event = GBDeviceEventMusicControl.Event.VOLUMEDOWN;
+                                break;
+                            default:
+                        }
+                        this.support.evaluateGBDeviceEvent(musicControl);
+                    }
+                }
+                if (resp.volumePresent) {
+                    byte volume = resp.volume;
+                    if (volume > audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC)) {
+                        LOG.warn("Music - Received volume is too high: 0x"
+                                + Integer.toHexString(volume)
+                                + " > 0x"
+                                + Integer.toHexString(audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC))
+                        );
+                        // TODO: probably best to send back an error code, though I wouldn't know which
+                        return;
+                    }
+                    if (Build.VERSION.SDK_INT > 28) {
+                        if (volume < audioManager.getStreamMinVolume(AudioManager.STREAM_MUSIC)) {
+                            LOG.warn("Music - Received volume is too low: 0x"
+                                    + Integer.toHexString(volume)
+                                    + " < 0x"
+                                    + audioManager.getStreamMinVolume(AudioManager.STREAM_MUSIC)
+                            );
+                            // TODO: probably best to send back an error code, though I wouldn't know which
+                            return;
+                        }
+                    }
+                    LOG.debug("Music - Setting volume to: 0x" + Integer.toHexString(volume));
+                    audioManager.setStreamVolume(AudioManager.STREAM_MUSIC, volume, 0);
+                }
+
+                if (resp.buttonPresent || resp.volumePresent) {
+                    SetMusicStatusRequest setMusicStatusRequest = new SetMusicStatusRequest(this.support, MusicControl.Control.id, MusicControl.successValue);
+                    try {
+                        setMusicStatusRequest.doPerform();
+                    } catch (IOException e) {
+                        GB.toast("Failed to send music status request", Toast.LENGTH_SHORT, GB.ERROR, e);
+                        LOG.error("Failed to send music status request (2)", e);
+                    }
+                }
+            }
+        }
+    }
+
+    private void handleCallControls(HuaweiPacket response) throws Request.ResponseParseException {
+        if (response.serviceId == Calls.id && response.commandId == Calls.AnswerCallResponse.id) {
+            if (!(response instanceof Calls.AnswerCallResponse))
+                throw new Request.ResponseTypeMismatchException(response, Calls.AnswerCallResponse.class);
+
+            SharedPreferences prefs = GBApplication.getDeviceSpecificSharedPrefs(support.getDevice().getAddress());
+
+            GBDeviceEventCallControl callControlEvent = new GBDeviceEventCallControl();
+            switch (((Calls.AnswerCallResponse) response).action) {
+                case UNKNOWN:
+                    LOG.info("Unknown action for call");
+                    return;
+                case CALL_ACCEPT:
+                    callControlEvent.event = GBDeviceEventCallControl.Event.ACCEPT;
+                    LOG.info("Accepted call");
+
+                    if (!prefs.getBoolean("enable_call_accept", true)) {
+                        LOG.info("Disabled accepting calls, ignoring");
+                        return;
+                    }
+
+                    break;
+                case CALL_REJECT:
+                    callControlEvent.event = GBDeviceEventCallControl.Event.REJECT;
+                    LOG.info("Rejected call");
+
+                    if (!prefs.getBoolean("enable_call_reject", true)) {
+                        LOG.info("Disabled rejecting calls, ignoring");
+                        return;
+                    }
+
+                    break;
+            }
+            support.evaluateGBDeviceEvent(callControlEvent);
+        }
+    }
+
+    private void handlePhoneInfo(HuaweiPacket response) {
+        if (response.serviceId == DeviceConfig.id && response.commandId == DeviceConfig.PhoneInfo.id) {
+            if (!(response instanceof DeviceConfig.PhoneInfo.Response)) {
+                // TODO: exception
+                return;
+            }
+            DeviceConfig.PhoneInfo.Response phoneInfoResp = (DeviceConfig.PhoneInfo.Response) response;
+            GetPhoneInfoRequest getPhoneInfoReq = new GetPhoneInfoRequest(this.support, phoneInfoResp.info);
+            try {
+                getPhoneInfoReq.doPerform();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    private void handleMenstrualModifyTime(HuaweiPacket response) {
+        if (response.serviceId == Menstrual.id && response.commandId == Menstrual.ModifyTime.id) {
+            if (!(response instanceof Menstrual.ModifyTime.Response)) {
+                // TODO: exception
+                return;
+            }
+            //Menstrual.ModifyTime.Response menstrualModifyTimeResp = (Menstrual.ModifyTime.Response) response;
+            SendMenstrualModifyTimeRequest sendMenstrualModifyTimeReq = new SendMenstrualModifyTimeRequest(this.support);
+            try {
+                sendMenstrualModifyTimeReq.doPerform();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+
+        }
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiBRSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiBRSupport.java
new file mode 100644
index 000000000..c5d2e61a3
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiBRSupport.java
@@ -0,0 +1,121 @@
+/*  Copyright (C) 2021-2023 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import java.util.ArrayList;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants;
+import nodomain.freeyourgadget.gadgetbridge.model.CallSpec;
+import nodomain.freeyourgadget.gadgetbridge.model.MusicSpec;
+import nodomain.freeyourgadget.gadgetbridge.model.MusicStateSpec;
+import nodomain.freeyourgadget.gadgetbridge.model.NotificationSpec;
+import nodomain.freeyourgadget.gadgetbridge.service.btbr.AbstractBTBRDeviceSupport;
+import nodomain.freeyourgadget.gadgetbridge.service.btbr.TransactionBuilder;
+
+public class HuaweiBRSupport extends AbstractBTBRDeviceSupport {
+    private static final Logger LOG = LoggerFactory.getLogger(HuaweiBRSupport.class);
+
+    private final HuaweiSupportProvider supportProvider;
+
+    public HuaweiBRSupport() {
+        super(LOG);
+        addSupportedService(HuaweiConstants.UUID_SERVICE_HUAWEI_SDP);
+        setBufferSize(1032);
+        supportProvider = new HuaweiSupportProvider(this);
+
+    }
+
+    @Override
+    protected TransactionBuilder initializeDevice(TransactionBuilder builder) {
+        return supportProvider.initializeDevice(builder);
+    }
+
+    @Override
+    public boolean connectFirstTime() {
+        supportProvider.setNeedsAuth(true);
+        return connect();
+    }
+
+    @Override
+    public void onSocketRead(byte[] data) {
+        supportProvider.onSocketRead(data);
+    }
+
+    @Override
+    public boolean useAutoConnect() {
+        return true;
+    }
+
+    @Override
+    public void onSendConfiguration(String config) {
+        supportProvider.onSendConfiguration(config);
+    }
+
+    @Override
+    public void onFetchRecordedData(int dataTypes) {
+        supportProvider.onFetchRecordedData(dataTypes);
+    }
+
+    @Override
+    public void onReset(int flags) {
+        supportProvider.onReset(flags);
+    }
+
+    @Override
+    public void onNotification(NotificationSpec notificationSpec) {
+        supportProvider.onNotification(notificationSpec);
+    }
+
+    @Override
+    public void onSetTime() {
+        supportProvider.onSetTime();
+    }
+
+    @Override
+    public void onSetAlarms(ArrayList<? extends nodomain.freeyourgadget.gadgetbridge.model.Alarm> alarms) {
+        supportProvider.onSetAlarms(alarms);
+    }
+
+    @Override
+    public void onSetCallState(CallSpec callSpec) {
+        supportProvider.onSetCallState(callSpec);
+    }
+
+    @Override
+    public void onSetMusicState(MusicStateSpec stateSpec) {
+        supportProvider.onSetMusicState(stateSpec);
+    }
+
+    @Override
+    public void onSetMusicInfo(MusicSpec musicSpec) {
+        supportProvider.onSetMusicInfo(musicSpec);
+    }
+
+    @Override
+    public void onSetPhoneVolume(float volume) {
+        supportProvider.onSetPhoneVolume();
+    }
+
+    @Override
+    public void onFindPhone(boolean start) {
+        if (!start)
+            supportProvider.onStopFindPhone();
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiLESupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiLESupport.java
new file mode 100644
index 000000000..dad482e32
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiLESupport.java
@@ -0,0 +1,129 @@
+/*  Copyright (C) 2021-2023 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei;
+
+import android.bluetooth.BluetoothGatt;
+import android.bluetooth.BluetoothGattCharacteristic;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants;
+import nodomain.freeyourgadget.gadgetbridge.model.CallSpec;
+import nodomain.freeyourgadget.gadgetbridge.model.MusicSpec;
+import nodomain.freeyourgadget.gadgetbridge.model.MusicStateSpec;
+import nodomain.freeyourgadget.gadgetbridge.model.NotificationSpec;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.GattService;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.AbstractBTLEDeviceSupport;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
+
+public class HuaweiLESupport extends AbstractBTLEDeviceSupport {
+    private static final Logger LOG = LoggerFactory.getLogger(HuaweiLESupport.class);
+
+    private final HuaweiSupportProvider supportProvider;
+
+    public HuaweiLESupport() {
+        super(LOG);
+        addSupportedService(GattService.UUID_SERVICE_GENERIC_ACCESS);
+        addSupportedService(GattService.UUID_SERVICE_GENERIC_ATTRIBUTE);
+        addSupportedService(GattService.UUID_SERVICE_DEVICE_INFORMATION);
+        addSupportedService(GattService.UUID_SERVICE_HUMAN_INTERFACE_DEVICE);
+        addSupportedService(HuaweiConstants.UUID_SERVICE_HUAWEI_SERVICE);
+        supportProvider = new HuaweiSupportProvider(this);
+    }
+
+    @Override
+    protected TransactionBuilder initializeDevice(TransactionBuilder builder) {
+        return supportProvider.initializeDevice(builder);
+    }
+
+    @Override
+    public boolean connectFirstTime() {
+        supportProvider.setNeedsAuth(true);
+        return connect();
+    }
+
+    @Override
+    public boolean onCharacteristicChanged(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic) {
+        supportProvider.onCharacteristicChanged(characteristic);
+        return true;
+    }
+
+    @Override
+    public boolean useAutoConnect() {
+        return true;
+    }
+
+    @Override
+    public void onSendConfiguration(String config) {
+        supportProvider.onSendConfiguration(config);
+    }
+
+    @Override
+    public void onFetchRecordedData(int dataTypes) {
+        supportProvider.onFetchRecordedData(dataTypes);
+    }
+
+    @Override
+    public void onReset(int flags) {
+        supportProvider.onReset(flags);
+    }
+
+    @Override
+    public void onNotification(NotificationSpec notificationSpec) {
+        supportProvider.onNotification(notificationSpec);
+    }
+
+    @Override
+    public void onSetTime() {
+        supportProvider.onSetTime();
+    }
+
+    @Override
+    public void onSetAlarms(ArrayList<? extends nodomain.freeyourgadget.gadgetbridge.model.Alarm> alarms) {
+        supportProvider.onSetAlarms(alarms);
+    }
+
+    @Override
+    public void onSetCallState(CallSpec callSpec) {
+        supportProvider.onSetCallState(callSpec);
+    }
+
+    @Override
+    public void onSetMusicState(MusicStateSpec stateSpec) {
+        supportProvider.onSetMusicState(stateSpec);
+    }
+
+    @Override
+    public void onSetMusicInfo(MusicSpec musicSpec) {
+        supportProvider.onSetMusicInfo(musicSpec);
+    }
+
+    @Override
+    public void onSetPhoneVolume(float volume) {
+        supportProvider.onSetPhoneVolume();
+    }
+
+    @Override
+    public void onFindPhone(boolean start) {
+        if (!start)
+            supportProvider.onStopFindPhone();
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiSupportProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiSupportProvider.java
new file mode 100644
index 000000000..443129cd2
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiSupportProvider.java
@@ -0,0 +1,1636 @@
+/*  Copyright (C) 2022-2023 Martin.JM
+    Copyright (C) 2023 Gaignon Damien
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei;
+
+import android.bluetooth.BluetoothGattCharacteristic;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+import java.util.UUID;
+
+import de.greenrobot.dao.query.QueryBuilder;
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.activities.SettingsActivity;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
+import nodomain.freeyourgadget.gadgetbridge.database.DBHandler;
+import nodomain.freeyourgadget.gadgetbridge.database.DBHelper;
+import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEvent;
+import nodomain.freeyourgadget.gadgetbridge.devices.DeviceCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiCoordinatorSupplier;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiCoordinatorSupplier.HuaweiDeviceType;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiCrypto;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiSampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.Workout;
+import nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst;
+import nodomain.freeyourgadget.gadgetbridge.entities.BaseActivitySummary;
+import nodomain.freeyourgadget.gadgetbridge.entities.BaseActivitySummaryDao;
+import nodomain.freeyourgadget.gadgetbridge.entities.HuaweiActivitySample;
+import nodomain.freeyourgadget.gadgetbridge.entities.HuaweiWorkoutDataSample;
+import nodomain.freeyourgadget.gadgetbridge.entities.HuaweiWorkoutDataSampleDao;
+import nodomain.freeyourgadget.gadgetbridge.entities.HuaweiWorkoutPaceSample;
+import nodomain.freeyourgadget.gadgetbridge.entities.HuaweiWorkoutPaceSampleDao;
+import nodomain.freeyourgadget.gadgetbridge.entities.HuaweiWorkoutSummarySample;
+import nodomain.freeyourgadget.gadgetbridge.entities.HuaweiWorkoutSummarySampleDao;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.entities.Alarm;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.entities.Device;
+import nodomain.freeyourgadget.gadgetbridge.entities.User;
+import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
+import nodomain.freeyourgadget.gadgetbridge.model.ActivityUser;
+import nodomain.freeyourgadget.gadgetbridge.model.CallSpec;
+import nodomain.freeyourgadget.gadgetbridge.model.MusicSpec;
+import nodomain.freeyourgadget.gadgetbridge.model.MusicStateSpec;
+import nodomain.freeyourgadget.gadgetbridge.model.NotificationSpec;
+import nodomain.freeyourgadget.gadgetbridge.model.RecordedDataTypes;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.GetEventAlarmList;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.GetNotificationConstraintsRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.GetSmartAlarmList;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.SendNotifyHeartRateCapabilityRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.SendNotifyRestHeartRateCapabilityRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.SetAutomaticHeartrateRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.SetAutomaticSpoRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.SetDisconnectNotification;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.SetMediumToStrengthThresholdRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.StopFindPhoneRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.StopNotificationRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.GetFitnessTotalsRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.GetHiChainRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.GetSleepDataCountRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.GetStepDataCountRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.GetWorkoutCountRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.SendNotificationRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.SetMusicRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.AlarmsRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.DebugRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.GetActivityTypeRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.Request;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.SendAccountRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.Request.RequestCallback;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.GetAuthRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.GetBatteryLevelRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.GetBondParamsRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.GetBondRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.GetConnectStatusRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.GetDeviceStatusRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.GetDndLiftWristTypeRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.GetExpandCapabilityRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.GetLinkParamsRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.GetPincodeRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.GetProductInformationRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.GetSecurityNegotiationRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.GetSettingRelatedRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.GetSupportedServicesRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.GetWearStatusRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.SendDndAddRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.SendFactoryResetRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.SendFitnessGoalRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.SendMenstrualCapabilityRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.SendDndDeleteRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.SendSetUpDeviceStatusRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.SetActivateOnLiftRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.SetActivityReminderRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.SetDateFormatRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.SetLanguageSettingRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.SetNotificationRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.SetNavigateOnRotateRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.SetTimeRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.SetTimeZoneIdRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.SetTruSleepRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.SetWearLocationRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.SetWearMessagePushRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.GetNotificationCapabilitiesRequest;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.FitnessData;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.SetWorkModeRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.serial.GBDeviceProtocol;
+import nodomain.freeyourgadget.gadgetbridge.util.GB;
+import nodomain.freeyourgadget.gadgetbridge.util.StringUtils;
+
+public class HuaweiSupportProvider {
+    private static final Logger LOG = LoggerFactory.getLogger(HuaweiSupportProvider.class);
+
+    private HuaweiBRSupport brSupport;
+    private HuaweiLESupport leSupport;
+
+    private GBDevice gbDevice;
+    private Context context;
+    private HuaweiCoordinatorSupplier.HuaweiDeviceType huaweiType;
+
+    private boolean needsAuth = false;
+    protected byte protocolVersion;
+    public String deviceMac; //get it from GB
+    protected String macAddress;
+    protected String androidID;
+    protected short msgId = 0;
+
+    private MusicStateSpec musicStateSpec = null;
+    private MusicSpec musicSpec = null;
+
+    private final HuaweiPacket.ParamsProvider paramsProvider = new HuaweiPacket.ParamsProvider();
+
+    protected ResponseManager responseManager = new ResponseManager(this);
+
+    public HuaweiCoordinatorSupplier getCoordinator() {
+        return ((HuaweiCoordinatorSupplier) this.gbDevice.getDeviceCoordinator());
+    }
+
+    public HuaweiCoordinator getHuaweiCoordinator() {
+        return getCoordinator().getHuaweiCoordinator();
+    }
+
+    public HuaweiSupportProvider(HuaweiBRSupport support) {
+        this.brSupport = support;
+    }
+
+    public HuaweiSupportProvider(HuaweiLESupport support) {
+        this.leSupport = support;
+    }
+
+    public boolean isBLE() {
+        return huaweiType == HuaweiDeviceType.AW || huaweiType == HuaweiDeviceType.BLE || huaweiType == HuaweiDeviceType.SMART;
+    }
+
+    public nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder createLeTransactionBuilder(String taskName) {
+        return leSupport.createTransactionBuilder(taskName);
+    }
+
+    public nodomain.freeyourgadget.gadgetbridge.service.btbr.TransactionBuilder createBrTransactionBuilder(String taskName) {
+        return brSupport.createTransactionBuilder(taskName);
+    }
+
+    public BluetoothGattCharacteristic getLeCharacteristic(UUID uuid) {
+        return leSupport.getCharacteristic(uuid);
+    }
+
+    public void performConnected(nodomain.freeyourgadget.gadgetbridge.service.btle.Transaction transaction) throws IOException {
+        leSupport.performConnected(transaction);
+    }
+
+    public void performConnected(nodomain.freeyourgadget.gadgetbridge.service.btbr.Transaction transaction) throws IOException {
+        brSupport.performConnected(transaction);
+    }
+
+    public void evaluateGBDeviceEvent(GBDeviceEvent deviceEvent) {
+        if (isBLE()) {
+            leSupport.evaluateGBDeviceEvent(deviceEvent);
+        } else {
+            brSupport.evaluateGBDeviceEvent(deviceEvent);
+        }
+    }
+
+    protected nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder initializeDevice(nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder builder) {
+        this.gbDevice = leSupport.getDevice();
+        this.context = leSupport.getContext();
+        this.huaweiType = getCoordinator().getHuaweiType();
+        this.paramsProvider.setTransactionsCrypted(this.getHuaweiCoordinator().isTransactionCrypted());
+        builder.setCallback(leSupport);
+        builder.notify(leSupport.getCharacteristic(HuaweiConstants.UUID_CHARACTERISTIC_HUAWEI_READ), true);
+        builder.add(new nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetDeviceStateAction(getDevice(), GBDevice.State.AUTHENTICATING, getContext()));
+        final GetLinkParamsRequest linkParamsReq = new GetLinkParamsRequest(this, builder);
+        initializeDevice(linkParamsReq);
+        getCoordinator().setDevice(this.gbDevice);
+        return builder;
+    }
+
+    protected nodomain.freeyourgadget.gadgetbridge.service.btbr.TransactionBuilder initializeDevice(nodomain.freeyourgadget.gadgetbridge.service.btbr.TransactionBuilder builder) {
+        this.gbDevice = brSupport.getDevice();
+        this.context = brSupport.getContext();
+        this.huaweiType = getCoordinator().getHuaweiType();
+        this.paramsProvider.setTransactionsCrypted(this.getHuaweiCoordinator().isTransactionCrypted());
+        builder.setCallback(brSupport);
+        builder.add(new nodomain.freeyourgadget.gadgetbridge.service.btbr.actions.SetDeviceStateAction(getDevice(), GBDevice.State.AUTHENTICATING, getContext()));
+        final GetLinkParamsRequest linkParamsReq = new GetLinkParamsRequest(this, builder);
+        initializeDevice(linkParamsReq);
+        getCoordinator().setDevice(this.gbDevice);
+        return builder;
+    }
+
+    protected void initializeDevice(Request linkParamsReq) {
+        deviceMac = this.gbDevice.getAddress();
+        createRandomMacAddress();
+        createAndroidID();
+        try {
+            RequestCallback finalizeReq = new RequestCallback() {
+                @Override
+                public void call() {
+                    initializeDeviceCheckStatus(linkParamsReq);
+                }
+
+                @Override
+                public void handleException(Request.ResponseParseException e) {
+                    LOG.error("Link params TLV exception", e);
+                }
+            };
+            linkParamsReq.setFinalizeReq(finalizeReq);
+            linkParamsReq.doPerform();
+        } catch (IOException e) {
+            GB.toast(context, "Initialization of authenticating to Huawei device failed", Toast.LENGTH_SHORT, GB.ERROR, e);
+            LOG.error("Initialization of authenticating to Huawei device failed", e);
+        }
+
+        /* This is to have the setting match the default Huawei behaviour */
+        SharedPreferences sharedPrefs = GBApplication.getDeviceSpecificSharedPrefs(getDeviceMac());
+        if (!sharedPrefs.contains(DeviceSettingsPreferenceConst.PREF_DISCONNECTNOTIF_NOSHED)) {
+            sharedPrefs.edit().putBoolean(DeviceSettingsPreferenceConst.PREF_DISCONNECTNOTIF_NOSHED, true).apply();
+        }
+    }
+
+    protected void initializeDeviceCheckStatus(Request linkParamsReq) {
+        try {
+            GetDeviceStatusRequest deviceStatusReq = new GetDeviceStatusRequest(this, true);
+            RequestCallback finalizeReq = new RequestCallback() {
+                @Override
+                public void call() {
+                    int status = (int)deviceStatusReq.status;
+                    if (status == -0x01 || status == 0x00 || status == 0x01) {
+                        initializeDeviceDealHiChain(linkParamsReq);
+                    } else {
+                        initializeDeviceNotify();
+                    }
+                }
+
+                @Override
+                public void handleException(Request.ResponseParseException e) {
+                    LOG.error("Status TLV exception", e);
+                }
+            };
+            if (huaweiType == HuaweiDeviceType.BLE) { //Only BLE known, check later for AW and SMART
+               initializeDeviceDealHiChain(linkParamsReq);
+            } else {
+                deviceStatusReq.setFinalizeReq(finalizeReq);
+                deviceStatusReq.doPerform();
+            }
+        } catch (IOException e) {
+            GB.toast(context, "Status of authenticating to Huawei device failed", Toast.LENGTH_SHORT, GB.ERROR, e);
+            e.printStackTrace();
+        }
+    }
+
+    protected boolean isHiChain() {
+        // In HH
+        // HiChain : 1 || 3
+        // HiChainLite : 2 || 3 || 8
+        // HiChain3 : 4 & API>=23 - API is always >=23
+        // For GB we will consider for authMode
+        // 0 : No HiChain
+        // 1 or 3 : HiChain
+        // 2 or 8 : HiChainLite -> normal mode
+        // 4 : HiChain3
+        byte authMode = paramsProvider.getAuthMode();
+        return authMode == 0x01 || authMode == 0x03 || authMode == 0x04 || isHiChainLite();
+    }
+
+    protected boolean isHiChainLite() {
+        byte authMode = paramsProvider.getAuthMode();
+        return authMode == 0x02;
+    }
+
+    protected boolean isHiChain3(int authType) {
+        return (authType ^ 0x01) == 0x04 || (authType ^ 0x02) == 0x04;
+    }
+
+    protected void initializeDeviceDealHiChain(Request linkParamsReq) {
+        try {
+            if (isHiChain()) {
+                GetSecurityNegotiationRequest securityNegoReq = new GetSecurityNegotiationRequest(this);
+                RequestCallback securityFinalizeReq = new RequestCallback(this) {
+                    @Override
+                    public void call() {
+                        if (securityNegoReq.authType == 0x0186A0 || isHiChain3(securityNegoReq.authType)) {
+                            LOG.debug("HiChain mode");
+                            initializeDeviceHiChainMode(linkParamsReq);
+                        } else if (securityNegoReq.authType == 0x01 || securityNegoReq.authType == 0x02) {
+                            LOG.debug("HiChain Lite mode");
+                            initializeDeviceHiChainLiteMode(linkParamsReq);
+                        }
+                    }
+                };
+                securityNegoReq.setFinalizeReq(securityFinalizeReq);
+                securityNegoReq.doPerform();
+            } else {
+                LOG.debug("Normal mode");
+                initializeDeviceNormalMode(linkParamsReq);
+            }
+        } catch (IOException e) {
+            // TODO: use translatable string
+            GB.toast(context, "init Deal with HiChain of Huawei device failed", Toast.LENGTH_SHORT, GB.ERROR, e);
+            LOG.error("Step of authenticating to Huawei device failed", e);
+        }
+    }
+
+    protected void initializeDeviceNotify() {} //TODO
+
+    RequestCallback configureReq = new RequestCallback() {
+        @Override
+        public void call() {
+            initializeDeviceConfigure();
+        }
+    };
+
+    protected void initializeDeviceHiChainMode(Request linkParamsReq) {
+        try {
+            GetHiChainRequest hiChainReq = new GetHiChainRequest(this, needsAuth);
+            hiChainReq.setFinalizeReq(configureReq);
+            if (((GetLinkParamsRequest)linkParamsReq).bondState == 0x00 || ((GetLinkParamsRequest)linkParamsReq).bondState == 0x02) {
+                GetPincodeRequest pincodeReq = new GetPincodeRequest(this);
+                pincodeReq.nextRequest(hiChainReq);
+                pincodeReq.doPerform();
+            } else
+                hiChainReq.doPerform();
+        } catch (IOException e) {
+            GB.toast(context, "init HiCHain Mode of Huawei device failed", Toast.LENGTH_SHORT, GB.ERROR, e);
+            e.printStackTrace();
+        }
+    }
+
+    protected void initializeDeviceHiChainLiteMode(Request linkParamsReq) {
+        try {
+            createSecretKey();
+            GetAuthRequest authReq = new GetAuthRequest(this, linkParamsReq, true);
+            GetBondParamsRequest bondParamsReq = new GetBondParamsRequest(this);
+            GetBondRequest bondReq = new GetBondRequest(this);
+            authReq.nextRequest(bondParamsReq);
+            bondParamsReq.nextRequest(bondReq);
+            bondParamsReq.setFinalizeReq(configureReq);
+            bondReq.setFinalizeReq(configureReq);
+            if (paramsProvider.getPinCode() == null & paramsProvider.getAuthVersion() != 0x02) {
+                GetPincodeRequest pinCodeReq = new GetPincodeRequest(this);
+                pinCodeReq.nextRequest(authReq);
+                pinCodeReq.doPerform();
+            } else {
+                authReq.doPerform();
+            }
+        } catch (IOException e) {
+            GB.toast(context, "init HiCHainLite Mode Mode of Huawei device failed", Toast.LENGTH_SHORT, GB.ERROR, e);
+            e.printStackTrace();
+        }
+    }
+
+    protected void initializeDeviceNormalMode(Request linkParamsReq) {
+        try {
+            createSecretKey();
+            GetAuthRequest authReq = new GetAuthRequest(this, linkParamsReq);
+            GetBondParamsRequest bondParamsReq = new GetBondParamsRequest(this);
+            GetBondRequest bondReq = new GetBondRequest(this);
+            authReq.nextRequest(bondParamsReq);
+            bondParamsReq.nextRequest(bondReq);
+            bondParamsReq.setFinalizeReq(configureReq);
+            bondReq.setFinalizeReq(configureReq);
+            authReq.doPerform();
+        } catch (IOException e) {
+            GB.toast(context, "init Normal Mode of Huawei device failed", Toast.LENGTH_SHORT, GB.ERROR, e);
+            e.printStackTrace();
+        }
+
+    }
+
+    protected void initializeDeviceConfigure() {
+        nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder leBuilder = null;
+        nodomain.freeyourgadget.gadgetbridge.service.btbr.TransactionBuilder brBuilder = null;
+        if (isBLE()) {
+            leBuilder = createLeTransactionBuilder("Initializing");
+            leBuilder.setCallback(leSupport);
+            leBuilder.notify(leSupport.getCharacteristic(HuaweiConstants.UUID_CHARACTERISTIC_HUAWEI_READ), true);
+            leBuilder.add(new nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetDeviceStateAction(gbDevice, GBDevice.State.INITIALIZING, context));
+        } else {
+            brBuilder = createBrTransactionBuilder("Initializing");
+            brBuilder.setCallback(brSupport);
+            brBuilder.add(new nodomain.freeyourgadget.gadgetbridge.service.btbr.actions.SetDeviceStateAction(gbDevice, GBDevice.State.INITIALIZING, context));
+        }
+        try {
+            GetProductInformationRequest productInformationReq = new GetProductInformationRequest(this);
+            Request setTimeReq = setTime();
+            GetSupportedServicesRequest supportedServicesReq = new GetSupportedServicesRequest(this);
+            productInformationReq.nextRequest(setTimeReq);
+            setTimeReq.nextRequest(supportedServicesReq);
+            productInformationReq.doPerform();
+            if (needsAuth) {
+                // Workaround to enable PREF_HUAWEI_ROTATE_WRIST_TO_SWITCH_INFO preference
+                SharedPreferences sharedPrefs = GBApplication.getDeviceSpecificSharedPrefs(deviceMac);
+                SharedPreferences.Editor editor = sharedPrefs.edit();
+                editor.putString(DeviceSettingsPreferenceConst.PREF_ACTIVATE_DISPLAY_ON_LIFT, "p_on");
+                editor.apply();
+//                initializeAlarms();
+                setNavigateOnRotate();
+                setTrusleep();
+            }
+            onSetTime();
+            getBatteryLevel();
+            if (isBLE()) {
+                assert leBuilder != null;
+                leBuilder.add(new nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetDeviceStateAction(gbDevice, GBDevice.State.INITIALIZED, context));
+                leSupport.performConnected(leBuilder.getTransaction());
+            } else {
+                assert brBuilder != null;
+                brBuilder.add(new nodomain.freeyourgadget.gadgetbridge.service.btbr.actions.SetDeviceStateAction(gbDevice, GBDevice.State.INITIALIZED, context));
+                brSupport.performConnected(brBuilder.getTransaction());
+            }
+        } catch (IOException e) {
+            // TODO: Use translatable string
+            GB.toast(context, "Final initialization of Huawei device failed", Toast.LENGTH_SHORT, GB.ERROR, e);
+            LOG.error("Final initialization of Huawei device failed", e);
+        }
+    }
+
+    public void createSecretKey() {
+        SharedPreferences sharedPrefs = GBApplication.getDeviceSpecificSharedPrefs(deviceMac);
+
+        String authKey = sharedPrefs.getString("authkey", null);
+        if (authKey == null || authKey.isEmpty()) {
+            SharedPreferences.Editor editor = sharedPrefs.edit();
+
+            authKey = StringUtils.bytesToHex(HuaweiCrypto.generateNonce());
+            editor.putString("authkey", authKey);
+            editor.apply();
+        }
+        paramsProvider.setSecretKey(GB.hexStringToByteArray(authKey));
+    }
+
+    public byte[] getSecretKey() {
+        SharedPreferences sharedPrefs = GBApplication.getDeviceSpecificSharedPrefs(deviceMac);
+
+        String authKey = sharedPrefs.getString("authkey", null);
+        return GB.hexStringToByteArray(authKey);
+    }
+
+    public void setSecretKey(byte[] authKey) {
+        SharedPreferences sharedPrefs = GBApplication.getDeviceSpecificSharedPrefs(deviceMac);
+
+        SharedPreferences.Editor editor = sharedPrefs.edit();
+
+        editor.putString("authkey", StringUtils.bytesToHex(authKey));
+        editor.apply();
+        paramsProvider.setSecretKey(authKey);
+    }
+
+    public HuaweiCoordinatorSupplier.HuaweiDeviceType getHuaweiType() {
+        return this.huaweiType;
+    }
+
+    public HuaweiPacket.ParamsProvider getParamsProvider() {
+        return paramsProvider;
+    }
+
+    public void setNeedsAuth(boolean needsAuth) {
+        this.needsAuth = needsAuth;
+    }
+
+    protected void createRandomMacAddress() {
+        SharedPreferences sharedPrefs = GBApplication.getDeviceSpecificSharedPrefs(deviceMac);
+
+        macAddress =  sharedPrefs.getString(HuaweiConstants.PREF_HUAWEI_ADDRESS, null);
+        if (macAddress == null || macAddress.isEmpty()) {
+            StringBuilder mac = new StringBuilder("FF:FF:FF");
+            Random r = new Random();
+            for (int i = 0; i < 3; i++) {
+                int n = r.nextInt(255);
+                mac.append(String.format(":%02x", n));
+            }
+            macAddress = mac.toString().toUpperCase();
+            SharedPreferences.Editor editor = sharedPrefs.edit();
+            editor.putString(HuaweiConstants.PREF_HUAWEI_ADDRESS, macAddress);
+            editor.apply();
+        }
+    }
+
+    public byte[] getMacAddress() {
+        return macAddress.getBytes(StandardCharsets.UTF_8);
+    }
+
+    public byte[] getSerial() {
+        return macAddress.replace(":", "").substring(6, 12).getBytes(StandardCharsets.UTF_8);
+    }
+
+    public String getDeviceMac() {
+        return deviceMac;
+    }
+
+    protected void createAndroidID() {
+        SharedPreferences sharedPrefs = GBApplication.getDeviceSpecificSharedPrefs(deviceMac);
+
+        androidID =  sharedPrefs.getString(DeviceSettingsPreferenceConst.PREF_FAKE_ANDROID_ID, null);
+        if (androidID == null || androidID.isEmpty()) {
+            androidID = StringUtils.bytesToHex(HuaweiCrypto.generateNonce());
+            LOG.debug("Created androidID: " + androidID);
+            SharedPreferences.Editor editor = sharedPrefs.edit();
+            editor.putString(DeviceSettingsPreferenceConst.PREF_FAKE_ANDROID_ID, androidID);
+            editor.apply();
+        }
+    }
+
+    public byte[] getAndroidId() {
+        return androidID.getBytes(StandardCharsets.UTF_8);
+    }
+
+    public Context getContext() {
+        return context;
+    }
+
+    public GBDevice getDevice() {
+        return gbDevice;
+    }
+
+    /**
+     * Initialize the services that may or may not be supported on the device
+     * To be called after the commandsPerService is filled in the coordinator
+     */
+    public void initializeDynamicServices() {
+
+        // Setup the alarms
+        if (!getHuaweiCoordinator().supportsChangingAlarm()) {
+            if (needsAuth) {
+                // TODO: not really sure if this is necessary, but it probably won't do any harm
+                initializeAlarms();
+            }
+        } else {
+            getAlarms();
+        }
+        try {
+            if (getHuaweiCoordinator().supportsExpandCapability()) {
+                GetExpandCapabilityRequest expandCapabilityReq = new GetExpandCapabilityRequest(this);
+                expandCapabilityReq.doPerform();
+            }
+            if (getHuaweiCoordinator().supportsAccount()) { // GetAccountJudgment
+                SendAccountRequest sendAccountReq = new SendAccountRequest(this);
+                sendAccountReq.doPerform();
+            }
+            if (getHuaweiCoordinator().supportsActivityType()) {
+                GetActivityTypeRequest activityTypeReq = new GetActivityTypeRequest(this);
+                activityTypeReq.doPerform();
+            }
+            if (getHuaweiCoordinator().supportsSettingRelated()) { // GetSettingRelated
+                GetSettingRelatedRequest getSettingRelatedReq = new GetSettingRelatedRequest(this);
+                getSettingRelatedReq.doPerform();
+            }
+            if (getHuaweiCoordinator().supportsConnectStatus()) {
+                GetConnectStatusRequest getConnectStatusReq = new GetConnectStatusRequest(this);
+                getConnectStatusReq.doPerform();
+            }
+            if (getHuaweiCoordinator().supportsActivateOnLift()) {
+                setActivateOnLift();
+            }
+            if (getHuaweiCoordinator().supportsWearLocation(getDevice())) {
+                setWearLocation();
+            }
+            if (getHuaweiCoordinator().supportsQueryDndLiftWristDisturbType()) {
+                GetDndLiftWristTypeRequest getDndLiftWristTypeReq = new GetDndLiftWristTypeRequest(this);
+                getDndLiftWristTypeReq.doPerform();
+            }
+            if (getHuaweiCoordinator().supportsDoNotDisturb(gbDevice)) {
+                SendDndDeleteRequest sendDndDeleteReq = new SendDndDeleteRequest(this);
+                SendDndAddRequest sendDndAddReq = new SendDndAddRequest(this);
+                sendDndDeleteReq.nextRequest(sendDndAddReq);
+                sendDndDeleteReq.doPerform();
+            }
+            if (getHuaweiCoordinator().supportsNotification()) { // 0x02 - 0x04
+                setNotificationStatus();
+            }
+            if (getHuaweiCoordinator().supportsDoNotDisturb(gbDevice) && getHuaweiCoordinator().supportsWearMessagePush()) {
+                setDndNotWear();
+            }
+            if (getHuaweiCoordinator().supportsTimeAndZoneId()) {
+                setTimeZoneId();
+            }
+            // Nothing usefull yet with this requests
+            if (getHuaweiCoordinator().supportsMultiDevice()) {
+                SendSetUpDeviceStatusRequest sendSetUpDeviceStatusReq = new SendSetUpDeviceStatusRequest(this);
+                sendSetUpDeviceStatusReq.doPerform();
+                GetWearStatusRequest getWearStatusReq = new GetWearStatusRequest(this);
+                getWearStatusReq.doPerform();
+            }
+            if (getHuaweiCoordinator().supportsMenstrual()) {
+                SendMenstrualCapabilityRequest sendMenstrualCapabilityReq = new SendMenstrualCapabilityRequest(this);
+                sendMenstrualCapabilityReq.doPerform();
+            }
+            if (getHuaweiCoordinator().supportsLanguageSetting()) { // 0x0c - 0x01
+                setLanguageSetting();
+            }
+            if (getHuaweiCoordinator().supportsWorkoutsTrustHeartRate()) {
+                SendNotifyHeartRateCapabilityRequest sendNotifyHeartRateCapabilityReq = new SendNotifyHeartRateCapabilityRequest(this);
+                sendNotifyHeartRateCapabilityReq.doPerform();
+            }
+            if (getHuaweiCoordinator().supportsFitnessRestHeartRate()) {
+                SendNotifyRestHeartRateCapabilityRequest sendNotifyRestHeartRateCapabilityReq = new SendNotifyRestHeartRateCapabilityRequest(this);
+                sendNotifyRestHeartRateCapabilityReq.doPerform();
+            }
+            if (getHuaweiCoordinator().supportsFitnessThresholdValue()) {
+                SetMediumToStrengthThresholdRequest setMediumToStrengthThresholdReq = new SetMediumToStrengthThresholdRequest(this);
+                setMediumToStrengthThresholdReq.doPerform();
+            }
+            if (getHuaweiCoordinator().supportsDateFormat()) { //0x01 - 0x04
+                setDateFormat();
+            }
+            if (getHuaweiCoordinator().supportsMotionGoal()) {
+                SendFitnessGoalRequest sendFitnessGoalReq = new SendFitnessGoalRequest(this);
+                sendFitnessGoalReq.doPerform();
+            }
+            if (getHuaweiCoordinator().supportsActivityReminder()) {
+                setActivityReminder();
+            }
+            if (getHuaweiCoordinator().supportsPromptPushMessage() && getProtocolVersion() == 2) {
+                GetNotificationCapabilitiesRequest getNotificationCapabilitiesReq = new GetNotificationCapabilitiesRequest(this);
+                getNotificationCapabilitiesReq.doPerform();
+            }
+            if (getHuaweiCoordinator().supportsNotificationAlert() && getProtocolVersion() == 2) {
+                GetNotificationConstraintsRequest getNotificationConstraintsReq = new GetNotificationConstraintsRequest(this);
+                getNotificationConstraintsReq.doPerform();
+            }
+        } catch (IOException e) {
+            GB.toast(getContext(), "Initialize dynamic services of Huawei device failed", Toast.LENGTH_SHORT, GB.ERROR,
+                    e);
+            e.printStackTrace();
+        }
+
+        // Properly update the device card
+        gbDevice.sendDeviceUpdateIntent(GBApplication.getContext());
+        GB.signalActivityDataFinish();
+    }
+
+    public void setProtocolVersion(byte protocolVersion) {
+        this.protocolVersion = protocolVersion;
+    }
+
+    public byte getProtocolVersion() {
+        return this.protocolVersion;
+    }
+
+    private void initializeAlarms() {
+        // TODO: check for smart alarm && overwrite for smart alarm
+        //       note that lowering the alarm count shouldn't delete the alarm of course...
+
+        // Populate alarms in order to specify important data
+        List<Alarm> alarms = DBHelper.getAlarms(gbDevice);
+        DeviceCoordinator coordinator = this.gbDevice.getDeviceCoordinator();
+        int supportedNumAlarms = coordinator.getAlarmSlotCount(gbDevice);
+        if (alarms.size() == 0) {
+            try (DBHandler db = GBApplication.acquireDB()) {
+                DaoSession daoSession = db.getDaoSession();
+                Device device = DBHelper.getDevice(gbDevice, daoSession);
+                User user = DBHelper.getUser(daoSession);
+                for (int position = 0; position < supportedNumAlarms; position++) {
+                    LOG.info("adding missing alarm at position " + position);
+                    DBHelper.store(createDefaultAlarm(device, user, position));
+                }
+            } catch (Exception e) {
+                // TODO: show user?
+                // TODO: What exceptions can happen here?
+                LOG.error("Error accessing database", e);
+            }
+        }
+    }
+
+    private Alarm createDefaultAlarm(@NonNull Device device, @NonNull User user, int position) {
+        boolean smartWakeup = false;
+        String title = context.getString(R.string.menuitem_alarm);
+        String description = context.getString(R.string.huawei_alarm_event_description);
+        if (position == 0) {
+            smartWakeup = true;
+            title = context.getString(R.string.alarm_smart_wakeup);
+            description = context.getString(R.string.huawei_alarm_smart_description);
+        }
+        return new Alarm(device.getId(), user.getId(), position, false, smartWakeup, false, 0, 6, 30, true, title, description);
+    }
+
+    private void getAlarms() {
+        if (!getHuaweiCoordinator().supportsChangingAlarm())
+            return;
+
+        GetEventAlarmList getEventAlarmList = new GetEventAlarmList(this);
+        responseManager.addHandler(getEventAlarmList);
+        getEventAlarmList.setFinalizeReq(new RequestCallback() {
+            @Override
+            public void call() {
+                if (!getHuaweiCoordinator().supportsSmartAlarm(getDevice()))
+                    return; // Don't get smart alarms when not supported
+
+                GetSmartAlarmList getSmartAlarmList = new GetSmartAlarmList(HuaweiSupportProvider.this);
+                responseManager.addHandler(getSmartAlarmList);
+                try {
+                    getSmartAlarmList.doPerform();
+                } catch (IOException e) {
+                    // TODO: Use translatable string
+                    GB.toast(context, "Error sending smart alarm list request", Toast.LENGTH_SHORT, GB.ERROR, e);
+                    LOG.error("Error sending smart alarm list request", e);
+                }
+            }
+
+            @Override
+            public void handleException(Request.ResponseParseException e) {
+                // TODO: Use translatable string
+                GB.toast(context, "Error parsing event list", Toast.LENGTH_SHORT, GB.ERROR, e);
+                LOG.error("Error parsing event list", e);
+            }
+        });
+        try {
+            getEventAlarmList.doPerform();
+        } catch (IOException e) {
+            // TODO: Use translatable string
+            GB.toast(context, "Error sending event alarm list request", Toast.LENGTH_SHORT, GB.ERROR, e);
+            LOG.error("Error sending event alarm list request", e);
+        }
+    }
+
+    public void saveAlarms(Alarm[] alarms) {
+        try (DBHandler db = GBApplication.acquireDB()) {
+            DaoSession daoSession = db.getDaoSession();
+            Device device = DBHelper.getDevice(gbDevice, daoSession);
+            User user = DBHelper.getUser(daoSession);
+            for (Alarm alarm : alarms) {
+                alarm.setDeviceId(device.getId());
+                alarm.setUserId(user.getId());
+                DBHelper.store(alarm);
+            }
+        } catch (Exception e) {
+            // TODO: Use translatable string
+            GB.toast(context, "Error saving alarms", Toast.LENGTH_SHORT, GB.ERROR, e);
+            LOG.error("Error saving alarms", e);
+        }
+    }
+
+    public boolean onCharacteristicChanged(BluetoothGattCharacteristic characteristic) {
+        byte[] data = characteristic.getValue();
+        responseManager.handleData(data);
+        return true;
+    }
+
+    public void onSocketRead(byte[] data) {
+        //Check multiple packet in data
+        ByteBuffer bData = ByteBuffer.wrap(data);
+        while (bData.remaining() != 0x00) {
+            int dataLen = bData.getShort(bData.position() + 1) + 0x05; // magic + len + CRC
+            byte[] newData = new byte[dataLen];
+            bData.get(newData, 0, dataLen);
+            responseManager.handleData(newData);
+        }
+    }
+
+    public void removeInProgressRequests(Request req) {
+        responseManager.removeHandler(req);
+    }
+
+    public void onSendConfiguration(String config) {
+        try {
+            switch (config) {
+                case DeviceSettingsPreferenceConst.PREF_DATEFORMAT:
+                case DeviceSettingsPreferenceConst.PREF_TIMEFORMAT: {
+                    setDateFormat();
+                    break;
+                }
+                case SettingsActivity.PREF_MEASUREMENT_SYSTEM:
+                case DeviceSettingsPreferenceConst.PREF_LANGUAGE: {
+                    setLanguageSetting();
+                    break;
+                }
+                case DeviceSettingsPreferenceConst.PREF_WEARLOCATION: {
+                    setWearLocation();
+                    break;
+                }
+                case DeviceSettingsPreferenceConst.PREF_LIFTWRIST_NOSHED: {
+                    setActivateOnLift();
+                    break;
+                }
+                case MiBandConst.PREF_MI2_ROTATE_WRIST_TO_SWITCH_INFO: {
+                    setNavigateOnRotate();
+                    break;
+                }
+                case DeviceSettingsPreferenceConst.PREF_INACTIVITY_ENABLE:
+                case DeviceSettingsPreferenceConst.PREF_INACTIVITY_THRESHOLD:
+                case DeviceSettingsPreferenceConst.PREF_INACTIVITY_START:
+                case DeviceSettingsPreferenceConst.PREF_INACTIVITY_END:
+                case DeviceSettingsPreferenceConst.PREF_INACTIVITY_MO:
+                case DeviceSettingsPreferenceConst.PREF_INACTIVITY_TU:
+                case DeviceSettingsPreferenceConst.PREF_INACTIVITY_WE:
+                case DeviceSettingsPreferenceConst.PREF_INACTIVITY_TH:
+                case DeviceSettingsPreferenceConst.PREF_INACTIVITY_FR:
+                case DeviceSettingsPreferenceConst.PREF_INACTIVITY_SA:
+                case DeviceSettingsPreferenceConst.PREF_INACTIVITY_SU: {
+                    setActivityReminder();
+                    break;
+                }
+                case HuaweiConstants.PREF_HUAWEI_TRUSLEEP: {
+                    setTrusleep();
+                    break;
+                }
+                case DeviceSettingsPreferenceConst.PREF_NOTIFICATION_ENABLE: {
+                    setNotificationStatus();
+                    break;
+                }
+                case HuaweiConstants.PREF_HUAWEI_WORKMODE:
+                    SetWorkModeRequest setWorkModeReq = new SetWorkModeRequest(this);
+                    setWorkModeReq.doPerform();
+                    break;
+                case DeviceSettingsPreferenceConst.PREF_DO_NOT_DISTURB:
+                case DeviceSettingsPreferenceConst.PREF_DO_NOT_DISTURB_START:
+                case DeviceSettingsPreferenceConst.PREF_DO_NOT_DISTURB_END:
+                case DeviceSettingsPreferenceConst.PREF_DO_NOT_DISTURB_LIFT_WRIST:
+                case DeviceSettingsPreferenceConst.PREF_DO_NOT_DISTURB_MO:
+                case DeviceSettingsPreferenceConst.PREF_DO_NOT_DISTURB_TU:
+                case DeviceSettingsPreferenceConst.PREF_DO_NOT_DISTURB_WE:
+                case DeviceSettingsPreferenceConst.PREF_DO_NOT_DISTURB_TH:
+                case DeviceSettingsPreferenceConst.PREF_DO_NOT_DISTURB_FR:
+                case DeviceSettingsPreferenceConst.PREF_DO_NOT_DISTURB_SA:
+                case DeviceSettingsPreferenceConst.PREF_DO_NOT_DISTURB_SU: {
+                    setDnd();
+                    break;
+                }
+                case DeviceSettingsPreferenceConst.PREF_DO_NOT_DISTURB_NOT_WEAR:
+                    setDndNotWear();
+                    break;
+                case DeviceSettingsPreferenceConst.PREF_FIND_PHONE:
+                case DeviceSettingsPreferenceConst.PREF_FIND_PHONE_DURATION:
+                    // TODO: enable/disable the find phone applet on band
+                    break;
+                case DeviceSettingsPreferenceConst.PREF_DISCONNECTNOTIF_NOSHED:
+                    setDisconnectNotification();
+                    break;
+                case DeviceSettingsPreferenceConst.PREF_HEARTRATE_AUTOMATIC_ENABLE:
+                    setHeartrateAutomatic();
+                    break;
+                case DeviceSettingsPreferenceConst.PREF_SPO_AUTOMATIC_ENABLE:
+                    setSpoAutomatic();
+                    break;
+                case DeviceSettingsPreferenceConst.PREF_FORCE_ENABLE_SMART_ALARM:
+                    getAlarms();
+                    break;
+                case HuaweiConstants.PREF_HUAWEI_DEBUG_REQUEST:
+                    sendDebugRequest();
+                    break;
+                case ActivityUser.PREF_USER_STEPS_GOAL:
+                    new SendFitnessGoalRequest(this).doPerform();
+                    break;
+            }
+        } catch (IOException e) {
+            // TODO: Use translatable string
+            GB.toast(context, "Configuration of Huawei device failed", Toast.LENGTH_SHORT, GB.ERROR, e);
+            LOG.error("Configuration of Huawei device failed", e);
+            // TODO: handle this?
+        }
+    }
+
+    public void onFetchRecordedData(int dataTypes) {
+        if (gbDevice.isBusy()) {
+            LOG.warn("Device is already busy with " + gbDevice.getBusyTask() + ", so won't fetch data now.");
+            // TODO: better way of letting user know?
+            // TODO: use string that can be translated
+            GB.toast("Device is already busy with " + gbDevice.getBusyTask() + ", so won't fetch data now.", Toast.LENGTH_LONG, 0);
+            return;
+        }
+
+        // TODO: An exception during the parsing can leave GB thinking that the sync is not yet
+        //       finished, but it won't ever complete because of the parsing exception
+        //       Maybe this can be fixed with an exception handler from the callback? If then
+        //       called from the ResponseManager, it may not be too much work to implement.
+
+        if ((dataTypes & RecordedDataTypes.TYPE_ACTIVITY) != 0) {
+            fetchActivityData();
+        } else if (dataTypes == RecordedDataTypes.TYPE_GPS_TRACKS) {
+            fetchWorkoutData();
+        } else {
+            // TODO: tell user
+            LOG.warn("Recorded data type {} not implemented yet.", dataTypes);
+        }
+
+        // Get the battery level, as that isn't shared nicely for now
+        getBatteryLevel();
+
+        // Get the alarms as they cannot be retrieved on opening the alarm window
+        // TODO: get the alarms if the alarm settings are opened instead of here
+        getAlarms();
+    }
+
+    private void fetchActivityData() {
+        int sleepStart = 0;
+        int stepStart = 0;
+        int end = (int) (System.currentTimeMillis() / 1000);
+
+        SharedPreferences sharedPreferences = GBApplication.getDeviceSpecificSharedPrefs(gbDevice.getAddress());
+        long prefLastSyncTime = sharedPreferences.getLong("lastSyncTimeMillis", 0);
+        if (prefLastSyncTime != 0) {
+            sleepStart = (int) (prefLastSyncTime / 1000);
+            stepStart = (int) (prefLastSyncTime / 1000);
+
+            // Reset for next calls
+            sharedPreferences.edit().putLong("lastSyncTimeMillis", 0).apply();
+        } else {
+            try (DBHandler db = GBApplication.acquireDB()) {
+                HuaweiSampleProvider sampleProvider = new HuaweiSampleProvider(gbDevice, db.getDaoSession());
+                sleepStart = sampleProvider.getLastSleepFetchTimestamp();
+                stepStart = sampleProvider.getLastStepFetchTimestamp();
+            } catch (Exception e) {
+                LOG.warn("Exception for getting start times, using 01/01/2000 - 00:00:00.");
+            }
+
+            // Some bands don't work with zero timestamp, so starting later
+            if (sleepStart == 0)
+                sleepStart = 946684800;
+            if (stepStart == 0)
+                stepStart = 946684800;
+        }
+        final GetSleepDataCountRequest getSleepDataCountRequest;
+        if (isBLE()) {
+            nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder leBuilder = createLeTransactionBuilder("FetchRecordedData");
+            leBuilder.add(new nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetDeviceBusyAction(gbDevice, context.getString(R.string.busy_task_fetch_activity_data), context));
+            getSleepDataCountRequest = new GetSleepDataCountRequest(this, leBuilder, sleepStart, end);
+        } else {
+            nodomain.freeyourgadget.gadgetbridge.service.btbr.TransactionBuilder brBuilder = createBrTransactionBuilder("FetchRecordedData");
+            brBuilder.add(new nodomain.freeyourgadget.gadgetbridge.service.btbr.actions.SetDeviceBusyAction(gbDevice, context.getString(R.string.busy_task_fetch_activity_data), context));
+            getSleepDataCountRequest = new GetSleepDataCountRequest(this, brBuilder, sleepStart, end);
+        }
+
+        final GetStepDataCountRequest getStepDataCountRequest = new GetStepDataCountRequest(this, stepStart, end);
+        final GetFitnessTotalsRequest getFitnessTotalsRequest = new GetFitnessTotalsRequest(this);
+
+        getFitnessTotalsRequest.setFinalizeReq(new RequestCallback() {
+            @Override
+            public void call() {
+                handleSyncFinished();
+            }
+
+            @Override
+            public void handleException(Request.ResponseParseException e) {
+                LOG.error("Fitness totals exception", e);
+                handleSyncFinished();
+            }
+        });
+
+        getStepDataCountRequest.setFinalizeReq(new RequestCallback() {
+            @Override
+            public void call() {
+                try {
+                    getFitnessTotalsRequest.doPerform();
+                } catch (IOException e) {
+                    LOG.error("Exception on starting fitness totals request", e);
+                    handleSyncFinished();
+                }
+            }
+
+            @Override
+            public void handleException(Request.ResponseParseException e) {
+                LOG.error("Step data count exception", e);
+                handleSyncFinished();
+            }
+        });
+
+        getSleepDataCountRequest.setFinalizeReq(new RequestCallback() {
+            @Override
+            public void call() {
+                try {
+                    getStepDataCountRequest.doPerform();
+                } catch (IOException e) {
+                    LOG.error("Exception on starting step data count request", e);
+                    handleSyncFinished();
+                }
+            }
+
+            @Override
+            public void handleException(Request.ResponseParseException e) {
+                LOG.error("Sleep data count exception", e);
+                handleSyncFinished();
+            }
+        });
+
+        try {
+            getSleepDataCountRequest.doPerform();
+        } catch (IOException e) {
+            LOG.error("Exception on starting sleep data count request", e);
+            handleSyncFinished();
+        }
+    }
+
+    private void fetchWorkoutData() {
+        int start = 0;
+        int end = (int) (System.currentTimeMillis() / 1000);
+
+        SharedPreferences sharedPreferences = GBApplication.getDeviceSpecificSharedPrefs(gbDevice.getAddress());
+        long prefLastSyncTime = sharedPreferences.getLong("lastSportsActivityTimeMillis", 0);
+        if (prefLastSyncTime != 0) {
+            start = (int) (prefLastSyncTime / 1000);
+
+            // Reset for next calls
+            sharedPreferences.edit().putLong("lastSportsActivityTimeMillis", 0).apply();
+        } else {
+            try (DBHandler db = GBApplication.acquireDB()) {
+                Long userId = DBHelper.getUser(db.getDaoSession()).getId();
+                Long deviceId = DBHelper.getDevice(gbDevice, db.getDaoSession()).getId();
+
+                QueryBuilder<HuaweiWorkoutSummarySample> qb1 = db.getDaoSession().getHuaweiWorkoutSummarySampleDao().queryBuilder().where(
+                        HuaweiWorkoutSummarySampleDao.Properties.DeviceId.eq(deviceId),
+                        HuaweiWorkoutSummarySampleDao.Properties.UserId.eq(userId)
+                ).orderDesc(
+                        HuaweiWorkoutSummarySampleDao.Properties.StartTimestamp
+                ).limit(1);
+
+                List<HuaweiWorkoutSummarySample> samples1 = qb1.list();
+                if (!samples1.isEmpty())
+                    start = samples1.get(0).getEndTimestamp();
+
+                QueryBuilder<BaseActivitySummary> qb2 = db.getDaoSession().getBaseActivitySummaryDao().queryBuilder().where(
+                        BaseActivitySummaryDao.Properties.DeviceId.eq(deviceId),
+                        BaseActivitySummaryDao.Properties.UserId.eq(userId)
+                ).orderDesc(
+                        BaseActivitySummaryDao.Properties.StartTime
+                ).limit(1);
+
+                List<BaseActivitySummary> samples2 = qb2.list();
+                if (!samples2.isEmpty())
+                    start = Math.min(start, (int) (samples2.get(0).getEndTime().getTime() / 1000L));
+
+                start = start + 1;
+            } catch (Exception e) {
+                LOG.warn("Exception for getting start time, using 10/06/2022 - 00:00:00.");
+            }
+
+            if (start == 0 || start == 1)
+                start = 1654819200;
+        }
+
+        final GetWorkoutCountRequest getWorkoutCountRequest;
+        if (isBLE()) {
+            nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder leBuilder = createLeTransactionBuilder("FetchWorkoutData");
+            // TODO: maybe use a different string from the other synchronization
+            leBuilder.add(new nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetDeviceBusyAction(gbDevice, context.getString(R.string.busy_task_fetch_activity_data), context));
+            getWorkoutCountRequest = new GetWorkoutCountRequest(this, leBuilder, start, end);
+        } else {
+            nodomain.freeyourgadget.gadgetbridge.service.btbr.TransactionBuilder brBuilder = createBrTransactionBuilder("FetchWorkoutData");
+            // TODO: maybe use a different string from the other synchronization
+            brBuilder.add(new nodomain.freeyourgadget.gadgetbridge.service.btbr.actions.SetDeviceBusyAction(gbDevice, context.getString(R.string.busy_task_fetch_activity_data), context));
+            getWorkoutCountRequest = new GetWorkoutCountRequest(this, brBuilder, start, end);
+        }
+
+        getWorkoutCountRequest.setFinalizeReq(new RequestCallback() {
+            @Override
+            public void call() {
+                handleSyncFinished();
+            }
+
+            @Override
+            public void handleException(Request.ResponseParseException e) {
+                LOG.error("Workout parsing exception", e);
+                handleSyncFinished();
+            }
+        });
+
+        try {
+            getWorkoutCountRequest.doPerform();
+        } catch (IOException e) {
+            LOG.error("Exception on starting workout count request", e);
+            handleSyncFinished();
+        }
+    }
+
+    private void handleSyncFinished() {
+        if (gbDevice.isBusy()) {
+            gbDevice.unsetBusyTask();
+            gbDevice.sendDeviceUpdateIntent(context);
+        }
+        GB.signalActivityDataFinish();
+    }
+
+    public void onReset(int flags) {
+        try {
+            if(flags== GBDeviceProtocol.RESET_FLAGS_FACTORY_RESET) {
+                SendFactoryResetRequest sendFactoryResetReq = new SendFactoryResetRequest(this);
+                sendFactoryResetReq.doPerform();
+            }
+        } catch (IOException e) {
+            // TODO: Use translatable string
+            GB.toast(context, "Factory resetting Huawei device failed", Toast.LENGTH_SHORT, GB.ERROR, e);
+            LOG.error("Factory resetting Huawei device failed", e);
+        }
+    }
+
+    public void setNotificationStatus() {
+        /*
+         * TODO: this doesn't work as expected
+         *       We thought it would disable(/enable) the notifications on the device side,
+         *       but at least the disabling doesn't work - so we don't send notifications to the
+         *       device at all if the setting is disabled now.
+         *      TRYING to debug this as it should really be handled on device side...
+         */
+        try {
+            SetNotificationRequest setNotificationReq = new SetNotificationRequest(this);
+            setNotificationReq.doPerform();
+//            SetWearMessagePushRequest setWearMessagePushReq = new SetWearMessagePushRequest(this);
+//            setWearMessagePushReq.doPerform();
+        } catch (IOException e) {
+            // TODO: Use translatable string
+            GB.toast(context, "Setting notification failed", Toast.LENGTH_SHORT, GB.ERROR, e);
+            LOG.error("Setting notification failed", e);
+        }
+    }
+
+    public short getNotificationId() {
+        if (msgId < 256) {
+            msgId += 1;
+        } else {
+            msgId = 0;
+        }
+        return msgId;
+    }
+
+    public void onNotification(NotificationSpec notificationSpec) {
+        if (!GBApplication.getDeviceSpecificSharedPrefs(getDevice().getAddress()).getBoolean(DeviceSettingsPreferenceConst.PREF_NOTIFICATION_ENABLE, false)) {
+            // Don't send notifications when they are disabled
+            LOG.info("Stopped notification as they are disabled.");
+            return;
+        }
+
+        SendNotificationRequest sendNotificationReq = new SendNotificationRequest(this);
+        try {
+            sendNotificationReq.buildNotificationTLVFromNotificationSpec(notificationSpec);
+            sendNotificationReq.doPerform();
+        } catch (IOException e) {
+            LOG.error("Sending notification failed", e);
+        }
+    }
+
+    public void setDateFormat() {
+        try {
+            SetDateFormatRequest setDateFormatReq = new SetDateFormatRequest(this);
+            setDateFormatReq.doPerform();
+        } catch (IOException e) {
+            // TODO: Use translatable string
+            GB.toast(context, "Failed to configure date format", Toast.LENGTH_SHORT, GB.ERROR, e);
+            LOG.error("Failed to configure date format", e);
+        }
+    }
+
+    public void onSetTime() {
+        try {
+            setTime().doPerform();
+        } catch (IOException e) {
+            // TODO: Use translatable string
+            GB.toast(context, "Failed to configure time", Toast.LENGTH_SHORT, GB.ERROR, e);
+            LOG.error("Failed to configure time", e);
+        }
+    }
+
+    private Request setTime() {
+        SetTimeRequest setTimeReq = new SetTimeRequest(this);
+        return setTimeReq;
+    }
+
+    public void setTimeZoneId() {
+        try {
+            SetTimeZoneIdRequest setTimeZoneIdReq = new SetTimeZoneIdRequest(this);
+            setTimeZoneIdReq.doPerform();
+        } catch (IOException e) {
+            // TODO: Use translatable string
+            GB.toast(context, "Failed to configure time and zoneId", Toast.LENGTH_SHORT, GB.ERROR, e);
+        }
+    }
+
+    public void onSetAlarms(ArrayList<? extends nodomain.freeyourgadget.gadgetbridge.model.Alarm> alarms) {
+        boolean smartAlarmEnabled = getHuaweiCoordinator().supportsSmartAlarm(getDevice());
+
+        AlarmsRequest smartAlarmReq = new AlarmsRequest(this, true);
+        AlarmsRequest eventAlarmReq = new AlarmsRequest(this, false);
+        for (nodomain.freeyourgadget.gadgetbridge.model.Alarm alarm : alarms) {
+            if (alarm.getPosition() == 0 && smartAlarmEnabled) {
+                smartAlarmReq.buildSmartAlarm(alarm);
+            } else {
+                eventAlarmReq.addEventAlarm(alarm, !smartAlarmEnabled);
+            }
+        }
+        try {
+            if (smartAlarmEnabled)
+                smartAlarmReq.doPerform();
+            eventAlarmReq.doPerform();
+        } catch (IOException e) {
+            // TODO: Use translatable string
+            GB.toast(context, "Failed to configure alarms", Toast.LENGTH_SHORT, GB.ERROR, e);
+            LOG.error("Failed to configure alarms", e);
+        }
+    }
+
+    public void onSetCallState(CallSpec callSpec) {
+        if (callSpec.command == CallSpec.CALL_INCOMING) {
+            SendNotificationRequest sendNotificationReq = new SendNotificationRequest(this);
+            try {
+                sendNotificationReq.buildNotificationTLVFromCallSpec(callSpec);
+                sendNotificationReq.doPerform();
+            } catch (IOException e) {
+                LOG.error("Failed to send start call notification", e);
+            }
+        } else if (
+                callSpec.command == CallSpec.CALL_ACCEPT ||
+                callSpec.command == CallSpec.CALL_START ||
+                callSpec.command == CallSpec.CALL_REJECT ||
+                callSpec.command == CallSpec.CALL_END
+        ) {
+            StopNotificationRequest stopNotificationRequest = new StopNotificationRequest(this);
+            try {
+                stopNotificationRequest.doPerform();
+            } catch (IOException e) {
+                LOG.error("Failed to send stop call notification", e);
+            }
+        }
+    }
+
+    public void onSetMusicState(MusicStateSpec stateSpec) {
+        this.musicStateSpec = stateSpec;
+        sendSetMusic();
+    }
+
+    public void onSetMusicInfo(MusicSpec musicSpec) {
+        this.musicSpec = musicSpec;
+        sendSetMusic();
+    }
+
+    public void onSetPhoneVolume() {
+        // TODO: check when implemented in GB
+
+        // We get the audio volume manually, so ignoring the argument
+        sendSetMusic();
+    }
+
+    public void sendSetMusic() {
+        // This often gets called twice in a row because of onSetMusicState and onSetMusicInfo
+        // Maybe we can consolidate that into just one request?
+        SetMusicRequest setMusicRequest = new SetMusicRequest(this, this.musicStateSpec, this.musicSpec);
+        try {
+            setMusicRequest.doPerform();
+        } catch (IOException e) {
+            LOG.error("Failed to send set music request", e);
+        }
+    }
+
+    public void addInProgressRequest(Request request) {
+        responseManager.addHandler(request);
+    }
+
+    public void addSleepActivity(int timestamp, short duration, byte type) {
+        try (DBHandler db = GBApplication.acquireDB()) {
+            Long userId = DBHelper.getUser(db.getDaoSession()).getId();
+            Long deviceId = DBHelper.getDevice(gbDevice, db.getDaoSession()).getId();
+            HuaweiSampleProvider sampleProvider = new HuaweiSampleProvider(gbDevice, db.getDaoSession());
+
+            HuaweiActivitySample activitySample = new HuaweiActivitySample(
+                    timestamp,
+                    deviceId,
+                    userId,
+                    timestamp + duration,
+                    FitnessData.MessageData.sleepId,
+                    type,
+                    1,
+                    ActivitySample.NOT_MEASURED,
+                    ActivitySample.NOT_MEASURED,
+                    ActivitySample.NOT_MEASURED,
+                    ActivitySample.NOT_MEASURED,
+                    ActivitySample.NOT_MEASURED
+            );
+            activitySample.setProvider(sampleProvider);
+
+            sampleProvider.addGBActivitySample(activitySample);
+        } catch (Exception e) {
+            LOG.error("Failed to add sleep activity to database", e);
+        }
+    }
+
+    public void addStepData(int timestamp, short steps, short calories, short distance, byte spo, byte heartrate) {
+        try (DBHandler db = GBApplication.acquireDB()) {
+            Long userId = DBHelper.getUser(db.getDaoSession()).getId();
+            Long deviceId = DBHelper.getDevice(gbDevice, db.getDaoSession()).getId();
+            HuaweiSampleProvider sampleProvider = new HuaweiSampleProvider(gbDevice, db.getDaoSession());
+
+            HuaweiActivitySample activitySample = new HuaweiActivitySample(
+                    timestamp,
+                    deviceId,
+                    userId,
+                    timestamp + 60,
+                    FitnessData.MessageData.stepId,
+                    ActivitySample.NOT_MEASURED,
+                    1,
+                    steps,
+                    calories,
+                    distance,
+                    spo,
+                    heartrate
+            );
+            activitySample.setProvider(sampleProvider);
+
+            sampleProvider.addGBActivitySample(activitySample);
+        } catch (Exception e) {
+            LOG.error("Failed to add step data to database", e);
+        }
+    }
+
+    public void addTotalFitnessData(int steps, int calories, int distance) {
+        LOG.debug("FITNESS total steps: " + steps);
+        LOG.debug("FITNESS total calories: " + calories); // TODO: May actually be kilocalories
+        LOG.debug("FITNESS total distance: " + distance + " m");
+
+        // TODO: potentially do more with this, maybe through realtime data?
+    }
+
+    public Long addWorkoutTotalsData(Workout.WorkoutTotals.Response packet) {
+        try (DBHandler db = GBApplication.acquireDB()) {
+            Long userId = DBHelper.getUser(db.getDaoSession()).getId();
+            Long deviceId = DBHelper.getDevice(gbDevice, db.getDaoSession()).getId();
+
+            // Avoid duplicates
+            QueryBuilder<HuaweiWorkoutSummarySample> qb = db.getDaoSession().getHuaweiWorkoutSummarySampleDao().queryBuilder().where(
+                    HuaweiWorkoutSummarySampleDao.Properties.UserId.eq(userId),
+                    HuaweiWorkoutSummarySampleDao.Properties.DeviceId.eq(deviceId),
+                    HuaweiWorkoutSummarySampleDao.Properties.WorkoutNumber.eq(packet.number),
+                    HuaweiWorkoutSummarySampleDao.Properties.StartTimestamp.eq(packet.startTime),
+                    HuaweiWorkoutSummarySampleDao.Properties.EndTimestamp.eq(packet.endTime)
+            );
+            List<HuaweiWorkoutSummarySample> results = qb.build().list();
+            Long workoutId = null;
+            if (!results.isEmpty())
+                workoutId = results.get(0).getWorkoutId();
+
+            byte[] raw;
+            if (packet.rawData == null)
+                raw = null;
+            else
+                raw = StringUtils.bytesToHex(packet.rawData).getBytes(StandardCharsets.UTF_8);
+
+            HuaweiWorkoutSummarySample summarySample = new HuaweiWorkoutSummarySample(
+                    workoutId,
+                    deviceId,
+                    userId,
+                    packet.number,
+                    packet.status,
+                    packet.startTime,
+                    packet.endTime,
+                    packet.calories,
+                    packet.distance,
+                    packet.stepCount,
+                    packet.totalTime,
+                    packet.duration,
+                    packet.type,
+                    packet.strokes,
+                    packet.avgStrokeRate,
+                    packet.poolLength,
+                    packet.laps,
+                    packet.avgSwolf,
+                    raw
+            );
+            db.getDaoSession().getHuaweiWorkoutSummarySampleDao().insertOrReplace(summarySample);
+
+            return summarySample.getWorkoutId();
+        } catch (Exception e) {
+            LOG.error("Failed to add workout totals data to database", e);
+            return null;
+        }
+    }
+
+    public void addWorkoutSampleData(Long workoutId, List<Workout.WorkoutData.Response.Data> dataList) {
+        if (workoutId == null)
+            return;
+
+        try (DBHandler db = GBApplication.acquireDB()) {
+            HuaweiWorkoutDataSampleDao dao = db.getDaoSession().getHuaweiWorkoutDataSampleDao();
+
+            for (Workout.WorkoutData.Response.Data data : dataList) {
+                byte[] unknown;
+                if (data.unknownData == null)
+                    unknown = null;
+                else
+                    unknown = StringUtils.bytesToHex(data.unknownData).getBytes(StandardCharsets.UTF_8);
+
+                HuaweiWorkoutDataSample dataSample = new HuaweiWorkoutDataSample(
+                        workoutId,
+                        data.timestamp,
+                        data.heartRate,
+                        data.speed,
+                        data.stepRate,
+                        data.cadence,
+                        data.stepLength,
+                        data.groundContactTime,
+                        data.impact,
+                        data.swingAngle,
+                        data.foreFootLanding,
+                        data.midFootLanding,
+                        data.backFootLanding,
+                        data.eversionAngle,
+                        data.swolf,
+                        data.strokeRate,
+                        unknown
+                );
+                dao.insertOrReplace(dataSample);
+            }
+        } catch (Exception e) {
+            LOG.error("Failed to add workout data to database", e);
+        }
+    }
+
+    public void addWorkoutPaceData(Long workoutId, List<Workout.WorkoutPace.Response.Block> paceList) {
+        if (workoutId == null)
+            return;
+
+        try (DBHandler db = GBApplication.acquireDB()) {
+            HuaweiWorkoutPaceSampleDao dao = db.getDaoSession().getHuaweiWorkoutPaceSampleDao();
+
+            for (Workout.WorkoutPace.Response.Block block : paceList) {
+                HuaweiWorkoutPaceSample paceSample = new HuaweiWorkoutPaceSample(
+                        workoutId,
+                        block.distance,
+                        block.type,
+                        block.pace,
+                        block.correction
+                );
+                dao.insertOrReplace(paceSample);
+            }
+        } catch (Exception e) {
+            LOG.error("Failed to add workout pace data to database", e);
+        }
+    }
+
+    public void setWearLocation() {
+        try {
+            SetWearLocationRequest setWearLocationReq = new SetWearLocationRequest(this);
+            setWearLocationReq.doPerform();
+        } catch (IOException e) {
+            // TODO: Use translatable string
+            GB.toast(context, "Failed to configure Wear Location", Toast.LENGTH_SHORT, GB.ERROR, e);
+            LOG.error("Failed to configure Wear Location", e);
+        }
+    }
+
+    public void getBatteryLevel() {
+        try {
+            GetBatteryLevelRequest batteryLevelReq = new GetBatteryLevelRequest(this);
+            batteryLevelReq.doPerform();
+        } catch (IOException e) {
+            // TODO: Use translatable string
+            GB.toast(context, "Failed to get battery Level", Toast.LENGTH_SHORT, GB.ERROR, e);
+            LOG.error("Failed to get battery Level", e);
+        }
+    }
+
+    public void setActivateOnLift() {
+        try {
+            SetActivateOnLiftRequest setActivateOnLiftReq = new SetActivateOnLiftRequest(this);
+            setActivateOnLiftReq.doPerform();
+            SharedPreferences sharedPrefs = GBApplication.getDeviceSpecificSharedPrefs(deviceMac);
+            boolean statusDndLiftWrist = sharedPrefs.getBoolean(DeviceSettingsPreferenceConst.PREF_DO_NOT_DISTURB_LIFT_WRIST, false);
+            if (statusDndLiftWrist) {
+                setDnd();
+            }
+        } catch (IOException e) {
+            // TODO: Use translatable string
+            GB.toast(context, "Failed to configure Activate on Rotate", Toast.LENGTH_SHORT, GB.ERROR, e);
+            LOG.error("Failed to configure Activate on Rotate", e);
+        }
+    }
+
+    public void setNavigateOnRotate() {
+        try {
+            SetNavigateOnRotateRequest setNavigateOnRotateReq = new SetNavigateOnRotateRequest(this);
+            setNavigateOnRotateReq.doPerform();
+        } catch (IOException e) {
+            // TODO: Use translatable string
+            GB.toast(context, "Failed to configure Navigate on Rotate", Toast.LENGTH_SHORT, GB.ERROR, e);
+            LOG.error("Failed to configure Navigate on Rotate", e);
+        }
+    }
+
+    public void setActivityReminder() {
+        try {
+            SetActivityReminderRequest setActivityReminderReq = new SetActivityReminderRequest(this);
+            setActivityReminderReq.doPerform();
+        } catch (IOException e) {
+            // TODO: Use translatable string
+            GB.toast(context, "Failed to configure Activity reminder", Toast.LENGTH_SHORT, GB.ERROR, e);
+            LOG.error("Failed to configure Activity reminder", e);
+        }
+    }
+
+    public void setTrusleep() {
+        try {
+            SetTruSleepRequest setTruSleepReq = new SetTruSleepRequest(this);
+            setTruSleepReq.doPerform();
+        } catch (IOException e) {
+            // TODO: Use translatable string
+            GB.toast(context, "Failed to configure truSleep", Toast.LENGTH_SHORT, GB.ERROR, e);
+            LOG.error("Failed to configure truSleep", e);
+        }
+    }
+
+    public void setDnd() {
+        try {
+            SendDndDeleteRequest sendDndDeleteReq = new SendDndDeleteRequest(this);
+            SendDndAddRequest sendDndAddReq = new SendDndAddRequest(this);
+            sendDndDeleteReq.nextRequest(sendDndAddReq);
+            sendDndDeleteReq.doPerform();
+        } catch (IOException e) {
+            // TODO: Use translatable string
+            GB.toast(context, "Failed to set DND", Toast.LENGTH_SHORT, GB.ERROR, e);
+            LOG.error("Failed to set DND", e);
+        }
+    }
+
+    public void setDndNotWear() {
+        try {
+            SetWearMessagePushRequest setWearMessagePushReq = new SetWearMessagePushRequest(this);
+            setWearMessagePushReq.doPerform();
+        } catch (IOException e) {
+            // TODO: Use translatable string
+            GB.toast(context, "Setting DND not wear failed", Toast.LENGTH_SHORT, GB.ERROR, e);
+            LOG.error("Setting DND not wear failed", e);
+        }
+
+    }
+
+    private void setDisconnectNotification() {
+        try {
+            SetDisconnectNotification req = new SetDisconnectNotification(this);
+            req.doPerform();
+        } catch (IOException e) {
+            // TODO: Use translatable string
+            GB.toast(context, "Failed to set disconnect notification", Toast.LENGTH_SHORT, GB.ERROR, e);
+            LOG.error("Failed to set disconnect notification", e);
+        }
+    }
+
+    private void setHeartrateAutomatic() {
+        try {
+            SetAutomaticHeartrateRequest req = new SetAutomaticHeartrateRequest(this);
+            req.doPerform();
+        } catch (IOException e) {
+            // TODO: Use translatable string
+            GB.toast(context, "Failed to set automatic heart rate", Toast.LENGTH_SHORT, GB.ERROR, e);
+            LOG.error("Failed to set automatic heart rate", e);
+        }
+    }
+
+    private void setSpoAutomatic() {
+        try {
+            SetAutomaticSpoRequest req = new SetAutomaticSpoRequest(this);
+            req.doPerform();
+        } catch (IOException e) {
+            // TODO: Use translatable string
+            GB.toast(context, "Failed to set automatic SpO", Toast.LENGTH_SHORT, GB.ERROR, e);
+            LOG.error("Failed to set automatic SpO", e);
+        }
+    }
+
+    public void sendDebugRequest() {
+        try {
+            LOG.debug("Send debug request");
+            DebugRequest req = new DebugRequest(this);
+            req.doPerform();
+        } catch (IOException e) {
+            // TODO: Use translatable string
+            GB.toast(context, "Failed to send debug request", Toast.LENGTH_SHORT, GB.ERROR, e);
+            LOG.error("Failed to send debug request", e);
+        }
+    }
+
+    public void onStopFindPhone() {
+        try {
+            LOG.debug("Send stop find phone request");
+            StopFindPhoneRequest stopFindPhoneRequest = new StopFindPhoneRequest(this);
+            stopFindPhoneRequest.doPerform();
+        } catch (IOException e) {
+            // TODO: Use translatable string
+            GB.toast(context, "Failed to send stop find phone request", Toast.LENGTH_SHORT, GB.ERROR, e);
+            LOG.error("Failed to send stop find phone request", e);
+        }
+    }
+
+    public void setLanguageSetting() {
+        try {
+            SetLanguageSettingRequest setLocaleReq = new SetLanguageSettingRequest(this);
+            setLocaleReq.doPerform();
+        } catch (IOException e) {
+            // TODO: Use translatable string
+            GB.toast(context, "Failed to set language settings request", Toast.LENGTH_SHORT, GB.ERROR, e);
+            LOG.error("Failed to set language settings request", e);
+        }
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiWorkoutGbParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiWorkoutGbParser.java
new file mode 100644
index 000000000..28d2405c0
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiWorkoutGbParser.java
@@ -0,0 +1,496 @@
+/*  Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei;
+
+import android.widget.Toast;
+
+import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+
+import de.greenrobot.dao.query.QueryBuilder;
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.GBException;
+import nodomain.freeyourgadget.gadgetbridge.database.DBHandler;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.Workout;
+import nodomain.freeyourgadget.gadgetbridge.entities.BaseActivitySummary;
+import nodomain.freeyourgadget.gadgetbridge.entities.BaseActivitySummaryDao;
+import nodomain.freeyourgadget.gadgetbridge.entities.HuaweiWorkoutDataSample;
+import nodomain.freeyourgadget.gadgetbridge.entities.HuaweiWorkoutDataSampleDao;
+import nodomain.freeyourgadget.gadgetbridge.entities.HuaweiWorkoutPaceSample;
+import nodomain.freeyourgadget.gadgetbridge.entities.HuaweiWorkoutPaceSampleDao;
+import nodomain.freeyourgadget.gadgetbridge.entities.HuaweiWorkoutSummarySample;
+import nodomain.freeyourgadget.gadgetbridge.entities.HuaweiWorkoutSummarySampleDao;
+import nodomain.freeyourgadget.gadgetbridge.model.ActivityKind;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.sonyswr12.entities.activity.ActivityType;
+import nodomain.freeyourgadget.gadgetbridge.util.GB;
+import nodomain.freeyourgadget.gadgetbridge.util.StringUtils;
+
+/**
+ * This class parses the Huawei workouts into the table GB uses to show the workouts
+ * It also re-parses the unknown data from the workout tables
+ * It is a separate class so it can easily be used to re-parse the data without database migrations
+ */
+public class HuaweiWorkoutGbParser {
+    private static final Logger LOG = LoggerFactory.getLogger(HuaweiWorkoutGbParser.class);
+
+    // TODO: Might be nicer to propagate the exceptions, so they can be handled upstream
+
+    public static void parseAllWorkouts() {
+        parseUnknownWorkoutData();
+
+        try (DBHandler db = GBApplication.acquireDB()) {
+            QueryBuilder<HuaweiWorkoutSummarySample> qb = db.getDaoSession().getHuaweiWorkoutSummarySampleDao().queryBuilder();
+            for (HuaweiWorkoutSummarySample summary : qb.listLazy()) {
+                parseWorkout(summary.getWorkoutId());
+            }
+        } catch (Exception e) {
+            GB.toast("Exception parsing workouts", Toast.LENGTH_SHORT, GB.ERROR, e);
+            LOG.error("Exception parsing workouts", e);
+        }
+    }
+
+    /**
+     * Parses the unknown data from the workout data table
+     */
+    private static void parseUnknownWorkoutData() {
+        try (DBHandler dbHandler = GBApplication.acquireDB()) {
+            QueryBuilder<HuaweiWorkoutDataSample> qb = dbHandler.getDaoSession().getHuaweiWorkoutDataSampleDao().queryBuilder().where(
+                    HuaweiWorkoutDataSampleDao.Properties.DataErrorHex.notEq("")
+            );
+            for (HuaweiWorkoutDataSample sample : qb.build().listLazy()) {
+                byte[] data = GB.hexStringToByteArray(new String(sample.getDataErrorHex()));
+                Workout.WorkoutData.Response response = new Workout.WorkoutData.Response(data);
+
+                for (Workout.WorkoutData.Response.Data responseData : response.dataList) {
+                    byte[] dataErrorHex;
+                    if (responseData.unknownData == null)
+                        dataErrorHex = null;
+                    else
+                        dataErrorHex = StringUtils.bytesToHex(responseData.unknownData).getBytes(StandardCharsets.UTF_8);
+
+                    HuaweiWorkoutDataSample dataSample = new HuaweiWorkoutDataSample(
+                            sample.getWorkoutId(),
+                            responseData.timestamp,
+                            responseData.heartRate,
+                            responseData.speed,
+                            responseData.stepRate,
+                            responseData.cadence,
+                            responseData.stepLength,
+                            responseData.groundContactTime,
+                            responseData.impact,
+                            responseData.swingAngle,
+                            responseData.foreFootLanding,
+                            responseData.midFootLanding,
+                            responseData.backFootLanding,
+                            responseData.eversionAngle,
+                            responseData.swolf,
+                            responseData.strokeRate,
+                            dataErrorHex
+                    );
+
+                    dbHandler.getDaoSession().getHuaweiWorkoutDataSampleDao().insertOrReplace(dataSample);
+                }
+            }
+        } catch (Exception e) {
+            GB.toast("Exception parsing unknown workout data", Toast.LENGTH_SHORT, GB.ERROR, e);
+            LOG.error("Exception parsing unknown workout data", e);
+        }
+    }
+
+    public static int huaweiTypeToGbType(byte huaweiType) {
+        int type = huaweiType & 0xFF;
+        switch (type) {
+            case 1:
+                return ActivityKind.TYPE_RUNNING;
+            case 2:
+            case 13:
+                return ActivityKind.TYPE_WALKING;
+            case 6:
+                return ActivityKind.TYPE_SWIMMING;
+            case 7:
+                return ActivityKind.TYPE_INDOOR_CYCLING;
+            case 129:
+                return ActivityKind.TYPE_BADMINTON;
+            case 130:
+                return ActivityKind.TYPE_EXERCISE; // TODO: Tennis
+            case 132:
+                return ActivityKind.TYPE_BASKETBALL;
+            case 133:
+                return ActivityKind.TYPE_EXERCISE; // TODO: Volleyball
+            case 134:
+                return ActivityKind.TYPE_ELLIPTICAL_TRAINER;
+            case 135:
+                return ActivityKind.TYPE_ROWING_MACHINE;
+            case 173:
+                return ActivityKind.TYPE_EXERCISE; // TODO: Laser tag
+            case 177:
+                return ActivityKind.TYPE_EXERCISE; // TODO: stair climbing
+            case 196:
+                return ActivityKind.TYPE_EXERCISE; // TODO: fishing
+            case 216:
+                return ActivityKind.TYPE_EXERCISE; // TODO: motor racing
+            default:
+                return ActivityKind.TYPE_UNKNOWN;
+        }
+    }
+
+    public static void parseWorkout(Long workoutId) {
+        if (workoutId == null)
+            return;
+
+        try (DBHandler db = GBApplication.acquireDB()) {
+            QueryBuilder<HuaweiWorkoutSummarySample> qbSummary = db.getDaoSession().getHuaweiWorkoutSummarySampleDao().queryBuilder().where(
+                    HuaweiWorkoutSummarySampleDao.Properties.WorkoutId.eq(workoutId)
+            );
+            List<HuaweiWorkoutSummarySample> summarySamples = qbSummary.build().list();
+            if (summarySamples.size() != 1)
+                return;
+            HuaweiWorkoutSummarySample summary = summarySamples.get(0);
+
+            QueryBuilder<HuaweiWorkoutDataSample> qbData = db.getDaoSession().getHuaweiWorkoutDataSampleDao().queryBuilder().where(
+                    HuaweiWorkoutDataSampleDao.Properties.WorkoutId.eq(workoutId)
+            );
+            List<HuaweiWorkoutDataSample> dataSamples = qbData.build().list();
+
+            QueryBuilder<HuaweiWorkoutPaceSample> qbPace = db.getDaoSession().getHuaweiWorkoutPaceSampleDao().queryBuilder().where(
+                    HuaweiWorkoutPaceSampleDao.Properties.WorkoutId.eq(workoutId)
+            );
+
+            long userId = summary.getUserId();
+            long deviceId = summary.getDeviceId();
+            Date start = new Date(summary.getStartTimestamp() * 1000L);
+            Date end = new Date(summary.getEndTimestamp() * 1000L);
+
+            // Avoid duplicates
+            QueryBuilder<BaseActivitySummary> qb = db.getDaoSession().getBaseActivitySummaryDao().queryBuilder().where(
+                    BaseActivitySummaryDao.Properties.UserId.eq(userId),
+                    BaseActivitySummaryDao.Properties.DeviceId.eq(deviceId),
+                    BaseActivitySummaryDao.Properties.StartTime.eq(start),
+                    BaseActivitySummaryDao.Properties.EndTime.eq(end)
+            );
+            List<BaseActivitySummary> duplicates = qb.build().list();
+            BaseActivitySummary previous = null;
+            if (!duplicates.isEmpty())
+                previous = duplicates.get(0);
+
+            int type = huaweiTypeToGbType(summary.getType());
+
+            JSONObject jsonObject = new JSONObject();
+
+            // TODO: Use translatable strings
+
+            JSONObject calories = new JSONObject();
+            calories.put("value", summary.getCalories());
+            calories.put("unit", "calories_unit");
+            jsonObject.put("caloriesBurnt", calories);
+
+            JSONObject distance = new JSONObject();
+            distance.put("value", summary.getDistance());
+            distance.put("unit", "meters");
+            jsonObject.put("distanceMeters", distance);
+
+            JSONObject steps = new JSONObject();
+            steps.put("value", summary.getStepCount());
+            steps.put("unit", "steps_unit");
+            jsonObject.put("steps", steps);
+
+            JSONObject time = new JSONObject();
+            time.put("value", summary.getDuration());
+            time.put("unit", "seconds");
+            jsonObject.put("activeSeconds", time);
+
+            JSONObject status = new JSONObject();
+            status.put("value", summary.getStatus() & 0xFF);
+            status.put("unit", "");
+            jsonObject.put("Status", status);
+
+            JSONObject typeJson = new JSONObject();
+            typeJson.put("value", summary.getType() & 0xFF);
+            typeJson.put("unit", "");
+            jsonObject.put("Type", typeJson);
+
+            JSONObject strokesJson = new JSONObject();
+            strokesJson.put("value", summary.getStrokes());
+            strokesJson.put("unit", "");
+            jsonObject.put("Strokes", strokesJson);
+
+            JSONObject avgStrokeRateJson = new JSONObject();
+            avgStrokeRateJson.put("value", summary.getAvgStrokeRate());
+            avgStrokeRateJson.put("unit", "");
+            jsonObject.put("Average reported stroke rate", avgStrokeRateJson);
+
+            JSONObject poolLengthJson = new JSONObject();
+            poolLengthJson.put("value", summary.getPoolLength());
+            poolLengthJson.put("unit", "cm");
+            jsonObject.put("Pool length", poolLengthJson);
+
+            JSONObject lapsJson = new JSONObject();
+            lapsJson.put("value", summary.getLaps());
+            lapsJson.put("unit", "");
+            jsonObject.put("Laps", lapsJson);
+
+            JSONObject avgSwolfJson = new JSONObject();
+            avgSwolfJson.put("value", summary.getAvgSwolf());
+            avgSwolfJson.put("unit", "");
+            jsonObject.put("Average reported swolf", avgSwolfJson);
+
+            boolean unknownData = false;
+            if (dataSamples.size() != 0) {
+                int speed = 0;
+                int stepRate = 0;
+                int cadence = 0;
+                int stepLength = 0;
+                int groundContactTime = 0;
+                int impact = 0;
+                int maxImpact = 0;
+                int swingAngle = 0;
+                int foreFootLanding = 0;
+                int midFootLanding = 0;
+                int backFootLanding = 0;
+                int eversionAngle = 0;
+                int maxEversionAngle = 0;
+                int swolf = 0;
+                int maxSwolf = 0;
+                int strokeRate = 0;
+                int maxStrokeRate = 0;
+                for (HuaweiWorkoutDataSample dataSample : dataSamples) {
+                    speed += dataSample.getSpeed();
+                    stepRate += dataSample.getStepRate();
+                    cadence += dataSample.getCadence();
+                    stepLength += dataSample.getStepLength();
+                    groundContactTime += dataSample.getGroundContactTime();
+                    impact += dataSample.getImpact();
+                    if (dataSample.getImpact() > maxImpact)
+                        maxImpact = dataSample.getImpact();
+                    swingAngle += dataSample.getSwingAngle();
+                    foreFootLanding += dataSample.getForeFootLanding();
+                    midFootLanding += dataSample.getMidFootLanding();
+                    backFootLanding += dataSample.getBackFootLanding();
+                    eversionAngle += dataSample.getEversionAngle();
+                    if (dataSample.getEversionAngle() > maxEversionAngle)
+                        maxEversionAngle = dataSample.getEversionAngle();
+                    swolf += dataSample.getSwolf();
+                    if (dataSample.getSwolf() > maxSwolf)
+                        maxSwolf = dataSample.getSwolf();
+                    strokeRate += dataSample.getStrokeRate();
+                    if (dataSample.getStrokeRate() > maxStrokeRate)
+                        maxStrokeRate = dataSample.getStrokeRate();
+                    if (dataSample.getDataErrorHex() != null)
+                        unknownData = true;
+                }
+                // Average the things that should probably be averaged
+                speed = speed / dataSamples.size();
+                cadence = cadence / dataSamples.size();
+                int avgStepRate = stepRate / (summary.getDuration() / 60); // steps per minute
+
+                stepLength = stepLength / dataSamples.size();
+                groundContactTime = groundContactTime / dataSamples.size();
+                impact = impact / dataSamples.size();
+                swingAngle = swingAngle / dataSamples.size();
+                eversionAngle = eversionAngle / dataSamples.size();
+                swolf = swolf / dataSamples.size();
+                strokeRate = strokeRate / dataSamples.size();
+
+                JSONObject speedJson = new JSONObject();
+                speedJson.put("value", speed);
+                speedJson.put("unit", "cm/s");
+                jsonObject.put("Reported speed (avg)", speedJson);
+
+                JSONObject stepRateSumJson = new JSONObject();
+                stepRateSumJson.put("value", stepRate);
+                stepRateSumJson.put("unit", "");
+                jsonObject.put("Step rate (sum)", stepRateSumJson);
+
+                JSONObject stepRateAvgJson = new JSONObject();
+                stepRateAvgJson.put("value", avgStepRate);
+                stepRateAvgJson.put("unit", "steps/min");
+                jsonObject.put("Step rate (avg)", stepRateAvgJson);
+
+                JSONObject cadenceJson = new JSONObject();
+                cadenceJson.put("value", cadence);
+                cadenceJson.put("unit", "steps/min");
+                jsonObject.put("Cadence (avg)", cadenceJson);
+
+                JSONObject stepLengthJson = new JSONObject();
+                stepLengthJson.put("value", stepLength);
+                stepLengthJson.put("unit", "cm");
+                jsonObject.put("Step Length (avg)", stepLengthJson);
+
+                JSONObject groundContactTimeJson = new JSONObject();
+                groundContactTimeJson.put("value", groundContactTime);
+                groundContactTimeJson.put("unit", "milliseconds");
+                jsonObject.put("Ground contact time (avg)", groundContactTimeJson);
+
+                JSONObject impactJson = new JSONObject();
+                impactJson.put("value", impact);
+                impactJson.put("unit", "g");
+                jsonObject.put("Impact (avg)", impactJson);
+
+                JSONObject maxImpactJson = new JSONObject();
+                maxImpactJson.put("value", maxImpact);
+                maxImpactJson.put("unit", "g");
+                jsonObject.put("Impact (max)", maxImpactJson);
+
+                JSONObject swingAngleJson = new JSONObject();
+                swingAngleJson.put("value", swingAngle);
+                swingAngleJson.put("unit", "degrees");
+                jsonObject.put("Swing angle (avg)", swingAngleJson);
+
+                JSONObject foreFootLandingJson = new JSONObject();
+                foreFootLandingJson.put("value", foreFootLanding);
+                foreFootLandingJson.put("unit", "");
+                jsonObject.put("Fore foot landings", foreFootLandingJson);
+
+                JSONObject midFootLandingJson = new JSONObject();
+                midFootLandingJson.put("value", midFootLanding);
+                midFootLandingJson.put("unit", "");
+                jsonObject.put("Mid foot landings", midFootLandingJson);
+
+                JSONObject backFootLandingJson = new JSONObject();
+                backFootLandingJson.put("value", backFootLanding);
+                backFootLandingJson.put("unit", "");
+                jsonObject.put("Back foot landings", backFootLandingJson);
+
+                JSONObject eversionAngleJson = new JSONObject();
+                eversionAngleJson.put("value", eversionAngle);
+                eversionAngleJson.put("unit", "degrees");
+                jsonObject.put("Eversion angle (avg)", eversionAngleJson);
+
+                JSONObject maxEversionAngleJson = new JSONObject();
+                maxEversionAngleJson.put("value", maxEversionAngle);
+                maxEversionAngleJson.put("unit", "degrees");
+                jsonObject.put("Eversion angle (max)", maxEversionAngleJson);
+
+                JSONObject swolfJson = new JSONObject();
+                swolfJson.put("value", swolf);
+                swolfJson.put("unit", "");
+                jsonObject.put("Swolf (avg calculated)", swolfJson);
+
+                JSONObject maxSwolfJson = new JSONObject();
+                maxSwolfJson.put("value", maxSwolf);
+                maxSwolfJson.put("unit", "");
+                jsonObject.put("Swolf (max)", maxSwolfJson);
+
+                JSONObject strokeRateJson = new JSONObject();
+                strokeRateJson.put("value", strokeRate);
+                strokeRateJson.put("unit", "");
+                jsonObject.put("Stroke rate (avg calculated)", strokeRateJson);
+
+                JSONObject maxStrokeRateJson = new JSONObject();
+                maxStrokeRateJson.put("value", maxStrokeRate);
+                maxStrokeRateJson.put("unit", "");
+                jsonObject.put("Stroke rate (max)", maxStrokeRateJson);
+            }
+
+            ListIterator<HuaweiWorkoutPaceSample> it = qbPace.build().listIterator();
+            int count = 0;
+            int pace = 0;
+            while (it.hasNext()) {
+                int index = it.nextIndex();
+                HuaweiWorkoutPaceSample sample = it.next();
+
+                count += 1;
+                pace += sample.getPace();
+
+                JSONObject paceDistance = new JSONObject();
+                paceDistance.put("value", sample.getDistance());
+                paceDistance.put("unit", "kilometers");
+                jsonObject.put(String.format(GBApplication.getLanguage() , "Pace %d distance", index), paceDistance);
+
+                JSONObject paceType = new JSONObject();
+                paceType.put("value", sample.getType());
+                paceType.put("unit", ""); // TODO: not sure
+                jsonObject.put(String.format(GBApplication.getLanguage(), "Pace %d type", index), paceType);
+
+                JSONObject pacePace = new JSONObject();
+                pacePace.put("value", sample.getPace());
+                pacePace.put("unit", "seconds_km");
+                jsonObject.put(String.format(GBApplication.getLanguage(), "Pace %d pace", index), pacePace);
+
+                if (sample.getCorrection() != 0) {
+                    JSONObject paceCorrection = new JSONObject();
+                    paceCorrection.put("value", sample.getCorrection());
+                    paceCorrection.put("unit", "m");
+                    jsonObject.put(String.format(GBApplication.getLanguage(), "Pace %d correction", index), paceCorrection);
+                }
+            }
+
+            if (count != 0) {
+                JSONObject avgPace = new JSONObject();
+                avgPace.put("value", pace / count);
+                avgPace.put("unit", "seconds_km");
+                jsonObject.put("Average pace", avgPace);
+            }
+
+            if (unknownData) {
+                JSONObject unknownDataJson = new JSONObject();
+                unknownDataJson.put("value", "YES");
+                unknownDataJson.put("unit", "string");
+
+                jsonObject.put("Unknown data encountered", unknownDataJson);
+            }
+
+            BaseActivitySummary baseSummary;
+            if (previous == null) {
+                baseSummary = new BaseActivitySummary(
+                        null,
+                        "Workout " + summary.getWorkoutNumber(),
+                        start,
+                        end,
+                        type,
+                        null,
+                        null,
+                        null,
+                        null,
+                        null,
+                        deviceId,
+                        userId,
+                        jsonObject.toString(),
+                        null
+                );
+            } else {
+                baseSummary = new BaseActivitySummary(
+                        previous.getId(),
+                        previous.getName(),
+                        start,
+                        end,
+                        type,
+                        previous.getBaseLongitude(),
+                        previous.getBaseLatitude(),
+                        previous.getBaseAltitude(),
+                        previous.getGpxTrack(),
+                        previous.getRawDetailsPath(),
+                        deviceId,
+                        userId,
+                        jsonObject.toString(),
+                        null
+                );
+            }
+            db.getDaoSession().getBaseActivitySummaryDao().insertOrReplace(baseSummary);
+        } catch (Exception e) {
+            GB.toast("Exception parsing workout data", Toast.LENGTH_SHORT, GB.ERROR, e);
+            LOG.error("Exception parsing workout data", e);
+        }
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/ResponseManager.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/ResponseManager.java
new file mode 100644
index 000000000..789d7860d
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/ResponseManager.java
@@ -0,0 +1,115 @@
+/*  Copyright (C) 2022 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.Request;
+
+/**
+ * Manages all response data.
+ */
+public class ResponseManager {
+    private static final Logger LOG = LoggerFactory.getLogger(ResponseManager.class);
+
+    private final List<Request> handlers = Collections.synchronizedList(new ArrayList<>());
+    private HuaweiPacket receivedPacket;
+    private final AsynchronousResponse asynchronousResponse;
+    private final HuaweiSupportProvider support;
+
+    public ResponseManager(HuaweiSupportProvider support) {
+        this.asynchronousResponse = new AsynchronousResponse(support);
+        this.support = support;
+    }
+
+    /**
+     * Add a request to the response handler list
+     * @param handler The request to handle responses
+     */
+    public void addHandler(Request handler) {
+        synchronized (handlers) {
+            handlers.add(handler);
+        }
+    }
+
+    /**
+     * Remove a request from the response handler list
+     * @param handler The request to remove
+     */
+    public void removeHandler(Request handler) {
+        synchronized (handlers) {
+            handlers.remove(handler);
+        }
+    }
+
+    /**
+     * Parses the data into a Huawei Packet.
+     * If the packet is complete, it will be handled by the first request that accepts it,
+     * or as an asynchronous request otherwise.
+     *
+     * @param data The received data
+     */
+    public void handleData(byte[] data) {
+        try {
+            if (receivedPacket == null)
+                receivedPacket = new HuaweiPacket(support.getParamsProvider()).parse(data);
+            else
+                receivedPacket = receivedPacket.parse(data);
+        } catch (HuaweiPacket.ParseException e) {
+            LOG.error("Packet parse exception", e);
+
+            // Clean up so the next message may be parsed correctly
+            this.receivedPacket = null;
+            return;
+        }
+
+        if (receivedPacket.complete) {
+            Request handler = null;
+            synchronized (handlers) {
+                for (Request req : handlers) {
+                    if (req.handleResponse(receivedPacket)) {
+                        handler = req;
+                        break;
+                    }
+                }
+            }
+
+            if (handler == null) {
+                LOG.debug("Service: " + Integer.toHexString(receivedPacket.serviceId & 0xff) + ", command: " + Integer.toHexString(receivedPacket.commandId & 0xff)  + ", asynchronous response.");
+
+                // Asynchronous response
+                asynchronousResponse.handleResponse(receivedPacket);
+            } else {
+                LOG.debug("Service: " + Integer.toHexString(receivedPacket.serviceId & 0xff)  + ", command: " + Integer.toHexString(receivedPacket.commandId & 0xff)  + ", handled by: " + handler.getClass());
+
+                synchronized (handlers) {
+                    handlers.remove(handler);
+                }
+
+                handler.handleResponse();
+            }
+            receivedPacket = null;
+        }
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/AlarmsRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/AlarmsRequest.java
new file mode 100644
index 000000000..9e8174c92
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/AlarmsRequest.java
@@ -0,0 +1,95 @@
+/*  Copyright (C) 2021-2022 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import static nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.Alarms.EventAlarmsRequest;
+import static nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.Alarms.SmartAlarmRequest;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.Alarms;
+import nodomain.freeyourgadget.gadgetbridge.model.Alarm;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class AlarmsRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(AlarmsRequest.class);
+
+    private EventAlarmsRequest eventAlarmsRequest = null;
+    private SmartAlarmRequest smartAlarmRequest = null;
+
+    public AlarmsRequest(HuaweiSupportProvider support, boolean smart) {
+        super(support);
+        this.serviceId = Alarms.id;
+        this.commandId = smart ? SmartAlarmRequest.id : EventAlarmsRequest.id;
+        if (!smart)
+            eventAlarmsRequest = new EventAlarmsRequest(support.getParamsProvider());
+    }
+
+    public void addEventAlarm(Alarm alarm, boolean increasePosition) {
+        if (!alarm.getUnused()) {
+            byte position = (byte) alarm.getPosition();
+            if (increasePosition)
+                position += 1;
+            eventAlarmsRequest.addEventAlarm(new Alarms.EventAlarm(
+                    position,
+                    alarm.getEnabled(),
+                    (byte) alarm.getHour(),
+                    (byte) alarm.getMinute(),
+                    (byte) alarm.getRepetition(),
+                    alarm.getTitle()
+            ));
+        }
+    }
+
+    public void buildSmartAlarm(Alarm alarm) {
+        this.smartAlarmRequest = new SmartAlarmRequest(
+                paramsProvider,
+                new Alarms.SmartAlarm(
+                        alarm.getEnabled() && !alarm.getUnused(),
+                        (byte) alarm.getHour(),
+                        (byte) alarm.getMinute(),
+                        (byte) alarm.getRepetition(),
+                        (byte) 5 // TODO: setting for ahead time
+                )
+        );
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        try {
+            if (eventAlarmsRequest != null) {
+                return eventAlarmsRequest.serialize();
+            } else if (smartAlarmRequest != null) {
+                return smartAlarmRequest.serialize();
+            } else {
+                throw new RequestCreationException("No alarms set");
+            }
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() {
+        LOG.debug("handle Alarm");
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/DebugRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/DebugRequest.java
new file mode 100644
index 000000000..acf87180a
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/DebugRequest.java
@@ -0,0 +1,221 @@
+/*  Copyright (C) 2023 Gaignon Damien, MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiTLV;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+import nodomain.freeyourgadget.gadgetbridge.util.GB;
+
+public class DebugRequest extends Request {
+
+    public DebugRequest(HuaweiSupportProvider support) {
+        super(support);
+        this.serviceId = 0;
+        this.commandId = 0;
+        this.addToResponse = false;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        String debugString = GBApplication
+            .getDeviceSpecificSharedPrefs(supportProvider.getDevice().getAddress())
+            .getString(HuaweiConstants.PREF_HUAWEI_DEBUG, "1,1,false,(1,/),(2,/),(3,/),(4,/)");
+        HuaweiPacket packet = parseDebugString(debugString);
+        try {
+            return packet.serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    /*
+        DebugString		:= [service_id] "," [command id] "," [encryptflag] ("," [tlv])*
+        service_id		:= int
+                         | "0x" hex
+        command_id		:= int
+                         | "0x" hex
+        encryptflag		:= "true"
+                         | "t"
+                         | "false"
+                         | "f"
+        tlv				:= "(" [tag] "," [typevalue] ")"
+        tag				:= int
+                         | "0x" hex
+        typevalue		:= [type] [value]
+                         | [tlv]
+        type			:= "/"                                  # Empty tag
+                         | "B"									# Byte (1 byte)
+                         | "S"									# Short (2 bytes)
+                         | "I"									# Integer (4 bytes)
+                         | "b"                                  # Boolean
+                         | "a"									# Array of bytes (in hex)
+                         | "-"									# String
+        value			:= [any]
+     */
+
+    public HuaweiPacket parseDebugString(String debugString) throws RequestCreationException {
+        HuaweiPacket packet = new HuaweiPacket(paramsProvider);
+
+        int current = 0;
+        int nextComma = debugString.indexOf(',');
+
+        if (nextComma < 1 || debugString.length() - current < 2)
+            throw new RequestCreationException("Invalid debug command");
+
+        if (debugString.charAt(current+1) == 'x')
+            packet.serviceId = Short.valueOf(debugString.substring(current+2, nextComma), 16).byteValue();
+        else
+            packet.serviceId = Short.valueOf(debugString.substring(current, nextComma)).byteValue();
+
+        current = nextComma + 1;
+        nextComma = debugString.indexOf(',', current);
+
+        if (nextComma < 1 || debugString.length() - current < 2)
+            throw new RequestCreationException("Invalid debug command");
+
+        if (debugString.charAt(current+1) == 'x')
+            packet.commandId = Short.valueOf(debugString.substring(current+2, nextComma), 16).byteValue();
+        else
+            packet.commandId = Short.valueOf(debugString.substring(current, nextComma)).byteValue();
+
+        current = nextComma + 1;
+        nextComma = debugString.indexOf(',', current);
+
+        if (debugString.length() - current < 2)
+            throw new RequestCreationException("Invalid debug command");
+        if (nextComma < 0)
+            nextComma = debugString.length(); // For no TLVs
+
+        switch (debugString.substring(current, nextComma)) {
+            case "true":
+            case "t":
+                packet.setEncryption(true);
+                break;
+            case "false":
+            case "f":
+                packet.setEncryption(false);
+                break;
+            default:
+                throw new RequestCreationException("Boolean is not a boolean");
+        }
+
+        current = nextComma + 1;
+
+        if (current < debugString.length()) {
+            HuaweiTlvParseReturn retv = parseTlv(debugString.substring(current));
+            if (current + retv.parsedCount != debugString.length())
+                throw new RequestCreationException("Invalid debug command");
+            packet.setTlv(retv.tlv);
+        }
+
+        packet.complete = true;
+        return packet;
+    }
+
+    private HuaweiTlvParseReturn parseTlv(String tlvString) throws RequestCreationException {
+        HuaweiTLV tlv = new HuaweiTLV();
+        int current = 0;
+        int nextDelim;
+
+        while (current < tlvString.length()) {
+            if (tlvString.charAt(current) != '(')
+                throw new RequestCreationException("Invalid debug command");
+
+            current += 1;
+            nextDelim = tlvString.indexOf(',', current);
+
+            if (nextDelim < 1 || tlvString.length() - current < 2)
+                throw new RequestCreationException("Invalid debug command");
+
+            byte tag;
+            // Short in between is because Java doesn't like unsigned numbers
+            if (tlvString.charAt(current+1) == 'x')
+                tag = Short.valueOf(tlvString.substring(current+2, nextDelim), 16).byteValue();
+            else
+                tag = Short.valueOf(tlvString.substring(current, nextDelim)).byteValue();
+
+            current = nextDelim + 1;
+            nextDelim = tlvString.indexOf(')', current);
+
+            if (nextDelim < 1)
+                throw new RequestCreationException("Invalid debug command");
+
+            if (tlvString.charAt(current) != '(') {
+                char type = tlvString.charAt(current);
+                String value = tlvString.substring(current + 1, nextDelim);
+
+                switch (type) {
+                    case '/':
+                        tlv.put(tag);
+                        break;
+                    case 'B':
+                        tlv.put(tag, Byte.parseByte(value));
+                        break;
+                    case 'S':
+                        tlv.put(tag, Short.parseShort(value));
+                        break;
+                    case 'I':
+                        tlv.put(tag, Integer.parseInt(value));
+                        break;
+                    case 'b':
+                        tlv.put(tag, value.equals("1"));
+                        break;
+                    case 'a':
+                        tlv.put(tag, GB.hexStringToByteArray(value));
+                        break;
+                    case '-':
+                        tlv.put(tag, value);
+                        break;
+                    default:
+                        throw new RequestCreationException("Invalid tag type");
+                }
+
+                current = nextDelim + 1;
+            } else {
+                HuaweiTlvParseReturn retv = parseTlv(tlvString.substring(current));
+                tlv.put(tag, retv.tlv);
+                current += retv.parsedCount + 1;
+            }
+
+            if (current == tlvString.length())
+                break;
+            if (tlvString.charAt(current) == ')')
+                break;
+            if (tlvString.charAt(current) != ',')
+                throw new RequestCreationException("Invalid debug command");
+
+            current += 1;
+        }
+
+        return new HuaweiTlvParseReturn(tlv, current);
+    }
+
+    private static class HuaweiTlvParseReturn {
+        public HuaweiTLV tlv;
+        public Integer parsedCount;
+
+        HuaweiTlvParseReturn(HuaweiTLV tlv, Integer parsedCount) {
+            this.tlv = tlv;
+            this.parsedCount = parsedCount;
+        }
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetActivityTypeRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetActivityTypeRequest.java
new file mode 100644
index 000000000..78aff25dc
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetActivityTypeRequest.java
@@ -0,0 +1,58 @@
+/*  Copyright (C) 2023 Gaignon Damien
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+
+/* In order to be compatible with all devices, request send all possible commands
+to all possible services. This implies long packet which is not handled on the device.
+Thus, this request could be sliced in 3 packets. But this command does not support slicing.
+Thus, one need to send multiple requests and concat the response.
+Packets should be 240 bytes max */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.GBException;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.DeviceConfig;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class GetActivityTypeRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(GetActivityTypeRequest.class);
+
+    public GetActivityTypeRequest(HuaweiSupportProvider support) {
+        super(support);
+        this.serviceId = DeviceConfig.id;
+        this.commandId = DeviceConfig.ActivityType.id;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        DeviceConfig.ActivityType.Request activityRequest = new DeviceConfig.ActivityType.Request(paramsProvider);
+        try {
+            return activityRequest.serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() throws ResponseParseException {
+        LOG.debug("handle Activity Type");
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetAuthRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetAuthRequest.java
new file mode 100644
index 000000000..087dd8e3a
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetAuthRequest.java
@@ -0,0 +1,115 @@
+/*  Copyright (C) 2021-2023 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.nio.ByteBuffer;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.util.Arrays;
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiCrypto;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.DeviceConfig;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+import nodomain.freeyourgadget.gadgetbridge.util.StringUtils;
+
+public class GetAuthRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(GetAuthRequest.class);
+
+    protected final byte[] clientNonce;
+    protected short authVersion;
+    protected boolean isHiChainLite = false;
+    protected byte[] doubleNonce;
+    protected byte[] key = null;
+
+    public GetAuthRequest(HuaweiSupportProvider support,
+            Request linkParamsReq) {
+        super(support);
+        this.serviceId = DeviceConfig.id;
+        this.commandId = DeviceConfig.Auth.id;
+        this.clientNonce = HuaweiCrypto.generateNonce();
+        doubleNonce = ByteBuffer.allocate(32)
+                .put(((GetLinkParamsRequest)linkParamsReq).serverNonce)
+                .put(clientNonce)
+                .array();
+        this.authVersion = paramsProvider.getAuthVersion();
+    }
+
+    public GetAuthRequest(HuaweiSupportProvider support,
+                          Request linkParamsReq,
+                          boolean isHiChainLite) {
+        this(support, linkParamsReq);
+        this.isHiChainLite = isHiChainLite;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        huaweiCrypto = new HuaweiCrypto(authVersion, isHiChainLite);
+        byte[] nonce;
+
+        try {
+            if (isHiChainLite) {
+                nonce = clientNonce;
+                key = paramsProvider.getPinCode();
+                if (authVersion == 0x02)
+                    key = paramsProvider.getSecretKey();
+            } else { // normal mode
+                nonce = ByteBuffer.allocate(18)
+                        .putShort(authVersion)
+                        .put(clientNonce)
+                        .array();
+            }
+            byte[] challenge = huaweiCrypto.digestChallenge(key, doubleNonce);
+            if (challenge == null)
+                throw new RequestCreationException("Challenge null");
+            return new DeviceConfig.Auth.Request(paramsProvider, challenge, nonce, isHiChainLite).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        } catch (NoSuchAlgorithmException | InvalidKeyException e) {
+            throw new RequestCreationException("Digest exception", e);
+        }
+    }
+
+    @Override
+    protected void processResponse() throws ResponseParseException {
+        LOG.debug("handle Auth");
+
+        if (!(receivedPacket instanceof DeviceConfig.Auth.Response))
+            throw new ResponseTypeMismatchException(receivedPacket, DeviceConfig.Auth.Response.class);
+
+        try {
+            byte[] expectedAnswer = huaweiCrypto.digestResponse(key, doubleNonce);
+            if (expectedAnswer == null)
+                throw new ResponseParseException("Challenge null");
+            byte[] actualAnswer = ((DeviceConfig.Auth.Response) receivedPacket).challengeResponse;
+            if (!Arrays.equals(expectedAnswer, actualAnswer)) {
+                throw new ResponseParseException("Challenge answer mismatch : "
+                        + StringUtils.bytesToHex(actualAnswer)
+                        + " != "
+                        + StringUtils.bytesToHex(expectedAnswer)
+                );
+            }
+        } catch (NoSuchAlgorithmException | InvalidKeyException e) {
+            throw new ResponseParseException("Challenge response digest exception");
+        }
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetBatteryLevelRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetBatteryLevelRequest.java
new file mode 100644
index 000000000..aff8f31d2
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetBatteryLevelRequest.java
@@ -0,0 +1,62 @@
+/*  Copyright (C) 2021-2022 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventBatteryInfo;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.DeviceConfig;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class GetBatteryLevelRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(GetBatteryLevelRequest.class);
+
+    public GetBatteryLevelRequest(HuaweiSupportProvider support) {
+        super(support);
+        this.serviceId = DeviceConfig.id;
+        this.commandId = DeviceConfig.BatteryLevel.id;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        try {
+            return new DeviceConfig.BatteryLevel.Request(paramsProvider).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() throws ResponseParseException {
+        LOG.debug("handle Battery Level");
+
+        if (!(receivedPacket instanceof DeviceConfig.BatteryLevel.Response))
+            throw new ResponseTypeMismatchException(receivedPacket, DeviceConfig.BatteryLevel.Response.class);
+
+        byte batteryLevel = ((DeviceConfig.BatteryLevel.Response) receivedPacket).level;
+        getDevice().setBatteryLevel(batteryLevel);
+
+        GBDeviceEventBatteryInfo batteryInfo = new GBDeviceEventBatteryInfo();
+        batteryInfo.level = (int)batteryLevel & 0xff;
+        this.supportProvider.evaluateGBDeviceEvent(batteryInfo);
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetBondParamsRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetBondParamsRequest.java
new file mode 100644
index 000000000..2ea1489a4
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetBondParamsRequest.java
@@ -0,0 +1,64 @@
+/*  Copyright (C) 2021-2023 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.DeviceConfig;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class GetBondParamsRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(GetBondParamsRequest.class);
+
+    public GetBondParamsRequest(HuaweiSupportProvider support) {
+        super(support);
+        this.serviceId = DeviceConfig.id;
+        this.commandId = DeviceConfig.BondParams.id;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        try {
+            return new DeviceConfig.BondParams.Request(
+                    paramsProvider,
+                    supportProvider.getSerial(),
+                    supportProvider.getMacAddress()
+            ).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() throws ResponseParseException {
+        LOG.debug("handle BondParams");
+
+        if (!(receivedPacket instanceof DeviceConfig.BondParams.Response))
+            throw new ResponseTypeMismatchException(receivedPacket, DeviceConfig.BondParams.Response.class);
+
+        paramsProvider.setEncryptionCounter(((DeviceConfig.BondParams.Response) receivedPacket).encryptionCounter);
+        int status = ((DeviceConfig.BondParams.Response) receivedPacket).status;
+        if (status == 1) {
+            stopChain(this);
+        }
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetBondRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetBondRequest.java
new file mode 100644
index 000000000..edf8d8603
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetBondRequest.java
@@ -0,0 +1,58 @@
+/*  Copyright (C) 2021-2023 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.DeviceConfig;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class GetBondRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(GetBondRequest.class);
+
+    protected String macAddress;
+
+    public GetBondRequest(HuaweiSupportProvider support) {
+        super(support);
+        this.serviceId = DeviceConfig.id;
+        this.commandId = DeviceConfig.Bond.id;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        try {
+            return new DeviceConfig.Bond.Request(
+                    paramsProvider,
+                    supportProvider.getSerial(),
+                    supportProvider.getDeviceMac(),
+                    huaweiCrypto
+            ).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() {
+        LOG.debug("handle Bond");
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetConnectStatusRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetConnectStatusRequest.java
new file mode 100644
index 000000000..a51d026ad
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetConnectStatusRequest.java
@@ -0,0 +1,51 @@
+/*  Copyright (C) 2023 Gaignon Damien
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.GBException;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket.CryptoException;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.DeviceConfig;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class GetConnectStatusRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(GetConnectStatusRequest.class);
+
+    public GetConnectStatusRequest(HuaweiSupportProvider support) {
+        super(support);
+        this.serviceId = DeviceConfig.id;
+        this.commandId = DeviceConfig.ConnectStatusRequest.id;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        try {
+            return new DeviceConfig.ConnectStatusRequest(paramsProvider).serialize();
+        } catch (CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() throws ResponseParseException {
+        LOG.debug("handle Connect Status");
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetDeviceStatusRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetDeviceStatusRequest.java
new file mode 100644
index 000000000..710da6894
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetDeviceStatusRequest.java
@@ -0,0 +1,60 @@
+/*  Copyright (C) 2021-2022 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.DeviceConfig;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class GetDeviceStatusRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(GetDeviceStatusRequest.class);
+
+    public byte status;
+    private boolean askStatus;
+
+    public GetDeviceStatusRequest(HuaweiSupportProvider support, boolean askStatus) {
+        super(support);
+        this.serviceId = DeviceConfig.id;
+        this.commandId = DeviceConfig.DeviceStatus.id;
+        this.askStatus = askStatus;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        try {
+            return new DeviceConfig.DeviceStatus.Request(paramsProvider, askStatus).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() throws ResponseParseException {
+        LOG.debug("handle Device Status");
+
+        if (!(receivedPacket instanceof DeviceConfig.DeviceStatus.Response))
+            throw new ResponseTypeMismatchException(receivedPacket, DeviceConfig.DeviceStatus.Response.class);
+
+        this.status = ((DeviceConfig.DeviceStatus.Response) receivedPacket).status;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetDndLiftWristTypeRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetDndLiftWristTypeRequest.java
new file mode 100644
index 000000000..614f9df3a
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetDndLiftWristTypeRequest.java
@@ -0,0 +1,64 @@
+/*  Copyright (C) 2021-2022 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import android.content.SharedPreferences;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.DeviceConfig;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class GetDndLiftWristTypeRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(GetDndLiftWristTypeRequest.class);
+
+    public GetDndLiftWristTypeRequest(HuaweiSupportProvider support) {
+        super(support);
+        this.serviceId = DeviceConfig.id;
+        this.commandId = DeviceConfig.DndLiftWristType.id;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        try {
+            return new DeviceConfig.DndLiftWristType.Request(
+                    paramsProvider
+            ).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() throws ResponseParseException {
+        LOG.debug("handle DND Allow Content");
+        if (!(receivedPacket instanceof DeviceConfig.DndLiftWristType.Response))
+            throw new ResponseTypeMismatchException(receivedPacket, DeviceConfig.DndLiftWristType.Response.class);
+        SharedPreferences sharedPrefs = GBApplication.getDeviceSpecificSharedPrefs(supportProvider.getDeviceMac());
+        SharedPreferences.Editor editor = sharedPrefs.edit();
+        editor.putInt(HuaweiConstants.PREF_HUAWEI_DND_LIFT_WRIST_TYPE,
+                    ((DeviceConfig.DndLiftWristType.Response) receivedPacket).dndLiftWristType);
+        editor.apply();
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetEventAlarmList.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetEventAlarmList.java
new file mode 100644
index 000000000..1ea4c2332
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetEventAlarmList.java
@@ -0,0 +1,102 @@
+/*  Copyright (C) 2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.Alarms;
+import nodomain.freeyourgadget.gadgetbridge.entities.Alarm;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class GetEventAlarmList extends Request {
+
+    public GetEventAlarmList(HuaweiSupportProvider support) {
+        super(support);
+
+        this.serviceId = Alarms.id;
+        this.commandId = Alarms.EventAlarmsList.id;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        try {
+            return new Alarms.EventAlarmsList.Request(supportProvider.getParamsProvider()).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() throws ResponseParseException {
+        if (!(receivedPacket instanceof Alarms.EventAlarmsList.Response))
+            throw new ResponseTypeMismatchException(receivedPacket, Alarms.EventAlarmsList.Response.class);
+
+        List<Alarm> alarms = new ArrayList<>();
+
+        // Correct for position of smart alarm
+        // Note that the band uses 1 as the first index for event alarms
+        int positionOffset;
+        if (supportProvider.getCoordinator().getHuaweiCoordinator().supportsSmartAlarm(supportProvider.getDevice()))
+            positionOffset = 0;
+        else
+            positionOffset = -1;
+
+        byte usedBitmap = 0;
+
+        for (Alarms.EventAlarm eventAlarm : ((Alarms.EventAlarmsList.Response) receivedPacket).eventAlarms) {
+            alarms.add(new Alarm(
+                    0,
+                    0,
+                    eventAlarm.index + positionOffset,
+                    eventAlarm.status,
+                    false,
+                    false,
+                    eventAlarm.repeat,
+                    eventAlarm.startHour,
+                    eventAlarm.startMinute,
+                    false,
+                    eventAlarm.name,
+                    ""
+            ));
+            usedBitmap |= 1 << eventAlarm.index;
+        }
+
+        // Add all unused alarms as unused
+        for (int i = 1; i < 6; i++) {
+            if ((usedBitmap & (1 << i)) == 0) {
+                alarms.add(new Alarm(
+                        0,
+                        0,
+                        i + positionOffset,
+                        false,
+                        false,
+                        false,
+                        0,
+                        0,
+                        0,
+                        true,
+                        "",
+                        ""
+                ));
+            }
+        }
+
+        supportProvider.saveAlarms(alarms.toArray(new Alarm[]{}));
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetExpandCapabilityRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetExpandCapabilityRequest.java
new file mode 100644
index 000000000..98d21e750
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetExpandCapabilityRequest.java
@@ -0,0 +1,62 @@
+/*  Copyright (C) 2023 Gaignon Damien
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+
+/* In order to be compatible with all devices, request send all possible commands
+to all possible services. This implies long packet which is not handled on the device.
+Thus, this request could be sliced in 3 packets. But this command does not support slicing.
+Thus, one need to send multiple requests and concat the response.
+Packets should be 240 bytes max */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.DeviceConfig;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class GetExpandCapabilityRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(GetExpandCapabilityRequest.class);
+
+    public GetExpandCapabilityRequest(HuaweiSupportProvider support) {
+        super(support);
+        this.serviceId = DeviceConfig.id;
+        this.commandId = DeviceConfig.ExpandCapability.id;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        DeviceConfig.ExpandCapability.Request expandRequest = new DeviceConfig.ExpandCapability.Request(paramsProvider);
+        try {
+            return expandRequest.serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() throws ResponseParseException {
+        LOG.debug("handle Expand Capability");
+
+        if (!(receivedPacket instanceof DeviceConfig.ExpandCapability.Response))
+            throw new ResponseTypeMismatchException(receivedPacket, DeviceConfig.ExpandCapability.Response.class);
+
+        supportProvider.getHuaweiCoordinator().saveExpandCapabilities(((DeviceConfig.ExpandCapability.Response) receivedPacket).expandCapabilities);
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetFitnessTotalsRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetFitnessTotalsRequest.java
new file mode 100644
index 000000000..070803ce3
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetFitnessTotalsRequest.java
@@ -0,0 +1,57 @@
+/*  Copyright (C) 2022 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.FitnessData;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class GetFitnessTotalsRequest extends Request {
+
+    public GetFitnessTotalsRequest(HuaweiSupportProvider support) {
+        super(support);
+
+        this.serviceId = FitnessData.id;
+        this.commandId = FitnessData.FitnessTotals.id;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        try {
+            return new FitnessData.FitnessTotals.Request(
+                    paramsProvider
+            ).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() throws ResponseParseException {
+        if (!(receivedPacket instanceof FitnessData.FitnessTotals.Response))
+            throw new ResponseTypeMismatchException(receivedPacket, FitnessData.FitnessTotals.Response.class);
+
+        int totalSteps = ((FitnessData.FitnessTotals.Response) receivedPacket).totalSteps;
+        int totalCalories = ((FitnessData.FitnessTotals.Response) receivedPacket).totalCalories;
+        int totalDistance = ((FitnessData.FitnessTotals.Response) receivedPacket).totalDistance;
+
+        supportProvider.addTotalFitnessData(totalSteps, totalCalories, totalDistance);
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetHiChainRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetHiChainRequest.java
new file mode 100644
index 000000000..19ca04804
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetHiChainRequest.java
@@ -0,0 +1,250 @@
+/*  Copyright (C) 2021-2023 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Random;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.DeviceConfig;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.DeviceConfig.HiChain;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+import nodomain.freeyourgadget.gadgetbridge.util.CryptoUtils;
+import nodomain.freeyourgadget.gadgetbridge.util.GB;
+import nodomain.freeyourgadget.gadgetbridge.util.StringUtils;
+
+public class GetHiChainRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(GetHiChainRequest.class);
+    // Attributs used along all operation
+    private HiChain.Request req = null;
+    private byte operationCode = 0x02;
+    private byte step;
+    private byte[] authIdSelf = null;
+    private byte[] authIdPeer = null;
+    private byte[] randSelf = null;
+    private byte[] randPeer = null;
+    private long requestId = 0x00;
+    private JSONObject json = null;
+    private byte[] sessionKey = null;
+    // Attributs used once
+    private byte[] seed = null;
+    private byte[] challenge = null;
+    private byte[] psk = null;
+
+
+    public GetHiChainRequest(HuaweiSupportProvider support, boolean firstConnection) {
+        super(support);
+        this.serviceId = DeviceConfig.id;
+        this.commandId = HiChain.id;
+        if (firstConnection) {
+            operationCode = 0x01;
+        }
+        this.step = 0x01;
+    }
+
+    public GetHiChainRequest(Request prevReq) {
+        super(prevReq.supportProvider);
+        this.serviceId = DeviceConfig.id;
+        this.commandId = HiChain.id;
+        GetHiChainRequest hcReq = (GetHiChainRequest)prevReq;
+        this.req = hcReq.req;
+        this.requestId = (Long)hcReq.requestId;
+        this.operationCode = (byte)hcReq.operationCode;
+        this.step = (byte)hcReq.step;
+        this.authIdSelf = hcReq.authIdSelf;
+        this.authIdPeer = hcReq.authIdPeer;
+        this.randSelf = hcReq.randSelf;
+        this.randPeer = hcReq.randPeer;
+        this.psk = hcReq.psk;
+        this.json = hcReq.json;
+        this.sessionKey = hcReq.sessionKey;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        if (requestId == 0x00) {
+            requestId = System.currentTimeMillis();
+        }
+
+        LOG.debug("Request operationCode: " + operationCode + " - step: " + step);
+        if (req == null) req = new HiChain.Request(
+                operationCode,
+                requestId,
+                supportProvider.getAndroidId(),
+                HuaweiConstants.GROUP_ID
+        );
+        HuaweiPacket packet = null;
+        int messageId = step;
+        try {
+            if (step == 0x01) {
+                seed = new byte[32];
+                new Random().nextBytes(seed);
+                randSelf = new byte[16];
+                new Random().nextBytes(randSelf);
+                HiChain.Request.StepOne stepOne = req.new StepOne(paramsProvider, messageId, randSelf, seed );
+                packet = stepOne;
+            } else if (step == 0x02) {
+                byte[] message = ByteBuffer
+                        .allocate(randPeer.length + randSelf.length + authIdSelf.length + authIdPeer.length)
+                        .put(randSelf)
+                        .put(randPeer)
+                        .put(authIdPeer)
+                        .put(authIdSelf)
+                        .array();
+                byte[] selfToken = CryptoUtils.calcHmacSha256(psk, message);
+                HiChain.Request.StepTwo stepTwo = req.new StepTwo(paramsProvider, messageId, selfToken);
+                packet = stepTwo;
+            } else if (step == 0x03) {
+                byte[] salt = ByteBuffer
+                    .allocate( randSelf.length + randPeer.length)
+                    .put(randSelf)
+                    .put(randPeer)
+                    .array();
+                byte[] info = "hichain_iso_session_key".getBytes(StandardCharsets.UTF_8);
+                sessionKey = CryptoUtils.hkdfSha256(psk, salt, info, 32);
+                LOG.debug("sessionKey: " + GB.hexdump(sessionKey));
+                if (operationCode == 0x01) {
+                    byte[] nonce = new byte[12];
+                    new Random().nextBytes(nonce);
+                    challenge = new byte[16];
+                    new Random().nextBytes(challenge);
+                    byte[] aad = "hichain_iso_exchange".getBytes(StandardCharsets.UTF_8);
+                    byte[] encData = CryptoUtils.encryptAES_GCM_NoPad(challenge, sessionKey, nonce, aad); //aesGCMNoPadding encrypt(sessionKey as key, challenge to encrypt, nonce as iv)
+                    HiChain.Request.StepThree stepThree = req.new StepThree(paramsProvider, messageId, nonce, encData);
+                    packet = stepThree;
+                } else {
+                    step += 0x01;
+                }
+            }
+            if (step == 0x04) {
+                LOG.debug("Step " + step);
+                byte[] nonce = new byte[12];
+                new Random().nextBytes(nonce);
+                byte[] input = new byte[]{0x00, 0x00, 0x00, 0x00};
+                byte[] aad = "hichain_iso_result".getBytes(StandardCharsets.UTF_8);
+                byte[] encResult = CryptoUtils.encryptAES_GCM_NoPad(input, sessionKey, nonce, aad);
+                HiChain.Request.StepFour stepFour = req.new StepFour(paramsProvider, messageId, nonce, encResult);
+                packet = stepFour;
+
+            }
+            LOG.debug("JSONObject on creation:" + (new JSONObject(packet.getTlv().getString(1))).getJSONObject("payload").toString());
+            return packet.serialize();
+        } catch (Exception e) {
+            // TODO: Make exception explicit
+            throw new RequestCreationException("HiChain exception", e);
+        }
+        //return null;
+    }
+
+    @Override
+    protected void processResponse() throws ResponseParseException {
+        if (!(receivedPacket instanceof HiChain.Response))
+            throw new ResponseTypeMismatchException(receivedPacket, HiChain.Response.class);
+
+        // TODO: handle failure codes
+
+        HiChain.Response response = (HiChain.Response)receivedPacket;
+        step = response.step;
+
+        LOG.debug("Response operationCode: " + operationCode + " - step: " + step);
+        try {
+            if (step == 0x04) {
+                if (operationCode == 0x01) {
+                    LOG.debug("Finished auth operation, go to bind");
+                    GetHiChainRequest nextRequest = new GetHiChainRequest(supportProvider, false);
+                    nextRequest.setFinalizeReq(this.finalizeReq);
+                    this.nextRequest(nextRequest);
+                } else {
+                    LOG.debug("Finished bind operation");
+                    byte[] salt = ByteBuffer
+                        .allocate( randSelf.length + randPeer.length)
+                        .put(randSelf)
+                        .put(randPeer)
+                        .array();
+                    byte[] info = "hichain_return_key".getBytes(StandardCharsets.UTF_8);
+                    byte[] key = CryptoUtils.hkdfSha256(sessionKey, salt, info, 32);
+                    LOG.debug("Final sessionKey:" + GB.hexdump(key));
+                    paramsProvider.setSecretKey(key);
+                }
+            } else {
+                if (step == 0x01) {
+                    byte[] key = null;
+                    authIdSelf = supportProvider.getAndroidId();
+                    authIdPeer = response.step1Data.peerAuthId;
+                    randPeer = response.step1Data.isoSalt;
+                    byte[] peerToken = response.step1Data.token;
+                    // GeneratePsk
+                    if (operationCode == 0x01) {
+                        String pinCodeHexStr = StringUtils.bytesToHex(paramsProvider.getPinCode());
+                        byte[] pinCode = pinCodeHexStr.getBytes(StandardCharsets.UTF_8);
+                        key = CryptoUtils.digest(pinCode);
+                    } else {
+                        key = supportProvider.getSecretKey();
+                    }
+                    psk = CryptoUtils.calcHmacSha256(key, seed);
+                    byte[] message = ByteBuffer
+                        .allocate(randPeer.length + randSelf.length + authIdSelf.length + authIdPeer.length)
+                        .put(randPeer)
+                        .put(randSelf)
+                        .put(authIdSelf)
+                        .put(authIdPeer)
+                        .array();
+                    byte[] tokenCheck = CryptoUtils.calcHmacSha256(psk, message);
+                    if (!Arrays.equals(peerToken, tokenCheck)) {
+                        LOG.debug("tokenCheck: " + GB.hexdump(tokenCheck) + " is different than " + GB.hexdump(peerToken));
+                        throw new RequestCreationException("tokenCheck: " + GB.hexdump(tokenCheck) + " is different than " + GB.hexdump(peerToken));
+                    } else {
+                        LOG.debug("Token check passes");
+                    }
+                } else if (step == 0x02) {
+                    byte[] returnCodeMac = response.step2Data.returnCodeMac;
+                    byte[] returnCodeMacCheck = CryptoUtils.calcHmacSha256(psk, new byte[]{0x00, 0x00, 0x00, 0x00});
+                    if (!Arrays.equals(returnCodeMacCheck, returnCodeMac)) {
+                        LOG.debug("returnCodeMacCheck: " + GB.hexdump(returnCodeMacCheck) + " is different than " + GB.hexdump(returnCodeMac));
+                        throw new RequestCreationException("returnCodeMacCheck: " + GB.hexdump(returnCodeMacCheck) + " is different than " + GB.hexdump(returnCodeMac));
+                    } else {
+                        LOG.debug("returnCodeMac check passes");
+                    }
+                } else if (step == 0x03) {
+                    if (operationCode == 0x01) {
+                        byte[] nonce = response.step3Data.nonce;
+                        byte[] encAuthToken = response.step3Data.encAuthToken;
+                        byte[] authToken = CryptoUtils.decryptAES_GCM_NoPad(encAuthToken, sessionKey, nonce, challenge);
+                        supportProvider.setSecretKey(authToken);
+                        LOG.debug("Set secret key");
+                    }
+                }
+                this.step += 0x01;
+                GetHiChainRequest nextRequest = new GetHiChainRequest(this);
+                nextRequest.setFinalizeReq(this.finalizeReq);
+                this.nextRequest(nextRequest);
+            }
+        } catch (Exception e) {
+            // TODO: Specify exceptions
+            throw new ResponseParseException(e);
+        }
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetLinkParamsRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetLinkParamsRequest.java
new file mode 100644
index 000000000..32871a9d6
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetLinkParamsRequest.java
@@ -0,0 +1,87 @@
+/*  Copyright (C) 2021-2023 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import static nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.DeviceConfig.LinkParams;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.DeviceConfig;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+// GetLinkParamsRequest<HuaweiBtLESupport, BtLERequest>
+public class GetLinkParamsRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(GetLinkParamsRequest.class);
+
+    public byte[] serverNonce;
+    public byte bondState;
+
+    public GetLinkParamsRequest(
+            HuaweiSupportProvider support,
+            nodomain.freeyourgadget.gadgetbridge.service.btbr.TransactionBuilder builder
+    ) {
+        super(support, builder);
+        this.serviceId = DeviceConfig.id;
+        this.commandId = LinkParams.id;
+        this.serverNonce = new byte[18];
+        isSelfQueue = false;
+    }
+
+    public GetLinkParamsRequest(
+            HuaweiSupportProvider support,
+            nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder builder
+    ) {
+        super(support, builder);
+        this.serviceId = DeviceConfig.id;
+        this.commandId = LinkParams.id;
+        this.serverNonce = new byte[18];
+        isSelfQueue = false;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        try {
+            return new LinkParams.Request(paramsProvider, supportProvider.getHuaweiType()).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() throws ResponseParseException {
+        LOG.debug("handle LinkParams");
+
+        if (!(receivedPacket instanceof LinkParams.Response))
+            throw new ResponseTypeMismatchException(receivedPacket, LinkParams.Response.class);
+
+        supportProvider.setProtocolVersion(((LinkParams.Response) receivedPacket).protocolVersion);
+        paramsProvider.setAuthMode(((LinkParams.Response) receivedPacket).authMode);
+
+        paramsProvider.setSliceSize(((LinkParams.Response) receivedPacket).sliceSize);
+        paramsProvider.setMtu(((LinkParams.Response) receivedPacket).mtu);
+
+        this.serverNonce = ((LinkParams.Response) receivedPacket).serverNonce;
+        paramsProvider.setAuthVersion(((LinkParams.Response) receivedPacket).authVersion);
+
+        this.bondState = ((LinkParams.Response) receivedPacket).bondState;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetNotificationCapabilitiesRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetNotificationCapabilitiesRequest.java
new file mode 100644
index 000000000..4f990ce82
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetNotificationCapabilitiesRequest.java
@@ -0,0 +1,56 @@
+/*  Copyright (C) 2023 Gaignon Damien
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.Notifications;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.Notifications.NotificationCapabilities;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class GetNotificationCapabilitiesRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(GetNotificationCapabilitiesRequest.class);
+
+    public GetNotificationCapabilitiesRequest(HuaweiSupportProvider support) {
+        super(support);
+        this.serviceId = Notifications.id;
+        this.commandId = NotificationCapabilities.id;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        try {
+            return new NotificationCapabilities.Request(paramsProvider).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() throws ResponseParseException {
+        LOG.debug("handle Get Notification Capabilities");
+
+        if (!(receivedPacket instanceof NotificationCapabilities.Response))
+            throw new ResponseTypeMismatchException(receivedPacket, NotificationCapabilities.Response.class);
+
+        supportProvider.getHuaweiCoordinator().saveNotificationCapabilities(((NotificationCapabilities.Response) receivedPacket).capabilities);
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetNotificationConstraintsRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetNotificationConstraintsRequest.java
new file mode 100644
index 000000000..b3399c928
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetNotificationConstraintsRequest.java
@@ -0,0 +1,56 @@
+/*  Copyright (C) 2023 Gaignon Damien
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.Notifications;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.Notifications.NotificationConstraints;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class GetNotificationConstraintsRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(GetNotificationConstraintsRequest.class);
+
+    public GetNotificationConstraintsRequest(HuaweiSupportProvider support) {
+        super(support);
+        this.serviceId = Notifications.id;
+        this.commandId = NotificationConstraints.id;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        try {
+            return new NotificationConstraints.Request(paramsProvider).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() throws ResponseParseException {
+        LOG.debug("handle Get Notification Constraint");
+
+        if (!(receivedPacket instanceof NotificationConstraints.Response))
+            throw new ResponseTypeMismatchException(receivedPacket, NotificationConstraints.Response.class);
+
+        supportProvider.getHuaweiCoordinator().saveNotificationConstraints(((NotificationConstraints.Response) receivedPacket).constraints);
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetPhoneInfoRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetPhoneInfoRequest.java
new file mode 100644
index 000000000..ad65d5cb5
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetPhoneInfoRequest.java
@@ -0,0 +1,55 @@
+/*  Copyright (C) 2023 Gaignon Damien
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.GBException;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket.CryptoException;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.DeviceConfig;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class GetPhoneInfoRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(GetPhoneInfoRequest.class);
+
+    private byte[] phoneInfo;
+
+    public GetPhoneInfoRequest(HuaweiSupportProvider support, byte[] phoneInfo) {
+        super(support);
+        this.serviceId = DeviceConfig.id;
+        this.commandId = DeviceConfig.PhoneInfo.id;
+        this.phoneInfo = phoneInfo;
+        this.addToResponse = false;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        try {
+            return new DeviceConfig.PhoneInfo.Request(paramsProvider, this.phoneInfo).serialize();
+        } catch (CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() throws ResponseParseException {
+        LOG.debug("handle Phone Info");
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetPincodeRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetPincodeRequest.java
new file mode 100644
index 000000000..7b3004f91
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetPincodeRequest.java
@@ -0,0 +1,57 @@
+/*  Copyright (C) 2021-2022 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiCrypto;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket.CryptoException;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.DeviceConfig;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class GetPincodeRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(GetPincodeRequest.class);
+
+    public GetPincodeRequest(HuaweiSupportProvider support) {
+        super(support);
+        this.serviceId = DeviceConfig.id;
+        this.commandId = DeviceConfig.PinCode.id;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        try {
+            return new DeviceConfig.PinCode.Request(paramsProvider).serialize();
+        } catch (CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() throws ResponseParseException {
+        LOG.debug("handle Pincode");
+
+        if (!(receivedPacket instanceof DeviceConfig.PinCode.Response))
+            throw new ResponseTypeMismatchException(receivedPacket, DeviceConfig.PinCode.Response.class);
+
+        paramsProvider.setPinCode(((DeviceConfig.PinCode.Response) receivedPacket).pinCode);
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetProductInformationRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetProductInformationRequest.java
new file mode 100644
index 000000000..1c480d921
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetProductInformationRequest.java
@@ -0,0 +1,58 @@
+/*  Copyright (C) 2021-2022 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.DeviceConfig;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class GetProductInformationRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(GetProductInformationRequest.class);
+
+    public GetProductInformationRequest(HuaweiSupportProvider support) {
+        super(support);
+        this.serviceId = DeviceConfig.id;
+        this.commandId = DeviceConfig.ProductInfo.id;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        try {
+            return new DeviceConfig.ProductInfo.Request(paramsProvider, supportProvider.getHuaweiType()).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() throws ResponseParseException {
+        LOG.debug("handle Product Information");
+
+        if (!(receivedPacket instanceof DeviceConfig.ProductInfo.Response))
+            throw new ResponseTypeMismatchException(receivedPacket, DeviceConfig.ProductInfo.Response.class);
+
+        getDevice().setFirmwareVersion(((DeviceConfig.ProductInfo.Response) receivedPacket).softwareVersion);
+        getDevice().setFirmwareVersion2(((DeviceConfig.ProductInfo.Response) receivedPacket).hardwareVersion);
+        getDevice().setModel(((DeviceConfig.ProductInfo.Response) receivedPacket).productModel);
+   }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSecurityNegotiationRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSecurityNegotiationRequest.java
new file mode 100644
index 000000000..5dc11a33d
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSecurityNegotiationRequest.java
@@ -0,0 +1,66 @@
+/*  Copyright (C) 2021-2022 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import android.os.Build;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.DeviceConfig;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class GetSecurityNegotiationRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(GetSecurityNegotiationRequest.class);
+    public int authType = 0x00;
+
+    public GetSecurityNegotiationRequest(HuaweiSupportProvider support) {
+        super(support);
+        this.serviceId = DeviceConfig.id;
+        this.commandId = DeviceConfig.SecurityNegotiation.id;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        try {
+            return new DeviceConfig.SecurityNegotiation.Request(
+                    paramsProvider,
+                    paramsProvider.getAuthMode(),
+                    supportProvider.getAndroidId(),
+                    Build.MODEL
+                ).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() {
+        LOG.debug("handle Security and Negotiation");
+
+        if (!(receivedPacket instanceof DeviceConfig.SecurityNegotiation.Response)) {
+            // TODO: exception
+            return;
+        }
+
+        this.authType = ((DeviceConfig.SecurityNegotiation.Response) receivedPacket).authType;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSettingRelatedRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSettingRelatedRequest.java
new file mode 100644
index 000000000..1ceabd61b
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSettingRelatedRequest.java
@@ -0,0 +1,51 @@
+/*  Copyright (C) 2023 Gaignon Damien
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.GBException;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket.CryptoException;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.DeviceConfig;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class GetSettingRelatedRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(GetSettingRelatedRequest.class);
+
+    public GetSettingRelatedRequest(HuaweiSupportProvider support) {
+        super(support);
+        this.serviceId = DeviceConfig.id;
+        this.commandId = DeviceConfig.SettingRelated.id;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        try {
+            return new DeviceConfig.SettingRelated.Request(paramsProvider).serialize();
+        } catch (CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() throws ResponseParseException {
+        LOG.debug("handle Setting Related");
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSleepDataCountRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSleepDataCountRequest.java
new file mode 100644
index 000000000..c9e7bb997
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSleepDataCountRequest.java
@@ -0,0 +1,85 @@
+/*  Copyright (C) 2022 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.FitnessData;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class GetSleepDataCountRequest extends Request {
+    private final int start;
+    private final int end;
+
+    public GetSleepDataCountRequest(
+            HuaweiSupportProvider support,
+            nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder builder,
+            int start,
+            int end
+    ) {
+        super(support, builder);
+        this.serviceId = FitnessData.id;
+        this.commandId = FitnessData.MessageCount.sleepId;
+
+        this.start = start;
+        this.end = end;
+    }
+
+    public GetSleepDataCountRequest(
+            HuaweiSupportProvider support,
+            nodomain.freeyourgadget.gadgetbridge.service.btbr.TransactionBuilder builder,
+            int start,
+            int end
+    ) {
+        super(support, builder);
+        this.serviceId = FitnessData.id;
+        this.commandId = FitnessData.MessageCount.sleepId;
+
+        this.start = start;
+        this.end = end;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        try {
+            return new FitnessData.MessageCount.Request(
+                    paramsProvider,
+                    this.commandId,
+                    this.start,
+                    this.end
+            ).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() throws ResponseParseException {
+        if (!(receivedPacket instanceof FitnessData.MessageCount.Response))
+            throw new ResponseTypeMismatchException(receivedPacket, FitnessData.MessageCount.Response.class);
+
+        short count = ((FitnessData.MessageCount.Response) receivedPacket).count;
+
+        if (count > 0) {
+            GetSleepDataRequest nextRequest = new GetSleepDataRequest(supportProvider, count, (short) 0);
+            nextRequest.setFinalizeReq(this.finalizeReq);
+            this.nextRequest(nextRequest);
+        }
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSleepDataRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSleepDataRequest.java
new file mode 100644
index 000000000..729e6e5b5
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSleepDataRequest.java
@@ -0,0 +1,98 @@
+/*  Copyright (C) 2022 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.FitnessData;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class GetSleepDataRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(GetSleepDataRequest.class);
+
+    private final short maxCount;
+    private final short count;
+
+    public GetSleepDataRequest(HuaweiSupportProvider support, short maxCount, short count) {
+        super(support);
+        this.serviceId = FitnessData.id;
+        this.commandId = FitnessData.MessageData.sleepId;
+
+        this.maxCount = maxCount;
+        this.count = count;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        try {
+            return new FitnessData.MessageData.Request(paramsProvider, this.commandId, this.count).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() throws ResponseParseException {
+        // FitnessData.MessageData.SleepResponse response = FitnessData.MessageData.SleepResponse.fromTlv(receivedPacket.tlv);
+        if (!(receivedPacket instanceof FitnessData.MessageData.SleepResponse))
+            throw new ResponseTypeMismatchException(receivedPacket, FitnessData.MessageData.SleepResponse.class);
+
+        FitnessData.MessageData.SleepResponse response = (FitnessData.MessageData.SleepResponse) receivedPacket;
+
+        short receivedCount = response.number;
+
+        if (receivedCount != this.count) {
+            LOG.warn("Counts do not match");
+        }
+
+        for (FitnessData.MessageData.SleepResponse.SubContainer subContainer : response.containers) {
+            // TODO: it might make more sense to convert the timestamp in the FitnessData class
+            int[] timestampInts = new int[6];
+
+            for (int i = 0; i < 6; i++) {
+                if (subContainer.timestamp[i] >= 0)
+                    timestampInts[i] = subContainer.timestamp[i];
+                else
+                    timestampInts[i] = subContainer.timestamp[i] & 0xFF;
+            }
+
+            int timestamp =
+                    (timestampInts[0] << 24) +
+                            (timestampInts[1] << 16) +
+                            (timestampInts[2] << 8) +
+                            (timestampInts[3]);
+
+            int durationInt =
+                    (timestampInts[4] << 8L) +
+                            (timestampInts[5]);
+            short duration = (short) (durationInt * 60);
+
+            this.supportProvider.addSleepActivity(timestamp, duration, subContainer.type);
+        }
+
+        if (count + 1 < maxCount) {
+            GetSleepDataRequest nextRequest = new GetSleepDataRequest(supportProvider, this.maxCount, (short) (this.count + 1));
+            nextRequest.setFinalizeReq(this.finalizeReq);
+            this.nextRequest(nextRequest);
+        }
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSmartAlarmList.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSmartAlarmList.java
new file mode 100644
index 000000000..6ca4c6b0f
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSmartAlarmList.java
@@ -0,0 +1,93 @@
+/*  Copyright (C) 2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.Alarms;
+import nodomain.freeyourgadget.gadgetbridge.entities.Alarm;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class GetSmartAlarmList extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(GetSmartAlarmList.class);
+
+    public GetSmartAlarmList(HuaweiSupportProvider support) {
+        super(support);
+
+        this.serviceId = Alarms.id;
+        this.commandId = Alarms.SmartAlarmList.id;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        try {
+            return new Alarms.SmartAlarmList.Request(supportProvider.getParamsProvider()).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() throws ResponseParseException {
+        if (!(receivedPacket instanceof Alarms.SmartAlarmList.Response))
+            throw new ResponseTypeMismatchException(receivedPacket, Alarms.SmartAlarmList.Response.class);
+
+        Alarms.SmartAlarm smartAlarm = ((Alarms.SmartAlarmList.Response) receivedPacket).smartAlarm;
+
+        if (smartAlarm != null) {
+            supportProvider.saveAlarms(new Alarm[] {
+                    new Alarm(
+                            0,
+                            0,
+                            0,
+                            smartAlarm.status,
+                            true,
+                            false,
+                            smartAlarm.repeat,
+                            smartAlarm.startHour,
+                            smartAlarm.startMinute,
+                            false,
+                            "Smart alarm",
+                            ""
+                    )
+            });
+        } else {
+            // Set empty smart alarm so index zero is always smart alarm
+            supportProvider.saveAlarms(new Alarm[] {
+                    new Alarm(
+                            0,
+                            0,
+                            0,
+                            false,
+                            true,
+                            false,
+                            0,
+                            0,
+                            0,
+                            true,
+                            "Smart alarm",
+                            ""
+                    )
+            });
+        }
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetStepDataCountRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetStepDataCountRequest.java
new file mode 100644
index 000000000..9a818a9fc
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetStepDataCountRequest.java
@@ -0,0 +1,62 @@
+/*  Copyright (C) 2022 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.FitnessData;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class GetStepDataCountRequest extends Request {
+    private int start = 0;
+    private int end = 0;
+
+    public GetStepDataCountRequest(HuaweiSupportProvider support, int start, int end) {
+        super(support);
+
+        this.serviceId = FitnessData.id;
+        this.commandId = FitnessData.MessageCount.stepId;
+
+        this.start = start;
+        this.end = end;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        try {
+            return new FitnessData.MessageCount.Request(paramsProvider, this.commandId, this.start, this.end).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() throws ResponseParseException {
+        if (!(receivedPacket instanceof FitnessData.MessageCount.Response))
+            throw new ResponseTypeMismatchException(receivedPacket, FitnessData.MessageCount.Response.class);
+
+        short count = ((FitnessData.MessageCount.Response) receivedPacket).count;
+
+        if (count > 0) {
+            GetStepDataRequest nextRequest = new GetStepDataRequest(supportProvider, count, (short) 0);
+            nextRequest.setFinalizeReq(this.finalizeReq);
+            this.nextRequest(nextRequest);
+        }
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetStepDataRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetStepDataRequest.java
new file mode 100644
index 000000000..d47609da6
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetStepDataRequest.java
@@ -0,0 +1,97 @@
+/*  Copyright (C) 2022 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.FitnessData;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class GetStepDataRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(GetStepDataRequest.class);
+
+    short maxCount;
+    short count;
+
+    public GetStepDataRequest(HuaweiSupportProvider support, short maxCount, short count) {
+        super(support);
+        this.serviceId = FitnessData.id;
+        this.commandId = FitnessData.MessageData.stepId;
+        this.maxCount = maxCount;
+        this.count = count;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        try {
+            return new FitnessData.MessageData.Request(paramsProvider, this.commandId, this.count).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() throws ResponseParseException {
+        if (!(receivedPacket instanceof FitnessData.MessageData.StepResponse))
+            throw new ResponseTypeMismatchException(receivedPacket, FitnessData.MessageData.StepResponse.class);
+
+        FitnessData.MessageData.StepResponse response = (FitnessData.MessageData.StepResponse) receivedPacket;
+
+        if (response.number != this.count) {
+            LOG.warn("Counts do not match! Received: " + response.number + ", expected: " + this.count);
+            this.count = response.number; // This stops it from going into a loop
+        }
+
+        for (FitnessData.MessageData.StepResponse.SubContainer subContainer : response.containers) {
+            int dataTimestamp = subContainer.timestamp;
+
+            if (subContainer.parsedData != null) {
+                short steps = (short) subContainer.steps;
+                short calories = (short) subContainer.calories;
+                short distance = (short) subContainer.distance;
+                byte heartrate = (byte) subContainer.heartrate;
+                byte spo = (byte) subContainer.spo;
+
+                if (steps == -1)
+                    steps = 0;
+                if (calories == -1)
+                    calories = 0;
+                if (distance == -1)
+                    distance = 0;
+
+                for (FitnessData.MessageData.StepResponse.SubContainer.TV tv : subContainer.unknownTVs) {
+                    LOG.warn("Unknown tag in step data: " + tv);
+                }
+
+                this.supportProvider.addStepData(dataTimestamp, steps, calories, distance, spo, heartrate);
+            } else {
+                LOG.error(subContainer.parsedDataError);
+            }
+        }
+
+        if (count + 1 < maxCount) {
+            GetStepDataRequest nextRequest = new GetStepDataRequest(supportProvider, this.maxCount, (short) (this.count + 1));
+            nextRequest.setFinalizeReq(this.finalizeReq);
+            this.nextRequest(nextRequest);
+        }
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSupportedCommandsRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSupportedCommandsRequest.java
new file mode 100644
index 000000000..94c205c76
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSupportedCommandsRequest.java
@@ -0,0 +1,106 @@
+/*  Copyright (C) 2022 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+
+/* In order to be compatible with all devices, request send all possible commands
+to all possible services. This implies long packet which is not handled on the device.
+Thus, this request could be sliced in 3 packets. But this command does not support slicing.
+Thus, one need to send multiple requests and concat the response.
+Packets should be 240 bytes max */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+import java.util.Map;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.DeviceConfig;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class GetSupportedCommandsRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(GetSupportedCommandsRequest.class);
+
+    private final Map<Integer, byte[]> commandsPerService;
+    private final List<Byte> activatedServices;
+
+    public GetSupportedCommandsRequest(
+            HuaweiSupportProvider support,
+            List<Byte> activatedServices
+    ) {
+        super(support);
+        this.serviceId = DeviceConfig.id;
+        this.commandId = DeviceConfig.SupportedCommands.id;
+        this.commandsPerService = DeviceConfig.SupportedCommands.commandsPerService;
+        this.activatedServices = activatedServices;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        DeviceConfig.SupportedCommands.Request commandsRequest = new DeviceConfig.SupportedCommands.Request(paramsProvider);
+        byte nextService = activatedServices.remove(0);
+        boolean fits = commandsRequest.addCommandsForService(nextService, this.commandsPerService.get((int) nextService));
+        while (fits && activatedServices.size() > 0) {
+            nextService = activatedServices.remove(0);
+            fits = commandsRequest.addCommandsForService(nextService, this.commandsPerService.get((int) nextService));
+        }
+        if (!fits)
+            activatedServices.add(0, nextService); // Put the extra back
+        try {
+            return commandsRequest.serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    RequestCallback dynamicServicesReq = new RequestCallback() {
+        @Override
+        public void call() {
+            supportProvider.initializeDynamicServices();
+        }
+    };
+
+    @Override
+    protected void processResponse() throws ResponseParseException {
+        LOG.debug("handle Supported Commands");
+
+        if (!(receivedPacket instanceof DeviceConfig.SupportedCommands.Response))
+            throw new ResponseTypeMismatchException(receivedPacket, DeviceConfig.SupportedCommands.Response.class);
+
+        for (DeviceConfig.SupportedCommands.Response.CommandsList commandsList : ((DeviceConfig.SupportedCommands.Response) receivedPacket).commandsLists) {
+            supportProvider.getHuaweiCoordinator().addCommandsForService(
+                    commandsList.service,
+                    commandsList.commands
+            );
+        }
+
+        if (activatedServices.size() > 0) {
+            GetSupportedCommandsRequest nextRequest = new GetSupportedCommandsRequest(supportProvider, activatedServices);
+            this.nextRequest(nextRequest);
+        } else {
+            supportProvider.getHuaweiCoordinator().printCommandsPerService();
+            if (supportProvider.getHuaweiCoordinator().supportsExpandCapability()) {
+                GetExpandCapabilityRequest nextRequest = new GetExpandCapabilityRequest(supportProvider);
+                nextRequest.setFinalizeReq(dynamicServicesReq);
+                this.nextRequest(nextRequest);
+            } else {
+                dynamicServicesReq.call();
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSupportedServicesRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSupportedServicesRequest.java
new file mode 100644
index 000000000..55648fffe
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSupportedServicesRequest.java
@@ -0,0 +1,69 @@
+/*  Copyright (C) 2022 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.DeviceConfig;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class GetSupportedServicesRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(GetSupportedServicesRequest.class);
+
+    private final byte[] knownSupportedServices;
+
+    public GetSupportedServicesRequest(HuaweiSupportProvider support) {
+        super(support);
+        this.serviceId = DeviceConfig.id;
+        this.commandId = DeviceConfig.SupportedServices.id;
+        this.knownSupportedServices = DeviceConfig.SupportedServices.knownSupportedServices;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        try {
+            return new DeviceConfig.SupportedServices.Request(paramsProvider, this.knownSupportedServices).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() throws ResponseParseException {
+        LOG.debug("handle Supported Services");
+
+        if (!(receivedPacket instanceof DeviceConfig.SupportedServices.Response))
+            throw new ResponseTypeMismatchException(receivedPacket, DeviceConfig.SupportedServices.Response.class);
+
+        byte[] supportedServices = ((DeviceConfig.SupportedServices.Response) receivedPacket).supportedServices;
+        List<Byte> activatedServices = new ArrayList<>();
+        for (int i = 0; i < supportedServices.length; i++) {
+            if (supportedServices[i] == 1) {
+                activatedServices.add(knownSupportedServices[i]);
+            }
+        }
+
+        GetSupportedCommandsRequest supportedCommandsReq = new GetSupportedCommandsRequest(supportProvider, activatedServices);
+        nextRequest(supportedCommandsReq);
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWearStatusRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWearStatusRequest.java
new file mode 100644
index 000000000..986dc6931
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWearStatusRequest.java
@@ -0,0 +1,51 @@
+/*  Copyright (C) 2021-2023 Gaignon Damien
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.DeviceConfig;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.DeviceConfig.WearStatus;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class GetWearStatusRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(GetWearStatusRequest.class);
+
+    public GetWearStatusRequest(HuaweiSupportProvider support) {
+        super(support);
+        this.serviceId = DeviceConfig.id;
+        this.commandId = WearStatus.id;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        try {
+            return new WearStatus.Request(paramsProvider).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() {
+        LOG.debug("handle Get Wear Status");
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWorkoutCountRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWorkoutCountRequest.java
new file mode 100644
index 000000000..87559fb15
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWorkoutCountRequest.java
@@ -0,0 +1,89 @@
+/*  Copyright (C) 2022 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.Workout;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class GetWorkoutCountRequest extends Request {
+    private final int start;
+    private final int end;
+
+    public GetWorkoutCountRequest(
+            HuaweiSupportProvider support,
+            nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder builder,
+            int start,
+            int end
+    ) {
+        super(support, builder);
+
+        this.serviceId = Workout.id;
+        this.commandId = Workout.WorkoutCount.id;
+
+        this.start = start;
+        this.end = end;
+    }
+
+    public GetWorkoutCountRequest(
+            HuaweiSupportProvider support,
+            nodomain.freeyourgadget.gadgetbridge.service.btbr.TransactionBuilder builder,
+            int start,
+            int end
+    ) {
+        super(support, builder);
+
+        this.serviceId = Workout.id;
+        this.commandId = Workout.WorkoutCount.id;
+
+        this.start = start;
+        this.end = end;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        try {
+            return new Workout.WorkoutCount.Request(paramsProvider, this.start, this.end).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() throws ResponseParseException {
+        if (!(receivedPacket instanceof Workout.WorkoutCount.Response))
+            throw new ResponseTypeMismatchException(receivedPacket, Workout.WorkoutCount.Response.class);
+
+        Workout.WorkoutCount.Response packet = (Workout.WorkoutCount.Response) receivedPacket;
+
+        if (packet.count != packet.workoutNumbers.size())
+            throw new WorkoutParseException("Packet count and workout numbers size do not match.");
+
+        if (packet.count > 0) {
+            GetWorkoutTotalsRequest nextRequest = new GetWorkoutTotalsRequest(
+                    this.supportProvider,
+                    packet.workoutNumbers.remove(0),
+                    packet.workoutNumbers
+            );
+            nextRequest.setFinalizeReq(this.finalizeReq);
+            this.nextRequest(nextRequest);
+        }
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWorkoutDataRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWorkoutDataRequest.java
new file mode 100644
index 000000000..13a88b372
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWorkoutDataRequest.java
@@ -0,0 +1,129 @@
+/*  Copyright (C) 2022 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Arrays;
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.Workout;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiWorkoutGbParser;
+
+public class GetWorkoutDataRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(GetWorkoutDataRequest.class);
+
+    Workout.WorkoutCount.Response.WorkoutNumbers workoutNumbers;
+    List<Workout.WorkoutCount.Response.WorkoutNumbers> remainder;
+    short number;
+    Long databaseId;
+
+    /**
+     * Request to get workout totals
+     * @param support The support
+     * @param workoutNumbers The numbers of the current workout
+     * @param remainder The numbers of the remainder if the workouts to get
+     * @param number The number of this data request
+     */
+    public GetWorkoutDataRequest(HuaweiSupportProvider support, Workout.WorkoutCount.Response.WorkoutNumbers workoutNumbers, List<Workout.WorkoutCount.Response.WorkoutNumbers> remainder, short number, Long databaseId) {
+        super(support);
+
+        this.serviceId = Workout.id;
+        this.commandId = Workout.WorkoutData.id;
+
+        this.workoutNumbers = workoutNumbers;
+        this.remainder = remainder;
+        this.number = number;
+
+        this.databaseId = databaseId;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        try {
+            return new Workout.WorkoutData.Request(paramsProvider, workoutNumbers.workoutNumber, this.number).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() throws ResponseParseException {
+        if (!(receivedPacket instanceof Workout.WorkoutData.Response))
+            throw new ResponseTypeMismatchException(receivedPacket, Workout.WorkoutData.Response.class);
+
+        Workout.WorkoutData.Response packet = (Workout.WorkoutData.Response) receivedPacket;
+
+        if (packet.workoutNumber != this.workoutNumbers.workoutNumber)
+            throw new WorkoutParseException("Incorrect workout number!");
+
+        if (packet.dataNumber != this.number)
+            throw new WorkoutParseException("Incorrect data number!");
+
+        LOG.info("Workout {} data {}:", this.workoutNumbers.workoutNumber, this.number);
+        LOG.info("Workout : " + packet.workoutNumber);
+        LOG.info("Data num: " + packet.dataNumber);
+        LOG.info("Header  : " + Arrays.toString(packet.rawHeader));
+        LOG.info("Header  : " + packet.header);
+        LOG.info("Data    : " + Arrays.toString(packet.rawData));
+        LOG.info("Data    : " + Arrays.toString(packet.dataList.toArray()));
+        LOG.info("Bitmap  : " + packet.innerBitmap);
+
+        this.supportProvider.addWorkoutSampleData(
+                this.databaseId,
+                packet.dataList
+        );
+
+        if (this.workoutNumbers.dataCount > this.number + 1) {
+            GetWorkoutDataRequest nextRequest = new GetWorkoutDataRequest(
+                    this.supportProvider,
+                    this.workoutNumbers,
+                    this.remainder,
+                    (short) (this.number + 1),
+                    databaseId
+            );
+            nextRequest.setFinalizeReq(this.finalizeReq);
+            this.nextRequest(nextRequest);
+        } else if (this.workoutNumbers.paceCount > 0) {
+            GetWorkoutPaceRequest nextRequest = new GetWorkoutPaceRequest(
+                    this.supportProvider,
+                    this.workoutNumbers,
+                    this.remainder,
+                    (short) 0,
+                    this.databaseId
+            );
+            nextRequest.setFinalizeReq(this.finalizeReq);
+            this.nextRequest(nextRequest);
+        } else {
+            HuaweiWorkoutGbParser.parseWorkout(this.databaseId);
+
+            if (remainder.size() > 0) {
+                GetWorkoutTotalsRequest nextRequest = new GetWorkoutTotalsRequest(
+                        this.supportProvider,
+                        remainder.remove(0),
+                        remainder
+                );
+                nextRequest.setFinalizeReq(this.finalizeReq);
+                this.nextRequest(nextRequest);
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWorkoutPaceRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWorkoutPaceRequest.java
new file mode 100644
index 000000000..d6b9a1900
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWorkoutPaceRequest.java
@@ -0,0 +1,106 @@
+/*  Copyright (C) 2022 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Arrays;
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.Workout;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiWorkoutGbParser;
+
+public class GetWorkoutPaceRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(GetWorkoutPaceRequest.class);
+
+    Workout.WorkoutCount.Response.WorkoutNumbers workoutNumbers;
+    List<Workout.WorkoutCount.Response.WorkoutNumbers> remainder;
+    short number;
+    Long databaseId;
+
+    public GetWorkoutPaceRequest(HuaweiSupportProvider support, Workout.WorkoutCount.Response.WorkoutNumbers workoutNumbers, List<Workout.WorkoutCount.Response.WorkoutNumbers> remainder, short number, Long databaseId) {
+        super(support);
+
+        this.serviceId = Workout.id;
+        this.commandId = Workout.WorkoutPace.id;
+
+        this.workoutNumbers = workoutNumbers;
+        this.remainder = remainder;
+        this.number = number;
+
+        this.databaseId = databaseId;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        try {
+            return new Workout.WorkoutPace.Request(paramsProvider,this.workoutNumbers.workoutNumber, this.number).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() throws ResponseParseException {
+        if (!(receivedPacket instanceof Workout.WorkoutPace.Response))
+            throw new ResponseTypeMismatchException(receivedPacket, Workout.WorkoutPace.Response.class);
+
+        Workout.WorkoutPace.Response packet = (Workout.WorkoutPace.Response) receivedPacket;
+
+        if (packet.workoutNumber != this.workoutNumbers.workoutNumber)
+            throw new WorkoutParseException("Incorrect workout number!");
+
+        if (packet.paceNumber != this.number)
+            throw new WorkoutParseException("Incorrect pace number!");
+
+        LOG.info("Workout {} pace {}:", this.workoutNumbers.workoutNumber, this.number);
+        LOG.info("Workout  : " + packet.workoutNumber);
+        LOG.info("Pace     : " + packet.paceNumber);
+        LOG.info("Block num: " + packet.blocks.size());
+        LOG.info("Blocks   : " + Arrays.toString(packet.blocks.toArray()));
+
+        supportProvider.addWorkoutPaceData(this.databaseId, packet.blocks);
+
+        if (this.workoutNumbers.paceCount > this.number + 1) {
+            GetWorkoutPaceRequest nextRequest = new GetWorkoutPaceRequest(
+                    this.supportProvider,
+                    this.workoutNumbers,
+                    this.remainder,
+                    (short) (this.number + 1),
+                    this.databaseId
+            );
+            nextRequest.setFinalizeReq(this.finalizeReq);
+            this.nextRequest(nextRequest);
+        } else {
+            HuaweiWorkoutGbParser.parseWorkout(this.databaseId);
+
+            if (remainder.size() > 0) {
+                GetWorkoutTotalsRequest nextRequest = new GetWorkoutTotalsRequest(
+                        this.supportProvider,
+                        remainder.remove(0),
+                        remainder
+                );
+                nextRequest.setFinalizeReq(this.finalizeReq);
+                this.nextRequest(nextRequest);
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWorkoutTotalsRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWorkoutTotalsRequest.java
new file mode 100644
index 000000000..518ef270a
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWorkoutTotalsRequest.java
@@ -0,0 +1,120 @@
+/*  Copyright (C) 2022 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.Workout;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiWorkoutGbParser;
+
+public class GetWorkoutTotalsRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(GetWorkoutTotalsRequest.class);
+
+    Workout.WorkoutCount.Response.WorkoutNumbers workoutNumbers;
+    List<Workout.WorkoutCount.Response.WorkoutNumbers> remainder;
+
+    /**
+     * Request to get workout totals
+     * @param support The support
+     * @param workoutNumbers The numbers of the current workout
+     * @param remainder The numbers of the remainder of the workouts to get
+     */
+    public GetWorkoutTotalsRequest(HuaweiSupportProvider support, Workout.WorkoutCount.Response.WorkoutNumbers workoutNumbers, List<Workout.WorkoutCount.Response.WorkoutNumbers> remainder) {
+        super(support);
+
+        this.serviceId = Workout.id;
+        this.commandId = Workout.WorkoutTotals.id;
+
+        this.workoutNumbers = workoutNumbers;
+        this.remainder = remainder;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        try {
+            return new Workout.WorkoutTotals.Request(paramsProvider, workoutNumbers.workoutNumber).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() throws ResponseParseException {
+        if (!(receivedPacket instanceof Workout.WorkoutTotals.Response))
+            throw new ResponseTypeMismatchException(receivedPacket, Workout.WorkoutTotals.Response.class);
+
+        Workout.WorkoutTotals.Response packet = (Workout.WorkoutTotals.Response) receivedPacket;
+
+        if (packet.number != this.workoutNumbers.workoutNumber)
+            throw new WorkoutParseException("Incorrect workout number!");
+
+        LOG.info("Workout {} totals:", this.workoutNumbers.workoutNumber);
+        LOG.info("Number  : " + packet.number);
+        LOG.info("Status  : " + packet.status);
+        LOG.info("Start   : " + packet.startTime);
+        LOG.info("End     : " + packet.endTime);
+        LOG.info("Calories: " + packet.calories);
+        LOG.info("Distance: " + packet.distance);
+        LOG.info("Steps   : " + packet.stepCount);
+        LOG.info("Time    : " + packet.totalTime);
+        LOG.info("Duration: " + packet.duration);
+        LOG.info("Type    : " + packet.type);
+
+        Long databaseId = this.supportProvider.addWorkoutTotalsData(packet);
+
+        // Create the next request
+        if (this.workoutNumbers.dataCount > 0) {
+            GetWorkoutDataRequest nextRequest = new GetWorkoutDataRequest(
+                    this.supportProvider,
+                    this.workoutNumbers,
+                    this.remainder,
+                    (short) 0,
+                    databaseId
+            );
+            nextRequest.setFinalizeReq(this.finalizeReq);
+            this.nextRequest(nextRequest);
+        } else if (this.workoutNumbers.paceCount > 0) {
+            GetWorkoutPaceRequest nextRequest = new GetWorkoutPaceRequest(
+                    this.supportProvider,
+                    this.workoutNumbers,
+                    this.remainder,
+                    (short) 0,
+                    databaseId
+            );
+            nextRequest.setFinalizeReq(this.finalizeReq);
+            this.nextRequest(nextRequest);
+        } else {
+            HuaweiWorkoutGbParser.parseWorkout(databaseId);
+
+            if (remainder.size() > 0) {
+                GetWorkoutTotalsRequest nextRequest = new GetWorkoutTotalsRequest(
+                        this.supportProvider,
+                        remainder.remove(0),
+                        remainder
+                );
+                nextRequest.setFinalizeReq(this.finalizeReq);
+                this.nextRequest(nextRequest);
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/Request.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/Request.java
new file mode 100644
index 000000000..65a8a2b37
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/Request.java
@@ -0,0 +1,304 @@
+/*  Copyright (C) 2021-2023 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import android.bluetooth.BluetoothGattCharacteristic;
+import android.content.Context;
+import android.widget.Toast;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiCrypto;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.miband.operations.OperationStatus;
+import nodomain.freeyourgadget.gadgetbridge.util.GB;
+
+// Based on nodomain.freeyourgadget.gadgetbridge.service.devices.lefun.requests.Request
+
+/**
+ * Add capacity to :
+ *     - chain requests;
+ *     - use data from a past request;
+ *     - call a function after last request.
+ */
+
+public class Request {
+    private static final Logger LOG = LoggerFactory.getLogger(Request.class);
+
+    public static class RequestCreationException extends Exception {
+        public RequestCreationException(String message) {
+            super(message);
+        }
+
+        public RequestCreationException(HuaweiPacket.CryptoException e) {
+            super(e);
+        }
+
+        public RequestCreationException(String message, Exception e) {
+            super(message, e);
+        }
+    }
+
+    public static class ResponseParseException extends Exception {
+        public ResponseParseException(String message) {
+            super(message);
+        }
+
+        public ResponseParseException(Exception e) {
+            super(e);
+        }
+
+        public ResponseParseException(String message, Exception e) {
+            super(message, e);
+        }
+    }
+
+    public static class ResponseTypeMismatchException extends ResponseParseException {
+        public ResponseTypeMismatchException(HuaweiPacket a, Class<?> b) {
+            super("Response type mismatch, packet is of type " + a.getClass() + " but expected " + b);
+        }
+    }
+
+    public static class WorkoutParseException extends ResponseParseException {
+        public WorkoutParseException(String message) {
+            super(message);
+        }
+    }
+
+    protected OperationStatus operationStatus = OperationStatus.INITIAL;
+    protected byte serviceId;
+    protected byte commandId;
+    protected HuaweiPacket receivedPacket = null;
+    protected HuaweiSupportProvider supportProvider;
+    protected HuaweiPacket.ParamsProvider paramsProvider;
+    private nodomain.freeyourgadget.gadgetbridge.service.btbr.TransactionBuilder builderBr;
+    private nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder builderLe;
+    // Be able to autostart a request after this one
+    protected Request nextRequest = null;
+    protected boolean isSelfQueue = false;
+    // Callback function to start after the request
+    protected RequestCallback finalizeReq = null;
+    // Stop chaining requests and clean support.inProgressRequests from these requests
+    protected boolean stopChain = false;
+    protected static HuaweiCrypto huaweiCrypto = null;
+    protected boolean addToResponse = true;
+
+    public static class RequestCallback {
+        protected HuaweiSupportProvider support = null;
+        public RequestCallback() {}
+        public RequestCallback(HuaweiSupportProvider supportProvider) {
+            support = supportProvider;
+        }
+        public void call() {};
+        public void handleException(ResponseParseException e) {
+            LOG.error("Callback request exception", e);
+        };
+    }
+
+    public Request(HuaweiSupportProvider supportProvider, nodomain.freeyourgadget.gadgetbridge.service.btbr.TransactionBuilder builder) {
+        this.supportProvider = supportProvider;
+        this.paramsProvider = supportProvider.getParamsProvider();
+        assert !supportProvider.isBLE();
+        this.builderBr = builder;
+
+        this.isSelfQueue = true;
+    }
+
+    public Request(HuaweiSupportProvider supportProvider, nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder builder) {
+        this.supportProvider = supportProvider;
+        this.paramsProvider = supportProvider.getParamsProvider();
+        assert supportProvider.isBLE();
+        this.builderLe = builder;
+
+        this.isSelfQueue = true;
+    }
+
+    public Request(HuaweiSupportProvider supportProvider) {
+        this.supportProvider = supportProvider;
+        this.paramsProvider = supportProvider.getParamsProvider();
+
+        if (!supportProvider.isBLE())
+            this.builderBr = supportProvider.createBrTransactionBuilder(getName());
+        else
+            this.builderLe = supportProvider.createLeTransactionBuilder(getName());
+
+        this.isSelfQueue = true;
+    }
+    
+    public void doPerform() throws IOException {
+        if (this.addToResponse) {
+            supportProvider.addInProgressRequest(this);
+        }
+        try {
+            for (byte[] request : createRequest()) {
+                int mtu = paramsProvider.getMtu();
+                if (request.length >= mtu) {
+                    ByteBuffer buffer = ByteBuffer.wrap(request);
+                    byte[] data;
+                    while (buffer.hasRemaining()) {
+                        int delta = Math.min(mtu, buffer.remaining());
+                        data = new byte[delta];
+                        buffer.get(data, 0, delta);
+                        builderWrite(data);
+                    }
+                } else {
+                    builderWrite(request);
+                }
+            }
+            builderWait(paramsProvider.getInterval()); // Need to wait a little to let some requests end correctly i.e. Battery Level on reconnection to not print correctly
+            if (isSelfQueue) {
+                performConnected();
+            }
+        } catch (RequestCreationException e) {
+            // We cannot throw the RequestCreationException, so we throw an IOException
+            throw new IOException("Request could not be created", e);
+        }
+    }
+
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        return null;
+    }
+
+    protected void processResponse() throws ResponseParseException {}
+
+    public void handleResponse() {
+        try {
+            this.receivedPacket.parseTlv();
+        } catch (HuaweiPacket.ParseException e) {
+            LOG.error("Parse TLV exception", e);
+            if (finalizeReq != null)
+                finalizeReq.handleException(new ResponseParseException("Parse TLV exception", e));
+            return;
+        }
+        try {
+            processResponse();
+        } catch (ResponseParseException e) {
+            if (finalizeReq != null)
+                finalizeReq.handleException(e);
+            return;
+        }
+        if (nextRequest != null && !stopChain) {
+            try {
+                nextRequest.doPerform();
+            } catch (IOException e) {
+                GB.toast(supportProvider.getContext(), "nextRequest failed", Toast.LENGTH_SHORT, GB.ERROR, e);
+                LOG.error("Next request failed", e);
+                if (finalizeReq != null)
+                    finalizeReq.handleException(new ResponseParseException("Next request failed", e));
+                return;
+            }
+        }
+        if (nextRequest == null || stopChain) {
+            operationStatus = OperationStatus.FINISHED;
+            if (finalizeReq != null) {
+                finalizeReq.call();
+            }
+        }
+    }
+
+    public void setSelfQueue() {
+        isSelfQueue = true;
+    }
+
+    public Request nextRequest(Request req) {
+        nextRequest = req;
+        nextRequest.setSelfQueue();
+        return this;
+    }
+
+    public void stopChain(Request req) {
+        req.stopChain();
+        Request next = req.nextRequest;
+        if (next != null) {
+            next.stopChain(next);
+            supportProvider.removeInProgressRequests(next);
+        }
+    }
+
+    public void stopChain() {
+        stopChain = true;
+    }
+
+    /**
+     * Handler for responses from the device
+     * @param response The response packet
+     * @return True if this request handles this response, false otherwise
+     */
+    public boolean handleResponse(HuaweiPacket response) {
+        if (response.serviceId == serviceId && response.commandId == commandId) {
+            receivedPacket = response;
+            return true;
+        }
+        return false;
+    }
+
+    protected Context getContext() {
+        return supportProvider.getContext();
+    }
+
+    protected GBDevice getDevice() {
+        return supportProvider.getDevice();
+    }
+
+    public String getName() {
+        Class<?> thisClass = getClass();
+        while (thisClass.isAnonymousClass()) thisClass = thisClass.getSuperclass();
+        return thisClass.getSimpleName();
+    }
+
+    public void setFinalizeReq(RequestCallback finalizeReq) {
+        this.finalizeReq = finalizeReq;
+    }
+
+    private void builderWrite(byte[] data) {
+        if (!this.supportProvider.isBLE()) {
+            this.builderBr.write(data);
+        } else {
+            BluetoothGattCharacteristic characteristic = supportProvider
+                    .getLeCharacteristic(HuaweiConstants.UUID_CHARACTERISTIC_HUAWEI_WRITE);
+            this.builderLe.write(characteristic, data);
+        }
+    }
+
+    private void builderWait(int millis) {
+        if (!this.supportProvider.isBLE())
+            this.builderBr.wait(millis);
+        else
+            this.builderLe.wait(millis);
+    }
+
+    private void performConnected() throws IOException {
+        LOG.debug("Perform connected");
+
+        if (!this.supportProvider.isBLE()) {
+            nodomain.freeyourgadget.gadgetbridge.service.btbr.Transaction transaction = this.builderBr.getTransaction();
+            this.supportProvider.performConnected(transaction);
+        } else {
+            nodomain.freeyourgadget.gadgetbridge.service.btle.Transaction transaction = this.builderLe.getTransaction();
+            this.supportProvider.performConnected(transaction);
+        }
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendAccountRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendAccountRequest.java
new file mode 100644
index 000000000..9fd3be50c
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendAccountRequest.java
@@ -0,0 +1,51 @@
+/*  Copyright (C) 2023 Gaignon Damien
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.GBException;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket.CryptoException;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.AccountRelated;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class SendAccountRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(SendAccountRequest.class);
+
+    public SendAccountRequest(HuaweiSupportProvider support) {
+        super(support);
+        this.serviceId = AccountRelated.id;
+        this.commandId = AccountRelated.SendAccountToDevice.id;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        try {
+            return new AccountRelated.SendAccountToDevice.Request(paramsProvider).serialize();
+        } catch (CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() throws ResponseParseException {
+        LOG.debug("handle Send Account to Device");
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendDndAddRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendDndAddRequest.java
new file mode 100644
index 000000000..b27a4c4e1
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendDndAddRequest.java
@@ -0,0 +1,88 @@
+/*  Copyright (C) 2022 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import android.content.SharedPreferences;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiUtil;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.DeviceConfig;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+import nodomain.freeyourgadget.gadgetbridge.util.AlarmUtils;
+
+public class SendDndAddRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(SendDndAddRequest.class);
+
+    public SendDndAddRequest(HuaweiSupportProvider support) {
+        super(support);
+        this.serviceId = DeviceConfig.id;
+        this.commandId = DeviceConfig.DndAddRequest.id;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        SharedPreferences sharedPrefs = GBApplication.getDeviceSpecificSharedPrefs(supportProvider.getDeviceMac());
+
+        int dndLiftWristType = sharedPrefs.getInt(HuaweiConstants.PREF_HUAWEI_DND_LIFT_WRIST_TYPE, 0x00); //Device allow content - accept activation
+        boolean statusDndLiftWrist = sharedPrefs.getBoolean(DeviceSettingsPreferenceConst.PREF_DO_NOT_DISTURB_LIFT_WRIST, false); //Activate on wrist lift with DND
+        String dndSwitch = sharedPrefs.getString(DeviceSettingsPreferenceConst.PREF_DO_NOT_DISTURB, "off");
+        boolean dndEnable = !dndSwitch.equals("off");
+        String startStr = sharedPrefs.getString(DeviceSettingsPreferenceConst.PREF_DO_NOT_DISTURB_START, "00:00");
+        if (dndSwitch.equals("automatic")) startStr = "00:00";
+        byte[] start = HuaweiUtil.timeToByte(startStr);
+        String endStr = sharedPrefs.getString(DeviceSettingsPreferenceConst.PREF_DO_NOT_DISTURB_END, "23:59");
+        if (dndSwitch.equals("automatic")) endStr = "23:59";
+        byte[] end = HuaweiUtil.timeToByte(endStr);
+        int cycle = AlarmUtils.createRepetitionMask(
+                sharedPrefs.getBoolean(DeviceSettingsPreferenceConst.PREF_DO_NOT_DISTURB_MO, true),
+                sharedPrefs.getBoolean(DeviceSettingsPreferenceConst.PREF_DO_NOT_DISTURB_TU, true),
+                sharedPrefs.getBoolean(DeviceSettingsPreferenceConst.PREF_DO_NOT_DISTURB_WE, true),
+                sharedPrefs.getBoolean(DeviceSettingsPreferenceConst.PREF_DO_NOT_DISTURB_TH, true),
+                sharedPrefs.getBoolean(DeviceSettingsPreferenceConst.PREF_DO_NOT_DISTURB_FR, true),
+                sharedPrefs.getBoolean(DeviceSettingsPreferenceConst.PREF_DO_NOT_DISTURB_SA, true),
+                sharedPrefs.getBoolean(DeviceSettingsPreferenceConst.PREF_DO_NOT_DISTURB_SU, true)
+        );
+
+        try {
+            return new DeviceConfig.DndAddRequest(
+                    paramsProvider,
+                    dndEnable,
+                    start,
+                    end,
+                    cycle,
+                    statusDndLiftWrist ? dndLiftWristType : 0x00,
+                    supportProvider.getHuaweiCoordinator().supportsQueryDndLiftWristDisturbType()
+            ).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() {
+        LOG.debug("handle DND Add");
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendDndDeleteRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendDndDeleteRequest.java
new file mode 100644
index 000000000..692147ddf
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendDndDeleteRequest.java
@@ -0,0 +1,51 @@
+/*  Copyright (C) 2022 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.DeviceConfig;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class SendDndDeleteRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(SendDndDeleteRequest.class);
+
+    public SendDndDeleteRequest(HuaweiSupportProvider support) {
+        super(support);
+        this.serviceId = DeviceConfig.id;
+        this.commandId = DeviceConfig.DndDeleteRequest.id;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        try {
+            return new DeviceConfig.DndDeleteRequest(paramsProvider).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() {
+        LOG.debug("handle DND Delete");
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendFactoryResetRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendFactoryResetRequest.java
new file mode 100644
index 000000000..aff94d018
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendFactoryResetRequest.java
@@ -0,0 +1,51 @@
+/*  Copyright (C) 2022 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.DeviceConfig;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class SendFactoryResetRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(SendFactoryResetRequest.class);
+
+    public SendFactoryResetRequest(HuaweiSupportProvider support) {
+        super(support);
+        this.serviceId = DeviceConfig.id;
+        this.commandId = DeviceConfig.FactoryResetRequest.id;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        try {
+            return new DeviceConfig.FactoryResetRequest(paramsProvider).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() {
+        LOG.debug("handle Factory Reset");
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendFitnessGoalRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendFitnessGoalRequest.java
new file mode 100644
index 000000000..7652f601e
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendFitnessGoalRequest.java
@@ -0,0 +1,63 @@
+/*  Copyright (C) 2023 Gaignon Damien
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.FitnessData;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.FitnessData.MotionGoal;
+import nodomain.freeyourgadget.gadgetbridge.model.ActivityUser;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class SendFitnessGoalRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(SendFitnessGoalRequest.class);
+
+    public SendFitnessGoalRequest(HuaweiSupportProvider support) {
+        super(support);
+        this.serviceId = FitnessData.id;
+        this.commandId = MotionGoal.id;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        try {
+            // Hardcoded values till interface for goal
+            int stepGoal = GBApplication.getPrefs().getInt(ActivityUser.PREF_USER_STEPS_GOAL, ActivityUser.defaultUserStepsGoal);
+            int calorieGoal = 0;
+            short durationGoal = 0;
+            return new MotionGoal.Request(paramsProvider,
+                    (byte)0x01,
+                    (byte)0x00,
+                    stepGoal,
+                    calorieGoal,
+                    durationGoal
+            ).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() {
+        LOG.debug("handle Send Fitness Goal Request");
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendMenstrualCapabilityRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendMenstrualCapabilityRequest.java
new file mode 100644
index 000000000..d75412ced
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendMenstrualCapabilityRequest.java
@@ -0,0 +1,51 @@
+/*  Copyright (C) 2023 Gaignon Damien
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.Menstrual;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.Menstrual.CapabilityRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class SendMenstrualCapabilityRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(SendMenstrualCapabilityRequest.class);
+
+    public SendMenstrualCapabilityRequest(HuaweiSupportProvider support) {
+        super(support);
+        this.serviceId = Menstrual.id;
+        this.commandId = CapabilityRequest.id;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        try {
+            return new CapabilityRequest(paramsProvider).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() {
+        LOG.debug("handle Send Menstrual Capability");
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendMenstrualModifyTimeRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendMenstrualModifyTimeRequest.java
new file mode 100644
index 000000000..a87f777f9
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendMenstrualModifyTimeRequest.java
@@ -0,0 +1,51 @@
+/*  Copyright (C) 2023 Gaignon Damien
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.Menstrual;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.Menstrual.ModifyTime;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class SendMenstrualModifyTimeRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(SendMenstrualModifyTimeRequest.class);
+
+    public SendMenstrualModifyTimeRequest(HuaweiSupportProvider support) {
+        super(support);
+        this.serviceId = Menstrual.id;
+        this.commandId = ModifyTime.id;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        try {
+            return new ModifyTime.Request(paramsProvider, -1, 0).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() {
+        LOG.debug("handle Send Menstrual Capability");
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendNotificationRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendNotificationRequest.java
new file mode 100644
index 000000000..e6588c304
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendNotificationRequest.java
@@ -0,0 +1,110 @@
+/*  Copyright (C) 2021-2022 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.Notifications;
+import nodomain.freeyourgadget.gadgetbridge.model.CallSpec;
+import nodomain.freeyourgadget.gadgetbridge.model.NotificationSpec;
+import nodomain.freeyourgadget.gadgetbridge.model.NotificationType;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class SendNotificationRequest extends Request {
+
+    private static final Logger LOG = LoggerFactory.getLogger(SendNotificationRequest.class);
+
+    private HuaweiPacket packet;
+
+    public SendNotificationRequest(HuaweiSupportProvider support) {
+        super(support);
+        this.serviceId = Notifications.id;
+        this.commandId = Notifications.NotificationActionRequest.id;
+    }
+
+    public static byte getNotificationType(NotificationType type) {
+        switch (type.getGenericType()) {
+            case "generic_social":
+            case "generic_chat":
+                return Notifications.NotificationType.weChat;
+            case "generic_email":
+                return Notifications.NotificationType.email;
+            case "generic":
+                return Notifications.NotificationType.generic;
+            default:
+                return Notifications.NotificationType.sms;
+        }
+    }
+
+
+    public void buildNotificationTLVFromNotificationSpec(NotificationSpec notificationSpec) {
+        String title;
+        if (notificationSpec.title != null)
+            title = notificationSpec.title;
+        else
+            title = notificationSpec.sourceName;
+
+        this.packet = new Notifications.NotificationActionRequest(
+                paramsProvider,
+                supportProvider.getNotificationId(),
+                getNotificationType(notificationSpec.type),
+                Notifications.TextEncoding.standard,
+                title,
+                Notifications.TextEncoding.standard,
+                notificationSpec.sender,
+                Notifications.TextEncoding.standard,
+                notificationSpec.body,
+                notificationSpec.sourceAppId
+        );
+    }
+
+    public void buildNotificationTLVFromCallSpec(CallSpec callSpec) {
+        this.packet = new Notifications.NotificationActionRequest(
+                paramsProvider,
+                supportProvider.getNotificationId(),
+                Notifications.NotificationType.call,
+                Notifications.TextEncoding.standard,
+                callSpec.name,
+                Notifications.TextEncoding.standard,
+                callSpec.name,
+                Notifications.TextEncoding.standard,
+                callSpec.name,
+                null
+        );
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        try {
+            return this.packet.serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() {
+        LOG.debug("handle Notification");
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendNotifyHeartRateCapabilityRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendNotifyHeartRateCapabilityRequest.java
new file mode 100644
index 000000000..b018aee59
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendNotifyHeartRateCapabilityRequest.java
@@ -0,0 +1,51 @@
+/*  Copyright (C) 2023 Gaignon Damien
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.Workout;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.Workout.NotifyHeartRate;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class SendNotifyHeartRateCapabilityRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(SendNotifyHeartRateCapabilityRequest.class);
+
+    public SendNotifyHeartRateCapabilityRequest(HuaweiSupportProvider support) {
+        super(support);
+        this.serviceId = Workout.id;
+        this.commandId = NotifyHeartRate.id;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        try {
+            return new NotifyHeartRate.Request(paramsProvider).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() {
+        LOG.debug("handle Send Workout HeartRate Capability Request");
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendNotifyRestHeartRateCapabilityRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendNotifyRestHeartRateCapabilityRequest.java
new file mode 100644
index 000000000..bb5363ab8
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendNotifyRestHeartRateCapabilityRequest.java
@@ -0,0 +1,51 @@
+/*  Copyright (C) 2023 Gaignon Damien
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.FitnessData;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.FitnessData.NotifyRestHeartRate;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class SendNotifyRestHeartRateCapabilityRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(SendNotifyRestHeartRateCapabilityRequest.class);
+
+    public SendNotifyRestHeartRateCapabilityRequest(HuaweiSupportProvider support) {
+        super(support);
+        this.serviceId = FitnessData.id;
+        this.commandId = NotifyRestHeartRate.id;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        try {
+            return new NotifyRestHeartRate.Request(paramsProvider).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() {
+        LOG.debug("handle Send Workout HeartRate Capability Request");
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendSetUpDeviceStatusRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendSetUpDeviceStatusRequest.java
new file mode 100644
index 000000000..9b49ef3d1
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendSetUpDeviceStatusRequest.java
@@ -0,0 +1,53 @@
+/*  Copyright (C) 2021-2023 Gaignon Damien
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.DeviceConfig;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.DeviceConfig.SetUpDeviceStatusRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class SendSetUpDeviceStatusRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(SetUpDeviceStatusRequest.class);
+
+    public SendSetUpDeviceStatusRequest(HuaweiSupportProvider support) {
+        super(support);
+        this.serviceId = DeviceConfig.id;
+        this.commandId = SetUpDeviceStatusRequest.id;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        int relationShip = 1; // Hardcoded value for now - 1 = mainDevice
+        String deviceName = supportProvider.getDevice().getName(); 
+        try {
+            return new SetUpDeviceStatusRequest(paramsProvider, relationShip, deviceName).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() {
+        LOG.debug("handle Set Up Device Status");
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetActivateOnLiftRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetActivateOnLiftRequest.java
new file mode 100644
index 000000000..ba06249e5
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetActivateOnLiftRequest.java
@@ -0,0 +1,56 @@
+/*  Copyright (C) 2021-2022 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.DeviceConfig;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class SetActivateOnLiftRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(SetActivateOnLiftRequest.class);
+
+    public SetActivateOnLiftRequest(HuaweiSupportProvider support) {
+        super(support);
+        this.serviceId = DeviceConfig.id;
+        this.commandId = DeviceConfig.ActivateOnLiftRequest.id;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        boolean activate = GBApplication
+            .getDeviceSpecificSharedPrefs(supportProvider.getDevice().getAddress())
+            .getBoolean(DeviceSettingsPreferenceConst.PREF_LIFTWRIST_NOSHED, false);
+        try {
+            return new DeviceConfig.ActivateOnLiftRequest(paramsProvider, activate).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() {
+        LOG.debug("handle Set Activate On Rotate");
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetActivityReminderRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetActivityReminderRequest.java
new file mode 100644
index 000000000..7cd289094
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetActivityReminderRequest.java
@@ -0,0 +1,82 @@
+/*  Copyright (C) 2021-2022 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import android.content.SharedPreferences;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiUtil;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.FitnessData;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+import nodomain.freeyourgadget.gadgetbridge.util.AlarmUtils;
+
+public class SetActivityReminderRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(SetActivityReminderRequest.class);
+
+    public SetActivityReminderRequest(HuaweiSupportProvider support) {
+        super(support);
+        this.serviceId = FitnessData.id;
+        this.commandId = FitnessData.ActivityReminder.id;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        SharedPreferences sharedPrefs = GBApplication.getDeviceSpecificSharedPrefs(supportProvider.getDeviceMac());
+
+        boolean longsitSwitch = sharedPrefs.getBoolean(DeviceSettingsPreferenceConst.PREF_INACTIVITY_ENABLE, false);
+        String longsitInterval = sharedPrefs.getString(DeviceSettingsPreferenceConst.PREF_INACTIVITY_THRESHOLD, "60");
+        String longsitStart = sharedPrefs.getString(DeviceSettingsPreferenceConst.PREF_INACTIVITY_START, "06:00");
+        String longsitEnd = sharedPrefs.getString(DeviceSettingsPreferenceConst.PREF_INACTIVITY_END, "23:00");
+        byte[] start = HuaweiUtil.timeToByte(longsitStart);
+        byte[] end = HuaweiUtil.timeToByte(longsitEnd);
+        int cycle = AlarmUtils.createRepetitionMask(
+                sharedPrefs.getBoolean(DeviceSettingsPreferenceConst.PREF_INACTIVITY_MO, false),
+                sharedPrefs.getBoolean(DeviceSettingsPreferenceConst.PREF_INACTIVITY_TU, false),
+                sharedPrefs.getBoolean(DeviceSettingsPreferenceConst.PREF_INACTIVITY_WE, false),
+                sharedPrefs.getBoolean(DeviceSettingsPreferenceConst.PREF_INACTIVITY_TH, false),
+                sharedPrefs.getBoolean(DeviceSettingsPreferenceConst.PREF_INACTIVITY_FR, false),
+                sharedPrefs.getBoolean(DeviceSettingsPreferenceConst.PREF_INACTIVITY_SA, false),
+                sharedPrefs.getBoolean(DeviceSettingsPreferenceConst.PREF_INACTIVITY_SU, false)
+        );
+
+        try {
+            return new FitnessData.ActivityReminder.Request(
+                    paramsProvider,
+                    longsitSwitch,
+                    (byte) Integer.parseInt(longsitInterval),
+                    start,
+                    end,
+                    (byte) cycle
+            ).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() {
+        LOG.debug("handle Set Activity Reminder");
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetAutomaticHeartrateRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetAutomaticHeartrateRequest.java
new file mode 100644
index 000000000..f83bc1259
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetAutomaticHeartrateRequest.java
@@ -0,0 +1,55 @@
+/*  Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.FitnessData;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class SetAutomaticHeartrateRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(SetAutomaticHeartrateRequest.class);
+
+    public SetAutomaticHeartrateRequest(HuaweiSupportProvider support) {
+        super(support);
+        this.serviceId = FitnessData.id;
+        this.commandId = FitnessData.EnableAutomaticHeartrate.id;
+        this.addToResponse = false;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        boolean automaticHeartrateEnabled = GBApplication
+                .getDeviceSpecificSharedPrefs(supportProvider.getDevice().getAddress())
+                .getBoolean(DeviceSettingsPreferenceConst.PREF_HEARTRATE_AUTOMATIC_ENABLE, false);
+        if (automaticHeartrateEnabled)
+            LOG.info("Attempting to enable automatic heartrate");
+        else
+            LOG.info("Attempting to disable automatic heartrate");
+        try {
+            return new FitnessData.EnableAutomaticHeartrate.Request(paramsProvider, automaticHeartrateEnabled).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetAutomaticSpoRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetAutomaticSpoRequest.java
new file mode 100644
index 000000000..2e27f192c
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetAutomaticSpoRequest.java
@@ -0,0 +1,55 @@
+/*  Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.FitnessData;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class SetAutomaticSpoRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(SetAutomaticSpoRequest.class);
+
+    public SetAutomaticSpoRequest(HuaweiSupportProvider support) {
+        super(support);
+        this.serviceId = FitnessData.id;
+        this.commandId = FitnessData.EnableAutomaticSpo.id;
+        this.addToResponse = false;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        boolean automaticSpoEnabled = GBApplication
+                .getDeviceSpecificSharedPrefs(supportProvider.getDevice().getAddress())
+                .getBoolean(DeviceSettingsPreferenceConst.PREF_SPO_AUTOMATIC_ENABLE, false);
+        if (automaticSpoEnabled)
+            LOG.info("Attempting to enable automatic SpO");
+        else
+            LOG.info("Attempting to disable automatic SpO");
+        try {
+            return new FitnessData.EnableAutomaticSpo.Request(paramsProvider, automaticSpoEnabled).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetDateFormatRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetDateFormatRequest.java
new file mode 100644
index 000000000..cbf334df3
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetDateFormatRequest.java
@@ -0,0 +1,79 @@
+/*  Copyright (C) 2021-2022 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.DeviceConfig;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.DeviceConfig.DateFormat;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class SetDateFormatRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(SetDateFormatRequest.class);
+
+    public SetDateFormatRequest(HuaweiSupportProvider support) {
+        super(support);
+        this.serviceId = DeviceConfig.id;
+        this.commandId = DateFormat.id;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        int time = DeviceConfig.Time.hours12;
+        int date;
+        String timeFormat = GBApplication
+            .getDeviceSpecificSharedPrefs(supportProvider.getDevice().getAddress())
+            .getString(DeviceSettingsPreferenceConst.PREF_TIMEFORMAT, "auto");
+        if (timeFormat.equals("auto")) {
+            if (android.text.format.DateFormat.is24HourFormat(GBApplication.getContext()))
+                time = DeviceConfig.Time.hours24;
+        } else if (timeFormat.equals("24h")) {
+            time = DeviceConfig.Time.hours24;
+        }
+        String dateFormat = GBApplication
+            .getDeviceSpecificSharedPrefs(supportProvider.getDevice().getAddress())
+            .getString(DeviceSettingsPreferenceConst.PREF_DATEFORMAT, "MM/dd/yyyy");
+        switch (dateFormat) {
+            case "MM/dd/yyyy":
+                date = DeviceConfig.Date.monthFirst;
+                break;
+            case "dd.MM.yyyy":
+            case "dd/MM/yyyy":
+                date = DeviceConfig.Date.dayFirst;
+                break;
+            default:
+                date = DeviceConfig.Date.yearFirst;
+        }
+        try {
+            return new DateFormat.Request(paramsProvider, (byte) date, (byte) time).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() {
+        LOG.debug("handle Set Date Format");
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetDisconnectNotification.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetDisconnectNotification.java
new file mode 100644
index 000000000..f8f2ace98
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetDisconnectNotification.java
@@ -0,0 +1,60 @@
+/*  Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import android.content.SharedPreferences;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.DisconnectNotification;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class SetDisconnectNotification extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(SetDisconnectNotification.class);
+
+    public SetDisconnectNotification(HuaweiSupportProvider support) {
+        super(support);
+        this.serviceId = DisconnectNotification.id;
+        this.commandId = DisconnectNotification.DisconnectNotificationSetting.id;
+        this.addToResponse = false;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        SharedPreferences sharedPrefs = GBApplication.getDeviceSpecificSharedPrefs(supportProvider.getDeviceMac());
+        boolean notificationEnable = sharedPrefs.getBoolean(DeviceSettingsPreferenceConst.PREF_DISCONNECTNOTIF_NOSHED, true);
+        if (notificationEnable) {
+            LOG.info("Attempting to enable disconnect notification");
+        } else {
+            LOG.info("Attempting to disable disconnect notification");
+        }
+        try {
+            return new DisconnectNotification.DisconnectNotificationSetting.Request(
+                    paramsProvider,
+                    notificationEnable
+            ).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetLanguageSettingRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetLanguageSettingRequest.java
new file mode 100644
index 000000000..889d8d61a
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetLanguageSettingRequest.java
@@ -0,0 +1,77 @@
+/*  Copyright (C) 2021-2022 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.Locale;
+
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.activities.SettingsActivity;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.LocaleConfig;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.LocaleConfig.SetLanguageSetting;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class SetLanguageSettingRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(SetLanguageSettingRequest.class);
+
+    public SetLanguageSettingRequest(HuaweiSupportProvider support) {
+        super(support);
+        this.serviceId = LocaleConfig.id;
+        this.commandId = SetLanguageSetting.id;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        String localeString = GBApplication
+            .getDeviceSpecificSharedPrefs(supportProvider.getDevice().getAddress())
+            .getString(DeviceSettingsPreferenceConst.PREF_LANGUAGE, "auto");
+        if (localeString == null || localeString.equals("auto")) {
+            String language = Locale.getDefault().getLanguage();
+            String country = Locale.getDefault().getCountry();
+            if (country.equals("")) {
+                country = language;
+            }
+            localeString = language + "-" + country.toUpperCase();
+        } else {
+            localeString = localeString.replace("_", "-");
+        }
+        LOG.debug("localeString: " + localeString);
+        String measurementString = GBApplication
+            .getPrefs()
+            .getString(SettingsActivity.PREF_MEASUREMENT_SYSTEM, getContext().getString(R.string.p_unit_metric));
+        LOG.debug("measurementString: " + measurementString);
+        byte measurement = measurementString.equals("metric") ? LocaleConfig.MeasurementSystem.metric : LocaleConfig.MeasurementSystem.imperial;
+        try {
+            return new SetLanguageSetting(paramsProvider, localeString.getBytes(StandardCharsets.UTF_8), measurement).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() {
+        LOG.debug("handle Set Locale");
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetMediumToStrengthThresholdRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetMediumToStrengthThresholdRequest.java
new file mode 100644
index 000000000..530f0c586
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetMediumToStrengthThresholdRequest.java
@@ -0,0 +1,60 @@
+/*  Copyright (C) 2021-2022 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.FitnessData;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.FitnessData.MediumToStrengthThreshold;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class SetMediumToStrengthThresholdRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(SetMediumToStrengthThresholdRequest.class);
+
+    public SetMediumToStrengthThresholdRequest(HuaweiSupportProvider support) {
+        super(support);
+        this.serviceId = FitnessData.id;
+        this.commandId = MediumToStrengthThreshold.id;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        try {
+            //Hardcoded value till interface enable threshold values
+            return new MediumToStrengthThreshold.Request(paramsProvider,
+                    (byte)0x6E,
+                    (byte)0x3C,
+                    (byte)0x05,
+                    (byte)0x40,
+                    (byte)0x50,
+                    (byte)0x03
+            ).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() {
+        LOG.debug("handle Set Activate On Rotate");
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetMusicRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetMusicRequest.java
new file mode 100644
index 000000000..956ddfe6f
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetMusicRequest.java
@@ -0,0 +1,104 @@
+/*  Copyright (C) 2022 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import android.content.Context;
+import android.media.AudioManager;
+import android.media.session.PlaybackState;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.MusicControl;
+import nodomain.freeyourgadget.gadgetbridge.model.MusicSpec;
+import nodomain.freeyourgadget.gadgetbridge.model.MusicStateSpec;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class SetMusicRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(SetMusicRequest.class);
+
+    private final MusicStateSpec musicStateSpec;
+    private final MusicSpec musicSpec;
+
+    public SetMusicRequest(HuaweiSupportProvider support, MusicStateSpec musicStateSpec, MusicSpec musicSpec) {
+        super(support);
+        this.serviceId = MusicControl.id;
+        this.commandId = MusicControl.MusicInfo.id;
+        this.musicStateSpec = musicStateSpec;
+        this.musicSpec = musicSpec;
+    }
+
+    private byte convertMusicState(int in) {
+        switch (in) {
+            case MusicStateSpec.STATE_PLAYING:
+                return PlaybackState.STATE_PLAYING;
+            case MusicStateSpec.STATE_PAUSED:
+                return PlaybackState.STATE_PAUSED;
+            case MusicStateSpec.STATE_STOPPED:
+                return PlaybackState.STATE_STOPPED;
+            case MusicStateSpec.STATE_UNKNOWN:
+            default:
+                return PlaybackState.STATE_NONE;
+        }
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        String artistName = "";
+        String songName = "";
+        byte playState = convertMusicState(MusicStateSpec.STATE_UNKNOWN);
+        if (this.musicSpec != null) {
+            artistName = this.musicSpec.artist;
+            songName = this.musicSpec.track;
+        }
+        if (this.musicStateSpec != null)
+            playState = convertMusicState(this.musicStateSpec.state);
+        AudioManager audioManager = (AudioManager) this.supportProvider.getContext().getSystemService(Context.AUDIO_SERVICE);
+        byte maxVolume = (byte) audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC);
+        byte currentVolume = (byte) audioManager.getStreamVolume(AudioManager.STREAM_MUSIC);
+
+        try {
+            return new MusicControl.MusicInfo.Request(
+                    paramsProvider,
+                    artistName,
+                    songName,
+                    playState,
+                    maxVolume,
+                    currentVolume
+            ).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() {
+        if (receivedPacket instanceof MusicControl.MusicInfo.Response) {
+            if (((MusicControl.MusicInfo.Response) receivedPacket).ok) {
+                LOG.debug("Music information acknowledged by band");
+            } else {
+                LOG.warn(((MusicControl.MusicInfo.Response) receivedPacket).error);
+            }
+        } else {
+            LOG.error("MusicInfo response is not of type MusicInfo response");
+        }
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetMusicStatusRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetMusicStatusRequest.java
new file mode 100644
index 000000000..ded5754b4
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetMusicStatusRequest.java
@@ -0,0 +1,45 @@
+/*  Copyright (C) 2022 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.MusicControl;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class SetMusicStatusRequest extends Request {
+    private final int returnValue;
+
+    public SetMusicStatusRequest(HuaweiSupportProvider support, byte commandId, int returnValue) {
+        super(support);
+        this.serviceId = MusicControl.id;
+        this.commandId = commandId;
+        this.returnValue = returnValue;
+        this.addToResponse = false;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        try {
+            return new MusicControl.MusicStatusRequest(paramsProvider, (byte) commandId, returnValue).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetNavigateOnRotateRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetNavigateOnRotateRequest.java
new file mode 100644
index 000000000..9e8dd12af
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetNavigateOnRotateRequest.java
@@ -0,0 +1,56 @@
+/*  Copyright (C) 2021-2022 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.DeviceConfig;
+import nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class SetNavigateOnRotateRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(SetNavigateOnRotateRequest.class);
+
+    public SetNavigateOnRotateRequest(HuaweiSupportProvider support) {
+        super(support);
+        this.serviceId = DeviceConfig.id;
+        this.commandId = DeviceConfig.NavigateOnRotateRequest.id;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        boolean navigate = GBApplication
+            .getDeviceSpecificSharedPrefs(supportProvider.getDevice().getAddress())
+            .getBoolean(MiBandConst.PREF_MI2_ROTATE_WRIST_TO_SWITCH_INFO, false);
+        try {
+            return new DeviceConfig.NavigateOnRotateRequest(paramsProvider, navigate).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() {
+        LOG.debug("handle Set Navigate On Rotate");
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetNotificationRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetNotificationRequest.java
new file mode 100644
index 000000000..90d57c344
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetNotificationRequest.java
@@ -0,0 +1,56 @@
+/*  Copyright (C) 2022 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.Notifications;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class SetNotificationRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(SetNotificationRequest.class);
+
+    public SetNotificationRequest(HuaweiSupportProvider support) {
+        super(support);
+        this.serviceId = Notifications.id;
+        this.commandId = Notifications.NotificationStateRequest.id;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        boolean status = GBApplication
+            .getDeviceSpecificSharedPrefs(supportProvider.getDevice().getAddress())
+            .getBoolean(DeviceSettingsPreferenceConst.PREF_NOTIFICATION_ENABLE, false);
+        try {
+            return new Notifications.NotificationStateRequest(paramsProvider, status).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() {
+        LOG.debug("handle Set Notification");
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetTimeRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetTimeRequest.java
new file mode 100644
index 000000000..6c3ebb910
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetTimeRequest.java
@@ -0,0 +1,51 @@
+/*  Copyright (C) 2021-2022 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.DeviceConfig;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class SetTimeRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(SetTimeRequest.class);
+
+    public SetTimeRequest(HuaweiSupportProvider support) {
+        super(support);
+        this.serviceId = DeviceConfig.id;
+        this.commandId = DeviceConfig.TimeRequest.id;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        try {
+            return new DeviceConfig.TimeRequest(paramsProvider).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() {
+        LOG.debug("handle Set Time");
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetTimeZoneIdRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetTimeZoneIdRequest.java
new file mode 100644
index 000000000..f6cda5a6e
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetTimeZoneIdRequest.java
@@ -0,0 +1,51 @@
+/*  Copyright (C) 2021-2022 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.DeviceConfig;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class SetTimeZoneIdRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(SetTimeZoneIdRequest.class);
+
+    public SetTimeZoneIdRequest(HuaweiSupportProvider support) {
+        super(support);
+        this.serviceId = DeviceConfig.id;
+        this.commandId = DeviceConfig.TimeZoneIdRequest.id;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        try {
+            return new DeviceConfig.TimeZoneIdRequest(paramsProvider).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() {
+        LOG.debug("handle Set Time ZoneId");
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetTruSleepRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetTruSleepRequest.java
new file mode 100644
index 000000000..a029fcb1d
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetTruSleepRequest.java
@@ -0,0 +1,56 @@
+/*  Copyright (C) 2021-2022 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.FitnessData;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class SetTruSleepRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(SetTruSleepRequest.class);
+
+    public SetTruSleepRequest(HuaweiSupportProvider support) {
+        super(support);
+        this.serviceId = FitnessData.id;
+        this.commandId = FitnessData.TruSleep.id;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        boolean truSleepSwitch = GBApplication
+            .getDeviceSpecificSharedPrefs(supportProvider.getDevice().getAddress())
+            .getBoolean(HuaweiConstants.PREF_HUAWEI_TRUSLEEP, false);
+        try {
+            return new FitnessData.TruSleep.Request(paramsProvider, truSleepSwitch).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() {
+        LOG.debug("handle Set TruSleep");
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetWearLocationRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetWearLocationRequest.java
new file mode 100644
index 000000000..c5cfe3f42
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetWearLocationRequest.java
@@ -0,0 +1,57 @@
+/*  Copyright (C) 2021-2022 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.DeviceConfig;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class SetWearLocationRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(SetWearLocationRequest.class);
+
+    public SetWearLocationRequest(HuaweiSupportProvider support) {
+        super(support);
+        this.serviceId = DeviceConfig.id;
+        this.commandId = DeviceConfig.WearLocationRequest.id;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        String locationString = GBApplication
+            .getDeviceSpecificSharedPrefs(supportProvider.getDevice().getAddress())
+            .getString(DeviceSettingsPreferenceConst.PREF_WEARLOCATION, "left");
+        byte location = (byte) (locationString.equals("left") ? 1 : 0);
+        try {
+            return new DeviceConfig.WearLocationRequest(paramsProvider, location).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() {
+        LOG.debug("handle Set Wear Location");
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetWearMessagePushRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetWearMessagePushRequest.java
new file mode 100644
index 000000000..e7d202d75
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetWearMessagePushRequest.java
@@ -0,0 +1,56 @@
+/*  Copyright (C) 2022 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.Notifications;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class SetWearMessagePushRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(SetWearMessagePushRequest.class);
+
+    public SetWearMessagePushRequest(HuaweiSupportProvider support) {
+        super(support);
+        this.serviceId = Notifications.id;
+        this.commandId = Notifications.WearMessagePushRequest.id;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        boolean status = GBApplication
+            .getDeviceSpecificSharedPrefs(supportProvider.getDevice().getAddress())
+            .getBoolean(DeviceSettingsPreferenceConst.PREF_DO_NOT_DISTURB_NOT_WEAR, false);
+        try {
+            return new Notifications.WearMessagePushRequest(paramsProvider, status).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() {
+        LOG.debug("handle Set WearMessage Push ");
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetWorkModeRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetWorkModeRequest.java
new file mode 100644
index 000000000..c7e48192f
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetWorkModeRequest.java
@@ -0,0 +1,57 @@
+/*  Copyright (C) 2021-2022 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.WorkMode;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class SetWorkModeRequest extends Request {
+    private static final Logger LOG = LoggerFactory.getLogger(SetWorkModeRequest.class);
+
+    public SetWorkModeRequest(HuaweiSupportProvider support) {
+        super(support);
+        this.serviceId = WorkMode.id;
+        this.commandId = WorkMode.SwitchStatusRequest.id;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        String workModeString = GBApplication
+            .getDeviceSpecificSharedPrefs(supportProvider.getDevice().getAddress())
+            .getString(HuaweiConstants.PREF_HUAWEI_WORKMODE, "auto");
+        boolean workMode = workModeString.equals("auto");
+        try {
+            return new WorkMode.SwitchStatusRequest(paramsProvider, workMode).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+
+    @Override
+    protected void processResponse() {
+        LOG.debug("handle Set WorkMode");
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/StopFindPhoneRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/StopFindPhoneRequest.java
new file mode 100644
index 000000000..a5581f9ca
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/StopFindPhoneRequest.java
@@ -0,0 +1,40 @@
+/*  Copyright (C) 2023 Martin.JM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.FindPhone;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class StopFindPhoneRequest extends Request {
+    public StopFindPhoneRequest(HuaweiSupportProvider support) {
+        super(support);
+        this.serviceId = FindPhone.id;
+        this.commandId = FindPhone.StopRequest.id;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        try {
+            return new FindPhone.StopRequest(paramsProvider).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/StopNotificationRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/StopNotificationRequest.java
new file mode 100644
index 000000000..69017d802
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/StopNotificationRequest.java
@@ -0,0 +1,53 @@
+/*  Copyright (C) 2022 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.Notifications;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+
+public class StopNotificationRequest extends Request {
+    public StopNotificationRequest(HuaweiSupportProvider support) {
+        super(support);
+        this.serviceId = Notifications.id;
+        this.commandId = Notifications.NotificationActionRequest.id;
+        this.addToResponse = false;
+    }
+
+    @Override
+    protected List<byte[]> createRequest() throws RequestCreationException {
+        try {
+            return new Notifications.NotificationActionRequest(
+                    paramsProvider,
+                    supportProvider.getNotificationId(),
+                    Notifications.NotificationType.stopNotification,
+                    Notifications.TextEncoding.standard,
+                    null,
+                    Notifications.TextEncoding.standard,
+                    null,
+                    Notifications.TextEncoding.standard,
+                    null,
+                    null
+            ).serialize();
+        } catch (HuaweiPacket.CryptoException e) {
+            throw new RequestCreationException(e);
+        }
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/CryptoUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/CryptoUtils.java
index a841ac640..71bd155c8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/CryptoUtils.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/CryptoUtils.java
@@ -2,13 +2,21 @@ package nodomain.freeyourgadget.gadgetbridge.util;
 
 import android.annotation.SuppressLint;
 
+import java.nio.ByteBuffer;
+import java.security.InvalidAlgorithmParameterException;
 import java.security.InvalidKeyException;
+import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.security.spec.AlgorithmParameterSpec;
 
 import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;
 import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.Mac;
 import javax.crypto.NoSuchPaddingException;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.GCMParameterSpec;
+import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 
 public class CryptoUtils {
@@ -25,4 +33,85 @@ public class CryptoUtils {
         ecipher.init(Cipher.DECRYPT_MODE, newKey);
         return ecipher.doFinal(value);
     }
+
+    public static byte[] encryptAES_CBC_Pad(byte[] data, byte[] key, byte[] iv) throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidAlgorithmParameterException, InvalidKeyException, IllegalBlockSizeException, BadPaddingException {
+        Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
+        SecretKeySpec secretKeySpec = new SecretKeySpec(key, "AES");
+        AlgorithmParameterSpec paramSpec = new IvParameterSpec(iv);
+        cipher.init(Cipher.ENCRYPT_MODE, secretKeySpec, paramSpec);
+        return cipher.doFinal(data);
+    }
+
+    public static byte[] decryptAES_CBC_Pad(byte[] data, byte[] key, byte[] iv) throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidAlgorithmParameterException, InvalidKeyException, IllegalBlockSizeException, BadPaddingException {
+        Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
+        SecretKeySpec secretKeySpec = new SecretKeySpec(key, "AES");
+        AlgorithmParameterSpec paramSpec = new IvParameterSpec(iv);
+        cipher.init(Cipher.DECRYPT_MODE, secretKeySpec, paramSpec);
+        return cipher.doFinal(data);
+    }
+
+    public static byte[] encryptAES_GCM_NoPad(byte[] data, byte[] key, byte[] iv, byte[] aad) throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidAlgorithmParameterException, InvalidKeyException, IllegalBlockSizeException, BadPaddingException {
+        Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
+        SecretKeySpec secretKeySpec = new SecretKeySpec(key, "AES");
+        GCMParameterSpec paramSpec = new GCMParameterSpec(16 * 8, iv);
+        cipher.init(Cipher.ENCRYPT_MODE, secretKeySpec, paramSpec);
+        if (aad != null) {
+            cipher.updateAAD(aad);
+        }
+        return cipher.doFinal(data);
+    }
+
+    public static byte[] decryptAES_GCM_NoPad(byte[] data, byte[] key, byte[] iv, byte[] aad) throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidAlgorithmParameterException, InvalidKeyException, IllegalBlockSizeException, BadPaddingException {
+        Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
+        SecretKeySpec secretKeySpec = new SecretKeySpec(key, "AES");
+        GCMParameterSpec paramSpec = new GCMParameterSpec(16 * 8, iv);
+        cipher.init(Cipher.DECRYPT_MODE, secretKeySpec, paramSpec);
+        if (aad != null) {
+            cipher.updateAAD(aad);
+        }
+        return cipher.doFinal(data);
+    }
+
+    public static byte[] calcHmacSha256(byte[] secretKey, byte[] message) throws NoSuchAlgorithmException, InvalidKeyException {
+        Mac mac = Mac.getInstance("HmacSHA256");
+        SecretKeySpec secretKeySpec = new SecretKeySpec(secretKey, "HmacSHA256");
+        mac.init(secretKeySpec);
+        return mac.doFinal(message);
+    }
+
+    public static byte[] digest(byte[] message) throws NoSuchAlgorithmException {
+        MessageDigest digest = MessageDigest.getInstance("SHA-256");
+        return digest.digest(message);
+    }
+
+    // Thanks to https://www.javatips.net/api/keywhiz-master/hkdf/src/main/java/keywhiz/hkdf/Hkdf.java for light code
+    public static byte[] hkdfSha256(byte[] secretKey, byte[] salt, byte[] info, int outputLength) throws InvalidKeyException, NoSuchAlgorithmException { // return 32 byte len session key - outputLength=32 ?
+        //extract start
+        byte[] pseudoRandomKey = calcHmacSha256(salt, secretKey);
+        SecretKey pseudoSecretKey = new SecretKeySpec(pseudoRandomKey, "HmacSHA256");
+        //extract end
+        int hashLen = 32;
+        int n = (outputLength % hashLen == 0) ? outputLength / hashLen : (outputLength / hashLen) + 1;
+        byte[] hashRound = new byte[0];
+
+        ByteBuffer generatedBytes = ByteBuffer.allocate(Math.multiplyExact(n, hashLen));
+        Mac mac = Mac.getInstance("HmacSHA256");
+        mac.init(pseudoSecretKey);
+        for (int roundNum = 1; roundNum <= n; roundNum++) {
+          mac.reset();
+          ByteBuffer t = ByteBuffer.allocate(hashRound.length + info.length + 1);
+          t.put(hashRound);
+          t.put(info);
+          t.put((byte)roundNum);
+          hashRound = mac.doFinal(t.array());
+          generatedBytes.put(hashRound);
+        }
+
+        byte[] result = new byte[outputLength];
+        generatedBytes.rewind();
+        generatedBytes.get(result, 0, outputLength);
+        return result;
+
+
+    }
 }
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index c57150f86..ccc4113ea 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -297,6 +297,11 @@
         <item>@string/mi2_dnd_automatic</item>
         <item>@string/mi2_dnd_scheduled</item>
     </string-array>
+    <string-array name="do_not_disturb_allday">
+        <item>@string/mi2_dnd_off</item>
+        <item>@string/dnd_all_day</item>
+        <item>@string/mi2_dnd_scheduled</item>
+    </string-array>
     <string-array name="mi2_do_not_disturb_values">
         <item>@string/p_off</item>
         <item>@string/p_automatic</item>
@@ -3186,6 +3191,16 @@
         <item>net.osmand.dev</item>
     </string-array>
 
+    <string-array name="workmode">
+        <item>@string/automatic</item>
+        <item>@string/manual</item>
+    </string-array>
+
+    <string-array name="workmode_values">
+        <item>auto</item>
+        <item>manual</item>
+    </string-array>
+
     <string-array name="pref_transliteration_languages">
         <item>@string/arabic</item>
         <item>@string/bengali</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c7e09d949..bf0e0bfdd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -941,6 +941,7 @@
     <string name="dateformat_time">Time</string>
     <string name="dateformat_date_time"><![CDATA[Time & date]]></string>
     <string name="prefs_disconnect_notification">Disconnect notification</string>
+    <string name="prefs_disconnect_notification_summary">Notification on device when disconnected from BT.</string>
     <string name="mi2_prefs_button_actions">Button actions</string>
     <string name="mi2_prefs_button_actions_summary">Specify button press actions</string>
     <string name="mi2_prefs_button_press_count">Button press count</string>
@@ -986,6 +987,8 @@
     <string name="mi2_prefs_do_not_disturb_start">Start time</string>
     <string name="mi2_prefs_do_not_disturb_end">End time</string>
     <string name="mi2_prefs_do_not_disturb_lift_wrist">Activate display upon lift during Do Not Disturb</string>
+    <string name="do_not_disturb_lift_wrist_summary">Only if activate display upon lift enabled</string>
+    <string name="pref_do_not_disturb_not_wear">Do not disturb when not wearing</string>
     <string name="mi3_prefs_band_screen_unlock">Band screen unlock"</string>
     <string name="mi3_prefs_band_screen_unlock_summary">Swipe up to unlock the band\'s screen</string>
     <string name="mi3_prefs_night_mode">Night mode</string>
@@ -1009,6 +1012,7 @@
     <string name="lefun_prefs_antilost_summary">The band will vibrate if your phone disconnects from the band</string>
     <string name="lefun_prefs_interface_language_title">Interface language</string>
     <string name="automatic">Automatic</string>
+    <string name="manual">Manual</string>
     <string name="simplified_chinese">Simplified Chinese</string>
     <string name="traditional_chinese">Traditional Chinese</string>
     <string name="english">English</string>
@@ -1206,6 +1210,7 @@
     <string name="mi3_night_mode_sunset">At sunset</string>
     <string name="mi2_dnd_automatic">Automatic (sleep detection)</string>
     <string name="mi2_dnd_scheduled">Scheduled (time interval)</string>
+    <string name="dnd_all_day">All day</string>
     <string name="maximum_duration">Duration</string>
     <string name="discovery_attempting_to_pair">Attempting to pair with %1$s</string>
     <string name="discovery_bonding_failed_immediately">Bonding with %1$s failed immediately.</string>
@@ -1423,6 +1428,21 @@
     <string name="devicetype_sony_wf_1000xm5">Sony WF-1000XM5</string>
     <string name="devicetype_sony_linkbuds_s">Sony LinkBuds S</string>
     <string name="devicetype_binary_sensor">Binary sensor</string>
+    <string name="devicetype_honor_band3">Honor Band 3</string>
+    <string name="devicetype_honor_band4">Honor Band 4</string>
+    <string name="devicetype_honor_band5">Honor Band 5</string>
+    <string name="devicetype_honor_band6">Honor Band 6</string>
+    <string name="devicetype_honor_band7">Honor Band 7</string>
+    <string name="devicetype_huawei_band_aw70">Huawei Band (AW70)</string>
+    <string name="devicetype_huawei_band6">Huawei Band 6</string>
+    <string name="devicetype_huawei_band7">Huawei Band 7</string>
+    <string name="devicetype_huawei_band8">Huawei Band 8</string>
+    <string name="devicetype_huawei_watch_gt">Huawei Watch GT</string>
+    <string name="devicetype_huawei_band4pro">Huawei Band 4 (Pro)</string>
+    <string name="devicetype_huawei_watchgt2">Huawei Watch GT 2 (Pro)</string>
+    <string name="devicetype_huawei_watchgt2e">Huawei Watch GT 2e</string>
+    <string name="devicetype_huawei_talk_band_b6">Huawei Talk Band B6</string>
+    <string name="devicetype_huawei_watchgt3">Huawei Watch GT 3 (Pro)</string>
     <string name="devicetype_femometer_vinca2">Femometer Vinca II</string>
     <string name="devicetype_xiaomi_watch_lite">Xiaomi Watch Lite</string>
     <string name="devicetype_redmiwatch3active">Redmi Watch 3 Active</string>
@@ -2203,6 +2223,21 @@
     <!-- Translators: the ### indicate number of digits, keep intact -->
     <string name="distance_format_feet">###ft</string>
 
+    <string name="prefs_workmode">Work Mode</string>
+    <string name="huawei_alarm_smart_description">Do not uncheck smart wakeup checkbox.</string>
+    <string name="huawei_alarm_event_description">Do not check smart wakeup checkbox.</string>
+    <string name="huawei_trusleep_title">HUAWEI TruSleep &#8482;</string>
+    <string name="huawei_trusleep_summary">Monitor your sleep quality and breathing pattern in real time.\nAnalyze your sleep patterns and accurately diagnose 6 types of sleeping problems.</string>
+    <string name="huawei_trusleep_summary_light">Improved sleep monitoring</string>
+    <string name="prefs_activity_recognition">Activity recognition settings</string>
+    <string name="pref_activity_recognize_running">recognize running</string>
+    <string name="pref_activity_recognize_biking">recognize biking</string>
+    <string name="pref_activity_recognize_walking">recognize walking</string>
+    <string name="pref_activity_recognize_rowing">recognize rowing</string>
+    <string name="pref_activity_recognition_mode_none">none</string>
+    <string name="pref_activity_recognition_mode_ask">ask</string>
+    <string name="pref_activity_recognition_mode_auto">auto</string>
+
     <string name="menuitem_menu">Menu</string>
     <string name="fossil_hr_button_config_info">Some buttons cannot be configured because their functions are hard-coded in the watch firmware.\n\nWarning: long-pressing the upper button when a watchface from the official Fossil app is installed will also toggle between showing/hiding widgets.</string>
     <string name="pref_title_opentracks_packagename">OpenTracks package name</string>
@@ -2212,6 +2247,31 @@
     <string name="watchface_dialog_pre_setting_position">pre-setting position to %s</string>
     <string name="watchface_setting_light_up_on_notification">Light up on new notification</string>
 
+    <string name="pref_enable_call_accept">Enable accepting calls</string>
+    <string name="pref_enable_call_accept_summary">Enable accepting calls from the device</string>
+    <string name="pref_enable_call_reject">Enable rejecting calls</string>
+    <string name="pref_enable_call_reject_summary">Enable rejecting calls from the device</string>
+
+    <string name="pref_disable_find_phone_with_dnd">Disable find my phone when do not disturb is active</string>
+
+    <string name="pref_heartrate_automatic_enable">Enable automatic heartrate measuring</string>
+    <string name="pref_spo_automatic_enable">Enable automatic SpO2 measuring</string>
+
+    <string name="pref_force_options">Force options</string>
+    <string name="pref_force_options_summary">Some devices falsely claim not to have support for some options. This settings can be used to enable them anyway.\nUSE AT YOUR OWN RISK\nRead the wiki</string>
+    <string name="pref_force_smart_alarm">Force smart alarm</string>
+    <string name="pref_force_smart_alarm_summary">Force smart alarms support.\nUSE AT YOUR OWN RISK</string>
+    <string name="pref_force_wear_location">Force wear location</string>
+    <string name="pref_force_wear_location_summary">Force wear location support.\nUSE AT YOUR OWN RISK</string>
+    <string name="pref_force_dnd_support">Force Do Not Disturb support</string>
+    <string name="pref_force_dnd_support_summary">Force Do Not Disturb support.\nUSE AT YOUR OWN RISK</string>
+    <string name="huawei_ignore_wakeup_status_start">Ignore wakeup start status</string>
+    <string name="huawei_ignore_wakeup_status_start_description">May help with proper sleep detection. Visible immediately in the daily activities view.</string>
+    <string name="huawei_ignore_wakeup_status_end">Ignore wakeup end status</string>
+    <string name="huawei_ignore_wakeup_status_end_description">May help with proper sleep detection. Visible immediately in the daily activities view.</string>
+    <string name="huawei_reparse_workout_data">"Reparse workout data"</string>
+    <string name="huawei_reparse_workout_data_description">"This will only do something after certain updates"</string>
+
     <string name="info_no_devices_connected">no devices connected</string>
     <string name="info_connected_count">%d devices connected</string>
     <string name="controlcenter_set_parent_folder">Set parent folder</string>
@@ -2266,6 +2326,8 @@
     <string name="supercars_turbo_speed_label">Turbo Speed</string>
     <string name="supercars_lights_label">Lights</string>
     <string name="supercars_lights_blinking_label">Blinking</string>
+    <string name="pref_summary_debug">Send a debug request to Huawei device</string>
+    <string name="pref_title_debug">Debug request</string>
     <string name="devicetype_asteroidos">AsteroidOS</string>
     <string name="devicetype_soflow_s06">SoFlow SO6</string>
     <string name="pref_title_lock_unlock">Lock</string>
diff --git a/app/src/main/res/xml/devicesettings_allow_accept_reject_calls.xml b/app/src/main/res/xml/devicesettings_allow_accept_reject_calls.xml
new file mode 100644
index 000000000..f233e9471
--- /dev/null
+++ b/app/src/main/res/xml/devicesettings_allow_accept_reject_calls.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <SwitchPreferenceCompat
+        android:defaultValue="true"
+        android:icon="@drawable/ic_notifications"
+        android:key="enable_call_accept"
+        android:title="@string/pref_enable_call_accept"
+        android:summary="@string/pref_enable_call_accept_summary" />
+    <SwitchPreferenceCompat
+        android:defaultValue="true"
+        android:icon="@drawable/ic_notifications"
+        android:key="enable_call_reject"
+        android:title="@string/pref_enable_call_reject"
+        android:summary="@string/pref_enable_call_reject_summary" />
+</PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/devicesettings_disable_find_phone_with_dnd.xml b/app/src/main/res/xml/devicesettings_disable_find_phone_with_dnd.xml
new file mode 100644
index 000000000..6dc02369b
--- /dev/null
+++ b/app/src/main/res/xml/devicesettings_disable_find_phone_with_dnd.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <SwitchPreferenceCompat
+        android:defaultValue="false"
+        android:icon="@drawable/ic_notifications"
+        android:key="disable_find_phone_with_dnd"
+        android:title="@string/pref_disable_find_phone_with_dnd" />
+</PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/devicesettings_donotdisturb_allday_liftwirst.xml b/app/src/main/res/xml/devicesettings_donotdisturb_allday_liftwirst.xml
new file mode 100644
index 000000000..1109a700c
--- /dev/null
+++ b/app/src/main/res/xml/devicesettings_donotdisturb_allday_liftwirst.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <PreferenceScreen
+        android:icon="@drawable/ic_block"
+        android:key="screen_do_not_disturb"
+        android:persistent="false"
+        android:summary="@string/mi2_prefs_do_not_disturb_summary"
+        android:title="@string/mi2_prefs_do_not_disturb">
+
+        <!-- workaround for missing toolbar -->
+        <PreferenceCategory
+            android:title="@string/mi2_prefs_do_not_disturb"
+            android:summary="@string/mi2_prefs_do_not_disturb_summary"/>
+
+        <ListPreference
+            android:defaultValue="@string/p_off"
+            android:entries="@array/do_not_disturb_allday"
+            android:entryValues="@array/mi2_do_not_disturb_values"
+            android:key="do_not_disturb"
+            android:summary="%s"
+            android:title="@string/mi2_prefs_do_not_disturb" />
+
+        <nodomain.freeyourgadget.gadgetbridge.util.XTimePreference
+            android:defaultValue="00:00"
+            android:key="do_not_disturb_start"
+            android:title="@string/mi2_prefs_do_not_disturb_start" />
+
+        <nodomain.freeyourgadget.gadgetbridge.util.XTimePreference
+            android:defaultValue="23:59"
+            android:key="do_not_disturb_end"
+            android:title="@string/mi2_prefs_do_not_disturb_end" />
+
+        <SwitchPreferenceCompat
+            android:defaultValue="false"
+            android:icon="@drawable/ic_arrow_upward"
+            android:key="do_not_disturb_lift_wrist"
+            android:title="@string/mi2_prefs_do_not_disturb_lift_wrist"
+            android:summary="@string/do_not_disturb_lift_wrist_summary"/>
+
+        <!-- workaround for missing toolbar -->
+        <PreferenceCategory android:title="@string/zetime_prefs_inactivity_repetitions">
+            <CheckBoxPreference
+                android:defaultValue="true"
+                android:key="pref_do_not_disturb_mo"
+                android:title="@string/zetime_prefs_inactivity_mo" />
+            <CheckBoxPreference
+                android:defaultValue="true"
+                android:key="pref_do_not_disturb_tu"
+                android:title="@string/zetime_prefs_inactivity_tu" />
+            <CheckBoxPreference
+                android:defaultValue="true"
+                android:key="pref_do_not_disturb_we"
+                android:title="@string/zetime_prefs_inactivity_we" />
+            <CheckBoxPreference
+                android:defaultValue="true"
+                android:key="pref_do_not_disturb_th"
+                android:title="@string/zetime_prefs_inactivity_th" />
+            <CheckBoxPreference
+                android:defaultValue="true"
+                android:key="pref_do_not_disturb_fr"
+                android:title="@string/zetime_prefs_inactivity_fr" />
+            <CheckBoxPreference
+                android:defaultValue="true"
+                android:key="pref_do_not_disturb_sa"
+                android:title="@string/zetime_prefs_inactivity_sa" />
+            <CheckBoxPreference
+                android:defaultValue="true"
+                android:key="pref_do_not_disturb_su"
+                android:title="@string/zetime_prefs_inactivity_su" />
+        </PreferenceCategory>
+
+    </PreferenceScreen>
+
+
+</androidx.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml/devicesettings_force_options.xml b/app/src/main/res/xml/devicesettings_force_options.xml
new file mode 100644
index 000000000..8b1e3ba89
--- /dev/null
+++ b/app/src/main/res/xml/devicesettings_force_options.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <PreferenceScreen
+        android:icon="@drawable/ic_settings"
+        android:key="pref_force_options"
+        android:title="@string/pref_force_options"
+        android:summary="@string/pref_force_options_summary">
+
+        <SwitchPreferenceCompat
+            android:icon="@drawable/ic_access_time"
+            android:defaultValue="false"
+            android:key="pref_force_enable_smart_alarm"
+            android:title="@string/pref_force_smart_alarm"
+            android:summary="@string/pref_force_smart_alarm_summary"/>
+
+        <SwitchPreferenceCompat
+            android:icon="@drawable/ic_switch_left"
+            android:defaultValue="false"
+            android:key="pref_force_enable_wear_location"
+            android:title="@string/pref_force_wear_location"
+            android:summary="@string/pref_force_wear_location_summary" />
+
+        <SwitchPreferenceCompat
+            android:icon="@drawable/ic_block"
+            android:defaultValue="false"
+            android:key="pref_force_dnd_support"
+            android:title="@string/pref_force_dnd_support"
+            android:summary="@string/pref_force_dnd_support_summary" />
+
+        <SwitchPreferenceCompat
+            android:icon="@drawable/ic_activity_sleep"
+            android:defaultValue="false"
+            android:key="pref_force_ignore_wakeup_status_start"
+            android:title="@string/huawei_ignore_wakeup_status_start"
+            android:summary="@string/huawei_ignore_wakeup_status_start_description"/>
+
+        <SwitchPreferenceCompat
+            android:icon="@drawable/ic_activity_sleep"
+            android:defaultValue="false"
+            android:key="pref_force_ignore_wakeup_status_end"
+            android:title="@string/huawei_ignore_wakeup_status_end"
+            android:summary="@string/huawei_ignore_wakeup_status_end_description"/>
+    </PreferenceScreen>
+
+</androidx.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml/devicesettings_heartrate_automatic_enable.xml b/app/src/main/res/xml/devicesettings_heartrate_automatic_enable.xml
new file mode 100644
index 000000000..8bed9f4a5
--- /dev/null
+++ b/app/src/main/res/xml/devicesettings_heartrate_automatic_enable.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <SwitchPreferenceCompat
+        android:defaultValue="false"
+        android:icon="@drawable/ic_heartrate"
+        android:key="heartrate_automatic_enable"
+        android:title="@string/pref_heartrate_automatic_enable" />
+</androidx.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml/devicesettings_huawei.xml b/app/src/main/res/xml/devicesettings_huawei.xml
new file mode 100644
index 000000000..d0c8a8011
--- /dev/null
+++ b/app/src/main/res/xml/devicesettings_huawei.xml
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <PreferenceScreen
+        android:icon="@drawable/ic_notifications"
+        android:key="screen_notification"
+        android:persistent="false"
+        android:title="@string/menuitem_notifications">
+
+        <SwitchPreferenceCompat
+            android:defaultValue="false"
+            android:icon="@drawable/ic_notifications"
+            android:key="notification_enable"
+            android:title="@string/prefs_notifications_enable"
+            android:summary="@string/enable_notifications_summary"/>
+
+        <SwitchPreferenceCompat
+            android:icon="@drawable/ic_signal_cellular_connected_no_internet_4_bar"
+            android:defaultValue="false"
+            android:key="disconnect_notification_noshed"
+            android:title="@string/prefs_disconnect_notification"
+            android:summary="@string/prefs_disconnect_notification_summary"/>
+
+        <PreferenceScreen
+            android:icon="@drawable/ic_chair"
+            android:key="screen_inactivity"
+            android:persistent="false"
+            android:summary="@string/mi2_prefs_inactivity_warnings_summary"
+            android:title="@string/mi2_prefs_inactivity_warnings">
+
+            <!-- workaround for missing toolbar -->
+            <PreferenceCategory android:title="@string/mi2_prefs_inactivity_warnings" />
+
+            <SwitchPreferenceCompat
+                android:defaultValue="false"
+                android:key="inactivity_warnings_enable"
+                android:title="@string/mi2_prefs_inactivity_warnings"
+                android:summary="@string/mi2_prefs_inactivity_warnings_summary" />
+
+            <EditTextPreference
+                android:defaultValue="60"
+                android:dependency="inactivity_warnings_enable"
+                android:key="inactivity_warnings_threshold"
+                android:inputType="numberSigned"
+                android:maxLength="3"
+                android:title="@string/mi2_prefs_inactivity_warnings_threshold"/>
+
+            <nodomain.freeyourgadget.gadgetbridge.util.XTimePreference
+                android:defaultValue="06:00"
+                android:dependency="inactivity_warnings_enable"
+                android:key="inactivity_warnings_start"
+                android:title="@string/mi2_prefs_do_not_disturb_start" />
+
+            <nodomain.freeyourgadget.gadgetbridge.util.XTimePreference
+                android:defaultValue="23:00"
+                android:dependency="inactivity_warnings_enable"
+                android:key="inactivity_warnings_end"
+                android:title="@string/mi2_prefs_do_not_disturb_end" />
+
+            <!-- workaround for missing toolbar -->
+            <PreferenceCategory android:title="@string/zetime_prefs_inactivity_repetitions"
+                android:dependency="inactivity_warnings_enable">
+                <CheckBoxPreference
+                    android:defaultValue="false"
+                    android:key="inactivity_warnings_mo"
+                    android:title="@string/zetime_prefs_inactivity_mo" />
+                <CheckBoxPreference
+                    android:defaultValue="false"
+                    android:key="inactivity_warnings_tu"
+                    android:title="@string/zetime_prefs_inactivity_tu" />
+                <CheckBoxPreference
+                    android:defaultValue="false"
+                    android:key="inactivity_warnings_we"
+                    android:title="@string/zetime_prefs_inactivity_we" />
+                <CheckBoxPreference
+                    android:defaultValue="false"
+                    android:key="inactivity_warnings_th"
+                    android:title="@string/zetime_prefs_inactivity_th" />
+                <CheckBoxPreference
+                    android:defaultValue="false"
+                    android:key="inactivity_warnings_fr"
+                    android:title="@string/zetime_prefs_inactivity_fr" />
+                <CheckBoxPreference
+                    android:defaultValue="false"
+                    android:key="inactivity_warnings_sa"
+                    android:title="@string/zetime_prefs_inactivity_sa" />
+                <CheckBoxPreference
+                    android:defaultValue="false"
+                    android:key="inactivity_warnings_su"
+                    android:title="@string/zetime_prefs_inactivity_su" />
+            </PreferenceCategory>
+        </PreferenceScreen>
+
+    </PreferenceScreen>
+
+    <PreferenceScreen
+        android:icon="@drawable/ic_block"
+        android:key="screen_do_not_disturb"
+        android:persistent="false"
+        android:title="@string/mi2_prefs_do_not_disturb">
+
+        <!-- workaround for missing toolbar -->
+        <!--PreferenceCategory
+            android:title="@string/mi2_prefs_do_not_disturb"
+            android:summary="@string/mi2_prefs_do_not_disturb_summary"/-->
+
+        <ListPreference
+            android:defaultValue="@string/p_off"
+            android:entries="@array/do_not_disturb_allday"
+            android:entryValues="@array/mi2_do_not_disturb_values"
+            android:key="do_not_disturb"
+            android:summary="%s"
+            android:title="@string/mi2_prefs_do_not_disturb" />
+
+        <nodomain.freeyourgadget.gadgetbridge.util.XTimePreference
+            android:defaultValue="00:00"
+            android:key="do_not_disturb_start"
+            android:title="@string/mi2_prefs_do_not_disturb_start" />
+
+        <nodomain.freeyourgadget.gadgetbridge.util.XTimePreference
+            android:defaultValue="23:59"
+            android:key="do_not_disturb_end"
+            android:title="@string/mi2_prefs_do_not_disturb_end" />
+
+        <SwitchPreferenceCompat
+            android:defaultValue="false"
+            android:icon="@drawable/ic_arrow_upward"
+            android:key="do_not_disturb_lift_wrist"
+            android:title="@string/mi2_prefs_do_not_disturb_lift_wrist"
+            android:summary="@string/do_not_disturb_lift_wrist_summary"/>
+
+        <SwitchPreferenceCompat
+            android:defaultValue="false"
+            android:icon="@drawable/ic_notification_disconnected"
+            android:key="do_not_disturb_not_wear"
+            android:title="@string/pref_do_not_disturb_not_wear" />
+
+        <!-- workaround for missing toolbar -->
+        <PreferenceCategory android:title="@string/zetime_prefs_inactivity_repetitions">
+            <CheckBoxPreference
+                android:defaultValue="true"
+                android:key="pref_do_not_disturb_mo"
+                android:title="@string/zetime_prefs_inactivity_mo" />
+            <CheckBoxPreference
+                android:defaultValue="true"
+                android:key="pref_do_not_disturb_tu"
+                android:title="@string/zetime_prefs_inactivity_tu" />
+            <CheckBoxPreference
+                android:defaultValue="true"
+                android:key="pref_do_not_disturb_we"
+                android:title="@string/zetime_prefs_inactivity_we" />
+            <CheckBoxPreference
+                android:defaultValue="true"
+                android:key="pref_do_not_disturb_th"
+                android:title="@string/zetime_prefs_inactivity_th" />
+            <CheckBoxPreference
+                android:defaultValue="true"
+                android:key="pref_do_not_disturb_fr"
+                android:title="@string/zetime_prefs_inactivity_fr" />
+            <CheckBoxPreference
+                android:defaultValue="true"
+                android:key="pref_do_not_disturb_sa"
+                android:title="@string/zetime_prefs_inactivity_sa" />
+            <CheckBoxPreference
+                android:defaultValue="true"
+                android:key="pref_do_not_disturb_su"
+                android:title="@string/zetime_prefs_inactivity_su" />
+        </PreferenceCategory>
+
+    </PreferenceScreen>
+
+    <PreferenceScreen
+        android:icon="@drawable/ic_warning"
+        android:key="debug_huawei"
+        android:persistent="false"
+        android:title="@string/title_activity_debug">
+
+        <EditTextPreference
+            android:icon="@drawable/ic_warning"
+            android:key="debug_huawei_request"
+            android:maxLength="16"
+            android:summary="@string/pref_summary_debug"
+            android:title="@string/pref_title_debug" />
+
+        <SwitchPreferenceCompat
+            android:defaultValue="false"
+            android:key="huawei_reparse_workout_data"
+            android:title="Reparse workout data"
+            android:summary="This will only do something after certain updates" />
+
+        <PreferenceCategory
+            android:icon="@drawable/ic_settings"
+            android:key="pref_force_options"
+            android:title="@string/pref_force_options"
+            android:summary="@string/pref_force_options_summary">
+
+            <SwitchPreferenceCompat
+                android:icon="@drawable/ic_access_time"
+                android:defaultValue="false"
+                android:key="pref_force_enable_smart_alarm"
+                android:title="@string/pref_force_smart_alarm"
+                android:summary="@string/pref_force_smart_alarm_summary"/>
+
+            <SwitchPreferenceCompat
+                android:icon="@drawable/ic_switch_left"
+                android:defaultValue="false"
+                android:key="pref_force_enable_wear_location"
+                android:title="@string/pref_force_wear_location"
+                android:summary="@string/pref_force_wear_location_summary" />
+
+            <SwitchPreferenceCompat
+                android:icon="@drawable/ic_block"
+                android:defaultValue="false"
+                android:key="pref_force_dnd_support"
+                android:title="@string/pref_force_dnd_support"
+                android:summary="@string/pref_force_dnd_support_summary" />
+
+            <SwitchPreferenceCompat
+                android:icon="@drawable/ic_activity_sleep"
+                android:defaultValue="false"
+                android:key="pref_force_ignore_wakeup_status_start"
+                android:title="@string/huawei_ignore_wakeup_status_start"
+                android:summary="@string/huawei_ignore_wakeup_status_start_description"/>
+
+            <SwitchPreferenceCompat
+                android:icon="@drawable/ic_activity_sleep"
+                android:defaultValue="false"
+                android:key="pref_force_ignore_wakeup_status_end"
+                android:title="@string/huawei_ignore_wakeup_status_end"
+                android:summary="@string/huawei_ignore_wakeup_status_end_description"/>
+        </PreferenceCategory>
+
+    </PreferenceScreen>
+    <ListPreference
+        android:icon="@drawable/ic_language"
+        android:defaultValue="auto"
+        android:entries="@array/pref_amazfitbip_language"
+        android:entryValues="@array/pref_amazfitbip_language_values"
+        android:key="language"
+        android:summary="%s"
+        android:title="@string/pref_title_language" />
+</androidx.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml/devicesettings_huawei_debug.xml b/app/src/main/res/xml/devicesettings_huawei_debug.xml
new file mode 100644
index 000000000..b02d20acc
--- /dev/null
+++ b/app/src/main/res/xml/devicesettings_huawei_debug.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <EditTextPreference
+        android:icon="@drawable/ic_warning"
+        android:key="debug_huawei"
+        android:maxLength="16"
+        android:summary="@string/pref_summary_debug"
+        android:title="@string/pref_title_debug" />
+
+</androidx.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml/devicesettings_huawei_reparse_workout_data.xml b/app/src/main/res/xml/devicesettings_huawei_reparse_workout_data.xml
new file mode 100644
index 000000000..9e1226c25
--- /dev/null
+++ b/app/src/main/res/xml/devicesettings_huawei_reparse_workout_data.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <SwitchPreferenceCompat
+        android:defaultValue="false"
+        android:key="huawei_reparse_workout_data"
+        android:title="@string/huawei_reparse_workout_data"
+        android:summary="@string/huawei_reparse_workout_data_description" />
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/devicesettings_inactivity_sheduled.xml b/app/src/main/res/xml/devicesettings_inactivity_sheduled.xml
new file mode 100644
index 000000000..bc98c8ad8
--- /dev/null
+++ b/app/src/main/res/xml/devicesettings_inactivity_sheduled.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <PreferenceScreen
+        android:icon="@drawable/ic_chair"
+        android:key="screen_inactivity"
+        android:persistent="false"
+        android:summary="@string/mi2_prefs_inactivity_warnings_summary"
+        android:title="@string/mi2_prefs_inactivity_warnings">
+
+        <!-- workaround for missing toolbar -->
+        <PreferenceCategory android:title="@string/mi2_prefs_inactivity_warnings" />
+
+        <SwitchPreferenceCompat
+            android:defaultValue="false"
+            android:key="inactivity_warnings_enable"
+            android:title="@string/mi2_prefs_inactivity_warnings"
+            android:summary="@string/mi2_prefs_inactivity_warnings_summary" />
+
+        <EditTextPreference
+            android:defaultValue="60"
+            android:dependency="inactivity_warnings_enable"
+            android:key="inactivity_warnings_threshold"
+            android:inputType="numberSigned"
+            android:maxLength="3"
+            android:title="@string/mi2_prefs_inactivity_warnings_threshold"/>
+
+        <nodomain.freeyourgadget.gadgetbridge.util.XTimePreference
+            android:defaultValue="06:00"
+            android:dependency="inactivity_warnings_enable"
+            android:key="inactivity_warnings_start"
+            android:title="@string/mi2_prefs_do_not_disturb_start" />
+
+        <nodomain.freeyourgadget.gadgetbridge.util.XTimePreference
+            android:defaultValue="23:00"
+            android:dependency="inactivity_warnings_enable"
+            android:key="inactivity_warnings_end"
+            android:title="@string/mi2_prefs_do_not_disturb_end" />
+
+        <!-- workaround for missing toolbar -->
+        <PreferenceCategory android:title="@string/zetime_prefs_inactivity_repetitions"
+            android:dependency="inactivity_warnings_enable">
+            <CheckBoxPreference
+                android:defaultValue="false"
+                android:key="inactivity_warnings_mo"
+                android:title="@string/zetime_prefs_inactivity_mo" />
+            <CheckBoxPreference
+                android:defaultValue="false"
+                android:key="inactivity_warnings_tu"
+                android:title="@string/zetime_prefs_inactivity_tu" />
+            <CheckBoxPreference
+                android:defaultValue="false"
+                android:key="inactivity_warnings_we"
+                android:title="@string/zetime_prefs_inactivity_we" />
+            <CheckBoxPreference
+                android:defaultValue="false"
+                android:key="inactivity_warnings_th"
+                android:title="@string/zetime_prefs_inactivity_th" />
+            <CheckBoxPreference
+                android:defaultValue="false"
+                android:key="inactivity_warnings_fr"
+                android:title="@string/zetime_prefs_inactivity_fr" />
+            <CheckBoxPreference
+                android:defaultValue="false"
+                android:key="inactivity_warnings_sa"
+                android:title="@string/zetime_prefs_inactivity_sa" />
+            <CheckBoxPreference
+                android:defaultValue="false"
+                android:key="inactivity_warnings_su"
+                android:title="@string/zetime_prefs_inactivity_su" />
+        </PreferenceCategory>
+    </PreferenceScreen>
+
+</androidx.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml/devicesettings_spo_automatic_enable.xml b/app/src/main/res/xml/devicesettings_spo_automatic_enable.xml
new file mode 100644
index 000000000..f59cd0705
--- /dev/null
+++ b/app/src/main/res/xml/devicesettings_spo_automatic_enable.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <SwitchPreferenceCompat
+        android:defaultValue="false"
+        android:icon="@drawable/ic_heart"
+        android:key="spo_automatic_enable"
+        android:title="@string/pref_spo_automatic_enable" />
+</androidx.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml/devicesettings_trusleep.xml b/app/src/main/res/xml/devicesettings_trusleep.xml
new file mode 100644
index 000000000..7a65510a3
--- /dev/null
+++ b/app/src/main/res/xml/devicesettings_trusleep.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <PreferenceScreen
+        android:icon="@drawable/ic_access_time"
+        android:key="screen_trusleep"
+        android:persistent="false"
+        android:title="@string/huawei_trusleep_title"
+        android:summary="@string/huawei_trusleep_summary_light">
+
+        <SwitchPreferenceCompat
+            android:enabled="false"
+            android:icon="@drawable/ic_access_time"
+            android:defaultValue="false"
+            android:key="trusleep"
+            android:title="@string/huawei_trusleep_title"
+            android:summary="@string/huawei_trusleep_summary"/>
+
+    </PreferenceScreen>
+</androidx.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml/devicesettings_workmode.xml b/app/src/main/res/xml/devicesettings_workmode.xml
new file mode 100644
index 000000000..51edc5dbf
--- /dev/null
+++ b/app/src/main/res/xml/devicesettings_workmode.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <ListPreference
+        android:defaultValue="auto"
+        android:icon="@drawable/ic_switch_left"
+        android:entries="@array/workmode"
+        android:entryValues="@array/workmode_values"
+        android:key="workmode"
+        android:summary="%s"
+        android:title="@string/prefs_workmode" />
+
+</androidx.preference.PreferenceScreen>
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/TestHuaweiCrypto.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/TestHuaweiCrypto.java
new file mode 100644
index 000000000..ccb60eae6
--- /dev/null
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/TestHuaweiCrypto.java
@@ -0,0 +1,77 @@
+/*  Copyright (C) 2022 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.Arrays;
+
+public class TestHuaweiCrypto {
+
+    private void printByteArrayAsHex(String name, byte[] array) {
+        System.out.print(name + ": [");
+        for (int i = 0; i < array.length - 1; i++) {
+            System.out.print(Integer.toHexString(array[i] & 0xFF) + ", ");
+        }
+        System.out.println(Integer.toHexString(array[array.length - 1] & 0xFF) + "]");
+    }
+
+    private void printIntArray(String name, int[] array) {
+        System.out.print(name + ": [");
+        for (int i = 0; i < array.length - 1; i++) {
+            System.out.print(array[i] + ", ");
+        }
+        System.out.println(array[array.length - 1] + "]");
+    }
+
+    @Test
+    public void testGenerateNonce() {
+        // The function output contains randomness, so we test multiple times
+
+        // We also check how often each byte is present, and that the difference isn't too high
+        // Note that this may fail due to the randomness
+        int[] bytePresent = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+        Assert.assertEquals(256, bytePresent.length);
+
+        for (int i = 0; i < 1000; i++) {
+            byte[] output = HuaweiCrypto.generateNonce();
+
+            printByteArrayAsHex("Output", output);
+
+            Assert.assertEquals(16, output.length);
+
+            for (byte b : output) {
+                bytePresent[b & 0xFF] += 1;
+            }
+        }
+
+        printIntArray("Bytes present", bytePresent);
+
+        int minCount = Integer.MAX_VALUE;
+        int maxCount = Integer.MIN_VALUE;
+        for (int c : bytePresent) {
+            minCount = Math.min(c, minCount);
+            maxCount = Math.max(c, maxCount);
+        }
+
+        // The limit here is quite arbitrary, erring on the high side
+        if (maxCount - minCount > 60) {
+            Assert.fail("Difference in byte counts is suspiciously high, check the randomness of the nonce.");
+        }
+    }
+}
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/TestHuaweiPacket.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/TestHuaweiPacket.java
new file mode 100644
index 000000000..6fa7efce0
--- /dev/null
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/TestHuaweiPacket.java
@@ -0,0 +1,269 @@
+/*  Copyright (C) 2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.FindPhone;
+
+public class TestHuaweiPacket {
+
+    HuaweiPacket.ParamsProvider paramsProvider = new HuaweiPacket.ParamsProvider() {
+
+        @Override
+        public byte getAuthMode() {
+            return 0;
+        }
+
+        @Override
+        public byte[] getSecretKey() {
+            return new byte[] {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+        }
+
+        @Override
+        public byte[] getIv() {
+            return new byte[] {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+        }
+
+        @Override
+        public boolean areTransactionsCrypted() {
+            return false;
+        }
+
+        @Override
+        public int getMtu() {
+            return 0;
+        }
+
+        @Override
+        public int getSliceSize() {
+            return 0xF4;
+        }
+    };
+
+    HuaweiPacket.ParamsProvider paramsProviderEncrypt = new HuaweiPacket.ParamsProvider() {
+
+        @Override
+        public byte getAuthMode() {
+            return 0;
+        }
+
+        @Override
+        public byte[] getSecretKey() {
+            return new byte[] {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+        }
+
+        @Override
+        public byte[] getIv() {
+            return new byte[] {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+        }
+
+        @Override
+        public boolean areTransactionsCrypted() {
+            return true;
+        }
+
+        @Override
+        public int getMtu() {
+            return 0;
+        }
+
+        @Override
+        public int getSliceSize() {
+            return 0xF4;
+        }
+    };
+
+    HuaweiPacket.ParamsProvider paramsProviderSmallSlice = new HuaweiPacket.ParamsProvider() {
+
+        @Override
+        public byte getAuthMode() {
+            return 0;
+        }
+
+        @Override
+        public byte[] getSecretKey() {
+            return new byte[] {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+        }
+
+        @Override
+        public byte[] getIv() {
+            return new byte[] {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+        }
+
+        @Override
+        public boolean areTransactionsCrypted() {
+            return false;
+        }
+
+        @Override
+        public int getMtu() {
+            return 0;
+        }
+
+        @Override
+        public int getSliceSize() {
+            return 0x10;
+        }
+    };
+
+    @Test
+    public void testEmptyPacketParse() {
+        byte[] input = {};
+
+        HuaweiPacket packet = new HuaweiPacket(paramsProvider);
+
+        try {
+            packet.parse(input);
+        } catch (HuaweiPacket.LengthMismatchException e) {
+            // Pass
+        } catch (HuaweiPacket.ParseException e) {
+            Assert.fail();
+        }
+    }
+
+    @Test
+    public void testUnknownUnencryptedPacketParse() throws HuaweiPacket.ParseException {
+        byte[] input = {0x5a, 0x00, 0x07, 0x00, 0x7f, 0x7f, 0x01, 0x02, 0x03, 0x04, 0x40, (byte) 0xb6};
+
+        HuaweiTLV expectedTlv = new HuaweiTLV()
+                .put(0x01, (short) 0x0304);
+
+        HuaweiPacket packet = new HuaweiPacket(paramsProvider);
+        packet = packet.parse(input);
+
+        Assert.assertEquals(HuaweiPacket.class, packet.getClass());
+        Assert.assertEquals(0x7f, packet.serviceId);
+        Assert.assertEquals(0x7f, packet.commandId);
+        Assert.assertFalse(packet.isEncrypted);
+        Assert.assertTrue(packet.complete);
+        Assert.assertEquals(expectedTlv, packet.getTlv());
+    }
+
+    @Test
+    public void testUnknownEncryptedPacketParse() throws HuaweiPacket.ParseException {
+        byte[] input = {(byte) 0x5a, (byte) 0x00, (byte) 0x2a, (byte) 0x00, (byte) 0x7f, (byte) 0x7f, (byte) 0x7c, (byte) 0x01, (byte) 0x01, (byte) 0x7d, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7e, (byte) 0x10, (byte) 0x9e, (byte) 0x40, (byte) 0xe1, (byte) 0xea, (byte) 0x15, (byte) 0xf6, (byte) 0x50, (byte) 0x80, (byte) 0x8c, (byte) 0x45, (byte) 0x19, (byte) 0xd5, (byte) 0x2a, (byte) 0xbb, (byte) 0x29, (byte) 0xb8, (byte) 0xD5, (byte) 0x24};
+
+        HuaweiTLV expectedTlv = new HuaweiTLV()
+                .put(0x01, (short) 0x0304);
+
+        HuaweiPacket packet = new HuaweiPacket(paramsProvider);
+        packet = packet.parse(input);
+
+        Assert.assertEquals(HuaweiPacket.class, packet.getClass());
+        Assert.assertEquals(0x7f, packet.serviceId);
+        Assert.assertEquals(0x7f, packet.commandId);
+        Assert.assertTrue(packet.isEncrypted);
+        Assert.assertTrue(packet.complete);
+        Assert.assertEquals(expectedTlv, packet.getTlv());
+    }
+
+    @Test
+    public void testKnownEncryptedPacketParse() throws HuaweiPacket.ParseException {
+        byte[] input = {(byte) 0x5a, (byte) 0x00, (byte) 0x2a, (byte) 0x00, (byte) 0x0b, (byte) 0x01, (byte) 0x7c, (byte) 0x01, (byte) 0x01, (byte) 0x7d, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7e, (byte) 0x10, (byte) 0x28, (byte) 0x00, (byte) 0x99, (byte) 0x6f, (byte) 0x2a, (byte) 0xcb, (byte) 0x62, (byte) 0x3a, (byte) 0xe6, (byte) 0x54, (byte) 0x28, (byte) 0x54, (byte) 0xf8, (byte) 0xab, (byte) 0x54, (byte) 0x83, (byte) 0xf4, (byte) 0xf4};
+
+        HuaweiTLV expectedTlv = new HuaweiTLV()
+                .put(0x01, false);
+
+        HuaweiPacket packet = new HuaweiPacket(paramsProvider);
+        packet = packet.parse(input);
+
+        Assert.assertEquals(FindPhone.Response.class, packet.getClass());
+        Assert.assertEquals(0x0b, packet.serviceId);
+        Assert.assertEquals(0x01, packet.commandId);
+        Assert.assertTrue(packet.isEncrypted);
+        Assert.assertTrue(packet.complete);
+        Assert.assertEquals(expectedTlv, packet.getTlv());
+    }
+
+    @Test
+    public void testUnencryptedUnslicedSerialize() throws HuaweiPacket.CryptoException {
+        byte serviceId = 0x01;
+        byte commandId = 0x02;
+        HuaweiTLV tlv = new HuaweiTLV()
+                .put(0x03, 0x05060708);
+
+        byte[] expected = {(byte) 0x5a, (byte) 0x00, (byte) 0x09, (byte) 0x00, (byte) 0x01, (byte) 0x02, (byte) 0x03, (byte) 0x04, (byte) 0x05, (byte) 0x06, (byte) 0x07, (byte) 0x08, (byte) 0xA4, (byte) 0xF0};
+
+        HuaweiPacket packet = new HuaweiPacket(paramsProvider);
+        packet.isSliced = false;
+        packet.isEncrypted = false;
+        packet.serviceId = serviceId;
+        packet.commandId = commandId;
+        packet.setTlv(tlv);
+
+        List<byte[]> output = packet.serialize();
+
+        Assert.assertEquals(1, output.size());
+        Assert.assertArrayEquals(expected, output.get(0));
+    }
+
+    @Test
+    public void testEncryptedUnslicedSerialize() throws HuaweiPacket.CryptoException {
+        byte serviceId = 0x01;
+        byte commandId = 0x02;
+        HuaweiTLV tlv = new HuaweiTLV()
+                .put(0x03, 0x05060708);
+
+        byte[] expected = {(byte) 0x5a, (byte) 0x00, (byte) 0x2a, (byte) 0x00, (byte) 0x01, (byte) 0x02, (byte) 0x7c, (byte) 0x01, (byte) 0x01, (byte) 0x7d, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7e, (byte) 0x10, (byte) 0x3b, (byte) 0x89, (byte) 0xfc, (byte) 0x79, (byte) 0xd9, (byte) 0x05, (byte) 0x5e, (byte) 0xed, (byte) 0x52, (byte) 0x35, (byte) 0xfe, (byte) 0x16, (byte) 0xa0, (byte) 0x8a, (byte) 0x4d, (byte) 0x53, (byte) 0x93, (byte) 0xc7};
+
+        HuaweiPacket packet = new HuaweiPacket(paramsProviderEncrypt);
+        packet.isSliced = false;
+        packet.isEncrypted = true;
+        packet.serviceId = serviceId;
+        packet.commandId = commandId;
+        packet.setTlv(tlv);
+
+        List<byte[]> output = packet.serialize();
+
+        Assert.assertEquals(1, output.size());
+        Assert.assertArrayEquals(expected, output.get(0));
+    }
+
+    @Test
+    public void testUnencryptedSlicedSerialize() throws HuaweiPacket.CryptoException {
+        byte serviceId = 0x01;
+        byte commandId = 0x02;
+        HuaweiTLV tlv = new HuaweiTLV()
+                .put(0x01, 0x00)
+                .put(0x02, 0x00)
+                .put(0x03, 0x00)
+                .put(0x04, 0x00);
+
+        byte[] expected1 = {(byte) 0x5a, (byte) 0x00, (byte) 0x0b, (byte) 0x01, (byte) 0x00, (byte) 0x01, (byte) 0x02, (byte) 0x01, (byte) 0x04, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x02, (byte) 0xcc, (byte) 0x98};
+        byte[] expected2 = {(byte) 0x5a, (byte) 0x00, (byte) 0x0b, (byte) 0x02, (byte) 0x01, (byte) 0x04, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x03, (byte) 0x04, (byte) 0x00, (byte) 0x00, (byte) 0xfa, (byte) 0xd3};
+        byte[] expected3 = {(byte) 0x5a, (byte) 0x00, (byte) 0x0a, (byte) 0x03, (byte) 0x02, (byte) 0x00, (byte) 0x00, (byte) 0x04, (byte) 0x04, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x37, (byte) 0xca};
+
+        HuaweiPacket packet = new HuaweiPacket(paramsProviderSmallSlice);
+        packet.isSliced = true;
+        packet.isEncrypted = false;
+        packet.serviceId = serviceId;
+        packet.commandId = commandId;
+        packet.setTlv(tlv);
+
+        List<byte[]> output = packet.serialize();
+
+        Assert.assertEquals(3, output.size());
+        Assert.assertArrayEquals(expected1, output.get(0));
+        Assert.assertArrayEquals(expected2, output.get(1));
+        Assert.assertArrayEquals(expected3, output.get(2));
+    }
+}
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/TestHuaweiTLV.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/TestHuaweiTLV.java
new file mode 100644
index 000000000..ed0004071
--- /dev/null
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/TestHuaweiTLV.java
@@ -0,0 +1,532 @@
+/*  Copyright (C) 2022 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+public class TestHuaweiTLV {
+
+    HuaweiPacket.ParamsProvider secretsProvider = new HuaweiPacket.ParamsProvider() {
+        @Override
+        public byte getAuthMode() {
+            return 0;
+        }
+
+        @Override
+        public byte[] getSecretKey() {
+            return new byte[] {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+        }
+
+        @Override
+        public byte[] getIv() {
+            return new byte[] {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+        }
+
+        @Override
+        public boolean areTransactionsCrypted() {
+            return false;
+        }
+
+        @Override
+        public int getMtu() {
+            return 0;
+        }
+
+        @Override
+        public int getSliceSize() {
+            return 0xF4;
+        }
+    };
+
+    @Test
+    public void testSerializeEmpty() {
+        byte[] expectedOutput = {};
+
+        HuaweiTLV huaweiTLV = new HuaweiTLV();
+
+        Assert.assertArrayEquals(expectedOutput, huaweiTLV.serialize());
+    }
+
+    @Test
+    public void testSerialize() {
+        ArrayList<HuaweiTLV.TLV> input = new ArrayList<>();
+        input.add(new HuaweiTLV.TLV((byte) 0x01, new byte[] {}));
+        input.add(new HuaweiTLV.TLV((byte) 0x01, new byte[] {0x42}));
+        byte[] expectedOutput = {0x01, 0x00, 0x01, 0x01, 0x42};
+
+        HuaweiTLV huaweiTLV = new HuaweiTLV();
+        huaweiTLV.valueMap = input;
+
+        Assert.assertArrayEquals(expectedOutput, huaweiTLV.serialize());
+    }
+
+    @Test
+    public void testPutEmptyTag() {
+        int tag = 0x01;
+        ArrayList<HuaweiTLV.TLV> expectedValueMap = new ArrayList<>();
+        expectedValueMap.add(new HuaweiTLV.TLV((byte) 0x01, new byte[] {}));
+
+        HuaweiTLV huaweiTLV = new HuaweiTLV().put(tag);
+
+        Assert.assertEquals(expectedValueMap, huaweiTLV.valueMap);
+    }
+
+    @Test
+    public void testPutNullByteArray() {
+        int tag = 0x01;
+        byte[] input = null;
+        ArrayList<HuaweiTLV.TLV> expectedValueMap = new ArrayList<>();
+
+        //noinspection ConstantConditions
+        HuaweiTLV huaweiTLV = new HuaweiTLV().put(tag, input);
+
+        Assert.assertEquals(expectedValueMap, huaweiTLV.valueMap);
+    }
+
+    @Test
+    public void testPutByteArray() {
+        int tag = 0x01;
+        byte[] input = {0x01, 0x02, 0x03};
+        ArrayList<HuaweiTLV.TLV> expectedValueMap = new ArrayList<>();
+        expectedValueMap.add(new HuaweiTLV.TLV((byte) 0x01, new byte[] {0x01, 0x02, 0x03}));
+
+        HuaweiTLV huaweiTLV = new HuaweiTLV()
+                .put(tag, input);
+
+        Assert.assertEquals(expectedValueMap, huaweiTLV.valueMap);
+    }
+
+    @Test
+    public void testPutByte() {
+        int tag = 0x01;
+        byte input = 0x13;
+        ArrayList<HuaweiTLV.TLV> expectedValueMap = new ArrayList<>();
+        expectedValueMap.add(new HuaweiTLV.TLV((byte) 0x01, new byte[] {0x13}));
+
+        HuaweiTLV huaweiTLV = new HuaweiTLV()
+                .put(tag, input);
+
+        Assert.assertEquals(expectedValueMap, huaweiTLV.valueMap);
+    }
+
+    @Test
+    public void testPutBooleans() {
+        int tag1 = 0x01;
+        int tag2 = 0x02;
+        ArrayList<HuaweiTLV.TLV> expectedValueMap = new ArrayList<>();
+        expectedValueMap.add(new HuaweiTLV.TLV((byte) 0x01, new byte[] {0x01}));
+        expectedValueMap.add(new HuaweiTLV.TLV((byte) 0x02, new byte[] {0x00}));
+
+        HuaweiTLV huaweiTLV = new HuaweiTLV()
+                .put(tag1, true)
+                .put(tag2, false);
+
+        Assert.assertEquals(expectedValueMap, huaweiTLV.valueMap);
+    }
+
+    @Test
+    public void testPutInt() {
+        int tag = 0x01;
+        int input = 0xDEADBEEF;
+        ArrayList<HuaweiTLV.TLV> expectedValueMap = new ArrayList<>();
+        expectedValueMap.add(new HuaweiTLV.TLV((byte) 0x01, new byte[] {(byte) 0xDE, (byte) 0xAD, (byte) 0xBE, (byte) 0xEF}));
+
+        HuaweiTLV huaweiTLV = new HuaweiTLV()
+                .put(tag, input);
+
+        Assert.assertEquals(expectedValueMap, huaweiTLV.valueMap);
+    }
+
+    @Test
+    public void testPutShort() {
+        int tag = 0x01;
+        short input = (short) 0xCAFE;
+        ArrayList<HuaweiTLV.TLV> expectedValueMap = new ArrayList<>();
+        expectedValueMap.add(new HuaweiTLV.TLV((byte) 0x01, new byte[] {(byte) 0xCA, (byte) 0xFE}));
+
+        HuaweiTLV huaweiTLV = new HuaweiTLV()
+                .put(tag, input);
+
+        Assert.assertEquals(expectedValueMap, huaweiTLV.valueMap);
+    }
+
+    @Test
+    public void testPutString() {
+        int tag = 0x01;
+        String input = "Hello world!";
+        ArrayList<HuaweiTLV.TLV> expectedValueMap = new ArrayList<>();
+        expectedValueMap.add(new HuaweiTLV.TLV(
+                (byte) 0x01,
+                new byte[] {0x48, 0x65, 0x6C, 0x6C, 0x6F, 0x20, 0x77, 0x6F, 0x72, 0x6C, 0x64, 0x21}
+        ));
+
+        HuaweiTLV huaweiTLV = new HuaweiTLV()
+                .put(tag, input);
+
+        Assert.assertEquals(expectedValueMap, huaweiTLV.valueMap);
+    }
+
+    @Test
+    public void testPutHuaweiTLV() {
+        int tag = 0x01;
+        HuaweiTLV input = new HuaweiTLV().put(0x01, (short) 0x1337);
+        ArrayList<HuaweiTLV.TLV> expectedValueMap = new ArrayList<>();
+        expectedValueMap.add(new HuaweiTLV.TLV((byte) 0x01, new byte[] {0x01, 0x02, 0x13, 0x37}));
+
+        HuaweiTLV huaweiTLV = new HuaweiTLV()
+                .put(tag, input);
+
+        Assert.assertEquals(expectedValueMap, huaweiTLV.valueMap);
+    }
+
+    @Test
+    public void testPutMultipleEqualEmptyTags() {
+        int tag = 0x01;
+        ArrayList<HuaweiTLV.TLV> expectedValueMap = new ArrayList<>();
+        expectedValueMap.add(new HuaweiTLV.TLV((byte) 0x01, new byte[] {}));
+        expectedValueMap.add(new HuaweiTLV.TLV((byte) 0x01, new byte[] {}));
+
+        HuaweiTLV huaweiTLV = new HuaweiTLV()
+                .put(tag)
+                .put(tag);
+
+        Assert.assertEquals(expectedValueMap, huaweiTLV.valueMap);
+    }
+
+    @Test
+    public void testParseEmpty() {
+        byte[] input = {};
+        ArrayList<HuaweiTLV.TLV> expectedValueMap = new ArrayList<>();
+
+        HuaweiTLV huaweiTLV = new HuaweiTLV()
+                .parse(input);
+
+        Assert.assertEquals(expectedValueMap, huaweiTLV.valueMap);
+    }
+
+    @Test
+    public void testParseSingleByte() {
+        byte[] input = {0x01, 0x01, 0x01};
+        ArrayList<HuaweiTLV.TLV> expectedValueMap = new ArrayList<>();
+        expectedValueMap.add(new HuaweiTLV.TLV((byte) 0x01, new byte[] {0x01}));
+
+        HuaweiTLV huaweiTLV = new HuaweiTLV()
+                .parse(input);
+
+        Assert.assertEquals(expectedValueMap, huaweiTLV.valueMap);
+    }
+
+    @Test
+    public void testParseBytes() {
+        byte[] input = {0x01, 0x04, (byte) 0xDE, (byte) 0xAD, (byte) 0xBE, (byte) 0xEF};
+        ArrayList<HuaweiTLV.TLV> expectedValueMap = new ArrayList<>();
+        expectedValueMap.add(new HuaweiTLV.TLV((byte) 0x01, new byte[] {(byte) 0xDE, (byte) 0xAD, (byte) 0xBE, (byte) 0xEF}));
+
+        HuaweiTLV huaweiTLV = new HuaweiTLV()
+                .parse(input);
+
+        Assert.assertEquals(expectedValueMap, huaweiTLV.valueMap);
+    }
+
+    @Test
+    public void testParseZeroOffsetLength() {
+        byte[] input = {};
+        ArrayList<HuaweiTLV.TLV> expectedValueMap = new ArrayList<>();
+
+        HuaweiTLV huaweiTLV = new HuaweiTLV()
+                .parse(input, 0, 0);
+
+        Assert.assertEquals(expectedValueMap, huaweiTLV.valueMap);
+    }
+
+    @Test(expected = ArrayIndexOutOfBoundsException.class)
+    public void testParseMalformed() {
+        byte[] input = {(byte) 0x01, (byte) 0x01};
+        new HuaweiTLV()
+                .parse(input);
+        Assert.fail();
+    }
+
+    @Test
+    public void testParseOffsetLength() {
+        byte[] input = {(byte) 0x90, (byte) 0x90, (byte) 0x90, 0x01, 0x00};
+        int offset = 3;
+        int length = 2;
+        ArrayList<HuaweiTLV.TLV> expectedValueMap = new ArrayList<>();
+        expectedValueMap.add(new HuaweiTLV.TLV((byte) 0x01, new byte[] {}));
+
+        HuaweiTLV huaweiTLV = new HuaweiTLV()
+                .parse(input, offset, length);
+
+        Assert.assertEquals(expectedValueMap, huaweiTLV.valueMap);
+    }
+
+    @Test(expected = ArrayIndexOutOfBoundsException.class)
+    public void testParseWrongOffsetLength() {
+        byte[] input = {};
+        new HuaweiTLV()
+                .parse(input, 1, 1);
+        Assert.fail();
+    }
+
+    @Test
+    public void testGetBytesEmpty() {
+        int tag = 0x01;
+        ArrayList<HuaweiTLV.TLV> input = new ArrayList<>();
+        input.add(new HuaweiTLV.TLV((byte) 0x01, new byte[] {}));
+        byte[] expectedOutput = new byte[] {};
+
+        HuaweiTLV huaweiTLV = new HuaweiTLV();
+        huaweiTLV.valueMap = input;
+
+        Assert.assertArrayEquals(expectedOutput, huaweiTLV.getBytes(tag));
+    }
+
+    @Test
+    public void testGetBytes() {
+        int tag = 0x01;
+        ArrayList<HuaweiTLV.TLV> input = new ArrayList<>();
+        input.add(new HuaweiTLV.TLV((byte) 0x01, new byte[] {0x01, 0x02, 0x03}));
+        byte[] expectedOutput = new byte[] {0x01, 0x02, 0x03};
+
+        HuaweiTLV huaweiTLV = new HuaweiTLV();
+        huaweiTLV.valueMap = input;
+
+        Assert.assertArrayEquals(expectedOutput, huaweiTLV.getBytes(tag));
+    }
+
+    @Test
+    public void testGetByte() {
+        int tag = 0x01;
+        ArrayList<HuaweiTLV.TLV> input = new ArrayList<>();
+        input.add(new HuaweiTLV.TLV((byte) 0x01, new byte[] {0x04}));
+        Byte expectedOutput = 0x04;
+
+        HuaweiTLV huaweiTLV = new HuaweiTLV();
+        huaweiTLV.valueMap = input;
+
+        Assert.assertEquals(expectedOutput, huaweiTLV.getByte(tag));
+    }
+
+    @Test
+    public void testGetBooleans() {
+        ArrayList<HuaweiTLV.TLV> input = new ArrayList<>();
+        input.add(new HuaweiTLV.TLV((byte) 0x01, new byte[] {0x01}));
+        input.add(new HuaweiTLV.TLV((byte) 0x02, new byte[] {0x00}));
+
+        HuaweiTLV huaweiTLV = new HuaweiTLV();
+        huaweiTLV.valueMap = input;
+
+        Assert.assertEquals(true, huaweiTLV.getBoolean(0x01));
+        Assert.assertEquals(false, huaweiTLV.getBoolean(0x02));
+    }
+
+    @Test
+    public void testGetInteger() {
+        int tag = 0x01;
+        ArrayList<HuaweiTLV.TLV> input = new ArrayList<>();
+        input.add(new HuaweiTLV.TLV((byte) 0x01, new byte[] {(byte) 0xDE, (byte) 0xAD, (byte) 0xBE, (byte) 0xEF}));
+        Integer expectedOutput = 0xDEADBEEF;
+
+        HuaweiTLV huaweiTLV = new HuaweiTLV();
+        huaweiTLV.valueMap = input;
+
+        Assert.assertEquals(expectedOutput, huaweiTLV.getInteger(tag));
+    }
+
+    @Test
+    public void testGetShort() {
+        int tag = 0x01;
+        ArrayList<HuaweiTLV.TLV> input = new ArrayList<>();
+        input.add(new HuaweiTLV.TLV((byte) 0x01, new byte[] {(byte) 0xCA, (byte) 0xFE}));
+        Short expectedOutput = (short) 0xCAFE;
+
+        HuaweiTLV huaweiTLV = new HuaweiTLV();
+        huaweiTLV.valueMap = input;
+
+        Assert.assertEquals(expectedOutput, huaweiTLV.getShort(tag));
+    }
+
+    @Test
+    public void testGetString() {
+        int tag = 0x01;
+        ArrayList<HuaweiTLV.TLV> input = new ArrayList<>();
+        input.add(new HuaweiTLV.TLV((byte) 0x01, new byte[] {0x48, 0x65, 0x6C, 0x6C, 0x6F, 0x20, 0x77, 0x6F, 0x72, 0x6C, 0x64, 0x21}));
+        String expectedOutput = "Hello world!";
+
+        HuaweiTLV huaweiTLV = new HuaweiTLV();
+        huaweiTLV.valueMap = input;
+
+        Assert.assertEquals(expectedOutput, huaweiTLV.getString(tag));
+    }
+
+    @Test
+    public void testGetObject() {
+        int tag = 0x01;
+        ArrayList<HuaweiTLV.TLV> input = new ArrayList<>();
+        input.add(new HuaweiTLV.TLV((byte) 0x01, new byte[] {0x01, 0x00}));
+        HuaweiTLV expectedOutput = new HuaweiTLV().put(0x01);
+
+        HuaweiTLV huaweiTLV = new HuaweiTLV();
+        huaweiTLV.valueMap = input;
+
+        // assertEquals currently tests if the objects are the same, thus this would fail
+        // Assert.assertEquals(expectedOutput, huaweiTLV.getObject(tag));
+
+        HuaweiTLV result = huaweiTLV.getObject(tag);
+
+        Assert.assertEquals(expectedOutput.valueMap, result.valueMap);
+    }
+
+    @Test
+    public void testContains() {
+        int existingTag = 0x01;
+        int nonExistingTag = 0x02;
+        ArrayList<HuaweiTLV.TLV> input = new ArrayList<>();
+        input.add(new HuaweiTLV.TLV((byte) 0x01, new byte[] {}));
+
+        HuaweiTLV huaweiTLV = new HuaweiTLV();
+        huaweiTLV.valueMap = input;
+
+        Assert.assertTrue(huaweiTLV.contains(existingTag));
+        Assert.assertFalse(huaweiTLV.contains(nonExistingTag));
+    }
+
+    @Test
+    public void testRemoveExisting() {
+        int tag = 0x01;
+        ArrayList<HuaweiTLV.TLV> input = new ArrayList<>();
+        input.add(new HuaweiTLV.TLV((byte) 0x01, new byte[] {0x13, 0x37}));
+        input.add(new HuaweiTLV.TLV((byte) 0x02, new byte[] {}));
+        byte[] expectedOutput = {0x13, 0x37};
+        ArrayList<HuaweiTLV.TLV> expectedValueMap = new ArrayList<>();
+        expectedValueMap.add(new HuaweiTLV.TLV((byte) 0x02, new byte[] {}));
+
+        HuaweiTLV huaweiTLV = new HuaweiTLV();
+        huaweiTLV.valueMap = input;
+
+        Assert.assertArrayEquals(expectedOutput, huaweiTLV.remove(tag));
+        Assert.assertEquals(expectedValueMap, huaweiTLV.valueMap);
+    }
+
+    @Test
+    public void testRemoveNonExisting() {
+        int tag = 0x02;
+        ArrayList<HuaweiTLV.TLV> input = new ArrayList<>();
+        input.add(new HuaweiTLV.TLV((byte) 0x01, new byte[] {0x13, 0x37}));
+
+        HuaweiTLV huaweiTLV = new HuaweiTLV();
+        huaweiTLV.valueMap = input;
+
+        Assert.assertNull(huaweiTLV.remove(tag));
+        Assert.assertEquals(input, huaweiTLV.valueMap);
+    }
+
+    @Test
+    public void testRemoveDouble() {
+        int tag = 0x01;
+        ArrayList<HuaweiTLV.TLV> input = new ArrayList<>();
+        input.add(new HuaweiTLV.TLV((byte) 0x01, new byte[] {(byte) 0xCA}));
+        input.add(new HuaweiTLV.TLV((byte) 0x01, new byte[] {(byte) 0xFE}));
+        byte[] expectedOutput1 = {(byte) 0xFE};
+        byte[] expectedOutput2 = {(byte) 0xCA};
+        ArrayList<HuaweiTLV.TLV> expectedValueMap1 = new ArrayList<>();
+        expectedValueMap1.add(new HuaweiTLV.TLV((byte) 0x01, new byte[] {(byte) 0xCA}));
+        ArrayList<HuaweiTLV.TLV> expectedValueMap2 = new ArrayList<>();
+
+        HuaweiTLV huaweiTLV = new HuaweiTLV();
+        huaweiTLV.valueMap = input;
+
+        Assert.assertArrayEquals(expectedOutput1, huaweiTLV.remove(tag));
+        Assert.assertEquals(expectedValueMap1, huaweiTLV.valueMap);
+        Assert.assertArrayEquals(expectedOutput2, huaweiTLV.remove(tag));
+        Assert.assertEquals(expectedValueMap2, huaweiTLV.valueMap);
+    }
+
+    @Test
+    public void testToStringEmpty() {
+        ArrayList<HuaweiTLV.TLV> input = new ArrayList<>();
+        String expectedOutput = "Empty";
+
+        HuaweiTLV huaweiTLV = new HuaweiTLV();
+        huaweiTLV.valueMap = input;
+
+        Assert.assertEquals(expectedOutput, huaweiTLV.toString());
+    }
+
+    @Test
+    public void testToString() {
+        ArrayList<HuaweiTLV.TLV> input = new ArrayList<>();
+        input.add(new HuaweiTLV.TLV((byte) 0x01, new byte[] {0x01, 0x02}));
+        input.add(new HuaweiTLV.TLV((byte) 0x02, new byte[] {0x03, 0x04}));
+        String expectedOutput = "{tag: 1 - Value: 0102} - {tag: 2 - Value: 0304}";
+
+        HuaweiTLV huaweiTLV = new HuaweiTLV();
+        huaweiTLV.valueMap = input;
+
+        Assert.assertEquals(expectedOutput, huaweiTLV.toString());
+    }
+
+    /**
+     * Following test also depends on the HuaweiCrypto class functioning correctly
+     */
+    @Test
+    public void testEncrypt() throws HuaweiCrypto.CryptoException {
+        ArrayList<HuaweiTLV.TLV> input = new ArrayList<>();
+        input.add(new HuaweiTLV.TLV((byte) 0x01, new byte[] {(byte) 0xCA, (byte) 0xFE}));
+
+        byte[] expectedCiphertext = {(byte) 0x0E, (byte) 0xA0, (byte) 0x01, (byte) 0xBB, (byte) 0x1E, (byte) 0xDA, (byte) 0xCB, (byte) 0x09, (byte) 0x83, (byte) 0x20, (byte) 0x40, (byte) 0x7D, (byte) 0x97, (byte) 0x1B, (byte) 0xF6, (byte) 0xD0};
+        ArrayList<HuaweiTLV.TLV> expectedValueMap = new ArrayList<>();
+        expectedValueMap.add(new HuaweiTLV.TLV((byte) 0x7C, new byte[] {0x01}));
+        expectedValueMap.add(new HuaweiTLV.TLV((byte) 0x7D, secretsProvider.getIv()));
+        expectedValueMap.add(new HuaweiTLV.TLV((byte) 0x7E, expectedCiphertext));
+
+        HuaweiTLV huaweiTLV = new HuaweiTLV();
+        huaweiTLV.valueMap = input;
+
+        HuaweiTLV encryptedTlv = huaweiTLV.encrypt(secretsProvider);
+
+        Assert.assertEquals(input, huaweiTLV.valueMap);
+        Assert.assertEquals(expectedValueMap, encryptedTlv.valueMap);
+    }
+
+    /**
+     * Following test also depends on the HuaweiCrypto class functioning correctly
+     */
+    @Test
+    public void testDecrypt() throws HuaweiCrypto.CryptoException {
+        byte[] ciphertext = {(byte) 0x0E, (byte) 0xA0, (byte) 0x01, (byte) 0xBB, (byte) 0x1E, (byte) 0xDA, (byte) 0xCB, (byte) 0x09, (byte) 0x83, (byte) 0x20, (byte) 0x40, (byte) 0x7D, (byte) 0x97, (byte) 0x1B, (byte) 0xF6, (byte) 0xD0};
+        ArrayList<HuaweiTLV.TLV> input = new ArrayList<>();
+        input.add(new HuaweiTLV.TLV((byte) 0x7C, new byte[] {0x01}));
+        input.add(new HuaweiTLV.TLV((byte) 0x7D, secretsProvider.getIv()));
+        input.add(new HuaweiTLV.TLV((byte) 0x7E, ciphertext));
+
+        ArrayList<HuaweiTLV.TLV> expectedValueMap = new ArrayList<>();
+        expectedValueMap.add(new HuaweiTLV.TLV((byte) 0x01, new byte[] {(byte) 0xCA, (byte) 0xFE}));
+
+        HuaweiTLV huaweiTLV = new HuaweiTLV();
+        huaweiTLV.valueMap = input;
+
+        huaweiTLV.decrypt(secretsProvider);
+
+        Assert.assertEquals(expectedValueMap, huaweiTLV.valueMap);
+    }
+}
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/TestVarInt.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/TestVarInt.java
new file mode 100644
index 000000000..3bc298644
--- /dev/null
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/TestVarInt.java
@@ -0,0 +1,72 @@
+/*  Copyright (C) 2022 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestVarInt {
+
+    private void testValue(int intValue, byte[] bytesValue, int size) {
+        Assert.assertEquals(size, VarInt.getVarIntSize(intValue));
+        Assert.assertEquals(intValue, VarInt.getVarIntValue(bytesValue, 0));
+        Assert.assertArrayEquals(bytesValue, VarInt.putVarIntValue(intValue));
+
+        VarInt varInt = new VarInt(bytesValue, 0);
+        Assert.assertEquals(size, varInt.size);
+        Assert.assertEquals(intValue, varInt.dValue);
+        Assert.assertArrayEquals(bytesValue, varInt.eValue);
+    }
+
+    @Test
+    public void testZero() {
+        testValue(0, new byte[]{0}, 1);
+    }
+
+    @Test
+    public void testSingleValue() {
+        testValue(17, new byte[]{17}, 1);
+    }
+
+    @Test
+    public void test0x80() {
+        // This is 1 << 8, the first 'overflowing' value
+        testValue(0x80, new byte[]{(byte) 0x81, 0x00}, 2);
+    }
+
+    @Test
+    public void testDoubleValue() {
+        testValue(460, new byte[]{(byte) 0x83, 0x4C}, 2);
+    }
+
+    @Test
+    public void testOffset() {
+        int intValue = 460;
+        byte[] bytesValue = {(byte) 0x83, 0x4C};
+        byte[] bytesTest = {0x00, (byte) 0x83, 0x4C};
+        int size = 2;
+
+        Assert.assertEquals(size, VarInt.getVarIntSize(intValue));
+        Assert.assertEquals(intValue, VarInt.getVarIntValue(bytesTest, 1));
+        Assert.assertArrayEquals(bytesValue, VarInt.putVarIntValue(intValue));
+
+        VarInt varInt = new VarInt(bytesTest, 1);
+        Assert.assertEquals(size, varInt.size);
+        Assert.assertEquals(intValue, varInt.dValue);
+        Assert.assertArrayEquals(bytesValue, varInt.eValue);
+    }
+}
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestAlarms.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestAlarms.java
new file mode 100644
index 000000000..c3cf58107
--- /dev/null
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestAlarms.java
@@ -0,0 +1,167 @@
+/*  Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiTLV;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.lang.reflect.Field;
+import java.util.List;
+
+public class TestAlarms {
+
+    HuaweiPacket.ParamsProvider paramsProvider = new HuaweiPacket.ParamsProvider() {
+        @Override
+        public byte getAuthMode() {
+            return 0;
+        }
+
+        @Override
+        public byte[] getSecretKey() {
+            return new byte[] {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+        }
+
+        @Override
+        public byte[] getIv() {
+            return new byte[] {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+        }
+
+        @Override
+        public boolean areTransactionsCrypted() {
+            return true;
+        }
+
+        @Override
+        public int getMtu() {
+            return 0;
+        }
+
+        @Override
+        public int getSliceSize() {
+            return 0xF4;
+        }
+    };
+
+    @Test
+    public void testEventAlarmsRequest() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.CryptoException {
+        Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
+        tlvField.setAccessible(true);
+
+        Field alarmField = Alarms.EventAlarmsRequest.class.getDeclaredField("alarms");
+        alarmField.setAccessible(true);
+
+        HuaweiTLV expectedAlarmsTlv = new HuaweiTLV();
+
+        Alarms.EventAlarmsRequest request = new Alarms.EventAlarmsRequest(paramsProvider);
+
+        expectedAlarmsTlv.put(0x82, new HuaweiTLV()
+                .put(0x03, (byte) 1)
+                .put(0x04, true)
+                .put(0x05, (short) 0x1337)
+                .put(0x06, (byte) 0)
+                .put(0x07, "Alarm1")
+        );
+
+        request.addEventAlarm(
+                new Alarms.EventAlarm(
+                        (byte) 1,
+                        true,
+                        (byte) 0x13,
+                        (byte) 0x37,
+                        (byte) 0,
+                        "Alarm1"
+                )
+        );
+
+        Assert.assertEquals(0x08, request.serviceId);
+        Assert.assertEquals(0x01, request.commandId);
+        // TODO: check count in request
+        Assert.assertEquals(expectedAlarmsTlv, alarmField.get(request));
+
+        // A serialize will change the tlv, so we cannot test it here
+
+        expectedAlarmsTlv.put(0x82,new HuaweiTLV()
+                .put(0x03, (byte) 2)
+                .put(0x04, false)
+                .put(0x05, (short) 0xCAFE)
+                .put(0x06, (byte) 1)
+                .put(0x07, "Alarm2")
+        );
+
+        request.addEventAlarm(
+                new Alarms.EventAlarm(
+                        (byte) 2,
+                        false,
+                        (byte) 0xCA,
+                        (byte) 0xFE,
+                        (byte) 1,
+                        "Alarm2"
+                )
+        );
+
+        Assert.assertEquals(expectedAlarmsTlv, alarmField.get(request));
+
+        HuaweiTLV expectedTlv = new HuaweiTLV().put(0x81, expectedAlarmsTlv);
+
+        // Different order for better assertion messages in case of failure
+        List<byte[]> listOut = request.serialize();
+        Assert.assertEquals(1, listOut.size());
+        Assert.assertEquals(expectedAlarmsTlv, alarmField.get(request));
+        Assert.assertEquals(expectedTlv, tlvField.get(request));
+    }
+
+    @Test
+    public void testSmartAlarmRequest() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.CryptoException {
+        Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
+        tlvField.setAccessible(true);
+
+        byte[] expectedOutput = new byte[] {(byte) 0x5a, (byte) 0x00, (byte) 0x3a, (byte) 0x00, (byte) 0x08, (byte) 0x02, (byte) 0x7c, (byte) 0x01, (byte) 0x01, (byte) 0x7d, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7e, (byte) 0x20, (byte) 0xcd, (byte) 0x7f, (byte) 0x80, (byte) 0x67, (byte) 0x02, (byte) 0x8d, (byte) 0x46, (byte) 0xfb, (byte) 0xc1, (byte) 0x0b, (byte) 0xed, (byte) 0x6c, (byte) 0x46, (byte) 0xb7, (byte) 0x59, (byte) 0xba, (byte) 0x08, (byte) 0xfd, (byte) 0xde, (byte) 0x3b, (byte) 0xee, (byte) 0x54, (byte) 0xbd, (byte) 0x4f, (byte) 0x27, (byte) 0xf6, (byte) 0x52, (byte) 0x9a, (byte) 0xae, (byte) 0xbf, (byte) 0x55, (byte) 0xd9, (byte) 0xe0, (byte) 0xa6};
+
+        HuaweiTLV expectedTlv = new HuaweiTLV()
+                .put(0x81, new HuaweiTLV()
+                        .put(0x82, new HuaweiTLV()
+                                .put(0x03, (byte) 0x01)
+                                .put(0x04, true)
+                                .put(0x05, (short) 0x1337)
+                                .put(0x06, (byte) 1)
+                                .put(0x07, (byte) 2)
+                        )
+                );
+
+        Alarms.SmartAlarmRequest request = new Alarms.SmartAlarmRequest(
+                paramsProvider,
+                new Alarms.SmartAlarm(
+                        true,
+                        (byte) 0x13,
+                        (byte) 0x37,
+                        (byte) 1,
+                        (byte) 2
+                )
+        );
+
+        Assert.assertEquals(0x08, request.serviceId);
+        Assert.assertEquals(0x02, request.commandId);
+        Assert.assertTrue(request.complete);
+        Assert.assertEquals(expectedTlv, tlvField.get(request));
+        List<byte[]> out = request.serialize();
+        Assert.assertEquals(1, out.size());
+        Assert.assertArrayEquals(expectedOutput, out.get(0));
+    }
+}
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestCalls.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestCalls.java
new file mode 100644
index 000000000..c3cb3fd0b
--- /dev/null
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestCalls.java
@@ -0,0 +1,68 @@
+/*  Copyright (C) 2022 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.lang.reflect.Field;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiTLV;
+
+public class TestCalls {
+
+    @Test
+    public void testAnswerCallResponseAccept() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.ParseException {
+        byte[] raw = new byte[] {(byte) 0x5A, (byte) 0x00, (byte) 0x06, (byte) 0x00, (byte) 0x04, (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x02, (byte) 0x99, (byte) 0x6B};
+
+        Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
+        tlvField.setAccessible(true);
+
+        HuaweiTLV expectedTlv = new HuaweiTLV().put(0x01, (byte) 0x02);
+
+        HuaweiPacket packet = new HuaweiPacket(null).parse(raw);
+        packet.parseTlv();
+
+        Assert.assertEquals(0x04, packet.serviceId);
+        Assert.assertEquals(0x01, packet.commandId);
+        Assert.assertEquals(expectedTlv, tlvField.get(packet));
+        Assert.assertTrue(packet.complete);
+        Assert.assertTrue(packet instanceof Calls.AnswerCallResponse);
+        Assert.assertEquals(Calls.AnswerCallResponse.Action.CALL_ACCEPT, ((Calls.AnswerCallResponse) packet).action);
+    }
+
+    @Test
+    public void testAnswerCallResponseReject() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.ParseException {
+        byte[] raw = new byte[] {(byte) 0x5A, (byte) 0x00, (byte) 0x06, (byte) 0x00, (byte) 0x04, (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0xA9, (byte) 0x08};
+
+        Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
+        tlvField.setAccessible(true);
+
+        HuaweiTLV expectedTlv = new HuaweiTLV().put(0x01, (byte) 0x01);
+
+        HuaweiPacket packet = new HuaweiPacket(null).parse(raw);
+        packet.parseTlv();
+
+        Assert.assertEquals(0x04, packet.serviceId);
+        Assert.assertEquals(0x01, packet.commandId);
+        Assert.assertEquals(expectedTlv, tlvField.get(packet));
+        Assert.assertTrue(packet.complete);
+        Assert.assertTrue(packet instanceof Calls.AnswerCallResponse);
+        Assert.assertEquals(Calls.AnswerCallResponse.Action.CALL_REJECT, ((Calls.AnswerCallResponse) packet).action);
+    }
+}
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestDeviceConfig.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestDeviceConfig.java
new file mode 100644
index 000000000..c5badfd13
--- /dev/null
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestDeviceConfig.java
@@ -0,0 +1,498 @@
+/*  Copyright (C) 2022 Gaignon Damien
+    Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiCoordinatorSupplier;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiCrypto;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiTLV;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.lang.reflect.Field;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.crypto.BadPaddingException;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
+
+public class TestDeviceConfig {
+
+    HuaweiPacket.ParamsProvider secretsProvider = new HuaweiPacket.ParamsProvider() {
+        @Override
+        public byte getAuthMode() {
+            return 0;
+        }
+
+        @Override
+        public byte[] getSecretKey() {
+            return new byte[] {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+        }
+
+        @Override
+        public byte[] getIv() {
+            return new byte[] {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+        }
+
+        @Override
+        public boolean areTransactionsCrypted() {
+            return true;
+        }
+
+        @Override
+        public int getMtu() {
+            return 0;
+        }
+
+        @Override
+        public int getSliceSize() {
+            return 0xF4;
+        }
+    };
+
+    @Test
+    public void testLinkParamsRequest() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.CryptoException {
+        Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
+        tlvField.setAccessible(true);
+
+        HuaweiTLV expectedTlv = new HuaweiTLV()
+                .put(0x01)
+                .put(0x02)
+                .put(0x03)
+                .put(0x04);
+
+        byte[] serialized = new byte[] {(byte) 0x5a, (byte) 0x00, (byte) 0x0b, (byte) 0x00, (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x00, (byte) 0x02, (byte) 0x00, (byte) 0x03, (byte) 0x00, (byte) 0x04, (byte) 0x00, (byte) 0xf1, (byte) 0x3b};
+        DeviceConfig.LinkParams.Request request = new DeviceConfig.LinkParams.Request(
+                secretsProvider, HuaweiCoordinatorSupplier.HuaweiDeviceType.BLE
+        );
+
+        Assert.assertEquals(0x01, request.serviceId);
+        Assert.assertEquals(0x01, request.commandId);
+        Assert.assertEquals(expectedTlv, tlvField.get(request));
+        Assert.assertTrue(request.complete);
+        List<byte[]> out = request.serialize();
+        Assert.assertEquals(1, out.size());
+        Assert.assertArrayEquals(serialized, out.get(0));
+    }
+
+    @Test
+    public void testLinkParamsResponse() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.ParseException {
+        byte[] rawLinkParams = new byte[] {(byte) 0x5a, (byte) 0x00, (byte) 0x1b, (byte) 0x00, (byte) 0x01, (byte) 0x01, (byte) 0x03, (byte) 0x02, (byte) 0x00, (byte) 0x14, (byte) 0x05, (byte) 0x12, (byte) 0x00, (byte) 0x01, (byte) 0x6a, (byte) 0xa2, (byte) 0x96, (byte) 0xe3, (byte) 0x76, (byte) 0x41, (byte) 0xb1, (byte) 0x0c, (byte) 0xf8, (byte) 0xaa, (byte) 0xf7, (byte) 0x47, (byte) 0x05, (byte) 0x5d, (byte) 0x0a, (byte) 0xa3, (byte) 0xe8, (byte) 0x9f};
+
+        byte[] expectedServerNonceWithAuth = new byte[] {(byte) 0x00, (byte) 0x01, (byte) 0x6A, (byte) 0xA2, (byte) 0x96, (byte) 0xE3, (byte) 0x76, (byte) 0x41, (byte) 0xB1, (byte) 0x0C, (byte) 0xF8, (byte) 0xAA, (byte) 0xF7, (byte) 0x47, (byte) 0x05, (byte) 0x5D, (byte) 0x0A, (byte) 0xA3};
+        byte[] expectedServerNonce = new byte[expectedServerNonceWithAuth.length - 2];
+        System.arraycopy(expectedServerNonceWithAuth, 2, expectedServerNonce, 0, expectedServerNonceWithAuth.length - 2);
+
+        Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
+        tlvField.setAccessible(true);
+
+        HuaweiTLV expectedTlv = new HuaweiTLV()
+                .put(0x03, new byte[] {0x00, 0x14})
+                .put(0x05, expectedServerNonceWithAuth);
+
+        HuaweiPacket packetLinkParams = new HuaweiPacket(secretsProvider).parse(rawLinkParams);
+        packetLinkParams.parseTlv();
+
+        Assert.assertEquals(0x01, packetLinkParams.serviceId);
+        Assert.assertEquals(0x01, packetLinkParams.commandId);
+        Assert.assertEquals(expectedTlv, tlvField.get(packetLinkParams));
+        Assert.assertTrue(packetLinkParams.complete);
+        Assert.assertTrue(packetLinkParams instanceof DeviceConfig.LinkParams.Response);
+        Assert.assertEquals(0x01, ((DeviceConfig.LinkParams.Response) packetLinkParams).authVersion);
+        Assert.assertArrayEquals(expectedServerNonce, ((DeviceConfig.LinkParams.Response) packetLinkParams).serverNonce);
+    }
+
+    @Test(expected=HuaweiPacket.ParseException.class)
+    public void testLinkParamsResponseException() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.ParseException {
+        byte[] rawLinkParams = new byte[] {(byte) 0x5a, (byte) 0x00, (byte) 0x17, (byte) 0x00, (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x12, (byte) 0x00, (byte) 0x01, (byte) 0x6a, (byte) 0xa2, (byte) 0x96, (byte) 0xe3, (byte) 0x76, (byte) 0x41, (byte) 0xb1, (byte) 0x0c, (byte) 0xf8, (byte) 0xaa, (byte) 0xf7, (byte) 0x47, (byte) 0x05, (byte) 0x5d, (byte) 0x0a, (byte) 0xa3, (byte) 0xdd, (byte) 0x41};
+
+        HuaweiPacket packetLinkParams = new HuaweiPacket(secretsProvider).parse(rawLinkParams);
+        packetLinkParams.parseTlv();
+    }
+
+    @Test
+    public void testSupportedServicesRequest() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.CryptoException {
+        byte[] allSupportedServices = new byte[] {(byte) 0x01, (byte) 0x02, (byte) 0x03, (byte) 0x04, (byte) 0x05, (byte) 0x06, (byte) 0x07, (byte) 0x08, (byte) 0x09, (byte) 0x0a, (byte) 0x0b, (byte) 0x0c, (byte) 0x0d, (byte) 0x0e, (byte) 0x0f, (byte) 0x10, (byte) 0x11, (byte) 0x12, (byte) 0x13, (byte) 0x14, (byte) 0x15, (byte) 0x16, (byte) 0x17, (byte) 0x18, (byte) 0x19, (byte) 0x1a, (byte) 0x1b, (byte) 0x1c, (byte) 0x1d, (byte) 0x1e, (byte) 0x1f, (byte) 0x20, (byte) 0x21, (byte) 0x22, (byte) 0x23, (byte) 0x24, (byte) 0x25, (byte) 0x26, (byte) 0x27, (byte) 0x28, (byte) 0x29, (byte) 0x2a, (byte) 0x2b, (byte) 0x2c, (byte) 0x2d, (byte) 0x2e, (byte) 0x2f, (byte) 0x30, (byte) 0x31, (byte) 0x32, (byte) 0x33, (byte) 0x34, (byte) 0x35};
+
+        Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
+        tlvField.setAccessible(true);
+
+        HuaweiTLV expectedTlv = new HuaweiTLV()
+                .put(0x01, allSupportedServices);
+
+        byte[] serialized = new byte[] {(byte) 0x5a, (byte) 0x00, (byte) 0x5a, (byte) 0x00, (byte) 0x01, (byte) 0x02, (byte) 0x7c, (byte) 0x01, (byte) 0x01, (byte) 0x7d, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7e, (byte) 0x40, (byte) 0x14, (byte) 0xb1, (byte) 0x75, (byte) 0x7d, (byte) 0xc0, (byte) 0xa5, (byte) 0x32, (byte) 0xeb, (byte) 0xc1, (byte) 0x20, (byte) 0x7b, (byte) 0xb8, (byte) 0x59, (byte) 0xdb, (byte) 0xdb, (byte) 0xfe, (byte) 0x5b, (byte) 0x01, (byte) 0x0a, (byte) 0x7d, (byte) 0xb7, (byte) 0x76, (byte) 0xfc, (byte) 0xcc, (byte) 0x5f, (byte) 0x22, (byte) 0xff, (byte) 0x13, (byte) 0xcb, (byte) 0xbb, (byte) 0x4f, (byte) 0xe2, (byte) 0xcd, (byte) 0x6e, (byte) 0x4b, (byte) 0xd7, (byte) 0x7c, (byte) 0x05, (byte) 0x24, (byte) 0x85, (byte) 0x65, (byte) 0x5f, (byte) 0x95, (byte) 0x32, (byte) 0xb4, (byte) 0x5e, (byte) 0x16, (byte) 0xef, (byte) 0xad, (byte) 0x62, (byte) 0x38, (byte) 0xd5, (byte) 0x88, (byte) 0x63, (byte) 0xa4, (byte) 0xb0, (byte) 0x29, (byte) 0xbb, (byte) 0x90, (byte) 0x66, (byte) 0x8c, (byte) 0x3f, (byte) 0x58, (byte) 0x69, (byte) 0x40, (byte) 0x22};
+        DeviceConfig.SupportedServices.Request request = new DeviceConfig.SupportedServices.Request(
+                secretsProvider,
+                allSupportedServices
+        );
+
+        Assert.assertEquals(0x01, request.serviceId);
+        Assert.assertEquals(0x02, request.commandId);
+        Assert.assertEquals(expectedTlv, tlvField.get(request));
+        Assert.assertTrue(request.complete);
+        List<byte[]> out = request.serialize();
+        Assert.assertEquals(1, out.size());
+        Assert.assertArrayEquals(serialized, out.get(0));
+    }
+
+    @Test
+    public void testSupportedServicesResponse() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.ParseException {
+        byte[] rawSupportedServices = new byte[] {(byte) 0x5a, (byte) 0x00, (byte) 0x5a, (byte) 0x00, (byte) 0x01, (byte) 0x02, (byte) 0x7c, (byte) 0x01, (byte) 0x01, (byte) 0x7d, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7e, (byte) 0x40, (byte) 0xC8, (byte) 0x9F, (byte) 0x1E, (byte) 0x2F, (byte) 0xE8, (byte) 0x31, (byte) 0xC8, (byte) 0x1E, (byte) 0x92, (byte) 0xB0, (byte) 0xE8, (byte) 0x9E, (byte) 0xC7, (byte) 0x2E, (byte) 0x76, (byte) 0xD7, (byte) 0x6C, (byte) 0x64, (byte) 0x22, (byte) 0x5A, (byte) 0x6C, (byte) 0xF9, (byte) 0xAF, (byte) 0xFB, (byte) 0x8E, (byte) 0x98, (byte) 0x74, (byte) 0xB6, (byte) 0xF9, (byte) 0x84, (byte) 0x3C, (byte) 0x1E, (byte) 0x3D, (byte) 0xCB, (byte) 0x7C, (byte) 0x23, (byte) 0x4F, (byte) 0x7B, (byte) 0x34, (byte) 0x0C, (byte) 0x49, (byte) 0xBD, (byte) 0x80, (byte) 0x94, (byte) 0x67, (byte) 0x1B, (byte) 0x5C, (byte) 0x64, (byte) 0x6B, (byte) 0xA4, (byte) 0xB9, (byte) 0xEC, (byte) 0xA7, (byte) 0x97, (byte) 0x95, (byte) 0x6F, (byte) 0x44, (byte) 0x13, (byte) 0x66, (byte) 0x7C, (byte) 0xF5, (byte) 0x9F, (byte) 0x05, (byte) 0x72, (byte) 0xc9, (byte) 0xe9};
+        byte[] expectedSupportedServices = new byte[] {(byte) 0x01, (byte) 0x00, (byte) 0x01, (byte) 0x00, (byte) 0x00, (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x00, (byte) 0x00, (byte) 0x01, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00};
+
+        Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
+        tlvField.setAccessible(true);
+
+        HuaweiTLV expectedTlv = new HuaweiTLV()
+                .put(0x02, expectedSupportedServices);
+
+        HuaweiPacket packetSupportedServices = new HuaweiPacket(secretsProvider).parse(rawSupportedServices);
+        packetSupportedServices.parseTlv();
+
+        Assert.assertEquals(0x01, packetSupportedServices.serviceId);
+        Assert.assertEquals(0x02, packetSupportedServices.commandId);
+        Assert.assertEquals(expectedTlv, tlvField.get(packetSupportedServices));
+        Assert.assertTrue(packetSupportedServices.complete);
+        Assert.assertTrue(packetSupportedServices instanceof DeviceConfig.SupportedServices.Response);
+        Assert.assertArrayEquals(expectedSupportedServices, ((DeviceConfig.SupportedServices.Response) packetSupportedServices).supportedServices);
+    }
+
+    @Test(expected=HuaweiPacket.ParseException.class)
+    public void testSupportedServicesResponseException() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.ParseException {
+        byte[] rawSupportedServices = new byte[] {(byte) 0x5A, (byte) 0x00, (byte) 0x5A, (byte) 0x00, (byte) 0x01, (byte) 0x02, (byte) 0x7C, (byte) 0x01, (byte) 0x01, (byte) 0x7D, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7E, (byte) 0x40, (byte) 0x28, (byte) 0xB0, (byte) 0x4D, (byte) 0x00, (byte) 0xCF, (byte) 0xE1, (byte) 0xD1, (byte) 0x7A, (byte) 0x5D, (byte) 0xE7, (byte) 0x61, (byte) 0x0E, (byte) 0xE1, (byte) 0xA5, (byte) 0xE8, (byte) 0xF9, (byte) 0x6D, (byte) 0x2D, (byte) 0x32, (byte) 0xB3, (byte) 0xC3, (byte) 0x7C, (byte) 0x07, (byte) 0xBC, (byte) 0x11, (byte) 0x03, (byte) 0x8A, (byte) 0x66, (byte) 0x8C, (byte) 0x47, (byte) 0x94, (byte) 0x86, (byte) 0x8C, (byte) 0x0D, (byte) 0xC6, (byte) 0xBC, (byte) 0xDF, (byte) 0xB3, (byte) 0x00, (byte) 0xFB, (byte) 0x68, (byte) 0x11, (byte) 0xC1, (byte) 0xB3, (byte) 0x66, (byte) 0x6D, (byte) 0x85, (byte) 0x6F, (byte) 0xF0, (byte) 0xA9, (byte) 0xD0, (byte) 0x49, (byte) 0xDF, (byte) 0xF5, (byte) 0x82, (byte) 0x01, (byte) 0x9F, (byte) 0xE4, (byte) 0x60, (byte) 0x36, (byte) 0x81, (byte) 0xAA, (byte) 0x31, (byte) 0xA1, (byte) 0x39, (byte) 0xD6};
+
+        HuaweiPacket packetSupportedServices = new HuaweiPacket(secretsProvider).parse(rawSupportedServices);
+        packetSupportedServices.parseTlv();
+    }
+
+    @Test
+    public void testSupportedCommandsRequest() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.CryptoException {
+        byte service1 = (byte) 0x01;
+        byte[] commands1 = new byte[]{(byte) 0x04, (byte) 0x07, (byte) 0x08, (byte) 0x09, (byte) 0x0A, (byte) 0x0D, (byte) 0x0E, (byte) 0x10, (byte) 0x11, (byte) 0x12, (byte) 0x13, (byte) 0x14, (byte) 0x1B, (byte) 0x1A, (byte) 0x1D, (byte) 0x21, (byte) 0x22, (byte) 0x23, (byte) 0x24, (byte) 0x29, (byte) 0x2A, (byte) 0x2B, (byte) 0x32, (byte) 0x2E, (byte) 0x31, (byte) 0x30, (byte) 0x35, (byte) 0x36, (byte) 0x37, (byte) 0x2F};
+        byte service2 = (byte) 0x02;
+        byte[] commands2 = new byte[]{(byte) 0x01, (byte) 0x04, (byte) 0x05, (byte) 0x06, (byte) 0x07, (byte) 0x08};
+        byte service3 = (byte) 0x04;
+        byte[] commands3 = new byte[]{(byte) 0x01};
+
+        Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
+        tlvField.setAccessible(true);
+
+        HuaweiTLV expectedTlv = new HuaweiTLV()
+                .put(0x81, new HuaweiTLV()
+                    .put(0x02, service1)
+                    .put(0x03, commands1)
+                    .put(0x02, service2)
+                    .put(0x03, commands2)
+                    .put(0x02, service3)
+                    .put(0x03, commands3)
+                );
+
+        byte[] expectedSerialized = new byte[] {(byte) 0x5A, (byte) 0x00, (byte) 0x5A, (byte) 0x00, (byte) 0x01, (byte) 0x03, (byte) 0x7C, (byte) 0x01, (byte) 0x01, (byte) 0x7D, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7E, (byte) 0x40, (byte) 0x81, (byte) 0xED, (byte) 0x07, (byte) 0xF6, (byte) 0x51, (byte) 0xA3, (byte) 0x19, (byte) 0xBD, (byte) 0xCE, (byte) 0x35, (byte) 0x13, (byte) 0x23, (byte) 0x1E, (byte) 0xFC, (byte) 0x1A, (byte) 0x51, (byte) 0x92, (byte) 0xBB, (byte) 0x43, (byte) 0xC5, (byte) 0xF5, (byte) 0xD9, (byte) 0x4E, (byte) 0xCC, (byte) 0x2F, (byte) 0xE0, (byte) 0xDB, (byte) 0xB1, (byte) 0x5E, (byte) 0x78, (byte) 0x66, (byte) 0x69, (byte) 0x61, (byte) 0x85, (byte) 0x46, (byte) 0xB2, (byte) 0x50, (byte) 0xEC, (byte) 0xB5, (byte) 0x3F, (byte) 0x74, (byte) 0x68, (byte) 0x47, (byte) 0x03, (byte) 0x87, (byte) 0xC1, (byte) 0xB3, (byte) 0x53, (byte) 0x7B, (byte) 0x53, (byte) 0xDB, (byte) 0xE8, (byte) 0x5E, (byte) 0x82, (byte) 0x56, (byte) 0xFD, (byte) 0x16, (byte) 0x66, (byte) 0x03, (byte) 0xB2, (byte) 0x56, (byte) 0xA3, (byte) 0x14, (byte) 0x70, (byte) 0x38, (byte) 0x3E};
+        DeviceConfig.SupportedCommands.Request request = new DeviceConfig.SupportedCommands.Request(
+                secretsProvider
+        );
+        request.addCommandsForService(service1, commands1);
+        request.addCommandsForService(service2, commands2);
+        request.addCommandsForService(service3, commands3);
+
+        List<byte[]> out = request.serialize();
+
+        Assert.assertEquals(0x01, request.serviceId);
+        Assert.assertEquals(0x03, request.commandId);
+        Assert.assertEquals(expectedTlv, tlvField.get(request));
+        Assert.assertTrue(request.complete);
+        Assert.assertEquals(1, out.size());
+        Assert.assertArrayEquals(expectedSerialized, out.get(0));
+    }
+
+    @Test
+    public void testSupportedCommandsResponse() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.ParseException {
+        byte[] rawSupportedCommands = new byte[] {(byte) 0x5A, (byte) 0x00, (byte) 0x5A, (byte) 0x00, (byte) 0x01, (byte) 0x03, (byte) 0x7C, (byte) 0x01, (byte) 0x01, (byte) 0x7D, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7E, (byte) 0x40, (byte) 0x8B, (byte) 0x86, (byte) 0x29, (byte) 0xE3, (byte) 0x90, (byte) 0x25, (byte) 0x4E, (byte) 0x14, (byte) 0xE1, (byte) 0xDD, (byte) 0x96, (byte) 0x63, (byte) 0x66, (byte) 0xB8, (byte) 0x1E, (byte) 0x4A, (byte) 0xC1, (byte) 0xA7, (byte) 0x49, (byte) 0xB0, (byte) 0x9F, (byte) 0x21, (byte) 0x7C, (byte) 0xE8, (byte) 0x2C, (byte) 0x72, (byte) 0x93, (byte) 0x9F, (byte) 0xAC, (byte) 0x37, (byte) 0x3B, (byte) 0x4D, (byte) 0x1A, (byte) 0xCB, (byte) 0xC2, (byte) 0xFF, (byte) 0x64, (byte) 0xE5, (byte) 0xF0, (byte) 0x3E, (byte) 0x5B, (byte) 0xFF, (byte) 0xB1, (byte) 0x9C, (byte) 0x59, (byte) 0xB2, (byte) 0xF1, (byte) 0xD6, (byte) 0x4B, (byte) 0x2B, (byte) 0x99, (byte) 0xFB, (byte) 0xEA, (byte) 0x29, (byte) 0x66, (byte) 0xD3, (byte) 0x90, (byte) 0x0B, (byte) 0xC9, (byte) 0xF0, (byte) 0xB4, (byte) 0x9B, (byte) 0x3B, (byte) 0x3E, (byte) 0x50, (byte) 0xFA};
+
+        List<DeviceConfig.SupportedCommands.Response.CommandsList> expectedSupportedCommandsList = new ArrayList<>();
+        DeviceConfig.SupportedCommands.Response.CommandsList commandsList = new DeviceConfig.SupportedCommands.Response.CommandsList();
+        commandsList.service = 1;
+        commandsList.commands = new byte[] {(byte) 0x01, (byte) 0x02, (byte) 0x03, (byte) 0x04, (byte) 0x05, (byte) 0x06, (byte) 0x07, (byte) 0x09, (byte) 0x0A, (byte) 0x0B, (byte) 0x0D, (byte) 0x0F, (byte) 0x10, (byte) 0x11};
+        expectedSupportedCommandsList.add(commandsList);
+        commandsList.service = 2;
+        commandsList.commands = new byte[] {(byte) 0x01, (byte) 0x02, (byte) 0x03, (byte) 0x04, (byte) 0x06};
+        expectedSupportedCommandsList.add(commandsList);
+        commandsList.service = 4;
+        commandsList.commands = new byte[] {(byte) 0x01};
+        expectedSupportedCommandsList.add(commandsList);
+
+        byte[] expectedSupportedCommands = new byte[] {(byte) 0x02, (byte) 0x01, (byte) 0x01, (byte) 0x04, (byte) 0x1E, (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x00, (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x00, (byte) 0x01, (byte) 0x00, (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x02, (byte) 0x01, (byte) 0x02, (byte) 0x04, (byte) 0x06, (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x00, (byte) 0x01, (byte) 0x02, (byte) 0x01, (byte) 0x04, (byte) 0x04, (byte) 0x01, (byte) 0x01};
+
+        Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
+        tlvField.setAccessible(true);
+
+        HuaweiTLV expectedTlv = new HuaweiTLV()
+                .put(0x81, expectedSupportedCommands);
+
+        HuaweiPacket packetSupportedCommands = new HuaweiPacket(secretsProvider).parse(rawSupportedCommands);
+        packetSupportedCommands.parseTlv();
+
+        Assert.assertEquals(0x01, packetSupportedCommands.serviceId);
+        Assert.assertEquals(0x03, packetSupportedCommands.commandId);
+        Assert.assertEquals(expectedTlv, tlvField.get(packetSupportedCommands));
+        Assert.assertTrue(packetSupportedCommands.complete);
+        Assert.assertTrue(packetSupportedCommands instanceof DeviceConfig.SupportedCommands.Response);
+        Assert.assertEquals(expectedSupportedCommandsList.size(), ((DeviceConfig.SupportedCommands.Response) packetSupportedCommands).commandsLists.size());
+    }
+
+    @Test(expected=HuaweiPacket.ParseException.class)
+    public void testSupportedCommandsResponseException02() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.ParseException {
+        byte[] rawSupportedCommands = new byte[] {(byte) 0x5A, (byte) 0x00, (byte) 0x4A, (byte) 0x00, (byte) 0x01, (byte) 0x03, (byte) 0x7C, (byte) 0x01, (byte) 0x01, (byte) 0x7D, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7E, (byte) 0x30, (byte) 0x57, (byte) 0xC7, (byte) 0xF7, (byte) 0x47, (byte) 0x0E, (byte) 0xA9, (byte) 0xA2, (byte) 0x9E, (byte) 0xF3, (byte) 0xB0, (byte) 0xBD, (byte) 0x02, (byte) 0xE0, (byte) 0x79, (byte) 0x3C, (byte) 0x12, (byte) 0xE6, (byte) 0x58, (byte) 0xDA, (byte) 0xF7, (byte) 0x0B, (byte) 0xC3, (byte) 0x93, (byte) 0x8D, (byte) 0x37, (byte) 0x2E, (byte) 0xA9, (byte) 0xB8, (byte) 0xF8, (byte) 0xF7, (byte) 0x97, (byte) 0xF3, (byte) 0x22, (byte) 0x08, (byte) 0xDF, (byte) 0xAD, (byte) 0x2B, (byte) 0x62, (byte) 0x33, (byte) 0x11, (byte) 0x93, (byte) 0x66, (byte) 0xD1, (byte) 0xAE, (byte) 0xF3, (byte) 0x02, (byte) 0x18, (byte) 0x49, (byte) 0xD0, (byte) 0x40};
+
+        HuaweiPacket packetSupportedCommands = new HuaweiPacket(secretsProvider).parse(rawSupportedCommands);
+        packetSupportedCommands.parseTlv();
+    }
+
+    @Test(expected=HuaweiPacket.ParseException.class)
+    public void testSupportedCommandsResponseException04() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.ParseException {
+        byte[] rawSupportedCommands = new byte[] {(byte) 0x5A, (byte) 0x00, (byte) 0x2A, (byte) 0x00, (byte) 0x01, (byte) 0x03, (byte) 0x7C, (byte) 0x01, (byte) 0x01, (byte) 0x7D, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7E, (byte) 0x10, (byte) 0x25, (byte) 0x26, (byte) 0xE0, (byte) 0x79, (byte) 0x1D, (byte) 0x19, (byte) 0x82, (byte) 0xDB, (byte) 0x0A, (byte) 0x3A, (byte) 0x21, (byte) 0x6E, (byte) 0x70, (byte) 0x52, (byte) 0xAB, (byte) 0xF3, (byte) 0x14, (byte) 0xB4};
+
+        HuaweiPacket packetSupportedCommands = new HuaweiPacket(secretsProvider).parse(rawSupportedCommands);
+        packetSupportedCommands.parseTlv();
+    }
+
+    @Test
+    public void testDateFormatRequest() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.CryptoException {
+        byte dateformat = (byte) 0x02;
+        byte timeFormat = (byte) 0x02;
+
+        Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
+        tlvField.setAccessible(true);
+
+        HuaweiTLV expectedTlv = new HuaweiTLV()
+                .put(0x81, new HuaweiTLV()
+                    .put(0x02, dateformat)
+                    .put(0x03, timeFormat)
+                );
+
+        byte[] serialized = new byte[] {(byte) 0x5a, (byte) 0x00, (byte) 0x2a, (byte) 0x00, (byte) 0x01, (byte) 0x04, (byte) 0x7c, (byte) 0x01, (byte) 0x01, (byte) 0x7d, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7e, (byte) 0x10, (byte) 0x63, (byte) 0xe0, (byte) 0xf1, (byte) 0xbf, (byte) 0x40, (byte) 0xab, (byte) 0x09, (byte) 0x63, (byte) 0x51, (byte) 0x7c, (byte) 0xa7, (byte) 0x8c, (byte) 0x2e, (byte) 0xd9, (byte) 0x6a, (byte) 0x6c, (byte) 0xdc, (byte) 0xe9};
+        DeviceConfig.DateFormat.Request request = new DeviceConfig.DateFormat.Request (
+                secretsProvider,
+                dateformat,
+                timeFormat
+        );
+
+        Assert.assertEquals(0x01, request.serviceId);
+        Assert.assertEquals(0x04, request.commandId);
+        Assert.assertEquals(expectedTlv, tlvField.get(request));
+        Assert.assertTrue(request.complete);
+        List<byte[]> out = request.serialize();
+        Assert.assertEquals(1, out.size());
+        Assert.assertArrayEquals(serialized, out.get(0));
+    }
+
+    @Test
+    public void testTimeRequest() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.CryptoException {
+        int timestamp = 1633987331;
+        short zoneOffset = (short) 512;
+
+        Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
+        tlvField.setAccessible(true);
+
+        HuaweiTLV expectedTlv = new HuaweiTLV()
+                .put(0x01, timestamp)
+                .put(0x02, zoneOffset);
+
+        byte[] serialized = new byte[] {(byte) 0x5A, (byte) 0x00, (byte) 0x2A, (byte) 0x00, (byte) 0x01, (byte) 0x05, (byte) 0x7C, (byte) 0x01, (byte) 0x01, (byte) 0x7D, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7E, (byte) 0x10, (byte) 0xED, (byte) 0x67, (byte) 0x61, (byte) 0x8A, (byte) 0x8E, (byte) 0x44, (byte) 0x67, (byte) 0xB1, (byte) 0x2A, (byte) 0xB4, (byte) 0xFA, (byte) 0x86, (byte) 0x76, (byte) 0x17, (byte) 0x8C, (byte) 0x61, (byte) 0xFC, (byte) 0x99};
+        DeviceConfig.TimeRequest request = new DeviceConfig.TimeRequest(secretsProvider);
+
+        Assert.assertEquals(0x01, request.serviceId);
+        Assert.assertEquals(0x05, request.commandId);
+        Assert.assertEquals(expectedTlv, tlvField.get(request));
+        Assert.assertTrue(request.complete);
+        List<byte[]> out = request.serialize();
+        Assert.assertEquals(1, out.size());
+        Assert.assertArrayEquals(serialized, out.get(0));
+    }
+
+    @Test
+    public void testProductInformationRequest() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.CryptoException {
+        Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
+        tlvField.setAccessible(true);
+
+        HuaweiTLV expectedTlv = new HuaweiTLV();
+        byte[] expectedTags = {0x01, 0x02, 0x07, 0x09, 0x0A, 0x11, 0x12, 0x16, 0x1A, 0x1D, 0x1E, 0x1F, 0x20, 0x21, 0x22, 0x23};
+        for (byte tag : expectedTags) {
+            expectedTlv.put(tag);
+        }
+
+        // Outdated
+        //byte[] serialized = new byte[] {(byte) 0x5A, (byte) 0x00, (byte) 0x3A, (byte) 0x00, (byte) 0x01, (byte) 0x07, (byte) 0x7C, (byte) 0x01, (byte) 0x01, (byte) 0x7D, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7E, (byte) 0x20, (byte) 0x10, (byte) 0x9B, (byte) 0x27, (byte) 0x5D, (byte) 0xB1, (byte) 0x3C, (byte) 0xFD, (byte) 0x40, (byte) 0x4B, (byte) 0xA8, (byte) 0xAC, (byte) 0xAF, (byte) 0x8A, (byte) 0xB6, (byte) 0xA5, (byte) 0x3D, (byte) 0x40, (byte) 0x30, (byte) 0x2C, (byte) 0x79, (byte) 0x98, (byte) 0x6D, (byte) 0xEC, (byte) 0xD1, (byte) 0x39, (byte) 0xE6, (byte) 0xFE, (byte) 0x5C, (byte) 0xE8, (byte) 0xB2, (byte) 0xF3, (byte) 0x9E, (byte) 0x3E, (byte) 0x1B};
+        DeviceConfig.ProductInfo.Request request = new DeviceConfig.ProductInfo.Request (
+                secretsProvider, HuaweiCoordinatorSupplier.HuaweiDeviceType.BLE
+        );
+
+        Assert.assertEquals(0x01, request.serviceId);
+        Assert.assertEquals(0x07, request.commandId);
+        Assert.assertEquals(expectedTlv, tlvField.get(request));
+        Assert.assertTrue(request.complete);
+        List<byte[]> out = request.serialize();
+        Assert.assertEquals(1, out.size());
+        // Assert.assertArrayEquals(serialized, out.get(0));
+    }
+
+    @Test
+    public void testProductInformationResponse() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.ParseException {
+        byte[] rawProductInformation = new byte[] {(byte) 0x5A, (byte) 0x00, (byte) 0x4A, (byte) 0x00, (byte) 0x01, (byte) 0x07, (byte) 0x7C, (byte) 0x01, (byte) 0x01, (byte) 0x7D, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7E, (byte) 0x30, (byte) 0x50, (byte) 0x75, (byte) 0xA5, (byte) 0x4F, (byte) 0x26, (byte) 0xF7, (byte) 0x74, (byte) 0x0B, (byte) 0xB2, (byte) 0xD8, (byte) 0x01, (byte) 0xBA, (byte) 0xDC, (byte) 0x7E, (byte) 0x40, (byte) 0x36, (byte) 0xD5, (byte) 0x6D, (byte) 0x4B, (byte) 0x7B, (byte) 0x8F, (byte) 0xC6, (byte) 0xFB, (byte) 0x48, (byte) 0xFC, (byte) 0x89, (byte) 0x54, (byte) 0xF8, (byte) 0xBB, (byte) 0xC0, (byte) 0x48, (byte) 0x9E, (byte) 0x34, (byte) 0x0E, (byte) 0xB1, (byte) 0x24, (byte) 0xD8, (byte) 0x89, (byte) 0x02, (byte) 0x7E, (byte) 0x6C, (byte) 0x3E, (byte) 0x81, (byte) 0x7D, (byte) 0x38, (byte) 0x0F, (byte) 0xD9, (byte) 0x2A, (byte) 0x98, (byte) 0xE3};
+        String softwareVersion = "1.0.10.78";
+        String productModel = "Crius";
+
+        Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
+        tlvField.setAccessible(true);
+
+        HuaweiTLV expectedTlv = new HuaweiTLV()
+                .put(0x03, new byte[] {(byte) 0x4E, (byte) 0x41})
+                .put(0x07, new byte[] {(byte) 0x31, (byte) 0x2E, (byte) 0x30, (byte) 0x2E, (byte) 0x31, (byte) 0x30, (byte) 0x2E, (byte) 0x37, (byte) 0x38})
+                .put(0x0A, new byte[] {(byte) 0x43, (byte) 0x72, (byte) 0x69, (byte) 0x75, (byte) 0x73, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00});
+
+        HuaweiPacket packetProductInformation = new HuaweiPacket(secretsProvider).parse(rawProductInformation);
+        packetProductInformation.parseTlv();
+
+        Assert.assertEquals(0x01, packetProductInformation.serviceId);
+        Assert.assertEquals(0x07, packetProductInformation.commandId);
+        Assert.assertEquals(expectedTlv, tlvField.get(packetProductInformation));
+        Assert.assertTrue(packetProductInformation.complete);
+        Assert.assertTrue(packetProductInformation instanceof DeviceConfig.ProductInfo.Response);
+        Assert.assertTrue(softwareVersion.equals(((DeviceConfig.ProductInfo.Response) packetProductInformation).softwareVersion));
+        System.out.println(((DeviceConfig.ProductInfo.Response) packetProductInformation).productModel);
+        System.out.println(((DeviceConfig.ProductInfo.Response) packetProductInformation).productModel.length());
+        Assert.assertTrue(productModel.equals(((DeviceConfig.ProductInfo.Response) packetProductInformation).productModel));
+    }
+
+    @Test(expected=HuaweiPacket.ParseException.class)
+    public void testProductInformationResponseException07() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.ParseException {
+        byte[] rawProductInformation = new byte[] {(byte) 0x5A, (byte) 0x00, (byte) 0x3A, (byte) 0x00, (byte) 0x01, (byte) 0x07, (byte) 0x7C, (byte) 0x01, (byte) 0x01, (byte) 0x7D, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7E, (byte) 0x20, (byte) 0xFE, (byte) 0x24, (byte) 0x4C, (byte) 0x68, (byte) 0xFC, (byte) 0x1D, (byte) 0xAD, (byte) 0x64, (byte) 0x77, (byte) 0xC9, (byte) 0xE9, (byte) 0x26, (byte) 0x8D, (byte) 0x3C, (byte) 0x3C, (byte) 0x8C, (byte) 0xB6, (byte) 0xA6, (byte) 0xF1, (byte) 0xBF, (byte) 0xAC, (byte) 0xB6, (byte) 0x7A, (byte) 0x75, (byte) 0xA3, (byte) 0xA9, (byte) 0x07, (byte) 0x5F, (byte) 0x39, (byte) 0x0F, (byte) 0x28, (byte) 0x61, (byte) 0x50, (byte) 0x61};
+
+        HuaweiPacket packetProductInformation = new HuaweiPacket(secretsProvider).parse(rawProductInformation);
+        packetProductInformation.parseTlv();
+    }
+
+    @Test(expected=HuaweiPacket.ParseException.class)
+    public void testProductInformationResponseException0A() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.ParseException {
+        byte[] rawProductInformation = new byte[] {(byte) 0x5A, (byte) 0x00, (byte) 0x2A, (byte) 0x00, (byte) 0x01, (byte) 0x07, (byte) 0x7C, (byte) 0x01, (byte) 0x01, (byte) 0x7D, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7E, (byte) 0x10, (byte) 0xB6, (byte) 0x67, (byte) 0xA5, (byte) 0x6A, (byte) 0x46, (byte) 0x0F, (byte) 0x08, (byte) 0x1E, (byte) 0xAC, (byte) 0x1E, (byte) 0x6B, (byte) 0xF2, (byte) 0x11, (byte) 0x4A, (byte) 0x54, (byte) 0x20, (byte) 0xCF, (byte) 0xB6};
+
+        HuaweiPacket packetProductInformation = new HuaweiPacket(secretsProvider).parse(rawProductInformation);
+        packetProductInformation.parseTlv();
+    }
+
+    @Test
+    public void testBondRequest() throws NoSuchFieldException, IllegalAccessException {
+        byte[] clientSerial = new byte[] {(byte) 0x54, (byte) 0x56, (byte) 0x64, (byte) 0x54, (byte) 0x4D, (byte) 0x44};
+        String mac = "FF:FF:FF:FF:FF:CC";
+        HuaweiCrypto huaweiCrypto = new HuaweiCrypto(0x01);
+        Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
+        tlvField.setAccessible(true);
+
+        try {
+            HuaweiTLV expectedTlv = new HuaweiTLV()
+                    .put(0x01)
+                    .put(0x03, (byte) 0x00)
+                    .put(0x05, clientSerial)
+                    .put(0x06, huaweiCrypto.encryptBondingKey(secretsProvider.getSecretKey(), mac, secretsProvider.getIv()))
+                    .put(0x07, secretsProvider.getIv());
+
+            byte[] serialized = new byte[]{(byte) 0x5A, (byte) 0x00, (byte) 0x44, (byte) 0x00, (byte) 0x01, (byte) 0x0E, (byte) 0x01, (byte) 0x00, (byte) 0x03, (byte) 0x01, (byte) 0x00, (byte) 0x05, (byte) 0x06, (byte) 0x54, (byte) 0x56, (byte) 0x64, (byte) 0x54, (byte) 0x4D, (byte) 0x44, (byte) 0x06, (byte) 0x20, (byte) 0x88, (byte) 0x45, (byte) 0xAA, (byte) 0xB5, (byte) 0x9C, (byte) 0x84, (byte) 0x39, (byte) 0xAE, (byte) 0xD8, (byte) 0xE9, (byte) 0x71, (byte) 0x01, (byte) 0x5D, (byte) 0xC8, (byte) 0x34, (byte) 0x05, (byte) 0xC5, (byte) 0x9A, (byte) 0x6B, (byte) 0xDB, (byte) 0x62, (byte) 0x7D, (byte) 0xC8, (byte) 0xC3, (byte) 0xF4, (byte) 0xCC, (byte) 0x30, (byte) 0x74, (byte) 0x21, (byte) 0xD4, (byte) 0x45, (byte) 0x0E, (byte) 0x07, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x72, (byte) 0xFC};
+            DeviceConfig.Bond.Request request = new DeviceConfig.Bond.Request(
+                    secretsProvider,
+                    clientSerial,
+                    mac,
+                    huaweiCrypto
+            );
+
+            Assert.assertEquals(0x01, request.serviceId);
+            Assert.assertEquals(0x0E, request.commandId);
+            Assert.assertEquals(expectedTlv, tlvField.get(request));
+            Assert.assertTrue(request.complete);
+            List<byte[]> out = request.serialize();
+            Assert.assertEquals(1, out.size());
+            Assert.assertArrayEquals(serialized, out.get(0));
+        } catch (InvalidAlgorithmParameterException | NoSuchPaddingException | IllegalBlockSizeException | NoSuchAlgorithmException | BadPaddingException | InvalidKeyException | HuaweiPacket.CryptoException e) {
+            e.printStackTrace();
+            Assert.fail();
+        }
+    }
+
+    @Test
+    public void testBondParamsRequest() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.CryptoException {
+        byte[] clientSerial = new byte[] {(byte) 0x54, (byte) 0x56, (byte) 0x64, (byte) 0x54, (byte) 0x4D, (byte) 0x44};
+        byte[] mac = new byte[] {(byte) 0x46, (byte) 0x46, (byte) 0x3A, (byte) 0x46, (byte) 0x46, (byte) 0x3A, (byte) 0x46, (byte) 0x46, (byte) 0x3A, (byte) 0x46, (byte) 0x46, (byte) 0x3A, (byte) 0x46, (byte) 0x46, (byte) 0x3A, (byte) 0x43, (byte) 0x43};
+        Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
+        tlvField.setAccessible(true);
+
+        HuaweiTLV expectedTlv = new HuaweiTLV()
+                .put(0x01)
+                .put(0x03, clientSerial)
+                .put(0x04, (byte) 0x02)
+                .put(0x05)
+                .put(0x07, mac)
+                .put(0x09);
+
+        byte[] serialized = new byte[] {(byte) 0x5A, (byte) 0x00, (byte) 0x27, (byte) 0x00, (byte) 0x01, (byte) 0x0F, (byte) 0x01, (byte) 0x00, (byte) 0x03, (byte) 0x06, (byte) 0x54, (byte) 0x56, (byte) 0x64, (byte) 0x54, (byte) 0x4D, (byte) 0x44, (byte) 0x04, (byte) 0x01, (byte) 0x02, (byte) 0x05, (byte) 0x00, (byte) 0x07, (byte) 0x11, (byte) 0x46, (byte) 0x46, (byte) 0x3A, (byte) 0x46, (byte) 0x46, (byte) 0x3A, (byte) 0x46, (byte) 0x46, (byte) 0x3A, (byte) 0x46, (byte) 0x46, (byte) 0x3A, (byte) 0x46, (byte) 0x46, (byte) 0x3A, (byte) 0x43, (byte) 0x43, (byte) 0x09, (byte) 0x00, (byte) 0xE5, (byte) 0xD8};
+        DeviceConfig.BondParams.Request request = new DeviceConfig.BondParams.Request(
+                secretsProvider,
+                clientSerial,
+                mac
+        );
+        Assert.assertEquals(0x01, request.serviceId);
+        Assert.assertEquals(0x0F, request.commandId);
+        Assert.assertEquals(expectedTlv, tlvField.get(request));
+        Assert.assertTrue(request.complete);
+        List<byte[]> out = request.serialize();
+        Assert.assertEquals(1, out.size());
+        Assert.assertArrayEquals(serialized, out.get(0));
+    }
+
+    @Test
+    public void testAuthRequest() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.CryptoException {
+        byte[] challenge = new byte[] {(byte) 0x9D, (byte) 0xF6, (byte) 0x52, (byte) 0x69, (byte) 0x06, (byte) 0x7B, (byte) 0xEB, (byte) 0x46, (byte) 0x94, (byte) 0xAD, (byte) 0x35, (byte) 0xE2, (byte) 0x88, (byte) 0xC3, (byte) 0x84, (byte) 0x24, (byte) 0xA2, (byte) 0x55, (byte) 0xD8, (byte) 0x0F, (byte) 0xA7, (byte) 0x68, (byte) 0x21, (byte) 0x9B, (byte) 0xA1, (byte) 0xC3, (byte) 0xDC, (byte) 0x09, (byte) 0x24, (byte) 0x81, (byte) 0x51, (byte) 0x61};
+        byte[] nonce = new byte[] {(byte) 0x00, (byte) 0x01, (byte) 0xBF, (byte) 0x1F, (byte) 0xEF, (byte) 0x9F, (byte) 0xF0, (byte) 0xFE, (byte) 0xEF, (byte) 0xEF, (byte) 0x9F, (byte) 0xEF, (byte) 0xF0, (byte) 0xEF, (byte) 0xF8, (byte) 0xFA, (byte) 0xEF, (byte) 0xF0};
+
+        Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
+        tlvField.setAccessible(true);
+
+        HuaweiTLV expectedTlv = new HuaweiTLV()
+                .put(0x01, challenge)
+                .put(0x02, nonce);
+
+        byte[] serialized = new byte[] {(byte) 0x5a, (byte) 0x00, (byte) 0x39, (byte) 0x00, (byte) 0x01, (byte) 0x13, (byte) 0x01, (byte) 0x20, (byte) 0x9d, (byte) 0xf6, (byte) 0x52, (byte) 0x69, (byte) 0x06, (byte) 0x7b, (byte) 0xeb, (byte) 0x46, (byte) 0x94, (byte) 0xad, (byte) 0x35, (byte) 0xe2, (byte) 0x88, (byte) 0xc3, (byte) 0x84, (byte) 0x24, (byte) 0xa2, (byte) 0x55, (byte) 0xd8, (byte) 0x0f, (byte) 0xa7, (byte) 0x68, (byte) 0x21, (byte) 0x9b, (byte) 0xa1, (byte) 0xc3, (byte) 0xdc, (byte) 0x09, (byte) 0x24, (byte) 0x81, (byte) 0x51, (byte) 0x61, (byte) 0x02, (byte) 0x12, (byte) 0x00, (byte) 0x01, (byte) 0xbf, (byte) 0x1f, (byte) 0xef, (byte) 0x9f, (byte) 0xf0, (byte) 0xfe, (byte) 0xef, (byte) 0xef, (byte) 0x9f, (byte) 0xef, (byte) 0xf0, (byte) 0xef, (byte) 0xf8, (byte) 0xfa, (byte) 0xef, (byte) 0xf0, (byte) 0xdc, (byte) 0x88};
+        DeviceConfig.Auth.Request request = new DeviceConfig.Auth.Request(
+                secretsProvider,
+                challenge,
+                nonce,
+                false
+        );
+
+        Assert.assertEquals(0x01, request.serviceId);
+        Assert.assertEquals(0x13, request.commandId);
+        Assert.assertEquals(expectedTlv, tlvField.get(request));
+        Assert.assertTrue(request.complete);
+        List<byte[]> out = request.serialize();
+        Assert.assertEquals(1, out.size());
+        Assert.assertArrayEquals(serialized, out.get(0));
+    }
+}
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestDisconnectNotification.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestDisconnectNotification.java
new file mode 100644
index 000000000..a9b30969a
--- /dev/null
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestDisconnectNotification.java
@@ -0,0 +1,104 @@
+/*  Copyright (C) 2022 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.lang.reflect.Field;
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiTLV;
+
+public class TestDisconnectNotification {
+
+    HuaweiPacket.ParamsProvider secretsProvider = new HuaweiPacket.ParamsProvider() {
+        @Override
+        public byte getAuthMode() {
+            return 0;
+        }
+
+        @Override
+        public byte[] getSecretKey() {
+            return new byte[] {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+        }
+
+        @Override
+        public byte[] getIv() {
+            return new byte[] {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+        }
+
+        @Override
+        public boolean areTransactionsCrypted() {
+            return true;
+        }
+
+        @Override
+        public int getMtu() {
+            return 0;
+        }
+
+        @Override
+        public int getSliceSize() {
+            return 0xF4;
+        }
+    };
+
+    @Test
+    public void testBluetoothDisconnectNotificationSetting() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.CryptoException {
+        Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
+        tlvField.setAccessible(true);
+
+        HuaweiTLV expectedTlvEnable = new HuaweiTLV()
+                .put(0x01, true);
+
+        byte[] serializedEnable = new byte[] {(byte) 0x5a, (byte) 0x00, (byte) 0x2a, (byte) 0x00, (byte) 0x0b, (byte) 0x03, (byte) 0x7c, (byte) 0x01, (byte) 0x01, (byte) 0x7d, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7e, (byte) 0x10, (byte) 0xcd, (byte) 0x97, (byte) 0x7e, (byte) 0x01, (byte) 0x48, (byte) 0x34, (byte) 0x2a, (byte) 0x48, (byte) 0x58, (byte) 0x0d, (byte) 0x30, (byte) 0xc7, (byte) 0xbc, (byte) 0x2e, (byte) 0x40, (byte) 0xd4, (byte) 0x20, (byte) 0xaf};
+
+        DisconnectNotification.DisconnectNotificationSetting.Request requestEnable = new DisconnectNotification.DisconnectNotificationSetting.Request(
+                secretsProvider,
+                true
+        );
+
+        Assert.assertEquals(0x0b, requestEnable.serviceId);
+        Assert.assertEquals(0x03, requestEnable.commandId);
+        Assert.assertEquals(expectedTlvEnable, tlvField.get(requestEnable));
+        Assert.assertTrue(requestEnable.complete);
+        List<byte[]> outEnable = requestEnable.serialize();
+        Assert.assertEquals(1, outEnable.size());
+        Assert.assertArrayEquals(serializedEnable, outEnable.get(0));
+
+
+        HuaweiTLV expectedTlvDisable = new HuaweiTLV()
+                .put(0x01, false);
+
+        byte[] serializedDisable = new byte[] {(byte) 0x5a, (byte) 0x00, (byte) 0x2a, (byte) 0x00, (byte) 0x0b, (byte) 0x03, (byte) 0x7c, (byte) 0x01, (byte) 0x01, (byte) 0x7d, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7e, (byte) 0x10, (byte) 0x28, (byte) 0x00, (byte) 0x99, (byte) 0x6f, (byte) 0x2a, (byte) 0xcb, (byte) 0x62, (byte) 0x3a, (byte) 0xe6, (byte) 0x54, (byte) 0x28, (byte) 0x54, (byte) 0xf8, (byte) 0xab, (byte) 0x54, (byte) 0x83, (byte) 0x39, (byte) 0x9D};
+
+        DisconnectNotification.DisconnectNotificationSetting.Request requestDisable = new DisconnectNotification.DisconnectNotificationSetting.Request(
+                secretsProvider,
+                false
+        );
+
+        Assert.assertEquals(0x0b, requestDisable.serviceId);
+        Assert.assertEquals(0x03, requestDisable.commandId);
+        Assert.assertEquals(expectedTlvDisable, tlvField.get(requestDisable));
+        Assert.assertTrue(requestDisable.complete);
+        List<byte[]> outDisable = requestDisable.serialize();
+        Assert.assertEquals(1, outDisable.size());
+        Assert.assertArrayEquals(serializedDisable, outDisable.get(0));
+    }
+}
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestFindPhone.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestFindPhone.java
new file mode 100644
index 000000000..3aa91ddbe
--- /dev/null
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestFindPhone.java
@@ -0,0 +1,120 @@
+/*  Copyright (C) 2022 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.lang.reflect.Field;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiTLV;
+
+public class TestFindPhone {
+
+    HuaweiPacket.ParamsProvider secretsProvider = new HuaweiPacket.ParamsProvider() {
+        @Override
+        public byte getAuthMode() {
+            return 0;
+        }
+
+        @Override
+        public byte[] getSecretKey() {
+            return new byte[] {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+        }
+
+        @Override
+        public byte[] getIv() {
+            return new byte[] {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+        }
+
+        @Override
+        public boolean areTransactionsCrypted() {
+            return true;
+        }
+
+        @Override
+        public int getMtu() {
+            return 0;
+        }
+
+        @Override
+        public int getSliceSize() {
+            return 0xF4;
+        }
+    };
+
+    @Test
+    public void testStartFindPhone() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.ParseException {
+        byte[] raw = new byte[] {(byte) 0x5a, (byte) 0x00, (byte) 0x06, (byte) 0x00, (byte) 0x0b, (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0xcc, (byte) 0xf1};
+
+        Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
+        tlvField.setAccessible(true);
+
+        HuaweiTLV expectedTlv = new HuaweiTLV().put(0x01, true);
+
+        HuaweiPacket packet = new HuaweiPacket(secretsProvider).parse(raw);
+        packet.parseTlv();
+
+        Assert.assertEquals(0x0b, packet.serviceId);
+        Assert.assertEquals(0x01, packet.commandId);
+        Assert.assertEquals(expectedTlv, tlvField.get(packet));
+        Assert.assertTrue(packet.complete);
+        Assert.assertTrue(packet instanceof FindPhone.Response);
+        Assert.assertTrue(((FindPhone.Response) packet).start);
+    }
+
+    @Test
+    public void testStopFindPhone() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.ParseException {
+        byte[] raw = new byte[] {(byte) 0x5a, (byte) 0x00, (byte) 0x06, (byte) 0x00, (byte) 0x0b, (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x00, (byte) 0xdc, (byte) 0xd0};
+
+        Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
+        tlvField.setAccessible(true);
+
+        HuaweiTLV expectedTlv = new HuaweiTLV().put(0x01, false);
+
+        HuaweiPacket packet = new HuaweiPacket(secretsProvider).parse(raw);
+        packet.parseTlv();
+
+        Assert.assertEquals(0x0b, packet.serviceId);
+        Assert.assertEquals(0x01, packet.commandId);
+        Assert.assertEquals(expectedTlv, tlvField.get(packet));
+        Assert.assertTrue(packet.complete);
+        Assert.assertTrue(packet instanceof FindPhone.Response);
+        Assert.assertFalse(((FindPhone.Response) packet).start);
+    }
+
+    @Test
+    public void testFindPhoneMissingTag() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.ParseException {
+        byte[] raw = new byte[] {(byte) 0x5a, (byte) 0x00, (byte) 0x03, (byte) 0x00, (byte) 0x0b, (byte) 0x01, (byte) 0xa1, (byte) 0x91};
+
+        Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
+        tlvField.setAccessible(true);
+
+        HuaweiTLV expectedTlv = new HuaweiTLV();
+
+        HuaweiPacket packet = new HuaweiPacket(secretsProvider).parse(raw);
+        packet.parseTlv();
+
+        Assert.assertEquals(0x0b, packet.serviceId);
+        Assert.assertEquals(0x01, packet.commandId);
+        Assert.assertEquals(expectedTlv, tlvField.get(packet));
+        Assert.assertTrue(packet.complete);
+        Assert.assertTrue(packet instanceof FindPhone.Response);
+        Assert.assertFalse(((FindPhone.Response) packet).start);
+    }
+}
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestFitnessData.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestFitnessData.java
new file mode 100644
index 000000000..6b4fb760e
--- /dev/null
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestFitnessData.java
@@ -0,0 +1,502 @@
+/*  Copyright (C) 2022 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.lang.reflect.Field;
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiCrypto;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiTLV;
+
+public class TestFitnessData {
+
+    HuaweiPacket.ParamsProvider secretsProvider = new HuaweiPacket.ParamsProvider() {
+        @Override
+        public byte getAuthMode() {
+            return 0;
+        }
+
+        @Override
+        public byte[] getSecretKey() {
+            return new byte[] {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+        }
+
+        @Override
+        public byte[] getIv() {
+            return new byte[] {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+        }
+
+        @Override
+        public boolean areTransactionsCrypted() {
+            return true;
+        }
+
+        @Override
+        public int getMtu() {
+            return 0;
+        }
+
+        @Override
+        public int getSliceSize() {
+            return 0xF4;
+        }
+    };
+
+    @Test
+    public void testMessageCountRequest() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.CryptoException {
+        int startSleep = 0x00000000;
+        int endSleep = 0x01020304;
+        int startStep = 0x01020304;
+        int endStep = 0x10203040;
+
+        Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
+        tlvField.setAccessible(true);
+
+        HuaweiTLV expectedTlvSleep = new HuaweiTLV()
+                .put(0x81)
+                .put(0x03, startSleep)
+                .put(0x04, endSleep);
+        HuaweiTLV expectedTlvStep = new HuaweiTLV()
+                .put(0x81)
+                .put(0x03, startStep)
+                .put(0x04, endStep);
+
+        byte[] sleepSerialized = new byte[] {(byte) 0x5a, (byte) 0x00, (byte) 0x2a, (byte) 0x00, (byte) 0x07, (byte) 0x0c, (byte) 0x7c, (byte) 0x01, (byte) 0x01, (byte) 0x7d, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7e, (byte) 0x10, (byte) 0x32, (byte) 0x69, (byte) 0x7b, (byte) 0x51, (byte) 0x85, (byte) 0x20, (byte) 0x9b, (byte) 0x16, (byte) 0x6b, (byte) 0x93, (byte) 0x8a, (byte) 0x3d, (byte) 0xd5, (byte) 0x9a, (byte) 0xf9, (byte) 0x29, (byte) 0xdf, (byte) 0x07};
+        byte[] stepSerialized = new byte[] {(byte) 0x5a, (byte) 0x00, (byte) 0x2a, (byte) 0x00, (byte) 0x07, (byte) 0x0a, (byte) 0x7c, (byte) 0x01, (byte) 0x01, (byte) 0x7d, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7e, (byte) 0x10, (byte) 0x4d, (byte) 0x52, (byte) 0x79, (byte) 0x57, (byte) 0x49, (byte) 0x30, (byte) 0x75, (byte) 0xc6, (byte) 0x28, (byte) 0x5b, (byte) 0x79, (byte) 0xd5, (byte) 0xab, (byte) 0x89, (byte) 0x0d, (byte) 0x1e, (byte) 0xa9, (byte) 0xc9};
+
+        FitnessData.MessageCount.Request sleepRequest = new FitnessData.MessageCount.Request(secretsProvider, FitnessData.MessageCount.sleepId, startSleep, endSleep);
+        FitnessData.MessageCount.Request stepRequest = new FitnessData.MessageCount.Request(secretsProvider, FitnessData.MessageCount.stepId, startStep, endStep);
+
+        Assert.assertEquals(0x07, sleepRequest.serviceId);
+        Assert.assertEquals(0x0c, sleepRequest.commandId);
+        Assert.assertEquals(expectedTlvSleep, tlvField.get(sleepRequest));
+        Assert.assertTrue(sleepRequest.complete);
+        List<byte[]> outSleep = sleepRequest.serialize();
+        Assert.assertEquals(1, outSleep.size());
+        Assert.assertArrayEquals(sleepSerialized, outSleep.get(0));
+
+        Assert.assertEquals(0x07, stepRequest.serviceId);
+        Assert.assertEquals(0x0a, stepRequest.commandId);
+        Assert.assertEquals(expectedTlvStep, tlvField.get(stepRequest));
+        Assert.assertTrue(stepRequest.complete);
+        List<byte[]> outStep = stepRequest.serialize();
+        Assert.assertEquals(1, outStep.size());
+        Assert.assertArrayEquals(stepSerialized, outStep.get(0));
+    }
+
+    @Test
+    public void testMessageCountResponse() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.ParseException {
+        byte[] rawSleep = new byte[] {(byte) 0x5a, (byte) 0x00, (byte) 0x2a, (byte) 0x00, (byte) 0x07, (byte) 0x0c, (byte) 0x7c, (byte) 0x01, (byte) 0x01, (byte) 0x7d, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7e, (byte) 0x10, (byte) 0xf6, (byte) 0xfb, (byte) 0xc0, (byte) 0xb6, (byte) 0x4f, (byte) 0x9a, (byte) 0xfa, (byte) 0x77, (byte) 0x53, (byte) 0x28, (byte) 0x7d, (byte) 0x13, (byte) 0xca, (byte) 0x49, (byte) 0xda, (byte) 0xfd, (byte) 0x93, (byte) 0x09};
+        byte[] rawStep = new byte[] {(byte) 0x5a, (byte) 0x00, (byte) 0x2a, (byte) 0x00, (byte) 0x07, (byte) 0x0a, (byte) 0x7c, (byte) 0x01, (byte) 0x01, (byte) 0x7d, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7e, (byte) 0x10, (byte) 0xf6, (byte) 0xfb, (byte) 0xc0, (byte) 0xb6, (byte) 0x4f, (byte) 0x9a, (byte) 0xfa, (byte) 0x77, (byte) 0x53, (byte) 0x28, (byte) 0x7d, (byte) 0x13, (byte) 0xca, (byte) 0x49, (byte) 0xda, (byte) 0xfd, (byte) 0xd4, (byte) 0x93};
+
+        short expectedCount = 0x1337;
+
+        Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
+        tlvField.setAccessible(true);
+
+        HuaweiTLV expectedTlv = new HuaweiTLV().put(0x81, new HuaweiTLV().put(0x02, expectedCount));
+
+        HuaweiPacket packetSleep = new HuaweiPacket(secretsProvider).parse(rawSleep);
+        HuaweiPacket packetStep = new HuaweiPacket(secretsProvider).parse(rawStep);
+        packetSleep.parseTlv();
+        packetStep.parseTlv();
+
+        Assert.assertEquals(0x07, packetSleep.serviceId);
+        Assert.assertEquals(0x0c, packetSleep.commandId);
+        Assert.assertEquals(expectedTlv, tlvField.get(packetSleep));
+        Assert.assertTrue(packetSleep.complete);
+        Assert.assertTrue(packetSleep instanceof FitnessData.MessageCount.Response);
+        Assert.assertEquals(expectedCount, ((FitnessData.MessageCount.Response) packetSleep).count);
+
+        Assert.assertEquals(0x07, packetStep.serviceId);
+        Assert.assertEquals(0x0a, packetStep.commandId);
+        Assert.assertEquals(expectedTlv, tlvField.get(packetStep));
+        Assert.assertTrue(packetStep.complete);
+        Assert.assertTrue(packetStep instanceof FitnessData.MessageCount.Response);
+        Assert.assertEquals(expectedCount, ((FitnessData.MessageCount.Response) packetStep).count);
+    }
+
+    @Test
+    public void testMessageDataRequest() throws NoSuchFieldException, IllegalAccessException, HuaweiCrypto.CryptoException, HuaweiPacket.CryptoException {
+        short count = 0x1337;
+
+        Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
+        tlvField.setAccessible(true);
+
+        HuaweiTLV expectedTlv = new HuaweiTLV().put(0x81, new HuaweiTLV().put(0x02, count));
+        expectedTlv.encrypt(secretsProvider);
+
+        byte[] expectedSleep = new byte[] {(byte) 0x5a, (byte) 0x00, (byte) 0x2a, (byte) 0x00, (byte) 0x07, (byte) 0x0d, (byte) 0x7c, (byte) 0x01, (byte) 0x01, (byte) 0x7d, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7e, (byte) 0x10, (byte) 0xf6, (byte) 0xfb, (byte) 0xc0, (byte) 0xb6, (byte) 0x4f, (byte) 0x9a, (byte) 0xfa, (byte) 0x77, (byte) 0x53, (byte) 0x28, (byte) 0x7d, (byte) 0x13, (byte) 0xca, (byte) 0x49, (byte) 0xda, (byte) 0xfd, (byte) 0x7d, (byte) 0xad};
+        byte[] expectedStep = new byte[] {(byte) 0x5a, (byte) 0x00, (byte) 0x2a, (byte) 0x00, (byte) 0x07, (byte) 0x0b, (byte) 0x7c, (byte) 0x01, (byte) 0x01, (byte) 0x7d, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7e, (byte) 0x10, (byte) 0xf6, (byte) 0xfb, (byte) 0xc0, (byte) 0xb6, (byte) 0x4f, (byte) 0x9a, (byte) 0xfa, (byte) 0x77, (byte) 0x53, (byte) 0x28, (byte) 0x7d, (byte) 0x13, (byte) 0xca, (byte) 0x49, (byte) 0xda, (byte) 0xfd, (byte) 0x3a, (byte) 0x37};
+
+        FitnessData.MessageData.Request sleepRequest = new FitnessData.MessageData.Request(secretsProvider, FitnessData.MessageData.sleepId, count);
+        FitnessData.MessageData.Request stepRequest = new FitnessData.MessageData.Request(secretsProvider, FitnessData.MessageData.stepId, count);
+
+        Assert.assertEquals(0x07, sleepRequest.serviceId);
+        Assert.assertEquals(0x0d, sleepRequest.commandId);
+        Assert.assertEquals(expectedTlv, tlvField.get(sleepRequest));
+        Assert.assertTrue(sleepRequest.complete);
+        List<byte[]> outSleep = sleepRequest.serialize();
+        Assert.assertEquals(1, outSleep.size());
+        Assert.assertArrayEquals(expectedSleep, outSleep.get(0));
+
+        Assert.assertEquals(0x07, stepRequest.serviceId);
+        Assert.assertEquals(0x0b, stepRequest.commandId);
+        Assert.assertEquals(expectedTlv, tlvField.get(stepRequest));
+        Assert.assertTrue(stepRequest.complete);
+        List<byte[]> outStep = stepRequest.serialize();
+        Assert.assertEquals(1, outStep.size());
+        Assert.assertArrayEquals(expectedStep, outStep.get(0));
+    }
+
+    @Test
+    public void testMessageDataSleepResponse() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.ParseException {
+        byte[] raw = new byte[] {(byte) 0x5a, (byte) 0x00, (byte) 0x3a, (byte) 0x00, (byte) 0x07, (byte) 0x0d, (byte) 0x7c, (byte) 0x01, (byte) 0x01, (byte) 0x7d, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7e, (byte) 0x20, (byte) 0xa4, (byte) 0x9e, (byte) 0xd8, (byte) 0xd3, (byte) 0x7a, (byte) 0x0e, (byte) 0x51, (byte) 0x55, (byte) 0xc5, (byte) 0x48, (byte) 0x07, (byte) 0x99, (byte) 0xf5, (byte) 0x99, (byte) 0x48, (byte) 0x3e, (byte) 0x41, (byte) 0xed, (byte) 0x16, (byte) 0xf1, (byte) 0x52, (byte) 0xd2, (byte) 0x9f, (byte) 0x38, (byte) 0xe8, (byte) 0xb1, (byte) 0x83, (byte) 0xd6, (byte) 0xcb, (byte) 0x52, (byte) 0xb0, (byte) 0x9f, (byte) 0x48, (byte) 0x05};
+
+        Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
+        tlvField.setAccessible(true);
+
+        HuaweiTLV expectedTlv = new HuaweiTLV().put(0x81, new HuaweiTLV()
+                .put(0x02, (short) 0x1337)
+                .put(0x83, new HuaweiTLV()
+                        .put(0x04, (byte) 0x00)
+                        .put(0x05, new byte[] {})
+                )
+                .put(0x83, new HuaweiTLV()
+                        .put(0x04, (byte) 0x01)
+                        .put(0x05, new byte[] {0x01, 0x02})
+                )
+        );
+
+        HuaweiPacket packet = new HuaweiPacket(secretsProvider).parse(raw);
+        packet.parseTlv();
+
+        Assert.assertEquals(0x07, packet.serviceId);
+        Assert.assertEquals(0x0d, packet.commandId);
+        Assert.assertEquals(expectedTlv, tlvField.get(packet));
+        Assert.assertTrue(packet.complete);
+        Assert.assertTrue(packet instanceof FitnessData.MessageData.SleepResponse);
+        Assert.assertEquals(0x1337, ((FitnessData.MessageData.SleepResponse) packet).number);
+        Assert.assertEquals(2, ((FitnessData.MessageData.SleepResponse) packet).containers.size());
+        Assert.assertEquals(0x00, ((FitnessData.MessageData.SleepResponse) packet).containers.get(0).type);
+        Assert.assertArrayEquals(new byte[] {}, ((FitnessData.MessageData.SleepResponse) packet).containers.get(0).timestamp);
+        Assert.assertEquals(0x01, ((FitnessData.MessageData.SleepResponse) packet).containers.get(1).type);
+        Assert.assertArrayEquals(new byte[] {0x01, 0x02}, ((FitnessData.MessageData.SleepResponse) packet).containers.get(1).timestamp);
+    }
+
+    @Test
+    public void testMessageDataStepResponse() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.ParseException {
+        byte[] raw = new byte[] {(byte) 0x5a, (byte) 0x00, (byte) 0x5a, (byte) 0x00, (byte) 0x07, (byte) 0x0b, (byte) 0x7c, (byte) 0x01, (byte) 0x01, (byte) 0x7d, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7e, (byte) 0x40, (byte) 0xdc, (byte) 0xb7, (byte) 0xf6, (byte) 0xaa, (byte) 0xb2, (byte) 0xf1, (byte) 0x03, (byte) 0x53, (byte) 0x25, (byte) 0x39, (byte) 0xe4, (byte) 0x79, (byte) 0xdd, (byte) 0xbf, (byte) 0x18, (byte) 0x7b, (byte) 0x98, (byte) 0x30, (byte) 0xb7, (byte) 0x4c, (byte) 0x33, (byte) 0xd2, (byte) 0x0c, (byte) 0xa5, (byte) 0xee, (byte) 0xfe, (byte) 0x5f, (byte) 0xa5, (byte) 0x12, (byte) 0x20, (byte) 0xec, (byte) 0x79, (byte) 0x38, (byte) 0xec, (byte) 0x9e, (byte) 0x4d, (byte) 0xfc, (byte) 0xc3, (byte) 0x5c, (byte) 0x59, (byte) 0x67, (byte) 0x51, (byte) 0x4b, (byte) 0xef, (byte) 0x50, (byte) 0x48, (byte) 0xb7, (byte) 0xf8, (byte) 0xc7, (byte) 0xe3, (byte) 0xf7, (byte) 0xdf, (byte) 0x82, (byte) 0xb4, (byte) 0x1a, (byte) 0xb8, (byte) 0x94, (byte) 0x78, (byte) 0x0d, (byte) 0xda, (byte) 0x53, (byte) 0xe3, (byte) 0xbe, (byte) 0xbf, (byte) 0x21, (byte) 0xc2};
+
+        Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
+        tlvField.setAccessible(true);
+
+        // TODO: add HR data
+
+        HuaweiTLV expectedTlv = new HuaweiTLV().put(0x81, new HuaweiTLV()
+                .put(0x02, (short) 0x1337)
+                .put(0x03, 0xCAFEBEEF)
+                .put(0x084, new HuaweiTLV()
+                        .put(0x05, (byte) 0x00)
+                        .put(0x06, new byte[] {})
+                )
+                .put(0x84, new HuaweiTLV()
+                        .put(0x05, (byte) 0x01)
+                        .put(0x06, new byte[] {0x01, 0x02})
+                )
+                .put(0x84, new HuaweiTLV()
+                        .put(0x05, (byte) 0x02)
+                        .put(0x06, new byte[] {0x0e, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03})
+                )
+                .put(0x84, new HuaweiTLV()
+                        .put(0x05, (byte) 0x02)
+                        .put(0x06, new byte[] {0x01, 0x00, 0x01})
+                )
+        );
+
+        HuaweiPacket packet = new HuaweiPacket(secretsProvider).parse(raw);
+        packet.parseTlv();
+
+        Assert.assertEquals(0x07, packet.serviceId);
+        Assert.assertEquals(0x0b, packet.commandId);
+        Assert.assertEquals(expectedTlv, tlvField.get(packet));
+        Assert.assertTrue(packet.complete);
+        Assert.assertTrue(packet instanceof FitnessData.MessageData.StepResponse);
+
+        Assert.assertEquals(0x1337, ((FitnessData.MessageData.StepResponse) packet).number);
+        Assert.assertEquals(0xCAFEBEEF, ((FitnessData.MessageData.StepResponse) packet).timestamp);
+        Assert.assertEquals(4, ((FitnessData.MessageData.StepResponse) packet).containers.size());
+
+        Assert.assertEquals(0x00, ((FitnessData.MessageData.StepResponse) packet).containers.get(0).timestampOffset);
+        Assert.assertArrayEquals(new byte[] {}, ((FitnessData.MessageData.StepResponse) packet).containers.get(0).data);
+        Assert.assertEquals(0xCAFEBEEF, ((FitnessData.MessageData.StepResponse) packet).containers.get(0).timestamp);
+        Assert.assertNull(((FitnessData.MessageData.StepResponse) packet).containers.get(0).parsedData);
+        Assert.assertEquals("Data is missing feature bitmap.", ((FitnessData.MessageData.StepResponse) packet).containers.get(0).parsedDataError);
+        Assert.assertEquals(-1, ((FitnessData.MessageData.StepResponse) packet).containers.get(0).steps);
+        Assert.assertEquals(-1, ((FitnessData.MessageData.StepResponse) packet).containers.get(0).calories);
+        Assert.assertEquals(-1, ((FitnessData.MessageData.StepResponse) packet).containers.get(0).distance);
+        Assert.assertNull(((FitnessData.MessageData.StepResponse) packet).containers.get(0).unknownTVs);
+
+        Assert.assertEquals(0x01, ((FitnessData.MessageData.StepResponse) packet).containers.get(1).timestampOffset);
+        Assert.assertArrayEquals(new byte[] {0x01, 0x02}, ((FitnessData.MessageData.StepResponse) packet).containers.get(1).data);
+        Assert.assertEquals(0xCAFEBF2B, ((FitnessData.MessageData.StepResponse) packet).containers.get(1).timestamp);
+        Assert.assertNull(((FitnessData.MessageData.StepResponse) packet).containers.get(1).parsedData);
+        Assert.assertEquals("Data is too short for selected features.", ((FitnessData.MessageData.StepResponse) packet).containers.get(1).parsedDataError);
+        Assert.assertEquals(-1, ((FitnessData.MessageData.StepResponse) packet).containers.get(1).steps);
+        Assert.assertEquals(-1, ((FitnessData.MessageData.StepResponse) packet).containers.get(1).calories);
+        Assert.assertEquals(-1, ((FitnessData.MessageData.StepResponse) packet).containers.get(1).distance);
+        Assert.assertEquals(0, ((FitnessData.MessageData.StepResponse) packet).containers.get(1).unknownTVs.size());
+
+        Assert.assertEquals(0x02, ((FitnessData.MessageData.StepResponse) packet).containers.get(2).timestampOffset);
+        Assert.assertArrayEquals(new byte[] {0x0e, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03}, ((FitnessData.MessageData.StepResponse) packet).containers.get(2).data);
+        Assert.assertEquals(0xCAFEBF67, ((FitnessData.MessageData.StepResponse) packet).containers.get(2).timestamp);
+        Assert.assertEquals(3, ((FitnessData.MessageData.StepResponse) packet).containers.get(2).parsedData.size());
+        Assert.assertEquals(1, ((FitnessData.MessageData.StepResponse) packet).containers.get(2).parsedData.get(0).bitmap);
+        Assert.assertEquals(0x02, ((FitnessData.MessageData.StepResponse) packet).containers.get(2).parsedData.get(0).tag);
+        Assert.assertEquals(0x01, ((FitnessData.MessageData.StepResponse) packet).containers.get(2).parsedData.get(0).value);
+        Assert.assertEquals(1, ((FitnessData.MessageData.StepResponse) packet).containers.get(2).parsedData.get(1).bitmap);
+        Assert.assertEquals(0x04, ((FitnessData.MessageData.StepResponse) packet).containers.get(2).parsedData.get(1).tag);
+        Assert.assertEquals(0x02, ((FitnessData.MessageData.StepResponse) packet).containers.get(2).parsedData.get(1).value);
+        Assert.assertEquals(1, ((FitnessData.MessageData.StepResponse) packet).containers.get(2).parsedData.get(2).bitmap);
+        Assert.assertEquals(0x08, ((FitnessData.MessageData.StepResponse) packet).containers.get(2).parsedData.get(2).tag);
+        Assert.assertEquals(0x03, ((FitnessData.MessageData.StepResponse) packet).containers.get(2).parsedData.get(2).value);
+        Assert.assertEquals("", ((FitnessData.MessageData.StepResponse) packet).containers.get(2).parsedDataError);
+        Assert.assertEquals(0x01, ((FitnessData.MessageData.StepResponse) packet).containers.get(2).steps);
+        Assert.assertEquals(0x02, ((FitnessData.MessageData.StepResponse) packet).containers.get(2).calories);
+        Assert.assertEquals(0x03, ((FitnessData.MessageData.StepResponse) packet).containers.get(2).distance);
+        Assert.assertEquals(0, ((FitnessData.MessageData.StepResponse) packet).containers.get(2).unknownTVs.size());
+
+        Assert.assertEquals(0x02, ((FitnessData.MessageData.StepResponse) packet).containers.get(3).timestampOffset);
+        Assert.assertArrayEquals(new byte[] {0x01, 0x00, 0x01}, ((FitnessData.MessageData.StepResponse) packet).containers.get(3).data);
+        Assert.assertEquals(0xCAFEBF67, ((FitnessData.MessageData.StepResponse) packet).containers.get(3).timestamp);
+        Assert.assertEquals(1, ((FitnessData.MessageData.StepResponse) packet).containers.get(3).parsedData.size());
+        Assert.assertEquals(1, ((FitnessData.MessageData.StepResponse) packet).containers.get(3).parsedData.get(0).bitmap);
+        Assert.assertEquals(0x01, ((FitnessData.MessageData.StepResponse) packet).containers.get(3).parsedData.get(0).tag);
+        Assert.assertEquals(0x01, ((FitnessData.MessageData.StepResponse) packet).containers.get(3).parsedData.get(0).value);
+        Assert.assertEquals("", ((FitnessData.MessageData.StepResponse) packet).containers.get(3).parsedDataError);
+        Assert.assertEquals(-1, ((FitnessData.MessageData.StepResponse) packet).containers.get(3).steps);
+        Assert.assertEquals(-1, ((FitnessData.MessageData.StepResponse) packet).containers.get(3).calories);
+        Assert.assertEquals(-1, ((FitnessData.MessageData.StepResponse) packet).containers.get(3).distance);
+        Assert.assertEquals(1, ((FitnessData.MessageData.StepResponse) packet).containers.get(3).unknownTVs.size());
+        Assert.assertEquals(1, ((FitnessData.MessageData.StepResponse) packet).containers.get(3).unknownTVs.get(0).bitmap);
+        Assert.assertEquals(0x01, ((FitnessData.MessageData.StepResponse) packet).containers.get(3).unknownTVs.get(0).tag);
+        Assert.assertEquals(0x01, ((FitnessData.MessageData.StepResponse) packet).containers.get(3).unknownTVs.get(0).value);
+    }
+
+    @Test
+    public void testMessageDataStepResponseSingleByte() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.ParseException {
+        byte[] raw = new byte[] {(byte) 0x5a, (byte) 0x00, (byte) 0x3a, (byte) 0x00, (byte) 0x07, (byte) 0x0b, (byte) 0x7c, (byte) 0x01, (byte) 0x01, (byte) 0x7d, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7e, (byte) 0x20, (byte) 0xcf, (byte) 0xa7, (byte) 0x76, (byte) 0x30, (byte) 0x69, (byte) 0xa3, (byte) 0x83, (byte) 0x6e, (byte) 0xd2, (byte) 0x84, (byte) 0x70, (byte) 0xc8, (byte) 0xca, (byte) 0x94, (byte) 0x87, (byte) 0xd2, (byte) 0x0d, (byte) 0x1e, (byte) 0xf5, (byte) 0x60, (byte) 0x72, (byte) 0xa4, (byte) 0xd9, (byte) 0x8f, (byte) 0xf6, (byte) 0xdf, (byte) 0x09, (byte) 0x35, (byte) 0x3c, (byte) 0x86, (byte) 0x62, (byte) 0x00, (byte) 0x0a, (byte) 0x3b};
+
+        Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
+        tlvField.setAccessible(true);
+
+        // TODO: change test as 0x40 is now added as HR
+
+        HuaweiTLV expectedTlv = new HuaweiTLV().put(0x81, new HuaweiTLV()
+                .put(0x02, (short) 0x01)
+                .put(0x03, 0x02)
+                .put(0x84, new HuaweiTLV()
+                        .put(0x05, (byte) 0x00)
+                        .put(0x06, new byte[] {0x20, 0x01})
+                )
+                .put(0x84, new HuaweiTLV()
+                        .put(0x05, (byte) 0x01)
+                        .put(0x06, new byte[] {0x40, 0x02})
+                )
+        );
+
+        HuaweiPacket packet = new HuaweiPacket(secretsProvider).parse(raw);
+        packet.parseTlv();
+
+        Assert.assertEquals(0x07, packet.serviceId);
+        Assert.assertEquals(0x0b, packet.commandId);
+        Assert.assertEquals(expectedTlv, tlvField.get(packet));
+        Assert.assertTrue(packet.complete);
+        Assert.assertTrue(packet instanceof FitnessData.MessageData.StepResponse);
+
+        Assert.assertEquals(0x01, ((FitnessData.MessageData.StepResponse) packet).number);
+        Assert.assertEquals(0x02, ((FitnessData.MessageData.StepResponse) packet).timestamp);
+        Assert.assertEquals(2, ((FitnessData.MessageData.StepResponse) packet).containers.size());
+
+        Assert.assertEquals(0x00, ((FitnessData.MessageData.StepResponse) packet).containers.get(0).timestampOffset);
+        Assert.assertArrayEquals(new byte[] {0x20, 0x01}, ((FitnessData.MessageData.StepResponse) packet).containers.get(0).data);
+        Assert.assertEquals(0x02, ((FitnessData.MessageData.StepResponse) packet).containers.get(0).timestamp);
+        Assert.assertEquals(1, ((FitnessData.MessageData.StepResponse) packet).containers.get(0).parsedData.size());
+        Assert.assertEquals(1, ((FitnessData.MessageData.StepResponse) packet).containers.get(0).parsedData.get(0).bitmap);
+        Assert.assertEquals(0x20, ((FitnessData.MessageData.StepResponse) packet).containers.get(0).parsedData.get(0).tag);
+        Assert.assertEquals(0x01, ((FitnessData.MessageData.StepResponse) packet).containers.get(0).parsedData.get(0).value);
+        Assert.assertEquals("", ((FitnessData.MessageData.StepResponse) packet).containers.get(0).parsedDataError);
+        Assert.assertEquals(-1, ((FitnessData.MessageData.StepResponse) packet).containers.get(0).steps);
+        Assert.assertEquals(-1, ((FitnessData.MessageData.StepResponse) packet).containers.get(0).calories);
+        Assert.assertEquals(-1, ((FitnessData.MessageData.StepResponse) packet).containers.get(0).distance);
+        Assert.assertEquals(1, ((FitnessData.MessageData.StepResponse) packet).containers.get(0).unknownTVs.size());
+        Assert.assertEquals(1, ((FitnessData.MessageData.StepResponse) packet).containers.get(0).unknownTVs.get(0).bitmap);
+        Assert.assertEquals(0x20, ((FitnessData.MessageData.StepResponse) packet).containers.get(0).unknownTVs.get(0).tag);
+        Assert.assertEquals(0x01, ((FitnessData.MessageData.StepResponse) packet).containers.get(0).unknownTVs.get(0).value);
+
+        Assert.assertEquals(0x01, ((FitnessData.MessageData.StepResponse) packet).containers.get(1).timestampOffset);
+        Assert.assertArrayEquals(new byte[] {0x40, 0x02}, ((FitnessData.MessageData.StepResponse) packet).containers.get(1).data);
+        Assert.assertEquals(0x3e, ((FitnessData.MessageData.StepResponse) packet).containers.get(1).timestamp);
+        Assert.assertEquals(1, ((FitnessData.MessageData.StepResponse) packet).containers.get(1).parsedData.size());
+        Assert.assertEquals(1, ((FitnessData.MessageData.StepResponse) packet).containers.get(1).parsedData.get(0).bitmap);
+        Assert.assertEquals(0x40, ((FitnessData.MessageData.StepResponse) packet).containers.get(1).parsedData.get(0).tag);
+        Assert.assertEquals(0x02, ((FitnessData.MessageData.StepResponse) packet).containers.get(1).parsedData.get(0).value);
+        Assert.assertEquals("", ((FitnessData.MessageData.StepResponse) packet).containers.get(1).parsedDataError);
+        Assert.assertEquals(-1, ((FitnessData.MessageData.StepResponse) packet).containers.get(1).steps);
+        Assert.assertEquals(-1, ((FitnessData.MessageData.StepResponse) packet).containers.get(1).calories);
+        Assert.assertEquals(-1, ((FitnessData.MessageData.StepResponse) packet).containers.get(1).distance);
+        Assert.assertEquals(0, ((FitnessData.MessageData.StepResponse) packet).containers.get(1).unknownTVs.size());
+//        Assert.assertEquals(1, ((FitnessData.MessageData.StepResponse) packet).containers.get(1).unknownTVs.get(0).bitmap);
+//        Assert.assertEquals(0x40, ((FitnessData.MessageData.StepResponse) packet).containers.get(1).unknownTVs.get(0).tag);
+//        Assert.assertEquals(0x02, ((FitnessData.MessageData.StepResponse) packet).containers.get(1).unknownTVs.get(0).value);
+    }
+
+    @SuppressWarnings("ConstantConditions")
+    @Test
+    public void testActivityReminderRequest() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.CryptoException, HuaweiCrypto.CryptoException {
+        boolean longSitSwitch = false;
+        byte longSitInterval = 0x00;
+        byte[] longSitStart = {0x01, 0x02};
+        byte[] longSitEnd = {0x03, 0x04};
+        byte cycle = 0x05;
+
+        Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
+        tlvField.setAccessible(true);
+
+        HuaweiTLV expectedTlv = new HuaweiTLV()
+                .put(0x81, new HuaweiTLV()
+                        .put(0x02, longSitSwitch)
+                        .put(0x03, longSitInterval)
+                        .put(0x04, longSitStart)
+                        .put(0x05, longSitEnd)
+                        .put(0x06, cycle)
+                );
+        expectedTlv.encrypt(secretsProvider);
+
+        byte[] expected = new byte[] {(byte) 0x5a, (byte) 0x00, (byte) 0x3a, (byte) 0x00, (byte) 0x07, (byte) 0x07, (byte) 0x7c, (byte) 0x01, (byte) 0x01, (byte) 0x7d, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7e, (byte) 0x20, (byte) 0x5b, (byte) 0x9b, (byte) 0x16, (byte) 0xa8, (byte) 0x65, (byte) 0x81, (byte) 0xc1, (byte) 0x18, (byte) 0x2f, (byte) 0x42, (byte) 0xab, (byte) 0xf3, (byte) 0x43, (byte) 0x1e, (byte) 0x5c, (byte) 0x32, (byte) 0x9a, (byte) 0xa9, (byte) 0xa2, (byte) 0x18, (byte) 0x36, (byte) 0xb3, (byte) 0x60, (byte) 0x39, (byte) 0xeb, (byte) 0xdb, (byte) 0x6b, (byte) 0xe5, (byte) 0xac, (byte) 0x7b, (byte) 0x45, (byte) 0x36, (byte) 0xbc, (byte) 0x0c};
+
+        FitnessData.ActivityReminder.Request request = new FitnessData.ActivityReminder.Request(
+                secretsProvider,
+                longSitSwitch,
+                longSitInterval,
+                longSitStart,
+                longSitEnd,
+                cycle
+        );
+
+        Assert.assertEquals(0x07, request.serviceId);
+        Assert.assertEquals(0x07, request.commandId);
+        Assert.assertEquals(expectedTlv, tlvField.get(request));
+        Assert.assertTrue(request.complete);
+        List<byte[]> out = request.serialize();
+        Assert.assertEquals(1, out.size());
+        Assert.assertArrayEquals(expected, out.get(0));
+    }
+
+    @SuppressWarnings("ConstantConditions")
+    @Test
+    public void testTruSleepRequest() throws NoSuchFieldException, IllegalAccessException, HuaweiCrypto.CryptoException, HuaweiPacket.CryptoException {
+        boolean truSleepSwitch = false;
+
+        Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
+        tlvField.setAccessible(true);
+
+        HuaweiTLV expectedTlv = new HuaweiTLV()
+                .put(0x01, truSleepSwitch);
+        expectedTlv.encrypt(secretsProvider);
+
+        byte [] expected = new byte[] {(byte) 0x5a, (byte) 0x00, (byte) 0x2a, (byte) 0x00, (byte) 0x07, (byte) 0x16, (byte) 0x7c, (byte) 0x01, (byte) 0x01, (byte) 0x7d, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7e, (byte) 0x10, (byte) 0x28, (byte) 0x00, (byte) 0x99, (byte) 0x6f, (byte) 0x2a, (byte) 0xcb, (byte) 0x62, (byte) 0x3a, (byte) 0xe6, (byte) 0x54, (byte) 0x28, (byte) 0x54, (byte) 0xf8, (byte) 0xab, (byte) 0x54, (byte) 0x83, (byte) 0x02, (byte) 0x23};
+
+        FitnessData.TruSleep.Request request = new FitnessData.TruSleep.Request(secretsProvider, truSleepSwitch);
+
+        Assert.assertEquals(0x07, request.serviceId);
+        Assert.assertEquals(0x16, request.commandId);
+        Assert.assertEquals(expectedTlv, tlvField.get(request));
+        Assert.assertTrue(request.complete);
+        List<byte[]> out = request.serialize();
+        Assert.assertEquals(1, out.size());
+        Assert.assertArrayEquals(expected, out.get(0));
+    }
+
+    @Test
+    public void testMessageDataStepResponseNoCount() throws NoSuchFieldException, IllegalAccessException {
+        // I've seen this happening because of a bug in the counts, so it's probably best to stop the sync if this happens.
+        byte[] raw = new byte[] {(byte) 0x5a, (byte) 0x00, (byte) 0x2a, (byte) 0x00, (byte) 0x07, (byte) 0x0b, (byte) 0x7c, (byte) 0x01, (byte) 0x01, (byte) 0x7d, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7e, (byte) 0x10, (byte) 0x4c, (byte) 0xdd, (byte) 0x99, (byte) 0x79, (byte) 0xf6, (byte) 0x3c, (byte) 0x1e, (byte) 0xbb, (byte) 0x0a, (byte) 0x95, (byte) 0x8d, (byte) 0x12, (byte) 0x05, (byte) 0x81, (byte) 0x7f, (byte) 0xff, (byte) 0xeb, (byte) 0x45};
+
+        Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
+        tlvField.setAccessible(true);
+
+        try {
+            HuaweiPacket packet = new HuaweiPacket(secretsProvider).parse(raw);
+            packet.parseTlv();
+            Assert.fail();
+        } catch (HuaweiPacket.ParseException e) {
+            if (e instanceof HuaweiPacket.MissingTagException) {
+                Assert.assertNotNull(e.getMessage());
+                if (!e.getMessage().equals("Missing tag: 2")) {
+                    Assert.fail();
+                }
+            } else {
+                Assert.fail();
+            }
+        }
+    }
+
+    @Test
+    public void testSpoData() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.ParseException {
+        byte[] raw = {(byte) 0x5a, (byte) 0x00, (byte) 0x3a, (byte) 0x00, (byte) 0x07, (byte) 0x0b, (byte) 0x7c, (byte) 0x01, (byte) 0x01, (byte) 0x7d, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7e, (byte) 0x20, (byte) 0x30, (byte) 0xdf, (byte) 0x42, (byte) 0xc9, (byte) 0x79, (byte) 0x91, (byte) 0x36, (byte) 0x3d, (byte) 0x80, (byte) 0x6b, (byte) 0x99, (byte) 0xd3, (byte) 0x3f, (byte) 0xbf, (byte) 0x1f, (byte) 0x1e, (byte) 0xc1, (byte) 0x0b, (byte) 0xbf, (byte) 0xcd, (byte) 0xae, (byte) 0x38, (byte) 0x89, (byte) 0x60, (byte) 0x60, (byte) 0xf7, (byte) 0x93, (byte) 0x84, (byte) 0x3a, (byte) 0x09, (byte) 0xd3, (byte) 0x77, (byte) 0x1e, (byte) 0xb9};
+
+        Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
+        tlvField.setAccessible(true);
+
+        HuaweiTLV expectedTlv = new HuaweiTLV().put(0x81, new HuaweiTLV()
+                .put(0x02, (short) 0x1337)
+                .put(0x03, 0xCAFEBEEF)
+                .put(0x84, new HuaweiTLV()
+                        .put(0x05, (byte) 0x00)
+                        .put(0x06, new byte[] {(byte) 0x80, 0x01, 0x42})
+                )
+        );
+
+        HuaweiPacket packet = new HuaweiPacket(secretsProvider).parse(raw);
+        packet.parseTlv();
+
+        Assert.assertEquals(0x07, packet.serviceId);
+        Assert.assertEquals(0x0b, packet.commandId);
+        Assert.assertEquals(expectedTlv, tlvField.get(packet));
+        Assert.assertTrue(packet.complete);
+        Assert.assertTrue(packet instanceof FitnessData.MessageData.StepResponse);
+
+        Assert.assertEquals(0x1337, ((FitnessData.MessageData.StepResponse) packet).number);
+        Assert.assertEquals(0xCAFEBEEF, ((FitnessData.MessageData.StepResponse) packet).timestamp);
+        Assert.assertEquals(1, ((FitnessData.MessageData.StepResponse) packet).containers.size());
+
+        Assert.assertEquals(0x00, ((FitnessData.MessageData.StepResponse) packet).containers.get(0).timestampOffset);
+        Assert.assertArrayEquals(new byte[] {(byte) 0x80, 0x01, 0x42}, ((FitnessData.MessageData.StepResponse) packet).containers.get(0).data);
+        Assert.assertEquals(0xCAFEBEEF, ((FitnessData.MessageData.StepResponse) packet).containers.get(0).timestamp);
+        Assert.assertEquals(1, ((FitnessData.MessageData.StepResponse) packet).containers.get(0).parsedData.size());
+        Assert.assertEquals(2, ((FitnessData.MessageData.StepResponse) packet).containers.get(0).parsedData.get(0).bitmap);
+        Assert.assertEquals(0x01, ((FitnessData.MessageData.StepResponse) packet).containers.get(0).parsedData.get(0).tag);
+        Assert.assertEquals(0x42, ((FitnessData.MessageData.StepResponse) packet).containers.get(0).parsedData.get(0).value);
+        Assert.assertEquals("", ((FitnessData.MessageData.StepResponse) packet).containers.get(0).parsedDataError);
+        Assert.assertEquals(0, ((FitnessData.MessageData.StepResponse) packet).containers.get(0).unknownTVs.size());
+    }
+}
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestLocaleConfig.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestLocaleConfig.java
new file mode 100644
index 000000000..c628c3fe4
--- /dev/null
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestLocaleConfig.java
@@ -0,0 +1,87 @@
+/*  Copyright (C) 2022 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.lang.reflect.Field;
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiTLV;
+
+public class TestLocaleConfig {
+
+    HuaweiPacket.ParamsProvider paramsProvider = new HuaweiPacket.ParamsProvider() {
+        @Override
+        public byte getAuthMode() {
+            return 0;
+        }
+
+        @Override
+        public byte[] getSecretKey() {
+            return new byte[] {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+        }
+
+        @Override
+        public byte[] getIv() {
+            return new byte[] {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+        }
+
+        @Override
+        public boolean areTransactionsCrypted() {
+            return true;
+        }
+
+        @Override
+        public int getMtu() {
+            return 0;
+        }
+
+        @Override
+        public int getSliceSize() {
+            return 0xF4;
+        }
+    };
+
+    @Test
+    public void testSetLocaleRequest() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.CryptoException {
+        Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
+        tlvField.setAccessible(true);
+
+        HuaweiTLV expectedTlv = new HuaweiTLV()
+                .put(0x01, new byte[] {0x45, 0x4e, 0x2d, 0x47, 0x42})
+                .put(0x02, (byte) 0x00);
+
+        byte[] serialized = new byte[] {(byte) 0x5a, (byte) 0x00, (byte) 0x2a, (byte) 0x00, (byte) 0x0c, (byte) 0x01, (byte) 0x7c, (byte) 0x01, (byte) 0x01, (byte) 0x7d, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7e, (byte) 0x10, (byte) 0x4e, (byte) 0xb0, (byte) 0x71, (byte) 0x05, (byte) 0x7b, (byte) 0xf1, (byte) 0x07, (byte) 0x31, (byte) 0xc4, (byte) 0x6c, (byte) 0x5b, (byte) 0x6d, (byte) 0xbf, (byte) 0x07, (byte) 0xf5, (byte) 0x55, (byte) 0x65, (byte) 0x06};
+
+        LocaleConfig.SetLanguageSetting request = new LocaleConfig.SetLanguageSetting(
+                paramsProvider,
+                new byte[] {0x45, 0x4e, 0x2d, 0x47, 0x42},
+                (byte) 0x00
+        );
+
+        Assert.assertEquals(0x0c, request.serviceId);
+        Assert.assertEquals(0x01, request.commandId);
+        Assert.assertEquals(expectedTlv, tlvField.get(request));
+        Assert.assertTrue(request.complete);
+        List<byte[]> out = request.serialize();
+        Assert.assertEquals(1, out.size());
+        Assert.assertArrayEquals(serialized, out.get(0));
+    }
+}
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestMusicControl.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestMusicControl.java
new file mode 100644
index 000000000..7704bc4d7
--- /dev/null
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestMusicControl.java
@@ -0,0 +1,338 @@
+/*  Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets;
+
+import static nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.MusicControl.Control.Response.Button;
+
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import java.lang.reflect.Field;
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiTLV;
+
+public class TestMusicControl {
+
+    HuaweiPacket.ParamsProvider secretsProvider = new HuaweiPacket.ParamsProvider() {
+        @Override
+        public byte getAuthMode() {
+            return 0;
+        }
+
+        @Override
+        public byte[] getSecretKey() {
+            return new byte[] {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+        }
+
+        @Override
+        public byte[] getIv() {
+            return new byte[] {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+        }
+
+        @Override
+        public boolean areTransactionsCrypted() {
+            return true;
+        }
+
+        @Override
+        public int getMtu() {
+            return 0;
+        }
+
+        @Override
+        public int getSliceSize() {
+            return 0xF4;
+        }
+    };
+
+    @Test
+    public void testMusicStatusRequest() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.CryptoException {
+        int okInput = 0x000186a0;
+        int errInput = 0x00000000;
+
+        byte commandId1 = 0x01;
+        byte commandId2 = 0x02;
+
+        Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
+        tlvField.setAccessible(true);
+
+        HuaweiTLV okExpectedTlv = new HuaweiTLV()
+                .put(0x7f, okInput);
+        HuaweiTLV errExpectedTlv = new HuaweiTLV()
+                .put(0x7f, errInput);
+
+        MusicControl.MusicStatusRequest okRequest = new MusicControl.MusicStatusRequest(secretsProvider, commandId1, okInput);
+        MusicControl.MusicStatusRequest errRequest = new MusicControl.MusicStatusRequest(secretsProvider, commandId2, errInput);
+
+        Assert.assertEquals(0x25, okRequest.serviceId);
+        Assert.assertEquals(commandId1, okRequest.commandId);
+        Assert.assertEquals(okExpectedTlv, tlvField.get(okRequest));
+        Assert.assertTrue(okRequest.complete);
+
+        // To check it doesn't error
+        okRequest.serialize();
+
+        Assert.assertEquals(0x25, errRequest.serviceId);
+        Assert.assertEquals(commandId2, errRequest.commandId);
+        Assert.assertEquals(errExpectedTlv, tlvField.get(errRequest));
+        Assert.assertTrue(errRequest.complete);
+
+        // To check it doesn't error
+        errRequest.serialize();
+    }
+
+    @Test
+    public void testMusicStatusResponse() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.ParseException {
+        byte[] raw = new byte[] {(byte) 0x5a, (byte) 0x00, (byte) 0x2a, (byte) 0x00, (byte) 0x25, (byte) 0x01, (byte) 0x7c, (byte) 0x01, (byte) 0x01, (byte) 0x7d, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7e, (byte) 0x10, (byte) 0x01, (byte) 0x43, (byte) 0xdb, (byte) 0x63, (byte) 0xee, (byte) 0x66, (byte) 0xb0, (byte) 0xcd, (byte) 0xff, (byte) 0x9f, (byte) 0x69, (byte) 0x91, (byte) 0x76, (byte) 0x80, (byte) 0x15, (byte) 0x1e, (byte) 0x52, (byte) 0x46};
+
+        Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
+        tlvField.setAccessible(true);
+
+        HuaweiTLV expectedTlv = new HuaweiTLV();
+
+        HuaweiPacket packet = new HuaweiPacket(secretsProvider).parse(raw);
+        packet.parseTlv();
+
+        Assert.assertEquals(0x25, packet.serviceId);
+        Assert.assertEquals(0x01, packet.commandId);
+        Assert.assertEquals(expectedTlv, tlvField.get(packet));
+        Assert.assertTrue(packet instanceof MusicControl.MusicStatusResponse);
+
+        // TODO: complete test when more is known about packet contents
+    }
+
+    @Test
+    public void testMusicStatusResponseUnencrypted() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.ParseException {
+        byte[] rawOk = new byte[] {0x5a, 0x00, 0x09, 0x00, 0x25, 0x01, 0x7f, 0x04, 0x00, 0x01, (byte) 0x86, (byte) 0xa0, 0x63, (byte) 0x96};
+        byte[] rawErr = new byte[] {0x5a, 0x00, 0x09, 0x00, 0x25, 0x01, 0x7f, 0x04, 0x00, 0x01, (byte) 0x86, (byte) 0xaa, (byte) 0xc2, (byte) 0xdc};
+
+        Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
+        tlvField.setAccessible(true);
+
+        HuaweiTLV expectedTlvOk = new HuaweiTLV().put(0x7F, 0x000186A0);
+        HuaweiTLV expectedTlvErr = new HuaweiTLV().put(0x7F, 0x000186AA);
+
+        HuaweiPacket packetOk = new HuaweiPacket(secretsProvider).parse(rawOk);
+        HuaweiPacket packetErr = new HuaweiPacket(secretsProvider).parse(rawErr);
+        packetOk.parseTlv();
+        packetErr.parseTlv();
+
+        Assert.assertEquals(0x25, packetOk.serviceId);
+        Assert.assertEquals(0x01, packetOk.commandId);
+        Assert.assertEquals(expectedTlvOk, tlvField.get(packetOk));
+        Assert.assertTrue(packetOk instanceof MusicControl.MusicStatusResponse);
+        Assert.assertEquals(0x000186A0, ((MusicControl.MusicStatusResponse) packetOk).status);
+
+        Assert.assertEquals(0x25, packetErr.serviceId);
+        Assert.assertEquals(0x01, packetErr.commandId);
+        Assert.assertEquals(expectedTlvErr, tlvField.get(packetErr));
+        Assert.assertTrue(packetErr instanceof MusicControl.MusicStatusResponse);
+        Assert.assertEquals(0x000186AA, ((MusicControl.MusicStatusResponse) packetErr).status);
+    }
+
+    @Test
+    public void testMusicInfoRequest() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.CryptoException {
+        String artistName = "Artist";
+        String songName = "Song";
+        byte playState = 0x01;
+        byte maxVolume = 0x03;
+        byte currentVolume = 0x02;
+        HuaweiTLV expectedTlv = new HuaweiTLV()
+                .put(0x01, artistName)
+                .put(0x02, songName)
+                .put(0x03, playState)
+                .put(0x04, maxVolume)
+                .put(0x05, currentVolume);
+        byte[] expectedSerializedPacket = new byte[] {(byte) 0x5a, (byte) 0x00, (byte) 0x3a, (byte) 0x00, (byte) 0x25, (byte) 0x02, (byte) 0x7c, (byte) 0x01, (byte) 0x01, (byte) 0x7d, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7e, (byte) 0x20, (byte) 0x21, (byte) 0x8b, (byte) 0xe1, (byte) 0x3d, (byte) 0x9f, (byte) 0x85, (byte) 0xd2, (byte) 0x2e, (byte) 0x64, (byte) 0x87, (byte) 0x3f, (byte) 0x1d, (byte) 0xab, (byte) 0x3f, (byte) 0xc7, (byte) 0x39, (byte) 0xb6, (byte) 0x34, (byte) 0x89, (byte) 0x60, (byte) 0xa0, (byte) 0x36, (byte) 0x4a, (byte) 0x08, (byte) 0x7a, (byte) 0x16, (byte) 0xed, (byte) 0xc9, (byte) 0x9e, (byte) 0xf3, (byte) 0xbf, (byte) 0x44, (byte) 0xac, (byte) 0x58};
+
+        Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
+        tlvField.setAccessible(true);
+
+        MusicControl.MusicInfo.Request musicInfoRequest = new MusicControl.MusicInfo.Request(
+                secretsProvider,
+                artistName,
+                songName,
+                playState,
+                maxVolume,
+                currentVolume
+        );
+
+        Assert.assertEquals(0x25, musicInfoRequest.serviceId);
+        Assert.assertEquals(0x02, musicInfoRequest.commandId);
+        Assert.assertEquals(expectedTlv, tlvField.get(musicInfoRequest));
+        Assert.assertTrue(musicInfoRequest.complete);
+        List<byte[]> out = musicInfoRequest.serialize();
+        Assert.assertEquals(1, out.size());
+        Assert.assertArrayEquals(expectedSerializedPacket, out.get(0));
+    }
+
+    @Test
+    public void testMusicInfoResponse() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.ParseException {
+        byte[] rawOk = new byte[] {(byte) 0x5a, (byte) 0x00, (byte) 0x09, (byte) 0x00, (byte) 0x25, (byte) 0x02, (byte) 0x7f, (byte) 0x04, (byte) 0x00, (byte) 0x01, (byte) 0x86, (byte) 0xA0, (byte) 0xbb, (byte) 0x14};
+        byte[] rawErr = new byte[] {(byte) 0x5a, (byte) 0x00, (byte) 0x09, (byte) 0x00, (byte) 0x25, (byte) 0x02, (byte) 0x7f, (byte) 0x04, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x88, (byte) 0xf0};
+        byte[] rawMissing = new byte[] {(byte) 0x5a, (byte) 0x00, (byte) 0x03, (byte) 0x00, (byte) 0x25, (byte) 0x02, (byte) 0xb4, (byte) 0x1b};
+
+        Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
+        tlvField.setAccessible(true);
+
+        HuaweiTLV okExpectedTlv = new HuaweiTLV()
+                .put(0x7f, 0x000186a0);
+        HuaweiTLV errExpectedTlv = new HuaweiTLV()
+                .put(0x7f, 0x00000000);
+        HuaweiTLV missingExpectedTlv = new HuaweiTLV();
+
+        HuaweiPacket packetOk = new HuaweiPacket(secretsProvider).parse(rawOk);
+        HuaweiPacket packetErr = new HuaweiPacket(secretsProvider).parse(rawErr);
+        HuaweiPacket packetMissing = new HuaweiPacket(secretsProvider).parse(rawMissing);
+
+        packetOk.parseTlv();
+        packetErr.parseTlv();
+        packetMissing.parseTlv();
+
+        Assert.assertEquals(0x25, packetOk.serviceId);
+        Assert.assertEquals(0x02, packetOk.commandId);
+        Assert.assertEquals(okExpectedTlv, tlvField.get(packetOk));
+        Assert.assertTrue(packetOk instanceof MusicControl.MusicInfo.Response);
+        Assert.assertTrue(((MusicControl.MusicInfo.Response) packetOk).ok);
+        Assert.assertEquals("", ((MusicControl.MusicInfo.Response) packetOk).error);
+
+        Assert.assertEquals(0x25, packetErr.serviceId);
+        Assert.assertEquals(0x02, packetErr.commandId);
+        Assert.assertEquals(errExpectedTlv, tlvField.get(packetErr));
+        Assert.assertTrue(packetErr instanceof MusicControl.MusicInfo.Response);
+        Assert.assertFalse(((MusicControl.MusicInfo.Response) packetErr).ok);
+        Assert.assertEquals("Music information error code: 0", ((MusicControl.MusicInfo.Response) packetErr).error);
+
+        Assert.assertEquals(0x25, packetMissing.serviceId);
+        Assert.assertEquals(0x02, packetMissing.commandId);
+        Assert.assertEquals(missingExpectedTlv, tlvField.get(packetMissing));
+        Assert.assertTrue(packetMissing instanceof MusicControl.MusicInfo.Response);
+        Assert.assertFalse(((MusicControl.MusicInfo.Response) packetMissing).ok);
+        Assert.assertEquals("Music information response no status tag", ((MusicControl.MusicInfo.Response) packetMissing).error);
+    }
+
+    @Test
+    public void testControlResponse() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.ParseException {
+        byte[] emptyInput = new byte[] {(byte) 0x5a, (byte) 0x00, (byte) 0x03, (byte) 0x00, (byte) 0x25, (byte) 0x03, (byte) 0xa4, (byte) 0x3a, };
+        byte[] playPauseInput = new byte[] {(byte) 0x5a, (byte) 0x00, (byte) 0x06, (byte) 0x00, (byte) 0x25, (byte) 0x03, (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0xe6, (byte) 0x85};
+        byte[] previousInput = new byte[] {(byte) 0x5a, (byte) 0x00, (byte) 0x06, (byte) 0x00, (byte) 0x25, (byte) 0x03, (byte) 0x01, (byte) 0x01, (byte) 0x03, (byte) 0xc6, (byte) 0xc7};
+        byte[] nextInput = new byte[] {(byte) 0x5a, (byte) 0x00, (byte) 0x06, (byte) 0x00, (byte) 0x25, (byte) 0x03, (byte) 0x01, (byte) 0x01, (byte) 0x04, (byte) 0xb6, (byte) 0x20};
+        byte[] unknownButtonInput = new byte[] {(byte) 0x5a, (byte) 0x00, (byte) 0x06, (byte) 0x00, (byte) 0x25, (byte) 0x03, (byte) 0x01, (byte) 0x01, (byte) 0xFF, (byte) 0xe8, (byte) 0x54};
+        byte[] volumeInput = new byte[] {(byte) 0x5a, (byte) 0x00, (byte) 0x06, (byte) 0x00, (byte) 0x25, (byte) 0x03, (byte) 0x02, (byte) 0x01, (byte) 0x42, (byte) 0xc7, (byte) 0x72};
+        byte[] combinedInput = new byte[] {(byte) 0x5a, (byte) 0x00, (byte) 0x09, (byte) 0x00, (byte) 0x25, (byte) 0x03, (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x02, (byte) 0x01, (byte) 0x42, (byte) 0x95, (byte) 0x9a};
+
+        Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
+        tlvField.setAccessible(true);
+
+        HuaweiTLV emptyExpectedTlv = new HuaweiTLV();
+        HuaweiTLV playPauseExpectedTlv = new HuaweiTLV()
+                .put(0x01, (byte) 0x01);
+        HuaweiTLV previousExpectedTlv = new HuaweiTLV()
+                .put(0x01,  (byte) 0x03);
+        HuaweiTLV nextExpectedTlv = new HuaweiTLV()
+                .put(0x01, (byte) 0x04);
+        HuaweiTLV unknownButtonExpectedTlv = new HuaweiTLV()
+                .put(0x01, (byte) 0xFF);
+        HuaweiTLV volumeExpectedTlv = new HuaweiTLV()
+                .put(0x02, (byte) 0x42);
+        HuaweiTLV combinedExpectedTlv = new HuaweiTLV()
+                .put(0x01, (byte) 0x01)
+                .put(0x02, (byte) 0x42);
+
+        HuaweiPacket emptyResponse = new HuaweiPacket(secretsProvider).parse(emptyInput);
+        HuaweiPacket playPauseResponse = new HuaweiPacket(secretsProvider).parse(playPauseInput);
+        HuaweiPacket previousResponse = new HuaweiPacket(secretsProvider).parse(previousInput);
+        HuaweiPacket nextResponse = new HuaweiPacket(secretsProvider).parse(nextInput);
+        HuaweiPacket unknownButtonResponse = new HuaweiPacket(secretsProvider).parse(unknownButtonInput);
+        HuaweiPacket volumeResponse = new HuaweiPacket(secretsProvider).parse(volumeInput);
+        HuaweiPacket combinedResponse = new HuaweiPacket(secretsProvider).parse(combinedInput);
+
+        emptyResponse.parseTlv();
+        playPauseResponse.parseTlv();
+        previousResponse.parseTlv();
+        nextResponse.parseTlv();
+        unknownButtonResponse.parseTlv();
+        volumeResponse.parseTlv();
+        combinedResponse.parseTlv();
+
+        // TODO: play and pause are now split - test needs to be updated
+
+        Assert.assertEquals(0x25, emptyResponse.serviceId);
+        Assert.assertEquals(0x03, emptyResponse.commandId);
+        Assert.assertEquals(emptyExpectedTlv, tlvField.get(emptyResponse));
+        Assert.assertTrue(emptyResponse instanceof MusicControl.Control.Response);
+        Assert.assertFalse(((MusicControl.Control.Response) emptyResponse).buttonPresent);
+        Assert.assertFalse(((MusicControl.Control.Response) emptyResponse).volumePresent);
+
+        Assert.assertEquals(0x25, playPauseResponse.serviceId);
+        Assert.assertEquals(0x03, playPauseResponse.commandId);
+        Assert.assertEquals(playPauseExpectedTlv, tlvField.get(playPauseResponse));
+        Assert.assertTrue(playPauseResponse instanceof MusicControl.Control.Response);
+        Assert.assertTrue(((MusicControl.Control.Response) playPauseResponse).buttonPresent);
+        Assert.assertEquals(0x01, ((MusicControl.Control.Response) playPauseResponse).rawButton);
+        // Assert.assertEquals(Button.PlayPause, ((MusicControl.Control.Response) playPauseResponse).button);
+        Assert.assertFalse(((MusicControl.Control.Response) playPauseResponse).volumePresent);
+
+        Assert.assertEquals(0x25, previousResponse.serviceId);
+        Assert.assertEquals(0x03, previousResponse.commandId);
+        Assert.assertEquals(previousExpectedTlv, tlvField.get(previousResponse));
+        Assert.assertTrue(previousResponse instanceof MusicControl.Control.Response);
+        Assert.assertTrue(((MusicControl.Control.Response) previousResponse).buttonPresent);
+        Assert.assertEquals(0x03, ((MusicControl.Control.Response) previousResponse).rawButton);
+        Assert.assertEquals(Button.Previous, ((MusicControl.Control.Response) previousResponse).button);
+        Assert.assertFalse(((MusicControl.Control.Response) previousResponse).volumePresent);
+
+        Assert.assertEquals(0x25, nextResponse.serviceId);
+        Assert.assertEquals(0x03, nextResponse.commandId);
+        Assert.assertEquals(nextExpectedTlv, tlvField.get(nextResponse));
+        Assert.assertTrue(nextResponse instanceof MusicControl.Control.Response);
+        Assert.assertTrue(((MusicControl.Control.Response) nextResponse).buttonPresent);
+        Assert.assertEquals(0x04, ((MusicControl.Control.Response) nextResponse).rawButton);
+        Assert.assertEquals(Button.Next, ((MusicControl.Control.Response) nextResponse).button);
+        Assert.assertFalse(((MusicControl.Control.Response) nextResponse).volumePresent);
+
+        Assert.assertEquals(0x25, unknownButtonResponse.serviceId);
+        Assert.assertEquals(0x03, unknownButtonResponse.commandId);
+        Assert.assertEquals(unknownButtonExpectedTlv, tlvField.get(unknownButtonResponse));
+        Assert.assertTrue(unknownButtonResponse instanceof MusicControl.Control.Response);
+        Assert.assertTrue(((MusicControl.Control.Response) unknownButtonResponse).buttonPresent);
+        Assert.assertEquals((byte) 0xFF, ((MusicControl.Control.Response) unknownButtonResponse).rawButton);
+        Assert.assertEquals(Button.Unknown, ((MusicControl.Control.Response) unknownButtonResponse).button);
+        Assert.assertFalse(((MusicControl.Control.Response) unknownButtonResponse).volumePresent);
+
+        Assert.assertEquals(0x25, volumeResponse.serviceId);
+        Assert.assertEquals(0x03, volumeResponse.commandId);
+        Assert.assertEquals(volumeExpectedTlv, tlvField.get(volumeResponse));
+        Assert.assertTrue(volumeResponse instanceof MusicControl.Control.Response);
+        Assert.assertFalse(((MusicControl.Control.Response) volumeResponse).buttonPresent);
+        Assert.assertTrue(((MusicControl.Control.Response) volumeResponse).volumePresent);
+        Assert.assertEquals(0x42, ((MusicControl.Control.Response) volumeResponse).volume);
+
+        Assert.assertEquals(0x25, combinedResponse.serviceId);
+        Assert.assertEquals(0x03, combinedResponse.commandId);
+        Assert.assertEquals(combinedExpectedTlv, tlvField.get(combinedResponse));
+        Assert.assertTrue(combinedResponse instanceof MusicControl.Control.Response);
+        Assert.assertTrue(((MusicControl.Control.Response) combinedResponse).buttonPresent);
+        Assert.assertEquals(0x01, ((MusicControl.Control.Response) combinedResponse).rawButton);
+        // Assert.assertEquals(Button.PlayPause, ((MusicControl.Control.Response) combinedResponse).button);
+        Assert.assertTrue(((MusicControl.Control.Response) combinedResponse).volumePresent);
+        Assert.assertEquals(0x42, ((MusicControl.Control.Response) combinedResponse).volume);
+    }
+}
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestNotifications.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestNotifications.java
new file mode 100644
index 000000000..52e1a3087
--- /dev/null
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestNotifications.java
@@ -0,0 +1,197 @@
+/*  Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.lang.reflect.Field;
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiTLV;
+
+public class TestNotifications {
+
+    HuaweiPacket.ParamsProvider secretsProvider = new HuaweiPacket.ParamsProvider() {
+        @Override
+        public byte getAuthMode() {
+            return 0;
+        }
+
+        @Override
+        public byte[] getSecretKey() {
+            return new byte[] {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+        }
+
+        @Override
+        public byte[] getIv() {
+            return new byte[] {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+        }
+
+        @Override
+        public boolean areTransactionsCrypted() {
+            return true;
+        }
+
+        @Override
+        public int getMtu() {
+            return 0;
+        }
+
+        @Override
+        public int getSliceSize() {
+            return 0xF4;
+        }
+    };
+
+    @Test
+    public void testNotificationActionRequest() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.CryptoException {
+        short notificationId = 0x01;
+        byte notificationType = 0x02;
+        byte titleEncoding = 0x02;
+        String titleContent = "Title";
+        byte senderEncoding = 0x02;
+        String senderContent = "Sender";
+        byte bodyEncoding = 0x02;
+        String bodyContent = "Body";
+        String sourceAppId = "SourceApp";
+
+        Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
+        tlvField.setAccessible(true);
+
+        HuaweiTLV expectedTlv = new HuaweiTLV()
+                .put(0x01, notificationId)
+                .put(0x02, notificationType)
+                .put(0x03, true)
+                .put(0x84, new HuaweiTLV()
+                        .put(0x8C, new HuaweiTLV()
+                                .put(0x8D, new HuaweiTLV()
+                                        .put(0x0E, (byte) 0x03)
+                                        .put(0x0F, titleEncoding)
+                                        .put(0x10, titleContent)
+                                )
+                                .put(0x8D, new HuaweiTLV()
+                                        .put(0x0E, (byte) 0x02)
+                                        .put(0x0F, senderEncoding)
+                                        .put(0x10, senderContent)
+                                )
+                                .put(0x8D, new HuaweiTLV()
+                                        .put(0x0E, (byte) 0x01)
+                                        .put(0x0F, bodyEncoding)
+                                        .put(0x10, bodyContent)
+                                )
+                        )
+                )
+                .put(0x11, sourceAppId);
+
+        Notifications.NotificationActionRequest request = new Notifications.NotificationActionRequest(
+                secretsProvider,
+                notificationId,
+                notificationType,
+                titleEncoding,
+                titleContent,
+                senderEncoding,
+                senderContent,
+                bodyEncoding,
+                bodyContent,
+                sourceAppId
+        );
+
+        Assert.assertEquals(0x02, request.serviceId);
+        Assert.assertEquals(0x01, request.commandId);
+        Assert.assertTrue(request.complete);
+        Assert.assertEquals(expectedTlv, tlvField.get(request));
+
+        // Only check that this doesn't error
+        request.serialize();
+    }
+
+    @Test
+    public void testSetNotificationRequest() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.CryptoException {
+        Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
+        tlvField.setAccessible(true);
+
+        HuaweiTLV expectedTlvTrue = new HuaweiTLV()
+                .put(0x81, new HuaweiTLV()
+                        .put(0x02, true)
+                        .put(0x03, true)
+                );
+
+        HuaweiTLV expectedTlvFalse = new HuaweiTLV()
+                .put(0x81, new HuaweiTLV()
+                        .put(0x02, false)
+                        .put(0x03, false)
+                );
+
+        byte[] expectedOutputTrue = new byte[] {(byte) 0x5a, (byte) 0x00, (byte) 0x2a, (byte) 0x00, (byte) 0x02, (byte) 0x04, (byte) 0x7c, (byte) 0x01, (byte) 0x01, (byte) 0x7d, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7e, (byte) 0x10, (byte) 0xd9, (byte) 0xc4, (byte) 0xaa, (byte) 0x7d, (byte) 0xa3, (byte) 0x5c, (byte) 0x42, (byte) 0xab, (byte) 0x2d, (byte) 0xc2, (byte) 0xe7, (byte) 0x73, (byte) 0xc0, (byte) 0x4c, (byte) 0x97, (byte) 0x5a, (byte) 0x41, (byte) 0x23};
+        byte[] expectedOutputFalse = new byte[] {(byte) 0x5a, (byte) 0x00, (byte) 0x2a, (byte) 0x00, (byte) 0x02, (byte) 0x04, (byte) 0x7c, (byte) 0x01, (byte) 0x01, (byte) 0x7d, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7e, (byte) 0x10, (byte) 0xeb, (byte) 0x1f, (byte) 0x20, (byte) 0x0a, (byte) 0x7d, (byte) 0xe2, (byte) 0x25, (byte) 0x45, (byte) 0x01, (byte) 0x5b, (byte) 0xe8, (byte) 0x24, (byte) 0xe3, (byte) 0x7e, (byte) 0x1d, (byte) 0x9c, (byte) 0x47, (byte) 0x31};
+
+        Notifications.NotificationStateRequest requestTrue = new Notifications.NotificationStateRequest(secretsProvider, true);
+        Notifications.NotificationStateRequest requestFalse = new Notifications.NotificationStateRequest(secretsProvider, false);
+
+        Assert.assertEquals(0x02, requestTrue.serviceId);
+        Assert.assertEquals(0x04, requestTrue.commandId);
+        Assert.assertTrue(requestTrue.complete);
+        Assert.assertEquals(expectedTlvTrue, tlvField.get(requestTrue));
+        List<byte[]> outTrue = requestTrue.serialize();
+        Assert.assertEquals(1, outTrue.size());
+        Assert.assertArrayEquals(expectedOutputTrue, outTrue.get(0));
+
+        Assert.assertEquals(0x02, requestFalse.serviceId);
+        Assert.assertEquals(0x04, requestFalse.commandId);
+        Assert.assertTrue(requestFalse.complete);
+        Assert.assertEquals(expectedTlvFalse, tlvField.get(requestFalse));
+        List<byte[]> outFalse = requestFalse.serialize();
+        Assert.assertEquals(1, outFalse.size());
+        Assert.assertArrayEquals(expectedOutputFalse, outFalse.get(0));
+    }
+
+    @Test
+    public void testSetWearMessagePushRequest() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.CryptoException {
+        Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
+        tlvField.setAccessible(true);
+
+        HuaweiTLV expectedTlvTrue = new HuaweiTLV()
+                .put(0x01, true);
+
+        HuaweiTLV expectedTlvFalse = new HuaweiTLV()
+                .put(0x01, false);
+
+        byte[] expectedOutputTrue = new byte[] {(byte) 0x5a, (byte) 0x00, (byte) 0x2a, (byte) 0x00, (byte) 0x02, (byte) 0x08, (byte) 0x7c, (byte) 0x01, (byte) 0x01, (byte) 0x7d, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7e, (byte) 0x10, (byte) 0xcd, (byte) 0x97, (byte) 0x7e, (byte) 0x01, (byte) 0x48, (byte) 0x34, (byte) 0x2a, (byte) 0x48, (byte) 0x58, (byte) 0x0d, (byte) 0x30, (byte) 0xc7, (byte) 0xbc, (byte) 0x2e, (byte) 0x40, (byte) 0xd4, (byte) 0x29, (byte) 0xe0};
+        byte[] expectedOutputFalse = new byte[] {(byte) 0x5a, (byte) 0x00, (byte) 0x2a, (byte) 0x00, (byte) 0x02, (byte) 0x08, (byte) 0x7c, (byte) 0x01, (byte) 0x01, (byte) 0x7d, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7e, (byte) 0x10, (byte) 0x28, (byte) 0x00, (byte) 0x99, (byte) 0x6f, (byte) 0x2a, (byte) 0xcb, (byte) 0x62, (byte) 0x3a, (byte) 0xe6, (byte) 0x54, (byte) 0x28, (byte) 0x54, (byte) 0xf8, (byte) 0xab, (byte) 0x54, (byte) 0x83, (byte) 0x30, (byte) 0xd2};
+
+        Notifications.WearMessagePushRequest requestTrue = new Notifications.WearMessagePushRequest(secretsProvider, true);
+        Notifications.WearMessagePushRequest requestFalse = new Notifications.WearMessagePushRequest(secretsProvider, false);
+
+        Assert.assertEquals(0x02, requestTrue.serviceId);
+        Assert.assertEquals(0x08, requestTrue.commandId);
+        Assert.assertTrue(requestTrue.complete);
+        Assert.assertEquals(expectedTlvTrue, tlvField.get(requestTrue));
+        List<byte[]> outTrue = requestTrue.serialize();
+        Assert.assertEquals(1, outTrue.size());
+        Assert.assertArrayEquals(expectedOutputTrue, outTrue.get(0));
+
+        Assert.assertEquals(0x02, requestFalse.serviceId);
+        Assert.assertEquals(0x08, requestFalse.commandId);
+        Assert.assertTrue(requestFalse.complete);
+        Assert.assertEquals(expectedTlvFalse, tlvField.get(requestFalse));
+        List<byte[]> outFalse = requestFalse.serialize();
+        Assert.assertEquals(1, outFalse.size());
+        Assert.assertArrayEquals(expectedOutputFalse, outFalse.get(0));
+    }
+}
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestWorkMode.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestWorkMode.java
new file mode 100644
index 000000000..a2c4eabad
--- /dev/null
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestWorkMode.java
@@ -0,0 +1,94 @@
+/*  Copyright (C) 2022 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.lang.reflect.Field;
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiTLV;
+
+public class TestWorkMode {
+
+    HuaweiPacket.ParamsProvider secretsProvider = new HuaweiPacket.ParamsProvider() {
+        @Override
+        public byte getAuthMode() {
+            return 0;
+        }
+
+        @Override
+        public byte[] getSecretKey() {
+            return new byte[] {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+        }
+
+        @Override
+        public byte[] getIv() {
+            return new byte[] {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+        }
+
+        @Override
+        public boolean areTransactionsCrypted() {
+            return true;
+        }
+
+        @Override
+        public int getMtu() {
+            return 0;
+        }
+
+        @Override
+        public int getSliceSize() {
+            return 0xF4;
+        }
+    };
+
+    @Test
+    public void testSwitchStatusRequest() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.CryptoException {
+        Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
+        tlvField.setAccessible(true);
+
+        HuaweiTLV expectedTlvTrue = new HuaweiTLV()
+                .put(0x01, true);
+        HuaweiTLV expectedTlvFalse = new HuaweiTLV()
+                .put(0x01, false);
+
+        byte[] serializedTrue = new byte[] {(byte) 0x5a, (byte) 0x00, (byte) 0x2a, (byte) 0x00, (byte) 0x26, (byte) 0x02, (byte) 0x7c, (byte) 0x01, (byte) 0x01, (byte) 0x7d, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7e, (byte) 0x10, (byte) 0xcd, (byte) 0x97, (byte) 0x7e, (byte) 0x01, (byte) 0x48, (byte) 0x34, (byte) 0x2a, (byte) 0x48, (byte) 0x58, (byte) 0x0d, (byte) 0x30, (byte) 0xc7, (byte) 0xbc, (byte) 0x2e, (byte) 0x40, (byte) 0xd4, (byte) 0x5c, (byte) 0x5a};
+        byte[] serializedFalse = new byte[] {(byte) 0x5a, (byte) 0x00, (byte) 0x2a, (byte) 0x00, (byte) 0x26, (byte) 0x02, (byte) 0x7c, (byte) 0x01, (byte) 0x01, (byte) 0x7d, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7e, (byte) 0x10, (byte) 0x28, (byte) 0x00, (byte) 0x99, (byte) 0x6f, (byte) 0x2a, (byte) 0xcb, (byte) 0x62, (byte) 0x3a, (byte) 0xe6, (byte) 0x54, (byte) 0x28, (byte) 0x54, (byte) 0xf8, (byte) 0xab, (byte) 0x54, (byte) 0x83, (byte) 0x45, (byte) 0x68};
+
+        WorkMode.SwitchStatusRequest requestTrue = new WorkMode.SwitchStatusRequest(secretsProvider, true);
+        WorkMode.SwitchStatusRequest requestFalse = new WorkMode.SwitchStatusRequest(secretsProvider, false);
+
+        Assert.assertEquals(0x26, requestTrue.serviceId);
+        Assert.assertEquals(0x02, requestTrue.commandId);
+        Assert.assertEquals(expectedTlvTrue, tlvField.get(requestTrue));
+        Assert.assertTrue(requestTrue.complete);
+        List<byte[]> outTrue = requestTrue.serialize();
+        Assert.assertEquals(1, outTrue.size());
+        Assert.assertArrayEquals(serializedTrue, outTrue.get(0));
+
+        Assert.assertEquals(0x26, requestFalse.serviceId);
+        Assert.assertEquals(0x02, requestFalse.commandId);
+        Assert.assertEquals(expectedTlvFalse, tlvField.get(requestFalse));
+        Assert.assertTrue(requestFalse.complete);
+        List<byte[]> outFalse = requestFalse.serialize();
+        Assert.assertEquals(1, outFalse.size());
+        Assert.assertArrayEquals(serializedFalse, outFalse.get(0));
+    }
+}
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestWorkout.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestWorkout.java
new file mode 100644
index 000000000..a81671ce7
--- /dev/null
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestWorkout.java
@@ -0,0 +1,437 @@
+/*  Copyright (C) 2022 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.lang.reflect.Field;
+import java.nio.ByteBuffer;
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiTLV;
+
+public class TestWorkout {
+
+    HuaweiPacket.ParamsProvider secretsProvider = new HuaweiPacket.ParamsProvider() {
+        @Override
+        public byte getAuthMode() {
+            return 0;
+        }
+
+        @Override
+        public byte[] getSecretKey() {
+            return new byte[] {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+        }
+
+        @Override
+        public byte[] getIv() {
+            return new byte[] {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+        }
+
+        @Override
+        public boolean areTransactionsCrypted() {
+            return true;
+        }
+
+        @Override
+        public int getMtu() {
+            return 0;
+        }
+
+        @Override
+        public int getSliceSize() {
+            return 0xF4;
+        }
+    };
+
+    @Test
+    public void testWorkoutCountRequest() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.CryptoException {
+        int start = 0x00000000;
+        int end = 0x01020304;
+
+        Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
+        tlvField.setAccessible(true);
+
+        HuaweiTLV expectedTlv = new HuaweiTLV().put(0x81, new HuaweiTLV()
+                .put(0x03, start)
+                .put(0x04, end)
+        );
+
+        byte[] expected = new byte[] {(byte) 0x5a, (byte) 0x00, (byte) 0x2a, (byte) 0x00, (byte) 0x17, (byte) 0x07, (byte) 0x7c, (byte) 0x01, (byte) 0x01, (byte) 0x7d, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7e, (byte) 0x10, (byte) 0xf7, (byte) 0x48, (byte) 0xf7, (byte) 0x49, (byte) 0x4a, (byte) 0xa5, (byte) 0xb2, (byte) 0xc9, (byte) 0x41, (byte) 0xf5, (byte) 0x7f, (byte) 0xb4, (byte) 0xe9, (byte) 0x17, (byte) 0xac, (byte) 0xb5, (byte) 0x5f, (byte) 0x8e};
+
+        Workout.WorkoutCount.Request request = new Workout.WorkoutCount.Request(secretsProvider, start, end);
+
+        Assert.assertEquals(0x17, request.serviceId);
+        Assert.assertEquals(0x07, request.commandId);
+        Assert.assertEquals(expectedTlv, tlvField.get(request));
+        Assert.assertTrue(request.complete);
+        List<byte[]> out = request.serialize();
+        Assert.assertEquals(1, out.size());
+        Assert.assertArrayEquals(expected, out.get(0));
+    }
+
+    @Test
+    public void testWorkoutCountResponse() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.ParseException {
+        byte[] raw = new byte[] {(byte) 0x5a, (byte) 0x00, (byte) 0x4a, (byte) 0x00, (byte) 0x17, (byte) 0x07, (byte) 0x7c, (byte) 0x01, (byte) 0x01, (byte) 0x7d, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7e, (byte) 0x30, (byte) 0xee, (byte) 0xdd, (byte) 0xa9, (byte) 0x23, (byte) 0x2c, (byte) 0xe4, (byte) 0x9f, (byte) 0x41, (byte) 0x0b, (byte) 0x9f, (byte) 0x7a, (byte) 0xc2, (byte) 0xe0, (byte) 0x72, (byte) 0x6d, (byte) 0xe1, (byte) 0x8f, (byte) 0xd0, (byte) 0xe7, (byte) 0x41, (byte) 0x59, (byte) 0x38, (byte) 0xac, (byte) 0x17, (byte) 0x66, (byte) 0xc8, (byte) 0x60, (byte) 0xd7, (byte) 0xd2, (byte) 0x32, (byte) 0x8b, (byte) 0xa5, (byte) 0x91, (byte) 0xc7, (byte) 0xc5, (byte) 0xe5, (byte) 0x7d, (byte) 0x8d, (byte) 0xa1, (byte) 0xd0, (byte) 0x6f, (byte) 0xe2, (byte) 0xe2, (byte) 0x24, (byte) 0x7d, (byte) 0xef, (byte) 0x02, (byte) 0x03, (byte) 0x59, (byte) 0x3e};
+
+        Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
+        tlvField.setAccessible(true);
+
+        HuaweiTLV expectedTlv = new HuaweiTLV().put(0x81, new HuaweiTLV()
+                .put(0x02, (short) 0x1337)
+                .put(0x85, new HuaweiTLV()
+                        .put(0x06, (short) 0x0001)
+                        .put(0x07, (short) 0x0002)
+                        .put(0x08, (short) 0x0003)
+                        .put(0x0a, (short) 0x0004)
+                )
+                .put(0x85, new HuaweiTLV()
+                        .put(0x06, (short) 0x0005)
+                        .put(0x07, (short) 0x0006)
+                        .put(0x08, (short) 0x0007)
+                        .put(0x0a, (short) 0x0008)
+                )
+        );
+
+        HuaweiPacket packet = new HuaweiPacket(secretsProvider).parse(raw);
+        packet.parseTlv();
+
+        Assert.assertEquals(0x17, packet.serviceId);
+        Assert.assertEquals(0x07, packet.commandId);
+        Assert.assertEquals(expectedTlv, tlvField.get(packet));
+        Assert.assertTrue(packet.complete);
+        Assert.assertTrue(packet instanceof Workout.WorkoutCount.Response);
+        Assert.assertEquals(0x1337, ((Workout.WorkoutCount.Response) packet).count);
+        Assert.assertEquals(2, ((Workout.WorkoutCount.Response) packet).workoutNumbers.size());
+
+        Assert.assertArrayEquals(new byte[] {0x06, 0x02, 0x00, 0x01, 0x07, 0x02, 0x00, 0x02, 0x08, 0x02, 0x00, 0x03, 0x0a, 0x02, 0x00, 0x04}, ((Workout.WorkoutCount.Response) packet).workoutNumbers.get(0).rawData);
+        Assert.assertEquals(0x01, ((Workout.WorkoutCount.Response) packet).workoutNumbers.get(0).workoutNumber);
+        Assert.assertEquals(0x02, ((Workout.WorkoutCount.Response) packet).workoutNumbers.get(0).dataCount);
+        Assert.assertEquals(0x03, ((Workout.WorkoutCount.Response) packet).workoutNumbers.get(0).paceCount);
+
+        Assert.assertArrayEquals(new byte[] {0x06, 0x02, 0x00, 0x05, 0x07, 0x02, 0x00, 0x06, 0x08, 0x02, 0x00, 0x07, 0x0a, 0x02, 0x00, 0x08}, ((Workout.WorkoutCount.Response) packet).workoutNumbers.get(1).rawData);
+        Assert.assertEquals(0x05, ((Workout.WorkoutCount.Response) packet).workoutNumbers.get(1).workoutNumber);
+        Assert.assertEquals(0x06, ((Workout.WorkoutCount.Response) packet).workoutNumbers.get(1).dataCount);
+        Assert.assertEquals(0x07, ((Workout.WorkoutCount.Response) packet).workoutNumbers.get(1).paceCount);
+    }
+
+    @Test
+    public void testWorkoutTotalsRequest() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.CryptoException {
+        short number = 0x1337;
+
+        Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
+        tlvField.setAccessible(true);
+
+        HuaweiTLV expectedTlv = new HuaweiTLV().put(0x81, new HuaweiTLV()
+                .put(0x02, number)
+        );
+
+        byte[] expected = new byte[] {(byte) 0x5a, (byte) 0x00, (byte) 0x2a, (byte) 0x00, (byte) 0x17, (byte) 0x08, (byte) 0x7c, (byte) 0x01, (byte) 0x01, (byte) 0x7d, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7e, (byte) 0x10, (byte) 0xf6, (byte) 0xfb, (byte) 0xc0, (byte) 0xb6, (byte) 0x4f, (byte) 0x9a, (byte) 0xfa, (byte) 0x77, (byte) 0x53, (byte) 0x28, (byte) 0x7d, (byte) 0x13, (byte) 0xca, (byte) 0x49, (byte) 0xda, (byte) 0xfd, (byte) 0x26, (byte) 0x91};
+
+        Workout.WorkoutTotals.Request request = new Workout.WorkoutTotals.Request(secretsProvider, number);
+
+        Assert.assertEquals(0x17, request.serviceId);
+        Assert.assertEquals(0x08, request.commandId);
+        Assert.assertEquals(expectedTlv, tlvField.get(request));
+        Assert.assertTrue(request.complete);
+        List<byte[]> out = request.serialize();
+        Assert.assertEquals(1, out.size());
+        Assert.assertArrayEquals(expected, out.get(0));
+    }
+
+    @Test
+    public void testWorkoutTotalsResponse() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.ParseException {
+        byte[] raw = new byte[] {(byte) 0x5a, (byte) 0x00, (byte) 0x5a, (byte) 0x00, (byte) 0x17, (byte) 0x08, (byte) 0x7c, (byte) 0x01, (byte) 0x01, (byte) 0x7d, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7e, (byte) 0x40, (byte) 0x0f, (byte) 0xa0, (byte) 0x3a, (byte) 0x90, (byte) 0xae, (byte) 0x8c, (byte) 0xcf, (byte) 0x03, (byte) 0xce, (byte) 0x5a, (byte) 0x68, (byte) 0x87, (byte) 0x05, (byte) 0x51, (byte) 0xf7, (byte) 0x2f, (byte) 0x78, (byte) 0xbd, (byte) 0x84, (byte) 0xf1, (byte) 0x4f, (byte) 0xb8, (byte) 0x51, (byte) 0x28, (byte) 0xec, (byte) 0xfd, (byte) 0x8b, (byte) 0x2e, (byte) 0x99, (byte) 0xd3, (byte) 0x42, (byte) 0xd7, (byte) 0x65, (byte) 0xb2, (byte) 0x82, (byte) 0x02, (byte) 0x28, (byte) 0x00, (byte) 0x34, (byte) 0xbc, (byte) 0x39, (byte) 0x59, (byte) 0x8f, (byte) 0x0b, (byte) 0xa7, (byte) 0x3a, (byte) 0x5c, (byte) 0xfb, (byte) 0xf1, (byte) 0xd4, (byte) 0x8f, (byte) 0xf6, (byte) 0x6d, (byte) 0x98, (byte) 0xd6, (byte) 0x5a, (byte) 0x51, (byte) 0x0a, (byte) 0x4a, (byte) 0x1c, (byte) 0x42, (byte) 0xc8, (byte) 0x9d, (byte) 0xee, (byte) 0x55, (byte) 0x44};
+
+        Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
+        tlvField.setAccessible(true);
+
+        HuaweiTLV expectedTlv = new HuaweiTLV().put(0x81, new HuaweiTLV()
+                .put(0x02, (short) 0x1337)
+                .put(0x03, (byte) 0x01)
+                .put(0x04, 0x01020304)
+                .put(0x05, 0x05060708)
+                .put(0x06, 0x090a0b0c)
+                .put(0x07, 0x0d0e0f10)
+                .put(0x08, 0x11121314)
+                .put(0x09, 0x15161718)
+                .put(0x12, 0x191a1b1c)
+                .put(0x14, (byte) 0x1d)
+        );
+
+        HuaweiPacket packet = new HuaweiPacket(secretsProvider).parse(raw);
+        packet.parseTlv();
+
+        // TODO: find out what the status and type can be
+
+        Assert.assertEquals(0x17, packet.serviceId);
+        Assert.assertEquals(0x08, packet.commandId);
+        Assert.assertEquals(expectedTlv, tlvField.get(packet));
+        Assert.assertTrue(packet.complete);
+        Assert.assertTrue(packet instanceof Workout.WorkoutTotals.Response);
+        Assert.assertArrayEquals(new byte[] {0x02, 0x02, 0x13, 0x37, 0x03, 0x01, 0x01, 0x04, 0x04, 0x01, 0x02, 0x03, 0x04, 0x05, 0x04, 0x05, 0x06, 0x07, 0x08, 0x06, 0x04, 0x09, 0x0a, 0x0b, 0x0c, 0x07, 0x04, 0x0d, 0x0e, 0x0f, 0x10, 0x08, 0x04, 0x11, 0x12, 0x13, 0x14, 0x09, 0x04, 0x15, 0x16, 0x17, 0x18, 0x12, 0x04, 0x19, 0x1a, 0x1b, 0x1c, 0x14, 0x01, 0x1d}, ((Workout.WorkoutTotals.Response) packet).rawData);
+        Assert.assertEquals(0x1337, ((Workout.WorkoutTotals.Response) packet).number);
+        Assert.assertEquals(0x01, ((Workout.WorkoutTotals.Response) packet).status);
+        Assert.assertEquals(0x01020304, ((Workout.WorkoutTotals.Response) packet).startTime);
+        Assert.assertEquals(0x05060708, ((Workout.WorkoutTotals.Response) packet).endTime);
+        Assert.assertEquals(0x090a0b0c, ((Workout.WorkoutTotals.Response) packet).calories);
+        Assert.assertEquals(0x0d0e0f10, ((Workout.WorkoutTotals.Response) packet).distance);
+        Assert.assertEquals(0x11121314, ((Workout.WorkoutTotals.Response) packet).stepCount);
+        Assert.assertEquals(0x15161718, ((Workout.WorkoutTotals.Response) packet).totalTime);
+        Assert.assertEquals(0x191a1b1c, ((Workout.WorkoutTotals.Response) packet).duration);
+        Assert.assertEquals(0x1d, ((Workout.WorkoutTotals.Response) packet).type);
+    }
+
+    @Test
+    public void testWorkoutDataRequest() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.CryptoException {
+        short workoutNumber = 0x0102;
+        short dataNumber = 0x0304;
+
+        Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
+        tlvField.setAccessible(true);
+
+        HuaweiTLV expectedTlv = new HuaweiTLV().put(0x81, new HuaweiTLV()
+                .put(0x02, workoutNumber)
+                .put(0x03, dataNumber)
+        );
+
+        byte[] expected = {(byte) 0x5a, (byte) 0x00, (byte) 0x2a, (byte) 0x00, (byte) 0x17, (byte) 0x0a, (byte) 0x7c, (byte) 0x01, (byte) 0x01, (byte) 0x7d, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7e, (byte) 0x10, (byte) 0xd2, (byte) 0xd7, (byte) 0x55, (byte) 0x23, (byte) 0xeb, (byte) 0x51, (byte) 0x4f, (byte) 0xe0, (byte) 0x35, (byte) 0x6c, (byte) 0x60, (byte) 0xc5, (byte) 0xbf, (byte) 0x61, (byte) 0x68, (byte) 0xd1, (byte) 0x03, (byte) 0x83};
+
+        Workout.WorkoutData.Request request = new Workout.WorkoutData.Request(secretsProvider, workoutNumber, dataNumber);
+
+        Assert.assertEquals(0x17, request.serviceId);
+        Assert.assertEquals(0x0a, request.commandId);
+        Assert.assertEquals(expectedTlv, tlvField.get(request));
+        Assert.assertTrue(request.complete);
+        List<byte[]> out = request.serialize();
+        Assert.assertEquals(1, out.size());
+        Assert.assertArrayEquals(expected, out.get(0));
+    }
+
+    @Test
+    public void testWorkoutDataResponse() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.ParseException {
+        byte[] raw = {(byte) 0x5a, (byte) 0x00, (byte) 0x5a, (byte) 0x00, (byte) 0x17, (byte) 0x0a, (byte) 0x7c, (byte) 0x01, (byte) 0x01, (byte) 0x7d, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7e, (byte) 0x40, (byte) 0x03, (byte) 0x66, (byte) 0xf5, (byte) 0x16, (byte) 0xc9, (byte) 0x60, (byte) 0xb9, (byte) 0xf2, (byte) 0xe3, (byte) 0x88, (byte) 0x99, (byte) 0xab, (byte) 0x50, (byte) 0x22, (byte) 0xcb, (byte) 0x83, (byte) 0x53, (byte) 0xd0, (byte) 0xb2, (byte) 0xc3, (byte) 0x66, (byte) 0xa9, (byte) 0x16, (byte) 0x23, (byte) 0xa5, (byte) 0x8e, (byte) 0x81, (byte) 0x68, (byte) 0x85, (byte) 0x38, (byte) 0x3e, (byte) 0xd5, (byte) 0x8e, (byte) 0x21, (byte) 0xc8, (byte) 0xa1, (byte) 0x80, (byte) 0x98, (byte) 0x2d, (byte) 0x78, (byte) 0x75, (byte) 0x80, (byte) 0xa1, (byte) 0x39, (byte) 0x61, (byte) 0xa6, (byte) 0x3e, (byte) 0x61, (byte) 0x2c, (byte) 0x5e, (byte) 0xe2, (byte) 0x6f, (byte) 0xef, (byte) 0xdf, (byte) 0xdb, (byte) 0x39, (byte) 0x8f, (byte) 0xab, (byte) 0x21, (byte) 0xde, (byte) 0xba, (byte) 0xdb, (byte) 0x2c, (byte) 0xff, (byte) 0x97, (byte) 0x94};
+
+        short workoutNumber = 0x0102;
+        short dataNumber = 0x0304;
+
+        int timestamp = 0x05060708;
+        byte interval = 0x09;
+        short dataCount = 0x0002;
+        byte dataLength = 0x0F; // Data length must match
+        short bitmap = 0x0042; // Inner data and speed
+
+        short speed1 = 0x0a0b;
+        short cadence1 = 0x0c0d;
+        short stepLength1 = 0x0e0f;
+        short groundContactTime1 = 0x1011;
+        byte groundImpact1 = 0x12;
+        short swingAngle1 = 0x1314;
+        byte foreFootLanding1 = 0x15;
+        byte midFootLanding1 = 0x16;
+        byte backFootLanding1 = 0x17;
+        byte eversionAngle1 = 0x18;
+
+        short speed2 = 0x191a;
+        short cadence2 = 0x1b1c;
+        short stepLength2 = 0x1d1e;
+        short groundContactTime2 = 0x1f20;
+        byte groundImpact2 = 0x21;
+        short swingAngle2 = 0x2223;
+        byte foreFootLanding2 = 0x24;
+        byte midFootLanding2 = 0x25;
+        byte backFootLanding2 = 0x26;
+        byte eversionAngle2 = 0x27;
+
+        ByteBuffer headerBuf = ByteBuffer.allocate(14);
+        headerBuf.putShort(workoutNumber);
+        headerBuf.putShort(dataNumber);
+        headerBuf.putInt(timestamp);
+        headerBuf.put(interval);
+        headerBuf.putShort(dataCount);
+        headerBuf.put(dataLength);
+        headerBuf.putShort(bitmap);
+
+        ByteBuffer dataBuf = ByteBuffer.allocate(30);
+
+        dataBuf.putShort(speed1);
+        dataBuf.putShort(cadence1);
+        dataBuf.putShort(stepLength1);
+        dataBuf.putShort(groundContactTime1);
+        dataBuf.put(groundImpact1);
+        dataBuf.putShort(swingAngle1);
+        dataBuf.put(foreFootLanding1);
+        dataBuf.put(midFootLanding1);
+        dataBuf.put(backFootLanding1);
+        dataBuf.put(eversionAngle1);
+
+        dataBuf.putShort(speed2);
+        dataBuf.putShort(cadence2);
+        dataBuf.putShort(stepLength2);
+        dataBuf.putShort(groundContactTime2);
+        dataBuf.put(groundImpact2);
+        dataBuf.putShort(swingAngle2);
+        dataBuf.put(foreFootLanding2);
+        dataBuf.put(midFootLanding2);
+        dataBuf.put(backFootLanding2);
+        dataBuf.put(eversionAngle2);
+
+        Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
+        tlvField.setAccessible(true);
+
+        HuaweiTLV expectedTlv = new HuaweiTLV().put(0x81, new HuaweiTLV()
+                .put(0x02, workoutNumber)
+                .put(0x03, dataNumber)
+                .put(0x04, headerBuf.array())
+                .put(0x05, dataBuf.array())
+        );
+
+        HuaweiPacket packet = new HuaweiPacket(secretsProvider).parse(raw);
+        packet.parseTlv();
+
+        Assert.assertEquals(0x17, packet.serviceId);
+        Assert.assertEquals(0x0a, packet.commandId);
+        Assert.assertEquals(expectedTlv, tlvField.get(packet));
+        Assert.assertTrue(packet.complete);
+        Assert.assertTrue(packet instanceof Workout.WorkoutData.Response);
+
+        Assert.assertEquals(0x0102, ((Workout.WorkoutData.Response) packet).workoutNumber);
+        Assert.assertEquals(0x0304, ((Workout.WorkoutData.Response) packet).dataNumber);
+        Assert.assertArrayEquals(headerBuf.array(), ((Workout.WorkoutData.Response) packet).rawHeader);
+        Assert.assertArrayEquals(dataBuf.array(), ((Workout.WorkoutData.Response) packet).rawData);
+
+        Assert.assertEquals(0x0102, ((Workout.WorkoutData.Response) packet).header.workoutNumber);
+        Assert.assertEquals(0x0304, ((Workout.WorkoutData.Response) packet).header.dataNumber);
+        Assert.assertEquals(0x05060708, ((Workout.WorkoutData.Response) packet).header.timestamp);
+        Assert.assertEquals(0x09, ((Workout.WorkoutData.Response) packet).header.interval);
+        Assert.assertEquals(0x0002, ((Workout.WorkoutData.Response) packet).header.dataCount);
+        Assert.assertEquals(0x0f, ((Workout.WorkoutData.Response) packet).header.dataLength);
+        Assert.assertEquals(0x0042, ((Workout.WorkoutData.Response) packet).header.bitmap);
+
+        Assert.assertEquals(2, ((Workout.WorkoutData.Response) packet).dataList.size());
+
+        Assert.assertNull(((Workout.WorkoutData.Response) packet).dataList.get(0).unknownData);
+        Assert.assertEquals(0x0a0b, ((Workout.WorkoutData.Response) packet).dataList.get(0).speed);
+        Assert.assertEquals(0x0c0d, ((Workout.WorkoutData.Response) packet).dataList.get(0).cadence);
+        Assert.assertEquals(0x0e0f, ((Workout.WorkoutData.Response) packet).dataList.get(0).stepLength);
+        Assert.assertEquals(0x1011, ((Workout.WorkoutData.Response) packet).dataList.get(0).groundContactTime);
+        Assert.assertEquals(0x12, ((Workout.WorkoutData.Response) packet).dataList.get(0).impact);
+        Assert.assertEquals(0x1314, ((Workout.WorkoutData.Response) packet).dataList.get(0).swingAngle);
+        Assert.assertEquals(0x15, ((Workout.WorkoutData.Response) packet).dataList.get(0).foreFootLanding);
+        Assert.assertEquals(0x16, ((Workout.WorkoutData.Response) packet).dataList.get(0).midFootLanding);
+        Assert.assertEquals(0x17, ((Workout.WorkoutData.Response) packet).dataList.get(0).backFootLanding);
+        Assert.assertEquals(0x18, ((Workout.WorkoutData.Response) packet).dataList.get(0).eversionAngle);
+
+        Assert.assertNull(((Workout.WorkoutData.Response) packet).dataList.get(1).unknownData);
+        Assert.assertEquals(0x191a, ((Workout.WorkoutData.Response) packet).dataList.get(1).speed);
+        Assert.assertEquals(0x1b1c, ((Workout.WorkoutData.Response) packet).dataList.get(1).cadence);
+        Assert.assertEquals(0x1d1e, ((Workout.WorkoutData.Response) packet).dataList.get(1).stepLength);
+        Assert.assertEquals(0x1f20, ((Workout.WorkoutData.Response) packet).dataList.get(1).groundContactTime);
+        Assert.assertEquals(0x21, ((Workout.WorkoutData.Response) packet).dataList.get(1).impact);
+        Assert.assertEquals(0x2223, ((Workout.WorkoutData.Response) packet).dataList.get(1).swingAngle);
+        Assert.assertEquals(0x24, ((Workout.WorkoutData.Response) packet).dataList.get(1).foreFootLanding);
+        Assert.assertEquals(0x25, ((Workout.WorkoutData.Response) packet).dataList.get(1).midFootLanding);
+        Assert.assertEquals(0x26, ((Workout.WorkoutData.Response) packet).dataList.get(1).backFootLanding);
+        Assert.assertEquals(0x27, ((Workout.WorkoutData.Response) packet).dataList.get(1).eversionAngle);
+    }
+
+    @Test
+    public void testWorkoutPaceRequest() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.CryptoException {
+        short workoutNumber = 0x0102;
+        short paceNumber = 0x0304;
+
+        Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
+        tlvField.setAccessible(true);
+
+        HuaweiTLV expectedTlv = new HuaweiTLV().put(0x81, new HuaweiTLV()
+                .put(0x02, workoutNumber)
+                .put(0x08, paceNumber)
+        );
+
+        byte[] expected = {(byte) 0x5a, (byte) 0x00, (byte) 0x2a, (byte) 0x00, (byte) 0x17, (byte) 0x0c, (byte) 0x7c, (byte) 0x01, (byte) 0x01, (byte) 0x7d, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7e, (byte) 0x10, (byte) 0x0c, (byte) 0x18, (byte) 0x24, (byte) 0x67, (byte) 0x5e, (byte) 0xe9, (byte) 0x8d, (byte) 0x36, (byte) 0x5f, (byte) 0xde, (byte) 0x1c, (byte) 0x9e, (byte) 0xa0, (byte) 0xd7, (byte) 0x0a, (byte) 0x01, (byte) 0xd3, (byte) 0xce};
+
+        Workout.WorkoutPace.Request request = new Workout.WorkoutPace.Request(secretsProvider, workoutNumber, paceNumber);
+
+        Assert.assertEquals(0x17, request.serviceId);
+        Assert.assertEquals(0x0c, request.commandId);
+        Assert.assertEquals(expectedTlv, tlvField.get(request));
+        Assert.assertTrue(request.complete);
+        List<byte[]> out = request.serialize();
+        Assert.assertEquals(1, out.size());
+        Assert.assertArrayEquals(expected, out.get(0));
+    }
+
+    @Test
+    public void testWorkoutPaceResponse() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.ParseException {
+        byte[] raw = {(byte) 0x5a, (byte) 0x00, (byte) 0x4a, (byte) 0x00, (byte) 0x17, (byte) 0x0c, (byte) 0x7c, (byte) 0x01, (byte) 0x01, (byte) 0x7d, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7e, (byte) 0x30, (byte) 0xe8, (byte) 0xfe, (byte) 0xb9, (byte) 0x27, (byte) 0xa6, (byte) 0xc5, (byte) 0x81, (byte) 0x65, (byte) 0x51, (byte) 0xb8, (byte) 0x24, (byte) 0xfe, (byte) 0x2a, (byte) 0xdc, (byte) 0x3d, (byte) 0x22, (byte) 0xd7, (byte) 0x34, (byte) 0x62, (byte) 0xaf, (byte) 0x06, (byte) 0x5f, (byte) 0xfe, (byte) 0x9c, (byte) 0xe8, (byte) 0xa6, (byte) 0x87, (byte) 0x23, (byte) 0xd6, (byte) 0xc7, (byte) 0x7a, (byte) 0xeb, (byte) 0x07, (byte) 0x06, (byte) 0x5c, (byte) 0x35, (byte) 0xe8, (byte) 0x99, (byte) 0xd3, (byte) 0x96, (byte) 0x0b, (byte) 0x99, (byte) 0x38, (byte) 0x65, (byte) 0x48, (byte) 0xcf, (byte) 0x0f, (byte) 0x99, (byte) 0xe2, (byte) 0x23};
+
+        short workoutNumber = 0x0102;
+        short paceNumber = 0x0304;
+
+        short distance1 = 0x0506;
+        byte type1 = 0x07;
+        int pace1 = 0x08090a0b;
+
+        short distance2 = 0x0c0d;
+        byte type2 = 0x0e;
+        int pace2 = 0x0f101112;
+        short correction = 0x1314;
+
+        Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
+        tlvField.setAccessible(true);
+
+        HuaweiTLV expectedTlv = new HuaweiTLV().put(0x81, new HuaweiTLV()
+                .put(0x02, workoutNumber)
+                .put(0x08, paceNumber)
+                .put(0x83, new HuaweiTLV()
+                        .put(0x04, distance1)
+                        .put(0x05, type1)
+                        .put(0x06, pace1)
+                )
+                .put(0x83, new HuaweiTLV()
+                        .put(0x04, distance2)
+                        .put(0x05, type2)
+                        .put(0x06, pace2)
+                        .put(0x09, correction)
+                )
+        );
+
+        HuaweiPacket packet = new HuaweiPacket(secretsProvider).parse(raw);
+        packet.parseTlv();
+
+        Assert.assertEquals(0x17, packet.serviceId);
+        Assert.assertEquals(0x0c, packet.commandId);
+        Assert.assertEquals(expectedTlv, tlvField.get(packet));
+        Assert.assertTrue(packet.complete);
+        Assert.assertTrue(packet instanceof Workout.WorkoutPace.Response);
+        Assert.assertEquals(0x0102, ((Workout.WorkoutPace.Response) packet).workoutNumber);
+        Assert.assertEquals(0x0304, ((Workout.WorkoutPace.Response) packet).paceNumber);
+        Assert.assertEquals(2, ((Workout.WorkoutPace.Response) packet).blocks.size());
+
+        Assert.assertEquals(0x0506, ((Workout.WorkoutPace.Response) packet).blocks.get(0).distance);
+        Assert.assertEquals(0x07, ((Workout.WorkoutPace.Response) packet).blocks.get(0).type);
+        Assert.assertEquals(0x08090a0b, ((Workout.WorkoutPace.Response) packet).blocks.get(0).pace);
+        Assert.assertEquals(0, ((Workout.WorkoutPace.Response) packet).blocks.get(0).correction);
+
+        Assert.assertEquals(0x0c0d, ((Workout.WorkoutPace.Response) packet).blocks.get(1).distance);
+        Assert.assertEquals(0x0e, ((Workout.WorkoutPace.Response) packet).blocks.get(1).type);
+        Assert.assertEquals(0x0f101112, ((Workout.WorkoutPace.Response) packet).blocks.get(1).pace);
+        Assert.assertEquals(0x1314, ((Workout.WorkoutPace.Response) packet).blocks.get(1).correction);
+    }
+}
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/TestDebugRequestParser.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/TestDebugRequestParser.java
new file mode 100644
index 000000000..b93a546b7
--- /dev/null
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/TestDebugRequestParser.java
@@ -0,0 +1,396 @@
+/*  Copyright (C) 2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei;
+
+import android.bluetooth.BluetoothGattCharacteristic;
+import android.content.Context;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.UUID;
+
+import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEvent;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiTLV;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.Workout;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.service.btbr.Transaction;
+import nodomain.freeyourgadget.gadgetbridge.service.btbr.TransactionBuilder;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.DebugRequest;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.Request;
+
+public class TestDebugRequestParser {
+
+    HuaweiSupportProvider supportProvider = new HuaweiSupportProvider(new HuaweiLESupport()) {
+
+        @Override
+        public boolean isBLE() {
+            return true;
+        }
+
+        @Override
+        public Context getContext() {
+            return null;
+        }
+
+        @Override
+        public GBDevice getDevice() {
+            return null;
+        }
+
+        @Override
+        public byte[] getSerial() {
+            return new byte[0];
+        }
+
+        @Override
+        public String getDeviceMac() {
+            return null;
+        }
+
+        @Override
+        public byte[] getMacAddress() {
+            return new byte[0];
+        }
+
+        @Override
+        public byte[] getAndroidId() {
+            return new byte[0];
+        }
+
+        @Override
+        public short getNotificationId() {
+            return 0;
+        }
+
+        @Override
+        public TransactionBuilder createBrTransactionBuilder(String taskName) {
+            return null;
+        }
+
+        @Override
+        public nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder createLeTransactionBuilder(String taskName) {
+            return null;
+        }
+
+        @Override
+        public void performConnected(Transaction transaction) throws IOException {
+
+        }
+
+        @Override
+        public void performConnected(nodomain.freeyourgadget.gadgetbridge.service.btle.Transaction transaction) throws IOException {
+
+        }
+
+        @Override
+        public void evaluateGBDeviceEvent(GBDeviceEvent deviceEvent) {
+
+        }
+
+        @Override
+        public BluetoothGattCharacteristic getLeCharacteristic(UUID uuid) {
+            return null;
+        }
+
+        @Override
+        public HuaweiPacket.ParamsProvider getParamsProvider() {
+            return null;
+        }
+
+        @Override
+        public void addInProgressRequest(Request request) {
+
+        }
+
+        @Override
+        public void removeInProgressRequests(Request request) {
+
+        }
+
+        @Override
+        public void setSecretKey(byte[] authKey) {
+
+        }
+
+        @Override
+        public byte[] getSecretKey() {
+            return new byte[0];
+        }
+
+        @Override
+        public void addTotalFitnessData(int steps, int calories, int distance) {
+
+        }
+
+        @Override
+        public void addSleepActivity(int timestamp, short duration, byte type) {
+
+        }
+
+        @Override
+        public void addStepData(int timestamp, short steps, short calories, short distance, byte spo, byte heartrate) {
+
+        }
+
+        @Override
+        public Long addWorkoutTotalsData(Workout.WorkoutTotals.Response packet) {
+            return null;
+        }
+
+        @Override
+        public void addWorkoutSampleData(Long workoutId, List<Workout.WorkoutData.Response.Data> dataList) {
+
+        }
+
+        @Override
+        public void addWorkoutPaceData(Long workoutId, List<Workout.WorkoutPace.Response.Block> paceList) {
+
+        }
+
+        @Override
+        public void sendSetMusic() {
+
+        }
+    };
+
+    @Test
+    public void emptyPacket() throws Request.RequestCreationException {
+        DebugRequest debugRequest = new DebugRequest(supportProvider);
+
+        HuaweiPacket expected = new HuaweiPacket(supportProvider.getParamsProvider());
+        expected.serviceId = 1;
+        expected.commandId = 1;
+        expected.setEncryption(false);
+        expected.complete = true;
+
+        HuaweiPacket packet = debugRequest.parseDebugString("1,1,false");
+
+        Assert.assertEquals(expected, packet);
+    }
+
+    @Test
+    public void emptyTag() throws Request.RequestCreationException {
+        DebugRequest debugRequest = new DebugRequest(supportProvider);
+
+        HuaweiPacket expected = new HuaweiPacket(supportProvider.getParamsProvider());
+        expected.serviceId = 1;
+        expected.commandId = 1;
+        expected.setEncryption(false);
+        expected.setTlv(new HuaweiTLV().put(1));
+        expected.complete = true;
+
+        HuaweiPacket packet = debugRequest.parseDebugString("1,1,false,(1,/)");
+
+        Assert.assertEquals(expected, packet);
+    }
+
+    @Test
+    public void byteTag() throws Request.RequestCreationException {
+        DebugRequest debugRequest = new DebugRequest(supportProvider);
+
+        HuaweiPacket expected = new HuaweiPacket(supportProvider.getParamsProvider());
+        expected.serviceId = 1;
+        expected.commandId = 1;
+        expected.setEncryption(false);
+        expected.setTlv(new HuaweiTLV().put(1, (byte) 1));
+        expected.complete = true;
+
+        HuaweiPacket packet = debugRequest.parseDebugString("1,1,false,(1,B1)");
+
+        Assert.assertEquals(expected, packet);
+    }
+
+    @Test
+    public void shortTag() throws Request.RequestCreationException {
+        DebugRequest debugRequest = new DebugRequest(supportProvider);
+
+        HuaweiPacket expected = new HuaweiPacket(supportProvider.getParamsProvider());
+        expected.serviceId = 1;
+        expected.commandId = 1;
+        expected.setEncryption(false);
+        expected.setTlv(new HuaweiTLV().put(1, (short) 1));
+        expected.complete = true;
+
+        HuaweiPacket packet = debugRequest.parseDebugString("1,1,false,(1,S1)");
+
+        Assert.assertEquals(expected, packet);
+    }
+
+    @Test
+    public void integerTag() throws Request.RequestCreationException {
+        DebugRequest debugRequest = new DebugRequest(supportProvider);
+
+        HuaweiPacket expected = new HuaweiPacket(supportProvider.getParamsProvider());
+        expected.serviceId = 1;
+        expected.commandId = 1;
+        expected.setEncryption(false);
+        expected.setTlv(new HuaweiTLV().put(1, (int) 1));
+        expected.complete = true;
+
+        HuaweiPacket packet = debugRequest.parseDebugString("1,1,false,(1,I1)");
+
+        Assert.assertEquals(expected, packet);
+    }
+
+    @Test
+    public void booleanTag() throws Request.RequestCreationException {
+        DebugRequest debugRequest = new DebugRequest(supportProvider);
+
+        HuaweiPacket expected = new HuaweiPacket(supportProvider.getParamsProvider());
+        expected.serviceId = 1;
+        expected.commandId = 1;
+        expected.setEncryption(false);
+        expected.setTlv(new HuaweiTLV().put(1, true));
+        expected.complete = true;
+
+        HuaweiPacket packet = debugRequest.parseDebugString("1,1,false,(1,b1)");
+
+        Assert.assertEquals(expected, packet);
+    }
+
+    @Test
+    public void arrayTag() throws Request.RequestCreationException {
+        DebugRequest debugRequest = new DebugRequest(supportProvider);
+
+        HuaweiPacket expected = new HuaweiPacket(supportProvider.getParamsProvider());
+        expected.serviceId = 1;
+        expected.commandId = 1;
+        expected.setEncryption(false);
+        expected.setTlv(new HuaweiTLV().put(1, new byte[] {(byte) 0xCA, (byte) 0xFE}));
+        expected.complete = true;
+
+        HuaweiPacket packet = debugRequest.parseDebugString("1,1,false,(1,aCAFE)");
+
+        Assert.assertEquals(expected, packet);
+    }
+
+    @Test
+    public void stringTag() throws Request.RequestCreationException {
+        DebugRequest debugRequest = new DebugRequest(supportProvider);
+
+        HuaweiPacket expected = new HuaweiPacket(supportProvider.getParamsProvider());
+        expected.serviceId = 1;
+        expected.commandId = 1;
+        expected.setEncryption(false);
+        expected.setTlv(new HuaweiTLV().put(1, new byte[] {0x79, 0x65, 0x73}));
+        expected.complete = true;
+
+        HuaweiPacket packet = debugRequest.parseDebugString("1,1,false,(1,-yes)");
+
+        Assert.assertEquals(expected, packet);
+    }
+
+    @Test
+    public void hexValues() throws Request.RequestCreationException {
+        DebugRequest debugRequest = new DebugRequest(supportProvider);
+
+        HuaweiPacket expected = new HuaweiPacket(supportProvider.getParamsProvider());
+        expected.serviceId = 1;
+        expected.commandId = 1;
+        expected.setEncryption(false);
+        expected.setTlv(new HuaweiTLV().put(1, new byte[] {0x79, 0x65, 0x73}));
+        expected.complete = true;
+
+        HuaweiPacket packet = debugRequest.parseDebugString("0x01,0x1,false,(0x01,-yes)");
+
+        Assert.assertEquals(expected, packet);
+    }
+
+    @Test
+    public void largeServiceCommand() throws Request.RequestCreationException {
+        DebugRequest debugRequest = new DebugRequest(supportProvider);
+
+        HuaweiPacket expected = new HuaweiPacket(supportProvider.getParamsProvider());
+        expected.serviceId = (byte) 0xff;
+        expected.commandId = (byte) 255;
+        expected.setEncryption(false);
+        expected.complete = true;
+
+        HuaweiPacket packet = debugRequest.parseDebugString("0xff,255,false");
+
+        Assert.assertEquals(expected, packet);
+    }
+
+    @Test
+    public void subTlv() throws Request.RequestCreationException {
+        DebugRequest debugRequest = new DebugRequest(supportProvider);
+
+        HuaweiPacket expected = new HuaweiPacket(supportProvider.getParamsProvider());
+        expected.serviceId = 1;
+        expected.commandId = 1;
+        expected.setEncryption(false);
+        expected.setTlv(new HuaweiTLV()
+                .put(129, new HuaweiTLV()
+                        .put(1)
+                        .put(2)
+                ));
+        expected.complete = true;
+
+        HuaweiPacket packet = debugRequest.parseDebugString("1,1,false,(129,(1,/),(2,/))");
+
+        Assert.assertEquals(expected, packet);
+    }
+
+    @Test
+    public void subSubSubTlv() throws Request.RequestCreationException {
+        DebugRequest debugRequest = new DebugRequest(supportProvider);
+
+        HuaweiPacket expected = new HuaweiPacket(supportProvider.getParamsProvider());
+        expected.serviceId = 1;
+        expected.commandId = 1;
+        expected.setEncryption(false);
+        expected.setTlv(new HuaweiTLV()
+                .put(129, new HuaweiTLV()
+                        .put(129, new HuaweiTLV()
+                                .put(129, new HuaweiTLV()
+                                        .put(1)
+                                )
+                        )
+                ));
+        expected.complete = true;
+
+        HuaweiPacket packet = debugRequest.parseDebugString("1,1,false,(129,(129,(129,(1,/))))");
+
+        Assert.assertEquals(expected, packet);
+    }
+
+    @Test
+    public void subTlvVCombined() throws Request.RequestCreationException {
+        DebugRequest debugRequest = new DebugRequest(supportProvider);
+
+        HuaweiPacket expected = new HuaweiPacket(supportProvider.getParamsProvider());
+        expected.serviceId = 1;
+        expected.commandId = 1;
+        expected.setEncryption(false);
+        expected.setTlv(new HuaweiTLV()
+                .put(129, new HuaweiTLV()
+                        .put(1)
+                        .put(2, true)
+                )
+                .put(1, true)
+        );
+        expected.complete = true;
+
+        HuaweiPacket packet = debugRequest.parseDebugString("1,1,false,(129,(1,/),(2,b1)),(1,b1)");
+
+        Assert.assertEquals(expected, packet);
+    }
+}
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/TestResponseManager.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/TestResponseManager.java
new file mode 100644
index 000000000..f5d3982de
--- /dev/null
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/TestResponseManager.java
@@ -0,0 +1,449 @@
+/*  Copyright (C) 2022-2023 MartinJM
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.bluetooth.BluetoothGattCharacteristic;
+import android.content.Context;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.UUID;
+
+import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEvent;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.Workout;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.service.btbr.Transaction;
+import nodomain.freeyourgadget.gadgetbridge.service.btbr.TransactionBuilder;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests.Request;
+
+@RunWith(MockitoJUnitRunner.class)
+public class TestResponseManager {
+
+    HuaweiSupportProvider supportProvider = new HuaweiSupportProvider(new HuaweiLESupport()) {
+
+        @Override
+        public boolean isBLE() {
+            return true;
+        }
+
+        @Override
+        public Context getContext() {
+            return null;
+        }
+
+        @Override
+        public GBDevice getDevice() {
+            return null;
+        }
+
+        @Override
+        public byte[] getSerial() {
+            return new byte[0];
+        }
+
+        @Override
+        public String getDeviceMac() {
+            return null;
+        }
+
+        @Override
+        public byte[] getMacAddress() {
+            return new byte[0];
+        }
+
+        @Override
+        public byte[] getAndroidId() {
+            return new byte[0];
+        }
+
+        @Override
+        public short getNotificationId() {
+            return 0;
+        }
+
+        @Override
+        public TransactionBuilder createBrTransactionBuilder(String taskName) {
+            return null;
+        }
+
+        @Override
+        public nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder createLeTransactionBuilder(String taskName) {
+            return null;
+        }
+
+        @Override
+        public void performConnected(Transaction transaction) throws IOException {
+
+        }
+
+        @Override
+        public void performConnected(nodomain.freeyourgadget.gadgetbridge.service.btle.Transaction transaction) throws IOException {
+
+        }
+
+        @Override
+        public void evaluateGBDeviceEvent(GBDeviceEvent deviceEvent) {
+
+        }
+
+        @Override
+        public BluetoothGattCharacteristic getLeCharacteristic(UUID uuid) {
+            return null;
+        }
+
+        @Override
+        public HuaweiPacket.ParamsProvider getParamsProvider() {
+            return null;
+        }
+
+        @Override
+        public void addInProgressRequest(Request request) {
+
+        }
+
+        @Override
+        public void removeInProgressRequests(Request request) {
+
+        }
+
+        @Override
+        public void setSecretKey(byte[] authKey) {
+
+        }
+
+        @Override
+        public byte[] getSecretKey() {
+            return new byte[0];
+        }
+
+        @Override
+        public void addTotalFitnessData(int steps, int calories, int distance) {
+
+        }
+
+        @Override
+        public void addSleepActivity(int timestamp, short duration, byte type) {
+
+        }
+
+        @Override
+        public void addStepData(int timestamp, short steps, short calories, short distance, byte spo, byte heartrate) {
+
+        }
+
+        @Override
+        public Long addWorkoutTotalsData(Workout.WorkoutTotals.Response packet) {
+            return null;
+        }
+
+        @Override
+        public void addWorkoutSampleData(Long workoutId, List<Workout.WorkoutData.Response.Data> dataList) {
+
+        }
+
+        @Override
+        public void addWorkoutPaceData(Long workoutId, List<Workout.WorkoutPace.Response.Block> paceList) {
+
+        }
+
+        @Override
+        public void sendSetMusic() {
+
+        }
+    };
+
+    Field handlersField;
+    Field receivedPacketField;
+    Field asynchronousResponseField;
+
+    @Before
+    public void beforeClass() throws NoSuchFieldException {
+        handlersField = ResponseManager.class.getDeclaredField("handlers");
+        handlersField.setAccessible(true);
+
+        asynchronousResponseField = ResponseManager.class.getDeclaredField("asynchronousResponse");
+        asynchronousResponseField.setAccessible(true);
+
+        receivedPacketField = ResponseManager.class.getDeclaredField("receivedPacket");
+        receivedPacketField.setAccessible(true);
+    }
+
+    @Test
+    public void testAddHandler() throws IllegalAccessException {
+        Request input = new Request(supportProvider);
+
+        List<Request> expectedHandlers = Collections.synchronizedList(new ArrayList<Request>());
+        expectedHandlers.add(input);
+
+        ResponseManager responseManager = new ResponseManager(supportProvider);
+        responseManager.addHandler(input);
+
+        Assert.assertEquals(expectedHandlers, handlersField.get(responseManager));
+    }
+
+    @Test
+    public void testRemoveHandler() throws IllegalAccessException {
+        Request input = new Request(supportProvider);
+        Request extra = new Request(supportProvider);
+
+        List<Request> inputHandlers = Collections.synchronizedList(new ArrayList<Request>());
+        inputHandlers.add(extra);
+        inputHandlers.add(input);
+        inputHandlers.add(extra);
+
+        List<Request> expectedHandlers = Collections.synchronizedList(new ArrayList<Request>());
+        expectedHandlers.add(extra);
+        expectedHandlers.add(extra);
+
+        ResponseManager responseManager = new ResponseManager(supportProvider);
+        handlersField.set(responseManager, inputHandlers);
+
+        responseManager.removeHandler(input);
+
+        Assert.assertEquals(expectedHandlers, handlersField.get(responseManager));
+    }
+
+    @Test
+    public void testHandleDataCompletePacketSynchronous() throws Exception {
+        // Note that this is not a proper packet, but that doesn't matter as we're not testing
+        // the packet parsing.
+        byte[] input = {0x01, 0x02, 0x03, 0x04};
+
+        AsynchronousResponse mockAsynchronousResponse = Mockito.mock(AsynchronousResponse.class);
+
+        HuaweiPacket mockHuaweiPacket = Mockito.mock(HuaweiPacket.class);
+        mockHuaweiPacket.complete = true;
+        when(mockHuaweiPacket.parse((byte[]) any()))
+                .thenReturn(mockHuaweiPacket);
+
+        Request request1 = Mockito.mock(Request.class);
+        when(request1.handleResponse((HuaweiPacket) any()))
+                .thenReturn(true);
+        Request request2 = Mockito.mock(Request.class);
+        when(request2.handleResponse((HuaweiPacket) any()))
+                .thenReturn(false);
+
+        List<Request> inputHandlers = Collections.synchronizedList(new ArrayList<Request>());
+        inputHandlers.add(request1);
+        inputHandlers.add(request2);
+
+        List<Request> expectedHandlers = Collections.synchronizedList(new ArrayList<Request>());
+        expectedHandlers.add(request2);
+
+        ResponseManager responseManager = new ResponseManager(supportProvider);
+        handlersField.set(responseManager, inputHandlers);
+        receivedPacketField.set(responseManager, mockHuaweiPacket);
+        asynchronousResponseField.set(responseManager, mockAsynchronousResponse);
+
+        responseManager.handleData(input);
+
+        Assert.assertEquals(expectedHandlers, handlersField.get(responseManager));
+        Assert.assertNull(receivedPacketField.get(responseManager));
+
+        verify(mockHuaweiPacket, times(1)).parse(input);
+        verify(mockAsynchronousResponse, times(0)).handleResponse((HuaweiPacket) any());
+        verify(request1, times(1)).handleResponse(mockHuaweiPacket);
+        verify(request1, times(1)).handleResponse();
+        verify(request2, times(0)).handleResponse((HuaweiPacket) any());
+        verify(request2, times(0)).handleResponse();
+    }
+
+    @Test
+    public void testHandleDataCompletePacketAsynchronous() throws Exception {
+        // Note that this is not a proper packet, but that doesn't matter as we're not testing
+        // the packet parsing.
+        byte[] input = {0x01, 0x02, 0x03, 0x04};
+
+        AsynchronousResponse mockAsynchronousResponse = Mockito.mock(AsynchronousResponse.class);
+
+        HuaweiPacket mockHuaweiPacket = Mockito.mock(HuaweiPacket.class);
+        mockHuaweiPacket.complete = true;
+        when(mockHuaweiPacket.parse((byte[]) any()))
+                .thenReturn(mockHuaweiPacket);
+
+        Request request1 = Mockito.mock(Request.class);
+        when(request1.handleResponse((HuaweiPacket) any()))
+                .thenReturn(false);
+        Request request2 = Mockito.mock(Request.class);
+        when(request2.handleResponse((HuaweiPacket) any()))
+                .thenReturn(false);
+
+        List<Request> inputHandlers = Collections.synchronizedList(new ArrayList<Request>());
+        inputHandlers.add(request1);
+        inputHandlers.add(request2);
+
+        List<Request> expectedHandlers = Collections.synchronizedList(new ArrayList<Request>());
+        expectedHandlers.add(request1);
+        expectedHandlers.add(request2);
+
+        ResponseManager responseManager = new ResponseManager(supportProvider);
+        handlersField.set(responseManager, inputHandlers);
+        receivedPacketField.set(responseManager, mockHuaweiPacket);
+        asynchronousResponseField.set(responseManager, mockAsynchronousResponse);
+
+        responseManager.handleData(input);
+
+        Assert.assertEquals(expectedHandlers, handlersField.get(responseManager));
+        Assert.assertNull(receivedPacketField.get(responseManager));
+
+        verify(mockHuaweiPacket, times(1)).parse(input);
+        verify(mockAsynchronousResponse, times(1)).handleResponse(mockHuaweiPacket);
+        verify(request1, times(1)).handleResponse(mockHuaweiPacket);
+        verify(request1, times(0)).handleResponse();
+        verify(request2, times(1)).handleResponse(mockHuaweiPacket);
+        verify(request2, times(0)).handleResponse();
+    }
+
+    @Test
+    public void testHandleDataTwoPartialPacketsSynchronous() throws Exception {
+        // Note that this is not a proper packet, but that doesn't matter as we're not testing
+        // the packet parsing.
+        byte[] input1 = {0x01, 0x02, 0x03, 0x04};
+        byte[] input2 = {0x05, 0x06, 0x07, 0x08};
+
+        AsynchronousResponse mockAsynchronousResponse = Mockito.mock(AsynchronousResponse.class);
+
+        HuaweiPacket mockHuaweiPacket = Mockito.mock(HuaweiPacket.class);
+        mockHuaweiPacket.complete = false;
+        when(mockHuaweiPacket.parse((byte[]) any()))
+                .thenReturn(mockHuaweiPacket);
+
+        Request request1 = Mockito.mock(Request.class);
+        when(request1.handleResponse((HuaweiPacket) any()))
+                .thenReturn(true);
+        Request request2 = Mockito.mock(Request.class);
+        when(request2.handleResponse((HuaweiPacket) any()))
+                .thenReturn(false);
+
+        List<Request> inputHandlers = Collections.synchronizedList(new ArrayList<Request>());
+        inputHandlers.add(request1);
+        inputHandlers.add(request2);
+
+        List<Request> expectedHandlers1 = Collections.synchronizedList(new ArrayList<Request>());
+        expectedHandlers1.add(request1);
+        expectedHandlers1.add(request2);
+
+        List<Request> expectedHandlers2 = Collections.synchronizedList(new ArrayList<Request>());
+        expectedHandlers2.add(request2);
+
+        ResponseManager responseManager = new ResponseManager(supportProvider);
+        handlersField.set(responseManager, inputHandlers);
+        receivedPacketField.set(responseManager, mockHuaweiPacket);
+        asynchronousResponseField.set(responseManager, mockAsynchronousResponse);
+
+        responseManager.handleData(input1);
+
+        Assert.assertEquals(expectedHandlers1, handlersField.get(responseManager));
+        Assert.assertEquals(mockHuaweiPacket, receivedPacketField.get(responseManager));
+
+        verify(mockHuaweiPacket, times(1)).parse(input1);
+        verify(mockAsynchronousResponse, times(0)).handleResponse((HuaweiPacket) any());
+        verify(request1, times(0)).handleResponse(mockHuaweiPacket);
+        verify(request1, times(0)).handleResponse();
+        verify(request2, times(0)).handleResponse((HuaweiPacket) any());
+        verify(request2, times(0)).handleResponse();
+
+        mockHuaweiPacket.complete = true;
+        responseManager.handleData(input2);
+
+        Assert.assertEquals(expectedHandlers2, handlersField.get(responseManager));
+        Assert.assertNull(receivedPacketField.get(responseManager));
+
+        verify(mockHuaweiPacket, times(1)).parse(input2);
+        verify(mockAsynchronousResponse, times(0)).handleResponse((HuaweiPacket) any());
+        verify(request1, times(1)).handleResponse(mockHuaweiPacket);
+        verify(request1, times(1)).handleResponse();
+        verify(request2, times(0)).handleResponse((HuaweiPacket) any());
+        verify(request2, times(0)).handleResponse();
+    }
+
+    @Test
+    public void testHandleDataTwoPartialPacketsAsynchronous() throws Exception {
+        // Note that this is not a proper packet, but that doesn't matter as we're not testing
+        // the packet parsing.
+        byte[] input1 = {0x01, 0x02, 0x03, 0x04};
+        byte[] input2 = {0x05, 0x06, 0x07, 0x08};
+
+        AsynchronousResponse mockAsynchronousResponse = Mockito.mock(AsynchronousResponse.class);
+
+        HuaweiPacket mockHuaweiPacket = Mockito.mock(HuaweiPacket.class);
+        mockHuaweiPacket.complete = false;
+        when(mockHuaweiPacket.parse((byte[]) any()))
+                .thenReturn(mockHuaweiPacket);
+
+        Request request1 = Mockito.mock(Request.class);
+        when(request1.handleResponse((HuaweiPacket) any()))
+                .thenReturn(false);
+        Request request2 = Mockito.mock(Request.class);
+        when(request2.handleResponse((HuaweiPacket) any()))
+                .thenReturn(false);
+
+        List<Request> inputHandlers = Collections.synchronizedList(new ArrayList<Request>());
+        inputHandlers.add(request1);
+        inputHandlers.add(request2);
+
+        List<Request> expectedHandlers = Collections.synchronizedList(new ArrayList<Request>());
+        expectedHandlers.add(request1);
+        expectedHandlers.add(request2);
+
+        ResponseManager responseManager = new ResponseManager(supportProvider);
+        handlersField.set(responseManager, inputHandlers);
+        receivedPacketField.set(responseManager, mockHuaweiPacket);
+        asynchronousResponseField.set(responseManager, mockAsynchronousResponse);
+
+        responseManager.handleData(input1);
+
+        Assert.assertEquals(expectedHandlers, handlersField.get(responseManager));
+        Assert.assertEquals(mockHuaweiPacket, receivedPacketField.get(responseManager));
+
+        verify(mockHuaweiPacket, times(1)).parse(input1);
+        verify(mockAsynchronousResponse, times(0)).handleResponse((HuaweiPacket) any());
+        verify(request1, times(0)).handleResponse(mockHuaweiPacket);
+        verify(request1, times(0)).handleResponse();
+        verify(request2, times(0)).handleResponse((HuaweiPacket) any());
+        verify(request2, times(0)).handleResponse();
+
+        mockHuaweiPacket.complete = true;
+        responseManager.handleData(input2);
+
+        Assert.assertEquals(expectedHandlers, handlersField.get(responseManager));
+        Assert.assertNull(receivedPacketField.get(responseManager));
+
+        verify(mockHuaweiPacket, times(1)).parse(input2);
+        verify(mockAsynchronousResponse, times(1)).handleResponse((HuaweiPacket) any());
+        verify(request1, times(1)).handleResponse(mockHuaweiPacket);
+        verify(request1, times(0)).handleResponse();
+        verify(request2, times(1)).handleResponse((HuaweiPacket) any());
+        verify(request2, times(0)).handleResponse();
+    }
+}

From 705361ae3a9d9613d969c82dab8853ade2d6b78b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Mon, 8 Jan 2024 13:43:26 +0000
Subject: [PATCH 304/595] Huawei: Fix linter

Math.multiplyExact is only available on SDK24 onward. We do not expect
an overflow to occur here, since the hashLength is fixed and the outputLength
is small (32 on all current calls).
---
 .../nodomain/freeyourgadget/gadgetbridge/util/CryptoUtils.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/CryptoUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/CryptoUtils.java
index 71bd155c8..e5db22666 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/CryptoUtils.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/CryptoUtils.java
@@ -94,7 +94,7 @@ public class CryptoUtils {
         int n = (outputLength % hashLen == 0) ? outputLength / hashLen : (outputLength / hashLen) + 1;
         byte[] hashRound = new byte[0];
 
-        ByteBuffer generatedBytes = ByteBuffer.allocate(Math.multiplyExact(n, hashLen));
+        ByteBuffer generatedBytes = ByteBuffer.allocate(n * hashLen);
         Mac mac = Mac.getInstance("HmacSHA256");
         mac.init(pseudoSecretKey);
         for (int roundNum = 1; roundNum <= n; roundNum++) {

From 904a7807a8e1e45271713b2c45c5a246626e66e7 Mon Sep 17 00:00:00 2001
From: Davis Mosenkovs <davikovs@gmail.com>
Date: Sun, 1 Oct 2023 23:54:45 +0300
Subject: [PATCH 305/595] Automatically connect to all devices

Automatically connect to all devices instead of connecting only to the
last connected device.
---
 .../service/DeviceCommunicationService.java   | 110 ++++++++++--------
 app/src/main/res/values/strings.xml           |   2 +-
 2 files changed, 61 insertions(+), 51 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
index 058f9cb7d..0faa04e6e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
@@ -476,66 +476,76 @@ public class DeviceCommunicationService extends Service implements SharedPrefere
                 break;
             case ACTION_CONNECT:
                 start(); // ensure started
-                GBDevice gbDevice = intent.getParcelableExtra(GBDevice.EXTRA_DEVICE);
-                String btDeviceAddress = null;
-                if (gbDevice == null) {
-                    if (prefs != null) { // may be null in test cases
-                        btDeviceAddress = prefs.getString("last_device_address", null);
-                        if (btDeviceAddress != null) {
-                            gbDevice = DeviceHelper.getInstance().findAvailableDevice(btDeviceAddress, this);
-                        }
-                    }
+                List<GBDevice> gbDevs = null;
+                boolean fromExtra = false;
+
+                GBDevice extraDevice = intent.getParcelableExtra(GBDevice.EXTRA_DEVICE);
+                if (extraDevice != null) {
+                    gbDevs = new ArrayList<>();
+                    gbDevs.add(extraDevice);
+                    fromExtra = true;
                 } else {
-                    btDeviceAddress = gbDevice.getAddress();
+                    gbDevs = GBApplication.app().getDeviceManager().getDevices();
                 }
 
-                if(gbDevice == null){
+                if(gbDevs == null || gbDevs.size() == 0) {
                     return START_NOT_STICKY;
                 }
 
-                boolean autoReconnect = GBPrefs.AUTO_RECONNECT_DEFAULT;
-                if (prefs != null && prefs.getPreferences() != null) {
-                    prefs.getPreferences().edit().putString("last_device_address", btDeviceAddress).apply();
-                    autoReconnect = getGBPrefs().getAutoReconnect(gbDevice);
-                }
+                for(GBDevice gbDevice : gbDevs) {
+                    String btDeviceAddress = gbDevice.getAddress();
 
-                DeviceStruct registeredStruct = getDeviceStructOrNull(gbDevice);
-                if(registeredStruct != null){
-                    boolean deviceAlreadyConnected = isDeviceConnecting(registeredStruct.getDevice()) || isDeviceConnected(registeredStruct.getDevice());
-                    if(deviceAlreadyConnected){
-                        break;
-                    }
-                    try {
-                        removeDeviceSupport(gbDevice);
-                    } catch (DeviceNotFoundException e) {
-                        e.printStackTrace();
-                    }
-                }else{
-                    registeredStruct = new DeviceStruct();
-                    registeredStruct.setDevice(gbDevice);
-                    registeredStruct.setCoordinator(gbDevice.getDeviceCoordinator());
-                    deviceStructs.add(registeredStruct);
-                }
-
-                try {
-                    DeviceSupport deviceSupport = mFactory.createDeviceSupport(gbDevice);
-                    if (deviceSupport != null) {
-                        setDeviceSupport(gbDevice, deviceSupport);
-                        if (firstTime) {
-                            deviceSupport.connectFirstTime();
-                        } else {
-                            deviceSupport.setAutoReconnect(autoReconnect);
-                            deviceSupport.connect();
+                    boolean autoReconnect = GBPrefs.AUTO_RECONNECT_DEFAULT;
+                    if (prefs != null && prefs.getPreferences() != null) {
+                        autoReconnect = getGBPrefs().getAutoReconnect(gbDevice);
+                        if(!fromExtra && !autoReconnect) {
+                            continue;
                         }
-                    } else {
-                        GB.toast(this, getString(R.string.cannot_connect, "Can't create device support"), Toast.LENGTH_SHORT, GB.ERROR);
+                        prefs.getPreferences().edit().putString("last_device_address", btDeviceAddress).apply();
                     }
-                } catch (Exception e) {
-                    GB.toast(this, getString(R.string.cannot_connect, e.getMessage()), Toast.LENGTH_SHORT, GB.ERROR, e);
-                }
 
-                for(DeviceStruct struct2 : deviceStructs){
-                    struct2.getDevice().sendDeviceUpdateIntent(this);
+                    if(!fromExtra && !autoReconnect) {
+                        continue;
+                    }
+
+                    DeviceStruct registeredStruct = getDeviceStructOrNull(gbDevice);
+                    if(registeredStruct != null){
+                        boolean deviceAlreadyConnected = isDeviceConnecting(registeredStruct.getDevice()) || isDeviceConnected(registeredStruct.getDevice());
+                        if(deviceAlreadyConnected){
+                            break;
+                        }
+                        try {
+                            removeDeviceSupport(gbDevice);
+                        } catch (DeviceNotFoundException e) {
+                            e.printStackTrace();
+                        }
+                    }else{
+                        registeredStruct = new DeviceStruct();
+                        registeredStruct.setDevice(gbDevice);
+                        registeredStruct.setCoordinator(gbDevice.getDeviceCoordinator());
+                        deviceStructs.add(registeredStruct);
+                    }
+
+                    try {
+                        DeviceSupport deviceSupport = mFactory.createDeviceSupport(gbDevice);
+                        if (deviceSupport != null) {
+                            setDeviceSupport(gbDevice, deviceSupport);
+                            if (firstTime) {
+                                deviceSupport.connectFirstTime();
+                            } else {
+                                deviceSupport.setAutoReconnect(autoReconnect);
+                                deviceSupport.connect();
+                            }
+                        } else {
+                            GB.toast(this, getString(R.string.cannot_connect, "Can't create device support"), Toast.LENGTH_SHORT, GB.ERROR);
+                        }
+                    } catch (Exception e) {
+                        GB.toast(this, getString(R.string.cannot_connect, e.getMessage()), Toast.LENGTH_SHORT, GB.ERROR, e);
+                    }
+
+                    for(DeviceStruct struct2 : deviceStructs){
+                        struct2.getDevice().sendDeviceUpdateIntent(this);
+                    }
                 }
                 break;
             default:
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bf0e0bfdd..9a936c1d2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -203,7 +203,7 @@
     <string name="pref_header_time">Time</string>
     <string name="pref_header_workout">Workout</string>
     <string name="pref_header_equalizer">Equalizer</string>
-    <string name="pref_title_general_autoconnectonbluetooth">Connect to Gadgetbridge device when Bluetooth is turned on</string>
+    <string name="pref_title_general_autoconnectonbluetooth">Connect to Gadgetbridge device(s) when Bluetooth is turned on</string>
     <string name="pref_title_general_autostartonboot">Start automatically</string>
     <string name="pref_title_general_autoreconnect">Reconnect automatically</string>
     <string name="pref_title_mb_intents">Broadcast Media Button Intents Directly</string>

From 9e10da062eb297b50422738f35839200e3a3814e Mon Sep 17 00:00:00 2001
From: Davis Mosenkovs <davikovs@gmail.com>
Date: Thu, 4 Jan 2024 18:48:26 +0200
Subject: [PATCH 306/595] Add "Reconnect only to connected devices" setting

* Add general_reconnectonlytoconnected setting.

* Replace last_device_address shared prefs string with
last_device_addresses shared prefs string set.
Bluetooth address of a device is added to last_device_addresses when
connecting to the device.
Bluetooth address of a device is removed from last_device_addresses only
when deleting the device or explicitly disconnecting from the device
(e.g. by selecting "Disconnect" in the device tile menu).

* Adjust ExternalPebbleJSActivity to better support multiple connected
devices.
---
 .../activities/ExternalPebbleJSActivity.java  | 29 +++++++++----------
 .../adapter/GBDeviceAdapterv2.java            | 14 +++++++++
 .../devices/AbstractDeviceCoordinator.java    | 13 ++++++---
 .../service/DeviceCommunicationService.java   | 21 +++++++++++++-
 .../freeyourgadget/gadgetbridge/util/GB.java  |  6 +++-
 .../gadgetbridge/util/GBPrefs.java            |  3 ++
 app/src/main/res/values/strings.xml           |  2 ++
 app/src/main/res/xml/preferences.xml          |  7 +++++
 8 files changed, 73 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ExternalPebbleJSActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ExternalPebbleJSActivity.java
index 4f9f26690..83bf63fee 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ExternalPebbleJSActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ExternalPebbleJSActivity.java
@@ -35,8 +35,10 @@ import androidx.core.app.NavUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
+import java.util.Set;
 import java.util.UUID;
 
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
@@ -51,6 +53,7 @@ import nodomain.freeyourgadget.gadgetbridge.service.devices.pebble.webview.GBWeb
 import nodomain.freeyourgadget.gadgetbridge.service.devices.pebble.webview.JSInterface;
 import nodomain.freeyourgadget.gadgetbridge.util.DeviceHelper;
 import nodomain.freeyourgadget.gadgetbridge.util.GB;
+import nodomain.freeyourgadget.gadgetbridge.util.GBPrefs;
 import nodomain.freeyourgadget.gadgetbridge.util.WebViewSingleton;
 
 import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_CONNECT;
@@ -91,28 +94,22 @@ public class ExternalPebbleJSActivity extends AbstractGBActivity {
                 DeviceManager deviceManager = ((GBApplication) getApplication()).getDeviceManager();
                 List<GBDevice> deviceList = deviceManager.getDevices();
                 for (GBDevice device : deviceList) {
-                    if (device.getState() == GBDevice.State.INITIALIZED) {
-                        if (device.getType().equals(DeviceType.PEBBLE)) {
-                            currentDevice = device;
-                            break;
-                        } else {
-                            LOG.error("attempting to load pebble configuration but a different device type is connected!!!");
-                            finish();
-                            return;
-                        }
+                    if (device.getState() == GBDevice.State.INITIALIZED && device.getType().equals(DeviceType.PEBBLE)) {
+                        currentDevice = device;
+                        break;
                     }
                 }
                 if (currentDevice == null) {
-                    //then try to reconnect to last connected device
-                    String btDeviceAddress = GBApplication.getPrefs().getPreferences().getString("last_device_address", null);
-                    if (btDeviceAddress != null) {
-                        GBDevice candidate = DeviceHelper.getInstance().findAvailableDevice(btDeviceAddress, this);
-                        if(!candidate.isConnected() && candidate.getType() == DeviceType.PEBBLE){
+                    //then try to reconnect to one of last connected Pebble devices
+                    Set<String> lastDeviceAddresses = GBApplication.getPrefs().getStringSet(GBPrefs.LAST_DEVICE_ADDRESSES, Collections.emptySet());
+                    for (GBDevice device : deviceList) {
+                        if (!device.isConnected() && device.getType() == DeviceType.PEBBLE && lastDeviceAddresses.contains(device.getAddress())) {
                             Intent intent = new Intent(this, DeviceCommunicationService.class)
                                     .setAction(ACTION_CONNECT)
-                                    .putExtra(GBDevice.EXTRA_DEVICE, currentDevice);
+                                    .putExtra(GBDevice.EXTRA_DEVICE, device);
                             this.startService(intent);
-                            currentDevice = candidate;
+                            currentDevice = device;
+                            break;
                         }
                     }
                 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java
index 1108a4edc..213fd5bc5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java
@@ -83,12 +83,15 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Hashtable;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
@@ -121,6 +124,7 @@ import nodomain.freeyourgadget.gadgetbridge.util.DateTimeUtils;
 import nodomain.freeyourgadget.gadgetbridge.util.DeviceHelper;
 import nodomain.freeyourgadget.gadgetbridge.util.FormatUtils;
 import nodomain.freeyourgadget.gadgetbridge.util.GB;
+import nodomain.freeyourgadget.gadgetbridge.util.GBPrefs;
 import nodomain.freeyourgadget.gadgetbridge.util.StringUtils;
 
 /**
@@ -855,6 +859,7 @@ public class GBDeviceAdapterv2 extends ListAdapter<GBDevice, GBDeviceAdapterv2.V
                             showTransientSnackbar(R.string.controlcenter_snackbar_disconnecting);
                             GBApplication.deviceService(device).disconnect();
                         }
+                        removeFromLastDeviceAddressesPref(device);
                         return true;
                     case R.id.controlcenter_device_submenu_set_alias:
                         showSetAliasDialog(device);
@@ -1061,6 +1066,15 @@ public class GBDeviceAdapterv2 extends ListAdapter<GBDevice, GBDeviceAdapterv2.V
         return false;
     }
 
+    private void removeFromLastDeviceAddressesPref(GBDevice device) {
+        Set<String> lastDeviceAddresses = GBApplication.getPrefs().getStringSet(GBPrefs.LAST_DEVICE_ADDRESSES, Collections.emptySet());
+        if (lastDeviceAddresses.contains(device.getAddress())) {
+            lastDeviceAddresses = new HashSet<String>(lastDeviceAddresses);
+            lastDeviceAddresses.remove(device.getAddress());
+            GBApplication.getPrefs().getPreferences().edit().putStringSet(GBPrefs.LAST_DEVICE_ADDRESSES, lastDeviceAddresses).apply();
+        }
+    }
+
     private void setAppPreferences(GBDevice device) {
         Intent startIntent;
         startIntent = new Intent(context, DeviceSettingsActivity.class);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java
index d412a1717..a7278dd76 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java
@@ -41,7 +41,9 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.EnumSet;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.regex.Pattern;
 
 import de.greenrobot.dao.query.QueryBuilder;
@@ -74,6 +76,7 @@ import nodomain.freeyourgadget.gadgetbridge.model.Spo2Sample;
 import nodomain.freeyourgadget.gadgetbridge.model.StressSample;
 import nodomain.freeyourgadget.gadgetbridge.model.TemperatureSample;
 import nodomain.freeyourgadget.gadgetbridge.service.ServiceDeviceSupport;
+import nodomain.freeyourgadget.gadgetbridge.util.GBPrefs;
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 
 public abstract class AbstractDeviceCoordinator implements DeviceCoordinator {
@@ -134,10 +137,12 @@ public abstract class AbstractDeviceCoordinator implements DeviceCoordinator {
         }
         Prefs prefs = getPrefs();
 
-        String lastDevice = prefs.getPreferences().getString("last_device_address", "");
-        if (gbDevice.getAddress().equals(lastDevice)) {
-            LOG.debug("#1605 removing last device");
-            prefs.getPreferences().edit().remove("last_device_address").apply();
+        Set<String> lastDeviceAddresses = prefs.getStringSet(GBPrefs.LAST_DEVICE_ADDRESSES, Collections.emptySet());
+        if (lastDeviceAddresses.contains(gbDevice.getAddress())) {
+            LOG.debug("#1605 removing last device (one of last devices)");
+            lastDeviceAddresses = new HashSet<String>(lastDeviceAddresses);
+            lastDeviceAddresses.remove(gbDevice.getAddress());
+            prefs.getPreferences().edit().putStringSet(GBPrefs.LAST_DEVICE_ADDRESSES, lastDeviceAddresses).apply();
         }
 
         String macAddress = prefs.getPreferences().getString(MiBandConst.PREF_MIBAND_ADDRESS, "");
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
index 0faa04e6e..b9946b276 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
@@ -48,8 +48,11 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.UUID;
 
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
@@ -484,6 +487,17 @@ public class DeviceCommunicationService extends Service implements SharedPrefere
                     gbDevs = new ArrayList<>();
                     gbDevs.add(extraDevice);
                     fromExtra = true;
+                } else if (prefs.getBoolean(GBPrefs.RECONNECT_ONLY_TO_CONNECTED, true)) {
+                    List<GBDevice> gbAllDevs = GBApplication.app().getDeviceManager().getDevices();
+                    Set<String> lastDeviceAddresses = prefs.getStringSet(GBPrefs.LAST_DEVICE_ADDRESSES, Collections.emptySet());
+                    if (gbAllDevs != null && !gbAllDevs.isEmpty() && !lastDeviceAddresses.isEmpty()) {
+                        gbDevs = new ArrayList<>();
+                        for(GBDevice gbDev : gbAllDevs) {
+                            if (lastDeviceAddresses.contains(gbDev.getAddress())) {
+                                gbDevs.add(gbDev);
+                            }
+                        }
+                    }
                 } else {
                     gbDevs = GBApplication.app().getDeviceManager().getDevices();
                 }
@@ -501,7 +515,12 @@ public class DeviceCommunicationService extends Service implements SharedPrefere
                         if(!fromExtra && !autoReconnect) {
                             continue;
                         }
-                        prefs.getPreferences().edit().putString("last_device_address", btDeviceAddress).apply();
+                        Set<String> lastDeviceAddresses = prefs.getStringSet(GBPrefs.LAST_DEVICE_ADDRESSES, Collections.emptySet());
+                        if (!lastDeviceAddresses.contains(btDeviceAddress)) {
+                            lastDeviceAddresses = new HashSet<String>(lastDeviceAddresses);
+                            lastDeviceAddresses.add(btDeviceAddress);
+                            prefs.getPreferences().edit().putStringSet(GBPrefs.LAST_DEVICE_ADDRESSES, lastDeviceAddresses).apply();
+                        }
                     }
 
                     if(!fromExtra && !autoReconnect) {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GB.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GB.java
index e920204b2..7d00c98a2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GB.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GB.java
@@ -49,6 +49,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
+import java.util.Collections;
 import java.util.List;
 
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
@@ -61,6 +62,7 @@ import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.model.ActivityKind;
 import nodomain.freeyourgadget.gadgetbridge.model.DeviceService;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceCommunicationService;
+import nodomain.freeyourgadget.gadgetbridge.util.GBPrefs;
 
 import static nodomain.freeyourgadget.gadgetbridge.GBApplication.isRunningOreoOrLater;
 import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_RECORDED_DATA_TYPES;
@@ -277,7 +279,9 @@ public class GB {
             builder.setColor(context.getResources().getColor(R.color.accent));
         }
 
-        if (GBApplication.getPrefs().getString("last_device_address", null) != null) {
+        // A small bug: When "Reconnect only to connected devices" is disabled, the intent will be added even when there are no devices in GB
+        // Not sure whether it is worth the complexity to fix this
+        if (!GBApplication.getPrefs().getBoolean(GBPrefs.RECONNECT_ONLY_TO_CONNECTED, true) || !GBApplication.getPrefs().getStringSet(GBPrefs.LAST_DEVICE_ADDRESSES, Collections.emptySet()).isEmpty()) {
             Intent deviceCommunicationServiceIntent = new Intent(context, DeviceCommunicationService.class);
             deviceCommunicationServiceIntent.setAction(DeviceService.ACTION_CONNECT);
             PendingIntent reconnectPendingIntent = PendingIntentUtils.getService(context, 2, deviceCommunicationServiceIntent, PendingIntent.FLAG_ONE_SHOT, false);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GBPrefs.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GBPrefs.java
index 50fd51461..55f1794f1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GBPrefs.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GBPrefs.java
@@ -65,6 +65,9 @@ public class GBPrefs {
     public static final String CHART_MAX_HEART_RATE = "chart_max_heart_rate";
     public static final String CHART_MIN_HEART_RATE = "chart_min_heart_rate";
 
+    public static final String LAST_DEVICE_ADDRESSES = "last_device_addresses";
+    public static final String RECONNECT_ONLY_TO_CONNECTED = "general_reconnectonlytoconnected";
+
     private final Prefs mPrefs;
 
     public GBPrefs(Prefs prefs) {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9a936c1d2..c91041c58 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -204,6 +204,8 @@
     <string name="pref_header_workout">Workout</string>
     <string name="pref_header_equalizer">Equalizer</string>
     <string name="pref_title_general_autoconnectonbluetooth">Connect to Gadgetbridge device(s) when Bluetooth is turned on</string>
+    <string name="pref_title_general_reconnectonlytoconnected">Reconnect only to connected devices</string>
+    <string name="pref_summary_general_reconnectonlytoconnected">Reconnect only to connected devices, instead of reconnecting to all devices</string>
     <string name="pref_title_general_autostartonboot">Start automatically</string>
     <string name="pref_title_general_autoreconnect">Reconnect automatically</string>
     <string name="pref_title_mb_intents">Broadcast Media Button Intents Directly</string>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index f7525a9d3..e8451b3d4 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -18,6 +18,13 @@
             android:layout="@layout/preference_checkbox"
             android:title="@string/pref_title_general_autoconnectonbluetooth"
             app:iconSpaceReserved="false" />
+        <SwitchPreferenceCompat
+            android:defaultValue="true"
+            android:key="general_reconnectonlytoconnected"
+            android:layout="@layout/preference_checkbox"
+            android:title="@string/pref_title_general_reconnectonlytoconnected"
+            android:summary="@string/pref_summary_general_reconnectonlytoconnected"
+            app:iconSpaceReserved="false" />
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:enabled="false"

From 5bcebe95904fac616cdf80758baea350f25b3762 Mon Sep 17 00:00:00 2001
From: Davis Mosenkovs <davikovs@gmail.com>
Date: Thu, 4 Jan 2024 20:24:12 +0200
Subject: [PATCH 307/595] Disconnect all devices that are not NOT_CONNECTED

Disconnect devices in all states except GBDevice.State.NOT_CONNECTED.
This should fix devices getting stuck in GBDevice.State.CONNECTING state
when Bluetooth is switched off.
---
 .../gadgetbridge/service/DeviceCommunicationService.java        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
index b9946b276..ac664aecc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
@@ -598,6 +598,8 @@ public class DeviceCommunicationService extends Service implements SharedPrefere
                                 }
                                 notifCache.removeAll(toRemove);
                             }
+                        } else if (action.equals(ACTION_DISCONNECT) && device.getState() != GBDevice.State.NOT_CONNECTED) {
+                            targetedDevices.add(device);
                         }
                     }
                 }

From 2618adac17a3b26e254c8da7c0916863fe435d8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Mon, 8 Jan 2024 18:51:34 +0000
Subject: [PATCH 308/595] Update changelog

---
 CHANGELOG.md | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 73bfb482e..b8cfd861e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,8 +2,27 @@
 
 #### Next version (WIP)
 
+* Initial support for Honor Band 3
+* Initial support for Honor Band 4
+* Initial support for Honor Band 5
+* Initial support for Honor Band 6
+* Initial support for Honor Band 7
+* Initial support for Huawei Band 4
+* Initial support for Huawei Band 4 Pro
+* Initial support for Huawei Band 6
+* Initial support for Huawei Band 7
+* Initial support for Huawei Band 8
+* Initial support for Huawei Band AW70 (aka Huawei Band 3e / 4e)
+* Initial support for Huawei Talk Band B6
+* Initial support for Huawei Watch GT
+* Initial support for Huawei Watch GT 2
+* Initial support for Huawei Watch GT 2 Pro
+* Initial support for Huawei Watch GT 2e
+* Initial support for Huawei Watch GT 3
+* Initial support for Huawei Watch GT 3 Pro
 * Initial support for Mijia LYWSD03MMC
 * Initial support for Nothing Ear (2)
+* Initial support for Nothing Ear (Stick)
 * Experimental support for Redmi Watch 2 Lite
 * Experimental support for Redmi Smart Band Pro
 * Fossil/Skagen Hybrids: Update navigationApp to 1.1
@@ -18,6 +37,8 @@
 * Xiaomi: Improve stability and fix some crashes
 * Xiaomi: Parse sleep stages on some devices
 * Add a notifications channel for connection status notifications
+* Improve automatic connection to all or previous devices
+* Fix devices sometimes staying stuck in a "Connecting" state
 * Map some missing Google Maps navigation actions
 
 #### 0.77.0

From e489d0d81182277375e17054f93d0c63d0bf11dd Mon Sep 17 00:00:00 2001
From: Damien 'Psolyca' Gaignon <damien.gaignon@gmail.com>
Date: Mon, 8 Jan 2024 00:08:56 +0100
Subject: [PATCH 309/595] Fix string comparison

---
 .../gadgetbridge/devices/huawei/HuaweiCoordinator.java      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCoordinator.java
index 22ee428be..edeeab8f3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCoordinator.java
@@ -59,11 +59,11 @@ public class HuaweiCoordinator {
                 byte[] commands = GB.hexStringToByteArray(getCapabilitiesSharedPreferences().getString(key, "00"));
                 this.commandsPerService.put(service, commands);
             } catch (NumberFormatException e) {
-                if (key == "expandCapabilities")
+                if (key.equals("expandCapabilities"))
                     this.expandCapabilities = GB.hexStringToByteArray(getCapabilitiesSharedPreferences().getString(key, "00"));
-                if (key == "notificationCapabilities")
+                if (key.equals("notificationCapabilities"))
                     this.notificationCapabilities = (byte)getCapabilitiesSharedPreferences().getInt(key, -0x01);
-                if (key == "notificationConstraints")
+                if (key.equals("notificationConstraints"))
                     this.notificationConstraints = ByteBuffer.wrap(GB.hexStringToByteArray(
                                     getCapabilitiesSharedPreferences().getString(
                                             key,

From 811b7524bc39506521e589bae1a88dedfed2c256 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Mon, 8 Jan 2024 22:58:52 +0000
Subject: [PATCH 310/595] Update changelog

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b8cfd861e..b7c1c5e15 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,8 @@
 * Initial support for Huawei Band 6
 * Initial support for Huawei Band 7
 * Initial support for Huawei Band 8
-* Initial support for Huawei Band AW70 (aka Huawei Band 3e / 4e)
+* Initial support for Huawei Band 3e
+* Initial support for Huawei Band 4e
 * Initial support for Huawei Talk Band B6
 * Initial support for Huawei Watch GT
 * Initial support for Huawei Watch GT 2

From 9bfe3dcd5f39d9ab37c29d1906ec1b82a9d4bbc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Mon, 8 Jan 2024 14:02:27 +0000
Subject: [PATCH 311/595] Huawei: Fix tests

- Allow the calendar to be passed as parameter for tests
- Disable the setWearMessage test, for now, broken since https://codeberg.org/psolyca/Gadgetbridge/commit/5b0736b7518aa5c998ac13207fff66286393965b
---
 .../gadgetbridge/devices/huawei/HuaweiUtil.java       |  3 +--
 .../devices/huawei/packets/DeviceConfig.java          | 11 ++++++++---
 .../devices/huawei/packets/TestDeviceConfig.java      |  8 +++++++-
 .../devices/huawei/packets/TestNotifications.java     |  2 ++
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiUtil.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiUtil.java
index 7cb7c1904..cf75921c7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiUtil.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiUtil.java
@@ -46,8 +46,7 @@ public class HuaweiUtil {
             (byte)calendar.get(Calendar.MINUTE)};
     }
 
-    public static byte[] getTimeAndZoneId() {
-        Calendar now = Calendar.getInstance();
+    public static byte[] getTimeAndZoneId(final Calendar now) {
         int zoneRawOffset = (now.get(Calendar.ZONE_OFFSET) + now.get(Calendar.DST_OFFSET)) / 1000;
         byte[] id = now.getTimeZone().getID().getBytes();
         return ByteBuffer.allocate(6 + id.length)
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DeviceConfig.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DeviceConfig.java
index 11e0b2ab3..1f0e09613 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DeviceConfig.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DeviceConfig.java
@@ -23,6 +23,7 @@ import java.security.InvalidAlgorithmParameterException;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.List;
 import java.util.TreeMap;
 
@@ -395,17 +396,21 @@ public class DeviceConfig {
     public static class TimeRequest extends HuaweiPacket {
         public static final byte id = 0x05;
 
-        public TimeRequest(ParamsProvider paramsProvider) {
+        public TimeRequest(ParamsProvider paramsProvider, final Calendar now) {
             super(paramsProvider);
             this.serviceId = DeviceConfig.id;
             this.commandId = id;
-            ByteBuffer timeAndZoneId = ByteBuffer.wrap(HuaweiUtil.getTimeAndZoneId());
+            ByteBuffer timeAndZoneId = ByteBuffer.wrap(HuaweiUtil.getTimeAndZoneId(now));
             this.tlv = new HuaweiTLV()
                     .put(0x01, timeAndZoneId.getInt(0))
                     .put(0x02, timeAndZoneId.getShort(4));
             this.complete = true;
         }
 
+        public TimeRequest(ParamsProvider paramsProvider) {
+            this(paramsProvider, Calendar.getInstance());
+        }
+
         // TODO: implement parsing this request for the log parser support
     }
 
@@ -1506,7 +1511,7 @@ public class DeviceConfig {
             super(paramsProvider);
             this.serviceId = DeviceConfig.id;
             this.commandId = id;
-            ByteBuffer timeAndZoneId = ByteBuffer.wrap(HuaweiUtil.getTimeAndZoneId());
+            ByteBuffer timeAndZoneId = ByteBuffer.wrap(HuaweiUtil.getTimeAndZoneId(Calendar.getInstance()));
             this.tlv = new HuaweiTLV()
                     .put(0x01, timeAndZoneId.getInt())
                     .put(0x02, timeAndZoneId.getShort());
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestDeviceConfig.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestDeviceConfig.java
index c5badfd13..028aac98f 100644
--- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestDeviceConfig.java
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestDeviceConfig.java
@@ -30,7 +30,9 @@ import java.security.InvalidAlgorithmParameterException;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.List;
+import java.util.TimeZone;
 
 import javax.crypto.BadPaddingException;
 import javax.crypto.IllegalBlockSizeException;
@@ -311,6 +313,10 @@ public class TestDeviceConfig {
         int timestamp = 1633987331;
         short zoneOffset = (short) 512;
 
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTimeInMillis(timestamp * 1000L);
+        calendar.setTimeZone(TimeZone.getTimeZone("GMT+2"));
+
         Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
         tlvField.setAccessible(true);
 
@@ -319,7 +325,7 @@ public class TestDeviceConfig {
                 .put(0x02, zoneOffset);
 
         byte[] serialized = new byte[] {(byte) 0x5A, (byte) 0x00, (byte) 0x2A, (byte) 0x00, (byte) 0x01, (byte) 0x05, (byte) 0x7C, (byte) 0x01, (byte) 0x01, (byte) 0x7D, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x7E, (byte) 0x10, (byte) 0xED, (byte) 0x67, (byte) 0x61, (byte) 0x8A, (byte) 0x8E, (byte) 0x44, (byte) 0x67, (byte) 0xB1, (byte) 0x2A, (byte) 0xB4, (byte) 0xFA, (byte) 0x86, (byte) 0x76, (byte) 0x17, (byte) 0x8C, (byte) 0x61, (byte) 0xFC, (byte) 0x99};
-        DeviceConfig.TimeRequest request = new DeviceConfig.TimeRequest(secretsProvider);
+        DeviceConfig.TimeRequest request = new DeviceConfig.TimeRequest(secretsProvider, calendar);
 
         Assert.assertEquals(0x01, request.serviceId);
         Assert.assertEquals(0x05, request.commandId);
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestNotifications.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestNotifications.java
index 52e1a3087..31b899371 100644
--- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestNotifications.java
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestNotifications.java
@@ -17,6 +17,7 @@
 package nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets;
 
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.lang.reflect.Field;
@@ -162,6 +163,7 @@ public class TestNotifications {
     }
 
     @Test
+    @Ignore("Broken since https://codeberg.org/psolyca/Gadgetbridge/commit/5b0736b7518aa5c998ac13207fff66286393965b")
     public void testSetWearMessagePushRequest() throws NoSuchFieldException, IllegalAccessException, HuaweiPacket.CryptoException {
         Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
         tlvField.setAccessible(true);

From cb7121a32e182726616f29e8452612ce4876e238 Mon Sep 17 00:00:00 2001
From: Damien 'Psolyca' Gaignon <damien.gaignon@gmail.com>
Date: Mon, 8 Jan 2024 23:42:11 +0100
Subject: [PATCH 312/595] Huawei : Change method to get device name

---
 .../huaweiband6/HuaweiBand6Coordinator.java     | 14 ++++----------
 .../huaweiband7/HuaweiBand7Coordinator.java     | 14 ++++----------
 .../huaweiband8/HuaweiBand8Coordinator.java     | 14 ++++----------
 .../HuaweiBandAw70Coordinator.java              | 17 ++++-------------
 .../HuaweiTalkBandB6Coordinator.java            | 14 ++++----------
 .../huaweiwatchgt/HuaweiWatchGTCoordinator.java | 14 ++++----------
 .../HuaweiWatchGT2Coordinator.java              | 17 ++++-------------
 .../HuaweiWatchGT2eCoordinator.java             | 14 ++++----------
 .../HuaweiWatchGT3Coordinator.java              | 17 ++++-------------
 9 files changed, 36 insertions(+), 99 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband6/HuaweiBand6Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband6/HuaweiBand6Coordinator.java
index 6277c775e..ff0f60943 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband6/HuaweiBand6Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband6/HuaweiBand6Coordinator.java
@@ -20,6 +20,8 @@ package nodomain.freeyourgadget.gadgetbridge.devices.huawei.huaweiband6;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.regex.Pattern;
+
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.TimeSampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants;
@@ -40,16 +42,8 @@ public class HuaweiBand6Coordinator extends HuaweiLECoordinator {
     }
 
     @Override
-    public boolean supports(GBDeviceCandidate candidate) {
-        try {
-            String name = candidate.getName();
-            if (name != null && name.toLowerCase().startsWith(HuaweiConstants.HU_BAND6_NAME)) {
-                return true;
-            }
-        } catch (Exception ex) {
-            LOG.error("unable to check device support", ex);
-        }
-        return false;
+    protected Pattern getSupportedDeviceName() {
+        return Pattern.compile(HuaweiConstants.HU_BAND6_NAME + ".*");
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband7/HuaweiBand7Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband7/HuaweiBand7Coordinator.java
index 770932498..cd63efb88 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband7/HuaweiBand7Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband7/HuaweiBand7Coordinator.java
@@ -20,6 +20,8 @@ package nodomain.freeyourgadget.gadgetbridge.devices.huawei.huaweiband7;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.regex.Pattern;
+
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.TimeSampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants;
@@ -40,16 +42,8 @@ public class HuaweiBand7Coordinator extends HuaweiLECoordinator {
     }
 
     @Override
-    public boolean supports(GBDeviceCandidate candidate) {
-        try {
-            String name = candidate.getName();
-            if (name != null && name.toLowerCase().startsWith(HuaweiConstants.HU_BAND7_NAME)) {
-                return true;
-            }
-        } catch (Exception ex) {
-            LOG.error("unable to check device support", ex);
-        }
-        return false;
+    protected Pattern getSupportedDeviceName() {
+        return Pattern.compile(HuaweiConstants.HU_BAND7_NAME + ".*");
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband8/HuaweiBand8Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband8/HuaweiBand8Coordinator.java
index d1acf5a08..7a7214c7d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband8/HuaweiBand8Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband8/HuaweiBand8Coordinator.java
@@ -20,6 +20,8 @@ package nodomain.freeyourgadget.gadgetbridge.devices.huawei.huaweiband8;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.regex.Pattern;
+
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.TimeSampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants;
@@ -40,16 +42,8 @@ public class HuaweiBand8Coordinator extends HuaweiLECoordinator {
     }
 
     @Override
-    public boolean supports(GBDeviceCandidate candidate) {
-        try {
-            String name = candidate.getName();
-            if (name != null && name.toLowerCase().startsWith(HuaweiConstants.HU_BAND8_NAME)) {
-                return true;
-            }
-        } catch (Exception ex) {
-            LOG.error("unable to check device support", ex);
-        }
-        return false;
+    protected Pattern getSupportedDeviceName() {
+        return Pattern.compile(HuaweiConstants.HU_BAND8_NAME + ".*");
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweibandaw70/HuaweiBandAw70Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweibandaw70/HuaweiBandAw70Coordinator.java
index 9c8d90d61..fa973cea4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweibandaw70/HuaweiBandAw70Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweibandaw70/HuaweiBandAw70Coordinator.java
@@ -20,6 +20,8 @@ package nodomain.freeyourgadget.gadgetbridge.devices.huawei.huaweibandaw70;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.regex.Pattern;
+
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants;
 import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiLECoordinator;
@@ -36,19 +38,8 @@ public class HuaweiBandAw70Coordinator extends HuaweiLECoordinator {
     }
 
     @Override
-    public boolean supports(GBDeviceCandidate candidate) {
-        try {
-            String name = candidate.getName();
-            if (name != null && (
-                name.toLowerCase().startsWith(HuaweiConstants.HU_BAND3E_NAME) ||
-                name.toLowerCase().startsWith(HuaweiConstants.HU_BAND4E_NAME)
-            )) {
-                return true;
-            }
-        } catch (Exception ex) {
-            LOG.error("unable to check device support", ex);
-        }
-        return false;
+    protected Pattern getSupportedDeviceName() {
+        return Pattern.compile("(" + HuaweiConstants.HU_BAND3E_NAME + "|" + HuaweiConstants.HU_BAND4E_NAME + ").*");
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweitalkbandb6/HuaweiTalkBandB6Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweitalkbandb6/HuaweiTalkBandB6Coordinator.java
index 9f9a65e74..98ecd7fa9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweitalkbandb6/HuaweiTalkBandB6Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweitalkbandb6/HuaweiTalkBandB6Coordinator.java
@@ -20,6 +20,8 @@ package nodomain.freeyourgadget.gadgetbridge.devices.huawei.huaweitalkbandb6;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.regex.Pattern;
+
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiBRCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants;
@@ -36,16 +38,8 @@ public class HuaweiTalkBandB6Coordinator extends HuaweiBRCoordinator {
     }
 
     @Override
-    public boolean supports(GBDeviceCandidate candidate) {
-        try {
-            String name = candidate.getName();
-            if (name != null && name.toLowerCase().startsWith(HuaweiConstants.HU_TALKBANDB6_NAME)) {
-                return true;
-            }
-        } catch (Exception ex) {
-            LOG.error("unable to check device support", ex);
-        }
-        return false;
+    protected Pattern getSupportedDeviceName() {
+        return Pattern.compile(HuaweiConstants.HU_TALKBANDB6_NAME + ".*");
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt/HuaweiWatchGTCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt/HuaweiWatchGTCoordinator.java
index 022b161ff..3aebcdef8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt/HuaweiWatchGTCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt/HuaweiWatchGTCoordinator.java
@@ -20,6 +20,8 @@ package nodomain.freeyourgadget.gadgetbridge.devices.huawei.huaweiwatchgt;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.regex.Pattern;
+
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.TimeSampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants;
@@ -40,16 +42,8 @@ public class HuaweiWatchGTCoordinator extends HuaweiLECoordinator {
     }
 
     @Override
-    public boolean supports(GBDeviceCandidate candidate) {
-        try {
-            String name = candidate.getName();
-            if (name != null && name.toLowerCase().startsWith(HuaweiConstants.HU_WATCHGT_NAME)) {
-                return true;
-            }
-        } catch (Exception ex) {
-            LOG.error("unable to check device support", ex);
-        }
-        return false;
+    protected Pattern getSupportedDeviceName() {
+        return Pattern.compile(HuaweiConstants.HU_WATCHGT_NAME + ".*");
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt2/HuaweiWatchGT2Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt2/HuaweiWatchGT2Coordinator.java
index a0c9f4607..01282f6af 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt2/HuaweiWatchGT2Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt2/HuaweiWatchGT2Coordinator.java
@@ -20,6 +20,8 @@ package nodomain.freeyourgadget.gadgetbridge.devices.huawei.huaweiwatchgt2;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.regex.Pattern;
+
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.TimeSampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiBRCoordinator;
@@ -44,19 +46,8 @@ public class HuaweiWatchGT2Coordinator extends HuaweiBRCoordinator {
     }
 
     @Override
-    public boolean supports(GBDeviceCandidate candidate) {
-        try {
-            String name = candidate.getName();
-            if (name != null && (
-                        name.toLowerCase().startsWith(HuaweiConstants.HU_WATCHGT2_NAME) ||
-                        name.toLowerCase().startsWith(HuaweiConstants.HU_WATCHGT2PRO_NAME)
-            )) {
-                return true;
-            }
-        } catch (Exception ex) {
-            LOG.error("unable to check device support", ex);
-        }
-        return false;
+    protected Pattern getSupportedDeviceName() {
+        return Pattern.compile("(" + HuaweiConstants.HU_WATCHGT2_NAME + "|" + HuaweiConstants.HU_WATCHGT2PRO_NAME + ").*");
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt2e/HuaweiWatchGT2eCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt2e/HuaweiWatchGT2eCoordinator.java
index 594256377..e1b03ed39 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt2e/HuaweiWatchGT2eCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt2e/HuaweiWatchGT2eCoordinator.java
@@ -20,6 +20,8 @@ package nodomain.freeyourgadget.gadgetbridge.devices.huawei.huaweiwatchgt2e;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.regex.Pattern;
+
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.TimeSampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants;
@@ -44,16 +46,8 @@ public class HuaweiWatchGT2eCoordinator extends HuaweiLECoordinator {
     }
 
     @Override
-    public boolean supports(GBDeviceCandidate candidate) {
-        try {
-            String name = candidate.getName();
-            if (name != null && name.toLowerCase().startsWith(HuaweiConstants.HU_WATCHGT2E_NAME)) {
-                return true;
-            }
-        } catch (Exception ex) {
-            LOG.error("unable to check device support", ex);
-        }
-        return false;
+    protected Pattern getSupportedDeviceName() {
+        return Pattern.compile(HuaweiConstants.HU_WATCHGT2E_NAME + ".*");
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt3/HuaweiWatchGT3Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt3/HuaweiWatchGT3Coordinator.java
index 5ce883734..2c2edb9e8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt3/HuaweiWatchGT3Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt3/HuaweiWatchGT3Coordinator.java
@@ -20,6 +20,8 @@ package nodomain.freeyourgadget.gadgetbridge.devices.huawei.huaweiwatchgt3;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.regex.Pattern;
+
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiBRCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants;
@@ -40,19 +42,8 @@ public class HuaweiWatchGT3Coordinator extends HuaweiBRCoordinator {
     }
 
     @Override
-    public boolean supports(GBDeviceCandidate candidate) {
-        try {
-            String name = candidate.getName();
-            if (name != null && (
-                        name.toLowerCase().startsWith(HuaweiConstants.HU_WATCHGT3_NAME) ||
-                        name.toLowerCase().startsWith(HuaweiConstants.HU_WATCHGT3PRO_NAME)
-            )) {
-                return true;
-            }
-        } catch (Exception ex) {
-            LOG.error("unable to check device support", ex);
-        }
-        return false;
+    protected Pattern getSupportedDeviceName() {
+        return Pattern.compile("(" + HuaweiConstants.HU_WATCHGT3_NAME + "|" + HuaweiConstants.HU_WATCHGT3PRO_NAME + ").*");
     }
 
     @Override

From 372aa88e6e8c36b75bfac8ca58e63b6819cd3f3c Mon Sep 17 00:00:00 2001
From: opcode <luigi@sciolla.net>
Date: Tue, 9 Jan 2024 01:32:53 +0100
Subject: [PATCH 313/595] Xiaomi: Weather fixes and Implement wind and AQI

Many fields were incorrectly being sent as uint32 instead of sint32. This caused issues with forecast icons.
---
 .../xiaomi/services/XiaomiWeatherService.java | 18 +++++++------
 app/src/main/proto/xiaomi.proto               | 26 +++++++++----------
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java
index 048cee6f7..2ec584fee 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java
@@ -111,13 +111,13 @@ public class XiaomiWeatherService extends AbstractXiaomiService {
                                                 .setHumidity(weatherSpec.currentHumidity)
                                                 .setSymbol("%")
                                         )
-                                        .setUnk5(XiaomiProto.WeatherCurrentUnk5.newBuilder()
-                                                .setUnk1("")
-                                                .setUnk2(0)
+                                        .setWind(XiaomiProto.WeatherCurrentWind.newBuilder()
+                                                .setWind(weatherSpec.windSpeedAsBeaufort())
+                                                .setSymbol("")
                                         )
-                                        .setUnk6(XiaomiProto.WeatherCurrentUnk6.newBuilder()
+                                        .setUv(XiaomiProto.WeatherCurrentUVIndex.newBuilder()
                                                 .setUnk1("")
-                                                .setUnk2(0)
+                                                .setIndex(Math.round(weatherSpec.uvIndex)) // This is sent as an sint but seems to be displayed with a decimal point
                                         )
                                         .setAQI(XiaomiProto.WeatherCurrentAQI.newBuilder()
                                                 .setAQIText("Unknown") // some string like "Moderate"
@@ -139,10 +139,12 @@ public class XiaomiWeatherService extends AbstractXiaomiService {
             XiaomiProto.WeatherDailyList.Builder dailyListBuilder = XiaomiProto.WeatherDailyList.newBuilder();
             int daysToSend = Math.min(7, weatherSpec.forecasts.size());
             for (int i = 0; i < daysToSend; i++) {
+                WeatherSpec.AirQuality airQuality = weatherSpec.forecasts.get(i).airQuality;
+
                 dailyListBuilder.addForecastDay(XiaomiProto.WeatherDailyForecastDay.newBuilder()
-                        .setUnk1(XiaomiProto.DailyUnk1.newBuilder()
-                                .setUnk1("")
-                                .setUnk2(0)
+                        .setAQI(XiaomiProto.DailyAQI.newBuilder()
+                                .setAQIText("")
+                                .setAQI(airQuality != null && airQuality.aqi >= 0 ? airQuality.aqi : 0)
                         )
                         .setUnk2(XiaomiProto.DailyUnk2.newBuilder()
                                 .setUnk1(HuamiWeatherConditions.mapToAmazfitBipWeatherCode(weatherSpec.forecasts.get(i).conditionCode)) // TODO: verify
diff --git a/app/src/main/proto/xiaomi.proto b/app/src/main/proto/xiaomi.proto
index 95465715e..afd434a48 100644
--- a/app/src/main/proto/xiaomi.proto
+++ b/app/src/main/proto/xiaomi.proto
@@ -752,8 +752,8 @@ message WeatherCurrent {
   optional uint32 weatherCondition = 2;
   optional WeatherCurrentTemperature temperature = 3;
   optional WeatherCurrentHumidity humidity= 4;
-  optional WeatherCurrentUnk5 unk5 = 5;
-  optional WeatherCurrentUnk6 unk6 = 6;
+  optional WeatherCurrentWind wind = 5;
+  optional WeatherCurrentUVIndex uv = 6;
   optional WeatherCurrentAQI AQI = 7;
   optional WeatherCurrentWarning warning = 8; // Seems to be an array?
   optional float pressure = 9;
@@ -776,14 +776,14 @@ message WeatherCurrentHumidity {
   optional sint32 humidity = 2;
 }
 
-message WeatherCurrentUnk5 {
-  optional string unk1 = 1;
-  optional uint32 unk2 = 2;
+message WeatherCurrentWind {
+  optional string symbol = 1;
+  optional sint32 wind = 2;
 }
 
-message WeatherCurrentUnk6 {
+message WeatherCurrentUVIndex {
   optional string unk1 = 1;
-  optional uint32 unk2 = 2;
+  optional sint32 index = 2;
 }
 
 message WeatherCurrentAQI {
@@ -817,21 +817,21 @@ message WeatherDailyList {
 }
 
 message WeatherDailyForecastDay {
-  optional DailyUnk1 unk1 = 1;
+  optional DailyAQI AQI = 1;
   optional DailyUnk2 unk2 = 2;
   optional DailyHighLowTemp highLowTemp = 3;
   optional string temperatureSymbol = 4;
   optional DailySunriseSunset sunriseSunset = 5;
 }
 
-message DailyUnk1 {
-  optional string unk1 = 1;
-  optional uint32 unk2 = 2;
+message DailyAQI {
+  optional string AQIText = 1;
+  optional sint32 AQI = 2;
 }
 
 message DailyUnk2 {
-  optional uint32 unk1 = 1;
-  optional uint32 unk2 = 2;
+  optional sint32 unk1 = 1;
+  optional sint32 unk2 = 2;
 }
 
 message DailyHighLowTemp {

From 5e6d18d413190403fbf88692ed8469a7172271a2 Mon Sep 17 00:00:00 2001
From: myxor <myxor@noreply.codeberg.org>
Date: Tue, 9 Jan 2024 14:57:32 +0000
Subject: [PATCH 314/595] Debug screen: put both weather buttons in one line
 next to each other

---
 app/src/main/res/layout/activity_debug.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/activity_debug.xml b/app/src/main/res/layout/activity_debug.xml
index b5528dd59..e9a9fbf06 100644
--- a/app/src/main/res/layout/activity_debug.xml
+++ b/app/src/main/res/layout/activity_debug.xml
@@ -135,7 +135,7 @@
                 android:id="@+id/setWeatherButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                grid:layout_columnSpan="2"
+                android:layout_marginEnd="2dp"
                 grid:layout_gravity="fill_horizontal"
                 android:text="Set Weather" />
 
@@ -143,7 +143,7 @@
                 android:id="@+id/showCachedWeatherButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                grid:layout_columnSpan="2"
+                android:layout_marginStart="2dp"
                 grid:layout_gravity="fill_horizontal"
                 android:text="Show Cached Weather" />
 

From aeec68aeef4d2097d761afc44168600077fedf4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Tue, 9 Jan 2024 17:43:43 +0000
Subject: [PATCH 315/595] Huami: Fetch SpO2 on devices that support it

---
 .../gadgetbridge/service/devices/huami/HuamiSupport.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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 19beeb779..13821a731 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
@@ -1686,11 +1686,11 @@ public abstract class HuamiSupport extends AbstractBTLEDeviceSupport implements
             this.fetchOperationQueue.add(new FetchPaiOperation(this));
         }
 
-        if (Huami2021Coordinator.experimentalFeatures(getDevice())) {
-            if ((dataTypes & RecordedDataTypes.TYPE_SPO2) != 0 && coordinator.supportsSpo2()) {
-                this.fetchOperationQueue.add(new FetchSpo2NormalOperation(this));
-            }
+        if ((dataTypes & RecordedDataTypes.TYPE_SPO2) != 0 && coordinator.supportsSpo2()) {
+            this.fetchOperationQueue.add(new FetchSpo2NormalOperation(this));
+        }
 
+        if (Huami2021Coordinator.experimentalFeatures(getDevice())) {
             if ((dataTypes & RecordedDataTypes.TYPE_HEART_RATE) != 0 && coordinator.supportsHeartRateStats()) {
                 this.fetchOperationQueue.add(new FetchHeartRateManualOperation(this));
                 this.fetchOperationQueue.add(new FetchHeartRateMaxOperation(this));

From b4b4d3eb58b2ed99ad5c9ae7d0bb48d723113f61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Tue, 9 Jan 2024 17:46:56 +0000
Subject: [PATCH 316/595] Update changelog

---
 CHANGELOG.md | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b7c1c5e15..617ef4adc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,27 +6,24 @@
 * Initial support for Honor Band 4
 * Initial support for Honor Band 5
 * Initial support for Honor Band 6
-* Initial support for Honor Band 7
 * Initial support for Huawei Band 4
 * Initial support for Huawei Band 4 Pro
 * Initial support for Huawei Band 6
 * Initial support for Huawei Band 7
-* Initial support for Huawei Band 8
 * Initial support for Huawei Band 3e
 * Initial support for Huawei Band 4e
 * Initial support for Huawei Talk Band B6
 * Initial support for Huawei Watch GT
 * Initial support for Huawei Watch GT 2
-* Initial support for Huawei Watch GT 2 Pro
-* Initial support for Huawei Watch GT 2e
-* Initial support for Huawei Watch GT 3
-* Initial support for Huawei Watch GT 3 Pro
 * Initial support for Mijia LYWSD03MMC
 * Initial support for Nothing Ear (2)
 * Initial support for Nothing Ear (Stick)
+* Experimental support for Honor Band 7
+* Experimental support for Huawei Band 8
 * Experimental support for Redmi Watch 2 Lite
 * Experimental support for Redmi Smart Band Pro
 * Fossil/Skagen Hybrids: Update navigationApp to 1.1
+* Huami: Fetch SpO2 on devices that support it
 * Pebble: Attempt to fix app configuration webview
 * PineTime: Add support for InfiniTime's new simple weather
 * PineTime: Fix freeze and reboot when upgrading firmware
@@ -36,6 +33,7 @@
 * Pixoo: support "clap hands to turn off screen" and "sleep after silence" settings
 * Xiaomi: Improve activity and workout parsing
 * Xiaomi: Improve stability and fix some crashes
+* Xiaomi: Improve weather
 * Xiaomi: Parse sleep stages on some devices
 * Add a notifications channel for connection status notifications
 * Improve automatic connection to all or previous devices

From d63db41f909204f55d2a2438d67c3b114d22dd8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Tue, 9 Jan 2024 19:12:03 +0000
Subject: [PATCH 317/595] Huami: Display proper error when battery too low to
 install firmware

---
 .../huami/operations/UpdateFirmwareOperation2020.java        | 5 +++++
 app/src/main/res/values/strings.xml                          | 1 +
 2 files changed, 6 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/UpdateFirmwareOperation2020.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/UpdateFirmwareOperation2020.java
index 1db8b75e7..2ab9d6277 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/UpdateFirmwareOperation2020.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/UpdateFirmwareOperation2020.java
@@ -55,6 +55,7 @@ public class UpdateFirmwareOperation2020 extends UpdateFirmwareOperation {
     public static final byte COMMAND_FINALIZE_UPDATE = (byte) 0xd6;
 
     public static final byte REPLY_ERROR_FREE_SPACE = (byte) 0x47;
+    public static final byte REPLY_ERROR_LOW_BATTERY = (byte) 0x22;
 
     protected int mChunkLength = -1;
 
@@ -137,9 +138,13 @@ public class UpdateFirmwareOperation2020 extends UpdateFirmwareOperation {
             getSupport().logMessageContent(value);
             int errorMessage = R.string.updatefirmwareoperation_metadata_updateproblem;
             // Display a more specific error message for known errors
+
             if (value[0] == HuamiService.RESPONSE && value[1] == COMMAND_START_TRANSFER && value[2] == REPLY_ERROR_FREE_SPACE) {
                 // Not enough free space on the device
                 errorMessage = R.string.updatefirmwareoperation_updateproblem_free_space;
+            } else if (value[0] == HuamiService.RESPONSE && value[1] == COMMAND_SEND_FIRMWARE_INFO && value[2] == REPLY_ERROR_LOW_BATTERY) {
+                // Battery is too low
+                errorMessage = R.string.updatefirmwareoperation_updateproblem_low_battery;
             }
             displayMessage(getContext(), getContext().getString(errorMessage), Toast.LENGTH_LONG, GB.ERROR);
             done();
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c91041c58..df1cafc7a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -858,6 +858,7 @@
     <string name="updatefirmwareoperation_updateproblem_do_not_reboot">Problem with the firmware transfer. DO NOT REBOOT your Mi Band!</string>
     <string name="updatefirmwareoperation_metadata_updateproblem">Problem with the firmware metadata transfer</string>
     <string name="updatefirmwareoperation_updateproblem_free_space">The device does not have enough free space</string>
+    <string name="updatefirmwareoperation_updateproblem_low_battery">The device battery is too low</string>
     <string name="updatefirmwareoperation_update_complete">Firmware installation complete</string>
     <string name="updatefirmwareoperation_update_complete_rebooting">Firmware installation complete, rebooting device…</string>
     <string name="updatefirmwareoperation_write_failed">Firmware flashing failed</string>

From 6ca415a6b01c02b59967eee689e299ae9945ead3 Mon Sep 17 00:00:00 2001
From: Yusuf Cihan <git@ysfchn.com>
Date: Tue, 9 Jan 2024 21:04:49 +0300
Subject: [PATCH 318/595] Add issue forms

---
 .gitea/ISSUE_TEMPLATE.md                  | 49 --------------
 .gitea/ISSUE_TEMPLATE/bug_report.md       | 49 --------------
 .gitea/ISSUE_TEMPLATE/device_request.md   | 51 ---------------
 .gitea/ISSUE_TEMPLATE/feature_request.md  | 40 ------------
 .gitea/PULL_REQUEST_TEMPLATE.md           | 14 ----
 .gitea/issue_template/bug_report.yml      | 79 +++++++++++++++++++++++
 .gitea/issue_template/config.yml          | 11 ++++
 .gitea/issue_template/device_request.yml  | 77 ++++++++++++++++++++++
 .gitea/issue_template/feature_request.yml | 78 ++++++++++++++++++++++
 .gitea/pull_request_template.md           | 16 +++++
 10 files changed, 261 insertions(+), 203 deletions(-)
 delete mode 100644 .gitea/ISSUE_TEMPLATE.md
 delete mode 100644 .gitea/ISSUE_TEMPLATE/bug_report.md
 delete mode 100644 .gitea/ISSUE_TEMPLATE/device_request.md
 delete mode 100644 .gitea/ISSUE_TEMPLATE/feature_request.md
 delete mode 100644 .gitea/PULL_REQUEST_TEMPLATE.md
 create mode 100644 .gitea/issue_template/bug_report.yml
 create mode 100644 .gitea/issue_template/config.yml
 create mode 100644 .gitea/issue_template/device_request.yml
 create mode 100644 .gitea/issue_template/feature_request.yml
 create mode 100644 .gitea/pull_request_template.md

diff --git a/.gitea/ISSUE_TEMPLATE.md b/.gitea/ISSUE_TEMPLATE.md
deleted file mode 100644
index f6dedd485..000000000
--- a/.gitea/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,49 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-
----
-You can use the `Preview` tab ^ above to see final rendering of your report. Use `x` in brackets ([x]) to "check" a checkbox.
-
-If you just have a question, please ask first in the user chatroom in Matrix: [`#gadgetbridge:matrix.org`](https://matrix.to/#/#gadgetbridge:matrix.org)
-
-
-#### Before reporting a bug, please confirm the following:
-- [ ] I have read the [wiki](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki), and I didn't find a solution to my problem / an answer to my question.
-- [ ] I have searched the [issues](https://codeberg.org/Freeyourgadget/Gadgetbridge/issues), and I didn't find a solution to my problem / an answer to my question.
-- [ ] If you upload an image or other content, please make sure you have read and understood the [Codeberg Terms of Use](https://codeberg.org/Codeberg/org/src/branch/main/TermsOfUse.md)
-
-### Where did you get Gadgetbridge from:
-* [ ] F-Droid
-* [ ] Gadgetbridge Nightly F-Droid repository
-* [ ] Bangle.js Gadgetbridge from the Play Store
-* [ ] I built it myself from source code (specify tag / commit)
-* [ ] I previously used Gadgetbridge from other sources and then updated to F-Droid version
-
-### Your Gadgetbridge version is:
-
-(This can be found in Gadgetbridge - Menu - About: Version and Commit)
-
-#### Your issue is:
-*If possible, please attach [logs](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Log-Files)! that might help identifying the problem.*
-*Long logs can be also included but make sure to tuck them into the `details` tag:*
-
-<details>
-  <summary>Click to see my log under this fold</summary>
-
-```
-Here go lines of your log.
-```
-</details>
-
-
-#### Your wearable device is:
-
-*Please specify model and firmware version if possible*
-
-#### Your Android version/manufacturer flavor is:
-
-
-*New issues about already solved/documented topics could be closed without further comments. Same for too generic or incomplete reports.*
-
-Please use `Preview` tab above to see final rendering of your report before submitting.
diff --git a/.gitea/ISSUE_TEMPLATE/bug_report.md b/.gitea/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index f6dedd485..000000000
--- a/.gitea/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,49 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-
----
-You can use the `Preview` tab ^ above to see final rendering of your report. Use `x` in brackets ([x]) to "check" a checkbox.
-
-If you just have a question, please ask first in the user chatroom in Matrix: [`#gadgetbridge:matrix.org`](https://matrix.to/#/#gadgetbridge:matrix.org)
-
-
-#### Before reporting a bug, please confirm the following:
-- [ ] I have read the [wiki](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki), and I didn't find a solution to my problem / an answer to my question.
-- [ ] I have searched the [issues](https://codeberg.org/Freeyourgadget/Gadgetbridge/issues), and I didn't find a solution to my problem / an answer to my question.
-- [ ] If you upload an image or other content, please make sure you have read and understood the [Codeberg Terms of Use](https://codeberg.org/Codeberg/org/src/branch/main/TermsOfUse.md)
-
-### Where did you get Gadgetbridge from:
-* [ ] F-Droid
-* [ ] Gadgetbridge Nightly F-Droid repository
-* [ ] Bangle.js Gadgetbridge from the Play Store
-* [ ] I built it myself from source code (specify tag / commit)
-* [ ] I previously used Gadgetbridge from other sources and then updated to F-Droid version
-
-### Your Gadgetbridge version is:
-
-(This can be found in Gadgetbridge - Menu - About: Version and Commit)
-
-#### Your issue is:
-*If possible, please attach [logs](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Log-Files)! that might help identifying the problem.*
-*Long logs can be also included but make sure to tuck them into the `details` tag:*
-
-<details>
-  <summary>Click to see my log under this fold</summary>
-
-```
-Here go lines of your log.
-```
-</details>
-
-
-#### Your wearable device is:
-
-*Please specify model and firmware version if possible*
-
-#### Your Android version/manufacturer flavor is:
-
-
-*New issues about already solved/documented topics could be closed without further comments. Same for too generic or incomplete reports.*
-
-Please use `Preview` tab above to see final rendering of your report before submitting.
diff --git a/.gitea/ISSUE_TEMPLATE/device_request.md b/.gitea/ISSUE_TEMPLATE/device_request.md
deleted file mode 100644
index 1470500df..000000000
--- a/.gitea/ISSUE_TEMPLATE/device_request.md
+++ /dev/null
@@ -1,51 +0,0 @@
----
-name: Device request
-about: Request for a new device
-labels:
-- device request
----
-
-You are trying to submit a request for a device implementation into Gadgetbridge. We cannot make any promise that the device will be implemented, as adding an implementation for a new device requires either an experienced or a willing to learn developer, ideally with the device at hand. Without that, you may try to submit a device request and see if anyone steps up and implements it and you are basically indicating that you have the device and are willing to help with testing, should anyone try to add this device to Gadgetbridge.
-
-You can use the `Preview` tab ^ above to see final rendering of your report. Use `x` in brackets ([x]) to "check" a checkbox.
-
-#### Before proceeding further, please confirm the following:
-- [ ] I have read the [wiki](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki), and I didn't find this device mentioned there
-- [ ] I have searched the [issues](https://codeberg.org/Freeyourgadget/Gadgetbridge/issues), and I didn't find this device mentioned there
-- [ ] Please make sure you have read and understood the [Codeberg Terms of Use](https://codeberg.org/Codeberg/org/src/branch/main/TermsOfUse.md)
-
-#### Device information
-
-- Provide device name, manufacturer and similarity to other devices:
-
-
-- Ideally, use an Android Bluetooth scanner app like nRF Connect or BLExplorer and provide screenshots of the scanned device from that app. This provides a name and some available UUIDs, which are needed for implementation. You may want to blur a MAC address for privacy reasons.
-
-
-- Specify model and firmware version if possible:
-
-
-- Please let us know if you have the device and if you are able to provide logs and testing:
-
-
-- If you want to help getting this device supported (and thus speed up the process), please take a look at:
-    - what you can do as a user: [Support for a new Device](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Support-for-a-new-Device)
-    - if you are a developer and could maybe even help getting the code ready: [New Device Tutorial](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/New-Device-Tutorial)
-
-- If possible, please attach [logs](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Log-Files)! which might help to implement the device support into Gadgetbridge.
-*Long logs can be also included in the text but make sure to tuck them into the `details` tag below:*
-
-<details>
-  <summary>Click to see my log under this fold</summary>
-
-```
-Here go lines of your log.
-```
-</details>
-
-
-
-
-*New issues about already solved/documented topics could be closed without further comments. Same for too generic or incomplete reports.*
-
-Please use `Preview` tab above to see final rendering of your report before submitting.
diff --git a/.gitea/ISSUE_TEMPLATE/feature_request.md b/.gitea/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 4e92a04aa..000000000
--- a/.gitea/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,40 +0,0 @@
----
-name: Feature request
-about: Suggest a feature or an idea
----
-You can use the `Preview` tab ^ above to see final rendering of your report. Use `x` in brackets ([x]) to "check" a checkbox.
-
-If you just have a question, please ask first in the user chatroom in Matrix: [`#gadgetbridge:matrix.org`](https://matrix.to/#/#gadgetbridge:matrix.org)
-
-#### Before requesting a new feature, please confirm the following:
-- [ ] I have read the [wiki](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki), and I didn't find a solution to my problem / an answer to my question.
-- [ ] I have searched the [issues](https://codeberg.org/Freeyourgadget/Gadgetbridge/issues), and I didn't find a solution to my problem / an answer to my question.
-- [ ] If you upload an image or other content, please make sure you have read and understood the [Codeberg Terms of Use](https://codeberg.org/Codeberg/org/src/branch/main/TermsOfUse.md)
-
-#### Log files
-*If applicable, please attach [logs](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Log-Files)*
-*Long logs can be also included in the text but make sure to tuck them into the `details` tag below:*
-
-<details>
-  <summary>Click to see my log under this fold</summary>
-
-```
-Here go lines of your log.
-```
-</details>
-
-
-#### Your wearable device is:
-
-*Please specify model and firmware version if possible*
-
-#### Your Android version/manufacturer flavor is:
-
-#### Your Gadgetbridge version is:
-
-
-
-*New requests about already solved/documented topics could be closed without further comments. Same for too generic or incomplete reports.*
-
-Please use `Preview` tab above to see final rendering of your report before submitting.
-
diff --git a/.gitea/PULL_REQUEST_TEMPLATE.md b/.gitea/PULL_REQUEST_TEMPLATE.md
deleted file mode 100644
index 5b92d9460..000000000
--- a/.gitea/PULL_REQUEST_TEMPLATE.md
+++ /dev/null
@@ -1,14 +0,0 @@
-Thank you for your contribution! 🎉 
-
-Please make sure that you:
-
-- Use `git rebase` to bring your branch up to date, do not use a merge commit
-  for that
-- Do not add translations by editing the language variants of strings.xml as
-  that creates merge conflicts between Codeberg git repo and Weblate git repo,
-  use Weblate https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/
-- do not use `e.printStacktrace()`, use slf4j logger or `GB.toast` for logging
-  as per https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Developer-Documentation#logging
-- Please erase these hints from this PR :), thank you!
----
-
diff --git a/.gitea/issue_template/bug_report.yml b/.gitea/issue_template/bug_report.yml
new file mode 100644
index 000000000..a119161fc
--- /dev/null
+++ b/.gitea/issue_template/bug_report.yml
@@ -0,0 +1,79 @@
+name: Bug report
+about: Create a report to help us improve.
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to make Gadgetbridge better!
+
+        If you just have a question, please ask first in the user chatroom in Matrix at [`#gadgetbridge:matrix.org`](https://matrix.to/#/#gadgetbridge:matrix.org)
+  - type: checkboxes
+    attributes:
+      label: Please confirm that;
+      options:
+        - label: I have checked the [website](https://gadgetbridge.org), and I didn't find a solution to my problem / an answer to my question.
+          required: true
+        - label: I have searched the [issues](https://codeberg.org/Freeyourgadget/Gadgetbridge/issues), and I didn't find a solution to my problem / an answer to my question.
+          required: true
+        - label: I have read and understood the [Codeberg Terms of Use](https://codeberg.org/Codeberg/org/src/branch/main/TermsOfUse.md) for images or other type of content that I included here.
+          required: true
+  - type: dropdown
+    id: source
+    attributes:
+      label: Where did you get Gadgetbridge from?
+      options:
+        - F-Droid
+        - Gadgetbridge Nightly F-Droid repository
+        - Bangle.js Gadgetbridge from the Play Store
+        - I built it myself from source code
+        - I previously used Gadgetbridge from other sources and then updated to F-Droid version
+    validations:
+      required: true
+  - type: input
+    id: version
+    attributes:
+      label: What is your Gadgetbridge version?
+      description: |
+        This can be found in "Menu > About > Version" in Gadgetbridge. 
+        Also include tag / commit SHA if you built Gadgetbridge from the source. 
+      placeholder: e.g. "0.77.0" or "0.77.0-2618adac1" to include commit
+    validations:
+      required: true
+  - type: textarea
+    id: content
+    attributes:
+      label: What happened?
+      description: >
+        Please note that new issues about already solved/documented topics
+        **could be closed without further comments.** Same for too generic or incomplete reports.
+      placeholder: If you want to include logs, don't include it here. Use the next text field for that.
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: Do you have logs?
+      description: >
+        If possible, please attach [logs](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Log-Files)
+        that might help identifying the problem. This will be automatically formatted into 
+        code, so no need for backticks.
+      render: shell
+  - type: input
+    id: gadget
+    attributes:
+      label: What gadget do you use?
+      description: >
+        Please specify model and firmware version if possible. Leave blank if you believe the
+        issue is not specific to the gadget that you currently use with Gadgetbridge.
+      placeholder: e.g. ExampleWatch A1 with 0.1 firmware
+  - type: input
+    id: android
+    attributes:
+      label: What is your Android version/manufacturer flavor?
+      description: >
+        Android phone manufacturers may customise the Android source code as they wish, so
+        if you are using a phone that running a vendor-exclusive system (like MIUI) or if 
+        you use a custom ROM, make sure to also include the name of the OS/ROM.
+      placeholder: e.g. LineageOS 20 based on Android 13
+    validations:
+      required: true
\ No newline at end of file
diff --git a/.gitea/issue_template/config.yml b/.gitea/issue_template/config.yml
new file mode 100644
index 000000000..4abd84b80
--- /dev/null
+++ b/.gitea/issue_template/config.yml
@@ -0,0 +1,11 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Ask a question
+    url: https://matrix.to/#/#gadgetbridge:matrix.org
+    about: If you just have a question, please ask in the user chatroom in Matrix.
+  - name: Website
+    url: https://gadgetbridge.org
+    about: Visit Gadgetbridge website for FAQ, getting started and common troubleshooting.
+  - name: See supported gadgets
+    url: https://gadgetbridge.org/gadgets/
+    about: List of all supported gadget vendors and models in Gadgetbridge.
\ No newline at end of file
diff --git a/.gitea/issue_template/device_request.yml b/.gitea/issue_template/device_request.yml
new file mode 100644
index 000000000..5694033c8
--- /dev/null
+++ b/.gitea/issue_template/device_request.yml
@@ -0,0 +1,77 @@
+name: Device request
+about: Request for a new device/gadget.
+labels:
+  - device request
+body:
+  - type: markdown
+    attributes:
+      value: >
+        You are trying to submit a request for a device implementation into Gadgetbridge. 
+        **We cannot make any promise that the device will be implemented**, as adding an implementation 
+        for a new device requires either an experienced or a willing to learn developer, 
+        ideally with the device at hand. Without that, you may try to submit a device request 
+        and see if anyone steps up and implements it and you are basically indicating that you 
+        have the device and are willing to help with testing, should anyone try to add 
+        this device to Gadgetbridge.
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to make Gadgetbridge better!
+
+        If you just have a question, please ask first in the user chatroom in Matrix at [`#gadgetbridge:matrix.org`](https://matrix.to/#/#gadgetbridge:matrix.org)
+  - type: checkboxes
+    attributes:
+      label: Please confirm that;
+      options:
+        - label: I have checked the [website](https://gadgetbridge.org) and [gadget list](https://gadgetbridge.org/gadgets/), and I didn't find this device mentioned there.
+          required: true
+        - label: I have searched the [issues](https://codeberg.org/Freeyourgadget/Gadgetbridge/issues), and I didn't find this device mentioned there.
+          required: true
+        - label: I have read and understood the [Codeberg Terms of Use](https://codeberg.org/Codeberg/org/src/branch/main/TermsOfUse.md) for images or other type of content that I included here.
+          required: true
+  - type: input
+    id: gadget
+    attributes:
+      label: Which gadget are you requesting support for?
+      description: Please specify name, manufacturer, model and firmware version if possible.
+      placeholder: e.g. ExampleWatch A1 with 0.1 firmware
+    validations:
+      required: true
+  - type: input
+    id: version
+    attributes:
+      label: Does this gadget have similarities to other gadgets?
+      description: >
+        If the gadget you request support for has similarities to other gadgets that we currently support,
+        it is more likely for us (still, not guaranteed) to add support for your gadget too.
+  - type: textarea
+    id: info
+    attributes:
+      label: Device information
+      description: >
+        Include all details about the gadget that will be useful to us when implementing a support for this gadget. 
+        
+        Ideally, use an Android Bluetooth scanner app like nRF Connect or BLExplorer and provide screenshots 
+        of the scanned gadget from that app. This provides a name and some available UUIDs, which are needed 
+        for implementation. You may want to blur MAC addresses for privacy reasons.
+      placeholder: If you want to include logs, don't include it here. Use the next text field for that.
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: Do you have logs?
+      description: >
+        If possible, please attach [logs](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Log-Files)
+        which might help to implement the device support into Gadgetbridge. This will be automatically 
+        formatted into code, so no need for backticks.
+      render: shell
+  - type: dropdown
+    id: source
+    attributes:
+      label: Do you have the gadget and are you able to help us for testing?
+      options:
+        - Yes, I have the gadget and I'm willing to provide further feedback and help testing.
+        - No, I don't have the gadget or/and I'm not able to help during the development.
+    validations:
+      required: true
\ No newline at end of file
diff --git a/.gitea/issue_template/feature_request.yml b/.gitea/issue_template/feature_request.yml
new file mode 100644
index 000000000..dee2148f3
--- /dev/null
+++ b/.gitea/issue_template/feature_request.yml
@@ -0,0 +1,78 @@
+name: Feature request
+about: Suggest a feature or an idea.
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to make Gadgetbridge better!
+
+        If you just have a question, please ask first in the user chatroom in Matrix at [`#gadgetbridge:matrix.org`](https://matrix.to/#/#gadgetbridge:matrix.org)
+  - type: checkboxes
+    attributes:
+      label: Please confirm that;
+      options:
+        - label: I have checked the [website](https://gadgetbridge.org), and I didn't find a solution to my problem / an answer to my question.
+          required: true
+        - label: I have searched the [issues](https://codeberg.org/Freeyourgadget/Gadgetbridge/issues), and I didn't find a solution to my problem / an answer to my question.
+          required: true
+        - label: I have read and understood the [Codeberg Terms of Use](https://codeberg.org/Codeberg/org/src/branch/main/TermsOfUse.md) for images or other type of content that I included here.
+          required: true
+  - type: dropdown
+    id: source
+    attributes:
+      label: Where did you get Gadgetbridge from?
+      options:
+        - F-Droid
+        - Gadgetbridge Nightly F-Droid repository
+        - Bangle.js Gadgetbridge from the Play Store
+        - I built it myself from source code
+        - I previously used Gadgetbridge from other sources and then updated to F-Droid version
+    validations:
+      required: true
+  - type: input
+    id: version
+    attributes:
+      label: What is your Gadgetbridge version?
+      description: |
+        This can be found in "Menu > About > Version" in Gadgetbridge. 
+        Also include tag / commit SHA if you built Gadgetbridge from the source. 
+      placeholder: e.g. "0.77.0" or "0.77.0-2618adac1" to include commit
+    validations:
+      required: true
+  - type: textarea
+    id: content
+    attributes:
+      label: What is your suggestion/idea?
+      description: >
+        Please note that new requests about already solved/documented topics
+        **could be closed without further comments.** Same for too generic or incomplete reports.
+      placeholder: If you want to include logs, don't include it here. Use the next text field for that.
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: Do you have logs?
+      description: >
+        If possible, please attach [logs.](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Log-Files)
+        This will be automatically formatted into code, so no need for backticks.
+      render: shell
+  - type: input
+    id: gadget
+    attributes:
+      label: What gadget do you use?
+      description: >
+        Please specify model and firmware version if possible. Leave blank if you believe the
+        issue is not specific to the gadget that you currently use with Gadgetbridge.
+      placeholder: e.g. ExampleWatch A1 with 0.1 firmware
+  - type: input
+    id: android
+    attributes:
+      label: What is your Android version/manufacturer flavor?
+      description: >
+        Android phone manufacturers may customise the Android source code as they wish, so
+        if you are using a phone that running a vendor-exclusive system (like MIUI) or if 
+        you use a custom ROM, make sure to also include the name of the OS/ROM.
+      placeholder: e.g. LineageOS 20 based on Android 13
+    validations:
+      required: true
\ No newline at end of file
diff --git a/.gitea/pull_request_template.md b/.gitea/pull_request_template.md
new file mode 100644
index 000000000..021ab4b7b
--- /dev/null
+++ b/.gitea/pull_request_template.md
@@ -0,0 +1,16 @@
+<!-- 
+    Thank you for your contribution! 🎉 
+
+    Please make sure that you:
+
+    - Use `git rebase` to bring your branch up to date, do not use a merge commit for that.
+
+    - Do not add translations by editing the language variants of strings.xml as that 
+      creates merge conflicts between Codeberg git repo and Weblate git repo,
+      use Weblate https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/
+
+    - Do not use `e.printStacktrace()`, use slf4j logger or `GB.toast` for logging
+      as per https://gadgetbridge.org/internals/development/project-overview/#logging
+    
+    You can erase this comment from PR description, thank you!
+-->
\ No newline at end of file

From 1d4ce8ccc898eeea73b878611df54c40ba70171d Mon Sep 17 00:00:00 2001
From: Yusuf Cihan <git@ysfchn.com>
Date: Tue, 9 Jan 2024 23:05:59 +0300
Subject: [PATCH 319/595] Change log link

---
 .gitea/issue_template/bug_report.yml      | 2 +-
 .gitea/issue_template/device_request.yml  | 2 +-
 .gitea/issue_template/feature_request.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitea/issue_template/bug_report.yml b/.gitea/issue_template/bug_report.yml
index a119161fc..06d4c88b4 100644
--- a/.gitea/issue_template/bug_report.yml
+++ b/.gitea/issue_template/bug_report.yml
@@ -54,7 +54,7 @@ body:
     attributes:
       label: Do you have logs?
       description: >
-        If possible, please attach [logs](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Log-Files)
+        If possible, please attach [logs](https://gadgetbridge.org/internals/topics/logs/)
         that might help identifying the problem. This will be automatically formatted into 
         code, so no need for backticks.
       render: shell
diff --git a/.gitea/issue_template/device_request.yml b/.gitea/issue_template/device_request.yml
index 5694033c8..724f12054 100644
--- a/.gitea/issue_template/device_request.yml
+++ b/.gitea/issue_template/device_request.yml
@@ -62,7 +62,7 @@ body:
     attributes:
       label: Do you have logs?
       description: >
-        If possible, please attach [logs](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Log-Files)
+        If possible, please attach [logs](https://gadgetbridge.org/internals/topics/logs/)
         which might help to implement the device support into Gadgetbridge. This will be automatically 
         formatted into code, so no need for backticks.
       render: shell
diff --git a/.gitea/issue_template/feature_request.yml b/.gitea/issue_template/feature_request.yml
index dee2148f3..e1e469660 100644
--- a/.gitea/issue_template/feature_request.yml
+++ b/.gitea/issue_template/feature_request.yml
@@ -54,7 +54,7 @@ body:
     attributes:
       label: Do you have logs?
       description: >
-        If possible, please attach [logs.](https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Log-Files)
+        If possible, please attach [logs.](https://gadgetbridge.org/internals/topics/logs/)
         This will be automatically formatted into code, so no need for backticks.
       render: shell
   - type: input

From 3beba4862fc7b847d8da1b8cdadc22bd3d838375 Mon Sep 17 00:00:00 2001
From: Yusuf Cihan <git@ysfchn.com>
Date: Tue, 9 Jan 2024 23:49:07 +0300
Subject: [PATCH 320/595] Remove requirement for Android version

---
 .gitea/issue_template/bug_report.yml      | 4 +---
 .gitea/issue_template/feature_request.yml | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/.gitea/issue_template/bug_report.yml b/.gitea/issue_template/bug_report.yml
index 06d4c88b4..a4c186ae0 100644
--- a/.gitea/issue_template/bug_report.yml
+++ b/.gitea/issue_template/bug_report.yml
@@ -74,6 +74,4 @@ body:
         Android phone manufacturers may customise the Android source code as they wish, so
         if you are using a phone that running a vendor-exclusive system (like MIUI) or if 
         you use a custom ROM, make sure to also include the name of the OS/ROM.
-      placeholder: e.g. LineageOS 20 based on Android 13
-    validations:
-      required: true
\ No newline at end of file
+      placeholder: e.g. LineageOS 20 based on Android 13
\ No newline at end of file
diff --git a/.gitea/issue_template/feature_request.yml b/.gitea/issue_template/feature_request.yml
index e1e469660..cdabcef1a 100644
--- a/.gitea/issue_template/feature_request.yml
+++ b/.gitea/issue_template/feature_request.yml
@@ -73,6 +73,4 @@ body:
         Android phone manufacturers may customise the Android source code as they wish, so
         if you are using a phone that running a vendor-exclusive system (like MIUI) or if 
         you use a custom ROM, make sure to also include the name of the OS/ROM.
-      placeholder: e.g. LineageOS 20 based on Android 13
-    validations:
-      required: true
\ No newline at end of file
+      placeholder: e.g. LineageOS 20 based on Android 13
\ No newline at end of file

From 4c7476845b466cdc8d2eb3275eaa89994ffadc1b Mon Sep 17 00:00:00 2001
From: FYG_license_bot_ignore_me <license-bot@freeyourgadget.org>
Date: Wed, 10 Jan 2024 18:54:00 +0100
Subject: [PATCH 321/595] Update license headers and CONTRIBUTORS file

---
 CONTRIBUTORS.rst                              | 20 +++++------
 .../gadgetbridge/GBApplication.java           | 10 +++---
 .../gadgetbridge/GBEnvironment.java           |  4 +--
 .../gadgetbridge/GBException.java             |  4 +--
 .../gadgetbridge/LockHandler.java             |  4 +--
 .../freeyourgadget/gadgetbridge/Logging.java  |  5 +--
 .../gadgetbridge/LoggingExceptionHandler.java |  4 +--
 .../gadgetbridge/SleepAlarmWidget.java        |  5 +--
 .../freeyourgadget/gadgetbridge/Widget.java   | 23 ++-----------
 .../activities/AboutActivity.java             |  5 ++-
 .../AboutUserPreferencesActivity.java         |  5 ++-
 .../AbstractFragmentPagerAdapter.java         |  4 +--
 .../activities/AbstractGBActivity.java        |  6 ++--
 .../activities/AbstractGBFragment.java        |  4 +--
 .../AbstractGBFragmentActivity.java           |  4 +--
 .../activities/AbstractListActivity.java      |  4 +--
 .../AbstractPreferenceFragment.java           |  4 +--
 .../activities/AbstractSettingsActivity.java  |  6 ++--
 .../AbstractSettingsActivityV2.java           |  4 +--
 .../activities/ActivitySummariesActivity.java |  6 ++--
 .../ActivitySummariesChartFragment.java       |  5 ++-
 .../activities/ActivitySummariesFilter.java   |  4 +--
 .../ActivitySummariesGpsFragment.java         |  5 ++-
 .../activities/ActivitySummaryDetail.java     |  6 ++--
 .../gadgetbridge/activities/AlarmDetails.java |  6 ++--
 .../activities/AndroidPairingActivity.java    |  4 +--
 .../activities/AppBlacklistActivity.java      |  6 ++--
 .../activities/BatteryInfoActivity.java       | 16 +++++++++
 .../activities/BatteryInfoChartFragment.java  |  5 ++-
 .../activities/CalBlacklistActivity.java      |  5 +--
 .../activities/ConfigureAlarms.java           |  7 ++--
 .../activities/ConfigureContacts.java         |  4 +--
 .../activities/ConfigureReminders.java        |  4 +--
 .../activities/ConfigureWorldClocks.java      |  4 +--
 .../activities/ContactDetails.java            |  4 +--
 .../activities/ControlCenterv2.java           |  8 +++--
 .../activities/DataManagementActivity.java    |  5 ++-
 .../activities/DebugActivity.java             |  9 ++---
 .../activities/ExternalPebbleJSActivity.java  |  6 ++--
 .../activities/FindPhoneActivity.java         |  6 ++--
 .../activities/FwAppInstallerActivity.java    |  6 ++--
 .../gadgetbridge/activities/GBActivity.java   |  4 +--
 .../activities/GpxReceiverActivity.java       |  5 ++-
 .../activities/HeartRateDialog.java           | 16 +++++++++
 .../activities/HeartRateUtils.java            |  4 +--
 .../activities/InstallActivity.java           |  4 +--
 .../NotificationFilterActivity.java           |  4 +--
 .../NotificationManagementActivity.java       |  5 ++-
 .../OpenFwAppInstallerActivity.java           |  4 +--
 .../activities/ReminderDetails.java           |  4 +--
 .../activities/SettingsActivity.java          |  9 ++---
 ...SleepAlarmWidgetConfigurationActivity.java | 17 ++++++++++
 .../activities/TextReceiverActivity.java      |  4 +--
 .../activities/VibrationActivity.java         |  4 +--
 .../gadgetbridge/activities/WakeActivity.java | 16 +++++++++
 .../activities/WidgetAlarmsActivity.java      |  5 +--
 .../WidgetConfigurationActivity.java          | 16 +++++++++
 .../activities/WorldClockDetails.java         |  4 +--
 ...pSpecificNotificationSettingsActivity.java | 33 ++++++++----------
 ...ficNotificationSettingsDetailActivity.java | 33 ++++++++----------
 .../AbstractAppManagerFragment.java           |  7 ++--
 .../appmanager/AppManagerActivity.java        |  6 ++--
 .../appmanager/AppManagerFragmentCache.java   |  4 +--
 .../AppManagerFragmentInstalledApps.java      |  5 +--
 ...AppManagerFragmentInstalledWatchfaces.java |  4 +--
 .../charts/AbstractActivityChartFragment.java |  5 ++-
 .../charts/AbstractChartFragment.java         |  6 ++--
 .../charts/AbstractChartsActivity.java        |  5 ++-
 .../charts/AbstractWeekChartFragment.java     |  6 ++--
 .../activities/charts/ActivityAnalysis.java   |  6 ++--
 .../charts/ActivityChartsActivity.java        |  5 ++-
 .../charts/ActivityListingAdapter.java        | 16 +++++++++
 .../charts/ActivityListingChartFragment.java  |  5 ++-
 .../charts/ActivityListingDashboard.java      | 16 +++++++++
 .../charts/ActivityListingDetail.java         | 16 +++++++++
 .../charts/ActivitySleepChartFragment.java    |  6 ++--
 .../charts/AngledLabelsChartRenderer.java     |  4 +--
 .../activities/charts/ChartsData.java         |  4 +--
 .../activities/charts/ChartsHost.java         |  5 +--
 .../charts/ChartsPreferencesActivity.java     |  5 ++-
 .../activities/charts/CustomBarChart.java     |  4 +--
 .../activities/charts/DefaultChartsData.java  |  5 ++-
 .../charts/LiveActivityFragment.java          |  6 ++--
 .../charts/NonSwipeableViewPager.java         |  5 ++-
 .../activities/charts/PaiChartFragment.java   |  4 +--
 .../PreformattedXIndexLabelFormatter.java     |  5 ++-
 .../charts/SampleXLabelFormatter.java         |  5 ++-
 .../activities/charts/ShowDurationDialog.java |  5 ++-
 .../charts/SingleEntryValueAnimator.java      |  4 +--
 .../activities/charts/SleepAnalysis.java      |  4 +--
 .../activities/charts/SleepChartFragment.java |  6 ++--
 .../activities/charts/SleepUtils.java         |  4 +--
 .../activities/charts/SpeedZonesFragment.java |  5 ++-
 .../activities/charts/Spo2ChartFragment.java  |  4 +--
 .../activities/charts/StepAnalysis.java       |  4 +--
 .../charts/StepStreaksDashboard.java          | 16 +++++++++
 .../charts/StressChartFragment.java           |  4 +--
 .../charts/TimestampTranslation.java          |  5 ++-
 .../charts/TimestampValueFormatter.java       |  4 +--
 .../charts/TrailingActivitySample.java        |  4 +--
 .../charts/WeekSleepChartFragment.java        |  6 ++--
 .../charts/WeekStepsChartFragment.java        |  6 ++--
 .../DeviceSettingsActivity.java               |  4 +--
 .../DeviceSettingsPreferenceConst.java        |  8 +++--
 .../devicesettings/DeviceSettingsUtils.java   |  4 +--
 .../DeviceSpecificSettingsCustomizer.java     |  4 +--
 .../DeviceSpecificSettingsFragment.java       |  7 ++--
 .../DeviceSpecificSettingsHandler.java        |  4 +--
 .../discovery/DiscoveryActivityV2.java        |  6 ++--
 .../DiscoveryPairingPreferenceActivity.java   |  5 ++-
 .../activities/discovery/GBScanEvent.java     |  4 +--
 .../discovery/GBScanEventProcessor.java       |  6 ++--
 .../LoyaltyCardsSettingsActivity.java         |  4 +--
 .../LoyaltyCardsSettingsConst.java            |  4 +--
 .../LoyaltyCardsSettingsFragment.java         |  4 +--
 .../widgets/WidgetScreenDetailsActivity.java  |  4 +--
 .../widgets/WidgetScreenListAdapter.java      |  4 +--
 .../widgets/WidgetScreensListActivity.java    |  4 +--
 .../AbstractActivityListingAdapter.java       |  5 ++-
 .../adapter/AbstractItemAdapter.java          |  6 ++--
 .../adapter/ActivitySummariesAdapter.java     |  5 +--
 .../adapter/AppBlacklistAdapter.java          |  6 ++--
 ...ficNotificationSettingsAppListAdapter.java | 34 +++++++++----------
 .../adapter/DeviceCandidateAdapter.java       |  5 +--
 .../adapter/GBAlarmListAdapter.java           |  6 ++--
 .../adapter/GBContactListAdapter.java         |  4 +--
 .../adapter/GBDeviceAdapterv2.java            |  8 +++--
 .../adapter/GBDeviceAppAdapter.java           |  6 ++--
 .../adapter/GBReminderListAdapter.java        |  4 +--
 .../adapter/GBWorldClockListAdapter.java      |  4 +--
 .../adapter/ItemWithDetailsAdapter.java       |  5 +--
 .../adapter/SpinnerWithIconAdapter.java       | 16 +++++++++
 .../adapter/SpinnerWithIconItem.java          | 16 +++++++++
 .../capabilities/GpsCapability.java           |  4 +--
 .../capabilities/HeartRateCapability.java     |  4 +--
 .../WorkoutDetectionCapability.java           |  4 +--
 .../loyaltycards/BarcodeFormat.java           |  4 +--
 .../loyaltycards/CatimaContentProvider.java   |  4 +--
 .../loyaltycards/CatimaManager.java           |  4 +--
 .../loyaltycards/LoyaltyCard.java             |  4 +--
 .../password/PasswordCapabilityImpl.java      |  4 +--
 .../capabilities/widgets/WidgetLayout.java    |  4 +--
 .../capabilities/widgets/WidgetManager.java   |  4 +--
 .../capabilities/widgets/WidgetPart.java      |  4 +--
 .../widgets/WidgetPartSubtype.java            |  4 +--
 .../capabilities/widgets/WidgetScreen.java    |  4 +--
 .../capabilities/widgets/WidgetType.java      |  4 +--
 .../PebbleContentProvider.java                |  4 +--
 ...pecificNotificationSettingsRepository.java | 33 ++++++++----------
 .../gadgetbridge/database/DBAccess.java       |  4 +--
 .../gadgetbridge/database/DBHandler.java      |  4 +--
 .../gadgetbridge/database/DBHelper.java       |  7 ++--
 .../gadgetbridge/database/DBOpenHelper.java   |  4 +--
 .../gadgetbridge/database/DBUpdateScript.java |  4 +--
 .../database/PeriodicExporter.java            |  5 +--
 .../schema/GadgetbridgeUpdate_14.java         |  4 +--
 .../schema/GadgetbridgeUpdate_15.java         |  4 +--
 .../schema/GadgetbridgeUpdate_17.java         |  4 +--
 .../schema/GadgetbridgeUpdate_22.java         |  4 +--
 .../schema/GadgetbridgeUpdate_23.java         |  4 +--
 .../schema/GadgetbridgeUpdate_24.java         |  4 +--
 .../schema/GadgetbridgeUpdate_26.java         |  4 +--
 .../schema/GadgetbridgeUpdate_27.java         |  4 +--
 .../schema/GadgetbridgeUpdate_29.java         |  4 +--
 .../schema/GadgetbridgeUpdate_30.java         |  4 +--
 .../schema/GadgetbridgeUpdate_35.java         |  4 +--
 .../schema/GadgetbridgeUpdate_42.java         |  4 +--
 .../schema/GadgetbridgeUpdate_44.java         |  4 +--
 .../schema/GadgetbridgeUpdate_45.java         |  4 +--
 .../schema/GadgetbridgeUpdate_51.java         |  4 +--
 .../schema/GadgetbridgeUpdate_62.java         |  4 +--
 .../schema/GadgetbridgeUpdate_66.java         |  4 +--
 .../database/schema/SchemaMigration.java      |  4 +--
 .../deviceevents/GBDeviceEvent.java           |  4 +--
 .../deviceevents/GBDeviceEventAppInfo.java    |  4 +--
 .../GBDeviceEventAppManagement.java           |  4 +--
 .../deviceevents/GBDeviceEventAppMessage.java |  4 +--
 .../GBDeviceEventBatteryInfo.java             |  5 +--
 .../GBDeviceEventCallControl.java             |  4 +--
 .../GBDeviceEventDisplayMessage.java          |  4 +--
 .../deviceevents/GBDeviceEventFindPhone.java  |  4 +--
 .../GBDeviceEventFmFrequency.java             |  4 +--
 .../deviceevents/GBDeviceEventLEDColor.java   |  4 +--
 .../GBDeviceEventMusicControl.java            |  4 +--
 .../GBDeviceEventNotificationControl.java     |  4 +--
 .../deviceevents/GBDeviceEventScreenshot.java |  4 +--
 .../deviceevents/GBDeviceEventSendBytes.java  |  4 +--
 .../deviceevents/GBDeviceEventSilentMode.java |  4 +--
 .../GBDeviceEventSleepStateDetection.java     |  4 +--
 .../GBDeviceEventUpdateDeviceInfo.java        |  4 +--
 .../GBDeviceEventUpdateDeviceState.java       |  4 +--
 .../GBDeviceEventUpdatePreferences.java       |  4 +--
 .../GBDeviceEventVersionInfo.java             |  4 +--
 .../deviceevents/GBDeviceEventWearState.java  |  4 +--
 .../pebble/GBDeviceEventDataLogging.java      |  4 +--
 .../AbstractBLClassicDeviceCoordinator.java   | 16 +++++++++
 .../devices/AbstractBLEDeviceCoordinator.java | 16 +++++++++
 .../devices/AbstractDeviceCoordinator.java    |  9 ++---
 .../devices/AbstractSampleProvider.java       |  6 ++--
 .../AbstractSampleToTimeSampleProvider.java   |  4 +--
 .../devices/AbstractTimeSampleProvider.java   |  5 ++-
 .../devices/DeviceCoordinator.java            |  9 ++---
 .../gadgetbridge/devices/DeviceManager.java   |  6 ++--
 .../gadgetbridge/devices/EventHandler.java    |  6 ++--
 .../gadgetbridge/devices/InstallHandler.java  |  4 +--
 .../gadgetbridge/devices/SampleProvider.java  |  6 ++--
 .../devices/TimeSampleProvider.java           |  4 +--
 .../devices/UnknownDeviceCoordinator.java     |  6 ++--
 .../amazfitbip/BipActivitySummary.java        |  4 +--
 .../asteroidos/AsteroidOSConstants.java       | 16 +++++++++
 .../AsteroidOSDeviceCoordinator.java          | 17 ++++++++++
 .../asteroidos/AsteroidOSMediaCommand.java    | 16 +++++++++
 .../asteroidos/AsteroidOSNotification.java    | 16 +++++++++
 .../devices/asteroidos/AsteroidOSWeather.java | 16 +++++++++
 .../banglejs/AppsManagementActivity.java      | 16 +++++++++
 .../devices/banglejs/BangleJSConstants.java   |  4 +--
 .../devices/banglejs/BangleJSCoordinator.java |  7 ++--
 .../banglejs/BangleJSSampleProvider.java      |  4 +--
 .../banglejs/BangleJSSettingsCustomizer.java  |  4 +--
 .../binary_sensor/activity/DataActivity.java  | 16 +++++++++
 .../coordinator/BinarySensorCoordinator.java  | 17 ++++++++++
 .../devices/casio/CasioConstants.java         |  4 +--
 .../devices/casio/CasioDeviceCoordinator.java |  7 ++--
 .../gb6900/CasioGB6900DeviceCoordinator.java  |  9 +++--
 .../gbx100/CasioGBX100DeviceCoordinator.java  |  9 +++--
 .../gbx100/CasioGBX100SampleProvider.java     |  5 ++-
 .../CasioGMWB5000DeviceCoordinator.java       |  7 ++--
 .../CasioGWB5600DeviceCoordinator.java        |  7 ++--
 .../devices/divoom/PixooCoordinator.java      |  4 +--
 .../devices/divoom/PixooInstallHandler.java   |  4 +--
 .../devices/domyos/DomyosT540Coordinator.java |  5 ++-
 .../FemometerVinca2DeviceCoordinator.java     |  5 ++-
 .../FemometerVinca2SampleProvider.java        |  5 ++-
 .../devices/fitpro/FitProConstants.java       |  4 +--
 .../fitpro/FitProDeviceCoordinator.java       |  5 +--
 .../devices/fitpro/FitProSampleProvider.java  |  4 +--
 .../fitpro/colacao/ColaCao21Coordinator.java  |  4 +--
 .../fitpro/colacao/ColaCao23Coordinator.java  |  4 +--
 .../flipper/zero/FlipperZeroCoordinator.java  | 16 +++++++++
 .../GalaxyBuds2DeviceCoordinator.java         | 16 +++++++++
 .../GalaxyBuds2ProDeviceCoordinator.java      | 16 +++++++++
 .../GalaxyBudsDeviceCoordinator.java          | 16 +++++++++
 .../GalaxyBudsGenericCoordinator.java         | 17 ++++++++++
 .../GalaxyBudsLiveDeviceCoordinator.java      | 16 +++++++++
 .../GalaxyBudsProDeviceCoordinator.java       | 16 +++++++++
 .../GalaxyBudsSettingsCustomizer.java         |  4 +--
 .../devices/hplus/EXRIZUK8Coordinator.java    |  5 +--
 .../devices/hplus/HPlusConstants.java         |  4 +--
 .../devices/hplus/HPlusCoordinator.java       |  7 ++--
 .../hplus/HPlusHealthSampleProvider.java      |  4 +--
 .../devices/hplus/HPlusSettingsActivity.java  |  4 +--
 .../devices/hplus/HPlusWeatherCode.java       |  4 +--
 .../devices/hplus/MakibesF68Coordinator.java  |  5 +--
 .../devices/hplus/Q8Coordinator.java          |  5 +--
 .../devices/hplus/SG2Coordinator.java         |  5 ++-
 .../devices/huami/ActivateDisplayOnLift.java  |  4 +--
 .../ActivateDisplayOnLiftSensitivity.java     |  4 +--
 .../devices/huami/AlwaysOnDisplay.java        |  4 +--
 .../huami/DisconnectNotificationSetting.java  |  4 +--
 .../huami/Huami2021ActivitySummaryParser.java |  4 +--
 .../devices/huami/Huami2021Coordinator.java   |  4 +--
 .../devices/huami/Huami2021Service.java       |  4 +--
 .../huami/Huami2021SettingsCustomizer.java    |  4 +--
 .../huami/HuamiActivitySummaryParser.java     |  6 ++--
 .../devices/huami/HuamiConst.java             |  7 ++--
 .../devices/huami/HuamiCoordinator.java       |  6 ++--
 .../huami/HuamiExtendedSampleProvider.java    |  4 +--
 .../devices/huami/HuamiFWHelper.java          |  6 ++--
 .../HuamiHeartRateManualSampleProvider.java   |  4 +--
 .../HuamiHeartRateMaxSampleProvider.java      |  4 +--
 .../HuamiHeartRateRestingSampleProvider.java  |  4 +--
 .../devices/huami/HuamiPaiSampleProvider.java |  4 +--
 .../devices/huami/HuamiService.java           |  5 ++-
 .../huami/HuamiSettingsCustomizer.java        |  4 +--
 ...amiSleepRespiratoryRateSampleProvider.java |  4 +--
 .../huami/HuamiSpo2SampleProvider.java        |  4 +--
 .../huami/HuamiStressSampleProvider.java      |  4 +--
 .../devices/huami/HuamiWeatherConditions.java |  4 +--
 .../AmazfitActiveCoordinator.java             |  4 +--
 .../amazfitactive/AmazfitActiveFWHelper.java  |  4 +--
 .../AmazfitActiveFWInstallHandler.java        |  4 +--
 .../AmazfitActiveEdgeCoordinator.java         |  4 +--
 .../AmazfitActiveEdgeFWHelper.java            |  4 +--
 .../AmazfitActiveEdgeFWInstallHandler.java    |  4 +--
 .../AmazfitBalanceCoordinator.java            |  4 +--
 .../AmazfitBalanceFWHelper.java               |  4 +--
 .../AmazfitBalanceFWInstallHandler.java       |  4 +--
 .../amazfitband5/AmazfitBand5Coordinator.java |  6 ++--
 .../amazfitband5/AmazfitBand5FWHelper.java    |  4 +--
 .../AmazfitBand5FWInstallHandler.java         |  4 +--
 .../amazfitband7/AmazfitBand7Coordinator.java |  4 +--
 .../amazfitband7/AmazfitBand7FWHelper.java    |  4 +--
 .../AmazfitBand7FWInstallHandler.java         |  4 +--
 .../amazfitbip/AmazfitBipCoordinator.java     |  6 ++--
 .../huami/amazfitbip/AmazfitBipFWHelper.java  |  5 ++-
 .../AmazfitBipFWInstallHandler.java           |  4 +--
 .../amazfitbip/AmazfitBipLiteCoordinator.java |  6 ++--
 .../amazfitbip/AmazfitBipLiteFWHelper.java    |  5 ++-
 .../AmazfitBipLiteFWInstallHandler.java       |  4 +--
 .../huami/amazfitbip/AmazfitBipService.java   |  4 +--
 .../AmazfitBip3ProCoordinator.java            |  4 +--
 .../AmazfitBip3ProFWHelper.java               |  4 +--
 .../AmazfitBip3ProFWInstallHandler.java       |  4 +--
 .../amazfitbip5/AmazfitBip5Coordinator.java   |  4 +--
 .../amazfitbip5/AmazfitBip5FWHelper.java      |  4 +--
 .../AmazfitBip5FWInstallHandler.java          |  4 +--
 .../amazfitbips/AmazfitBipSCoordinator.java   |  6 ++--
 .../amazfitbips/AmazfitBipSFWHelper.java      |  4 +--
 .../AmazfitBipSFWInstallHandler.java          |  4 +--
 .../AmazfitBipSLiteCoordinator.java           |  5 ++-
 .../amazfitbips/AmazfitBipSLiteFWHelper.java  |  4 +--
 .../AmazfitBipSLiteFWInstallHandler.java      |  4 +--
 .../amazfitbipu/AmazfitBipUCoordinator.java   |  7 ++--
 .../amazfitbipu/AmazfitBipUFWHelper.java      |  4 +--
 .../AmazfitBipUFWInstallHandler.java          |  4 +--
 .../AmazfitBipUProCoordinator.java            |  7 ++--
 .../AmazfitBipUProFWHelper.java               |  4 +--
 .../AmazfitBipUProFWInstallHandler.java       |  4 +--
 .../AmazfitCheetahProCoordinator.java         |  4 +--
 .../AmazfitCheetahProFWHelper.java            |  4 +--
 .../AmazfitCheetahProFWInstallHandler.java    |  4 +--
 .../AmazfitCheetahRoundCoordinator.java       |  4 +--
 .../AmazfitCheetahRoundFWHelper.java          |  4 +--
 .../AmazfitCheetahRoundFWInstallHandler.java  |  4 +--
 .../AmazfitCheetahSquareCoordinator.java      |  4 +--
 .../AmazfitCheetahSquareFWHelper.java         |  4 +--
 .../AmazfitCheetahSquareFWInstallHandler.java |  4 +--
 .../amazfitcor/AmazfitCorCoordinator.java     |  6 ++--
 .../huami/amazfitcor/AmazfitCorFWHelper.java  |  4 +--
 .../AmazfitCorFWInstallHandler.java           |  4 +--
 .../amazfitcor2/AmazfitCor2Coordinator.java   |  6 ++--
 .../amazfitcor2/AmazfitCor2FWHelper.java      |  4 +--
 .../AmazfitCor2FWInstallHandler.java          |  4 +--
 .../AmazfitFalconCoordinator.java             |  4 +--
 .../amazfitfalcon/AmazfitFalconFWHelper.java  |  4 +--
 .../AmazfitFalconFWInstallHandler.java        |  4 +--
 .../amazfitgtr/AmazfitGTRCoordinator.java     |  6 ++--
 .../huami/amazfitgtr/AmazfitGTRFWHelper.java  |  5 ++-
 .../AmazfitGTRFWInstallHandler.java           |  4 +--
 .../amazfitgtr/AmazfitGTRLiteCoordinator.java |  6 ++--
 .../amazfitgtr/AmazfitGTRLiteFWHelper.java    |  5 ++-
 .../AmazfitGTRLiteFWInstallHandler.java       |  4 +--
 .../amazfitgtr2/AmazfitGTR2Coordinator.java   |  6 ++--
 .../amazfitgtr2/AmazfitGTR2FWHelper.java      |  5 ++-
 .../AmazfitGTR2FWInstallHandler.java          |  4 +--
 .../amazfitgtr2/AmazfitGTR2eCoordinator.java  |  6 ++--
 .../amazfitgtr2/AmazfitGTR2eFWHelper.java     |  5 ++-
 .../AmazfitGTR2eFWInstallHandler.java         |  4 +--
 .../amazfitgtr3/AmazfitGTR3Coordinator.java   |  4 +--
 .../amazfitgtr3/AmazfitGTR3FWHelper.java      |  4 +--
 .../AmazfitGTR3FWInstallHandler.java          |  4 +--
 .../AmazfitGTR3ProCoordinator.java            |  4 +--
 .../AmazfitGTR3ProFWHelper.java               |  4 +--
 .../AmazfitGTR3ProFWInstallHandler.java       |  4 +--
 .../amazfitgtr4/AmazfitGTR4Coordinator.java   |  4 +--
 .../amazfitgtr4/AmazfitGTR4FWHelper.java      |  4 +--
 .../AmazfitGTR4FWInstallHandler.java          |  4 +--
 .../AmazfitGTRMiniCoordinator.java            |  4 +--
 .../AmazfitGTRMiniFWHelper.java               |  4 +--
 .../AmazfitGTRMiniFWInstallHandler.java       |  4 +--
 .../amazfitgts/AmazfitGTSCoordinator.java     |  5 +--
 .../huami/amazfitgts/AmazfitGTSFWHelper.java  |  5 ++-
 .../AmazfitGTSFWInstallHandler.java           |  4 +--
 .../amazfitgts2/AmazfitGTS2Coordinator.java   |  6 ++--
 .../amazfitgts2/AmazfitGTS2FWHelper.java      |  5 ++-
 .../AmazfitGTS2FWInstallHandler.java          |  4 +--
 .../AmazfitGTS2MiniCoordinator.java           |  6 ++--
 .../amazfitgts2/AmazfitGTS2MiniFWHelper.java  |  5 ++-
 .../AmazfitGTS2MiniFWInstallHandler.java      |  4 +--
 .../amazfitgts2/AmazfitGTS2eCoordinator.java  |  6 ++--
 .../amazfitgts2/AmazfitGTS2eFWHelper.java     |  5 ++-
 .../AmazfitGTS2eFWInstallHandler.java         |  4 +--
 .../amazfitgts3/AmazfitGTS3Coordinator.java   |  4 +--
 .../amazfitgts3/AmazfitGTS3FWHelper.java      |  4 +--
 .../AmazfitGTS3FWInstallHandler.java          |  4 +--
 .../amazfitgts4/AmazfitGTS4Coordinator.java   |  4 +--
 .../amazfitgts4/AmazfitGTS4FWHelper.java      |  4 +--
 .../AmazfitGTS4FWInstallHandler.java          |  4 +--
 .../AmazfitGTS4MiniCoordinator.java           |  4 +--
 .../AmazfitGTS4MiniFWHelper.java              |  4 +--
 .../AmazfitGTS4MiniFWInstallHandler.java      |  4 +--
 .../amazfitneo/AmazfitNeoCoordinator.java     |  5 +--
 .../huami/amazfitneo/AmazfitNeoFWHelper.java  |  4 +--
 .../AmazfitNeoFWInstallHandler.java           |  4 +--
 .../amazfitpop/AmazfitPopCoordinator.java     |  4 +--
 .../huami/amazfitpop/AmazfitPopFWHelper.java  |  4 +--
 .../AmazfitPopFWInstallHandler.java           |  4 +--
 .../AmazfitPopProCoordinator.java             |  4 +--
 .../amazfitpoppro/AmazfitPopProFWHelper.java  |  4 +--
 .../AmazfitPopProFWInstallHandler.java        |  4 +--
 .../amazfittrex/AmazfitTRexCoordinator.java   |  6 ++--
 .../amazfittrex/AmazfitTRexFWHelper.java      |  5 ++-
 .../AmazfitTRexFWInstallHandler.java          |  4 +--
 .../amazfittrex2/AmazfitTRex2Coordinator.java |  4 +--
 .../amazfittrex2/AmazfitTRex2FWHelper.java    |  4 +--
 .../AmazfitTRex2FWInstallHandler.java         |  4 +--
 .../AmazfitTRexProCoordinator.java            |  6 ++--
 .../AmazfitTRexProFWHelper.java               |  5 ++-
 .../AmazfitTRexProFWInstallHandler.java       |  4 +--
 .../AmazfitTRexUltraCoordinator.java          |  4 +--
 .../AmazfitTRexUltraFWHelper.java             |  4 +--
 .../AmazfitTRexUltraFWInstallHandler.java     |  4 +--
 .../AmazfitVergeLCoordinator.java             |  4 +--
 .../amazfitvergel/AmazfitVergeLFWHelper.java  |  5 ++-
 .../AmazfitVergeLFWInstallHandler.java        |  4 +--
 .../huami/amazfitx/AmazfitXCoordinator.java   |  6 ++--
 .../huami/amazfitx/AmazfitXFWHelper.java      |  4 +--
 .../amazfitx/AmazfitXFWInstallHandler.java    |  4 +--
 .../huami/miband2/MiBand2Coordinator.java     |  6 ++--
 .../huami/miband2/MiBand2FWHelper.java        |  5 ++-
 .../miband2/MiBand2FWInstallHandler.java      |  4 +--
 .../huami/miband2/MiBand2HRXCoordinator.java  |  6 ++--
 .../huami/miband3/MiBand3Coordinator.java     |  6 ++--
 .../huami/miband3/MiBand3FWHelper.java        |  4 +--
 .../miband3/MiBand3FWInstallHandler.java      |  4 +--
 .../devices/huami/miband3/MiBand3Service.java |  4 +--
 .../huami/miband4/MiBand4Coordinator.java     |  6 ++--
 .../huami/miband4/MiBand4FWHelper.java        |  4 +--
 .../miband4/MiBand4FWInstallHandler.java      |  4 +--
 .../huami/miband5/MiBand5Coordinator.java     |  6 ++--
 .../huami/miband5/MiBand5FWHelper.java        |  4 +--
 .../miband5/MiBand5FWInstallHandler.java      |  4 +--
 .../huami/miband6/MiBand6Coordinator.java     | 17 ++++++++++
 .../huami/miband6/MiBand6FWHelper.java        |  4 +--
 .../miband6/MiBand6FWInstallHandler.java      |  4 +--
 .../huami/miband7/MiBand7Coordinator.java     |  4 +--
 .../huami/miband7/MiBand7FWHelper.java        |  4 +--
 .../miband7/MiBand7FWInstallHandler.java      |  4 +--
 .../devices/huami/zeppe/ZeppECoordinator.java |  6 ++--
 .../devices/huami/zeppe/ZeppEFWHelper.java    |  5 ++-
 .../huami/zeppe/ZeppEFWInstallHandler.java    |  5 ++-
 .../zeppos/ZeppOsAgpsInstallHandler.java      |  4 +--
 .../zeppos/ZeppOsGpxRouteInstallHandler.java  |  4 +--
 .../devices/huawei/HuaweiBRCoordinator.java   |  5 ++-
 .../devices/huawei/HuaweiConstants.java       |  4 +--
 .../devices/huawei/HuaweiCoordinator.java     |  5 ++-
 .../huawei/HuaweiCoordinatorSupplier.java     |  5 ++-
 .../devices/huawei/HuaweiCrypto.java          |  5 ++-
 .../devices/huawei/HuaweiLECoordinator.java   |  5 ++-
 .../devices/huawei/HuaweiPacket.java          |  5 ++-
 .../devices/huawei/HuaweiSampleProvider.java  |  4 +--
 .../huawei/HuaweiSettingsCustomizer.java      |  6 ++--
 .../huawei/HuaweiSpo2SampleProvider.java      |  4 +--
 .../devices/huawei/HuaweiTLV.java             |  5 ++-
 .../devices/huawei/HuaweiUtil.java            |  4 +--
 .../honorband3/HonorBand3Coordinator.java     |  5 ++-
 .../honorband4/HonorBand4Coordinator.java     |  5 ++-
 .../honorband5/HonorBand5Coordinator.java     |  5 ++-
 .../honorband6/HonorBand6Coordinator.java     |  5 ++-
 .../honorband7/HonorBand7Coordinator.java     |  5 ++-
 .../HuaweiBand4ProCoordinator.java            |  5 ++-
 .../huaweiband6/HuaweiBand6Coordinator.java   |  5 ++-
 .../huaweiband7/HuaweiBand7Coordinator.java   |  5 ++-
 .../huaweiband8/HuaweiBand8Coordinator.java   |  5 ++-
 .../HuaweiBandAw70Coordinator.java            |  5 ++-
 .../HuaweiTalkBandB6Coordinator.java          |  5 ++-
 .../HuaweiWatchGTCoordinator.java             |  5 ++-
 .../HuaweiWatchGT2Coordinator.java            |  5 ++-
 .../HuaweiWatchGT2eCoordinator.java           |  5 ++-
 .../HuaweiWatchGT3Coordinator.java            |  5 ++-
 .../huawei/packets/AccountRelated.java        |  4 +--
 .../devices/huawei/packets/Alarms.java        |  5 ++-
 .../devices/huawei/packets/Calls.java         |  5 ++-
 .../devices/huawei/packets/DeviceConfig.java  |  5 ++-
 .../packets/DisconnectNotification.java       |  4 +--
 .../devices/huawei/packets/FindPhone.java     |  4 +--
 .../devices/huawei/packets/FitnessData.java   |  5 ++-
 .../devices/huawei/packets/LocaleConfig.java  |  5 ++-
 .../devices/huawei/packets/Menstrual.java     |  4 +--
 .../devices/huawei/packets/MusicControl.java  |  5 ++-
 .../devices/huawei/packets/Notifications.java |  5 ++-
 .../devices/huawei/packets/WorkMode.java      |  5 ++-
 .../devices/huawei/packets/Workout.java       |  5 ++-
 .../devices/id115/ID115Constants.java         |  4 +--
 .../devices/id115/ID115Coordinator.java       |  6 ++--
 .../devices/id115/ID115SampleProvider.java    |  4 +--
 .../devices/itag/ITagConstants.java           |  5 ++-
 .../devices/itag/ITagCoordinator.java         |  6 ++--
 .../devices/jyou/BFH16Constants.java          |  4 +--
 .../devices/jyou/BFH16DeviceCoordinator.java  |  5 +--
 .../devices/jyou/JYouConstants.java           |  4 +--
 .../devices/jyou/JYouSampleProvider.java      |  4 +--
 .../TeclastH30/TeclastH30Coordinator.java     |  6 ++--
 .../devices/jyou/y5/Y5Coordinator.java        |  6 ++--
 ...BohemicSmartBraceletDeviceCoordinator.java |  5 ++-
 .../devices/lefun/LefunConstants.java         |  4 +--
 .../devices/lefun/LefunDeviceCoordinator.java |  6 ++--
 .../devices/lefun/LefunFeatureSupport.java    |  4 +--
 .../devices/lefun/LefunSampleProvider.java    |  4 +--
 .../devices/lefun/commands/AlarmCommand.java  |  4 +--
 .../devices/lefun/commands/BaseCommand.java   |  4 +--
 .../devices/lefun/commands/Cmd22Command.java  |  4 +--
 .../devices/lefun/commands/Cmd25Command.java  |  4 +--
 .../lefun/commands/FeaturesCommand.java       |  4 +--
 .../lefun/commands/FindDeviceCommand.java     |  4 +--
 .../lefun/commands/FindPhoneCommand.java      |  4 +--
 .../commands/GetActivityDataCommand.java      |  4 +--
 .../commands/GetBatteryLevelCommand.java      |  4 +--
 .../commands/GetFirmwareInfoCommand.java      |  4 +--
 .../lefun/commands/GetPpgDataCommand.java     |  4 +--
 .../lefun/commands/GetSleepDataCommand.java   |  4 +--
 .../lefun/commands/GetSleepTimeCommand.java   |  4 +--
 .../lefun/commands/GetStepsDataCommand.java   |  4 +--
 .../HydrationReminderIntervalCommand.java     |  4 +--
 .../lefun/commands/NotificationCommand.java   |  4 +--
 .../lefun/commands/PpgResultCommand.java      |  4 +--
 .../lefun/commands/ProfileCommand.java        |  4 +--
 .../RemoteCameraTriggeredCommand.java         |  4 +--
 .../lefun/commands/RequestBondingCommand.java |  4 +--
 .../SedentaryReminderIntervalCommand.java     |  4 +--
 .../lefun/commands/SetLanguageCommand.java    |  4 +--
 .../commands/SetRemoteCameraCommand.java      |  4 +--
 .../lefun/commands/SettingsCommand.java       |  4 +--
 .../commands/StartPpgSensingCommand.java      |  4 +--
 .../devices/lefun/commands/TimeCommand.java   |  4 +--
 .../lefun/commands/UiPagesCommand.java        |  4 +--
 .../gadgetbridge/devices/lenovo/DataType.java |  4 +--
 .../LenovoWatchCalibrationActivity.java       |  4 +--
 .../devices/lenovo/LenovoWatchConstants.java  |  4 +--
 .../lenovo/LenovoWatchPairingActivity.java    |  4 +--
 .../watchxplus/WatchXPlusConstants.java       |  4 +--
 .../WatchXPlusDeviceCoordinator.java          |  7 ++--
 .../watchxplus/WatchXPlusSampleProvider.java  |  4 +--
 .../devices/liveview/LiveviewConstants.java   |  4 +--
 .../devices/liveview/LiveviewCoordinator.java |  6 ++--
 .../makibeshr3/MakibesHR3Constants.java       |  4 +--
 .../makibeshr3/MakibesHR3Coordinator.java     |  6 ++--
 .../makibeshr3/MakibesHR3SampleProvider.java  |  4 +--
 .../miband/AbstractMiBandFWHelper.java        |  6 ++--
 .../AbstractMiBandFWInstallHandler.java       |  5 +--
 .../miband/AbstractMiBandSampleProvider.java  |  4 +--
 .../devices/miband/DateTimeDisplay.java       |  4 +--
 .../devices/miband/DoNotDisturb.java          |  4 +--
 .../devices/miband/MiBand2SampleProvider.java |  4 +--
 .../devices/miband/MiBandConst.java           |  7 ++--
 .../devices/miband/MiBandCoordinator.java     |  7 ++--
 .../devices/miband/MiBandDateConverter.java   |  4 +--
 .../devices/miband/MiBandFWHelper.java        |  4 +--
 .../miband/MiBandFWInstallHandler.java        |  4 +--
 .../devices/miband/MiBandPairingActivity.java |  7 ++--
 .../miband/MiBandPreferencesActivity.java     |  6 ++--
 .../devices/miband/MiBandSampleProvider.java  |  4 +--
 .../devices/miband/MiBandService.java         |  4 +--
 .../gadgetbridge/devices/miband/UserInfo.java |  6 ++--
 .../devices/miband/VibrationProfile.java      |  4 +--
 .../AbstractMijiaLywsdCoordinator.java        |  5 ++-
 .../mijia_lywsd/MijiaLywsd02Coordinator.java  |  5 ++-
 .../mijia_lywsd/MijiaLywsd03Coordinator.java  |  5 ++-
 .../miscale2/MiScale2DeviceCoordinator.java   |  6 ++--
 .../devices/no1f1/No1F1Constants.java         |  4 +--
 .../devices/no1f1/No1F1Coordinator.java       |  7 ++--
 .../devices/no1f1/No1F1SampleProvider.java    |  4 +--
 .../nothing/AbstractEarCoordinator.java       |  4 +--
 .../devices/nothing/Ear1Coordinator.java      | 17 ++++++++++
 .../devices/nothing/Ear2Coordinator.java      |  4 +--
 .../nothing/EarSettingsCustomizer.java        |  4 +--
 .../devices/nothing/EarStickCoordinator.java  |  4 +--
 .../devices/nut/NutConstants.java             |  4 +--
 .../devices/nut/NutCoordinator.java           |  6 ++--
 .../gadgetbridge/devices/nut/NutKey.java      |  4 +--
 .../devices/pebble/PBWInstallHandler.java     |  4 +--
 .../devices/pebble/PBWReader.java             |  4 +--
 .../devices/pebble/PebbleColor.java           |  4 +--
 .../devices/pebble/PebbleCoordinator.java     |  7 ++--
 .../pebble/PebbleHealthSampleProvider.java    |  4 +--
 .../devices/pebble/PebbleIconID.java          |  4 +--
 .../devices/pebble/PebbleInstallable.java     |  4 +--
 .../pebble/PebbleMisfitSampleProvider.java    |  4 +--
 .../pebble/PebbleMorpheuzSampleProvider.java  |  4 +--
 .../devices/pebble/PebblePairingActivity.java |  6 ++--
 .../pebble/PebbleSettingsActivity.java        |  4 +--
 .../gadgetbridge/devices/pebble/STM32CRC.java |  4 +--
 .../pinetime/InfiniTimeDFUPackage.java        |  2 +-
 .../PineTimeActivitySampleProvider.java       | 16 +++++++++
 .../devices/pinetime/PineTimeDFUService.java  |  4 +--
 .../pinetime/PineTimeInstallHandler.java      |  4 +--
 .../devices/pinetime/PineTimeJFConstants.java |  5 +--
 .../pinetime/PineTimeJFCoordinator.java       |  7 ++--
 .../devices/pinetime/weather/WeatherData.java |  4 +--
 .../devices/qc35/QC35Coordinator.java         |  4 +--
 .../qhybrid/AppsManagementActivity.java       | 16 +++++++++
 .../devices/qhybrid/CalibrationActivity.java  |  4 +--
 .../qhybrid/CommuteActionsActivity.java       |  4 +--
 .../qhybrid/CommuteActionsListAdapter.java    |  4 +--
 .../devices/qhybrid/ConfigActivity.java       |  5 +--
 .../qhybrid/FileManagementActivity.java       |  4 +--
 .../devices/qhybrid/FossilAppWriter.java      |  4 +--
 .../devices/qhybrid/FossilFileReader.java     |  4 +--
 .../qhybrid/FossilHRInstallHandler.java       |  5 +--
 .../devices/qhybrid/FossilInstallHandler.java |  4 +--
 .../devices/qhybrid/HRConfigActivity.java     |  5 +--
 .../HybridHRActivitySampleProvider.java       |  4 +--
 .../HybridHRWatchfaceDesignerActivity.java    |  5 +--
 .../qhybrid/HybridHRWatchfaceFactory.java     |  4 +--
 .../qhybrid/HybridHRWatchfaceSettings.java    |  4 +--
 .../HybridHRWatchfaceSettingsActivity.java    |  4 +--
 .../qhybrid/HybridHRWatchfaceWidget.java      |  4 +--
 .../HybridHRWatchfaceWidgetActivity.java      |  4 +--
 .../qhybrid/HybridHRWidgetPosition.java       |  4 +--
 .../devices/qhybrid/ImageEditActivity.java    |  4 +--
 .../qhybrid/NotificationConfiguration.java    |  4 +--
 .../qhybrid/NotificationHRConfiguration.java  |  4 +--
 .../devices/qhybrid/PackageConfigHelper.java  |  4 +--
 .../qhybrid/QHybridAppChoserActivity.java     |  4 +--
 .../devices/qhybrid/QHybridConstants.java     |  4 +--
 .../devices/qhybrid/QHybridCoordinator.java   |  7 ++--
 .../devices/qhybrid/TimePicker.java           |  4 +--
 .../qhybrid/WidgetSettingsActivity.java       |  4 +--
 .../devices/roidmi/Roidmi1Coordinator.java    |  5 ++-
 .../devices/roidmi/Roidmi3Coordinator.java    |  5 ++-
 .../devices/roidmi/RoidmiConst.java           |  4 +--
 .../devices/roidmi/RoidmiCoordinator.java     |  6 ++--
 .../devices/smaq2oss/SMAQ2OSSConstants.java   | 16 +++++++++
 .../devices/smaq2oss/SMAQ2OSSCoordinator.java | 17 ++++++++++
 .../devices/smaq2oss/SMAQ2OSSSupport.java     | 16 +++++++++
 .../devices/soflow/SoFlowCoordinator.java     |  5 +--
 .../SonyHeadphonesCapabilities.java           |  4 +--
 .../headphones/SonyHeadphonesCoordinator.java |  5 +--
 .../SonyHeadphonesSettingsCustomizer.java     |  4 +--
 .../SonyLinkBudsSCoordinator.java             |  4 +--
 .../SonyWF1000XM3Coordinator.java             |  4 +--
 .../SonyWF1000XM4Coordinator.java             |  4 +--
 .../SonyWF1000XM5Coordinator.java             |  4 +--
 .../coordinators/SonyWFSP800NCoordinator.java |  4 +--
 .../SonyWH1000XM2Coordinator.java             |  4 +--
 .../SonyWH1000XM3Coordinator.java             |  4 +--
 .../SonyWH1000XM4Coordinator.java             |  4 +--
 .../SonyWH1000XM5Coordinator.java             |  4 +--
 .../headphones/prefs/AmbientSoundControl.java |  4 +--
 .../prefs/AmbientSoundControlButtonMode.java  |  4 +--
 .../headphones/prefs/AudioUpsampling.java     |  4 +--
 .../headphones/prefs/AutomaticPowerOff.java   |  4 +--
 .../sony/headphones/prefs/ButtonModes.java    |  4 +--
 .../prefs/EqualizerCustomBands.java           |  4 +--
 .../headphones/prefs/EqualizerPreset.java     |  4 +--
 .../headphones/prefs/PauseWhenTakenOff.java   |  4 +--
 .../sony/headphones/prefs/QuickAccess.java    |  4 +--
 .../sony/headphones/prefs/SoundPosition.java  |  4 +--
 .../headphones/prefs/SpeakToChatConfig.java   |  4 +--
 .../headphones/prefs/SpeakToChatEnabled.java  |  4 +--
 .../sony/headphones/prefs/SurroundMode.java   |  4 +--
 .../sony/headphones/prefs/TouchSensor.java    |  4 +--
 .../headphones/prefs/VoiceNotifications.java  |  4 +--
 .../SonyWena3ActivitySampleCombiner.java      | 33 ++++++++----------
 .../SonyWena3ActivitySampleProvider.java      | 33 ++++++++----------
 .../SonyWena3BehaviorSampleProvider.java      | 33 ++++++++----------
 .../SonyWena3CaloriesSampleProvider.java      | 33 ++++++++----------
 .../sony/wena3/SonyWena3Constants.java        |  4 +--
 .../sony/wena3/SonyWena3Coordinator.java      |  5 ++-
 .../wena3/SonyWena3EnergySampleProvider.java  | 33 ++++++++----------
 .../SonyWena3HeartRateSampleProvider.java     | 33 ++++++++----------
 .../sony/wena3/SonyWena3SettingKeys.java      |  5 ++-
 .../wena3/SonyWena3SettingsCustomizer.java    | 33 ++++++++----------
 .../wena3/SonyWena3StressSampleProvider.java  | 33 ++++++++----------
 .../wena3/SonyWena3Vo2SampleProvider.java     | 33 ++++++++----------
 .../sonyswr12/SonySWR12DeviceCoordinator.java |  6 ++--
 .../sonyswr12/SonySWR12SampleProvider.java    |  4 +--
 .../devices/supercars/ControlActivity.java    | 16 +++++++++
 .../devices/supercars/SuperCarsConstants.java | 16 +++++++++
 .../supercars/SuperCarsCoordinator.java       | 17 ++++++++++
 .../devices/test/TestDeviceCoordinator.java   | 16 +++++++++
 .../devices/tlw64/TLW64Constants.java         |  4 +--
 .../devices/tlw64/TLW64Coordinator.java       |  6 ++--
 .../devices/tlw64/TLW64SampleProvider.java    |  4 +--
 .../devices/um25/Activity/DataActivity.java   | 16 +++++++++
 .../um25/Coordinator/UM25Coordinator.java     | 17 ++++++++++
 .../devices/vesc/VescControlActivity.java     |  4 +--
 .../devices/vesc/VescCoordinator.java         |  5 +--
 .../vibratissimo/VibratissimoCoordinator.java |  6 ++--
 .../devices/vivomovehr/GarminCapability.java  |  4 +--
 .../devices/vivomovehr/VivomoveConstants.java |  4 +--
 .../vivomovehr/VivomoveHrCoordinator.java     |  4 +--
 .../vivomovehr/VivomoveHrSampleProvider.java  |  4 +--
 .../devices/waspos/WaspOSConstants.java       |  4 +--
 .../devices/waspos/WaspOSCoordinator.java     |  6 ++--
 .../watch9/Watch9CalibrationActivity.java     |  4 +--
 .../devices/watch9/Watch9Constants.java       |  4 +--
 .../watch9/Watch9DeviceCoordinator.java       |  6 ++--
 .../devices/watch9/Watch9PairingActivity.java |  5 +--
 .../withingssteelhr/RotaryControl.java        |  4 +--
 .../WithingsCalibrationActivity.java          |  4 +--
 .../WithingsSteelHRDeviceCoordinator.java     |  4 +--
 .../WithingsSteelHRSampleProvider.java        |  4 +--
 .../devices/xiaomi/XiaomiCoordinator.java     |  4 +--
 .../XiaomiDailySummarySampleProvider.java     |  4 +--
 .../devices/xiaomi/XiaomiFWHelper.java        |  4 +--
 .../devices/xiaomi/XiaomiInstallHandler.java  |  4 +--
 .../xiaomi/XiaomiPaiSampleProvider.java       |  4 +--
 .../devices/xiaomi/XiaomiSampleProvider.java  |  4 +--
 .../xiaomi/XiaomiSettingsCustomizer.java      |  4 +--
 .../XiaomiSleepStageSampleProvider.java       |  4 +--
 .../xiaomi/XiaomiSleepTimeSampleProvider.java |  4 +--
 .../xiaomi/XiaomiSpo2SampleProvider.java      |  4 +--
 .../xiaomi/XiaomiStressSampleProvider.java    |  4 +--
 .../devices/xiaomi/XiaomiWidgetManager.java   |  4 +--
 .../devices/xiaomi/XiaomiWorkoutType.java     |  4 +--
 .../miband7pro/MiBand7ProCoordinator.java     |  4 +--
 .../xiaomi/miband8/MiBand8Coordinator.java    |  4 +--
 .../miwatch/MiWatchLiteCoordinator.java       |  4 +--
 .../MiWatchColorSportCoordinator.java         |  4 +--
 .../RedmiSmartBand2Coordinator.java           |  4 +--
 .../RedmiSmartBandProCoordinator.java         |  4 +--
 .../redmiwatch2lite/RedmiWatch2Lite.java      |  4 +--
 .../RedmiWatch3ActiveCoordinator.java         |  4 +--
 .../XiaomiWatchS1ActiveCoordinator.java       |  4 +--
 .../devices/xwatch/XWatchCoordinator.java     |  6 ++--
 .../devices/xwatch/XWatchSampleProvider.java  |  4 +--
 .../devices/xwatch/XWatchService.java         |  4 +--
 .../devices/zetime/ZeTimeConstants.java       |  4 +--
 .../devices/zetime/ZeTimeCoordinator.java     |  6 ++--
 .../zetime/ZeTimePreferenceActivity.java      |  5 +--
 .../devices/zetime/ZeTimeSampleProvider.java  |  4 +--
 .../entities/AbstractActivitySample.java      |  4 +--
 .../AbstractFitProActivitySample.java         | 16 +++++++++
 .../AbstractGBX100ActivitySample.java         |  4 +--
 .../entities/AbstractHeartRateSample.java     |  4 +--
 .../AbstractHybridHRActivitySample.java       |  4 +--
 .../entities/AbstractPaiSample.java           |  4 +--
 .../AbstractPebbleHealthActivitySample.java   |  4 +--
 .../AbstractPebbleMisfitActivitySample.java   |  4 +--
 .../AbstractPebbleMorpheuzActivitySample.java |  4 +--
 .../AbstractSleepRespiratoryRateSample.java   |  4 +--
 .../entities/AbstractSpo2Sample.java          |  4 +--
 .../entities/AbstractStressSample.java        |  4 +--
 .../entities/AbstractTemperatureSample.java   |  5 ++-
 .../entities/AbstractTimeSample.java          |  4 +--
 .../export/ActivityTrackExporter.java         |  4 +--
 .../gadgetbridge/export/GPXExporter.java      |  6 ++--
 .../externalevents/AlarmClockReceiver.java    |  4 +--
 .../externalevents/AlarmReceiver.java         |  4 +--
 .../externalevents/AutoStartReceiver.java     |  6 ++--
 .../BluetoothConnectReceiver.java             |  4 +--
 .../BluetoothPairingRequestReceiver.java      |  6 ++--
 .../BluetoothStateChangeReceiver.java         |  6 ++--
 .../externalevents/CMWeatherReceiver.java     |  4 +--
 .../externalevents/CalendarReceiver.java      |  6 ++--
 .../DeviceSettingsReceiver.java               |  4 +--
 .../GenericWeatherReceiver.java               |  5 +--
 .../externalevents/IntentApiReceiver.java     |  4 +--
 .../LineageOsWeatherReceiver.java             |  5 +--
 .../externalevents/MusicPlaybackReceiver.java |  4 +--
 .../externalevents/NotificationListener.java  | 13 ++++---
 .../externalevents/OmniJawsObserver.java      |  4 +--
 .../externalevents/OsmandEventReceiver.java   | 17 ++++++++++
 .../externalevents/PebbleReceiver.java        |  6 ++--
 .../externalevents/PhoneCallReceiver.java     |  7 ++--
 .../externalevents/SMSReceiver.java           |  6 ++--
 .../externalevents/SilentModeReceiver.java    |  4 +--
 .../externalevents/TimeChangeReceiver.java    |  4 +--
 .../TinyWeatherForecastGermanyReceiver.java   |  4 +--
 .../WeatherNotificationConfig.java            |  4 +--
 .../WeatherNotificationReceiver.java          |  4 +--
 .../gps/AbstractLocationProvider.java         |  4 +--
 .../gps/GBLocationListener.java               |  4 +--
 .../externalevents/gps/GBLocationManager.java |  4 +--
 .../gps/LocationProviderType.java             | 16 +++++++++
 .../gps/MockLocationProvider.java             |  4 +--
 .../gps/PhoneGpsLocationProvider.java         |  4 +--
 .../gps/PhoneNetworkLocationProvider.java     |  4 +--
 .../GoogleMapsNotificationHandler.java        | 16 +++++++++
 .../opentracks/OpenTracksContentObserver.java |  4 +--
 .../opentracks/OpenTracksController.java      |  4 +--
 .../externalevents/opentracks/Track.java      |  4 +--
 .../opentracks/TrackStatistics.java           |  4 +--
 .../gadgetbridge/impl/GBDevice.java           |  7 ++--
 .../gadgetbridge/impl/GBDeviceApp.java        |  6 ++--
 .../gadgetbridge/impl/GBDeviceCandidate.java  |  6 ++--
 .../gadgetbridge/impl/GBDeviceFolder.java     | 16 +++++++++
 .../gadgetbridge/impl/GBDeviceService.java    | 11 +++---
 .../gadgetbridge/impl/GBSummaryOfDay.java     |  4 +--
 .../model/AbstractNotificationPattern.java    | 33 ++++++++----------
 .../gadgetbridge/model/ActivityAmount.java    |  4 +--
 .../gadgetbridge/model/ActivityAmounts.java   |  4 +--
 .../gadgetbridge/model/ActivityKind.java      |  6 ++--
 .../gadgetbridge/model/ActivityPoint.java     |  4 +--
 .../gadgetbridge/model/ActivitySample.java    |  4 +--
 .../gadgetbridge/model/ActivitySession.java   | 16 +++++++++
 .../gadgetbridge/model/ActivitySummary.java   |  4 +--
 .../model/ActivitySummaryEntries.java         |  4 +--
 .../model/ActivitySummaryItems.java           | 16 +++++++++
 .../model/ActivitySummaryJsonSummary.java     | 17 ++++++++++
 .../model/ActivitySummaryParser.java          |  4 +--
 .../gadgetbridge/model/ActivityTrack.java     |  4 +--
 .../gadgetbridge/model/ActivityUser.java      |  6 ++--
 .../gadgetbridge/model/Alarm.java             |  5 +--
 .../model/AppNotificationType.java            |  9 ++---
 .../gadgetbridge/model/BatteryConfig.java     |  4 +--
 .../gadgetbridge/model/BatteryState.java      |  4 +--
 .../gadgetbridge/model/CalendarEventSpec.java |  5 +--
 .../gadgetbridge/model/CallSpec.java          |  5 +--
 .../model/CannedMessagesSpec.java             |  4 +--
 .../gadgetbridge/model/Contact.java           |  4 +--
 .../gadgetbridge/model/DailyTotals.java       |  5 +--
 .../gadgetbridge/model/DeviceService.java     | 10 +++---
 .../gadgetbridge/model/DeviceType.java        | 20 +++++++----
 .../gadgetbridge/model/GPSCoordinate.java     |  4 +--
 .../gadgetbridge/model/GenericItem.java       |  4 +--
 .../gadgetbridge/model/HeartRateSample.java   |  4 +--
 .../gadgetbridge/model/ItemWithDetails.java   |  5 +--
 .../gadgetbridge/model/Measurement.java       |  4 +--
 .../gadgetbridge/model/MusicSpec.java         |  6 ++--
 .../gadgetbridge/model/MusicStateSpec.java    |  6 ++--
 .../model/NavigationInfoSpec.java             |  4 +--
 .../gadgetbridge/model/NotificationSpec.java  |  5 +--
 .../gadgetbridge/model/NotificationType.java  |  8 ++---
 .../gadgetbridge/model/PaiSample.java         |  4 +--
 .../gadgetbridge/model/RecordedDataTypes.java |  4 +--
 .../gadgetbridge/model/Reminder.java          |  4 +--
 .../model/SleepRespiratoryRateSample.java     |  4 +--
 .../gadgetbridge/model/SleepState.java        |  4 +--
 .../gadgetbridge/model/Spo2Sample.java        |  4 +--
 .../gadgetbridge/model/StressSample.java      |  4 +--
 .../gadgetbridge/model/SummaryOfDay.java      |  4 +--
 .../gadgetbridge/model/TemperatureSample.java |  5 ++-
 .../gadgetbridge/model/TimeSample.java        |  4 +--
 .../gadgetbridge/model/TimeStamped.java       |  4 +--
 .../gadgetbridge/model/ValidByDate.java       |  4 +--
 .../gadgetbridge/model/WearingState.java      |  4 +--
 .../gadgetbridge/model/Weather.java           |  6 ++--
 .../gadgetbridge/model/WeatherSpec.java       |  7 ++--
 .../gadgetbridge/model/WorldClock.java        |  4 +--
 .../service/AbstractDeviceSupport.java        |  9 ++---
 .../service/DeviceCommunicationService.java   | 14 ++++----
 .../gadgetbridge/service/DeviceSupport.java   |  4 +--
 .../service/DeviceSupportFactory.java         | 19 ++++++-----
 .../NotificationCollectorMonitorService.java  |  4 +--
 .../service/ServiceDeviceSupport.java         |  8 ++---
 .../btbr/AbstractBTBRDeviceSupport.java       |  4 +--
 .../service/btbr/AbstractTransaction.java     |  5 ++-
 .../gadgetbridge/service/btbr/BtBRAction.java |  4 +--
 .../gadgetbridge/service/btbr/BtBRQueue.java  | 33 +++++++++---------
 .../service/btbr/SocketCallback.java          | 33 +++++++++---------
 .../service/btbr/Transaction.java             |  5 ++-
 .../service/btbr/TransactionBuilder.java      |  4 +--
 .../btbr/actions/AbortTransactionAction.java  |  4 +--
 .../btbr/actions/CheckInitializedAction.java  |  4 +--
 .../service/btbr/actions/PlainAction.java     |  4 +--
 .../btbr/actions/SetDeviceBusyAction.java     |  4 +--
 .../btbr/actions/SetDeviceStateAction.java    |  4 +--
 .../service/btbr/actions/WaitAction.java      |  4 +--
 .../service/btbr/actions/WriteAction.java     |  5 ++-
 .../service/btclassic/BtClassicIoThread.java  |  4 +--
 .../btle/AbstractBTLEDeviceSupport.java       |  7 ++--
 .../service/btle/AbstractBTLEOperation.java   |  6 ++--
 .../service/btle/AbstractGattCallback.java    |  4 +--
 .../service/btle/AbstractTransaction.java     |  5 ++-
 .../service/btle/BLETypeConversions.java      |  7 ++--
 .../service/btle/BTLEOperation.java           |  4 +--
 .../service/btle/BleNamesResolver.java        |  5 ++-
 .../gadgetbridge/service/btle/BtLEAction.java |  4 +--
 .../gadgetbridge/service/btle/BtLEQueue.java  |  8 ++---
 .../service/btle/BtLEServerAction.java        |  5 ++-
 .../service/btle/GattCallback.java            | 16 ---------
 .../service/btle/GattCharacteristic.java      |  5 +--
 .../service/btle/GattDescriptor.java          |  4 +--
 .../service/btle/GattListenerAction.java      |  4 +--
 .../service/btle/GattServerCallback.java      |  4 +--
 .../service/btle/GattService.java             |  4 +--
 .../service/btle/ServerTransaction.java       |  5 ++-
 .../btle/ServerTransactionBuilder.java        |  4 +--
 .../service/btle/Transaction.java             |  6 ++--
 .../service/btle/TransactionBuilder.java      |  7 ++--
 .../btle/actions/AbortTransactionAction.java  |  4 +--
 .../AbstractGattListenerWriteAction.java      |  4 +--
 .../service/btle/actions/BondAction.java      | 16 +++++++++
 .../btle/actions/CheckInitializedAction.java  |  4 +--
 .../btle/actions/ConditionalWriteAction.java  |  4 +--
 .../service/btle/actions/NotifyAction.java    |  5 ++-
 .../service/btle/actions/PlainAction.java     |  4 +--
 .../service/btle/actions/ReadAction.java      |  5 ++-
 .../RequestConnectionPriorityAction.java      |  4 +--
 .../btle/actions/RequestMtuAction.java        |  4 +--
 .../btle/actions/ServerResponseAction.java    |  4 +--
 .../btle/actions/SetDeviceBusyAction.java     |  4 +--
 .../btle/actions/SetDeviceStateAction.java    |  4 +--
 .../btle/actions/SetProgressAction.java       |  5 ++-
 .../service/btle/actions/WaitAction.java      |  4 +--
 .../service/btle/actions/WriteAction.java     |  6 ++--
 .../btle/profiles/AbstractBleProfile.java     |  5 +--
 .../service/btle/profiles/IntentListener.java |  4 +--
 .../service/btle/profiles/ValueDecoder.java   |  4 +--
 .../alertnotification/AlertCategory.java      |  4 +--
 .../alertnotification/AlertLevel.java         |  4 +--
 .../AlertNotificationControl.java             |  4 +--
 .../AlertNotificationProfile.java             |  4 +--
 .../alertnotification/AlertStatus.java        |  4 +--
 .../profiles/alertnotification/Command.java   |  4 +--
 .../profiles/alertnotification/NewAlert.java  |  4 +--
 .../alertnotification/OverflowStrategy.java   |  4 +--
 .../SupportedNewAlertCategory.java            |  4 +--
 .../btle/profiles/battery/BatteryInfo.java    |  4 +--
 .../profiles/battery/BatteryInfoProfile.java  |  4 +--
 .../btle/profiles/deviceinfo/DeviceInfo.java  |  4 +--
 .../deviceinfo/DeviceInfoProfile.java         |  4 +--
 .../HealthThermometerProfile.java             |  5 ++-
 .../healthThermometer/TemperatureInfo.java    |  5 ++-
 .../heartrate/BodySensorLocation.java         |  4 +--
 .../profiles/heartrate/HeartRateProfile.java  |  4 +--
 .../asteroidos/AsteroidOSDeviceSupport.java   | 16 +++++++++
 .../banglejs/BangleJSDeviceSupport.java       |  7 ++--
 .../BinarySensorBaseSupport.java              | 16 +++++++++
 .../binary_sensor/BinarySensorSupport.java    | 16 +++++++++
 .../protocol/constants/MessageId.java         | 16 +++++++++
 .../protocol/constants/ParameterId.java       | 16 +++++++++
 .../protocol/constants/ReportState.java       | 16 +++++++++
 .../protocol/constants/ResultCode.java        | 16 +++++++++
 .../protocol/constants/SensorState.java       | 16 +++++++++
 .../protocol/constants/SensorType.java        | 16 +++++++++
 .../protocol/message/GetSensorRequest.java    | 16 +++++++++
 .../protocol/message/Message.java             | 16 +++++++++
 .../protocol/message/Response.java            | 16 +++++++++
 .../protocol/message/SetSensorRequest.java    | 16 +++++++++
 .../protocol/parameter/Parameter.java         | 16 +++++++++
 .../protocol/parameter/ReportStatus.java      | 16 +++++++++
 .../protocol/parameter/ResultCode.java        | 16 +++++++++
 .../protocol/parameter/SensorState.java       | 16 +++++++++
 .../protocol/parameter/SensorType.java        | 16 +++++++++
 .../devices/casio/Casio2C2DSupport.java       |  5 ++-
 .../service/devices/casio/CasioSupport.java   |  4 +--
 .../gb6900/CasioGB6900DeviceSupport.java      |  4 +--
 .../gb6900/CasioGB6900HandlerThread.java      |  5 ++-
 .../devices/casio/gb6900/InitOperation.java   |  4 +--
 .../casio/gb6900/SetAlarmOperation.java       |  4 +--
 .../gbx100/CasioGBX100DeviceSupport.java      |  5 ++-
 .../gbx100/FetchStepCountDataOperation.java   |  4 +--
 .../gbx100/GetConfigurationOperation.java     |  4 +--
 .../devices/casio/gbx100/InitOperation.java   |  4 +--
 .../gbx100/SetConfigurationOperation.java     |  4 +--
 .../gwb5600/CasioGWB5600DeviceSupport.java    |  4 +--
 .../casio/gwb5600/CasioGWB5600TimeZone.java   |  4 +--
 .../devices/casio/gwb5600/InitOperation.java  |  4 +--
 .../devices/common/SimpleNotification.java    |  4 +--
 .../service/devices/divoom/PixooIOThread.java |  4 +--
 .../service/devices/divoom/PixooProtocol.java |  4 +--
 .../service/devices/divoom/PixooSupport.java  |  4 +--
 .../devices/domyos/DomyosT540Support.java     |  5 ++-
 .../FemometerVinca2DeviceSupport.java         |  5 ++-
 .../devices/fitpro/FitProDeviceSupport.java   |  4 +--
 .../zero/support/FlipperZeroBaseSupport.java  | 16 +++++++++
 .../zero/support/FlipperZeroSupport.java      | 16 +++++++++
 .../galaxy_buds/GalaxyBudsDeviceSupport.java  | 16 +++++++++
 .../galaxy_buds/GalaxyBudsIOThread.java       | 16 +++++++++
 .../galaxy_buds/GalaxyBudsProtocol.java       | 16 +++++++++
 .../devices/hplus/HPlusDataRecord.java        |  4 +--
 .../devices/hplus/HPlusDataRecordDaySlot.java |  4 +--
 .../hplus/HPlusDataRecordDaySummary.java      |  4 +--
 .../hplus/HPlusDataRecordRealtime.java        |  4 +--
 .../devices/hplus/HPlusDataRecordSleep.java   |  4 +--
 .../devices/hplus/HPlusHandlerThread.java     |  6 ++--
 .../service/devices/hplus/HPlusSupport.java   |  8 ++---
 .../AbstractHuami2021FWInstallHandler.java    |  4 +--
 .../AbstractHuamiActivityDetailsParser.java   |  5 ++-
 .../huami/AbstractHuamiFirmwareInfo.java      |  4 +--
 .../devices/huami/AbstractHuamiOperation.java |  4 +--
 .../huami/Huami2021ActivityDetailsParser.java |  4 +--
 .../huami/Huami2021ChunkedDecoder.java        |  4 +--
 .../huami/Huami2021ChunkedEncoder.java        |  4 +--
 .../devices/huami/Huami2021FirmwareInfo.java  |  4 +--
 .../devices/huami/Huami2021Handler.java       |  4 +--
 .../devices/huami/Huami2021MenuType.java      |  5 +--
 .../devices/huami/Huami2021Support.java       |  4 +--
 .../devices/huami/Huami2021Weather.java       |  5 +--
 .../Huami2021WorkoutTrackActivityType.java    |  4 +--
 .../huami/HuamiActivityDetailsParser.java     |  5 ++-
 .../devices/huami/HuamiBatteryInfo.java       |  4 +--
 .../devices/huami/HuamiDeviceEvent.java       |  4 +--
 .../devices/huami/HuamiFirmwareInfo.java      |  4 +--
 .../devices/huami/HuamiFirmwareType.java      |  4 +--
 .../service/devices/huami/HuamiIcon.java      |  6 ++--
 .../devices/huami/HuamiLanguageType.java      |  4 +--
 .../service/devices/huami/HuamiMenuType.java  |  5 +--
 .../devices/huami/HuamiPhoneGpsStatus.java    |  4 +--
 .../huami/HuamiSportsActivityType.java        |  4 +--
 .../service/devices/huami/HuamiSupport.java   | 11 +++---
 ...HuamiVibrationPatternNotificationType.java |  4 +--
 .../huami/HuamiWorkoutScreenActivityType.java |  4 +--
 .../devices/huami/HuamiWorkoutStatus.java     |  4 +--
 .../huami/HuamiWorkoutTrackActivityType.java  |  4 +--
 .../service/devices/huami/UIHHContainer.java  |  4 +--
 .../huami/actions/StopNotificationAction.java |  4 +--
 .../AmazfitActiveFirmwareInfo.java            |  4 +--
 .../amazfitactive/AmazfitActiveSupport.java   |  4 +--
 .../AmazfitActiveEdgeFirmwareInfo.java        |  4 +--
 .../AmazfitActiveEdgeSupport.java             |  4 +--
 .../AmazfitBalanceFirmwareInfo.java           |  4 +--
 .../amazfitbalance/AmazfitBalanceSupport.java |  4 +--
 .../AmazfitBand5FirmwareInfo.java             |  5 ++-
 .../amazfitband5/AmazfitBand5Support.java     |  4 +--
 .../AmazfitBand7FirmwareInfo.java             |  4 +--
 .../amazfitband7/AmazfitBand7Support.java     |  4 +--
 .../amazfitbip/AmazfitBipFirmwareInfo.java    |  4 +--
 .../AmazfitBipLiteFirmwareInfo.java           |  4 +--
 .../amazfitbip/AmazfitBipLiteSupport.java     |  4 +--
 .../huami/amazfitbip/AmazfitBipSupport.java   |  6 ++--
 .../AmazfitBipTextNotificationStrategy.java   |  4 +--
 .../AmazfitBip3ProFirmwareInfo.java           |  4 +--
 .../amazfitbip3pro/AmazfitBip3ProSupport.java |  4 +--
 .../amazfitbip5/AmazfitBip5FirmwareInfo.java  |  4 +--
 .../huami/amazfitbip5/AmazfitBip5Support.java |  4 +--
 .../amazfitbips/AmazfitBipSFirmwareInfo.java  |  4 +--
 .../AmazfitBipSLiteFirmwareInfo.java          |  4 +--
 .../amazfitbips/AmazfitBipSLiteSupport.java   |  4 +--
 .../huami/amazfitbips/AmazfitBipSSupport.java |  5 +--
 .../amazfitbipu/AmazfitBipUFirmwareInfo.java  |  4 +--
 .../huami/amazfitbipu/AmazfitBipUSupport.java |  5 ++-
 .../AmazfitBipUProFirmwareInfo.java           |  4 +--
 .../amazfitbipupro/AmazfitBipUProSupport.java |  5 ++-
 .../AmazfitCheetahProFirmwareInfo.java        |  4 +--
 .../AmazfitCheetahProSupport.java             |  4 +--
 .../AmazfitCheetahRoundFirmwareInfo.java      |  4 +--
 .../AmazfitCheetahRoundSupport.java           |  4 +--
 .../AmazfitCheetahSquareFirmwareInfo.java     |  4 +--
 .../AmazfitCheetahSquareSupport.java          |  4 +--
 .../amazfitcor/AmazfitCorFirmwareInfo.java    |  4 +--
 .../huami/amazfitcor/AmazfitCorSupport.java   |  4 +--
 .../amazfitcor2/AmazfitCor2FirmwareInfo.java  |  4 +--
 .../huami/amazfitcor2/AmazfitCor2Support.java |  4 +--
 .../AmazfitFalconFirmwareInfo.java            |  4 +--
 .../amazfitfalcon/AmazfitFalconSupport.java   |  4 +--
 .../amazfitgtr/AmazfitGTRFirmwareInfo.java    |  4 +--
 .../AmazfitGTRLiteFirmwareInfo.java           |  4 +--
 .../amazfitgtr/AmazfitGTRLiteSupport.java     |  4 +--
 .../huami/amazfitgtr/AmazfitGTRSupport.java   |  4 +--
 .../amazfitgtr2/AmazfitGTR2FirmwareInfo.java  |  5 ++-
 .../huami/amazfitgtr2/AmazfitGTR2Support.java |  6 ++--
 .../amazfitgtr2/AmazfitGTR2eFirmwareInfo.java |  5 ++-
 .../amazfitgtr2/AmazfitGTR2eSupport.java      |  5 ++-
 .../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 +--
 .../amazfitgts/AmazfitGTSFirmwareInfo.java    |  4 +--
 .../huami/amazfitgts/AmazfitGTSSupport.java   |  4 +--
 .../amazfitgts2/AmazfitGTS2FirmwareInfo.java  |  5 ++-
 .../AmazfitGTS2MiniFirmwareInfo.java          |  5 ++-
 .../amazfitgts2/AmazfitGTS2MiniSupport.java   |  5 ++-
 .../huami/amazfitgts2/AmazfitGTS2Support.java |  6 ++--
 .../amazfitgts2/AmazfitGTS2eFirmwareInfo.java |  5 ++-
 .../amazfitgts2/AmazfitGTS2eSupport.java      |  5 ++-
 .../amazfitgts3/AmazfitGTS3FirmwareInfo.java  |  4 +--
 .../huami/amazfitgts3/AmazfitGTS3Support.java |  4 +--
 .../amazfitgts4/AmazfitGTS4FirmwareInfo.java  |  4 +--
 .../huami/amazfitgts4/AmazfitGTS4Support.java |  4 +--
 .../AmazfitGTS4MiniFirmwareInfo.java          |  4 +--
 .../AmazfitGTS4MiniSupport.java               |  4 +--
 .../amazfitneo/AmazfitNeoFirmwareInfo.java    |  4 +--
 .../huami/amazfitneo/AmazfitNeoSupport.java   |  5 +--
 .../amazfitpop/AmazfitPopFirmwareInfo.java    |  4 +--
 .../huami/amazfitpop/AmazfitPopSupport.java   |  4 +--
 .../AmazfitPopProFirmwareInfo.java            |  4 +--
 .../amazfitpoppro/AmazfitPopProSupport.java   |  4 +--
 .../amazfittrex/AmazfitTRexFirmwareInfo.java  |  4 +--
 .../huami/amazfittrex/AmazfitTRexSupport.java |  4 +--
 .../AmazfitTRex2FirmwareInfo.java             |  4 +--
 .../amazfittrex2/AmazfitTRex2Support.java     |  4 +--
 .../AmazfitTRexProFirmwareInfo.java           |  4 +--
 .../amazfittrexpro/AmazfitTRexProSupport.java |  4 +--
 .../AmazfitTRexUltraFirmwareInfo.java         |  4 +--
 .../AmazfitTRexUltraSupport.java              |  4 +--
 .../AmazfitVergeLFirmwareInfo.java            |  5 ++-
 .../amazfitvergel/AmazfitVergeLSupport.java   |  4 +--
 .../huami/amazfitx/AmazfitXFirmwareInfo.java  |  5 ++-
 .../huami/amazfitx/AmazfitXSupport.java       |  4 +--
 .../huami/miband2/Mi2FirmwareInfo.java        |  5 ++-
 .../miband2/Mi2NotificationStrategy.java      |  5 ++-
 .../miband2/Mi2TextNotificationStrategy.java  |  5 ++-
 .../devices/huami/miband2/MiBand2Support.java |  4 +--
 .../huami/miband3/MiBand3FirmwareInfo.java    |  5 ++-
 .../devices/huami/miband3/MiBand3Support.java |  4 +--
 .../huami/miband4/MiBand4FirmwareInfo.java    |  4 +--
 .../devices/huami/miband4/MiBand4Support.java |  4 +--
 .../huami/miband5/MiBand5FirmwareInfo.java    |  5 ++-
 .../devices/huami/miband5/MiBand5Support.java |  5 +--
 .../huami/miband6/MiBand6FirmwareInfo.java    |  5 ++-
 .../devices/huami/miband6/MiBand6Support.java |  4 +--
 .../huami/miband7/MiBand7FirmwareInfo.java    |  4 +--
 .../devices/huami/miband7/MiBand7Support.java |  4 +--
 .../operations/AbstractFetchOperation.java    |  6 ++--
 .../AbstractRepeatingFetchOperation.java      |  4 +--
 .../operations/FetchActivityOperation.java    |  6 ++--
 .../FetchHeartRateManualOperation.java        |  4 +--
 .../FetchHeartRateMaxOperation.java           |  4 +--
 .../FetchHeartRateRestingOperation.java       |  4 +--
 .../huami/operations/FetchPaiOperation.java   |  4 +--
 .../FetchSleepRespiratoryRateOperation.java   |  4 +--
 .../operations/FetchSpo2NormalOperation.java  |  4 +--
 .../operations/FetchSpo2SleepOperation.java   |  4 +--
 .../FetchSportsDetailsOperation.java          |  6 ++--
 .../FetchSportsSummaryOperation.java          |  6 ++--
 .../operations/FetchStatisticsOperation.java  |  4 +--
 .../operations/FetchStressAutoOperation.java  |  4 +--
 .../FetchStressManualOperation.java           |  4 +--
 .../operations/FetchTemperatureOperation.java |  4 +--
 .../HuamiFetchDebugLogsOperation.java         |  5 ++-
 .../huami/operations/InitOperation.java       |  5 +--
 .../huami/operations/InitOperation2021.java   |  4 +--
 .../operations/UpdateFirmwareOperation.java   |  5 ++-
 .../UpdateFirmwareOperation2020.java          |  4 +--
 .../UpdateFirmwareOperation2021.java          |  4 +--
 .../UpdateFirmwareOperationNew.java           |  4 +--
 .../huami/zeppe/ZeppEFirmwareInfo.java        |  5 ++-
 .../devices/huami/zeppe/ZeppESupport.java     |  5 ++-
 .../huami/zeppos/AbstractZeppOsService.java   |  4 +--
 .../zeppos/operations/ZeppOsAgpsFile.java     |  4 +--
 .../operations/ZeppOsAgpsUpdateOperation.java |  4 +--
 .../zeppos/operations/ZeppOsGpxRouteFile.java |  4 +--
 .../ZeppOsGpxRouteUploadOperation.java        |  4 +--
 .../zeppos/services/ZeppOsAgpsService.java    |  4 +--
 .../zeppos/services/ZeppOsAlarmsService.java  |  4 +--
 .../zeppos/services/ZeppOsAlexaService.java   |  4 +--
 .../zeppos/services/ZeppOsAppsService.java    |  4 +--
 .../services/ZeppOsCalendarService.java       |  4 +--
 .../services/ZeppOsCannedMessagesService.java |  4 +--
 .../zeppos/services/ZeppOsConfigService.java  |  4 +--
 .../services/ZeppOsContactsService.java       |  4 +--
 .../services/ZeppOsDisplayItemsService.java   |  4 +--
 .../services/ZeppOsFileTransferService.java   |  4 +--
 .../services/ZeppOsFtpServerService.java      |  4 +--
 .../zeppos/services/ZeppOsHttpService.java    |  4 +--
 .../zeppos/services/ZeppOsLogsService.java    |  4 +--
 .../services/ZeppOsLoyaltyCardService.java    |  4 +--
 .../services/ZeppOsMorningUpdatesService.java |  4 +--
 .../zeppos/services/ZeppOsMusicService.java   |  4 +--
 .../services/ZeppOsNotificationService.java   |  4 +--
 .../zeppos/services/ZeppOsPhoneService.java   |  4 +--
 .../services/ZeppOsRemindersService.java      |  4 +--
 .../services/ZeppOsServicesService.java       |  4 +--
 .../services/ZeppOsShortcutCardsService.java  |  4 +--
 .../services/ZeppOsWatchfaceService.java      |  4 +--
 .../zeppos/services/ZeppOsWifiService.java    |  4 +--
 .../devices/huawei/AsynchronousResponse.java  |  5 ++-
 .../devices/huawei/HuaweiBRSupport.java       |  5 ++-
 .../devices/huawei/HuaweiLESupport.java       |  5 ++-
 .../devices/huawei/HuaweiSupportProvider.java |  5 ++-
 .../devices/huawei/HuaweiWorkoutGbParser.java |  4 +--
 .../devices/huawei/ResponseManager.java       |  5 ++-
 .../huawei/requests/AlarmsRequest.java        |  5 ++-
 .../devices/huawei/requests/DebugRequest.java |  4 +--
 .../requests/GetActivityTypeRequest.java      |  4 +--
 .../huawei/requests/GetAuthRequest.java       |  5 ++-
 .../requests/GetBatteryLevelRequest.java      |  5 ++-
 .../huawei/requests/GetBondParamsRequest.java |  5 ++-
 .../huawei/requests/GetBondRequest.java       |  5 ++-
 .../requests/GetConnectStatusRequest.java     |  4 +--
 .../requests/GetDeviceStatusRequest.java      |  5 ++-
 .../requests/GetDndLiftWristTypeRequest.java  |  5 ++-
 .../huawei/requests/GetEventAlarmList.java    |  4 +--
 .../requests/GetExpandCapabilityRequest.java  |  4 +--
 .../requests/GetFitnessTotalsRequest.java     |  5 ++-
 .../huawei/requests/GetHiChainRequest.java    |  5 ++-
 .../huawei/requests/GetLinkParamsRequest.java |  5 ++-
 .../GetNotificationCapabilitiesRequest.java   |  4 +--
 .../GetNotificationConstraintsRequest.java    |  4 +--
 .../huawei/requests/GetPhoneInfoRequest.java  |  4 +--
 .../huawei/requests/GetPincodeRequest.java    |  5 ++-
 .../GetProductInformationRequest.java         |  5 ++-
 .../GetSecurityNegotiationRequest.java        |  5 ++-
 .../requests/GetSettingRelatedRequest.java    |  4 +--
 .../requests/GetSleepDataCountRequest.java    |  5 ++-
 .../huawei/requests/GetSleepDataRequest.java  |  5 ++-
 .../huawei/requests/GetSmartAlarmList.java    |  4 +--
 .../requests/GetStepDataCountRequest.java     |  5 ++-
 .../huawei/requests/GetStepDataRequest.java   |  5 ++-
 .../requests/GetSupportedCommandsRequest.java |  5 ++-
 .../requests/GetSupportedServicesRequest.java |  5 ++-
 .../huawei/requests/GetWearStatusRequest.java |  4 +--
 .../requests/GetWorkoutCountRequest.java      |  5 ++-
 .../requests/GetWorkoutDataRequest.java       |  5 ++-
 .../requests/GetWorkoutPaceRequest.java       |  5 ++-
 .../requests/GetWorkoutTotalsRequest.java     |  5 ++-
 .../devices/huawei/requests/Request.java      |  5 ++-
 .../huawei/requests/SendAccountRequest.java   |  4 +--
 .../huawei/requests/SendDndAddRequest.java    |  5 ++-
 .../huawei/requests/SendDndDeleteRequest.java |  5 ++-
 .../requests/SendFactoryResetRequest.java     |  5 ++-
 .../requests/SendFitnessGoalRequest.java      |  4 +--
 .../SendMenstrualCapabilityRequest.java       |  4 +--
 .../SendMenstrualModifyTimeRequest.java       |  4 +--
 .../requests/SendNotificationRequest.java     |  5 ++-
 .../SendNotifyHeartRateCapabilityRequest.java |  4 +--
 ...dNotifyRestHeartRateCapabilityRequest.java |  4 +--
 .../SendSetUpDeviceStatusRequest.java         |  4 +--
 .../requests/SetActivateOnLiftRequest.java    |  5 ++-
 .../requests/SetActivityReminderRequest.java  |  5 ++-
 .../SetAutomaticHeartrateRequest.java         |  4 +--
 .../requests/SetAutomaticSpoRequest.java      |  4 +--
 .../huawei/requests/SetDateFormatRequest.java |  5 ++-
 .../requests/SetDisconnectNotification.java   |  4 +--
 .../requests/SetLanguageSettingRequest.java   |  5 ++-
 .../SetMediumToStrengthThresholdRequest.java  |  5 ++-
 .../huawei/requests/SetMusicRequest.java      |  5 ++-
 .../requests/SetMusicStatusRequest.java       |  5 ++-
 .../requests/SetNavigateOnRotateRequest.java  |  5 ++-
 .../requests/SetNotificationRequest.java      |  5 ++-
 .../huawei/requests/SetTimeRequest.java       |  5 ++-
 .../huawei/requests/SetTimeZoneIdRequest.java |  5 ++-
 .../huawei/requests/SetTruSleepRequest.java   |  5 ++-
 .../requests/SetWearLocationRequest.java      |  5 ++-
 .../requests/SetWearMessagePushRequest.java   |  5 ++-
 .../huawei/requests/SetWorkModeRequest.java   |  5 ++-
 .../huawei/requests/StopFindPhoneRequest.java |  4 +--
 .../requests/StopNotificationRequest.java     |  5 ++-
 .../devices/id115/AbstractID115Operation.java |  4 +--
 .../devices/id115/FetchActivityOperation.java |  4 +--
 .../service/devices/id115/ID115Support.java   |  6 ++--
 .../id115/SendNotificationOperation.java      |  4 +--
 .../service/devices/itag/ITagSupport.java     |  5 ++-
 .../devices/jyou/BFH16DeviceSupport.java      |  4 +--
 .../service/devices/jyou/JYouDataRecord.java  |  4 +--
 .../service/devices/jyou/JYouSupport.java     |  4 +--
 .../devices/jyou/RealtimeSamplesSupport.java  |  4 +--
 .../jyou/TeclastH30/TeclastH30Support.java    |  4 +--
 .../service/devices/jyou/y5/Y5Support.java    |  4 +--
 .../devices/lefun/LefunDeviceSupport.java     |  6 ++--
 .../AbstractSendNotificationRequest.java      |  4 +--
 .../lefun/requests/FindDeviceRequest.java     |  4 +--
 .../requests/GetActivityDataRequest.java      |  4 +--
 .../requests/GetBatteryLevelRequest.java      |  4 +--
 .../requests/GetEnabledFeaturesRequest.java   |  4 +--
 .../requests/GetFirmwareInfoRequest.java      |  4 +--
 .../requests/GetGeneralSettingsRequest.java   |  4 +--
 .../GetHydrationReminderIntervalRequest.java  |  4 +--
 .../lefun/requests/GetPpgDataRequest.java     |  4 +--
 .../GetSedentaryReminderIntervalRequest.java  |  4 +--
 .../lefun/requests/GetSleepDataRequest.java   |  4 +--
 .../lefun/requests/MultiFetchRequest.java     |  4 +--
 .../devices/lefun/requests/Request.java       |  4 +--
 .../requests/SendCallNotificationRequest.java |  4 +--
 .../requests/SendNotificationRequest.java     |  4 +--
 .../lefun/requests/SetAlarmRequest.java       |  4 +--
 .../requests/SetEnabledFeaturesRequest.java   |  4 +--
 .../requests/SetGeneralSettingsRequest.java   |  4 +--
 .../SetHydrationReminderIntervalRequest.java  |  4 +--
 .../lefun/requests/SetLanguageRequest.java    |  4 +--
 .../lefun/requests/SetProfileRequest.java     |  4 +--
 .../SetSedentaryReminderIntervalRequest.java  |  4 +--
 .../lefun/requests/SetTimeRequest.java        |  4 +--
 .../lefun/requests/StartPpgRequest.java       |  4 +--
 .../lenovo/operations/InitOperation.java      |  4 +--
 .../watchxplus/WatchXPlusDeviceSupport.java   |  7 ++--
 .../devices/liveview/LiveviewIoThread.java    |  4 +--
 .../devices/liveview/LiveviewProtocol.java    |  4 +--
 .../devices/liveview/LiveviewSupport.java     |  6 ++--
 .../makibeshr3/MakibesHR3DeviceSupport.java   |  5 +--
 .../service/devices/miband/AbstractInfo.java  |  4 +--
 .../miband/AbstractMi1FirmwareInfo.java       |  4 +--
 .../miband/AbstractMi1SFirmwareInfo.java      |  4 +--
 .../miband/AbstractMiFirmwareInfo.java        |  4 +--
 .../service/devices/miband/BatteryInfo.java   |  4 +--
 .../CheckAuthenticationNeededAction.java      |  4 +--
 .../miband/CompositeMiFirmwareInfo.java       |  4 +--
 .../service/devices/miband/DeviceInfo.java    |  6 ++--
 .../devices/miband/Mi1AFirmwareInfo.java      |  4 +--
 .../devices/miband/Mi1FirmwareInfo.java       |  4 +--
 .../devices/miband/Mi1SFirmwareInfo.java      |  4 +--
 .../devices/miband/Mi1SFirmwareInfoFW1.java   |  4 +--
 .../devices/miband/Mi1SFirmwareInfoFW2.java   |  4 +--
 .../service/devices/miband/MiBandSupport.java | 10 +++---
 .../miband/NoNotificationStrategy.java        |  4 +--
 .../devices/miband/NotificationStrategy.java  |  4 +--
 .../miband/RealtimeSamplesSupport.java        |  4 +--
 .../devices/miband/TestMi1AFirmwareInfo.java  |  4 +--
 .../miband/V1NotificationStrategy.java        |  4 +--
 .../miband/V2NotificationStrategy.java        |  4 +--
 .../operations/AbstractMiBand1Operation.java  |  4 +--
 .../operations/AbstractMiBandOperation.java   |  4 +--
 .../operations/FetchActivityOperation.java    |  4 +--
 .../miband/operations/OperationStatus.java    |  4 +--
 .../operations/UpdateFirmwareOperation.java   |  4 +--
 .../mijia_lywsd/MijiaLywsdSupport.java        |  5 ++-
 .../miscale2/MiScale2DeviceSupport.java       |  6 ++--
 .../service/devices/no1f1/No1F1Support.java   |  7 ++--
 .../service/devices/nothing/Ear1Support.java  | 16 +++++++++
 .../devices/nothing/NothingIOThread.java      | 16 +++++++++
 .../devices/nothing/NothingProtocol.java      | 16 +++++++++
 .../service/devices/nut/NutSupport.java       |  4 +--
 .../devices/pebble/AppMessageHandler.java     |  4 +--
 .../pebble/AppMessageHandlerGBPebble.java     |  4 +--
 .../pebble/AppMessageHandlerHealthify.java    |  4 +--
 .../devices/pebble/AppMessageHandlerM7S.java  |  5 ++-
 .../pebble/AppMessageHandlerMarioTime.java    |  4 +--
 .../pebble/AppMessageHandlerMisfit.java       |  4 +--
 .../pebble/AppMessageHandlerMorpheuz.java     |  4 +--
 .../pebble/AppMessageHandlerObsidian.java     |  4 +--
 .../pebble/AppMessageHandlerPebStyle.java     |  4 +--
 .../pebble/AppMessageHandlerRealWeather.java  |  4 +--
 .../pebble/AppMessageHandlerSimplyLight.java  |  4 +--
 .../pebble/AppMessageHandlerSquare.java       |  4 +--
 .../AppMessageHandlerTimeStylePebble.java     |  4 +--
 .../pebble/AppMessageHandlerTrekVolle.java    |  4 +--
 .../pebble/AppMessageHandlerYWeather.java     |  4 +--
 .../pebble/AppMessageHandlerZalewszczak.java  |  4 +--
 .../devices/pebble/DatalogSession.java        |  4 +--
 .../pebble/DatalogSessionAnalytics.java       |  4 +--
 .../pebble/DatalogSessionHealthHR.java        |  4 +--
 .../DatalogSessionHealthOverlayData.java      |  4 +--
 .../pebble/DatalogSessionHealthSleep.java     |  6 ++--
 .../pebble/DatalogSessionHealthSteps.java     |  6 ++--
 .../pebble/DatalogSessionPebbleHealth.java    |  4 +--
 .../pebble/PebbleActiveAppTracker.java        |  4 +--
 .../devices/pebble/PebbleIoThread.java        |  6 ++--
 .../devices/pebble/PebbleKitSupport.java      |  4 +--
 .../devices/pebble/PebbleProtocol.java        |  8 ++---
 .../service/devices/pebble/PebbleSupport.java |  7 ++--
 .../devices/pebble/ble/PebbleGATTClient.java  |  4 +--
 .../devices/pebble/ble/PebbleGATTServer.java  |  4 +--
 .../devices/pebble/ble/PebbleLESupport.java   |  4 +--
 .../pebble/webview/CurrentPosition.java       |  4 +--
 .../pebble/webview/GBChromeClient.java        |  4 +--
 .../devices/pebble/webview/GBWebClient.java   |  4 +--
 .../devices/pebble/webview/JSInterface.java   |  4 +--
 .../devices/pinetime/PineTimeJFSupport.java   |  8 +++--
 .../service/devices/qc35/QC35BaseSupport.java |  4 +--
 .../service/devices/qc35/QC35IOThread.java    |  4 +--
 .../service/devices/qc35/QC35Protocol.java    |  4 +--
 .../devices/qhybrid/QHybridBaseSupport.java   |  5 ++-
 .../devices/qhybrid/QHybridSupport.java       |  6 ++--
 .../devices/qhybrid/adapter/WatchAdapter.java |  5 +--
 .../qhybrid/adapter/WatchAdapterFactory.java  |  4 +--
 .../adapter/fossil/FossilWatchAdapter.java    |  5 +--
 .../fossil_hr/FossilHRWatchAdapter.java       |  6 ++--
 .../adapter/misfit/MisfitWatchAdapter.java    |  4 +--
 .../buttonconfig/ConfigFileBuilder.java       |  4 +--
 .../qhybrid/buttonconfig/ConfigPayload.java   |  4 +--
 .../devices/qhybrid/encoder/RLEEncoder.java   |  4 +--
 .../devices/qhybrid/file/FileHandle.java      |  4 +--
 .../devices/qhybrid/parser/ActivityEntry.java |  4 +--
 .../qhybrid/parser/ActivityFileParser.java    |  4 +--
 .../devices/qhybrid/requests/Request.java     |  4 +--
 .../requests/fossil/FossilRequest.java        |  4 +--
 .../requests/fossil/RequestMtuRequest.java    |  4 +--
 .../fossil/SetDeviceStateRequest.java         |  4 +--
 .../qhybrid/requests/fossil/alarm/Alarm.java  |  4 +--
 .../fossil/alarm/AlarmsGetRequest.java        |  4 +--
 .../fossil/alarm/AlarmsSetRequest.java        |  4 +--
 .../button/ButtonConfigurationGetRequest.java |  4 +--
 .../ConfigurationGetRequest.java              |  4 +--
 .../ConfigurationPutRequest.java              |  5 +--
 .../SetConnectionParametersRequest.java       |  4 +--
 .../fossil/device_info/DeviceInfo.java        |  4 +--
 .../DeviceSecurityVersionInfo.java            |  4 +--
 .../device_info/GetDeviceInfoRequest.java     |  4 +--
 .../SupportedFileVersionsInfo.java            |  4 +--
 .../fossil/file/FileCloseAndPutRequest.java   |  4 +--
 .../fossil/file/FileCloseRequest.java         |  4 +--
 .../fossil/file/FileDeleteRequest.java        |  4 +--
 .../fossil/file/FileGetRawRequest.java        |  4 +--
 .../requests/fossil/file/FileGetRequest.java  |  4 +--
 .../fossil/file/FileLookupAndGetRequest.java  |  4 +--
 .../fossil/file/FileLookupRequest.java        |  4 +--
 .../fossil/file/FilePutRawRequest.java        |  4 +--
 .../requests/fossil/file/FilePutRequest.java  |  4 +--
 .../fossil/file/FileVerifyRequest.java        |  4 +--
 .../fossil/file/FirmwareFilePutRequest.java   |  4 +--
 .../fossil/microapp/MicroAppCommand.java      |  4 +--
 .../fossil/microapp/PlayCrazyShitRequest.java |  4 +--
 .../DismissTextNotificationRequest.java       |  4 +--
 .../NotificationFilterGetRequest.java         |  4 +--
 .../NotificationFilterPutRequest.java         |  4 +--
 .../fossil/notification/NotificationType.java |  4 +--
 .../PlayCallNotificationRequest.java          |  4 +--
 .../notification/PlayNotificationRequest.java |  5 +--
 .../PlayTextNotificationRequest.java          |  4 +--
 .../alexa/AlexaMessageSetRequest.java         | 16 +++++++++
 .../application/ApplicationInformation.java   | 16 +++++++++
 .../application/ApplicationsListRequest.java  | 16 +++++++++
 .../async/ConfirmAppStatusRequest.java        |  4 +--
 .../authentication/AuthenticationRequest.java | 16 +++++++++
 .../CheckDeviceNeedsConfirmationRequest.java  | 16 +++++++++
 .../CheckDevicePairingRequest.java            | 16 +++++++++
 .../ConfirmOnDeviceRequest.java               | 16 +++++++++
 .../PerformDevicePairingRequest.java          | 16 +++++++++
 .../VerifyPrivateKeyRequest.java              |  4 +--
 .../buttons/ButtonConfiguration.java          |  4 +--
 .../ButtonConfigurationPutRequest.java        |  4 +--
 .../commute/CommuteConfigPutRequest.java      |  4 +--
 .../ConfigurationGetRequest.java              |  4 +--
 .../ConfigurationPutRequest.java              |  4 +--
 .../requests/fossil_hr/file/AssetFile.java    |  4 +--
 .../fossil_hr/file/AssetFilePutRequest.java   |  4 +--
 .../file/FileEncryptedGetRequest.java         |  4 +--
 .../file/FileEncryptedInterface.java          |  4 +--
 .../FileEncryptedLookupAndGetRequest.java     |  4 +--
 .../file/FileEncryptedPutRequest.java         |  4 +--
 .../requests/fossil_hr/file/ResultCode.java   |  4 +--
 .../requests/fossil_hr/image/AssetImage.java  |  4 +--
 .../fossil_hr/image/AssetImageFactory.java    |  4 +--
 .../fossil_hr/image/ImageConverter.java       |  4 +--
 .../fossil_hr/image/ImagesSetRequest.java     |  4 +--
 .../fossil_hr/json/JsonPutRequest.java        |  4 +--
 .../fossil_hr/menu/SetCommuteMenuMessage.java |  4 +--
 .../fossil_hr/music/MusicControlRequest.java  |  4 +--
 .../fossil_hr/music/MusicInfoSetRequest.java  |  4 +--
 .../NotificationFilterPutHRRequest.java       |  4 +--
 .../notification/NotificationImage.java       |  4 +--
 .../NotificationImagePutRequest.java          |  4 +--
 .../QuickReplyConfigurationPutRequest.java    |  4 +--
 .../QuickReplyConfirmationPutRequest.java     |  4 +--
 .../theme/SelectedThemePutRequest.java        |  4 +--
 .../translation/TranslationData.java          |  4 +--
 .../translation/TranslationItem.java          |  4 +--
 .../translation/TranslationsGetRequest.java   |  4 +--
 .../translation/TranslationsPutRequest.java   |  4 +--
 .../widget/CustomBackgroundWidgetElement.java |  4 +--
 .../widget/CustomTextWidgetElement.java       |  4 +--
 .../fossil_hr/widget/CustomWidget.java        |  4 +--
 .../fossil_hr/widget/CustomWidgetElement.java |  4 +--
 .../requests/fossil_hr/widget/Widget.java     |  4 +--
 .../fossil_hr/widget/WidgetsPutRequest.java   |  4 +--
 .../workout/WorkoutRequestHandler.java        |  4 +--
 .../misfit/ActivityPointGetRequest.java       |  4 +--
 .../requests/misfit/AnimationRequest.java     |  4 +--
 .../requests/misfit/BatteryLevelRequest.java  |  4 +--
 .../requests/misfit/DownloadFileRequest.java  |  4 +--
 .../requests/misfit/EraseFileRequest.java     |  4 +--
 .../requests/misfit/EventStreamRequest.java   |  4 +--
 .../requests/misfit/FactoryResetRequest.java  |  4 +--
 .../qhybrid/requests/misfit/FileRequest.java  |  4 +--
 .../misfit/GetCountdownSettingsRequest.java   |  4 +--
 .../misfit/GetCurrentStepCountRequest.java    |  4 +--
 .../requests/misfit/GetStepGoalRequest.java   |  4 +--
 .../misfit/GetTripleTapEnabledRequest.java    |  4 +--
 .../misfit/GetVibrationStrengthRequest.java   |  4 +--
 .../misfit/GoalTrackingGetRequest.java        |  4 +--
 .../misfit/GoalTrackingSetRequest.java        |  4 +--
 .../requests/misfit/ListFilesRequest.java     |  4 +--
 .../requests/misfit/MoveHandsRequest.java     |  4 +--
 .../requests/misfit/OTAEnterRequest.java      |  4 +--
 .../requests/misfit/OTAEraseRequest.java      |  4 +--
 .../requests/misfit/OTAResetRequest.java      |  4 +--
 .../misfit/PlayNotificationRequest.java       |  4 +--
 .../misfit/PutSettingsFileRequest.java        |  4 +--
 .../misfit/ReleaseHandsControlRequest.java    |  4 +--
 .../misfit/RequestHandControlRequest.java     |  4 +--
 .../misfit/SaveCalibrationRequest.java        |  4 +--
 .../requests/misfit/SetCountdownSettings.java |  4 +--
 .../misfit/SetCurrentStepCountRequest.java    |  4 +--
 .../misfit/SetCurrentTimeServiceRequest.java  |  4 +--
 .../requests/misfit/SetStepGoalRequest.java   |  4 +--
 .../requests/misfit/SetTimeRequest.java       |  4 +--
 .../misfit/SetTripleTapEnabledRequest.java    |  4 +--
 .../misfit/SetVibrationStrengthRequest.java   |  4 +--
 .../misfit/SettingsFilePutRequest.java        |  4 +--
 .../requests/misfit/UploadFileRequest.java    |  4 +--
 .../requests/misfit/VibrateRequest.java       |  4 +--
 .../devices/roidmi/Roidmi1Protocol.java       |  4 +--
 .../devices/roidmi/Roidmi3Protocol.java       |  4 +--
 .../devices/roidmi/RoidmiIoThread.java        |  4 +--
 .../devices/roidmi/RoidmiProtocol.java        |  4 +--
 .../service/devices/roidmi/RoidmiSupport.java |  5 +--
 .../service/devices/soflow/SoFlowSupport.java |  4 +--
 .../headphones/SonyHeadphonesIoThread.java    |  4 +--
 .../headphones/SonyHeadphonesProtocol.java    |  4 +--
 .../headphones/SonyHeadphonesSupport.java     |  4 +--
 .../SonyHeadphonesEnqueueRequestEvent.java    |  4 +--
 .../sony/headphones/protocol/Message.java     |  4 +--
 .../sony/headphones/protocol/MessageType.java |  4 +--
 .../sony/headphones/protocol/Request.java     |  4 +--
 .../impl/AbstractSonyProtocolImpl.java        |  4 +--
 .../protocol/impl/v1/PayloadTypeV1.java       |  4 +--
 .../protocol/impl/v1/SonyProtocolImplV1.java  |  4 +--
 .../protocol/impl/v1/params/AudioCodec.java   |  4 +--
 .../protocol/impl/v1/params/BatteryType.java  |  4 +--
 .../NoiseCancellingOptimizerStatus.java       |  4 +--
 .../impl/v1/params/VirtualSoundParam.java     |  4 +--
 .../protocol/impl/v2/PayloadTypeV2.java       |  4 +--
 .../protocol/impl/v2/SonyProtocolImplV2.java  |  4 +--
 .../protocol/impl/v3/PayloadTypeV3.java       |  4 +--
 .../protocol/impl/v3/SonyProtocolImplV3.java  |  4 +--
 .../sony/wena3/SonyWena3DeviceSupport.java    |  4 +--
 .../sony/wena3/protocol/Wena3Packetable.java  |  4 +--
 .../protocol/logic/ActivityPacketCrc.java     | 33 ++++++++----------
 .../protocol/logic/ActivityPacketParser.java  | 33 ++++++++----------
 .../logic/ActivitySyncPacketProcessor.java    | 33 ++++++++----------
 .../protocol/logic/StepsSampleCollection.java | 33 ++++++++----------
 .../logic/parsers/BehaviorPacketParser.java   | 33 ++++++++----------
 .../logic/parsers/CaloriesPacketParser.java   | 33 ++++++++----------
 .../logic/parsers/EnergyPacketParser.java     | 33 ++++++++----------
 .../logic/parsers/HeartRatePacketParser.java  | 33 ++++++++----------
 .../parsers/LinearSamplePacketParser.java     | 33 ++++++++----------
 .../parsers/OneBytePerSamplePacketParser.java | 33 ++++++++----------
 .../logic/parsers/SamplePacketParser.java     | 33 ++++++++----------
 .../logic/parsers/StepsPacketParser.java      | 33 ++++++++----------
 .../logic/parsers/StressPacketParser.java     | 33 ++++++++----------
 .../logic/parsers/Vo2MaxPacketParser.java     | 33 ++++++++----------
 .../activity/ActivitySyncDataPacket.java      | 33 ++++++++----------
 .../activity/ActivitySyncStartPacket.java     | 33 ++++++++----------
 .../ActivitySyncTimePacketTemplate.java       |  4 +--
 .../activity/ActivitySyncTimePacketTypeA.java |  4 +--
 .../activity/ActivitySyncTimePacketTypeB.java |  4 +--
 .../packets/activity/BehaviorSample.java      | 33 ++++++++----------
 .../packets/activity/Vo2MaxSample.java        | 33 ++++++++----------
 .../packets/calendar/CalendarEntry.java       |  4 +--
 .../notification/EndOfIncomingCall.java       |  4 +--
 .../notification/NotificationArrival.java     |  4 +--
 .../notification/NotificationRemoval.java     |  4 +--
 .../notification/defines/LedColor.java        |  5 ++-
 .../defines/NotificationFlags.java            |  5 ++-
 .../defines/NotificationKind.java             |  4 +--
 .../notification/defines/VibrationCount.java  | 33 ++++++++----------
 .../notification/defines/VibrationKind.java   |  5 ++-
 .../defines/VibrationOptions.java             |  5 ++-
 .../packets/settings/AlarmListSettings.java   |  4 +--
 .../settings/AutoPowerOffSettings.java        |  4 +--
 .../settings/BodyPropertiesSetting.java       |  4 +--
 .../CalendarNotificationEnableSetting.java    |  4 +--
 .../settings/CameraAppTypeSetting.java        |  4 +--
 .../packets/settings/DayStartHourSetting.java |  4 +--
 .../settings/DeviceButtonActionSetting.java   |  4 +--
 .../packets/settings/DisplaySetting.java      |  4 +--
 .../settings/DoNotDisturbSettings.java        |  4 +--
 .../packets/settings/GoalStepsSetting.java    |  4 +--
 .../settings/HomeIconOrderSetting.java        |  4 +--
 .../packets/settings/MenuIconSetting.java     |  4 +--
 .../packets/settings/SingleAlarmSetting.java  |  4 +--
 .../settings/StatusPageOrderSetting.java      |  4 +--
 .../packets/settings/TimeSetting.java         |  4 +--
 .../packets/settings/TimeZoneSetting.java     |  4 +--
 .../packets/settings/VibrationSetting.java    |  4 +--
 .../defines/DeviceButtonActionId.java         |  4 +--
 .../settings/defines/DisplayDesign.java       |  4 +--
 .../settings/defines/DisplayOrientation.java  |  4 +--
 .../packets/settings/defines/FontSize.java    |  4 +--
 .../settings/defines/GenderSetting.java       |  4 +--
 .../packets/settings/defines/HomeIconId.java  |  4 +--
 .../packets/settings/defines/Language.java    |  4 +--
 .../packets/settings/defines/MenuIconId.java  |  4 +--
 .../settings/defines/StatusPageId.java        |  4 +--
 .../settings/defines/VibrationStrength.java   |  4 +--
 .../packets/status/BatteryLevelInfo.java      |  4 +--
 .../protocol/packets/status/DeviceInfo.java   |  4 +--
 .../protocol/packets/status/MusicInfo.java    |  4 +--
 .../NotificationServiceStatusRequest.java     |  4 +--
 .../packets/status/StatusRequestType.java     |  4 +--
 .../protocol/packets/status/Weather.java      |  4 +--
 .../protocol/packets/status/WeatherDay.java   |  4 +--
 .../packets/status/WeatherReport.java         |  4 +--
 .../protocol/packets/status/WeatherType.java  |  4 +--
 .../sony/wena3/protocol/util/TimeUtil.java    |  4 +--
 .../devices/sonyswr12/SonySWR12Constants.java |  4 +--
 .../sonyswr12/SonySWR12DeviceSupport.java     |  4 +--
 .../sonyswr12/SonySWR12HandlerThread.java     |  4 +--
 .../devices/sonyswr12/SonySWR12Util.java      |  4 +--
 .../entities/activity/ActivityBase.java       |  4 +--
 .../entities/activity/ActivityHeartRate.java  |  4 +--
 .../entities/activity/ActivitySleep.java      |  4 +--
 .../entities/activity/ActivityType.java       |  4 +--
 .../entities/activity/ActivityWithData.java   |  4 +--
 .../entities/activity/EventBase.java          |  4 +--
 .../entities/activity/EventCode.java          |  4 +--
 .../entities/activity/EventFactory.java       |  4 +--
 .../entities/activity/EventWithActivity.java  |  4 +--
 .../entities/activity/EventWithValue.java     |  4 +--
 .../entities/activity/SleepLevel.java         |  4 +--
 .../sonyswr12/entities/alarm/AlarmRepeat.java |  4 +--
 .../sonyswr12/entities/alarm/AlarmState.java  |  4 +--
 .../sonyswr12/entities/alarm/BandAlarm.java   |  4 +--
 .../sonyswr12/entities/alarm/BandAlarms.java  |  4 +--
 .../entities/control/CommandCode.java         |  4 +--
 .../entities/control/ControlPoint.java        |  4 +--
 .../control/ControlPointLowVibration.java     |  4 +--
 .../control/ControlPointWithValue.java        |  4 +--
 .../entities/time/BandDaylightSavingTime.java |  4 +--
 .../sonyswr12/entities/time/BandTime.java     |  4 +--
 .../sonyswr12/entities/time/BandTimeZone.java |  4 +--
 .../sonyswr12/util/ByteArrayReader.java       |  4 +--
 .../sonyswr12/util/ByteArrayWriter.java       |  4 +--
 .../devices/sonyswr12/util/IntFormat.java     |  4 +--
 .../devices/sonyswr12/util/UIntBitReader.java |  4 +--
 .../devices/sonyswr12/util/UIntBitWriter.java |  4 +--
 .../devices/supercars/SuperCarsSupport.java   | 16 +++++++++
 .../service/devices/tlw64/TLW64Support.java   |  6 ++--
 .../devices/um25/Data/CaptureGroup.java       | 16 +++++++++
 .../devices/um25/Data/MeasurementData.java    | 16 +++++++++
 .../devices/um25/Support/UM25BaseSupport.java | 16 +++++++++
 .../devices/um25/Support/UM25Support.java     | 16 +++++++++
 .../devices/unknown/UnknownDeviceSupport.java | 16 +++++++++
 .../service/devices/vesc/CommandType.java     |  4 +--
 .../devices/vesc/VescBaseDeviceSupport.java   |  4 +--
 .../devices/vesc/VescDeviceSupport.java       |  4 +--
 .../vibratissimo/VibratissimoSupport.java     |  6 ++--
 .../vivomovehr/ChecksumCalculator.java        |  4 +--
 .../vivomovehr/GarminDeviceSetting.java       |  4 +--
 .../devices/vivomovehr/GarminMessageType.java |  4 +--
 .../vivomovehr/GarminMusicControlCommand.java |  4 +--
 .../vivomovehr/GarminSystemEventType.java     |  4 +--
 .../devices/vivomovehr/GarminTimeUtils.java   |  4 +--
 .../devices/vivomovehr/GfdiPacketParser.java  |  4 +--
 .../vivomovehr/RealTimeActivityHandler.java   |  4 +--
 .../vivomovehr/VivomoveHrCommunicator.java    |  4 +--
 .../devices/vivomovehr/VivomoveHrSupport.java |  4 +--
 .../devices/vivomovehr/ams/AmsEntity.java     |  4 +--
 .../vivomovehr/ams/AmsEntityAttribute.java    |  4 +--
 .../devices/vivomovehr/ancs/AncsAction.java   |  4 +--
 .../vivomovehr/ancs/AncsAndroidAction.java    |  4 +--
 .../vivomovehr/ancs/AncsAppAttribute.java     |  4 +--
 .../vivomovehr/ancs/AncsAttribute.java        |  4 +--
 .../vivomovehr/ancs/AncsAttributeRequest.java |  4 +--
 .../devices/vivomovehr/ancs/AncsCategory.java |  4 +--
 .../devices/vivomovehr/ancs/AncsCommand.java  |  4 +--
 .../vivomovehr/ancs/AncsControlCommand.java   |  4 +--
 .../devices/vivomovehr/ancs/AncsEvent.java    |  4 +--
 .../vivomovehr/ancs/AncsEventFlag.java        |  4 +--
 .../ancs/AncsGetAppAttributesCommand.java     |  4 +--
 .../AncsGetNotificationAttributeCommand.java  |  4 +--
 ...AncsGetNotificationAttributesResponse.java |  4 +--
 .../ancs/AncsPerformAndroidAction.java        |  4 +--
 .../ancs/AncsPerformNotificationAction.java   |  4 +--
 .../vivomovehr/ancs/GncsDataSourceQueue.java  |  4 +--
 .../vivomovehr/downloads/DirectoryData.java   |  4 +--
 .../vivomovehr/downloads/DirectoryEntry.java  |  4 +--
 .../downloads/FileDownloadListener.java       |  4 +--
 .../downloads/FileDownloadQueue.java          |  4 +--
 .../devices/vivomovehr/fit/FitBool.java       |  4 +--
 .../devices/vivomovehr/fit/FitDbImporter.java |  4 +--
 .../vivomovehr/fit/FitFieldBaseType.java      |  4 +--
 .../vivomovehr/fit/FitImportProcessor.java    |  4 +--
 .../devices/vivomovehr/fit/FitImporter.java   |  4 +--
 .../fit/FitLocalFieldDefinition.java          |  4 +--
 .../fit/FitLocalMessageDefinition.java        |  4 +--
 .../devices/vivomovehr/fit/FitMessage.java    |  4 +--
 .../vivomovehr/fit/FitMessageDefinition.java  |  4 +--
 .../vivomovehr/fit/FitMessageDefinitions.java |  4 +--
 .../fit/FitMessageFieldDefinition.java        |  4 +--
 .../devices/vivomovehr/fit/FitParser.java     |  4 +--
 .../devices/vivomovehr/fit/FitSerializer.java |  4 +--
 .../vivomovehr/fit/FitWeatherConditions.java  |  4 +--
 .../messages/AuthNegotiationMessage.java      |  4 +--
 .../AuthNegotiationResponseMessage.java       |  4 +--
 .../messages/BatteryStatusMessage.java        |  4 +--
 .../messages/ConfigurationMessage.java        |  4 +--
 .../messages/CreateFileRequestMessage.java    |  4 +--
 .../messages/CreateFileResponseMessage.java   |  4 +--
 .../messages/CurrentTimeRequestMessage.java   |  4 +--
 .../CurrentTimeRequestResponseMessage.java    |  4 +--
 .../messages/DeviceInformationMessage.java    |  4 +--
 .../DeviceInformationResponseMessage.java     |  4 +--
 .../DirectoryFileFilterRequestMessage.java    |  4 +--
 .../DirectoryFileFilterResponseMessage.java   |  4 +--
 .../messages/DownloadRequestMessage.java      |  4 +--
 .../DownloadRequestResponseMessage.java       |  4 +--
 .../vivomovehr/messages/FileReadyMessage.java |  4 +--
 .../messages/FileTransferDataMessage.java     |  4 +--
 .../FileTransferDataResponseMessage.java      |  4 +--
 .../messages/FindMyPhoneRequestMessage.java   |  4 +--
 .../vivomovehr/messages/FitDataMessage.java   |  4 +--
 .../messages/FitDataResponseMessage.java      |  4 +--
 .../messages/FitDefinitionMessage.java        |  4 +--
 .../FitDefinitionResponseMessage.java         |  4 +--
 .../messages/GenericResponseMessage.java      |  4 +--
 .../messages/GncsControlPointMessage.java     |  4 +--
 .../GncsControlPointResponseMessage.java      |  4 +--
 .../messages/GncsDataSourceMessage.java       |  4 +--
 .../GncsDataSourceResponseMessage.java        |  4 +--
 .../GncsNotificationSourceMessage.java        |  4 +--
 .../vivomovehr/messages/MessageReader.java    |  4 +--
 .../vivomovehr/messages/MessageWriter.java    |  4 +--
 .../MusicControlCapabilitiesMessage.java      |  4 +--
 ...sicControlCapabilitiesResponseMessage.java |  4 +--
 .../MusicControlEntityUpdateMessage.java      |  4 +--
 ...otificationServiceSubscriptionMessage.java |  4 +--
 ...ionServiceSubscriptionResponseMessage.java |  4 +--
 .../messages/ProtobufRequestMessage.java      |  4 +--
 .../ProtobufRequestResponseMessage.java       |  4 +--
 .../vivomovehr/messages/RequestMessage.java   |  4 +--
 .../vivomovehr/messages/ResponseMessage.java  |  4 +--
 .../messages/SetDeviceSettingsMessage.java    |  4 +--
 .../SetDeviceSettingsResponseMessage.java     |  4 +--
 .../SupportedFileTypesRequestMessage.java     |  4 +--
 .../SupportedFileTypesResponseMessage.java    |  4 +--
 .../messages/SyncRequestMessage.java          |  4 +--
 .../messages/SystemEventMessage.java          |  4 +--
 .../messages/SystemEventResponseMessage.java  |  4 +--
 .../messages/UploadRequestMessage.java        |  4 +--
 .../UploadRequestResponseMessage.java         |  4 +--
 .../messages/WeatherRequestMessage.java       |  4 +--
 .../WeatherRequestResponseMessage.java        |  4 +--
 .../notifications/NotificationData.java       |  4 +--
 .../notifications/NotificationStorage.java    |  4 +--
 .../vivomovehr/uploads/FileUploadQueue.java   |  4 +--
 .../devices/waspos/WaspOSDeviceSupport.java   |  5 +--
 .../devices/watch9/Watch9DeviceSupport.java   |  7 ++--
 .../watch9/operations/InitOperation.java      |  4 +--
 .../AuthenticationHandler.java                |  4 +--
 .../devices/withingssteelhr/IconHelper.java   |  4 +--
 .../WithingsSteelHRDeviceSupport.java         |  4 +--
 .../activity/ActivityEntry.java               |  4 +--
 .../activity/SleepActivitySampleHelper.java   |  4 +--
 .../activity/WithingsActivityType.java        |  4 +--
 .../communication/WithingsServerAction.java   |  4 +--
 .../communication/WithingsUUID.java           |  4 +--
 .../conversation/AbstractConversation.java    |  4 +--
 .../conversation/AbstractResponseHandler.java |  4 +--
 .../conversation/ActivitySampleHandler.java   |  4 +--
 .../conversation/BatteryStateHandler.java     |  4 +--
 .../conversation/Conversation.java            |  4 +--
 .../conversation/ConversationObserver.java    |  4 +--
 .../conversation/ConversationQueue.java       |  4 +--
 .../conversation/HeartRateHandler.java        |  4 +--
 .../conversation/ResponseHandler.java         |  4 +--
 .../conversation/SetupFinishedHandler.java    |  4 +--
 .../conversation/SimpleConversation.java      |  4 +--
 .../conversation/SyncFinishedHandler.java     |  4 +--
 .../WorkoutScreenListHandler.java             |  4 +--
 .../datastructures/ActivityHeartrate.java     |  4 +--
 .../ActivitySampleCalories.java               |  4 +--
 .../ActivitySampleCalories2.java              |  4 +--
 .../ActivitySampleDuration.java               |  4 +--
 .../ActivitySampleMovement.java               |  4 +--
 .../datastructures/ActivitySampleRun.java     |  4 +--
 .../datastructures/ActivitySampleSleep.java   |  4 +--
 .../datastructures/ActivitySampleSwim.java    |  4 +--
 .../datastructures/ActivitySampleTime.java    |  4 +--
 .../datastructures/ActivitySampleUnknown.java |  4 +--
 .../datastructures/ActivitySampleWalk.java    |  4 +--
 .../datastructures/ActivityTarget.java        |  4 +--
 .../datastructures/AlarmName.java             |  4 +--
 .../datastructures/AlarmSettings.java         |  4 +--
 .../datastructures/AlarmStatus.java           |  4 +--
 .../datastructures/AncsStatus.java            |  4 +--
 .../datastructures/BatteryValues.java         |  4 +--
 .../datastructures/Challenge.java             |  4 +--
 .../datastructures/ChallengeResponse.java     |  4 +--
 .../datastructures/DataStructureFactory.java  |  4 +--
 .../datastructures/EndOfTransmission.java     |  4 +--
 .../datastructures/GetActivitySamples.java    |  4 +--
 .../communication/datastructures/GlyphId.java |  4 +--
 .../datastructures/HeartRate.java             |  4 +--
 .../datastructures/ImageData.java             |  4 +--
 .../datastructures/ImageMetaData.java         |  4 +--
 .../datastructures/LiveHeartRate.java         |  4 +--
 .../datastructures/LiveWorkoutEnd.java        |  4 +--
 .../datastructures/LiveWorkoutPauseState.java |  4 +--
 .../datastructures/LiveWorkoutStart.java      |  4 +--
 .../communication/datastructures/Locale.java  |  4 +--
 .../datastructures/MoveHand.java              |  4 +--
 .../communication/datastructures/Probe.java   |  4 +--
 .../datastructures/ProbeOsVersion.java        |  4 +--
 .../datastructures/ProbeReply.java            |  4 +--
 .../datastructures/ScreenSettings.java        |  4 +--
 .../datastructures/SourceAppId.java           |  4 +--
 .../communication/datastructures/Status.java  |  4 +--
 .../communication/datastructures/Time.java    |  4 +--
 .../datastructures/TypeVersion.java           |  4 +--
 .../communication/datastructures/User.java    |  4 +--
 .../datastructures/UserSecret.java            |  4 +--
 .../datastructures/UserUnit.java              |  4 +--
 .../datastructures/UserUnitConstants.java     |  4 +--
 .../datastructures/WithingsStructure.java     |  4 +--
 .../datastructures/WithingsStructureType.java |  4 +--
 .../datastructures/WorkoutGpsState.java       |  4 +--
 .../datastructures/WorkoutScreen.java         |  4 +--
 .../datastructures/WorkoutScreenData.java     |  4 +--
 .../datastructures/WorkoutScreenList.java     |  4 +--
 .../datastructures/WorkoutType.java           |  4 +--
 .../message/AbstractMessage.java              |  4 +--
 .../message/ExpectedResponse.java             |  4 +--
 .../message/GlyphRequestHandler.java          |  4 +--
 .../communication/message/Message.java        |  4 +--
 .../communication/message/MessageBuilder.java |  4 +--
 .../communication/message/MessageFactory.java |  4 +--
 .../message/SimpleHexToByteMessage.java       |  4 +--
 .../message/WithingsMessage.java              |  4 +--
 .../message/WithingsMessageType.java          |  4 +--
 .../incoming/IncomingMessageHandler.java      |  4 +--
 .../IncomingMessageHandlerFactory.java        |  4 +--
 .../incoming/LiveHeartrateHandler.java        |  4 +--
 .../message/incoming/LiveWorkoutHandler.java  |  4 +--
 .../incoming/NotificationRequestHandler.java  |  4 +--
 .../message/incoming/SyncRequestHandler.java  |  4 +--
 .../notification/AncsConstants.java           |  4 +--
 .../GetNotificationAttributes.java            |  4 +--
 .../GetNotificationAttributesResponse.java    |  4 +--
 .../notification/NotificationAttribute.java   |  4 +--
 .../notification/NotificationProvider.java    |  4 +--
 .../notification/NotificationSource.java      |  4 +--
 .../RequestedNotificationAttribute.java       |  4 +--
 .../devices/xiaomi/XiaomiAuthService.java     |  4 +--
 .../devices/xiaomi/XiaomiBleUuids.java        |  4 +--
 .../devices/xiaomi/XiaomiCharacteristic.java  |  4 +--
 .../devices/xiaomi/XiaomiPreferences.java     |  4 +--
 .../service/devices/xiaomi/XiaomiSupport.java |  4 +--
 .../activity/XiaomiActivityFileFetcher.java   |  4 +--
 .../xiaomi/activity/XiaomiActivityFileId.java |  4 +--
 .../xiaomi/activity/XiaomiActivityParser.java |  4 +--
 .../activity/impl/DailyDetailsParser.java     |  4 +--
 .../activity/impl/DailySummaryParser.java     |  4 +--
 .../activity/impl/SleepDetailsParser.java     |  4 +--
 .../activity/impl/SleepStagesParser.java      |  4 +--
 .../activity/impl/WorkoutGpsParser.java       |  4 +--
 .../activity/impl/WorkoutSummaryParser.java   |  4 +--
 .../impl/XiaomiSimpleActivityParser.java      |  4 +--
 .../activity/impl/XiaomiSimpleDataEntry.java  |  4 +--
 .../services/AbstractXiaomiService.java       |  4 +--
 .../services/XiaomiCalendarService.java       |  4 +--
 .../services/XiaomiDataUploadService.java     |  4 +--
 .../xiaomi/services/XiaomiHealthService.java  |  4 +--
 .../xiaomi/services/XiaomiMusicService.java   |  4 +--
 .../services/XiaomiNotificationService.java   |  4 +--
 .../services/XiaomiPhonebookService.java      |  4 +--
 .../services/XiaomiScheduleService.java       |  4 +--
 .../xiaomi/services/XiaomiSystemService.java  |  5 +--
 .../services/XiaomiWatchfaceService.java      |  4 +--
 .../xiaomi/services/XiaomiWeatherService.java |  4 +--
 .../service/devices/xwatch/XWatchSupport.java |  6 ++--
 .../devices/zetime/ZeTimeDeviceSupport.java   |  7 ++--
 .../AutoConnectIntervalReceiver.java          |  5 +--
 .../receivers/GBAutoFetchReceiver.java        |  4 +--
 .../receivers/GBCallControlReceiver.java      |  6 ++--
 .../receivers/GBMusicControlReceiver.java     |  6 ++--
 .../serial/AbstractSerialDeviceSupport.java   |  4 +--
 .../service/serial/GBDeviceIoThread.java      |  4 +--
 .../service/serial/GBDeviceProtocol.java      |  4 +--
 .../gadgetbridge/util/AlarmUtils.java         |  6 ++--
 .../gadgetbridge/util/AndroidUtils.java       |  7 ++--
 .../gadgetbridge/util/ArrayUtils.java         |  5 +--
 .../gadgetbridge/util/BcdUtil.java            |  4 +--
 .../gadgetbridge/util/BitmapUtil.java         |  5 +--
 .../gadgetbridge/util/BondingInterface.java   | 18 +---------
 .../gadgetbridge/util/BondingUtil.java        |  5 +--
 .../gadgetbridge/util/CRC32C.java             | 16 ---------
 .../gadgetbridge/util/CheckSums.java          |  5 +--
 .../gadgetbridge/util/CryptoUtils.java        | 16 +++++++++
 .../gadgetbridge/util/DateTimeUtils.java      |  6 ++--
 .../gadgetbridge/util/DeviceHelper.java       | 20 ++++++-----
 .../gadgetbridge/util/ECDH_B163.java          |  4 +--
 .../gadgetbridge/util/EmojiConverter.java     |  5 ++-
 .../gadgetbridge/util/FileUtils.java          |  7 ++--
 .../gadgetbridge/util/FormatUtils.java        |  4 +--
 .../freeyourgadget/gadgetbridge/util/GB.java  |  9 ++---
 .../gadgetbridge/util/GBChangeLog.java        |  4 +--
 .../gadgetbridge/util/GBPrefs.java            |  7 ++--
 .../util/ImportExportSharedPreferences.java   |  6 ++--
 .../gadgetbridge/util/JavaExtensions.java     |  4 +--
 .../gadgetbridge/util/LimitedQueue.java       |  4 +--
 .../gadgetbridge/util/MapUtils.java           |  4 +--
 .../gadgetbridge/util/MediaManager.java       |  4 +--
 .../gadgetbridge/util/NotificationUtils.java  |  6 ++--
 .../gadgetbridge/util/Optional.java           |  4 +--
 .../gadgetbridge/util/PebbleUtils.java        |  4 +--
 .../gadgetbridge/util/PendingIntentUtils.java | 16 +++++++++
 .../gadgetbridge/util/Prefs.java              |  4 +--
 .../gadgetbridge/util/RangeMap.java           |  4 +--
 .../gadgetbridge/util/RtlUtils.java           |  4 +--
 .../gadgetbridge/util/SilentMode.java         |  4 +--
 .../gadgetbridge/util/StringUtils.java        |  8 ++---
 .../gadgetbridge/util/SwipeEvents.java        |  4 +--
 .../gadgetbridge/util/TimePreference.java     |  4 +--
 .../gadgetbridge/util/UriHelper.java          |  4 +--
 .../gadgetbridge/util/Version.java            |  5 +--
 .../gadgetbridge/util/WebViewSingleton.java   |  6 ++--
 .../util/WidgetPreferenceStorage.java         |  4 +--
 .../gadgetbridge/util/XTimePreference.java    |  4 +--
 .../util/XTimePreferenceFragment.java         |  4 +--
 .../gadgetbridge/util/ZipFile.java            | 16 +++++++++
 .../gadgetbridge/util/ZipFileException.java   | 16 +++++++++
 .../util/calendar/CalendarEvent.java          |  5 ++-
 .../util/calendar/CalendarManager.java        |  5 ++-
 .../util/dialogs/MaterialDialogFragment.java  |  4 +--
 .../util/gpx/GpxParseException.java           |  4 +--
 .../gadgetbridge/util/gpx/GpxParser.java      |  4 +--
 .../gadgetbridge/util/gpx/model/GpxFile.java  |  4 +--
 .../gadgetbridge/util/gpx/model/GpxTrack.java |  4 +--
 .../util/gpx/model/GpxTrackPoint.java         |  4 +--
 .../util/gpx/model/GpxTrackSegment.java       |  4 +--
 .../util/gpx/model/GpxWaypoint.java           |  4 +--
 .../util/language/LanguageUtils.java          |  7 ++--
 .../util/language/MultiTransliterator.java    |  4 +--
 .../util/language/SimpleTransliterator.java   |  4 +--
 .../util/language/Transliterator.java         |  4 +--
 .../language/impl/ArabicTransliterator.java   |  6 ++--
 .../language/impl/BengaliTransliterator.java  |  5 ++-
 .../impl/CommonSymbolsTransliterator.java     |  7 ++--
 .../language/impl/CroatianTransliterator.java |  6 ++--
 .../language/impl/CzechTransliterator.java    |  6 ++--
 .../language/impl/EstonianTransliterator.java |  6 ++--
 .../impl/ExtendedAsciiTransliterator.java     |  6 ++--
 .../impl/FlattenToAsciiTransliterator.java    |  6 ++--
 .../language/impl/FrenchTransliterator.java   |  4 +--
 .../language/impl/GeorgianTransliterator.java |  6 ++--
 .../language/impl/GermanTransliterator.java   |  6 ++--
 .../language/impl/GreekTransliterator.java    |  6 ++--
 .../language/impl/HebrewTransliterator.java   |  6 ++--
 .../impl/HungarianTransliterator.java         |  6 ++--
 .../impl/IcelandicTransliterator.java         |  6 ++--
 .../language/impl/KoreanTransliterator.java   |  4 +--
 .../language/impl/LatvianTransliterator.java  |  7 ++--
 .../impl/LithuanianTransliterator.java        |  6 ++--
 .../language/impl/PersianTransliterator.java  |  6 ++--
 .../language/impl/PolishTransliterator.java   |  6 ++--
 .../language/impl/RussianTransliterator.java  |  6 ++--
 .../impl/ScandinavianTransliterator.java      |  6 ++--
 .../language/impl/TurkishTransliterator.java  |  6 ++--
 .../language/impl/UkranianTransliterator.java |  6 ++--
 .../util/protobuf/ProtobufUtils.java          | 16 +++++++++
 .../messagefields/BytesMessageField.java      | 16 +++++++++
 .../messagefields/Int32MessageField.java      | 16 +++++++++
 .../messagefields/Int64MessageField.java      | 16 +++++++++
 .../protobuf/messagefields/MessageField.java  | 16 +++++++++
 .../messagefields/NestedMessageField.java     | 16 +++++++++
 .../messagefields/RootMessageField.java       | 16 +++++++++
 .../messagefields/StringMessageField.java     | 16 +++++++++
 .../messagefields/VarintMessageField.java     | 16 +++++++++
 .../notification/ParcelableWeather2.java      |  6 ++--
 1908 files changed, 6086 insertions(+), 4712 deletions(-)
 mode change 100755 => 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/femometer/FemometerVinca2DeviceCoordinator.java

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index c5e6d3ecb..62a05ff0a 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -30,15 +30,14 @@
 * Yaron Shahrabani <sh.yaron@gmail.com>
 * Daniel Dakhno <dakhnod@gmail.com>
 * 陈少举 <oshirisu.red@gmail.com>
+* Arjan Schrijver <arjan5@noreply.codeberg.org>
 * Vincèn PUJOL <vincen@vincen.org>
 * Oğuz Ersen <oguzersen@protonmail.com>
 * Allan Nordhøy <epost@anotheragency.no>
 * Ihor Hordiichuk <igor_ck@outlook.com>
-* Arjan Schrijver <arjan.schrijver@foxcrypto.com>
 * nautilusx <mail.ka@mailbox.org>
 * Taavi Eomäe <taavi.eomae+github@gmail.com>
 * Gordon Williams <gw@pur3.co.uk>
-* arjan-s <a_gitlab@anymore.nl>
 * Rafael Fontenelle <rafaelff@gnome.org>
 * Michal L <michalrmsmi@wp.pl>
 * Sebastian Kranz <lightwars@web.de>
@@ -62,6 +61,7 @@
 * Vadim Kaushan <admin@disasm.info>
 * protomors <protomors@gmail.com>
 * Cre3per <lukas96s@web.de>
+* Davis Mosenkovs <davikovs@gmail.com>
 * ssantos <ssantos@web.de>
 * Michael <quelbs@gmail.com>
 * glemco <glemco@codeberg>
@@ -70,14 +70,13 @@
 * Саша Петровић <salepetronije@gmail.com>
 * naofum <naofum@gmail.com>
 * My Random Thoughts <weblate@myrandomthoughts.co.uk>
-* Davis Mosenkovs <davikovs@gmail.com>
+* Damien 'Psolyca' Gaignon <damien.gaignon@gmail.com>
 * 0eoc <0eoc@users.noreply.hosted.weblate.org>
 * mesnevi <shams@airpost.net>
 * Kintu <kintukp@gmail.com>
 * youzhiran <2668760098@qq.com>
 * mueller-ma <mueller-ma@users.noreply.github.com>
 * ivanovlev <ivanovlev@mail.ru>
-* Damien 'Psolyca' Gaignon <damien.gaignon@gmail.com>
 * Tijl Schepens <tijl.schepens@hotmail.com>
 * Sophanimus <sennamails@googlemail.com>
 * Pavel Elagin <elagin.pasha@gmail.com>
@@ -120,6 +119,7 @@
 * Lukas <lukas.edi@gmx.net>
 * Ganblejs <ganblejs@noreply.codeberg.org>
 * Deixondit <jperals@protonmail.com>
+* akasaka / Genjitsu Labs <vladkorotnev@gmail.com>
 * Szylu <chipolade@gmail.com>
 * Robert Barat <rbarat07@gmail.com>
 * Reza Almanda <rezaalmanda27@gmail.com>
@@ -168,7 +168,6 @@
 * ce4 <ce4@posteo.de>
 * Baka Gaijin <lewdwarrior@waifu.club>
 * AndrewBedscastle <1462953+AndrewBedscastle@users.noreply.github.com>
-* akasaka <akasaka@nezumi.local>
 * abettenburg <a.bettenburg@gmail.com>
 * 0nse <0nse@users.noreply.github.com>
 * Максим Якимчук <xpinovo@gmail.com>
@@ -204,6 +203,7 @@
 * ITCactus <itcactus@noreply.codeberg.org>
 * illis <illis@beyond8labs.com>
 * Francesco Marinucci <francesco.marinucci@posteo.net>
+* FintasticMan <finlay.neon.kid@gmail.com>
 * Doma Gergő <domag02@gmail.com>
 * Dikay900 <dark900@xyz.de>
 * Denis <korden@sky-play.ru>
@@ -289,7 +289,6 @@
 * Andreas Kromke <Andreas.Kromke@web.de>
 * Alex <leha-bot@yandex.ru>
 * Albert <albert@avdm043>
-* Akasaka Ryuunosuke <vladkorotnev@gmail.com>
 * Ainārs <ainars71@inbox.lv>
 * عبدالرئوف عابدی <abdolraoofabedi@gmail.com>
 * Егор Ермаков <eg.ermakov2016@yandex.ru>
@@ -304,7 +303,6 @@
 * Xavier RENE-CORAIL <xavier.renecorail@gmail.com>
 * x29a <x29a@noreply.codeberg.org>
 * w2q <w2q@noreply.codeberg.org>
-* vladkorotnev <vladkorotnev@noreply.codeberg.org>
 * Vitaliy Shuruta <vshuruta@gmail.com>
 * veecue <veecue@ventos.tk>
 * Unixware <csynt@hotmail.com>
@@ -316,6 +314,7 @@
 * t-m-w <t-m-w-codeberg@galac.tk>
 * tiparega <11555126+tiparega@users.noreply.github.com>
 * TinfoilSubmarine <tinfoilsubmarine@noreply.codeberg.org>
+* Tim <tim.w1995@gmail.com>
 * thirschbuechler <thirschbuechler@github.com>
 * Thiago Rodrigues <thiaguinho.the@gmail.com>
 * thermatk <thermatk@noreply.codeberg.org>
@@ -368,6 +367,7 @@
 * pangwalla <pangwalla@noreply.codeberg.org>
 * Pander <pander@users.sourceforge.net>
 * ozkanpakdil <ozkan.pakdil@gmail.com>
+* opcode <luigi@sciolla.net>
 * Ondřej Sedláček <ond.sedlacek@gmail.com>
 * Olivier Bloch <blochjunior@gmail.com>
 * Oleg Vasilev <oleg.vasilev@virtuozzo.com>
@@ -379,6 +379,7 @@
 * Nathan Philipp Bo Seddig <natpbs@gmail.com>
 * Natanael Arndt <arndtn@gmail.com>
 * Nabil BENDAFI <nabil@bendafi.fr>
+* myxor <myxor@noreply.codeberg.org>
 * Morten Rieger Hannemose <mohan@dtu.dk>
 * Mirko Covizzi <mrkcvzz@gmail.com>
 * Milan Šalka <salka.milan@googlemail.com>
@@ -461,7 +462,6 @@
 * Hüseyin Aslan <ha098784@gmail.com>
 * Hugel <qihu@nfschina.com>
 * hr-sales <hericsonregis@hotmail.com>
-* hrglpfrmpf <hrglpfrmpf@noreply.codeberg.org>
 * Hirnchirurg <anonymous11@posteo.net>
 * Hen Ry <nobo@go4more.de>
 * HelloCodeberg <hellocodeberg@noreply.codeberg.org>
@@ -483,6 +483,7 @@
 * Gabe Schrecker <gabe@pbrb.co.uk>
 * freezed-or-frozen <freezed.or.frozen@gmail.com>
 * Frank Slezak <KazWolfe@users.noreply.github.com>
+* Frank Ertl <hrglpfrmpf@noreply.codeberg.org>
 * Florian Beuscher <florianbeuscher@gmail.com>
 * Fabian Hof <weblate@fabian-hof.de>
 * Étienne Deparis <etienne@depar.is>
@@ -494,7 +495,6 @@
 * Donato <pread.xa4mx@simplelogin.com>
 * Dmytro Bielik <mitrandir.hex@gmail.com>
 * djurik <dirceu.semighini@protonmail.com>
-* DESKTOP-IF738U6\Tim <tim.w1995@gmail.com>
 * DerFetzer <kontakt@der-fetzer.de>
 * Dean <3114661520@qq.com>
 * Deactivated Account <diastasis@gmail.com>
@@ -539,11 +539,11 @@
 * andre <andre.buesgen@yahoo.de>
 * Andrea Lepori <mafaldo@hotmail.it>
 * Allen B <28495335+Allen-B1@users.noreply.github.com>
+* Alicia Hormann <ahormann@gmx.net>
 * Alfeu Lucas Guedes dos Santos <alfeugds@gmail.com>
 * Alexey Afanasev <avafanasiev@gmail.com>
 * Alexandra Sevostyanova <asevostyanova@gmail.com>
 * Aidan Crane <aidancrane78@gmail.com>
-* ahormann <ahormann@gmx.net>
 * aerowolf <aerowolf@tom.com>
 * Adam Büchner <buechner.adam@gmx.de>
 * a b <65567823+abb128@users.noreply.github.com>
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
index 46d7a4428..6d8772419 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
@@ -1,6 +1,8 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Martin, Matthieu Baerts, Normano64, odavo32nof, Pauli Salmenrinne,
-    Pavel Elagin, Petr Vaněk, Saul Nunez, Taavi Eomäe
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Arjan Schrijver, Carsten
+    Pfeiffer, Damien Gaignon, Daniel Dakhno, Daniele Gobbetti, Davis Mosenkovs,
+    Dmitriy Bogdanov, Joel Beckmeyer, José Rebelo, Kornél Schmidt, Ludovic
+    Jozeau, Martin, Martin.JM, mvn23, Normano64, odavo32nof, Pauli Salmenrinne,
+    Pavel Elagin, Petr Vaněk, Saul Nunez, Taavi Eomäe, x29a
 
     This file is part of Gadgetbridge.
 
@@ -15,7 +17,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge;
 
 import android.annotation.TargetApi;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBEnvironment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBEnvironment.java
index ee16aa828..721d3c6ae 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBEnvironment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBEnvironment.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge;
 
 /**
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBException.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBException.java
index 82e20f222..f7b14ce9e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBException.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBException.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge;
 
 public class GBException extends Exception {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/LockHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/LockHandler.java
index 909dddbd5..cd13e53f7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/LockHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/LockHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2020 Andreas Shimokawa, Carsten Pfeiffer, Taavi Eomäe
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Carsten Pfeiffer, Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge;
 
 import android.database.sqlite.SQLiteDatabase;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/Logging.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/Logging.java
index 987f71bfd..d64465f8b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/Logging.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/Logging.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2016-2021 Carsten Pfeiffer, Daniele Gobbetti, Pavel Elagin
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+    Gobbetti, José Rebelo, Pavel Elagin, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge;
 
 import android.util.Log;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/LoggingExceptionHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/LoggingExceptionHandler.java
index 41b5fa3a2..80ee5e743 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/LoggingExceptionHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/LoggingExceptionHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Carsten Pfeiffer
+/*  Copyright (C) 2015-2024 Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge;
 
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/SleepAlarmWidget.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/SleepAlarmWidget.java
index 33c817012..b74639488 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/SleepAlarmWidget.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/SleepAlarmWidget.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2016-2020 0nse, Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2016-2024 0nse, Andreas Shimokawa, Carsten Pfeiffer,
+    Dmitry Markin, Ganblejs, José Rebelo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge;
 
 import android.annotation.TargetApi;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/Widget.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/Widget.java
index 4083d1e8b..42e64b636 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/Widget.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/Widget.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2019-2020 Andreas Shimokawa, vanous
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Carsten Pfeiffer, Ganblejs,
+    José Rebelo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -11,27 +12,9 @@
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU Affero General Public License for more details.
-    GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-/*  Copyright (C) 2019-2020 Andreas Shimokawa, vanous
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge;
 
 import android.app.PendingIntent;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AboutActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AboutActivity.java
index 56a7ae3b9..99c9d3799 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AboutActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AboutActivity.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2015-2020 abettenburg, Andreas Shimokawa, Carsten Pfeiffer,
-    Daniele Gobbetti, Lem Dulfo
+/*  Copyright (C) 2020-2024 Petr Vaněk, Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import android.os.Bundle;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AboutUserPreferencesActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AboutUserPreferencesActivity.java
index 1e405bfef..914a76763 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AboutUserPreferencesActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AboutUserPreferencesActivity.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2015-2023 Andreas Shimokawa, Carsten Pfeiffer, Lem Dulfo,
-    vanous, José Rebelo
+/*  Copyright (C) 2020-2024 Andreas Shimokawa, José Rebelo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import static nodomain.freeyourgadget.gadgetbridge.model.ActivityUser.PREF_USER_ACTIVETIME_MINUTES;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractFragmentPagerAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractFragmentPagerAdapter.java
index 417c9a1a0..227b067f9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractFragmentPagerAdapter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractFragmentPagerAdapter.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2020 Carsten Pfeiffer, Daniele Gobbetti
+/*  Copyright (C) 2015-2024 Carsten Pfeiffer, Daniele Gobbetti
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import android.view.ViewGroup;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractGBActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractGBActivity.java
index 08d626481..670bfd970 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractGBActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractGBActivity.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Lem Dulfo
+/*  Copyright (C) 2017-2024 Andreas Shimokawa, Arjan Schrijver, Carsten
+    Pfeiffer, Daniele Gobbetti, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractGBFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractGBFragment.java
index 83420b28f..94d6dc656 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractGBFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractGBFragment.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
     Gobbetti, walkjivefly
 
     This file is part of Gadgetbridge.
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import androidx.annotation.Nullable;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractGBFragmentActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractGBFragmentActivity.java
index 1e86d0e92..2da4bf9c3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractGBFragmentActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractGBFragmentActivity.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
     Gobbetti
 
     This file is part of Gadgetbridge.
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import android.os.Bundle;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractListActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractListActivity.java
index 9196c16a6..8a0470f27 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractListActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractListActivity.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2020 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2017-2024 Andreas Shimokawa, Carsten Pfeiffer, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import android.os.Bundle;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractPreferenceFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractPreferenceFragment.java
index 01e34b6b5..49c81cd72 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractPreferenceFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractPreferenceFragment.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2023 Andreas Shimokawa, Cre3per, José Rebelo
+/*  Copyright (C) 2023-2024 Andreas Shimokawa, Arjan Schrijver, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import android.content.SharedPreferences;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractSettingsActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractSettingsActivity.java
index d346e2c74..827d9377a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractSettingsActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractSettingsActivity.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer, Christian
-    Fischer, Daniele Gobbetti, Lem Dulfo
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Christian
+    Fischer, Daniele Gobbetti, José Rebelo, Lem Dulfo, Petr Vaněk, Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import android.content.BroadcastReceiver;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractSettingsActivityV2.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractSettingsActivityV2.java
index 3fb6976e5..a33e7c608 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractSettingsActivityV2.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractSettingsActivityV2.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2023 Andreas Shimokawa, José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import android.os.Bundle;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummariesActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummariesActivity.java
index 416bc1868..c683505bb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummariesActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummariesActivity.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2017-2020 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti
+/*  Copyright (C) 2017-2024 Andreas Shimokawa, Arjan Schrijver, Carsten
+    Pfeiffer, Daniele Gobbetti, José Rebelo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import android.app.DatePickerDialog;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummariesChartFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummariesChartFragment.java
index e5510f693..fc038a73e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummariesChartFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummariesChartFragment.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Dikay900, Pavel Elagin
+/*  Copyright (C) 2020-2024 José Rebelo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummariesFilter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummariesFilter.java
index c0a0466a2..2906aecbe 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummariesFilter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummariesFilter.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2020 vanous
+/*  Copyright (C) 2020-2024 Daniel Dakhno, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import android.app.DatePickerDialog;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummariesGpsFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummariesGpsFragment.java
index d387b21a0..10a1861fe 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummariesGpsFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummariesGpsFragment.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Dikay900, Pavel Elagin
+/*  Copyright (C) 2020-2024 José Rebelo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import android.graphics.Bitmap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummaryDetail.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummaryDetail.java
index eb3e2c95d..1eaa56c78 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummaryDetail.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummaryDetail.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2015-2020 abettenburg, Andreas Shimokawa, Carsten Pfeiffer,
-    Daniele Gobbetti, Lem Dulfo
+/*  Copyright (C) 2020-2024 Andreas Shimokawa, Arjan Schrijver, Daniel Dakhno,
+    José Rebelo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import static nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries.*;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AlarmDetails.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AlarmDetails.java
index 71aeed27f..2308662c3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AlarmDetails.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AlarmDetails.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Lem Dulfo
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniel
+    Dakhno, Daniele Gobbetti, Dmitry Markin, Lem Dulfo, Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import android.os.Bundle;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AndroidPairingActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AndroidPairingActivity.java
index d51c26aa7..92452caba 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AndroidPairingActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AndroidPairingActivity.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer, Lem Dulfo
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Lem Dulfo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import android.os.Bundle;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AppBlacklistActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AppBlacklistActivity.java
index 4a0cd1c5b..d4e4b6af3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AppBlacklistActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AppBlacklistActivity.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2015-2020 abettenburg, Andreas Shimokawa, Carsten Pfeiffer,
-    Daniele Gobbetti, Lem Dulfo
+/*  Copyright (C) 2015-2024 abettenburg, Andreas Shimokawa, Carsten Pfeiffer,
+    Daniele Gobbetti, Lem Dulfo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import android.os.Bundle;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/BatteryInfoActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/BatteryInfoActivity.java
index c64b7660a..5fee6f77d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/BatteryInfoActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/BatteryInfoActivity.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2021-2024 Daniel Dakhno, José Rebelo, Petr Vaněk
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import android.app.DatePickerDialog;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/BatteryInfoChartFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/BatteryInfoChartFragment.java
index afcc86a01..b9ea582c5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/BatteryInfoChartFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/BatteryInfoChartFragment.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Dikay900, Pavel Elagin
+/*  Copyright (C) 2021-2024 José Rebelo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/CalBlacklistActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/CalBlacklistActivity.java
index 792e868ce..6684e5a99 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/CalBlacklistActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/CalBlacklistActivity.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2017-2020 Carsten Pfeiffer, Daniele Gobbetti
+/*  Copyright (C) 2017-2024 Carsten Pfeiffer, Daniele Gobbetti, José Rebelo,
+    Ludovic Jozeau
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import android.Manifest;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ConfigureAlarms.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ConfigureAlarms.java
index cce2f3364..68e0042df 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ConfigureAlarms.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ConfigureAlarms.java
@@ -1,5 +1,6 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Lem Dulfo, vanous
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Damien
+    Gaignon, Daniel Dakhno, Daniele Gobbetti, Dmitry Markin, José Rebelo,
+    Lem Dulfo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +15,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import android.content.BroadcastReceiver;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ConfigureContacts.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ConfigureContacts.java
index f3f6c81a2..cd287a748 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ConfigureContacts.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ConfigureContacts.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 Arjan Schrijver, Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ConfigureReminders.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ConfigureReminders.java
index 3630aeed6..55b8dbc41 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ConfigureReminders.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ConfigureReminders.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019 José Rebelo
+/*  Copyright (C) 2021-2024 Arjan Schrijver, Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import android.content.BroadcastReceiver;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ConfigureWorldClocks.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ConfigureWorldClocks.java
index 166a0e682..04a646c64 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ConfigureWorldClocks.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ConfigureWorldClocks.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 Arjan Schrijver, Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import android.content.BroadcastReceiver;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ContactDetails.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ContactDetails.java
index 57fe5bb87..be8a75379 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ContactDetails.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ContactDetails.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenterv2.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenterv2.java
index 645f1d2a5..ebd57ab3b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenterv2.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenterv2.java
@@ -1,5 +1,7 @@
-/*  Copyright (C) 2016-2020 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Johannes Tysiak, Taavi Eomäe, vanous
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Andrzej Surowiec, Arjan
+    Schrijver, Carsten Pfeiffer, Daniel Dakhno, Daniele Gobbetti, Ganblejs,
+    gfwilliams, Gordon Williams, Johannes Tysiak, José Rebelo, marco.altomonte,
+    Petr Vaněk, Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +16,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_CONNECT;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DataManagementActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DataManagementActivity.java
index f7d73600f..821836967 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DataManagementActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DataManagementActivity.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2016-2020 Alberto, Andreas Shimokawa, Carsten Pfeiffer,
-    Daniele Gobbetti, vanous
+/*  Copyright (C) 2021-2024 Arjan Schrijver, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DebugActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DebugActivity.java
index 2be4d031d..fa1cc7db5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DebugActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DebugActivity.java
@@ -1,6 +1,7 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Frank Slezak, ivanovlev, Kasha, Lem Dulfo, Pavel Elagin, Steffen
-    Liebergeld, vanous
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Arjan Schrijver, Carsten
+    Pfeiffer, Daniel Dakhno, Daniele Gobbetti, Dmitriy Bogdanov, Frank Slezak,
+    Ganblejs, ivanovlev, José Rebelo, Kamalei Zestri, Kasha, Lem Dulfo, Pavel
+    Elagin, Petr Vaněk, Steffen Liebergeld, Tim
 
     This file is part of Gadgetbridge.
 
@@ -15,7 +16,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import static android.content.Intent.EXTRA_SUBJECT;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ExternalPebbleJSActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ExternalPebbleJSActivity.java
index 83bf63fee..82060a52e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ExternalPebbleJSActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ExternalPebbleJSActivity.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2016-2020 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Lem Dulfo, Uwe Hermann
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+    Gobbetti, Davis Mosenkovs, Lem Dulfo, Taavi Eomäe, Uwe Hermann
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import android.content.Intent;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/FindPhoneActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/FindPhoneActivity.java
index 6d469dede..f84136b19 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/FindPhoneActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/FindPhoneActivity.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2018-2020 Andreas Shimokawa, Carsten Pfeiffer, Cre3per,
-    Daniele Gobbetti
+/*  Copyright (C) 2018-2024 Andreas Shimokawa, Anemograph, Carsten Pfeiffer,
+    Cre3per, Daniele Gobbetti, Dmitriy Bogdanov, José Rebelo, Pauli Salmenrinne
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import android.content.BroadcastReceiver;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/FwAppInstallerActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/FwAppInstallerActivity.java
index 7b9cb094a..78e57958b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/FwAppInstallerActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/FwAppInstallerActivity.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Lem Dulfo, Taavi Eomäe
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniel
+    Dakhno, Daniele Gobbetti, José Rebelo, Lem Dulfo, Petr Vaněk, Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import android.content.BroadcastReceiver;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/GBActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/GBActivity.java
index cec1f3b4e..94b9b0230 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/GBActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/GBActivity.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer, Lem Dulfo
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import java.util.Locale;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/GpxReceiverActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/GpxReceiverActivity.java
index 375d65fda..3a6bc03a4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/GpxReceiverActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/GpxReceiverActivity.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2015-2020 abettenburg, Andreas Shimokawa, Carsten Pfeiffer,
-    Daniele Gobbetti, Lem Dulfo
+/*  Copyright (C) 2021-2024 Gordon Williams, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import android.content.ClipData;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/HeartRateDialog.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/HeartRateDialog.java
index dbd2cd383..f396b0344 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/HeartRateDialog.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/HeartRateDialog.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2021-2024 Petr Vaněk
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import android.app.Dialog;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/HeartRateUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/HeartRateUtils.java
index 16f9fa1bb..caf8b704a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/HeartRateUtils.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/HeartRateUtils.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2020 Carsten Pfeiffer, Dikay900
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Carsten Pfeiffer, Dikay900
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/InstallActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/InstallActivity.java
index c3699cce6..162b064a2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/InstallActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/InstallActivity.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import android.graphics.Bitmap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/NotificationFilterActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/NotificationFilterActivity.java
index 905d1e762..ab6e3ff3c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/NotificationFilterActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/NotificationFilterActivity.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2018-2020 abettenburg, AndrewBedscastle, Carsten Pfeiffer,
+/*  Copyright (C) 2018-2024 abettenburg, AndrewBedscastle, Carsten Pfeiffer,
     Daniele Gobbetti
 
     This file is part of Gadgetbridge.
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import android.os.Bundle;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/NotificationManagementActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/NotificationManagementActivity.java
index ed50198f6..a03752769 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/NotificationManagementActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/NotificationManagementActivity.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2015-2023 Andreas Shimokawa, Carsten Pfeiffer, Lem Dulfo,
-    vanous, José Rebelo
+/*  Copyright (C) 2021-2024 José Rebelo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import android.content.Intent;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/OpenFwAppInstallerActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/OpenFwAppInstallerActivity.java
index 4f732405d..6dda0ca09 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/OpenFwAppInstallerActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/OpenFwAppInstallerActivity.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2020 vanous,
+/*  Copyright (C) 2022-2024 Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ReminderDetails.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ReminderDetails.java
index 6c0d0b981..e45448f73 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ReminderDetails.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ReminderDetails.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019 José Rebelo
+/*  Copyright (C) 2021-2024 Arjan Schrijver, Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import android.app.DatePickerDialog;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SettingsActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SettingsActivity.java
index 1325ae94d..bdd9cb090 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SettingsActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SettingsActivity.java
@@ -1,6 +1,7 @@
-/*  Copyright (C) 2015-2023 0nse, Andreas Shimokawa, Carsten Pfeiffer,
-    Daniel Dakhno, Daniele Gobbetti, Felix Konstantin Maurer, José Rebelo,
-    Martin, Normano64, Pavel Elagin, Sebastian Kranz, vanous
+/*  Copyright (C) 2015-2024 0nse, Andreas Shimokawa, Anemograph, Arjan
+    Schrijver, Carsten Pfeiffer, Daniel Dakhno, Daniele Gobbetti, Felix Konstantin
+    Maurer, José Rebelo, Martin, Normano64, Pavel Elagin, Petr Vaněk, Sebastian
+    Kranz, Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -15,7 +16,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import android.Manifest;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SleepAlarmWidgetConfigurationActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SleepAlarmWidgetConfigurationActivity.java
index 95af08a31..e7cc18e24 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SleepAlarmWidgetConfigurationActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SleepAlarmWidgetConfigurationActivity.java
@@ -1,3 +1,20 @@
+/*  Copyright (C) 2022-2024 Arjan Schrijver, Damien Gaignon, Daniel Dakhno,
+    Petr Vaněk
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/TextReceiverActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/TextReceiverActivity.java
index 58b10023a..5d3869480 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/TextReceiverActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/TextReceiverActivity.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import android.content.Intent;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/VibrationActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/VibrationActivity.java
index 2716d41b8..5805cdcda 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/VibrationActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/VibrationActivity.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2020 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import android.os.Bundle;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/WakeActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/WakeActivity.java
index 1495c9b8a..c26375f2b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/WakeActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/WakeActivity.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 Ganblejs
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/WidgetAlarmsActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/WidgetAlarmsActivity.java
index 72f74195b..ecc04aa32 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/WidgetAlarmsActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/WidgetAlarmsActivity.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2019-2020 vanous
+/*  Copyright (C) 2019-2024 Dmitry Markin, José Rebelo, Petr Vaněk,
+    Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/WidgetConfigurationActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/WidgetConfigurationActivity.java
index 9d4223079..056411c97 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/WidgetConfigurationActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/WidgetConfigurationActivity.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2020-2024 Arjan Schrijver, Daniel Dakhno, Petr Vaněk
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/WorldClockDetails.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/WorldClockDetails.java
index 67d9a5bf4..d04641911 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/WorldClockDetails.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/WorldClockDetails.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 Arjan Schrijver, Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import android.content.DialogInterface;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/app_specific_notifications/AppSpecificNotificationSettingsActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/app_specific_notifications/AppSpecificNotificationSettingsActivity.java
index 38921be05..5a172b7f3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/app_specific_notifications/AppSpecificNotificationSettingsActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/app_specific_notifications/AppSpecificNotificationSettingsActivity.java
@@ -1,22 +1,19 @@
-/*
- *   Copyright (C) 2023 akasaka / Genjitsu Labs
- *
- *     This file is part of Gadgetbridge.
- *
- *     Gadgetbridge is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU Affero General Public License as published
- *     by the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Gadgetbridge is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU Affero General Public License for more details.
- *
- *     You should have received a copy of the GNU Affero General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.app_specific_notifications;
 
 import android.os.Bundle;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/app_specific_notifications/AppSpecificNotificationSettingsDetailActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/app_specific_notifications/AppSpecificNotificationSettingsDetailActivity.java
index 842276430..27af77088 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/app_specific_notifications/AppSpecificNotificationSettingsDetailActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/app_specific_notifications/AppSpecificNotificationSettingsDetailActivity.java
@@ -1,22 +1,19 @@
-/*
- *   Copyright (C) 2023 akasaka / Genjitsu Labs
- *
- *     This file is part of Gadgetbridge.
- *
- *     Gadgetbridge is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU Affero General Public License as published
- *     by the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Gadgetbridge is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU Affero General Public License for more details.
- *
- *     You should have received a copy of the GNU Affero General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs, Daniel Dakhno
 
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.app_specific_notifications;
 
 import android.os.Bundle;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AbstractAppManagerFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AbstractAppManagerFragment.java
index 1a8063d73..5bc47aadb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AbstractAppManagerFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AbstractAppManagerFragment.java
@@ -1,5 +1,6 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Konrad Iturbe, Lem Dulfo
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Arjan Schrijver, Carsten
+    Pfeiffer, Daniel Dakhno, Daniele Gobbetti, José Rebelo, Konrad Iturbe,
+    TylerWilliamson
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +15,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.appmanager;
 
 import static nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.QHybridSupport.QHYBRID_ACTION_DOWNLOADED_FILE;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AppManagerActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AppManagerActivity.java
index 166155d99..9647d1aaa 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AppManagerActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AppManagerActivity.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2016-2020 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Arjan Schrijver, Carsten
+    Pfeiffer, Daniele Gobbetti, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.appmanager;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AppManagerFragmentCache.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AppManagerFragmentCache.java
index 3b67d11f9..c603dfbb2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AppManagerFragmentCache.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AppManagerFragmentCache.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2020 Andreas Shimokawa
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Arjan Schrijver, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.appmanager;
 
 import java.util.List;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AppManagerFragmentInstalledApps.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AppManagerFragmentInstalledApps.java
index 69eb1e65c..2f07bf953 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AppManagerFragmentInstalledApps.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AppManagerFragmentInstalledApps.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2016-2020 Andreas Shimokawa, Daniele Gobbetti
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Arjan Schrijver, Daniele
+    Gobbetti
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.appmanager;
 
 import java.nio.charset.StandardCharsets;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AppManagerFragmentInstalledWatchfaces.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AppManagerFragmentInstalledWatchfaces.java
index 411467140..20faeb8be 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AppManagerFragmentInstalledWatchfaces.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AppManagerFragmentInstalledWatchfaces.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2020 Andreas Shimokawa
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Arjan Schrijver
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.appmanager;
 
 import java.util.ArrayList;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractActivityChartFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractActivityChartFragment.java
index ad6090810..0dab39da6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractActivityChartFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractActivityChartFragment.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2015-2020 0nse, Andreas Shimokawa, Carsten Pfeiffer,
-    Daniele Gobbetti, Dikay900, Pavel Elagin, vanous, walkjivefly
+/*  Copyright (C) 2023-2024 Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.charts;
 
 import android.util.TypedValue;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractChartFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractChartFragment.java
index 3c24d1377..9c1aae219 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractChartFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractChartFragment.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2015-2020 0nse, Andreas Shimokawa, Carsten Pfeiffer,
-    Daniele Gobbetti, Dikay900, Pavel Elagin, vanous, walkjivefly
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+    Gobbetti, Dikay900, José Rebelo, Pavel Elagin, Petr Vaněk, walkjivefly
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.charts;
 
 import android.annotation.SuppressLint;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractChartsActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractChartsActivity.java
index a2314afc4..65e1c5674 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractChartsActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractChartsActivity.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, vanous, Vebryn
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.charts;
 
 import android.content.BroadcastReceiver;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractWeekChartFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractWeekChartFragment.java
index 48fcff7ea..edec1cd90 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractWeekChartFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractWeekChartFragment.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2015-2020 0nse, Alberto, Andreas Shimokawa, Carsten Pfeiffer,
-    Daniele Gobbetti, Pavel Elagin, vanous
+/*  Copyright (C) 2017-2024 Alberto, Andreas Shimokawa, Carsten Pfeiffer,
+    Daniele Gobbetti, José Rebelo, Pavel Elagin, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.charts;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityAnalysis.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityAnalysis.java
index 1a46ffca7..28b82b77b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityAnalysis.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityAnalysis.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Pavel Elagin, vanous, Vebryn
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+    Gobbetti, José Rebelo, Pavel Elagin, Petr Vaněk, Vebryn
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.charts;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityChartsActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityChartsActivity.java
index 3f82d9133..89ca38d5c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityChartsActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityChartsActivity.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, vanous, Vebryn
+/*  Copyright (C) 2023-2024 Daniel Dakhno, José Rebelo, Martin.JM
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.charts;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityListingAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityListingAdapter.java
index fd96c69a7..024539edc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityListingAdapter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityListingAdapter.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2020-2024 José Rebelo, Petr Vaněk
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.charts;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityListingChartFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityListingChartFragment.java
index 7fc773038..8e1845d98 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityListingChartFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityListingChartFragment.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Dikay900, Pavel Elagin
+/*  Copyright (C) 2020-2024 José Rebelo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.charts;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityListingDashboard.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityListingDashboard.java
index 66a5386b6..3c7d3573c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityListingDashboard.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityListingDashboard.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2021-2024 Arjan Schrijver, Daniel Dakhno, Petr Vaněk
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.charts;
 
 import android.app.DatePickerDialog;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityListingDetail.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityListingDetail.java
index 18104000f..99e0017bf 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityListingDetail.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityListingDetail.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2021-2024 Petr Vaněk
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.charts;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivitySleepChartFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivitySleepChartFragment.java
index 8b42186b9..672774d96 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivitySleepChartFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivitySleepChartFragment.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Dikay900, Pavel Elagin
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+    Gobbetti, Dikay900, José Rebelo, Pavel Elagin
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.charts;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AngledLabelsChartRenderer.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AngledLabelsChartRenderer.java
index 6f7d605d2..3a9694dee 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AngledLabelsChartRenderer.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AngledLabelsChartRenderer.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2020 Andreas Shimokawa, vanous
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.charts;
 
 import android.graphics.Canvas;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ChartsData.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ChartsData.java
index 958cb2eb5..f9bf5f60a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ChartsData.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ChartsData.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2020 Carsten Pfeiffer
+/*  Copyright (C) 2016-2024 Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.charts;
 
 public abstract class ChartsData {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ChartsHost.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ChartsHost.java
index f1f1d257f..790d38d92 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ChartsHost.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ChartsHost.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer, vanous
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, José Rebelo,
+    Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.charts;
 
 import android.view.ViewGroup;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ChartsPreferencesActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ChartsPreferencesActivity.java
index 0b3bb1a2c..2c8a8ec67 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ChartsPreferencesActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ChartsPreferencesActivity.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2015-2023 Andreas Shimokawa, Carsten Pfeiffer, Lem Dulfo,
-    vanous, José Rebelo
+/*  Copyright (C) 2019-2024 José Rebelo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.charts;
 
 import android.content.Intent;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/CustomBarChart.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/CustomBarChart.java
index b1169f636..1eb358095 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/CustomBarChart.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/CustomBarChart.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.charts;
 
 import android.animation.ValueAnimator;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/DefaultChartsData.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/DefaultChartsData.java
index e73c11466..e09601a53 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/DefaultChartsData.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/DefaultChartsData.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2015-2020 0nse, Andreas Shimokawa, Carsten Pfeiffer,
-    Daniele Gobbetti, Dikay900, Pavel Elagin, vanous, walkjivefly
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.charts;
 
 import com.github.mikephil.charting.data.ChartData;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/LiveActivityFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/LiveActivityFragment.java
index 8e3cec074..ef419f9b6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/LiveActivityFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/LiveActivityFragment.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer, Cre3per,
-    Daniele Gobbetti, Dikay900, Pavel, Pavel Elagin
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Cre3per,
+    Daniele Gobbetti, Dikay900, José Rebelo, Pavel Elagin
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.charts;
 
 import android.content.BroadcastReceiver;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/NonSwipeableViewPager.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/NonSwipeableViewPager.java
index 92d1c584a..a82b98303 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/NonSwipeableViewPager.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/NonSwipeableViewPager.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, vanous, Vebryn
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.charts;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/PaiChartFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/PaiChartFragment.java
index 71a58c2cd..b73bd5160 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/PaiChartFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/PaiChartFragment.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.charts;
 
 import android.graphics.Color;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/PreformattedXIndexLabelFormatter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/PreformattedXIndexLabelFormatter.java
index 2d013208a..2cde827c1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/PreformattedXIndexLabelFormatter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/PreformattedXIndexLabelFormatter.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2015-2020 0nse, Andreas Shimokawa, Carsten Pfeiffer,
-    Daniele Gobbetti, Dikay900, Pavel Elagin, vanous, walkjivefly
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.charts;
 
 import com.github.mikephil.charting.formatter.ValueFormatter;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SampleXLabelFormatter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SampleXLabelFormatter.java
index 801e6f9a5..9e4f40d97 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SampleXLabelFormatter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SampleXLabelFormatter.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2015-2020 0nse, Andreas Shimokawa, Carsten Pfeiffer,
-    Daniele Gobbetti, Dikay900, Pavel Elagin, vanous, walkjivefly
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.charts;
 
 import android.annotation.SuppressLint;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ShowDurationDialog.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ShowDurationDialog.java
index f11957a2d..46143883e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ShowDurationDialog.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ShowDurationDialog.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, vanous, Vebryn
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.charts;
 
 import android.app.Dialog;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SingleEntryValueAnimator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SingleEntryValueAnimator.java
index 93ed7699b..e099e2d54 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SingleEntryValueAnimator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SingleEntryValueAnimator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2020 Carsten Pfeiffer
+/*  Copyright (C) 2015-2024 Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.charts;
 
 import android.animation.ObjectAnimator;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SleepAnalysis.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SleepAnalysis.java
index c0f6d2d44..0efe066a8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SleepAnalysis.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SleepAnalysis.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2020 Q-er
+/*  Copyright (C) 2019-2024 José Rebelo, Petr Vaněk, Q-er
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.charts;
 
 import java.util.ArrayList;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SleepChartFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SleepChartFragment.java
index 345030990..6b6cee71c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SleepChartFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SleepChartFragment.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2015-2020 0nse, Andreas Shimokawa, Carsten Pfeiffer,
-    Daniele Gobbetti, Dikay900, Pavel Elagin, Q-er, vanous
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+    Gobbetti, Dikay900, José Rebelo, ozkanpakdil, Pavel Elagin, Petr Vaněk, Q-er
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.charts;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SleepUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SleepUtils.java
index c34446ba8..1b4fcbbce 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SleepUtils.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SleepUtils.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2015-2024 Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.charts;
 
 import nodomain.freeyourgadget.gadgetbridge.model.ActivityKind;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SpeedZonesFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SpeedZonesFragment.java
index eaea07b73..74fd2ae64 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SpeedZonesFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SpeedZonesFragment.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2015-2020 0nse, Andreas Shimokawa, Carsten Pfeiffer,
-    Daniele Gobbetti, Vebryn
+/*  Copyright (C) 2017-2024 Andreas Shimokawa, Daniele Gobbetti, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.charts;
 
 import android.os.Bundle;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/Spo2ChartFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/Spo2ChartFragment.java
index f8e8be12b..0d46ea268 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/Spo2ChartFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/Spo2ChartFragment.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo, MartinJM
+/*  Copyright (C) 2023-2024 Martin.JM
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.charts;
 
 import android.graphics.Color;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/StepAnalysis.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/StepAnalysis.java
index 1355d3a49..75017ce6a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/StepAnalysis.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/StepAnalysis.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2020 Q-er
+/*  Copyright (C) 2020-2024 Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.charts;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/StepStreaksDashboard.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/StepStreaksDashboard.java
index e8396367e..28be1ea2e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/StepStreaksDashboard.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/StepStreaksDashboard.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 Arjan Schrijver, Petr Vaněk
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.charts;
 
 import android.content.ActivityNotFoundException;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/StressChartFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/StressChartFragment.java
index 2e42cf9e1..20586bd33 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/StressChartFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/StressChartFragment.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.charts;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/TimestampTranslation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/TimestampTranslation.java
index 4b3aa99f9..8cc36aa23 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/TimestampTranslation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/TimestampTranslation.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2015-2020 0nse, Andreas Shimokawa, Carsten Pfeiffer,
-    Daniele Gobbetti, Dikay900, Pavel Elagin, vanous, walkjivefly
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.charts;
 
 /**
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/TimestampValueFormatter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/TimestampValueFormatter.java
index e4603cfaa..6d82079e5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/TimestampValueFormatter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/TimestampValueFormatter.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2020 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.charts;
 
 import com.github.mikephil.charting.formatter.ValueFormatter;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/TrailingActivitySample.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/TrailingActivitySample.java
index 35a69b5ad..8bec737c9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/TrailingActivitySample.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/TrailingActivitySample.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2020 Carsten Pfeiffer
+/*  Copyright (C) 2016-2024 Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.charts;
 
 import nodomain.freeyourgadget.gadgetbridge.entities.AbstractActivitySample;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/WeekSleepChartFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/WeekSleepChartFragment.java
index 3c79cf0a6..a3f0368a2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/WeekSleepChartFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/WeekSleepChartFragment.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2017-2020 Andreas Shimokawa, Carsten Pfeiffer, Pavel
-    Elagin, vanous
+/*  Copyright (C) 2017-2024 Andreas Shimokawa, Carsten Pfeiffer, José Rebelo,
+    Pavel Elagin, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.charts;
 
 import com.github.mikephil.charting.charts.Chart;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/WeekStepsChartFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/WeekStepsChartFragment.java
index 35547b401..fdc31a096 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/WeekStepsChartFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/WeekStepsChartFragment.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2015-2020 0nse, Andreas Shimokawa, Carsten Pfeiffer,
-    Daniele Gobbetti, Pavel Elagin, vanous
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+    Gobbetti, José Rebelo, Pavel Elagin, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.charts;
 
 import com.github.mikephil.charting.charts.Chart;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsActivity.java
index 78977f98f..49fe217da 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsActivity.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2020 Andreas Shimokawa
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, José Rebelo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.devicesettings;
 
 import androidx.preference.PreferenceFragmentCompat;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
index 58951d2c4..d4d28ff59 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
@@ -1,4 +1,8 @@
-/*  Copyright (C) 2019-2020 Andreas Shimokawa
+/*  Copyright (C) 2019-2024 115ek, akasaka / Genjitsu Labs, Alicia Hormann,
+    Andreas Böhler, Andreas Shimokawa, Arjan Schrijver, Damien Gaignon, Daniel
+    Dakhno, Daniele Gobbetti, Davis Mosenkovs, foxstidious, Gordon Williams,
+    José Rebelo, Lukas, LukasEdl, mamucho, narektor, NekoBox, opavlov, Petr
+    Vaněk, Yoran Vulker, Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +17,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.devicesettings;
 
 public class DeviceSettingsPreferenceConst {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsUtils.java
index effdd5788..88dc40e87 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsUtils.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsUtils.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.devicesettings;
 
 import android.text.InputFilter;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsCustomizer.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsCustomizer.java
index 40516ec96..20610ffbc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsCustomizer.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsCustomizer.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 José Rebelo
+/*  Copyright (C) 2021-2024 José Rebelo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.devicesettings;
 
 import android.os.Parcelable;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
index 1ac588f72..0ea61bccb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
@@ -1,4 +1,7 @@
-/*  Copyright (C) 2019-2020 Andreas Shimokawa, Cre3per
+/*  Copyright (C) 2019-2024 akasaka / Genjitsu Labs, Alicia Hormann, Andreas
+    Böhler, Andreas Shimokawa, Arjan Schrijver, Cre3per, Damien Gaignon, Daniel
+    Dakhno, Daniele Gobbetti, Davis Mosenkovs, foxstidious, José Rebelo, mamucho,
+    NekoBox, opavlov, Petr Vaněk, Yoran Vulker, Yukai Li, Zhong Jianxin
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +16,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.devicesettings;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsHandler.java
index 272f702b7..8d3812fe9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 José Rebelo
+/*  Copyright (C) 2021-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.devicesettings;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/discovery/DiscoveryActivityV2.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/discovery/DiscoveryActivityV2.java
index 0d6352d74..410362fc0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/discovery/DiscoveryActivityV2.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/discovery/DiscoveryActivityV2.java
@@ -1,6 +1,4 @@
-/*  Copyright (C) 2015-2023 Andreas Shimokawa, boun, Carsten Pfeiffer, Daniel
-    Dakhno, Daniele Gobbetti, JohnnySun, jonnsoft, José Rebelo, Lem Dulfo, Taavi
-    Eomäe, Uwe Hermann
+/*  Copyright (C) 2023-2024 Andreas Böhler, Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -15,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.discovery;
 
 import static nodomain.freeyourgadget.gadgetbridge.util.GB.toast;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/discovery/DiscoveryPairingPreferenceActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/discovery/DiscoveryPairingPreferenceActivity.java
index 14d6fe97c..f42581eac 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/discovery/DiscoveryPairingPreferenceActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/discovery/DiscoveryPairingPreferenceActivity.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2015-2023 Andreas Shimokawa, Carsten Pfeiffer, Lem Dulfo,
-    vanous, José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.discovery;
 
 import android.os.Bundle;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/discovery/GBScanEvent.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/discovery/GBScanEvent.java
index a2a79c8b6..c77e55e60 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/discovery/GBScanEvent.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/discovery/GBScanEvent.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.discovery;
 
 import android.bluetooth.BluetoothDevice;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/discovery/GBScanEventProcessor.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/discovery/GBScanEventProcessor.java
index 8857da45e..f701399a3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/discovery/GBScanEventProcessor.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/discovery/GBScanEventProcessor.java
@@ -1,6 +1,4 @@
-/*  Copyright (C) 2015-2023 Andreas Shimokawa, boun, Carsten Pfeiffer, Daniel
-    Dakhno, Daniele Gobbetti, JohnnySun, jonnsoft, José Rebelo, Lem Dulfo, Taavi
-    Eomäe, Uwe Hermann
+/*  Copyright (C) 2023-2024 Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -15,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.discovery;
 
 import android.os.ParcelUuid;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/loyaltycards/LoyaltyCardsSettingsActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/loyaltycards/LoyaltyCardsSettingsActivity.java
index da7c5efb9..4b84a450d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/loyaltycards/LoyaltyCardsSettingsActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/loyaltycards/LoyaltyCardsSettingsActivity.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.loyaltycards;
 
 import android.content.pm.PackageManager;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/loyaltycards/LoyaltyCardsSettingsConst.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/loyaltycards/LoyaltyCardsSettingsConst.java
index f7c80a0d8..42bd0e21a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/loyaltycards/LoyaltyCardsSettingsConst.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/loyaltycards/LoyaltyCardsSettingsConst.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.loyaltycards;
 
 public final class LoyaltyCardsSettingsConst {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/loyaltycards/LoyaltyCardsSettingsFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/loyaltycards/LoyaltyCardsSettingsFragment.java
index dcc8a7dca..87659ae2b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/loyaltycards/LoyaltyCardsSettingsFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/loyaltycards/LoyaltyCardsSettingsFragment.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2023-2024 Andreas Shimokawa, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.loyaltycards;
 
 import static nodomain.freeyourgadget.gadgetbridge.activities.loyaltycards.LoyaltyCardsSettingsConst.LOYALTY_CARDS_CATIMA_NOT_COMPATIBLE;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/widgets/WidgetScreenDetailsActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/widgets/WidgetScreenDetailsActivity.java
index 4dcff2f89..8245be60a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/widgets/WidgetScreenDetailsActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/widgets/WidgetScreenDetailsActivity.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.widgets;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/widgets/WidgetScreenListAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/widgets/WidgetScreenListAdapter.java
index d2278dfe1..2c4e0197a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/widgets/WidgetScreenListAdapter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/widgets/WidgetScreenListAdapter.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 Andreas Shimokawa, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.widgets;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/widgets/WidgetScreensListActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/widgets/WidgetScreensListActivity.java
index f8f1b17b3..48d34a1e5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/widgets/WidgetScreensListActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/widgets/WidgetScreensListActivity.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.activities.widgets;
 
 import android.annotation.SuppressLint;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/AbstractActivityListingAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/AbstractActivityListingAdapter.java
index 37baf42f7..5fd5b5064 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/AbstractActivityListingAdapter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/AbstractActivityListingAdapter.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti
+/*  Copyright (C) 2020-2024 Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.adapter;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/AbstractItemAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/AbstractItemAdapter.java
index 2511dd5f9..dbbbeb3a9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/AbstractItemAdapter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/AbstractItemAdapter.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti
+/*  Copyright (C) 2017-2024 Arjan Schrijver, Carsten Pfeiffer, Daniele
+    Gobbetti, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.adapter;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/ActivitySummariesAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/ActivitySummariesAdapter.java
index 248b7d2a6..b24b20d91 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/ActivitySummariesAdapter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/ActivitySummariesAdapter.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2017-2020 Carsten Pfeiffer, Daniele Gobbetti
+/*  Copyright (C) 2017-2024 Carsten Pfeiffer, Daniel Dakhno, Daniele Gobbetti,
+    José Rebelo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.adapter;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/AppBlacklistAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/AppBlacklistAdapter.java
index b70b7bb15..6507a3e3e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/AppBlacklistAdapter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/AppBlacklistAdapter.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2017-2020 abettenburg, AndrewBedscastle, Carsten Pfeiffer,
-    Daniele Gobbetti
+/*  Copyright (C) 2017-2024 abettenburg, AndrewBedscastle, Carsten Pfeiffer,
+    Daniele Gobbetti, José Rebelo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.adapter;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/AppSpecificNotificationSettingsAppListAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/AppSpecificNotificationSettingsAppListAdapter.java
index 37490f0aa..966a13b9e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/AppSpecificNotificationSettingsAppListAdapter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/AppSpecificNotificationSettingsAppListAdapter.java
@@ -1,21 +1,19 @@
-/*
- *   Copyright (C) 2023 akasaka / Genjitsu Labs
- *
- *     This file is part of Gadgetbridge.
- *
- *     Gadgetbridge is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU Affero General Public License as published
- *     by the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Gadgetbridge is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU Affero General Public License for more details.
- *
- *     You should have received a copy of the GNU Affero General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.adapter;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/DeviceCandidateAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/DeviceCandidateAdapter.java
index 198885f74..f10823e77 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/DeviceCandidateAdapter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/DeviceCandidateAdapter.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniel
+    Dakhno, José Rebelo, Petr Vaněk, Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.adapter;
 
 import android.bluetooth.BluetoothDevice;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBAlarmListAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBAlarmListAdapter.java
index d24da839f..2f45c8958 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBAlarmListAdapter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBAlarmListAdapter.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Arjan Schrijver, Carsten
+    Pfeiffer, Daniele Gobbetti
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.adapter;
 
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBContactListAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBContactListAdapter.java
index 3112338d2..7c9831032 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBContactListAdapter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBContactListAdapter.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 Arjan Schrijver, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.adapter;
 
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java
index 213fd5bc5..fd5164efc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java
@@ -1,5 +1,7 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, José Rebelo, Lem Dulfo, maxirnilian
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Arjan Schrijver, Carsten
+    Pfeiffer, Damien Gaignon, Daniel Dakhno, Daniele Gobbetti, Davis Mosenkovs,
+    fparri, José Rebelo, mamucho, maxirnilian, mkusnierz, Petr Vaněk, Taavi
+    Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +16,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.adapter;
 
 import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_CONNECT;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAppAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAppAdapter.java
index a23b68002..5cd82eb4c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAppAdapter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAppAdapter.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Arjan Schrijver, Carsten
+    Pfeiffer, Daniele Gobbetti, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.adapter;
 
 import android.graphics.Bitmap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBReminderListAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBReminderListAdapter.java
index 4d16ed47a..385493cf6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBReminderListAdapter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBReminderListAdapter.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019 José Rebelo
+/*  Copyright (C) 2021-2024 Arjan Schrijver, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.adapter;
 
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBWorldClockListAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBWorldClockListAdapter.java
index 88cfc0353..b687be892 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBWorldClockListAdapter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBWorldClockListAdapter.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 Arjan Schrijver, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.adapter;
 
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/ItemWithDetailsAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/ItemWithDetailsAdapter.java
index 2b81bed00..3bb2e079f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/ItemWithDetailsAdapter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/ItemWithDetailsAdapter.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Arjan Schrijver, Carsten
+    Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.adapter;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/SpinnerWithIconAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/SpinnerWithIconAdapter.java
index 68a4010ad..5732cdb38 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/SpinnerWithIconAdapter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/SpinnerWithIconAdapter.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2020-2024 Petr Vaněk
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.adapter;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/SpinnerWithIconItem.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/SpinnerWithIconItem.java
index d9500d1b1..dd1292b4b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/SpinnerWithIconItem.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/SpinnerWithIconItem.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2020-2024 Petr Vaněk
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.adapter;
 
 public class SpinnerWithIconItem {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/GpsCapability.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/GpsCapability.java
index e0d40b0d2..7567acfea 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/GpsCapability.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/GpsCapability.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.capabilities;
 
 public class GpsCapability {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/HeartRateCapability.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/HeartRateCapability.java
index 6fd390d25..17e3124cd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/HeartRateCapability.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/HeartRateCapability.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 Arjan Schrijver, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.capabilities;
 
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_HEARTRATE_ACTIVITY_MONITORING;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/WorkoutDetectionCapability.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/WorkoutDetectionCapability.java
index 0193a6d40..12da8ab87 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/WorkoutDetectionCapability.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/WorkoutDetectionCapability.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.capabilities;
 
 public class WorkoutDetectionCapability {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/loyaltycards/BarcodeFormat.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/loyaltycards/BarcodeFormat.java
index 0dd7f7b29..3f6311deb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/loyaltycards/BarcodeFormat.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/loyaltycards/BarcodeFormat.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.capabilities.loyaltycards;
 
 /**
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/loyaltycards/CatimaContentProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/loyaltycards/CatimaContentProvider.java
index d72447f14..a6b6da752 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/loyaltycards/CatimaContentProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/loyaltycards/CatimaContentProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.capabilities.loyaltycards;
 
 import android.content.ContentResolver;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/loyaltycards/CatimaManager.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/loyaltycards/CatimaManager.java
index 63e9f286f..88715f4d3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/loyaltycards/CatimaManager.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/loyaltycards/CatimaManager.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.capabilities.loyaltycards;
 
 import static nodomain.freeyourgadget.gadgetbridge.activities.loyaltycards.LoyaltyCardsSettingsConst.LOYALTY_CARDS_CATIMA_PACKAGE;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/loyaltycards/LoyaltyCard.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/loyaltycards/LoyaltyCard.java
index 8fe79487a..9b3d131a4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/loyaltycards/LoyaltyCard.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/loyaltycards/LoyaltyCard.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.capabilities.loyaltycards;
 
 import androidx.annotation.Nullable;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/password/PasswordCapabilityImpl.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/password/PasswordCapabilityImpl.java
index 069336ad7..5ef94ed0f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/password/PasswordCapabilityImpl.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/password/PasswordCapabilityImpl.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.capabilities.password;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/widgets/WidgetLayout.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/widgets/WidgetLayout.java
index d10331d38..06341d38c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/widgets/WidgetLayout.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/widgets/WidgetLayout.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.capabilities.widgets;
 
 import androidx.annotation.StringRes;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/widgets/WidgetManager.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/widgets/WidgetManager.java
index 1ac23da96..0d4c9c451 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/widgets/WidgetManager.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/widgets/WidgetManager.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.capabilities.widgets;
 
 import java.util.List;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/widgets/WidgetPart.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/widgets/WidgetPart.java
index 54c10ae8c..c2246727a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/widgets/WidgetPart.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/widgets/WidgetPart.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.capabilities.widgets;
 
 import androidx.annotation.Nullable;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/widgets/WidgetPartSubtype.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/widgets/WidgetPartSubtype.java
index 7655ed020..b4be3ffdd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/widgets/WidgetPartSubtype.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/widgets/WidgetPartSubtype.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.capabilities.widgets;
 
 import java.io.Serializable;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/widgets/WidgetScreen.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/widgets/WidgetScreen.java
index c7394d8fc..25cd56744 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/widgets/WidgetScreen.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/widgets/WidgetScreen.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.capabilities.widgets;
 
 import androidx.annotation.Nullable;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/widgets/WidgetType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/widgets/WidgetType.java
index 14be6f4f8..53612a359 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/widgets/WidgetType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/widgets/WidgetType.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.capabilities.widgets;
 
 public enum WidgetType {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/contentprovider/PebbleContentProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/contentprovider/PebbleContentProvider.java
index e5a3dc32b..ff66e20b5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/contentprovider/PebbleContentProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/contentprovider/PebbleContentProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
     Gobbetti
 
     This file is part of Gadgetbridge.
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.contentprovider;
 
 import android.content.BroadcastReceiver;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/AppSpecificNotificationSettingsRepository.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/AppSpecificNotificationSettingsRepository.java
index 95957540a..f9afb1c06 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/AppSpecificNotificationSettingsRepository.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/AppSpecificNotificationSettingsRepository.java
@@ -1,22 +1,19 @@
-/*
- *   Copyright (C) 2023 akasaka / Genjitsu Labs
- *
- *     This file is part of Gadgetbridge.
- *
- *     Gadgetbridge is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU Affero General Public License as published
- *     by the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Gadgetbridge is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU Affero General Public License for more details.
- *
- *     You should have received a copy of the GNU Affero General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.database;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBAccess.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBAccess.java
index 03143c7f3..7def569ba 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBAccess.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBAccess.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.database;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBHandler.java
index a6fabf657..7e18d1f80 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
     Gobbetti, JohnnySun
 
     This file is part of Gadgetbridge.
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.database;
 
 import android.database.sqlite.SQLiteDatabase;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBHelper.java
index c7c5a8896..78ff43c58 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBHelper.java
@@ -1,5 +1,6 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Felix Konstantin Maurer, JohnnySun
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Damien
+    Gaignon, Daniel Dakhno, Daniele Gobbetti, Felix Konstantin Maurer, JohnnySun,
+    José Rebelo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +15,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.database;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBOpenHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBOpenHelper.java
index e8075965b..a958e006a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBOpenHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBOpenHelper.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2020 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.database;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBUpdateScript.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBUpdateScript.java
index e13962372..3dc394034 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBUpdateScript.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBUpdateScript.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.database;
 
 import android.database.sqlite.SQLiteDatabase;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/PeriodicExporter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/PeriodicExporter.java
index 36861f5a2..4dee60766 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/PeriodicExporter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/PeriodicExporter.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2018-2020 Carsten Pfeiffer, Felix Konstantin Maurer
+/*  Copyright (C) 2018-2024 Carsten Pfeiffer, Felix Konstantin Maurer,
+    Ganblejs, José Rebelo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.database;
 
 import android.app.AlarmManager;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_14.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_14.java
index 3199e9bd5..6eef4ea05 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_14.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_14.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2020 Andreas Shimokawa
+/*  Copyright (C) 2016-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.database.schema;
 
 import android.database.sqlite.SQLiteDatabase;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_15.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_15.java
index bd8b91c18..5a50ec9ad 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_15.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_15.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2020 Andreas Shimokawa
+/*  Copyright (C) 2016-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.database.schema;
 
 import android.database.sqlite.SQLiteDatabase;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_17.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_17.java
index 170dfa8fc..9e50eadc4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_17.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_17.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2020 protomors
+/*  Copyright (C) 2017-2024 protomors
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.database.schema;
 
 import android.database.sqlite.SQLiteDatabase;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_22.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_22.java
index 5f53ed8a5..c740c4f45 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_22.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_22.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2020 Andreas Shimokawa, protomors
+/*  Copyright (C) 2019-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.database.schema;
 
 import android.database.sqlite.SQLiteDatabase;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_23.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_23.java
index dd29cdca7..79b88acb3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_23.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_23.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2020 Andreas Shimokawa, protomors
+/*  Copyright (C) 2020-2024 Dmitry Markin
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.database.schema;
 
 import android.database.sqlite.SQLiteDatabase;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_24.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_24.java
index 129d3ef40..420cd2c41 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_24.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_24.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2020 Andreas Shimokawa, protomors
+/*  Copyright (C) 2020-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.database.schema;
 
 import android.database.sqlite.SQLiteDatabase;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_26.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_26.java
index 4bed074f0..0ef368224 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_26.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_26.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2020 Andreas Shimokawa, protomors
+/*  Copyright (C) 2020-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.database.schema;
 
 import android.database.sqlite.SQLiteDatabase;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_27.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_27.java
index 323abbc8f..00cf6e491 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_27.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_27.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2020 Andreas Shimokawa, protomors
+/*  Copyright (C) 2020-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.database.schema;
 
 import android.database.sqlite.SQLiteDatabase;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_29.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_29.java
index 7239e1fa3..711dea4fa 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_29.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_29.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2020 Andreas Shimokawa, protomors
+/*  Copyright (C) 2020-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.database.schema;
 
 import android.database.sqlite.SQLiteDatabase;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_30.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_30.java
index 41fb5cee8..195ae3aae 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_30.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_30.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2020 Andreas Shimokawa, protomors
+/*  Copyright (C) 2020-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.database.schema;
 
 import android.database.sqlite.SQLiteDatabase;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_35.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_35.java
index ab8ea364b..5253d90de 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_35.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_35.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2020 Andreas Shimokawa, protomors
+/*  Copyright (C) 2021-2024 Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.database.schema;
 
 import android.database.sqlite.SQLiteDatabase;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_42.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_42.java
index 012f16f78..29dfe433b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_42.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_42.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2020 Andreas Shimokawa, protomors
+/*  Copyright (C) 2022-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.database.schema;
 
 import android.database.sqlite.SQLiteDatabase;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_44.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_44.java
index 595d8ae79..76c11df70 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_44.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_44.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.database.schema;
 
 import android.database.sqlite.SQLiteDatabase;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_45.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_45.java
index 39b5ba85c..465ef369e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_45.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_45.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.database.schema;
 
 import android.database.sqlite.SQLiteDatabase;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_51.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_51.java
index 66e34123c..557e1f139 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_51.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_51.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.database.schema;
 
 import android.database.sqlite.SQLiteDatabase;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_62.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_62.java
index a1c02ff6a..9ec2d78f8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_62.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_62.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 Daniel Dakhno
+/*  Copyright (C) 2023-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.database.schema;
 
 import android.database.sqlite.SQLiteDatabase;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_66.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_66.java
index fb08efaa1..7aa15a068 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_66.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/GadgetbridgeUpdate_66.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.database.schema;
 
 import android.database.sqlite.SQLiteDatabase;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/SchemaMigration.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/SchemaMigration.java
index 6c78a7c1d..5eda0d69f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/SchemaMigration.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/schema/SchemaMigration.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2020 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.database.schema;
 
 import android.database.sqlite.SQLiteDatabase;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEvent.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEvent.java
index 8cce8ded7..2c77fdeb7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEvent.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEvent.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
     Gobbetti
 
     This file is part of Gadgetbridge.
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.deviceevents;
 
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventAppInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventAppInfo.java
index 5ff42e9e4..afc425979 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventAppInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventAppInfo.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.deviceevents;
 
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceApp;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventAppManagement.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventAppManagement.java
index b9ab9bc20..190edfac2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventAppManagement.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventAppManagement.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa
+/*  Copyright (C) 2015-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.deviceevents;
 
 import java.util.UUID;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventAppMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventAppMessage.java
index 8b4139547..0bab08da3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventAppMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventAppMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.deviceevents;
 
 import java.util.UUID;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventBatteryInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventBatteryInfo.java
index a664d7032..88376ee4f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventBatteryInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventBatteryInfo.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Daniele Gobbetti, José Rebelo
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Daniele Gobbetti, José Rebelo,
+    Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.deviceevents;
 
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventCallControl.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventCallControl.java
index dc9127585..596e1ddc4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventCallControl.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventCallControl.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Böhler, Andreas Shimokawa
+/*  Copyright (C) 2015-2024 Andreas Böhler, Andreas Shimokawa, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.deviceevents;
 
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventDisplayMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventDisplayMessage.java
index eeed25e27..1fbc87f9e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventDisplayMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventDisplayMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.deviceevents;
 
 public class GBDeviceEventDisplayMessage {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventFindPhone.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventFindPhone.java
index 066a58b43..92aeac6c2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventFindPhone.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventFindPhone.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa
+/*  Copyright (C) 2018-2024 Andreas Shimokawa, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 package nodomain.freeyourgadget.gadgetbridge.deviceevents;
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventFmFrequency.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventFmFrequency.java
index 8e56be5dc..7c02a46b6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventFmFrequency.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventFmFrequency.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, José Rebelo
+/*  Copyright (C) 2018-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.deviceevents;
 
 public class GBDeviceEventFmFrequency extends GBDeviceEvent {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventLEDColor.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventLEDColor.java
index 86f104f6c..e476759f0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventLEDColor.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventLEDColor.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, José Rebelo
+/*  Copyright (C) 2018-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.deviceevents;
 
 public class GBDeviceEventLEDColor extends GBDeviceEvent {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventMusicControl.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventMusicControl.java
index 1f91e2c08..df9d118cc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventMusicControl.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventMusicControl.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Petr Vaněk
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.deviceevents;
 
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventNotificationControl.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventNotificationControl.java
index 2a7f7577e..be05245af 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventNotificationControl.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventNotificationControl.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Daniele Gobbetti
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Daniele Gobbetti
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.deviceevents;
 
 public class GBDeviceEventNotificationControl extends GBDeviceEvent {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventScreenshot.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventScreenshot.java
index 3ab57cf96..b67b9a5a4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventScreenshot.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventScreenshot.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.deviceevents;
 
 public class GBDeviceEventScreenshot extends GBDeviceEvent {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventSendBytes.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventSendBytes.java
index 15ecffe88..8a4243ae2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventSendBytes.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventSendBytes.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.deviceevents;
 
 public class GBDeviceEventSendBytes extends GBDeviceEvent {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventSilentMode.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventSilentMode.java
index d02847250..e057843a3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventSilentMode.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventSilentMode.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.deviceevents;
 
 public class GBDeviceEventSilentMode extends GBDeviceEvent {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventSleepStateDetection.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventSleepStateDetection.java
index 419916725..b4fcdcad4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventSleepStateDetection.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventSleepStateDetection.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 Yoran Vulker
+/*  Copyright (C) 2023-2024 Yoran Vulker
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.deviceevents;
 
 import java.util.Locale;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventUpdateDeviceInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventUpdateDeviceInfo.java
index 136f98704..d1951c10d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventUpdateDeviceInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventUpdateDeviceInfo.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 José Rebelo
+/*  Copyright (C) 2021-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.deviceevents;
 
 import nodomain.freeyourgadget.gadgetbridge.model.GenericItem;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventUpdateDeviceState.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventUpdateDeviceState.java
index dbe610deb..572d5567b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventUpdateDeviceState.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventUpdateDeviceState.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 José Rebelo
+/*  Copyright (C) 2021-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.deviceevents;
 
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventUpdatePreferences.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventUpdatePreferences.java
index 0bdccdcc5..8691c308a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventUpdatePreferences.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventUpdatePreferences.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 José Rebelo
+/*  Copyright (C) 2021-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.deviceevents;
 
 import android.content.SharedPreferences;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventVersionInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventVersionInfo.java
index e878d0b5d..0f607653d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventVersionInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventVersionInfo.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.deviceevents;
 
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventWearState.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventWearState.java
index 3c913b6b1..2c2e992e1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventWearState.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventWearState.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 Yoran Vulker
+/*  Copyright (C) 2023-2024 Yoran Vulker
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.deviceevents;
 
 import java.util.Locale;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/pebble/GBDeviceEventDataLogging.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/pebble/GBDeviceEventDataLogging.java
index 835ae5aa0..088915004 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/pebble/GBDeviceEventDataLogging.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/pebble/GBDeviceEventDataLogging.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa
+/*  Copyright (C) 2017-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.deviceevents.pebble;
 
 import java.util.UUID;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractBLClassicDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractBLClassicDeviceCoordinator.java
index e029d088a..a2cf5c60d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractBLClassicDeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractBLClassicDeviceCoordinator.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 Daniel Dakhno
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices;
 
 public abstract class AbstractBLClassicDeviceCoordinator extends AbstractDeviceCoordinator {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractBLEDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractBLEDeviceCoordinator.java
index 18500a4b0..565837cd0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractBLEDeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractBLEDeviceCoordinator.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 Daniel Dakhno, José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices;
 
 public abstract class AbstractBLEDeviceCoordinator extends AbstractDeviceCoordinator {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java
index a7278dd76..ba8399137 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java
@@ -1,6 +1,7 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Dmitry Markin, José Rebelo, Matthieu Baerts, Nephiel, Petr Vaněk,
-    Taavi Eomäe
+/*  Copyright (C) 2015-2024 akasaka / Genjitsu Labs, Alicia Hormann, Andreas
+    Shimokawa, Arjan Schrijver, Carsten Pfeiffer, Daniel Dakhno, Daniele Gobbetti,
+    Davis Mosenkovs, Dmitry Markin, José Rebelo, Matthieu Baerts, Nephiel,
+    Petr Vaněk, Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -15,7 +16,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices;
 
 import static nodomain.freeyourgadget.gadgetbridge.GBApplication.getPrefs;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractSampleProvider.java
index 4228707c3..d020116e2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractSampleProvider.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniel
+    Dakhno, Daniele Gobbetti, José Rebelo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices;
 
 import java.util.ArrayList;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractSampleToTimeSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractSampleToTimeSampleProvider.java
index 1b10367d0..8546875da 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractSampleToTimeSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractSampleToTimeSampleProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractTimeSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractTimeSampleProvider.java
index 646f1f6be..2d9bc1aba 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractTimeSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractTimeSampleProvider.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2023 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java
index 999523c29..011b9d6fa 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java
@@ -1,6 +1,7 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Dmitry Markin, JohnnySun, José Rebelo, Matthieu Baerts, Nephiel,
-    Uwe Hermann
+/*  Copyright (C) 2015-2024 akasaka / Genjitsu Labs, Alicia Hormann, Andreas
+    Böhler, Andreas Shimokawa, Arjan Schrijver, Carsten Pfeiffer, Damien Gaignon,
+    Daniel Dakhno, Daniele Gobbetti, Dmitry Markin, JohnnySun, José Rebelo,
+    Matthieu Baerts, Nephiel, Petr Vaněk, Uwe Hermann
 
     This file is part of Gadgetbridge.
 
@@ -15,7 +16,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceManager.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceManager.java
index 384041c31..4677ee652 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceManager.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceManager.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniel
+    Dakhno, Daniele Gobbetti, Gordon Williams, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices;
 
 import android.bluetooth.BluetoothDevice;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/EventHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/EventHandler.java
index 900c007c1..a4583431a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/EventHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/EventHandler.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, José Rebelo, Julien Pivotto, Kasha, Sebastian Kranz, Steffen
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Arjan Schrijver, Carsten
+    Pfeiffer, José Rebelo, Julien Pivotto, Kasha, Sebastian Kranz, Steffen
     Liebergeld, Uwe Hermann
 
     This file is part of Gadgetbridge.
@@ -15,7 +15,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices;
 
 import android.location.Location;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/InstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/InstallHandler.java
index da43d2c50..87556b8fa 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/InstallHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/InstallHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices;
 
 import nodomain.freeyourgadget.gadgetbridge.activities.InstallActivity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/SampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/SampleProvider.java
index 7a6ec8dc1..c38abf634 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/SampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/SampleProvider.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, João Paulo Barraca
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+    Gobbetti, João Paulo Barraca, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices;
 
 import java.util.List;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/TimeSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/TimeSampleProvider.java
index 8e4a0097d..08f82b6c6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/TimeSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/TimeSampleProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/UnknownDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/UnknownDeviceCoordinator.java
index 527f50879..b67696194 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/UnknownDeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/UnknownDeviceCoordinator.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, José Rebelo
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Damien
+    Gaignon, Daniel Dakhno, Daniele Gobbetti, José Rebelo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/amazfitbip/BipActivitySummary.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/amazfitbip/BipActivitySummary.java
index 84cdaa3f3..b520592cc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/amazfitbip/BipActivitySummary.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/amazfitbip/BipActivitySummary.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Carsten Pfeiffer, Daniele Gobbetti
+/*  Copyright (C) 2017-2024 Carsten Pfeiffer, Daniele Gobbetti
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.amazfitbip;
 
 import nodomain.freeyourgadget.gadgetbridge.entities.BaseActivitySummary;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/asteroidos/AsteroidOSConstants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/asteroidos/AsteroidOSConstants.java
index 778dbe6b2..0a94bff30 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/asteroidos/AsteroidOSConstants.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/asteroidos/AsteroidOSConstants.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 Noodlez
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.asteroidos;
 
 import java.util.UUID;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/asteroidos/AsteroidOSDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/asteroidos/AsteroidOSDeviceCoordinator.java
index 7330f5ee7..358cca6b9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/asteroidos/AsteroidOSDeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/asteroidos/AsteroidOSDeviceCoordinator.java
@@ -1,3 +1,20 @@
+/*  Copyright (C) 2022-2024 Damien Gaignon, Daniel Dakhno, José Rebelo,
+    Noodlez
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.asteroidos;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/asteroidos/AsteroidOSMediaCommand.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/asteroidos/AsteroidOSMediaCommand.java
index 54d5a6c70..316efd2de 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/asteroidos/AsteroidOSMediaCommand.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/asteroidos/AsteroidOSMediaCommand.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 Noodlez
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.asteroidos;
 
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventMusicControl;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/asteroidos/AsteroidOSNotification.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/asteroidos/AsteroidOSNotification.java
index 6b2452998..053bcecb9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/asteroidos/AsteroidOSNotification.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/asteroidos/AsteroidOSNotification.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 Noodlez
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.asteroidos;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/asteroidos/AsteroidOSWeather.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/asteroidos/AsteroidOSWeather.java
index 20d2a293f..a07cdcfd9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/asteroidos/AsteroidOSWeather.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/asteroidos/AsteroidOSWeather.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 José Rebelo, Noodlez
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.asteroidos;
 
 import java.io.ByteArrayOutputStream;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/banglejs/AppsManagementActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/banglejs/AppsManagementActivity.java
index c73941a4a..a18b201f1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/banglejs/AppsManagementActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/banglejs/AppsManagementActivity.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 Andreas Shimokawa, Daniel Dakhno, Gordon Williams
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.banglejs;
 
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_DEVICE_INTERNET_ACCESS;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/banglejs/BangleJSConstants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/banglejs/BangleJSConstants.java
index b56df1bad..6f1858f66 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/banglejs/BangleJSConstants.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/banglejs/BangleJSConstants.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Gordon Williams
+/*  Copyright (C) 2019-2024 Gordon Williams, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.banglejs;
 
 import java.util.UUID;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/banglejs/BangleJSCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/banglejs/BangleJSCoordinator.java
index 06f674a14..b1357c954 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/banglejs/BangleJSCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/banglejs/BangleJSCoordinator.java
@@ -1,5 +1,6 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Gordon Williams, José Rebelo
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Damien Gaignon, Daniel Dakhno,
+    Gabriele Monaco, Ganblejs, glemco, Gordon Williams, José Rebelo, LukasEdl,
+    Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +15,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.banglejs;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/banglejs/BangleJSSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/banglejs/BangleJSSampleProvider.java
index 71322f9ee..e0994bb23 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/banglejs/BangleJSSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/banglejs/BangleJSSampleProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2018-2021 Daniele Gobbetti, Gordon Williams, Vadim Kaushan
+/*  Copyright (C) 2020-2024 Gordon Williams, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.banglejs;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/banglejs/BangleJSSettingsCustomizer.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/banglejs/BangleJSSettingsCustomizer.java
index 64f9bee10..8c5fef9b8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/banglejs/BangleJSSettingsCustomizer.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/banglejs/BangleJSSettingsCustomizer.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.banglejs;
 
 import static nodomain.freeyourgadget.gadgetbridge.devices.banglejs.BangleJSConstants.PREF_BANGLEJS_ACTIVITY_FULL_SYNC_START;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/binary_sensor/activity/DataActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/binary_sensor/activity/DataActivity.java
index 2c303236c..6b8f76b93 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/binary_sensor/activity/DataActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/binary_sensor/activity/DataActivity.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 Daniel Dakhno
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.binary_sensor.activity;
 
 import android.content.BroadcastReceiver;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/binary_sensor/coordinator/BinarySensorCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/binary_sensor/coordinator/BinarySensorCoordinator.java
index 3284935ef..e9dcacde3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/binary_sensor/coordinator/BinarySensorCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/binary_sensor/coordinator/BinarySensorCoordinator.java
@@ -1,3 +1,20 @@
+/*  Copyright (C) 2022-2024 Arjan Schrijver, Damien Gaignon, Daniel Dakhno,
+    José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.binary_sensor.coordinator;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/CasioConstants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/CasioConstants.java
index 8aa44db8f..c3a155115 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/CasioConstants.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/CasioConstants.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2018-2023 Andreas Böhler, Johannes Krude
+/*  Copyright (C) 2020-2024 Andreas Böhler, Johannes Krude
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.casio;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/CasioDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/CasioDeviceCoordinator.java
index 89c50bd0e..133c50f01 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/CasioDeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/CasioDeviceCoordinator.java
@@ -1,6 +1,4 @@
-/*  Copyright (C) 2023 Johannes Krude
-
-    based on code from BlueWatcher, https://github.com/masterjc/bluewatcher
+/*  Copyright (C) 2023-2024 Johannes Krude
 
     This file is part of Gadgetbridge.
 
@@ -15,7 +13,8 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
+/*  Based on code from BlueWatcher, https://github.com/masterjc/bluewatcher */
 package nodomain.freeyourgadget.gadgetbridge.devices.casio;
 
 import java.util.Collection;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/gb6900/CasioGB6900DeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/gb6900/CasioGB6900DeviceCoordinator.java
index 09cb4e095..0c7875496 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/gb6900/CasioGB6900DeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/gb6900/CasioGB6900DeviceCoordinator.java
@@ -1,7 +1,5 @@
-/*  Copyright (C) 2016-2023 Andreas Böhler, Andreas Shimokawa, Carsten
-    Pfeiffer, Daniele Gobbetti, José Rebelo, Johannes Krude
-
-    based on code from BlueWatcher, https://github.com/masterjc/bluewatcher
+/*  Copyright (C) 2020-2024 Andreas Böhler, Damien Gaignon, Daniel Dakhno,
+    Johannes Krude, José Rebelo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -16,7 +14,8 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
+/*  Based on code from BlueWatcher, https://github.com/masterjc/bluewatcher */
 package nodomain.freeyourgadget.gadgetbridge.devices.casio.gb6900;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/gbx100/CasioGBX100DeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/gbx100/CasioGBX100DeviceCoordinator.java
index 3ababcb87..c8da6c419 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/gbx100/CasioGBX100DeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/gbx100/CasioGBX100DeviceCoordinator.java
@@ -1,7 +1,5 @@
-/*  Copyright (C) 2016-2023 Andreas Böhler, Andreas Shimokawa, Carsten
-    Pfeiffer, Daniele Gobbetti, José Rebelo, Johannes Krude
-
-    based on code from BlueWatcher, https://github.com/masterjc/bluewatcher
+/*  Copyright (C) 2020-2024 Andreas Böhler, Damien Gaignon, Daniel Dakhno,
+    foxstidious, Johannes Krude, José Rebelo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -16,7 +14,8 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
+/*  Based on code from BlueWatcher, https://github.com/masterjc/bluewatcher */
 package nodomain.freeyourgadget.gadgetbridge.devices.casio.gbx100;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/gbx100/CasioGBX100SampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/gbx100/CasioGBX100SampleProvider.java
index 6eedf5a60..890dad8e1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/gbx100/CasioGBX100SampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/gbx100/CasioGBX100SampleProvider.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2018-2021 Andreas Böhler, Cre3per, Daniele Gobbetti,
-    Sebastian Kranz
+/*  Copyright (C) 2023-2024 Johannes Krude
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.casio.gbx100;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/gwb5600/CasioGMWB5000DeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/gwb5600/CasioGMWB5000DeviceCoordinator.java
index e645980eb..f6a12633e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/gwb5600/CasioGMWB5000DeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/gwb5600/CasioGMWB5000DeviceCoordinator.java
@@ -1,6 +1,4 @@
-/*  Copyright (C) 2023 Johannes Krude
-
-    based on code from BlueWatcher, https://github.com/masterjc/bluewatcher
+/*  Copyright (C) 2023-2024 Daniel Dakhno, Johannes Krude, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -15,7 +13,8 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
+/*  Based on code from BlueWatcher, https://github.com/masterjc/bluewatcher */
 package nodomain.freeyourgadget.gadgetbridge.devices.casio.gwb5600;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/gwb5600/CasioGWB5600DeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/gwb5600/CasioGWB5600DeviceCoordinator.java
index 5e1abf870..157c4642d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/gwb5600/CasioGWB5600DeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/gwb5600/CasioGWB5600DeviceCoordinator.java
@@ -1,6 +1,4 @@
-/*  Copyright (C) 2023 Johannes Krude
-
-    based on code from BlueWatcher, https://github.com/masterjc/bluewatcher
+/*  Copyright (C) 2023-2024 Daniel Dakhno, Johannes Krude, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -15,7 +13,8 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
+/*  Based on code from BlueWatcher, https://github.com/masterjc/bluewatcher */
 package nodomain.freeyourgadget.gadgetbridge.devices.casio.gwb5600;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/divoom/PixooCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/divoom/PixooCoordinator.java
index 4b94afb61..940725416 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/divoom/PixooCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/divoom/PixooCoordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 Andreas Shimokawa
+/*  Copyright (C) 2023-2024 Andreas Shimokawa, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.divoom;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/divoom/PixooInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/divoom/PixooInstallHandler.java
index 0155dd41a..beee43ef1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/divoom/PixooInstallHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/divoom/PixooInstallHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 Andreas Shimokawa
+/*  Copyright (C) 2023-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 package nodomain.freeyourgadget.gadgetbridge.devices.divoom;
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/domyos/DomyosT540Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/domyos/DomyosT540Coordinator.java
index e4bcdc33e..2cf8da3e0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/domyos/DomyosT540Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/domyos/DomyosT540Coordinator.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2016-2020 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, José Rebelo
+/*  Copyright (C) 2023-2024 Damien Gaignon, Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.domyos;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/femometer/FemometerVinca2DeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/femometer/FemometerVinca2DeviceCoordinator.java
old mode 100755
new mode 100644
index 7b1f19ea5..ab09d76e9
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/femometer/FemometerVinca2DeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/femometer/FemometerVinca2DeviceCoordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 Alicia Hormann
+/*  Copyright (C) 2023-2024 Alicia Hormann
 
     This file is part of Gadgetbridge.
 
@@ -13,8 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.femometer;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/femometer/FemometerVinca2SampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/femometer/FemometerVinca2SampleProvider.java
index 1f1f278f3..40a2ba872 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/femometer/FemometerVinca2SampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/femometer/FemometerVinca2SampleProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 Alicia Hormann
+/*  Copyright (C) 2023-2024 Alicia Hormann
 
     This file is part of Gadgetbridge.
 
@@ -13,8 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.femometer;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/fitpro/FitProConstants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/fitpro/FitProConstants.java
index d93f461f3..5f0713112 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/fitpro/FitProConstants.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/fitpro/FitProConstants.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2020 Petr Vaněk
+/*  Copyright (C) 2021-2024 Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 package nodomain.freeyourgadget.gadgetbridge.devices.fitpro;
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/fitpro/FitProDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/fitpro/FitProDeviceCoordinator.java
index be5123667..1a797f1cf 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/fitpro/FitProDeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/fitpro/FitProDeviceCoordinator.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2016-2020 Petr Vaněk
+/*  Copyright (C) 2021-2024 a b, Damien Gaignon, Daniel Dakhno, José Rebelo,
+    Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 package nodomain.freeyourgadget.gadgetbridge.devices.fitpro;
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/fitpro/FitProSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/fitpro/FitProSampleProvider.java
index 0621146e6..e585adffa 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/fitpro/FitProSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/fitpro/FitProSampleProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2020 Petr Vaněk
+/*  Copyright (C) 2021-2024 Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 package nodomain.freeyourgadget.gadgetbridge.devices.fitpro;
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/fitpro/colacao/ColaCao21Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/fitpro/colacao/ColaCao21Coordinator.java
index 5428b7b1c..e630ca481 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/fitpro/colacao/ColaCao21Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/fitpro/colacao/ColaCao21Coordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2023 Petr Vaněk, José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 package nodomain.freeyourgadget.gadgetbridge.devices.fitpro.colacao;
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/fitpro/colacao/ColaCao23Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/fitpro/colacao/ColaCao23Coordinator.java
index cf735ec98..ec502a6c3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/fitpro/colacao/ColaCao23Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/fitpro/colacao/ColaCao23Coordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2023 Petr Vaněk, José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 package nodomain.freeyourgadget.gadgetbridge.devices.fitpro.colacao;
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/flipper/zero/FlipperZeroCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/flipper/zero/FlipperZeroCoordinator.java
index 70a9cd81e..87f6b7277 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/flipper/zero/FlipperZeroCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/flipper/zero/FlipperZeroCoordinator.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 Damien Gaignon, Daniel Dakhno, José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.flipper.zero;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBuds2DeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBuds2DeviceCoordinator.java
index 869cbffb8..3df3ecf86 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBuds2DeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBuds2DeviceCoordinator.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 Daniel Dakhno, narektor
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.galaxy_buds;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBuds2ProDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBuds2ProDeviceCoordinator.java
index 7d63455c9..82c5162e4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBuds2ProDeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBuds2ProDeviceCoordinator.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2023-2024 Daniel Dakhno, narektor
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.galaxy_buds;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsDeviceCoordinator.java
index 10a78a244..037325354 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsDeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsDeviceCoordinator.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2021-2024 Daniel Dakhno, Petr Vaněk
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.galaxy_buds;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsGenericCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsGenericCoordinator.java
index e89967a8c..aedbc1af4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsGenericCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsGenericCoordinator.java
@@ -1,3 +1,20 @@
+/*  Copyright (C) 2022-2024 Damien Gaignon, Daniel Dakhno, José Rebelo,
+    Petr Vaněk
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.galaxy_buds;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsLiveDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsLiveDeviceCoordinator.java
index 0b755fab1..61075ef03 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsLiveDeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsLiveDeviceCoordinator.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2021-2024 Daniel Dakhno, Petr Vaněk
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.galaxy_buds;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsProDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsProDeviceCoordinator.java
index 334cf2ae4..d7dee6e99 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsProDeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsProDeviceCoordinator.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 Daniel Dakhno, José Rebelo, Petr Vaněk
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.galaxy_buds;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsSettingsCustomizer.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsSettingsCustomizer.java
index fb56a7ec3..704c5f196 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsSettingsCustomizer.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBudsSettingsCustomizer.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 José Rebelo
+/*  Copyright (C) 2022-2024 narektor, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.galaxy_buds;
 
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_GALAXY_BUDS_AMBIENT_VOLUME;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/EXRIZUK8Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/EXRIZUK8Coordinator.java
index eefc77daf..ee2c4e149 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/EXRIZUK8Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/EXRIZUK8Coordinator.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2017-2021 Daniele Gobbetti, João Paulo Barraca, Quallenauge
+/*  Copyright (C) 2017-2024 Daniel Dakhno, Daniele Gobbetti, José Rebelo,
+    Quallenauge
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.hplus;
 
 /*
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusConstants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusConstants.java
index 0107bb36a..bf948793b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusConstants.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusConstants.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, João
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Carsten Pfeiffer, João
     Paulo Barraca, Lesur Frederic
 
     This file is part of Gadgetbridge.
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.hplus;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusCoordinator.java
index 41e3e6b3a..00bc2ecfc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusCoordinator.java
@@ -1,5 +1,6 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, João Paulo Barraca, José Rebelo, Lesur Frederic
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Carsten Pfeiffer, Damien
+    Gaignon, Daniel Dakhno, Daniele Gobbetti, João Paulo Barraca, José Rebelo,
+    Lesur Frederic, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +15,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.hplus;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusHealthSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusHealthSampleProvider.java
index 4d8dbe2d7..3dd0a86af 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusHealthSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusHealthSampleProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Daniele Gobbetti, João
+/*  Copyright (C) 2017-2024 Andreas Shimokawa, Daniele Gobbetti, João
     Paulo Barraca
 
     This file is part of Gadgetbridge.
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.hplus;
 
 /*
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusSettingsActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusSettingsActivity.java
index 85507ef43..6726bd2de 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusSettingsActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusSettingsActivity.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo,
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.hplus;
 
 import android.os.Bundle;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusWeatherCode.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusWeatherCode.java
index ef697b6d0..e9216f398 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusWeatherCode.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusWeatherCode.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Lesur Frederic
+/*  Copyright (C) 2020-2024 Lesur Frederic
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.hplus;
 
 public class HPlusWeatherCode {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/MakibesF68Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/MakibesF68Coordinator.java
index ecbd61a38..e005a144c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/MakibesF68Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/MakibesF68Coordinator.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2017-2021 Daniele Gobbetti, João Paulo Barraca, Stan Gomin
+/*  Copyright (C) 2017-2024 Daniel Dakhno, Daniele Gobbetti, João Paulo
+    Barraca, José Rebelo, Stan Gomin
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.hplus;
 
 /*
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/Q8Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/Q8Coordinator.java
index 3beec9cff..3ed48dbc1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/Q8Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/Q8Coordinator.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2017-2021 Daniele Gobbetti, João Paulo Barraca, tiparega
+/*  Copyright (C) 2018-2024 Daniel Dakhno, Daniele Gobbetti, José Rebelo,
+    tiparega
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.hplus;
 
 /*
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/SG2Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/SG2Coordinator.java
index 977a42e59..89b85d546 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/SG2Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/SG2Coordinator.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2017-2021 Daniele Gobbetti, João Paulo Barraca, Lesur Frederic
-    tiparega
+/*  Copyright (C) 2020-2024 Daniel Dakhno, José Rebelo, Lesur Frederic
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.hplus;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/ActivateDisplayOnLift.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/ActivateDisplayOnLift.java
index 7373f3b8b..776b895c5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/ActivateDisplayOnLift.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/ActivateDisplayOnLift.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, José Rebelo
+/*  Copyright (C) 2018-2024 Andreas Shimokawa, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami;
 
 public enum ActivateDisplayOnLift {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/ActivateDisplayOnLiftSensitivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/ActivateDisplayOnLiftSensitivity.java
index f50750b78..dc05df758 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/ActivateDisplayOnLiftSensitivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/ActivateDisplayOnLiftSensitivity.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami;
 
 public enum ActivateDisplayOnLiftSensitivity {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/AlwaysOnDisplay.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/AlwaysOnDisplay.java
index f772e5a34..d32c800e2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/AlwaysOnDisplay.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/AlwaysOnDisplay.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami;
 
 public enum AlwaysOnDisplay {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/DisconnectNotificationSetting.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/DisconnectNotificationSetting.java
index 5d78c5495..13680c2d8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/DisconnectNotificationSetting.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/DisconnectNotificationSetting.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, José Rebelo
+/*  Copyright (C) 2019-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami;
 
 public enum DisconnectNotificationSetting {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021ActivitySummaryParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021ActivitySummaryParser.java
index f0bd87c9b..929f31b48 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021ActivitySummaryParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021ActivitySummaryParser.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo, Reiner Herrmann
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami;
 
 import static nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries.*;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021Coordinator.java
index 0ddbebe14..488cbd498 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021Coordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021Service.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021Service.java
index c4ba5ee26..4a7ecd68c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021Service.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021Service.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami;
 
 public class Huami2021Service {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021SettingsCustomizer.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021SettingsCustomizer.java
index 7f3c55f09..70fe1f3bb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021SettingsCustomizer.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021SettingsCustomizer.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami;
 
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsUtils.hidePrefIfNoneVisible;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiActivitySummaryParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiActivitySummaryParser.java
index fa354e72b..5dcebf3a5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiActivitySummaryParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiActivitySummaryParser.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Petr Vaněk
+/*  Copyright (C) 2020-2024 Andreas Shimokawa, José Rebelo, Sebastian Krey,
+    Your Name
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami;
 
 import static nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries.*;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiConst.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiConst.java
index fbec4d016..d6caac90f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiConst.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiConst.java
@@ -1,5 +1,6 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer, Nephiel,
-    odavo32nof, Petr Vaněk, Zhong Jianxin
+/*  Copyright (C) 2018-2024 Andreas Shimokawa, Damien Gaignon, jhey, José
+    Rebelo, Maxime Reyrolle, Nephiel, odavo32nof, Petr Vaněk, Raghd Hamzeh,
+    sedy89, Stefan Bora, thermatk, xaos, Yoran Vulker, Zhong Jianxin
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +15,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami;
 
 import nodomain.freeyourgadget.gadgetbridge.model.ActivityKind;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiCoordinator.java
index 8adb42b91..e35aaca55 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiCoordinator.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, José Rebelo, Nephiel
+/*  Copyright (C) 2017-2024 Andreas Shimokawa, Damien Gaignon, Daniel Dakhno,
+    Daniele Gobbetti, José Rebelo, NekoBox, Nephiel, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiExtendedSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiExtendedSampleProvider.java
index d1ee0438e..069b96baa 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiExtendedSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiExtendedSampleProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022  José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiFWHelper.java
index 2a50623de..b016d35dc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiFWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiFWHelper.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti
+/*  Copyright (C) 2017-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+    Gobbetti, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiHeartRateManualSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiHeartRateManualSampleProvider.java
index 4720a88ec..8d066d204 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiHeartRateManualSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiHeartRateManualSampleProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiHeartRateMaxSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiHeartRateMaxSampleProvider.java
index 7d7dfc40b..0f902ef86 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiHeartRateMaxSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiHeartRateMaxSampleProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiHeartRateRestingSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiHeartRateRestingSampleProvider.java
index 4dd127a2b..46ff14215 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiHeartRateRestingSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiHeartRateRestingSampleProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiPaiSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiPaiSampleProvider.java
index a0c49e768..39d5738fb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiPaiSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiPaiSampleProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiService.java
index 1aa701abd..6c8262f9c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiService.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, JohnnySun,
-    José Rebelo, Uwe Hermann
+/*  Copyright (C) 2018-2024 Andreas Shimokawa, gsbhat, José Rebelo, NekoBox
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiSettingsCustomizer.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiSettingsCustomizer.java
index 1bdc63591..d992b5a79 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiSettingsCustomizer.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiSettingsCustomizer.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami;
 
 import android.os.Parcel;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiSleepRespiratoryRateSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiSleepRespiratoryRateSampleProvider.java
index 213aa3eae..891a66509 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiSleepRespiratoryRateSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiSleepRespiratoryRateSampleProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiSpo2SampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiSpo2SampleProvider.java
index a23e89401..af36d0ffc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiSpo2SampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiSpo2SampleProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiStressSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiStressSampleProvider.java
index acc8f66c6..dae451288 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiStressSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiStressSampleProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiWeatherConditions.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiWeatherConditions.java
index 92792a859..cea19633b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiWeatherConditions.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiWeatherConditions.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa
+/*  Copyright (C) 2017-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 package nodomain.freeyourgadget.gadgetbridge.devices.huami;
 
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 4a37621e1..2c3161cf9 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitactive;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitactive/AmazfitActiveFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitactive/AmazfitActiveFWHelper.java
index b29af6c77..3ea7e80cf 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitactive/AmazfitActiveFWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitactive/AmazfitActiveFWHelper.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitactive;
 
 import android.content.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 335767093..a4907b898 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitactive;
 
 import android.content.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 9d3af38e4..db894c921 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitactiveedge;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitactiveedge/AmazfitActiveEdgeFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitactiveedge/AmazfitActiveEdgeFWHelper.java
index 961f55242..ebadfcc7f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitactiveedge/AmazfitActiveEdgeFWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitactiveedge/AmazfitActiveEdgeFWHelper.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitactiveedge;
 
 import android.content.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 62240e255..b0e4aa7bb 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitactiveedge;
 
 import android.content.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 97750e4ba..860e1624c 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo, Maxime Reyrolle
+/*  Copyright (C) 2023-2024 José Rebelo, Maxime Reyrolle
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitbalance;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbalance/AmazfitBalanceFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbalance/AmazfitBalanceFWHelper.java
index 58d874c21..7c0366d0f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbalance/AmazfitBalanceFWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbalance/AmazfitBalanceFWHelper.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo, Maxime Reyrolle
+/*  Copyright (C) 2023-2024 Maxime Reyrolle
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitbalance;
 
 import android.content.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 adf17ea2a..40d9f628f 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo, Maxime Reyrolle
+/*  Copyright (C) 2023-2024 Maxime Reyrolle
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitbalance;
 
 import android.content.Context;
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 6fe4beede..2f9167ed1 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
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, HardLight, José Rebelo, odavo32nof
+/*  Copyright (C) 2020-2024 Andreas Shimokawa, Arjan Schrijver, Daniel Dakhno,
+    José Rebelo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitband5;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband5/AmazfitBand5FWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband5/AmazfitBand5FWHelper.java
index 78a56524b..13e2a9c43 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband5/AmazfitBand5FWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband5/AmazfitBand5FWHelper.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2020-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitband5;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband5/AmazfitBand5FWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband5/AmazfitBand5FWInstallHandler.java
index dabfa0bb6..d6a167033 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband5/AmazfitBand5FWInstallHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband5/AmazfitBand5FWInstallHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2020-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitband5;
 
 import android.content.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 64d480966..090da7b69 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 Arjan Schrijver, Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitband7;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband7/AmazfitBand7FWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband7/AmazfitBand7FWHelper.java
index 90d01983c..854c65130 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband7/AmazfitBand7FWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband7/AmazfitBand7FWHelper.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitband7;
 
 import android.content.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 ada6d57f7..b19b0312a 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitband7;
 
 import android.content.Context;
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 19923b027..5966626e9 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
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, João Paulo Barraca, Nephiel, Petr Vaněk
+/*  Copyright (C) 2017-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniel
+    Dakhno, Daniele Gobbetti, José Rebelo, Nephiel, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitbip;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipFWHelper.java
index 53520178b..6474318bf 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipFWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipFWHelper.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti
+/*  Copyright (C) 2017-2024 Andreas Shimokawa, Daniele Gobbetti
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitbip;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipFWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipFWInstallHandler.java
index 569c06f47..f002999e5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipFWInstallHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipFWInstallHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2017-2024 Andreas Shimokawa, Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitbip;
 
 import android.content.Context;
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 81913467a..69757d116 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
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Daniele Gobbetti, João
-    Paulo Barraca, José Rebelo, tiparega
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Daniel Dakhno, José Rebelo,
+    Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitbip;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipLiteFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipLiteFWHelper.java
index 84b8a2d49..bfb8d2187 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipLiteFWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipLiteFWHelper.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti
+/*  Copyright (C) 2019-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitbip;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipLiteFWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipLiteFWInstallHandler.java
index 116cf58ba..944958155 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipLiteFWInstallHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipLiteFWInstallHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2019-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitbip;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipService.java
index 5fad4da18..fe091c880 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipService.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2017-2024 Andreas Shimokawa, Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitbip;
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip3pro/AmazfitBip3ProCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip3pro/AmazfitBip3ProCoordinator.java
index 464c8617e..4640708e1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip3pro/AmazfitBip3ProCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip3pro/AmazfitBip3ProCoordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitbip3pro;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip3pro/AmazfitBip3ProFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip3pro/AmazfitBip3ProFWHelper.java
index 606fc7463..e3e75c94a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip3pro/AmazfitBip3ProFWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip3pro/AmazfitBip3ProFWHelper.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitbip3pro;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip3pro/AmazfitBip3ProFWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip3pro/AmazfitBip3ProFWInstallHandler.java
index f6f67c0b0..176c003bd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip3pro/AmazfitBip3ProFWInstallHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip3pro/AmazfitBip3ProFWInstallHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitbip3pro;
 
 import android.content.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 c15ba5b03..04872983c 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitbip5;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip5/AmazfitBip5FWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip5/AmazfitBip5FWHelper.java
index 5571113ba..e28fa4959 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip5/AmazfitBip5FWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip5/AmazfitBip5FWHelper.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitbip5;
 
 import android.content.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 b9d52a685..ef9bcf79a 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitbip5;
 
 import android.content.Context;
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 9abb2aa32..fc15827f9 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
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, João Paulo Barraca, Nephiel, Petr Vaněk, Zhong Jianxin
+/*  Copyright (C) 2020-2024 Andreas Shimokawa, Daniel Dakhno, José Rebelo,
+    Petr Vaněk, Zhong Jianxin
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitbips;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbips/AmazfitBipSFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbips/AmazfitBipSFWHelper.java
index 889863e38..a8a53840c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbips/AmazfitBipSFWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbips/AmazfitBipSFWHelper.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2020-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitbips;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbips/AmazfitBipSFWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbips/AmazfitBipSFWInstallHandler.java
index 3cf4a258d..4546fe450 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbips/AmazfitBipSFWInstallHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbips/AmazfitBipSFWInstallHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2020-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitbips;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbips/AmazfitBipSLiteCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbips/AmazfitBipSLiteCoordinator.java
index 3a16bfd99..298577b21 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbips/AmazfitBipSLiteCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbips/AmazfitBipSLiteCoordinator.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Daniele Gobbetti, João
-    Paulo Barraca, José Rebelo, tiparega
+/*  Copyright (C) 2020-2024 Andreas Shimokawa, Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitbips;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbips/AmazfitBipSLiteFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbips/AmazfitBipSLiteFWHelper.java
index 682849a3d..c535340c1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbips/AmazfitBipSLiteFWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbips/AmazfitBipSLiteFWHelper.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2020-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitbips;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbips/AmazfitBipSLiteFWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbips/AmazfitBipSLiteFWInstallHandler.java
index 1a47e3339..4f971b3ea 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbips/AmazfitBipSLiteFWInstallHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbips/AmazfitBipSLiteFWInstallHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2020-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitbips;
 
 import android.content.Context;
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 e58e37ef7..036f01f0b 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
@@ -1,6 +1,5 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, João Paulo Barraca, Nephiel, Petr Vaněk, TinfoilSubmarine,
-    Zhong Jianxin
+/*  Copyright (C) 2020-2024 Andreas Shimokawa, Daniel Dakhno, Joel Beckmeyer,
+    José Rebelo, Petr Vaněk, TinfoilSubmarine
 
     This file is part of Gadgetbridge.
 
@@ -15,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitbipu;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipu/AmazfitBipUFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipu/AmazfitBipUFWHelper.java
index 644254e82..3d238eb32 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipu/AmazfitBipUFWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipu/AmazfitBipUFWHelper.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2020-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitbipu;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipu/AmazfitBipUFWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipu/AmazfitBipUFWInstallHandler.java
index 21cdb5ee0..2ca966775 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipu/AmazfitBipUFWInstallHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipu/AmazfitBipUFWInstallHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2020-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitbipu;
 
 import android.content.Context;
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 837e7e0db..df0d0ec14 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
@@ -1,6 +1,5 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer, DanialHanif,
-    Daniele Gobbetti, João Paulo Barraca, Nephiel, Petr Vaněk, TinfoilSubmarine,
-    Zhong Jianxin
+/*  Copyright (C) 2021-2024 Andreas Shimokawa, DanialHanif, Daniel Dakhno,
+    José Rebelo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -15,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitbipupro;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipupro/AmazfitBipUProFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipupro/AmazfitBipUProFWHelper.java
index 1554385da..d1b3445c8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipupro/AmazfitBipUProFWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipupro/AmazfitBipUProFWHelper.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer, DanialHanif
+/*  Copyright (C) 2021-2024 DanialHanif
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitbipupro;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipupro/AmazfitBipUProFWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipupro/AmazfitBipUProFWInstallHandler.java
index a2b7667f5..49fe53e2e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipupro/AmazfitBipUProFWInstallHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipupro/AmazfitBipUProFWInstallHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, DanialHanif
+/*  Copyright (C) 2021-2024 DanialHanif
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitbipupro;
 
 import android.content.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 17e9f8146..e8d66c694 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo, Raghd Hamzeh
+/*  Copyright (C) 2023-2024 Daniel Dakhno, José Rebelo, Raghd Hamzeh
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitcheetahpro;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahpro/AmazfitCheetahProFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahpro/AmazfitCheetahProFWHelper.java
index 6c4379d1f..49f003ad3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahpro/AmazfitCheetahProFWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahpro/AmazfitCheetahProFWHelper.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo, Raghd Hamzeh
+/*  Copyright (C) 2023-2024 Raghd Hamzeh
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitcheetahpro;
 
 import android.content.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 5111dac9d..1319bc348 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo, Raghd Hamzeh
+/*  Copyright (C) 2023-2024 Raghd Hamzeh
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitcheetahpro;
 
 import android.content.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 fa6848199..ccd83755b 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitcheetahround;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahround/AmazfitCheetahRoundFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahround/AmazfitCheetahRoundFWHelper.java
index dad1c755e..60fc1fef7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahround/AmazfitCheetahRoundFWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahround/AmazfitCheetahRoundFWHelper.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitcheetahround;
 
 import android.content.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 8650ef6ad..557c8cd94 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitcheetahround;
 
 import android.content.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 3016ffa4b..3bca11321 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitcheetahsquare;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahsquare/AmazfitCheetahSquareFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahsquare/AmazfitCheetahSquareFWHelper.java
index d8ed7660f..bfbc766ac 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahsquare/AmazfitCheetahSquareFWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahsquare/AmazfitCheetahSquareFWHelper.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitcheetahsquare;
 
 import android.content.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 ae49ffb7b..27748cc2b 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitcheetahsquare;
 
 import android.content.Context;
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 dc734ce17..0bab38cab 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
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Daniele Gobbetti, João
-    Paulo Barraca, Matthieu Baerts
+/*  Copyright (C) 2017-2024 Andreas Shimokawa, Daniel Dakhno, Daniele Gobbetti,
+    José Rebelo, Matthieu Baerts, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitcor;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor/AmazfitCorFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor/AmazfitCorFWHelper.java
index 4a4b287b5..e20635e53 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor/AmazfitCorFWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor/AmazfitCorFWHelper.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2017-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitcor;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor/AmazfitCorFWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor/AmazfitCorFWInstallHandler.java
index 3d4dddae4..75a98b818 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor/AmazfitCorFWInstallHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor/AmazfitCorFWInstallHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2017-2024 Andreas Shimokawa, Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitcor;
 
 import android.content.Context;
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 9f1050109..317d2c188 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
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Daniele Gobbetti, João
-    Paulo Barraca, Matthieu Baerts
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Daniel Dakhno, José Rebelo,
+    Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitcor2;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor2/AmazfitCor2FWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor2/AmazfitCor2FWHelper.java
index 9d6b1e102..6c0a969d2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor2/AmazfitCor2FWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor2/AmazfitCor2FWHelper.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2019-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitcor2;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor2/AmazfitCor2FWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor2/AmazfitCor2FWInstallHandler.java
index 3576aa2e2..77a8463be 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor2/AmazfitCor2FWInstallHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcor2/AmazfitCor2FWInstallHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2019-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitcor2;
 
 import android.content.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 6abc0c7a2..38be3b728 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitfalcon;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitfalcon/AmazfitFalconFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitfalcon/AmazfitFalconFWHelper.java
index 0b85874c1..63af00b33 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitfalcon/AmazfitFalconFWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitfalcon/AmazfitFalconFWHelper.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitfalcon;
 
 import android.content.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 3c00e64c8..ae35c230d 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitfalcon;
 
 import android.content.Context;
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 94d61ff8a..ce7e7d79e 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
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Daniele Gobbetti, João
-    Paulo Barraca, José Rebelo, tiparega
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Daniel Dakhno, José Rebelo,
+    Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgtr;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr/AmazfitGTRFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr/AmazfitGTRFWHelper.java
index 3427deed8..8e9a350e8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr/AmazfitGTRFWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr/AmazfitGTRFWHelper.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti
+/*  Copyright (C) 2019-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgtr;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr/AmazfitGTRFWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr/AmazfitGTRFWInstallHandler.java
index 9778eef3d..efa40f8e4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr/AmazfitGTRFWInstallHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr/AmazfitGTRFWInstallHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2019-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgtr;
 
 import android.content.Context;
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 bbbf9b5bd..cf2dd772f 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
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Daniele Gobbetti, João
-    Paulo Barraca, José Rebelo, tiparega
+/*  Copyright (C) 2020-2024 Andreas Shimokawa, Daniel Dakhno, José Rebelo,
+    Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgtr;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr/AmazfitGTRLiteFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr/AmazfitGTRLiteFWHelper.java
index e2a945876..99ad699f2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr/AmazfitGTRLiteFWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr/AmazfitGTRLiteFWHelper.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti
+/*  Copyright (C) 2020-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgtr;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr/AmazfitGTRLiteFWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr/AmazfitGTRLiteFWInstallHandler.java
index 07212da07..82c902a4a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr/AmazfitGTRLiteFWInstallHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr/AmazfitGTRLiteFWInstallHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2020-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgtr;
 
 import android.content.Context;
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 e14dfece9..5e41a5942 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
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Daniele Gobbetti, João
-    Paulo Barraca, José Rebelo, pangwalla, tiparega
+/*  Copyright (C) 2020-2024 Andreas Shimokawa, Daniel Dakhno, José Rebelo,
+    pangwalla, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgtr2;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr2/AmazfitGTR2FWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr2/AmazfitGTR2FWHelper.java
index a5993c928..b8fd0b05c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr2/AmazfitGTR2FWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr2/AmazfitGTR2FWHelper.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, pangwalla
+/*  Copyright (C) 2020-2024 Andreas Shimokawa, pangwalla
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgtr2;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr2/AmazfitGTR2FWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr2/AmazfitGTR2FWInstallHandler.java
index 8e3186464..d85af4623 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr2/AmazfitGTR2FWInstallHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr2/AmazfitGTR2FWInstallHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, pangwalla
+/*  Copyright (C) 2020-2024 pangwalla
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgtr2;
 
 import android.content.Context;
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 b6e680f0d..219656051 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
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Daniele Gobbetti, João
-    Paulo Barraca, José Rebelo, pangwalla, tiparega
+/*  Copyright (C) 2021-2024 Andreas Shimokawa, Daniel Dakhno, José Rebelo,
+    Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgtr2;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr2/AmazfitGTR2eFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr2/AmazfitGTR2eFWHelper.java
index 04a06b8fb..1a5c38f2e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr2/AmazfitGTR2eFWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr2/AmazfitGTR2eFWHelper.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, pangwalla
+/*  Copyright (C) 2021-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgtr2;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr2/AmazfitGTR2eFWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr2/AmazfitGTR2eFWInstallHandler.java
index 45f438dfb..38516e93b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr2/AmazfitGTR2eFWInstallHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr2/AmazfitGTR2eFWInstallHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, pangwalla
+/*  Copyright (C) 2021-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgtr2;
 
 import android.content.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 c8598233a..15ac270d6 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 Daniel Dakhno, José Rebelo, thermatk
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgtr3;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3/AmazfitGTR3FWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3/AmazfitGTR3FWHelper.java
index 991396c68..507c81549 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3/AmazfitGTR3FWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3/AmazfitGTR3FWHelper.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo, thermatk
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgtr3;
 
 import android.content.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 81affbbb5..485f9f333 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo, thermatk
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgtr3;
 
 import android.content.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 0cf410ab1..4ce4d7f4a 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgtr3pro;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3pro/AmazfitGTR3ProFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3pro/AmazfitGTR3ProFWHelper.java
index 8e86dadec..e767e36eb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3pro/AmazfitGTR3ProFWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3pro/AmazfitGTR3ProFWHelper.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgtr3pro;
 
 import android.content.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 fbf8d8d4e..363203b39 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgtr3pro;
 
 import android.content.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 25de3a9cd..d5f9c2e26 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgtr4;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr4/AmazfitGTR4FWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr4/AmazfitGTR4FWHelper.java
index 50a41718f..0c1952524 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr4/AmazfitGTR4FWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr4/AmazfitGTR4FWHelper.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgtr4;
 
 import android.content.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 8dac806d9..5ada0d821 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgtr4;
 
 import android.content.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 88ab8e84e..ee5604c75 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgtrmini;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtrmini/AmazfitGTRMiniFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtrmini/AmazfitGTRMiniFWHelper.java
index 9528939ae..d21a0d645 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtrmini/AmazfitGTRMiniFWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtrmini/AmazfitGTRMiniFWHelper.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgtrmini;
 
 import android.content.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 df36edac7..0c2347cd8 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgtrmini;
 
 import android.content.Context;
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 ffffb2a59..ca1a40629 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
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2019-2021 Andreas Shimokawa, Manuel Ruß
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Daniel Dakhno, José Rebelo,
+    Manuel Ruß, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgts;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts/AmazfitGTSFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts/AmazfitGTSFWHelper.java
index a7fc7b4fa..afaf71fb2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts/AmazfitGTSFWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts/AmazfitGTSFWHelper.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti
+/*  Copyright (C) 2019-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgts;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts/AmazfitGTSFWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts/AmazfitGTSFWInstallHandler.java
index 07239fe11..e093a9d6b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts/AmazfitGTSFWInstallHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts/AmazfitGTSFWInstallHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2019-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgts;
 
 import android.content.Context;
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 13ef19e59..e9907bd65 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
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Daniele Gobbetti, João
-    Paulo Barraca, José Rebelo, pangwalla, tiparega
+/*  Copyright (C) 2020-2024 Andreas Shimokawa, Daniel Dakhno, José Rebelo,
+    Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgts2;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2FWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2FWHelper.java
index 87836ea18..a4d5c899f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2FWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2FWHelper.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, pangwalla
+/*  Copyright (C) 2020-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgts2;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2FWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2FWInstallHandler.java
index d69cdd06c..80c90c161 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2FWInstallHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2FWInstallHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, pangwalla
+/*  Copyright (C) 2020-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgts2;
 
 import android.content.Context;
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 6259e22a5..0b9853e06 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
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Daniele Gobbetti, João
-    Paulo Barraca, José Rebelo, pangwalla, tiparega
+/*  Copyright (C) 2021-2024 Andreas Shimokawa, Daniel Dakhno, José Rebelo,
+    Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgts2;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2MiniFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2MiniFWHelper.java
index eb23c20ef..7a0555644 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2MiniFWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2MiniFWHelper.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, pangwalla
+/*  Copyright (C) 2021-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgts2;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2MiniFWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2MiniFWInstallHandler.java
index 6dfb9e62a..a4ff8ca0a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2MiniFWInstallHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2MiniFWInstallHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, pangwalla
+/*  Copyright (C) 2021-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgts2;
 
 import android.content.Context;
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 5c48f60cf..e557b6fff 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
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Daniele Gobbetti, João
-    Paulo Barraca, José Rebelo, pangwalla, tiparega
+/*  Copyright (C) 2021-2024 Andreas Shimokawa, Daniel Dakhno, José Rebelo,
+    Petr Vaněk, pommes
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgts2;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2eFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2eFWHelper.java
index 2695ce363..68d4dabd0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2eFWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2eFWHelper.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, pangwalla
+/*  Copyright (C) 2021-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgts2;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2eFWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2eFWInstallHandler.java
index 9bcd953c7..2517b4d2f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2eFWInstallHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts2/AmazfitGTS2eFWInstallHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, pangwalla
+/*  Copyright (C) 2021-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgts2;
 
 import android.content.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 b1408b035..5c4d513e8 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 Daniel Dakhno, José Rebelo, sedy89
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgts3;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts3/AmazfitGTS3FWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts3/AmazfitGTS3FWHelper.java
index f37b4eddd..1e3cdcc45 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts3/AmazfitGTS3FWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts3/AmazfitGTS3FWHelper.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo, sedy89
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgts3;
 
 import android.content.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 9ecb2f428..7000005eb 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo, sedy89
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgts3;
 
 import android.content.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 3136e374c..8b06aa980 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgts4;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4/AmazfitGTS4FWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4/AmazfitGTS4FWHelper.java
index 707d3a40c..46e2357ac 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4/AmazfitGTS4FWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4/AmazfitGTS4FWHelper.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgts4;
 
 import android.content.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 c022eb621..73cea35fb 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgts4;
 
 import android.content.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 2c11e2d52..a92a4847d 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgts4mini;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4mini/AmazfitGTS4MiniFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4mini/AmazfitGTS4MiniFWHelper.java
index e18020ac9..321f03998 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4mini/AmazfitGTS4MiniFWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4mini/AmazfitGTS4MiniFWHelper.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgts4mini;
 
 import android.content.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 a2bddbc86..bda959519 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgts4mini;
 
 import android.content.Context;
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 58bd69714..09846501c 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
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2020 Andreas Shimokawa
+/*  Copyright (C) 2021-2024 Andreas Shimokawa, Daniel Dakhno, José Rebelo,
+    NekoBox, Petr Vaněk, xaos
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitneo;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitneo/AmazfitNeoFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitneo/AmazfitNeoFWHelper.java
index b68253557..1e347c344 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitneo/AmazfitNeoFWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitneo/AmazfitNeoFWHelper.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020 Andreas Shimokawa
+/*  Copyright (C) 2021-2024 Andreas Shimokawa, xaos
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitneo;
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitneo/AmazfitNeoFWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitneo/AmazfitNeoFWInstallHandler.java
index 26843f027..790641427 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitneo/AmazfitNeoFWInstallHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitneo/AmazfitNeoFWInstallHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 020 Andreas Shimokawa
+/*  Copyright (C) 2021-2024 Andreas Shimokawa, xaos
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitneo;
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitpop/AmazfitPopCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitpop/AmazfitPopCoordinator.java
index 1d5459640..95828e7e8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitpop/AmazfitPopCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitpop/AmazfitPopCoordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 Andreas Shimokawa
+/*  Copyright (C) 2022-2024 Andreas Shimokawa, Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitpop;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitpop/AmazfitPopFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitpop/AmazfitPopFWHelper.java
index 7fa6bb82d..2f9989b51 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitpop/AmazfitPopFWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitpop/AmazfitPopFWHelper.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 Andreas Shimokawa
+/*  Copyright (C) 2022-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitpop;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitpop/AmazfitPopFWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitpop/AmazfitPopFWInstallHandler.java
index 5473b748e..075571eca 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitpop/AmazfitPopFWInstallHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitpop/AmazfitPopFWInstallHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 Andreas Shimokawa
+/*  Copyright (C) 2022-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitpop;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitpoppro/AmazfitPopProCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitpoppro/AmazfitPopProCoordinator.java
index 48ad8f02c..2da52ad5d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitpoppro/AmazfitPopProCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitpoppro/AmazfitPopProCoordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 Andreas Shimokawa
+/*  Copyright (C) 2022-2024 Andreas Shimokawa, Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitpoppro;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitpoppro/AmazfitPopProFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitpoppro/AmazfitPopProFWHelper.java
index 46497dd88..4b11a293d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitpoppro/AmazfitPopProFWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitpoppro/AmazfitPopProFWHelper.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 Andreas Shimokawa
+/*  Copyright (C) 2022-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitpoppro;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitpoppro/AmazfitPopProFWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitpoppro/AmazfitPopProFWInstallHandler.java
index 494425586..5534f8ccf 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitpoppro/AmazfitPopProFWInstallHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitpoppro/AmazfitPopProFWInstallHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 Andreas Shimokawa
+/*  Copyright (C) 2022-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitpoppro;
 
 import android.content.Context;
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 1cbbc3015..42ff21732 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
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Daniele Gobbetti, Dmytro
-    Bielik, João Paulo Barraca, José Rebelo, tiparega
+/*  Copyright (C) 2020-2024 Andreas Shimokawa, Daniel Dakhno, Dmytro Bielik,
+    José Rebelo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfittrex;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrex/AmazfitTRexFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrex/AmazfitTRexFWHelper.java
index c05dc0b3d..bdb5905eb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrex/AmazfitTRexFWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrex/AmazfitTRexFWHelper.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Dmytro Bielik
+/*  Copyright (C) 2020-2024 Dmytro Bielik
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfittrex;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrex/AmazfitTRexFWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrex/AmazfitTRexFWInstallHandler.java
index 6f20988f1..da2b2a64a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrex/AmazfitTRexFWInstallHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrex/AmazfitTRexFWInstallHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Dmytro Bielik
+/*  Copyright (C) 2020-2024 Dmytro Bielik
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfittrex;
 
 import android.content.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 fc6981046..d49880555 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2023-2024 Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfittrex2;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrex2/AmazfitTRex2FWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrex2/AmazfitTRex2FWHelper.java
index e22e2c6db..cc9a29a02 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrex2/AmazfitTRex2FWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrex2/AmazfitTRex2FWHelper.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfittrex2;
 
 import android.content.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 a293992e7..2007ccde2 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfittrex2;
 
 import android.content.Context;
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 575a4b929..4195f68a3 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
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Daniele Gobbetti, Dmytro
-    Bielik, João Paulo Barraca, José Rebelo, tiparega
+/*  Copyright (C) 2021-2024 Daniel Dakhno, GeekosaurusR3x, José Rebelo,
+    Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfittrexpro;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrexpro/AmazfitTRexProFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrexpro/AmazfitTRexProFWHelper.java
index c9eae79e3..a7cda0671 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrexpro/AmazfitTRexProFWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrexpro/AmazfitTRexProFWHelper.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Dmytro Bielik
+/*  Copyright (C) 2021-2024 GeekosaurusR3x
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfittrexpro;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrexpro/AmazfitTRexProFWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrexpro/AmazfitTRexProFWInstallHandler.java
index 16764b0a3..ebfa2eb55 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrexpro/AmazfitTRexProFWInstallHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrexpro/AmazfitTRexProFWInstallHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Dmytro Bielik
+/*  Copyright (C) 2021-2024 GeekosaurusR3x
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfittrexpro;
 
 import android.content.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 751203345..5318e904b 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfittrexultra;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrexultra/AmazfitTRexUltraFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrexultra/AmazfitTRexUltraFWHelper.java
index 1a3d4396e..ca02e43a0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrexultra/AmazfitTRexUltraFWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrexultra/AmazfitTRexUltraFWHelper.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfittrexultra;
 
 import android.content.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 8c89342a5..bde74c693 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfittrexultra;
 
 import android.content.Context;
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 781a10509..ae2275d12 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Andreas Shimokawa, angelpup, Manuel Ruß
+/*  Copyright (C) 2020-2024 angelpup, Daniel Dakhno, José Rebelo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitvergel;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitvergel/AmazfitVergeLFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitvergel/AmazfitVergeLFWHelper.java
index 5af04a9c0..245baacd6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitvergel/AmazfitVergeLFWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitvergel/AmazfitVergeLFWHelper.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, angelpup, Carsten Pfeiffer,
-    Daniele Gobbetti, Dmytro Bielik
+/*  Copyright (C) 2020-2024 angelpup
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitvergel;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitvergel/AmazfitVergeLFWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitvergel/AmazfitVergeLFWInstallHandler.java
index 176347438..12d3644ea 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitvergel/AmazfitVergeLFWInstallHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitvergel/AmazfitVergeLFWInstallHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, angelpup, Carsten Pfeiffer
+/*  Copyright (C) 2020-2024 angelpup
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitvergel;
 
 import android.content.Context;
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 06b4be53d..46e2e7442 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
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, HardLight, José Rebelo, odavo32nof
+/*  Copyright (C) 2021-2024 Andreas Shimokawa, Daniel Dakhno, José Rebelo,
+    Petr Vaněk, Stefan Bora
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitx;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitx/AmazfitXFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitx/AmazfitXFWHelper.java
index 4addb2122..6bfb9834c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitx/AmazfitXFWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitx/AmazfitXFWHelper.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2021-2024 Stefan Bora
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitx;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitx/AmazfitXFWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitx/AmazfitXFWInstallHandler.java
index dad7a4842..0edc4c9e9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitx/AmazfitXFWInstallHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitx/AmazfitXFWInstallHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2021-2024 Stefan Bora
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitx;
 
 import android.content.Context;
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 75113860b..844dafc59 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
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Dmitry Markin, José Rebelo
+/*  Copyright (C) 2017-2024 Andreas Shimokawa, Daniel Dakhno, Daniele Gobbetti,
+    Dmitry Markin, José Rebelo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.miband2;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2FWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2FWHelper.java
index a4e9b785b..323da7bc8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2FWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2FWHelper.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti
+/*  Copyright (C) 2017-2024 Andreas Shimokawa, Daniele Gobbetti
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.miband2;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2FWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2FWInstallHandler.java
index 7f3074995..647df1d14 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2FWInstallHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband2/MiBand2FWInstallHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Taavi Eomäe
+/*  Copyright (C) 2017-2024 Andreas Shimokawa, Daniel Dakhno, Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.miband2;
 
 import android.content.Context;
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 c29186caf..88803741f 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
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Dmitry Markin, João Paulo Barraca
+/*  Copyright (C) 2017-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniel
+    Dakhno, Daniele Gobbetti, Dmitry Markin, José Rebelo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.miband2;
 
 import android.content.Context;
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 6bc289636..95539c3f8 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
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, José Rebelo, Petr Vaněk
+/*  Copyright (C) 2018-2024 Andreas Shimokawa, Daniel Dakhno, Daniele Gobbetti,
+    José Rebelo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.miband3;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband3/MiBand3FWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband3/MiBand3FWHelper.java
index 02cf7b684..0e0ed4ef2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband3/MiBand3FWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband3/MiBand3FWHelper.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2018-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.miband3;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband3/MiBand3FWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband3/MiBand3FWInstallHandler.java
index 744967d73..66314c2e5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband3/MiBand3FWInstallHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband3/MiBand3FWInstallHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2018-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.miband3;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband3/MiBand3Service.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband3/MiBand3Service.java
index 7870b6b79..b83cec82d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband3/MiBand3Service.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband3/MiBand3Service.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, José Rebelo
+/*  Copyright (C) 2018-2024 Andreas Shimokawa, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.miband3;
 
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 50bbe0530..586c15ee2 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
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, HardLight, José Rebelo
+/*  Copyright (C) 2019-2024 Adam Büchner, Andreas Shimokawa, Daniel Dakhno,
+    HardLight, José Rebelo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.miband4;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband4/MiBand4FWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband4/MiBand4FWHelper.java
index 38259a28e..9ef7839a2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband4/MiBand4FWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband4/MiBand4FWHelper.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2019-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.miband4;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband4/MiBand4FWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband4/MiBand4FWInstallHandler.java
index 5d86e018d..673777fc7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband4/MiBand4FWInstallHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband4/MiBand4FWInstallHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2019-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.miband4;
 
 import android.content.Context;
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 6749bd680..a3cabec92 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
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, HardLight, José Rebelo, odavo32nof
+/*  Copyright (C) 2020-2024 Andreas Shimokawa, Daniel Dakhno, José Rebelo,
+    odavo32nof, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.miband5;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5FWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5FWHelper.java
index 87befafc4..f0f80393c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5FWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5FWHelper.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer, odavo32nof
+/*  Copyright (C) 2020-2024 odavo32nof
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.miband5;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5FWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5FWInstallHandler.java
index 43c6cf073..0e2b12b12 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5FWInstallHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5FWInstallHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, odavo32nof
+/*  Copyright (C) 2020-2024 odavo32nof
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.miband5;
 
 import android.content.Context;
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 643d48cb7..1fb9d57da 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
@@ -1,3 +1,20 @@
+/*  Copyright (C) 2021-2024 Aidan Crane, Andreas Shimokawa, Daniel Dakhno,
+    Daniele Gobbetti, jhey, José Rebelo, Petr Vaněk
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.miband6;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband6/MiBand6FWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband6/MiBand6FWHelper.java
index 3abc0d734..eccc9413c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband6/MiBand6FWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband6/MiBand6FWHelper.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer, odavo32nof
+/*  Copyright (C) 2021-2024 Andreas Shimokawa, jhey
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.miband6;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband6/MiBand6FWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband6/MiBand6FWInstallHandler.java
index 616a50a4f..f9dba4d51 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband6/MiBand6FWInstallHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband6/MiBand6FWInstallHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, odavo32nof
+/*  Copyright (C) 2021-2024 jhey
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.miband6;
 
 import android.content.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 94a8f445b..940648aa3 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.miband7;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband7/MiBand7FWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband7/MiBand7FWHelper.java
index a3dd2ef41..28cbe32d5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband7/MiBand7FWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband7/MiBand7FWHelper.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.miband7;
 
 import android.content.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 db3887bb3..a6357bef7 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.miband7;
 
 import android.content.Context;
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 d450a121c..6fb47ed53 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
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Daniele Gobbetti, João
-    Paulo Barraca, José Rebelo, pangwalla, tiparega, randnv20
+/*  Copyright (C) 2021-2024 Andrew Watkins, Daniel Dakhno, José Rebelo,
+    Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppe;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppe/ZeppEFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppe/ZeppEFWHelper.java
index ca7e7195e..475547ffa 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppe/ZeppEFWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppe/ZeppEFWHelper.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, pangwalla, randnv20
+/*  Copyright (C) 2021-2024 Andreas Shimokawa, Andrew Watkins
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppe;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppe/ZeppEFWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppe/ZeppEFWInstallHandler.java
index ff048ccad..262397ed3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppe/ZeppEFWInstallHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppe/ZeppEFWInstallHandler.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, pangwalla,
-    randnv20
+/*  Copyright (C) 2021-2024 Andrew Watkins
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppe;
 
 import android.content.Context;
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 060ca49e4..7cc131e39 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2023-2024 Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos;
 
 import android.content.Context;
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 367e9b309..c6f673704 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiBRCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiBRCoordinator.java
index c856aab85..b8f786629 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiBRCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiBRCoordinator.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2023 Gaignon Damien
-    Copyright (C) 2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huawei;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiConstants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiConstants.java
index 13e551327..01e5d5ccf 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiConstants.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiConstants.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021-2023 Gaignon Damien
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huawei;
 
 import java.util.UUID;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCoordinator.java
index edeeab8f3..702e055ed 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCoordinator.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2021-2023 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huawei;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCoordinatorSupplier.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCoordinatorSupplier.java
index 3709ed031..c186faf83 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCoordinatorSupplier.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCoordinatorSupplier.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2021-2023 Gaignon Damien
-    Copyright (C) 2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huawei;
 
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCrypto.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCrypto.java
index d22047a5a..5859481ec 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCrypto.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCrypto.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2021-2023 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huawei;
 
 import nodomain.freeyourgadget.gadgetbridge.util.CryptoUtils;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiLECoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiLECoordinator.java
index 2c359fe01..76add4b12 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiLECoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiLECoordinator.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2023 Gaignon Damien
-    Copyright (C) 2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huawei;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiPacket.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiPacket.java
index 3001c6b6d..24d76d81a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiPacket.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiPacket.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2021-2023 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 package nodomain.freeyourgadget.gadgetbridge.devices.huawei;
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSampleProvider.java
index d93e71e96..7c17c1ee5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSampleProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huawei;
 
 import android.content.SharedPreferences;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSettingsCustomizer.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSettingsCustomizer.java
index 1cbff4028..c2f30af77 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSettingsCustomizer.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSettingsCustomizer.java
@@ -1,6 +1,4 @@
-/*  Copyright (C) 2021 José Rebelo
-    Copyright (C) 2022 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -15,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huawei;
 
 import android.content.SharedPreferences;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSpo2SampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSpo2SampleProvider.java
index 4451309d5..824b1e7c7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSpo2SampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSpo2SampleProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huawei;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiTLV.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiTLV.java
index 8c4cb6c6c..8d4aa354d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiTLV.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiTLV.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2021-2022 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 /* TLV parsing and serialisation thanks to https://github.com/yihleego/tlv */
 package nodomain.freeyourgadget.gadgetbridge.devices.huawei;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiUtil.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiUtil.java
index cf75921c7..1b07c4274 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiUtil.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiUtil.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Gaignon Damien
+/*  Copyright (C) 2024 Damien Gaignon, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huawei;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband3/HonorBand3Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband3/HonorBand3Coordinator.java
index b960f3f4e..c2ab21bc5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband3/HonorBand3Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband3/HonorBand3Coordinator.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2021-2023 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huawei.honorband3;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband4/HonorBand4Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband4/HonorBand4Coordinator.java
index 3066cceb3..8d4517df6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband4/HonorBand4Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband4/HonorBand4Coordinator.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2021-2023 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huawei.honorband4;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband5/HonorBand5Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband5/HonorBand5Coordinator.java
index 179788cc1..b983875cd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband5/HonorBand5Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband5/HonorBand5Coordinator.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2021-2023 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huawei.honorband5;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband6/HonorBand6Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband6/HonorBand6Coordinator.java
index dcb89dcb2..3e32963cf 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband6/HonorBand6Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband6/HonorBand6Coordinator.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2021-2023 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huawei.honorband6;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband7/HonorBand7Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband7/HonorBand7Coordinator.java
index df75023c1..dc14d947a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband7/HonorBand7Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband7/HonorBand7Coordinator.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2021-2023 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huawei.honorband7;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband4pro/HuaweiBand4ProCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband4pro/HuaweiBand4ProCoordinator.java
index dfb4ddb2e..d09a506d9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband4pro/HuaweiBand4ProCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband4pro/HuaweiBand4ProCoordinator.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2021-2023 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huawei.huaweiband4pro;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband6/HuaweiBand6Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband6/HuaweiBand6Coordinator.java
index ff0f60943..efc37af6b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband6/HuaweiBand6Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband6/HuaweiBand6Coordinator.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2021-2023 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huawei.huaweiband6;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband7/HuaweiBand7Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband7/HuaweiBand7Coordinator.java
index cd63efb88..270e2b3fa 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband7/HuaweiBand7Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband7/HuaweiBand7Coordinator.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2021-2023 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huawei.huaweiband7;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband8/HuaweiBand8Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband8/HuaweiBand8Coordinator.java
index 7a7214c7d..9464b92aa 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband8/HuaweiBand8Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband8/HuaweiBand8Coordinator.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2023 Gaignon Damien
-    Copyright (C) 2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huawei.huaweiband8;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweibandaw70/HuaweiBandAw70Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweibandaw70/HuaweiBandAw70Coordinator.java
index fa973cea4..8ffe335a2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweibandaw70/HuaweiBandAw70Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweibandaw70/HuaweiBandAw70Coordinator.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2021-2023 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huawei.huaweibandaw70;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweitalkbandb6/HuaweiTalkBandB6Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweitalkbandb6/HuaweiTalkBandB6Coordinator.java
index 98ecd7fa9..fac70d314 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweitalkbandb6/HuaweiTalkBandB6Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweitalkbandb6/HuaweiTalkBandB6Coordinator.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2021-2023 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huawei.huaweitalkbandb6;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt/HuaweiWatchGTCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt/HuaweiWatchGTCoordinator.java
index 3aebcdef8..fb2aec26b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt/HuaweiWatchGTCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt/HuaweiWatchGTCoordinator.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2021-2023 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huawei.huaweiwatchgt;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt2/HuaweiWatchGT2Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt2/HuaweiWatchGT2Coordinator.java
index 01282f6af..dcbe595e4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt2/HuaweiWatchGT2Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt2/HuaweiWatchGT2Coordinator.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2021-2023 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huawei.huaweiwatchgt2;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt2e/HuaweiWatchGT2eCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt2e/HuaweiWatchGT2eCoordinator.java
index e1b03ed39..1dec4c737 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt2e/HuaweiWatchGT2eCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt2e/HuaweiWatchGT2eCoordinator.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2021-2023 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huawei.huaweiwatchgt2e;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt3/HuaweiWatchGT3Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt3/HuaweiWatchGT3Coordinator.java
index 2c2edb9e8..455d1a146 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt3/HuaweiWatchGT3Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt3/HuaweiWatchGT3Coordinator.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2023 Gaignon Damien
-    Copyright (C) 2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huawei.huaweiwatchgt3;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/AccountRelated.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/AccountRelated.java
index 7462e7801..141f4023f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/AccountRelated.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/AccountRelated.java
@@ -1,4 +1,4 @@
-/*	Copyright (C) 2023 Gaignon Damien
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Alarms.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Alarms.java
index da90532f4..94995b049 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Alarms.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Alarms.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2022 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets;
 
 import java.util.ArrayList;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Calls.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Calls.java
index d513902cd..2a0e37117 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Calls.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Calls.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2022 Gaignon Damien
-    Copyright (C) 2022 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DeviceConfig.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DeviceConfig.java
index 1f0e09613..5b4cdfaca 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DeviceConfig.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DeviceConfig.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2021-2023 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DisconnectNotification.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DisconnectNotification.java
index 8ebcbcaa4..0f6d9f6ba 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DisconnectNotification.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DisconnectNotification.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets;
 
 /*
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/FindPhone.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/FindPhone.java
index 701b2bd36..ce510fa23 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/FindPhone.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/FindPhone.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022-2023 Martin.JM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/FitnessData.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/FitnessData.java
index e0dc297b2..0d64c8065 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/FitnessData.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/FitnessData.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2022 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets;
 
 import java.util.ArrayList;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/LocaleConfig.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/LocaleConfig.java
index f625ebbbd..7a1e255ba 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/LocaleConfig.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/LocaleConfig.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2021-2022 Gaignon Damien
-    Copyright (C) 2022 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Menstrual.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Menstrual.java
index 2d74e383e..a1210e3fd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Menstrual.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Menstrual.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 Gaignon Damien
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/MusicControl.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/MusicControl.java
index 81ae1b56d..358e52d7c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/MusicControl.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/MusicControl.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2022 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Notifications.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Notifications.java
index 2f9e00711..b44a10a20 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Notifications.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Notifications.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2022 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/WorkMode.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/WorkMode.java
index 8469996cc..c46c37550 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/WorkMode.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/WorkMode.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2021-2022 Gaignon Damien
-    Copyright (C) 2022 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Workout.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Workout.java
index e95b6d02a..3be3928cb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Workout.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Workout.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2022 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/id115/ID115Constants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/id115/ID115Constants.java
index 22649bea3..ed546f6fe 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/id115/ID115Constants.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/id115/ID115Constants.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2018-2021 Andreas Shimokawa, Vadim Kaushan
+/*  Copyright (C) 2018-2024 Andreas Shimokawa, Vadim Kaushan
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.id115;
 
 import java.util.UUID;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/id115/ID115Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/id115/ID115Coordinator.java
index 0ef30d266..6c0c5017a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/id115/ID115Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/id115/ID115Coordinator.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Vadim Kaushan
+/*  Copyright (C) 2018-2024 Andreas Shimokawa, Damien Gaignon, Daniel Dakhno,
+    Daniele Gobbetti, José Rebelo, Petr Vaněk, Vadim Kaushan
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.id115;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/id115/ID115SampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/id115/ID115SampleProvider.java
index 70f7a607f..ef26097d0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/id115/ID115SampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/id115/ID115SampleProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2018-2021 Daniele Gobbetti, Vadim Kaushan
+/*  Copyright (C) 2018-2024 Daniele Gobbetti, Vadim Kaushan
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.id115;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/itag/ITagConstants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/itag/ITagConstants.java
index a51927ff8..a63749e97 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/itag/ITagConstants.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/itag/ITagConstants.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Taavi Eomäe
+/*  Copyright (C) 2020-2024 Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.itag;
 
 import java.util.UUID;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/itag/ITagCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/itag/ITagCoordinator.java
index 166e74603..e3f0df340 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/itag/ITagCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/itag/ITagCoordinator.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, José Rebelo, Taavi Eomäe
+/*  Copyright (C) 2020-2024 Andreas Shimokawa, Damien Gaignon, Daniel Dakhno,
+    José Rebelo, Petr Vaněk, Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.itag;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/jyou/BFH16Constants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/jyou/BFH16Constants.java
index a4a010a62..a86fd1009 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/jyou/BFH16Constants.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/jyou/BFH16Constants.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Sophanimus
+/*  Copyright (C) 2019-2024 Sophanimus
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 package nodomain.freeyourgadget.gadgetbridge.devices.jyou;
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/jyou/BFH16DeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/jyou/BFH16DeviceCoordinator.java
index f175928b4..d56a8ab7e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/jyou/BFH16DeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/jyou/BFH16DeviceCoordinator.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2019-2021 Andreas Shimokawa, Sophanimus
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Damien Gaignon, Daniel Dakhno,
+    José Rebelo, Petr Vaněk, Sophanimus
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 package nodomain.freeyourgadget.gadgetbridge.devices.jyou;
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/jyou/JYouConstants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/jyou/JYouConstants.java
index d688701d9..315e36a0a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/jyou/JYouConstants.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/jyou/JYouConstants.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Pavel Elagin, Sami Alaoui
+/*  Copyright (C) 2017-2024 Da Pa, Pavel Elagin, Sami Alaoui
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.jyou;
 
 import java.util.UUID;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/jyou/JYouSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/jyou/JYouSampleProvider.java
index 73c65c8ac..96aa434d6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/jyou/JYouSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/jyou/JYouSampleProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2018-2021 Pavel Elagin
+/*  Copyright (C) 2018-2024 Da Pa, Pavel Elagin
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.jyou;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/jyou/TeclastH30/TeclastH30Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/jyou/TeclastH30/TeclastH30Coordinator.java
index eab3455a7..85dd26a45 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/jyou/TeclastH30/TeclastH30Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/jyou/TeclastH30/TeclastH30Coordinator.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Dougal19, José Rebelo, Pavel Elagin, protomors, Sami Alaoui
+/*  Copyright (C) 2018-2024 Andreas Shimokawa, Damien Gaignon, Daniel Dakhno,
+    Da Pa, José Rebelo, Pavel Elagin, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.jyou.TeclastH30;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/jyou/y5/Y5Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/jyou/y5/Y5Coordinator.java
index 808e199eb..a76e9b598 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/jyou/y5/Y5Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/jyou/y5/Y5Coordinator.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, José Rebelo, ladbsoft, Pavel Elagin
+/*  Copyright (C) 2018-2024 Damien Gaignon, Daniel Dakhno, Da Pa, José
+    Rebelo, Pavel Elagin, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.jyou.y5;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/BohemicSmartBraceletDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/BohemicSmartBraceletDeviceCoordinator.java
index 8762302b5..fd704476c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/BohemicSmartBraceletDeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/BohemicSmartBraceletDeviceCoordinator.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, José Rebelo, Petr Kadlec, protomors, Yukai Li
+/*  Copyright (C) 2023-2024 Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.lefun;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/LefunConstants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/LefunConstants.java
index 3e205f844..50c4f6918 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/LefunConstants.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/LefunConstants.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.lefun;
 
 import java.util.UUID;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/LefunDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/LefunDeviceCoordinator.java
index e585308e2..a5ce12e76 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/LefunDeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/LefunDeviceCoordinator.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, José Rebelo, Petr Kadlec, protomors, Yukai Li
+/*  Copyright (C) 2020-2024 Damien Gaignon, Daniel Dakhno, José Rebelo,
+    Petr Vaněk, Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.lefun;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/LefunFeatureSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/LefunFeatureSupport.java
index e98986557..06ca0e7e8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/LefunFeatureSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/LefunFeatureSupport.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.lefun;
 
 /**
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/LefunSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/LefunSampleProvider.java
index 318af8f96..984ac3f02 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/LefunSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/LefunSampleProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.lefun;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/AlarmCommand.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/AlarmCommand.java
index 89b881d39..e9387e7ae 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/AlarmCommand.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/AlarmCommand.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.lefun.commands;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/BaseCommand.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/BaseCommand.java
index 18bcbb859..3bb2fed7f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/BaseCommand.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/BaseCommand.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.lefun.commands;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/Cmd22Command.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/Cmd22Command.java
index 40e2b2353..ff399fe82 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/Cmd22Command.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/Cmd22Command.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.lefun.commands;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/Cmd25Command.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/Cmd25Command.java
index b9a775278..abd2b8bc8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/Cmd25Command.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/Cmd25Command.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.lefun.commands;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/FeaturesCommand.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/FeaturesCommand.java
index 55b1e4dba..b6901b0f3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/FeaturesCommand.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/FeaturesCommand.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.lefun.commands;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/FindDeviceCommand.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/FindDeviceCommand.java
index 1d4c6bca5..2ccec76fe 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/FindDeviceCommand.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/FindDeviceCommand.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.lefun.commands;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/FindPhoneCommand.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/FindPhoneCommand.java
index 33211ded9..71c6aff62 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/FindPhoneCommand.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/FindPhoneCommand.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.lefun.commands;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/GetActivityDataCommand.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/GetActivityDataCommand.java
index a65f85c55..b28d78a52 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/GetActivityDataCommand.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/GetActivityDataCommand.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.lefun.commands;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/GetBatteryLevelCommand.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/GetBatteryLevelCommand.java
index 841a6c118..0612ace03 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/GetBatteryLevelCommand.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/GetBatteryLevelCommand.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.lefun.commands;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/GetFirmwareInfoCommand.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/GetFirmwareInfoCommand.java
index 855e99e99..a1564661d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/GetFirmwareInfoCommand.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/GetFirmwareInfoCommand.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.lefun.commands;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/GetPpgDataCommand.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/GetPpgDataCommand.java
index 83dbea228..6dbca283a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/GetPpgDataCommand.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/GetPpgDataCommand.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.lefun.commands;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/GetSleepDataCommand.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/GetSleepDataCommand.java
index 6b4e533bf..dba937f2b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/GetSleepDataCommand.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/GetSleepDataCommand.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.lefun.commands;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/GetSleepTimeCommand.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/GetSleepTimeCommand.java
index 89c035599..fe4ae4e79 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/GetSleepTimeCommand.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/GetSleepTimeCommand.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.lefun.commands;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/GetStepsDataCommand.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/GetStepsDataCommand.java
index 535490efc..3010fb7ff 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/GetStepsDataCommand.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/GetStepsDataCommand.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.lefun.commands;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/HydrationReminderIntervalCommand.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/HydrationReminderIntervalCommand.java
index fcbc4f16a..119402062 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/HydrationReminderIntervalCommand.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/HydrationReminderIntervalCommand.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.lefun.commands;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/NotificationCommand.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/NotificationCommand.java
index 24872d193..04facc7fb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/NotificationCommand.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/NotificationCommand.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.lefun.commands;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/PpgResultCommand.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/PpgResultCommand.java
index cb6776634..ffdb6b0cc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/PpgResultCommand.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/PpgResultCommand.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.lefun.commands;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/ProfileCommand.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/ProfileCommand.java
index 2c6a215f9..edf59cfec 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/ProfileCommand.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/ProfileCommand.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.lefun.commands;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/RemoteCameraTriggeredCommand.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/RemoteCameraTriggeredCommand.java
index cafd00861..5c0528b74 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/RemoteCameraTriggeredCommand.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/RemoteCameraTriggeredCommand.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.lefun.commands;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/RequestBondingCommand.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/RequestBondingCommand.java
index 523f68780..671a65d10 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/RequestBondingCommand.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/RequestBondingCommand.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.lefun.commands;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/SedentaryReminderIntervalCommand.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/SedentaryReminderIntervalCommand.java
index 799f9d2df..c35931149 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/SedentaryReminderIntervalCommand.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/SedentaryReminderIntervalCommand.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.lefun.commands;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/SetLanguageCommand.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/SetLanguageCommand.java
index dd4f58f74..79ed798d1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/SetLanguageCommand.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/SetLanguageCommand.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.lefun.commands;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/SetRemoteCameraCommand.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/SetRemoteCameraCommand.java
index 0def00b8d..91fab2c55 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/SetRemoteCameraCommand.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/SetRemoteCameraCommand.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.lefun.commands;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/SettingsCommand.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/SettingsCommand.java
index d08a0de67..04beba404 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/SettingsCommand.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/SettingsCommand.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.lefun.commands;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/StartPpgSensingCommand.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/StartPpgSensingCommand.java
index 48ab55463..6b021615f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/StartPpgSensingCommand.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/StartPpgSensingCommand.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.lefun.commands;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/TimeCommand.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/TimeCommand.java
index 7ce6130d6..1083ce81a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/TimeCommand.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/TimeCommand.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.lefun.commands;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/UiPagesCommand.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/UiPagesCommand.java
index c72df762f..0ff5af67d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/UiPagesCommand.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lefun/commands/UiPagesCommand.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.lefun.commands;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lenovo/DataType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lenovo/DataType.java
index afbd1b5f1..b94f8eb79 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lenovo/DataType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lenovo/DataType.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 mamucho, mkusnierz
+/*  Copyright (C) 2019-2024 mamucho, mkusnierz
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.lenovo;
 
 public enum DataType {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lenovo/LenovoWatchCalibrationActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lenovo/LenovoWatchCalibrationActivity.java
index 5410b3fd7..ae913c1c8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lenovo/LenovoWatchCalibrationActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lenovo/LenovoWatchCalibrationActivity.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2018-2021 Daniele Gobbetti, mamucho, maxirnilian, mkusnierz
+/*  Copyright (C) 2019-2024 mamucho, mkusnierz
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.lenovo;
 
 import android.content.Intent;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lenovo/LenovoWatchConstants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lenovo/LenovoWatchConstants.java
index 5e5d76475..ecf8c39e9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lenovo/LenovoWatchConstants.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lenovo/LenovoWatchConstants.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2018-2021 maxirnilian, mkusnierz
+/*  Copyright (C) 2019-2024 mkusnierz
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.lenovo;
 
 public class LenovoWatchConstants {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lenovo/LenovoWatchPairingActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lenovo/LenovoWatchPairingActivity.java
index 4476eba83..c845d92d9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lenovo/LenovoWatchPairingActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lenovo/LenovoWatchPairingActivity.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2018-2021 Daniele Gobbetti, mamucho, maxirnilian, mkusnierz,
+/*  Copyright (C) 2019-2024 Andreas Böhler, José Rebelo, mamucho, mkusnierz,
     Taavi Eomäe
 
     This file is part of Gadgetbridge.
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.lenovo;
 
 import static nodomain.freeyourgadget.gadgetbridge.util.BondingUtil.STATE_DEVICE_CANDIDATE;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lenovo/watchxplus/WatchXPlusConstants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lenovo/watchxplus/WatchXPlusConstants.java
index a05b8e7e0..87e71f8e4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lenovo/watchxplus/WatchXPlusConstants.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lenovo/watchxplus/WatchXPlusConstants.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 mamucho, mkusnierz
+/*  Copyright (C) 2019-2024 Damien Gaignon, mamucho, mkusnierz
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.lenovo.watchxplus;
 
 import java.util.UUID;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lenovo/watchxplus/WatchXPlusDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lenovo/watchxplus/WatchXPlusDeviceCoordinator.java
index e58d80aad..4f9ace4f1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lenovo/watchxplus/WatchXPlusDeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lenovo/watchxplus/WatchXPlusDeviceCoordinator.java
@@ -1,6 +1,5 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Jean-François Greffier, ksiwczynski, mamucho, mkusnierz, Vadim
-    Kaushan
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Damien Gaignon, Daniel Dakhno,
+    José Rebelo, mamucho, mkusnierz, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -15,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.lenovo.watchxplus;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lenovo/watchxplus/WatchXPlusSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lenovo/watchxplus/WatchXPlusSampleProvider.java
index 07b06acd2..469b82c4e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lenovo/watchxplus/WatchXPlusSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lenovo/watchxplus/WatchXPlusSampleProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 mamucho, mkusnierz
+/*  Copyright (C) 2019-2024 mamucho, mkusnierz
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.lenovo.watchxplus;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/liveview/LiveviewConstants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/liveview/LiveviewConstants.java
index 609b95e62..005583485 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/liveview/LiveviewConstants.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/liveview/LiveviewConstants.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Daniele Gobbetti
+/*  Copyright (C) 2016-2024 Daniele Gobbetti
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.liveview;
 //Changed by Renze: Fixed brightness constants
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/liveview/LiveviewCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/liveview/LiveviewCoordinator.java
index f57461185..119d41b23 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/liveview/LiveviewCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/liveview/LiveviewCoordinator.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, José Rebelo
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Carsten Pfeiffer, Damien
+    Gaignon, Daniel Dakhno, Daniele Gobbetti, José Rebelo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.liveview;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/makibeshr3/MakibesHR3Constants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/makibeshr3/MakibesHR3Constants.java
index de2838238..83b793fcf 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/makibeshr3/MakibesHR3Constants.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/makibeshr3/MakibesHR3Constants.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Andreas Shimokawa, Cre3per
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Cre3per, Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.makibeshr3;
 
 import java.util.UUID;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/makibeshr3/MakibesHR3Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/makibeshr3/MakibesHR3Coordinator.java
index ce1a890fc..9cb7fabf4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/makibeshr3/MakibesHR3Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/makibeshr3/MakibesHR3Coordinator.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Cre3per,
-    Daniele Gobbetti, José Rebelo, Petr Kadlec, protomors
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Cre3per, Damien Gaignon,
+    Daniel Dakhno, José Rebelo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.makibeshr3;
 
 import java.text.DateFormat;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/makibeshr3/MakibesHR3SampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/makibeshr3/MakibesHR3SampleProvider.java
index 69d85a1a0..29e1c436d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/makibeshr3/MakibesHR3SampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/makibeshr3/MakibesHR3SampleProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2018-2021 Cre3per, Daniele Gobbetti, Sebastian Kranz
+/*  Copyright (C) 2019-2024 Cre3per
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.makibeshr3;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/AbstractMiBandFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/AbstractMiBandFWHelper.java
index fdd5f94cf..f01e4b30d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/AbstractMiBandFWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/AbstractMiBandFWHelper.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Taavi Eomäe
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+    Gobbetti, José Rebelo, Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.miband;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/AbstractMiBandFWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/AbstractMiBandFWInstallHandler.java
index 92ae6fca4..d27b4f8dd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/AbstractMiBandFWInstallHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/AbstractMiBandFWInstallHandler.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniel
+    Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.miband;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/AbstractMiBandSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/AbstractMiBandSampleProvider.java
index af27e1d1d..896472cbb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/AbstractMiBandSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/AbstractMiBandSampleProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
     Gobbetti
 
     This file is part of Gadgetbridge.
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.miband;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/DateTimeDisplay.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/DateTimeDisplay.java
index 47ad0e0bd..9e34fdd99 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/DateTimeDisplay.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/DateTimeDisplay.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Carsten Pfeiffer
+/*  Copyright (C) 2016-2024 Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.miband;
 
 public enum DateTimeDisplay {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/DoNotDisturb.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/DoNotDisturb.java
index e1c39b25d..ebd8bc942 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/DoNotDisturb.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/DoNotDisturb.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 José Rebelo
+/*  Copyright (C) 2017-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.miband;
 
 public enum DoNotDisturb {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBand2SampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBand2SampleProvider.java
index 46f809bee..b2ba40d16 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBand2SampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBand2SampleProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
     Gobbetti
 
     This file is part of Gadgetbridge.
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.miband;
 
 import java.util.List;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandConst.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandConst.java
index e605f28fa..74bed437a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandConst.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandConst.java
@@ -1,5 +1,6 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Christian
-    Fischer, Daniele Gobbetti, José Rebelo, Michal Novotny, Szymon Tomasz Stefanek
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Christian
+    Fischer, Damien Gaignon, Daniele Gobbetti, José Rebelo, Michal Novotny,
+    Szymon Tomasz Stefanek
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +15,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.miband;
 
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandCoordinator.java
index f8147cb45..4b39e900f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandCoordinator.java
@@ -1,5 +1,6 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Christian
-    Fischer, Daniele Gobbetti, José Rebelo, Szymon Tomasz Stefanek
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Christian
+    Fischer, Damien Gaignon, Daniel Dakhno, Daniele Gobbetti, José Rebelo,
+    Petr Vaněk, Szymon Tomasz Stefanek
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +15,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.miband;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandDateConverter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandDateConverter.java
index bc44fa680..b1b7828d4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandDateConverter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandDateConverter.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
     Gobbetti, Szymon Tomasz Stefanek
 
     This file is part of Gadgetbridge.
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.miband;
 
 import java.util.Calendar;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandFWHelper.java
index 828fd97c3..1108c4cb5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandFWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandFWHelper.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
     Gobbetti, Taavi Eomäe
 
     This file is part of Gadgetbridge.
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.miband;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandFWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandFWInstallHandler.java
index 68cab80f4..c2196cc46 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandFWInstallHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandFWInstallHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.miband;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPairingActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPairingActivity.java
index 0f3dab468..644e26403 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPairingActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPairingActivity.java
@@ -1,5 +1,6 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Taavi Eomäe
+/*  Copyright (C) 2015-2024 Andreas Böhler, Andreas Shimokawa, Carsten
+    Pfeiffer, Daniel Dakhno, Daniele Gobbetti, José Rebelo, Petr Vaněk,
+    Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +15,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.miband;
 
 import static nodomain.freeyourgadget.gadgetbridge.util.BondingUtil.STATE_DEVICE_CANDIDATE;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPreferencesActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPreferencesActivity.java
index 2825e26ca..72690ce8e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPreferencesActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPreferencesActivity.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2015-2023 Andreas Shimokawa, Carsten Pfeiffer, Christian
-    Fischer, Daniele Gobbetti, José Rebelo, Szymon Tomasz Stefanek
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Christian
+    Fischer, Damien Gaignon, Daniele Gobbetti, José Rebelo, Szymon Tomasz Stefanek
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.miband;
 
 import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_MIBAND_ADDRESS;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandSampleProvider.java
index 1ef90ac0e..93afce049 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandSampleProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
     Gobbetti
 
     This file is part of Gadgetbridge.
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.miband;
 
 import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandService.java
index 974c3a705..6f0f6a5b8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandService.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
     Gobbetti, Kasha
 
     This file is part of Gadgetbridge.
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.miband;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/UserInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/UserInfo.java
index 2e995db42..e6d8cc8c3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/UserInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/UserInfo.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2015-2021 0nse, Andreas Shimokawa, Carsten Pfeiffer,
-    Daniele Gobbetti, Sergey Trofimov
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+    Gobbetti, Sergey Trofimov
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.miband;
 
 import java.util.Arrays;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/VibrationProfile.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/VibrationProfile.java
index 70cbd9d3c..26428cb5c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/VibrationProfile.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/VibrationProfile.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Uwe Hermann
+/*  Copyright (C) 2015-2024 Carsten Pfeiffer, José Rebelo, Uwe Hermann
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.miband;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/mijia_lywsd/AbstractMijiaLywsdCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/mijia_lywsd/AbstractMijiaLywsdCoordinator.java
index 59bc4d0a1..448ad590a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/mijia_lywsd/AbstractMijiaLywsdCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/mijia_lywsd/AbstractMijiaLywsdCoordinator.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.mijia_lywsd;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/mijia_lywsd/MijiaLywsd02Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/mijia_lywsd/MijiaLywsd02Coordinator.java
index 36aabf498..4e5ead271 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/mijia_lywsd/MijiaLywsd02Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/mijia_lywsd/MijiaLywsd02Coordinator.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2016-2023 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.mijia_lywsd;
 
 import java.util.regex.Pattern;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/mijia_lywsd/MijiaLywsd03Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/mijia_lywsd/MijiaLywsd03Coordinator.java
index 8b6faf0db..8bcbb156b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/mijia_lywsd/MijiaLywsd03Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/mijia_lywsd/MijiaLywsd03Coordinator.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2016-2023 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.mijia_lywsd;
 
 import java.util.regex.Pattern;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miscale2/MiScale2DeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miscale2/MiScale2DeviceCoordinator.java
index 922daba70..5484baaa2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miscale2/MiScale2DeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miscale2/MiScale2DeviceCoordinator.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Jean-François Greffier, Vadim Kaushan
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Damien Gaignon, Daniel Dakhno,
+    Jean-François Greffier, José Rebelo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.miscale2;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/no1f1/No1F1Constants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/no1f1/No1F1Constants.java
index 56866ed89..dcb0ca386 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/no1f1/No1F1Constants.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/no1f1/No1F1Constants.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 protomors
+/*  Copyright (C) 2017-2024 protomors
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.no1f1;
 
 import java.util.UUID;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/no1f1/No1F1Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/no1f1/No1F1Coordinator.java
index 119fb57d5..0f7e9e09d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/no1f1/No1F1Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/no1f1/No1F1Coordinator.java
@@ -1,5 +1,6 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, José Rebelo, Petr Kadlec, protomors
+/*  Copyright (C) 2017-2024 Andreas Shimokawa, Carsten Pfeiffer, Damien
+    Gaignon, Daniel Dakhno, Daniele Gobbetti, José Rebelo, Petr Kadlec, Petr
+    Vaněk, protomors
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +15,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.no1f1;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/no1f1/No1F1SampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/no1f1/No1F1SampleProvider.java
index ed8747288..6e6ccaa96 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/no1f1/No1F1SampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/no1f1/No1F1SampleProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Daniele Gobbetti, protomors
+/*  Copyright (C) 2017-2024 Daniele Gobbetti, protomors
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.no1f1;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/AbstractEarCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/AbstractEarCoordinator.java
index 8da21877c..129f0403a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/AbstractEarCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/AbstractEarCoordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 Daniele Gobbetti, José Rebelo
+/*  Copyright (C) 2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.nothing;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/Ear1Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/Ear1Coordinator.java
index 0c688a262..6707d891c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/Ear1Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/Ear1Coordinator.java
@@ -1,3 +1,20 @@
+/*  Copyright (C) 2021-2024 Damien Gaignon, Daniel Dakhno, Daniele Gobbetti,
+    José Rebelo, Petr Vaněk
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.nothing;
 
 import java.util.regex.Pattern;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/Ear2Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/Ear2Coordinator.java
index 33c074700..e5b1a0e60 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/Ear2Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/Ear2Coordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 Daniele Gobbetti, José Rebelo
+/*  Copyright (C) 2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.nothing;
 
 import java.util.regex.Pattern;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/EarSettingsCustomizer.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/EarSettingsCustomizer.java
index 5c0277953..3e898c4ab 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/EarSettingsCustomizer.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/EarSettingsCustomizer.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.nothing;
 
 import android.os.Parcel;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/EarStickCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/EarStickCoordinator.java
index 11c718198..1200ec404 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/EarStickCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/EarStickCoordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 Daniele Gobbetti, José Rebelo
+/*  Copyright (C) 2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.nothing;
 
 import java.util.regex.Pattern;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nut/NutConstants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nut/NutConstants.java
index 265b0d49c..5f0d4b5ad 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nut/NutConstants.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nut/NutConstants.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Taavi Eomäe
+/*  Copyright (C) 2020-2024 Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.nut;
 
 import java.util.UUID;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nut/NutCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nut/NutCoordinator.java
index 9b42fff76..56dc89b7d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nut/NutCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nut/NutCoordinator.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, José Rebelo, Taavi Eomäe
+/*  Copyright (C) 2020-2024 Andreas Shimokawa, Damien Gaignon, Daniel Dakhno,
+    José Rebelo, Petr Vaněk, Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.nut;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nut/NutKey.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nut/NutKey.java
index e45dfcb1e..b1e8b1b13 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nut/NutKey.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nut/NutKey.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Taavi Eomäe
+/*  Copyright (C) 2020-2024 Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.nut;
 
 import org.apache.commons.lang3.ArrayUtils;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PBWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PBWInstallHandler.java
index 5ddebe95a..9fa65d9d3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PBWInstallHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PBWInstallHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
     Gobbetti, Uwe Hermann
 
     This file is part of Gadgetbridge.
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.pebble;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PBWReader.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PBWReader.java
index be456a734..d4f5cdc20 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PBWReader.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PBWReader.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
     Gobbetti, Uwe Hermann
 
     This file is part of Gadgetbridge.
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.pebble;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleColor.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleColor.java
index ebc630f03..4e9fa9a96 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleColor.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleColor.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa
+/*  Copyright (C) 2015-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.pebble;
 
 public final class PebbleColor {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleCoordinator.java
index cf72a164d..7884e0e7c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleCoordinator.java
@@ -1,5 +1,6 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, José Rebelo, Matthieu Baerts
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Arjan Schrijver, Carsten
+    Pfeiffer, Damien Gaignon, Daniel Dakhno, Daniele Gobbetti, José Rebelo,
+    Matthieu Baerts, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +15,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.pebble;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleHealthSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleHealthSampleProvider.java
index 482d30e1e..aa8acda3a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleHealthSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleHealthSampleProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
     Gobbetti
 
     This file is part of Gadgetbridge.
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.pebble;
 
 import java.util.Collections;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleIconID.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleIconID.java
index a5896e418..59ff076ed 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleIconID.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleIconID.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa
+/*  Copyright (C) 2015-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.pebble;
 
 public final class PebbleIconID {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleInstallable.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleInstallable.java
index c71144ad1..3c8a20480 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleInstallable.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleInstallable.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2015-2024 Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.pebble;
 
 public class PebbleInstallable {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleMisfitSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleMisfitSampleProvider.java
index 6f529778f..2f5a3f68e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleMisfitSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleMisfitSampleProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2016-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.pebble;
 
 import de.greenrobot.dao.AbstractDao;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleMorpheuzSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleMorpheuzSampleProvider.java
index 0298b1cf6..406245bec 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleMorpheuzSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleMorpheuzSampleProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2016-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.pebble;
 
 import de.greenrobot.dao.AbstractDao;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebblePairingActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebblePairingActivity.java
index a701fe041..ced9b284e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebblePairingActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebblePairingActivity.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Taavi Eomäe
+/*  Copyright (C) 2016-2024 Andreas Böhler, Andreas Shimokawa, Carsten
+    Pfeiffer, Daniele Gobbetti, José Rebelo, Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.pebble;
 
 import static nodomain.freeyourgadget.gadgetbridge.util.BondingUtil.STATE_DEVICE_CANDIDATE;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleSettingsActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleSettingsActivity.java
index f07f0b827..06a774f32 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleSettingsActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleSettingsActivity.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo,
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.pebble;
 
 import android.content.Intent;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/STM32CRC.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/STM32CRC.java
index 8d81175ac..b40c2f088 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/STM32CRC.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/STM32CRC.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.pebble;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/InfiniTimeDFUPackage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/InfiniTimeDFUPackage.java
index 9b47e2c90..6250ef76c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/InfiniTimeDFUPackage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/InfiniTimeDFUPackage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Taavi Eomäe
+/*  Copyright (C) 2021-2024 Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/PineTimeActivitySampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/PineTimeActivitySampleProvider.java
index 88231762f..a308ec741 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/PineTimeActivitySampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/PineTimeActivitySampleProvider.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2021-2024 ITCactus, Patric Gruber
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.pinetime;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/PineTimeDFUService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/PineTimeDFUService.java
index 23f817c7d..bf2787e93 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/PineTimeDFUService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/PineTimeDFUService.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno, Taavi Eomäe
+/*  Copyright (C) 2020-2024 Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.pinetime;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/PineTimeInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/PineTimeInstallHandler.java
index 9f088653b..27059ecce 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/PineTimeInstallHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/PineTimeInstallHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Andreas Shimokawa, Taavi Eomäe
+/*  Copyright (C) 2020-2024 MPeter, Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.pinetime;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/PineTimeJFConstants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/PineTimeJFConstants.java
index d2375839e..0b0d893b3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/PineTimeJFConstants.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/PineTimeJFConstants.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2020-2022 Taavi Eomäe, Stephan Lachnit, ITCactus
+/*  Copyright (C) 2020-2024 Andreas Shimokawa, FintasticMan, ITCactus,
+    Patric Gruber, Stephan Lachnit, Taavi Eomäe, uli
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.pinetime;
 
 import nodomain.freeyourgadget.gadgetbridge.service.btle.GattService;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/PineTimeJFCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/PineTimeJFCoordinator.java
index 5574bf5ca..b30aa2697 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/PineTimeJFCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/PineTimeJFCoordinator.java
@@ -1,5 +1,6 @@
-/*  Copyright (C) 2016-2022 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, José Rebelo, Taavi Eomäe
+/*  Copyright (C) 2020-2024 Andreas Shimokawa, Damien Gaignon, Daniel Dakhno,
+    Davis Mosenkovs, ITCactus, José Rebelo, Patric Gruber, Petr Vaněk, Taavi
+    Eomäe, uli
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +15,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.pinetime;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/weather/WeatherData.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/weather/WeatherData.java
index 453a58151..6918cdda0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/weather/WeatherData.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/weather/WeatherData.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021-2022 TaaviE
+/*  Copyright (C) 2022-2024 Andreas Shimokawa, FintasticMan, Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.pinetime.weather;
 
 /**
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qc35/QC35Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qc35/QC35Coordinator.java
index 27877bf21..38ab5130c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qc35/QC35Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qc35/QC35Coordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Daniel Dakhno
+/*  Copyright (C) 2021-2024 Damien Gaignon, Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.qc35;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/AppsManagementActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/AppsManagementActivity.java
index 31df95197..103c1cdad 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/AppsManagementActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/AppsManagementActivity.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2021-2024 Daniel Dakhno, Hasan Ammar
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.qhybrid;
 
 import android.content.BroadcastReceiver;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/CalibrationActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/CalibrationActivity.java
index 8121b76b9..b0e4157ec 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/CalibrationActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/CalibrationActivity.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Daniel Dakhno
+/*  Copyright (C) 2020-2024 Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.qhybrid;
 
 import android.content.Intent;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/CommuteActionsActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/CommuteActionsActivity.java
index c2c2713b5..7f0b38aff 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/CommuteActionsActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/CommuteActionsActivity.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Arjan Schrijver
+/*  Copyright (C) 2021-2024 Arjan Schrijver
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.qhybrid;
 
 import android.content.DialogInterface;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/CommuteActionsListAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/CommuteActionsListAdapter.java
index e7fc04dd5..ab9f06907 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/CommuteActionsListAdapter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/CommuteActionsListAdapter.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Arjan Schrijver
+/*  Copyright (C) 2021-2024 Arjan Schrijver
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.qhybrid;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/ConfigActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/ConfigActivity.java
index 638652823..9e62fd4b6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/ConfigActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/ConfigActivity.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2019-2021 Carsten Pfeiffer, Daniel Dakhno, Taavi Eomäe
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Arjan Schrijver, Carsten
+    Pfeiffer, Daniel Dakhno, Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.qhybrid;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/FileManagementActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/FileManagementActivity.java
index b1d0cce8e..bb091132a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/FileManagementActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/FileManagementActivity.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Daniel Dakhno
+/*  Copyright (C) 2020-2024 Andreas Shimokawa, Arjan Schrijver, Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.qhybrid;
 
 import android.content.BroadcastReceiver;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/FossilAppWriter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/FossilAppWriter.java
index 5368ac84d..a30128e00 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/FossilAppWriter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/FossilAppWriter.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Arjan Schrijver, Daniel Dakhno
+/*  Copyright (C) 2021-2024 Arjan Schrijver
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.qhybrid;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/FossilFileReader.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/FossilFileReader.java
index b084960b6..937986f1e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/FossilFileReader.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/FossilFileReader.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Arjan Schrijver, Daniel Dakhno
+/*  Copyright (C) 2021-2024 Andreas Shimokawa, Arjan Schrijver
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.qhybrid;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/FossilHRInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/FossilHRInstallHandler.java
index 1f4e6d9b9..50589f2e7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/FossilHRInstallHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/FossilHRInstallHandler.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2020-2021 Andreas Shimokawa
+/*  Copyright (C) 2020-2024 Andreas Shimokawa, Arjan Schrijver, Daniel Dakhno,
+    Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.qhybrid;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/FossilInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/FossilInstallHandler.java
index b899e6a6b..e1dcceb6a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/FossilInstallHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/FossilInstallHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Andreas Shimokawa, Daniel Dakhno
+/*  Copyright (C) 2020-2024 Daniel Dakhno, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.qhybrid;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HRConfigActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HRConfigActivity.java
index d51e4481f..415d0eb43 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HRConfigActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HRConfigActivity.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2019-2021 Andreas Shimokawa, Daniel Dakhno
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Arjan Schrijver, Daniel Dakhno,
+    Hasan Ammar
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.qhybrid;
 
 import static nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.QHybridSupport.QHYBRID_COMMAND_UPDATE_WIDGETS;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRActivitySampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRActivitySampleProvider.java
index 1d07d944a..305a54d20 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRActivitySampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRActivitySampleProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Daniel Dakhno
+/*  Copyright (C) 2020-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.qhybrid;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceDesignerActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceDesignerActivity.java
index 3280bbc40..2484ead6b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceDesignerActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceDesignerActivity.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2021 Arjan Schrijver
+/*  Copyright (C) 2021-2024 Arjan Schrijver, Daniel Dakhno, HelloCodeberg,
+    José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.qhybrid;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceFactory.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceFactory.java
index 396b5d8da..7560fd16d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceFactory.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceFactory.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Arjan Schrijver
+/*  Copyright (C) 2021-2024 Arjan Schrijver, Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.qhybrid;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceSettings.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceSettings.java
index 51bfa7df7..d29992c51 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceSettings.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceSettings.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Arjan Schrijver
+/*  Copyright (C) 2021-2024 Arjan Schrijver
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.qhybrid;
 
 import java.io.Serializable;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceSettingsActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceSettingsActivity.java
index 8e43162ee..ce154bf45 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceSettingsActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceSettingsActivity.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Arjan Schrijver
+/*  Copyright (C) 2021-2024 Arjan Schrijver, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.qhybrid;
 
 import android.content.Intent;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceWidget.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceWidget.java
index 8f6ffcd2d..64b71fe11 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceWidget.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceWidget.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Arjan Schrijver
+/*  Copyright (C) 2021-2024 Arjan Schrijver, Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.qhybrid;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceWidgetActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceWidgetActivity.java
index a8fca2b59..bd51540f3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceWidgetActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceWidgetActivity.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 Arjan Schrijver
+/*  Copyright (C) 2022-2024 Arjan Schrijver, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.qhybrid;
 
 import android.content.Intent;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWidgetPosition.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWidgetPosition.java
index fc4880a0f..45e6ca716 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWidgetPosition.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWidgetPosition.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Daniel Dakhno
+/*  Copyright (C) 2022-2024 Arjan Schrijver
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.qhybrid;
 
 class HybridHRWidgetPosition{
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/ImageEditActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/ImageEditActivity.java
index b46884b88..a484275ed 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/ImageEditActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/ImageEditActivity.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Daniel Dakhno
+/*  Copyright (C) 2020-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.qhybrid;
 
 import android.content.ContentResolver;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/NotificationConfiguration.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/NotificationConfiguration.java
index 4ccf0f505..8181902ac 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/NotificationConfiguration.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/NotificationConfiguration.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.qhybrid;
 
 import android.util.Log;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/NotificationHRConfiguration.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/NotificationHRConfiguration.java
index e09deaf78..3974cffbc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/NotificationHRConfiguration.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/NotificationHRConfiguration.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Arjan Schrijver, Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.qhybrid;
 
 import java.io.Serializable;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/PackageConfigHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/PackageConfigHelper.java
index 475e512f1..aee688f24 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/PackageConfigHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/PackageConfigHelper.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Carsten Pfeiffer, Daniel Dakhno
+/*  Copyright (C) 2019-2024 Carsten Pfeiffer, Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.qhybrid;
 
 import android.content.ContentValues;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridAppChoserActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridAppChoserActivity.java
index 636be3f89..657616f19 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridAppChoserActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridAppChoserActivity.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Carsten Pfeiffer, Daniel Dakhno
+/*  Copyright (C) 2019-2024 Carsten Pfeiffer, Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.qhybrid;
 
 import android.annotation.SuppressLint;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridConstants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridConstants.java
index 14a457a97..6c9d46efc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridConstants.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridConstants.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 Arjan Schrijver
+/*  Copyright (C) 2022-2024 Arjan Schrijver, Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.qhybrid;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridCoordinator.java
index 5b9d1ac46..26b7ca962 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridCoordinator.java
@@ -1,5 +1,6 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniel
-    Dakhno, Daniele Gobbetti, José Rebelo
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Arjan Schrijver, Carsten
+    Pfeiffer, Damien Gaignon, Daniel Dakhno, Hasan Ammar, José Rebelo, Morten
+    Rieger Hannemose, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +15,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.qhybrid;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/TimePicker.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/TimePicker.java
index d85003a68..be026be38 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/TimePicker.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/TimePicker.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Arjan Schrijver, Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.qhybrid;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/WidgetSettingsActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/WidgetSettingsActivity.java
index 647804451..a284949b2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/WidgetSettingsActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/WidgetSettingsActivity.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Andreas Shimokawa, Daniel Dakhno
+/*  Copyright (C) 2020-2024 Andreas Shimokawa, Arjan Schrijver, Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.qhybrid;
 
 import android.content.DialogInterface;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/roidmi/Roidmi1Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/roidmi/Roidmi1Coordinator.java
index cc954973c..6ab296d9e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/roidmi/Roidmi1Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/roidmi/Roidmi1Coordinator.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2017-2021 Daniele Gobbetti, João Paulo Barraca, José
-    Rebelo, Quallenauge
+/*  Copyright (C) 2018-2024 Daniel Dakhno, Daniele Gobbetti, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.roidmi;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/roidmi/Roidmi3Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/roidmi/Roidmi3Coordinator.java
index 972d441ce..28e7406d2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/roidmi/Roidmi3Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/roidmi/Roidmi3Coordinator.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2017-2021 Daniele Gobbetti, João Paulo Barraca, José
-    Rebelo, tiparega
+/*  Copyright (C) 2018-2024 Daniel Dakhno, Daniele Gobbetti, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.roidmi;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/roidmi/RoidmiConst.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/roidmi/RoidmiConst.java
index 362f1ebc3..cc55564b7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/roidmi/RoidmiConst.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/roidmi/RoidmiConst.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2018-2021 José Rebelo
+/*  Copyright (C) 2018-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.roidmi;
 
 import android.graphics.Color;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/roidmi/RoidmiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/roidmi/RoidmiCoordinator.java
index a38c895c8..789e0fcf4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/roidmi/RoidmiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/roidmi/RoidmiCoordinator.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, José Rebelo
+/*  Copyright (C) 2018-2024 Andreas Shimokawa, Damien Gaignon, Daniel Dakhno,
+    Daniele Gobbetti, José Rebelo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.roidmi;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/smaq2oss/SMAQ2OSSConstants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/smaq2oss/SMAQ2OSSConstants.java
index f6ee28fb9..ad0208106 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/smaq2oss/SMAQ2OSSConstants.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/smaq2oss/SMAQ2OSSConstants.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2021-2024 x29a
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.smaq2oss;
 
 import java.util.UUID;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/smaq2oss/SMAQ2OSSCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/smaq2oss/SMAQ2OSSCoordinator.java
index bdb79902f..897544342 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/smaq2oss/SMAQ2OSSCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/smaq2oss/SMAQ2OSSCoordinator.java
@@ -1,3 +1,20 @@
+/*  Copyright (C) 2021-2024 Andreas Shimokawa, Arjan Schrijver, Damien Gaignon,
+    Daniel Dakhno, José Rebelo, Petr Vaněk, x29a
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.smaq2oss;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/smaq2oss/SMAQ2OSSSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/smaq2oss/SMAQ2OSSSupport.java
index e7f204b60..cff1a239c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/smaq2oss/SMAQ2OSSSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/smaq2oss/SMAQ2OSSSupport.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2021-2024 Arjan Schrijver, José Rebelo, x29a
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.smaq2oss;
 
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/soflow/SoFlowCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/soflow/SoFlowCoordinator.java
index da456c33a..725d61464 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/soflow/SoFlowCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/soflow/SoFlowCoordinator.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2022 Andreas Shimokawa
+/*  Copyright (C) 2022-2024 Andreas Shimokawa, Damien Gaignon, Daniel Dakhno,
+    José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.soflow;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/SonyHeadphonesCapabilities.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/SonyHeadphonesCapabilities.java
index 621a5f347..b715db9d8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/SonyHeadphonesCapabilities.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/SonyHeadphonesCapabilities.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones;
 
 public enum SonyHeadphonesCapabilities {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/SonyHeadphonesCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/SonyHeadphonesCoordinator.java
index 4cedffcaf..e7b93cab5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/SonyHeadphonesCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/SonyHeadphonesCoordinator.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2021-2024 Damien Gaignon, Daniel Dakhno, José Rebelo,
+    Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/SonyHeadphonesSettingsCustomizer.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/SonyHeadphonesSettingsCustomizer.java
index 1003634bf..3524fc0fb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/SonyHeadphonesSettingsCustomizer.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/SonyHeadphonesSettingsCustomizer.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 José Rebelo
+/*  Copyright (C) 2021-2024 Arjan Schrijver, José Rebelo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones;
 
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_SONY_AMBIENT_SOUND_CONTROL;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyLinkBudsSCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyLinkBudsSCoordinator.java
index f95d9392e..566d7eff2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyLinkBudsSCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyLinkBudsSCoordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.coordinators;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWF1000XM3Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWF1000XM3Coordinator.java
index 6c0f618db..10ba13b0e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWF1000XM3Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWF1000XM3Coordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 Ngô Minh Quang
+/*  Copyright (C) 2022-2024 Daniel Dakhno, José Rebelo, Quang Ngô
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.coordinators;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWF1000XM4Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWF1000XM4Coordinator.java
index f07789c72..e88815211 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWF1000XM4Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWF1000XM4Coordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.coordinators;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWF1000XM5Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWF1000XM5Coordinator.java
index 6c6d8a719..413240901 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWF1000XM5Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWF1000XM5Coordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2023-2024 Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.coordinators;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWFSP800NCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWFSP800NCoordinator.java
index 4b6d9dc11..7b83dd49e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWFSP800NCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWFSP800NCoordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 José Rebelo
+/*  Copyright (C) 2021-2024 Daniel Dakhno, José Rebelo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.coordinators;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWH1000XM2Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWH1000XM2Coordinator.java
index 27c99b958..e06c4fdce 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWH1000XM2Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWH1000XM2Coordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.coordinators;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWH1000XM3Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWH1000XM3Coordinator.java
index 8220dd9bf..b533c878c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWH1000XM3Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWH1000XM3Coordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 José Rebelo
+/*  Copyright (C) 2021-2024 Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.coordinators;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWH1000XM4Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWH1000XM4Coordinator.java
index 08f1ff618..1ca26c7f1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWH1000XM4Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWH1000XM4Coordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 José Rebelo
+/*  Copyright (C) 2022-2024 Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.coordinators;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWH1000XM5Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWH1000XM5Coordinator.java
index e77ecd604..b15504642 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWH1000XM5Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWH1000XM5Coordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.coordinators;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/AmbientSoundControl.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/AmbientSoundControl.java
index 764c97b1f..3cc364eda 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/AmbientSoundControl.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/AmbientSoundControl.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 José Rebelo
+/*  Copyright (C) 2021-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.prefs;
 
 import android.content.SharedPreferences;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/AmbientSoundControlButtonMode.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/AmbientSoundControlButtonMode.java
index 759a1bbb6..0b3c9d2da 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/AmbientSoundControlButtonMode.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/AmbientSoundControlButtonMode.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.prefs;
 
 import android.content.SharedPreferences;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/AudioUpsampling.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/AudioUpsampling.java
index 4f4f1811c..9ce9cdc4a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/AudioUpsampling.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/AudioUpsampling.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 José Rebelo
+/*  Copyright (C) 2021-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.prefs;
 
 import android.content.SharedPreferences;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/AutomaticPowerOff.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/AutomaticPowerOff.java
index 203681abd..3c0c00bee 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/AutomaticPowerOff.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/AutomaticPowerOff.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 José Rebelo
+/*  Copyright (C) 2021-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.prefs;
 
 import android.content.SharedPreferences;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/ButtonModes.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/ButtonModes.java
index 676c44bdd..49718485f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/ButtonModes.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/ButtonModes.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 José Rebelo
+/*  Copyright (C) 2021-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.prefs;
 
 import android.content.SharedPreferences;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/EqualizerCustomBands.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/EqualizerCustomBands.java
index 443969ec8..6d424cc1b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/EqualizerCustomBands.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/EqualizerCustomBands.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 José Rebelo
+/*  Copyright (C) 2021-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.prefs;
 
 import android.content.SharedPreferences;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/EqualizerPreset.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/EqualizerPreset.java
index 162b6ed43..9a2b0669a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/EqualizerPreset.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/EqualizerPreset.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 José Rebelo
+/*  Copyright (C) 2021-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.prefs;
 
 import android.content.SharedPreferences;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/PauseWhenTakenOff.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/PauseWhenTakenOff.java
index 29a56d4cb..53fd2aa75 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/PauseWhenTakenOff.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/PauseWhenTakenOff.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 José Rebelo
+/*  Copyright (C) 2021-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.prefs;
 
 import android.content.SharedPreferences;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/QuickAccess.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/QuickAccess.java
index e86afa089..40e68b9b4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/QuickAccess.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/QuickAccess.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.prefs;
 
 import android.content.SharedPreferences;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/SoundPosition.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/SoundPosition.java
index 15b2bf4fd..97f80a848 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/SoundPosition.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/SoundPosition.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 José Rebelo
+/*  Copyright (C) 2021-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.prefs;
 
 import android.content.SharedPreferences;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/SpeakToChatConfig.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/SpeakToChatConfig.java
index 0ec9f7259..e66386c22 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/SpeakToChatConfig.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/SpeakToChatConfig.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.prefs;
 
 import android.content.SharedPreferences;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/SpeakToChatEnabled.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/SpeakToChatEnabled.java
index 9e2352189..f38a1a530 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/SpeakToChatEnabled.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/SpeakToChatEnabled.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.prefs;
 
 import android.content.SharedPreferences;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/SurroundMode.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/SurroundMode.java
index 3918f5cb5..8eea63e2c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/SurroundMode.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/SurroundMode.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 José Rebelo
+/*  Copyright (C) 2021-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.prefs;
 
 import android.content.SharedPreferences;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/TouchSensor.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/TouchSensor.java
index 3923edf3b..ae2567d92 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/TouchSensor.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/TouchSensor.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 José Rebelo
+/*  Copyright (C) 2021-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.prefs;
 
 import android.content.SharedPreferences;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/VoiceNotifications.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/VoiceNotifications.java
index 8fbbc9a65..00083e63e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/VoiceNotifications.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/prefs/VoiceNotifications.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 José Rebelo
+/*  Copyright (C) 2021-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.prefs;
 
 import android.content.SharedPreferences;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3ActivitySampleCombiner.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3ActivitySampleCombiner.java
index 13049c788..a3baed0ea 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3ActivitySampleCombiner.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3ActivitySampleCombiner.java
@@ -1,22 +1,19 @@
-/*
- *   Copyright (C) 2023 akasaka / Genjitsu Labs
- *
- *     This file is part of Gadgetbridge.
- *
- *     Gadgetbridge is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU Affero General Public License as published
- *     by the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Gadgetbridge is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU Affero General Public License for more details.
- *
- *     You should have received a copy of the GNU Affero General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.sony.wena3;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3ActivitySampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3ActivitySampleProvider.java
index 4c2034e9b..3ae8d8866 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3ActivitySampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3ActivitySampleProvider.java
@@ -1,22 +1,19 @@
-/*
- *   Copyright (C) 2023 akasaka / Genjitsu Labs
- *
- *     This file is part of Gadgetbridge.
- *
- *     Gadgetbridge is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU Affero General Public License as published
- *     by the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Gadgetbridge is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU Affero General Public License for more details.
- *
- *     You should have received a copy of the GNU Affero General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.sony.wena3;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3BehaviorSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3BehaviorSampleProvider.java
index 1cccf0db6..952662f87 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3BehaviorSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3BehaviorSampleProvider.java
@@ -1,22 +1,19 @@
-/*
- *   Copyright (C) 2023 akasaka / Genjitsu Labs
- *
- *     This file is part of Gadgetbridge.
- *
- *     Gadgetbridge is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU Affero General Public License as published
- *     by the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Gadgetbridge is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU Affero General Public License for more details.
- *
- *     You should have received a copy of the GNU Affero General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.sony.wena3;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3CaloriesSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3CaloriesSampleProvider.java
index 602dde1fb..29bb3041c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3CaloriesSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3CaloriesSampleProvider.java
@@ -1,22 +1,19 @@
-/*
- *   Copyright (C) 2023 akasaka / Genjitsu Labs
- *
- *     This file is part of Gadgetbridge.
- *
- *     Gadgetbridge is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU Affero General Public License as published
- *     by the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Gadgetbridge is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU Affero General Public License for more details.
- *
- *     You should have received a copy of the GNU Affero General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.sony.wena3;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3Constants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3Constants.java
index 8a75a5e46..d76ca485b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3Constants.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3Constants.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.sony.wena3;
 
 import android.graphics.Color;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3Coordinator.java
index 5cd5bff7d..78e4ca3b8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3Coordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs, Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,8 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.sony.wena3;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3EnergySampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3EnergySampleProvider.java
index ba633c841..ae7b63ce6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3EnergySampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3EnergySampleProvider.java
@@ -1,22 +1,19 @@
-/*
- *   Copyright (C) 2023 akasaka / Genjitsu Labs
- *
- *     This file is part of Gadgetbridge.
- *
- *     Gadgetbridge is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU Affero General Public License as published
- *     by the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Gadgetbridge is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU Affero General Public License for more details.
- *
- *     You should have received a copy of the GNU Affero General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.sony.wena3;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3HeartRateSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3HeartRateSampleProvider.java
index 490dd3b06..3dbbc65ea 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3HeartRateSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3HeartRateSampleProvider.java
@@ -1,22 +1,19 @@
-/*
- *   Copyright (C) 2023 akasaka / Genjitsu Labs
- *
- *     This file is part of Gadgetbridge.
- *
- *     Gadgetbridge is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU Affero General Public License as published
- *     by the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Gadgetbridge is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU Affero General Public License for more details.
- *
- *     You should have received a copy of the GNU Affero General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.sony.wena3;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3SettingKeys.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3SettingKeys.java
index c7cba86f9..e8efc764a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3SettingKeys.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3SettingKeys.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,8 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.sony.wena3;
 
 public class SonyWena3SettingKeys {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3SettingsCustomizer.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3SettingsCustomizer.java
index eaedab22c..180c6ea20 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3SettingsCustomizer.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3SettingsCustomizer.java
@@ -1,22 +1,19 @@
-/*
- *   Copyright (C) 2023 akasaka / Genjitsu Labs
- *
- *     This file is part of Gadgetbridge.
- *
- *     Gadgetbridge is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU Affero General Public License as published
- *     by the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Gadgetbridge is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU Affero General Public License for more details.
- *
- *     You should have received a copy of the GNU Affero General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.sony.wena3;
 
 import android.os.Parcel;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3StressSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3StressSampleProvider.java
index 034919949..f64e39989 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3StressSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3StressSampleProvider.java
@@ -1,22 +1,19 @@
-/*
- *   Copyright (C) 2023 akasaka / Genjitsu Labs
- *
- *     This file is part of Gadgetbridge.
- *
- *     Gadgetbridge is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU Affero General Public License as published
- *     by the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Gadgetbridge is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU Affero General Public License for more details.
- *
- *     You should have received a copy of the GNU Affero General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.sony.wena3;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3Vo2SampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3Vo2SampleProvider.java
index b5c62411d..9e38dfda7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3Vo2SampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/wena3/SonyWena3Vo2SampleProvider.java
@@ -1,22 +1,19 @@
-/*
- *   Copyright (C) 2023 akasaka / Genjitsu Labs
- *
- *     This file is part of Gadgetbridge.
- *
- *     Gadgetbridge is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU Affero General Public License as published
- *     by the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Gadgetbridge is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU Affero General Public License for more details.
- *
- *     You should have received a copy of the GNU Affero General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.sony.wena3;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sonyswr12/SonySWR12DeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sonyswr12/SonySWR12DeviceCoordinator.java
index 4e9de4bfc..f32e6db96 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sonyswr12/SonySWR12DeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sonyswr12/SonySWR12DeviceCoordinator.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, José Rebelo, ladbsoft, opavlov
+/*  Copyright (C) 2020-2024 Damien Gaignon, Daniel Dakhno, José Rebelo,
+    opavlov, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.sonyswr12;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sonyswr12/SonySWR12SampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sonyswr12/SonySWR12SampleProvider.java
index 26479272e..d9dedd65f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sonyswr12/SonySWR12SampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sonyswr12/SonySWR12SampleProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 opavlov
+/*  Copyright (C) 2020-2024 opavlov
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.sonyswr12;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/supercars/ControlActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/supercars/ControlActivity.java
index f881b877b..d80d896bf 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/supercars/ControlActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/supercars/ControlActivity.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 Petr Vaněk
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.supercars;
 
 import android.content.BroadcastReceiver;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/supercars/SuperCarsConstants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/supercars/SuperCarsConstants.java
index c36de6e91..b231e3850 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/supercars/SuperCarsConstants.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/supercars/SuperCarsConstants.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 Petr Vaněk
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.supercars;
 
 import java.util.UUID;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/supercars/SuperCarsCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/supercars/SuperCarsCoordinator.java
index 14fd2a456..ed4bf8f46 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/supercars/SuperCarsCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/supercars/SuperCarsCoordinator.java
@@ -1,3 +1,20 @@
+/*  Copyright (C) 2022-2024 Damien Gaignon, Daniel Dakhno, José Rebelo,
+    Petr Vaněk
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.supercars;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/test/TestDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/test/TestDeviceCoordinator.java
index fa2ea7cdf..8b1ab96c0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/test/TestDeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/test/TestDeviceCoordinator.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2023-2024 Daniel Dakhno, José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.test;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/tlw64/TLW64Constants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/tlw64/TLW64Constants.java
index 4cd98e4a5..cf0127d19 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/tlw64/TLW64Constants.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/tlw64/TLW64Constants.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 115ek, Carsten Pfeiffer
+/*  Copyright (C) 2020-2024 115ek
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 package nodomain.freeyourgadget.gadgetbridge.devices.tlw64;
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/tlw64/TLW64Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/tlw64/TLW64Coordinator.java
index 5ba2e73f7..cd1bad705 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/tlw64/TLW64Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/tlw64/TLW64Coordinator.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2016-2021 115ek, Andreas Shimokawa, Carsten Pfeiffer,
-    Daniele Gobbetti, José Rebelo
+/*  Copyright (C) 2020-2024 115ek, Damien Gaignon, Daniel Dakhno, José
+    Rebelo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 package nodomain.freeyourgadget.gadgetbridge.devices.tlw64;
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/tlw64/TLW64SampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/tlw64/TLW64SampleProvider.java
index 0134bf276..503db6a35 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/tlw64/TLW64SampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/tlw64/TLW64SampleProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 115ek
+/*  Copyright (C) 2020-2024 115ek
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.tlw64;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/um25/Activity/DataActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/um25/Activity/DataActivity.java
index 2f0a11f62..1fe96662f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/um25/Activity/DataActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/um25/Activity/DataActivity.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2020-2024 Daniel Dakhno
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.um25.Activity;
 
 import android.content.BroadcastReceiver;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/um25/Coordinator/UM25Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/um25/Coordinator/UM25Coordinator.java
index 78a38e37e..60e360077 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/um25/Coordinator/UM25Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/um25/Coordinator/UM25Coordinator.java
@@ -1,3 +1,20 @@
+/*  Copyright (C) 2020-2024 Damien Gaignon, Daniel Dakhno, José Rebelo,
+    Petr Vaněk
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.um25.Coordinator;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/vesc/VescControlActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/vesc/VescControlActivity.java
index 18f904a9d..197d93c3a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/vesc/VescControlActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/vesc/VescControlActivity.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Daniel Dakhno
+/*  Copyright (C) 2021-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.vesc;
 
 import android.content.Intent;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/vesc/VescCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/vesc/VescCoordinator.java
index 347125afd..28afa594c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/vesc/VescCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/vesc/VescCoordinator.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2021 Daniel Dakhno
+/*  Copyright (C) 2021-2024 Damien Gaignon, Daniel Dakhno, José Rebelo,
+    Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.vesc;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/vibratissimo/VibratissimoCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/vibratissimo/VibratissimoCoordinator.java
index 8be69d1f6..67639930f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/vibratissimo/VibratissimoCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/vibratissimo/VibratissimoCoordinator.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, José Rebelo
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Carsten Pfeiffer, Damien
+    Gaignon, Daniel Dakhno, Daniele Gobbetti, José Rebelo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.vibratissimo;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/vivomovehr/GarminCapability.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/vivomovehr/GarminCapability.java
index ff814e27d..081cdd9ca 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/vivomovehr/GarminCapability.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/vivomovehr/GarminCapability.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.vivomovehr;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/vivomovehr/VivomoveConstants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/vivomovehr/VivomoveConstants.java
index 644b313c6..19f945d3b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/vivomovehr/VivomoveConstants.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/vivomovehr/VivomoveConstants.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.vivomovehr;
 
 import java.text.SimpleDateFormat;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/vivomovehr/VivomoveHrCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/vivomovehr/VivomoveHrCoordinator.java
index 9e4eee176..919d532ac 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/vivomovehr/VivomoveHrCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/vivomovehr/VivomoveHrCoordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Daniel Dakhno, Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.vivomovehr;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/vivomovehr/VivomoveHrSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/vivomovehr/VivomoveHrSampleProvider.java
index 6eb8ccc26..1479e40c3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/vivomovehr/VivomoveHrSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/vivomovehr/VivomoveHrSampleProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.vivomovehr;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/waspos/WaspOSConstants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/waspos/WaspOSConstants.java
index df5c29378..8ea8901c5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/waspos/WaspOSConstants.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/waspos/WaspOSConstants.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2020 Gordon Williams
+/*  Copyright (C) 2020-2024 Daniel Thompson
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.waspos;
 
 import java.util.UUID;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/waspos/WaspOSCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/waspos/WaspOSCoordinator.java
index 3827f3e7b..106ea5b67 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/waspos/WaspOSCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/waspos/WaspOSCoordinator.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2016-2020 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Gordon Williams, José Rebelo
+/*  Copyright (C) 2020-2024 Andreas Shimokawa, Damien Gaignon, Daniel Dakhno,
+    Daniel Thompson, José Rebelo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.waspos;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/watch9/Watch9CalibrationActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/watch9/Watch9CalibrationActivity.java
index 2384c02e2..c86948638 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/watch9/Watch9CalibrationActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/watch9/Watch9CalibrationActivity.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2018-2021 Daniele Gobbetti, maxirnilian
+/*  Copyright (C) 2018-2024 Daniele Gobbetti, maxirnilian
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.watch9;
 
 import android.content.Intent;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/watch9/Watch9Constants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/watch9/Watch9Constants.java
index 7a86ef6a8..27426f9e6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/watch9/Watch9Constants.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/watch9/Watch9Constants.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2018-2021 maxirnilian
+/*  Copyright (C) 2018-2024 maxirnilian
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.watch9;
 
 import java.util.UUID;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/watch9/Watch9DeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/watch9/Watch9DeviceCoordinator.java
index 061790ba1..98aecaf62 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/watch9/Watch9DeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/watch9/Watch9DeviceCoordinator.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, mamucho, maxirnilian, Vadim Kaushan
+/*  Copyright (C) 2018-2024 Andreas Shimokawa, Damien Gaignon, Daniel Dakhno,
+    Daniele Gobbetti, José Rebelo, mamucho, maxirnilian, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.watch9;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/watch9/Watch9PairingActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/watch9/Watch9PairingActivity.java
index 1bad89c2f..afa7e7dc4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/watch9/Watch9PairingActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/watch9/Watch9PairingActivity.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2018-2021 Daniele Gobbetti, maxirnilian, Taavi Eomäe
+/*  Copyright (C) 2018-2024 Andreas Böhler, Daniele Gobbetti, José Rebelo,
+    maxirnilian, Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.watch9;
 
 import static nodomain.freeyourgadget.gadgetbridge.util.BondingUtil.STATE_DEVICE_CANDIDATE;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/withingssteelhr/RotaryControl.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/withingssteelhr/RotaryControl.java
index 86585f1fb..0a42d3a41 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/withingssteelhr/RotaryControl.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/withingssteelhr/RotaryControl.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.withingssteelhr;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/withingssteelhr/WithingsCalibrationActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/withingssteelhr/WithingsCalibrationActivity.java
index f46d1cd82..b904d3af9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/withingssteelhr/WithingsCalibrationActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/withingssteelhr/WithingsCalibrationActivity.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.withingssteelhr;
 
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/withingssteelhr/WithingsSteelHRDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/withingssteelhr/WithingsSteelHRDeviceCoordinator.java
index 6a42414db..fba30050a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/withingssteelhr/WithingsSteelHRDeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/withingssteelhr/WithingsSteelHRDeviceCoordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Ascense, Daniel Dakhno, Frank Ertl, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.withingssteelhr;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/withingssteelhr/WithingsSteelHRSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/withingssteelhr/WithingsSteelHRSampleProvider.java
index 393422a98..0427be36c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/withingssteelhr/WithingsSteelHRSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/withingssteelhr/WithingsSteelHRSampleProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.withingssteelhr;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
index 2daa96bf1..20e81c1ce 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 Andreas Shimokawa, José Rebelo, Yoran Vulker
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi;
 
 import static nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiPreferences.*;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiDailySummarySampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiDailySummarySampleProvider.java
index 7543694d8..5926994d5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiDailySummarySampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiDailySummarySampleProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiFWHelper.java
index 54c308d0d..e46b1f862 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiFWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiFWHelper.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiInstallHandler.java
index 863094d00..eab30fabe 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiInstallHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiInstallHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiPaiSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiPaiSampleProvider.java
index 037598948..0eaa3cc01 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiPaiSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiPaiSampleProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSampleProvider.java
index 1b5b22376..950e8b753 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSampleProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSettingsCustomizer.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSettingsCustomizer.java
index 71c6a25dd..ef9bf3e70 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSettingsCustomizer.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSettingsCustomizer.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi;
 
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsUtils.hidePrefIfNoneVisible;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSleepStageSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSleepStageSampleProvider.java
index 3e288f9d9..f26bf3e9f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSleepStageSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSleepStageSampleProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSleepTimeSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSleepTimeSampleProvider.java
index 0b031e8db..22548863e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSleepTimeSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSleepTimeSampleProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSpo2SampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSpo2SampleProvider.java
index 7d50754e0..93dc82147 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSpo2SampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSpo2SampleProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.AbstractSampleToTimeSampleProvider;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiStressSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiStressSampleProvider.java
index ece71d1ad..2695ae9dc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiStressSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiStressSampleProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.AbstractSampleToTimeSampleProvider;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiWidgetManager.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiWidgetManager.java
index e8d9ee0aa..9e9db972d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiWidgetManager.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiWidgetManager.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi;
 
 import androidx.annotation.Nullable;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiWorkoutType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiWorkoutType.java
index f9aa663d4..35fb453c0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiWorkoutType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiWorkoutType.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi;
 
 import androidx.annotation.StringRes;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband7pro/MiBand7ProCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband7pro/MiBand7ProCoordinator.java
index 87d4948e5..2f361cc0e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband7pro/MiBand7ProCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband7pro/MiBand7ProCoordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.miband7pro;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/MiBand8Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/MiBand8Coordinator.java
index 3f070e832..fb4b10eb0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/MiBand8Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8/MiBand8Coordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.miband8;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatch/MiWatchLiteCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatch/MiWatchLiteCoordinator.java
index a7ad29601..072a66a6c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatch/MiWatchLiteCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatch/MiWatchLiteCoordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 Andreas Shimokawa
+/*  Copyright (C) 2023-2024 Andreas Shimokawa, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.miwatch;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatchcolorsport/MiWatchColorSportCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatchcolorsport/MiWatchColorSportCoordinator.java
index c69791a08..51c4e09fb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatchcolorsport/MiWatchColorSportCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miwatchcolorsport/MiWatchColorSportCoordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.miwatchcolorsport;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmismartband2/RedmiSmartBand2Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmismartband2/RedmiSmartBand2Coordinator.java
index 11ed02f40..d70ddcf3d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmismartband2/RedmiSmartBand2Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmismartband2/RedmiSmartBand2Coordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.redmismartband2;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmismartbandpro/RedmiSmartBandProCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmismartbandpro/RedmiSmartBandProCoordinator.java
index 1a8b5c161..f6f81ae7a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmismartbandpro/RedmiSmartBandProCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmismartbandpro/RedmiSmartBandProCoordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.redmismartbandpro;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch2lite/RedmiWatch2Lite.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch2lite/RedmiWatch2Lite.java
index a1a4ee3a9..9a018f8ea 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch2lite/RedmiWatch2Lite.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch2lite/RedmiWatch2Lite.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.redmiwatch2lite;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch3active/RedmiWatch3ActiveCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch3active/RedmiWatch3ActiveCoordinator.java
index 6a2586801..4009d6fb8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch3active/RedmiWatch3ActiveCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch3active/RedmiWatch3ActiveCoordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 Andreas Shimokawa
+/*  Copyright (C) 2023-2024 Andreas Shimokawa, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.redmiwatch3active;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs1active/XiaomiWatchS1ActiveCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs1active/XiaomiWatchS1ActiveCoordinator.java
index 3ed43f298..04ac42316 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs1active/XiaomiWatchS1ActiveCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs1active/XiaomiWatchS1ActiveCoordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 Yoran Vulker
+/*  Copyright (C) 2023-2024 José Rebelo, Yoran Vulker
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.watchs1active;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xwatch/XWatchCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xwatch/XWatchCoordinator.java
index 8cb4fb2c7..a119da3e8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xwatch/XWatchCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xwatch/XWatchCoordinator.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, José Rebelo, ladbsoft
+/*  Copyright (C) 2018-2024 Andreas Shimokawa, Damien Gaignon, Daniel Dakhno,
+    Daniele Gobbetti, José Rebelo, ladbsoft, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.xwatch;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xwatch/XWatchSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xwatch/XWatchSampleProvider.java
index e2e3b16db..42b095365 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xwatch/XWatchSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xwatch/XWatchSampleProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Daniele Gobbetti, ladbsoft, protomors
+/*  Copyright (C) 2018-2024 Daniele Gobbetti, ladbsoft
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.xwatch;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xwatch/XWatchService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xwatch/XWatchService.java
index d7a80c589..8d764fdab 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xwatch/XWatchService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xwatch/XWatchService.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2018-2021 ladbsoft
+/*  Copyright (C) 2018-2024 ladbsoft, SalavatR
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.xwatch;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/zetime/ZeTimeConstants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/zetime/ZeTimeConstants.java
index 1e6ce070a..a4db9b95a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/zetime/ZeTimeConstants.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/zetime/ZeTimeConstants.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2018-2021 Andreas Shimokawa, Sebastian Kranz
+/*  Copyright (C) 2018-2024 Andreas Shimokawa, Damien Gaignon, Sebastian Kranz
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.zetime;
 
 import java.util.UUID;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/zetime/ZeTimeCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/zetime/ZeTimeCoordinator.java
index 771235bd2..b1960e519 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/zetime/ZeTimeCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/zetime/ZeTimeCoordinator.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, José Rebelo, Sebastian Kranz
+/*  Copyright (C) 2018-2024 Andreas Shimokawa, Damien Gaignon, Daniel Dakhno,
+    Daniele Gobbetti, José Rebelo, Petr Vaněk, Sebastian Kranz
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.zetime;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/zetime/ZeTimePreferenceActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/zetime/ZeTimePreferenceActivity.java
index 0edcf32da..d119ed78e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/zetime/ZeTimePreferenceActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/zetime/ZeTimePreferenceActivity.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2018-2021 Andreas Shimokawa, Sebastian Kranz
+/*  Copyright (C) 2018-2024 Andreas Shimokawa, Damien Gaignon, José Rebelo,
+    Sebastian Kranz
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.zetime;
 
 import android.os.Bundle;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/zetime/ZeTimeSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/zetime/ZeTimeSampleProvider.java
index ce06a8df3..878b75e9e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/zetime/ZeTimeSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/zetime/ZeTimeSampleProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2018-2021 Daniele Gobbetti, Sebastian Kranz
+/*  Copyright (C) 2018-2024 Daniele Gobbetti, Sebastian Kranz
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.zetime;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractActivitySample.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractActivitySample.java
index 1667e7ff4..b43b13216 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractActivitySample.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractActivitySample.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.entities;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractFitProActivitySample.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractFitProActivitySample.java
index d9f3c5bf3..f72fc4a75 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractFitProActivitySample.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractFitProActivitySample.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2021-2024 Petr Vaněk
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.entities;
 
 public abstract class AbstractFitProActivitySample extends AbstractActivitySample {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractGBX100ActivitySample.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractGBX100ActivitySample.java
index a7a8d66eb..bd3233092 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractGBX100ActivitySample.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractGBX100ActivitySample.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Andreas Shimokawa
+/*  Copyright (C) 2020-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.entities;
 
 public abstract class AbstractGBX100ActivitySample extends AbstractActivitySample {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractHeartRateSample.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractHeartRateSample.java
index b8108b41d..7c2327cc0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractHeartRateSample.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractHeartRateSample.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.entities;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractHybridHRActivitySample.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractHybridHRActivitySample.java
index 95967097e..046a9a820 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractHybridHRActivitySample.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractHybridHRActivitySample.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Daniel Dakhno
+/*  Copyright (C) 2020-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.entities;
 
 public abstract class AbstractHybridHRActivitySample extends AbstractActivitySample {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractPaiSample.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractPaiSample.java
index c418d5146..e8ff17b0b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractPaiSample.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractPaiSample.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.entities;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractPebbleHealthActivitySample.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractPebbleHealthActivitySample.java
index dd77654a5..4a7ac5f93 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractPebbleHealthActivitySample.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractPebbleHealthActivitySample.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa
+/*  Copyright (C) 2016-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.entities;
 
 import nodomain.freeyourgadget.gadgetbridge.model.ActivityKind;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractPebbleMisfitActivitySample.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractPebbleMisfitActivitySample.java
index 7e154dbc7..3683010eb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractPebbleMisfitActivitySample.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractPebbleMisfitActivitySample.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa
+/*  Copyright (C) 2016-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.entities;
 
 import nodomain.freeyourgadget.gadgetbridge.model.ActivityKind;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractPebbleMorpheuzActivitySample.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractPebbleMorpheuzActivitySample.java
index 73a859db2..b9ce056f8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractPebbleMorpheuzActivitySample.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractPebbleMorpheuzActivitySample.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa
+/*  Copyright (C) 2016-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.entities;
 
 import nodomain.freeyourgadget.gadgetbridge.model.ActivityKind;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractSleepRespiratoryRateSample.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractSleepRespiratoryRateSample.java
index 2d35a63f1..ca0e020f8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractSleepRespiratoryRateSample.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractSleepRespiratoryRateSample.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.entities;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractSpo2Sample.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractSpo2Sample.java
index 8b73972a0..9071f2c37 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractSpo2Sample.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractSpo2Sample.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.entities;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractStressSample.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractStressSample.java
index 91ff6fe01..dc1c6aaf6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractStressSample.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractStressSample.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.entities;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractTemperatureSample.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractTemperatureSample.java
index 40b75c3bc..d3376609d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractTemperatureSample.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractTemperatureSample.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 Alicia Hormann
+/*  Copyright (C) 2023-2024 Alicia Hormann
 
     This file is part of Gadgetbridge.
 
@@ -13,8 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.entities;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractTimeSample.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractTimeSample.java
index ef9476395..281513b56 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractTimeSample.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractTimeSample.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.entities;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/export/ActivityTrackExporter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/export/ActivityTrackExporter.java
index 2be498adc..9548cbec5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/export/ActivityTrackExporter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/export/ActivityTrackExporter.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Carsten Pfeiffer, Daniele Gobbetti
+/*  Copyright (C) 2017-2024 Carsten Pfeiffer, Daniele Gobbetti, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.export;
 
 import java.io.File;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/export/GPXExporter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/export/GPXExporter.java
index ad8ff59e9..925e6ff86 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/export/GPXExporter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/export/GPXExporter.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, AndrewH, Carsten Pfeiffer,
-    Daniele Gobbetti, Dikay900, Nick Spacek
+/*  Copyright (C) 2017-2024 Andreas Shimokawa, AndrewH, Carsten Pfeiffer,
+    Daniele Gobbetti, Dikay900, José Rebelo, Nick Spacek, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.export;
 
 import android.util.Xml;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/AlarmClockReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/AlarmClockReceiver.java
index c6967054b..33fcb6191 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/AlarmClockReceiver.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/AlarmClockReceiver.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2020 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+/*  Copyright (C) 2017-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
     Gobbetti
 
     This file is part of Gadgetbridge.
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.externalevents;
 
 import android.content.BroadcastReceiver;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/AlarmReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/AlarmReceiver.java
index f1a93f9c2..313b91e32 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/AlarmReceiver.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/AlarmReceiver.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2020 Andreas Shimokawa, Daniele Gobbetti
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Daniele Gobbetti, Ganblejs
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.externalevents;
 
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/AutoStartReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/AutoStartReceiver.java
index f445c23da..54ab6d24e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/AutoStartReceiver.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/AutoStartReceiver.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2017-2020 Carsten Pfeiffer, Daniele Gobbetti, Felix
-    Konstantin Maurer
+/*  Copyright (C) 2017-2024 Carsten Pfeiffer, Daniele Gobbetti, Felix
+    Konstantin Maurer, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.externalevents;
 
 import android.content.BroadcastReceiver;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/BluetoothConnectReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/BluetoothConnectReceiver.java
index 83fd71c38..5fe53eb7a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/BluetoothConnectReceiver.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/BluetoothConnectReceiver.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2020 Andreas Shimokawa
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.externalevents;
 
 import android.bluetooth.BluetoothDevice;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/BluetoothPairingRequestReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/BluetoothPairingRequestReceiver.java
index 882373b3f..fcd8a3bee 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/BluetoothPairingRequestReceiver.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/BluetoothPairingRequestReceiver.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2016-2020 Andreas Shimokawa, Daniele Gobbetti, João
-    Paulo Barraca
+/*  Copyright (C) 2017-2024 Andreas Shimokawa, Daniel Dakhno, Daniele Gobbetti,
+    João Paulo Barraca, Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.externalevents;
 
 import android.bluetooth.BluetoothDevice;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/BluetoothStateChangeReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/BluetoothStateChangeReceiver.java
index 801f66abd..8d7627fde 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/BluetoothStateChangeReceiver.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/BluetoothStateChangeReceiver.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+    Gobbetti, Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.externalevents;
 
 import android.bluetooth.BluetoothAdapter;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/CMWeatherReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/CMWeatherReceiver.java
index bd71fecc7..19f4eb43d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/CMWeatherReceiver.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/CMWeatherReceiver.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2020 Andreas Shimokawa
+/*  Copyright (C) 2017-2024 Andreas Shimokawa, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.externalevents;
 
 import android.app.AlarmManager;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/CalendarReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/CalendarReceiver.java
index 658960e94..7ea876559 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/CalendarReceiver.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/CalendarReceiver.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2017-2020 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Daniel Hauck
+/*  Copyright (C) 2017-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+    Gobbetti, Daniel Hauck, Gabriele Monaco, José Rebelo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.externalevents;
 
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/DeviceSettingsReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/DeviceSettingsReceiver.java
index ec913e8ac..682bb8f67 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/DeviceSettingsReceiver.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/DeviceSettingsReceiver.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.externalevents;
 
 import android.annotation.SuppressLint;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/GenericWeatherReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/GenericWeatherReceiver.java
index b56482841..8ab6281c2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/GenericWeatherReceiver.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/GenericWeatherReceiver.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2020 Andreas Shimokawa
+/*  Copyright (C) 2022-2024 Daniele Gobbetti, Enrico Brambilla, José Rebelo,
+    TylerWilliamson
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 package nodomain.freeyourgadget.gadgetbridge.externalevents;
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/IntentApiReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/IntentApiReceiver.java
index 5354d1478..8871dbee0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/IntentApiReceiver.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/IntentApiReceiver.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo, octospacc
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.externalevents;
 
 import android.content.BroadcastReceiver;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/LineageOsWeatherReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/LineageOsWeatherReceiver.java
index fc87df6a8..add66a6f8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/LineageOsWeatherReceiver.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/LineageOsWeatherReceiver.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2017-2020 Andreas Shimokawa, keeshii
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, José Rebelo, keeshii,
+    Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.externalevents;
 
 import static lineageos.providers.WeatherContract.WeatherColumns.TempUnit.FAHRENHEIT;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/MusicPlaybackReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/MusicPlaybackReceiver.java
index a098bc826..ff5c1e171 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/MusicPlaybackReceiver.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/MusicPlaybackReceiver.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2020 andre, Andreas Shimokawa, Avamander, Carsten
+/*  Copyright (C) 2015-2024 andre, Andreas Shimokawa, Avamander, Carsten
     Pfeiffer, Daniele Gobbetti
 
     This file is part of Gadgetbridge.
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.externalevents;
 
 import android.content.BroadcastReceiver;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
index 191dba293..1dc673a45 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
@@ -1,7 +1,10 @@
-/*  Copyright (C) 2015-2020 abettenburg, Andreas Shimokawa, AndrewBedscastle,
-    Carsten Pfeiffer, Daniel Dakhno, Daniele Gobbetti, Frank Slezak, Hasan Ammar,
-    José Rebelo, Julien Pivotto, Kevin Richter, Matthieu Baerts, Normano64,
-    Steffen Liebergeld, Taavi Eomäe, veecue, Zhong Jianxin
+/*  Copyright (C) 2015-2024 abettenburg, Andreas Böhler, Andreas Shimokawa,
+    AndrewBedscastle, Arjan Schrijver, Carsten Pfeiffer, Daniel Dakhno, Daniele
+    Gobbetti, Davis Mosenkovs, Dmitriy Bogdanov, Dmitry Markin, Frank Slezak,
+    gnufella, Gordon Williams, Hasan Ammar, José Rebelo, Julien Pivotto,
+    Kevin Richter, mamucho, Matthieu Baerts, mvn23, Normano64, Petr Kadlec,
+    Petr Vaněk, Steffen Liebergeld, Taavi Eomäe, theghostofheathledger, t-m-w,
+    veecue, Zhong Jianxin
 
     This file is part of Gadgetbridge.
 
@@ -16,7 +19,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.externalevents;
 
 import android.app.ActivityManager;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/OmniJawsObserver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/OmniJawsObserver.java
index d59c34e61..579e30e05 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/OmniJawsObserver.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/OmniJawsObserver.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2020 Carsten Pfeiffer, Daniele Gobbetti
+/*  Copyright (C) 2017-2024 Carsten Pfeiffer, Daniele Gobbetti, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.externalevents;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/OsmandEventReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/OsmandEventReceiver.java
index 87db2ddc2..c33a508d2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/OsmandEventReceiver.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/OsmandEventReceiver.java
@@ -1,3 +1,20 @@
+/*  Copyright (C) 2021-2024 Andreas Shimokawa, Arjan Schrijver, Gordon
+    Williams, José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.externalevents;
 
 import android.app.Application;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/PebbleReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/PebbleReceiver.java
index 081539bd0..8e4ca405a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/PebbleReceiver.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/PebbleReceiver.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+    Gobbetti, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.externalevents;
 
 import android.content.BroadcastReceiver;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/PhoneCallReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/PhoneCallReceiver.java
index a912cea18..7b700a546 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/PhoneCallReceiver.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/PhoneCallReceiver.java
@@ -1,5 +1,6 @@
-/*  Copyright (C) 2015-2020 Andreas Böhler, Andreas Shimokawa, Carsten
-    Pfeiffer, Daniele Gobbetti, Johannes Tysiak, Normano64
+/*  Copyright (C) 2015-2024 Andreas Böhler, Andreas Shimokawa, Carsten
+    Pfeiffer, Daniele Gobbetti, Johannes Tysiak, José Rebelo, mvn23, Normano64,
+    Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +15,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.externalevents;
 
 import android.app.NotificationManager;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/SMSReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/SMSReceiver.java
index 6d1812133..d05ba28b5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/SMSReceiver.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/SMSReceiver.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2015-2020 0nse, Andreas Shimokawa, Carsten Pfeiffer,
-    Daniele Gobbetti, Normano64, Zhong Jianxin
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+    Gobbetti, mvn23, Normano64, Zhong Jianxin
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.externalevents;
 
 import android.app.NotificationManager;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/SilentModeReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/SilentModeReceiver.java
index 84eeb57af..6b8032da0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/SilentModeReceiver.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/SilentModeReceiver.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.externalevents;
 
 import android.content.BroadcastReceiver;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/TimeChangeReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/TimeChangeReceiver.java
index b577af466..8b6f566fe 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/TimeChangeReceiver.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/TimeChangeReceiver.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.externalevents;
 
 import android.app.AlarmManager;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/TinyWeatherForecastGermanyReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/TinyWeatherForecastGermanyReceiver.java
index b8c61b8c7..d9d7e83e2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/TinyWeatherForecastGermanyReceiver.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/TinyWeatherForecastGermanyReceiver.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020 Andreas Shimokawa
+/*  Copyright (C) 2020-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 package nodomain.freeyourgadget.gadgetbridge.externalevents;
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/WeatherNotificationConfig.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/WeatherNotificationConfig.java
index f495a5dbf..e07254d8b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/WeatherNotificationConfig.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/WeatherNotificationConfig.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2020 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
     Gobbetti
 
     This file is part of Gadgetbridge.
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.externalevents;
 
 import android.os.Bundle;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/WeatherNotificationReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/WeatherNotificationReceiver.java
index 79b87f3fe..7643545ca 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/WeatherNotificationReceiver.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/WeatherNotificationReceiver.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Daniele Gobbetti
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Daniele Gobbetti
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.externalevents;
 
 import android.content.BroadcastReceiver;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/gps/AbstractLocationProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/gps/AbstractLocationProvider.java
index b746c5616..6789512d6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/gps/AbstractLocationProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/gps/AbstractLocationProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo, LukasEdl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.externalevents.gps;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/gps/GBLocationListener.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/gps/GBLocationListener.java
index 790442d02..a207e1027 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/gps/GBLocationListener.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/gps/GBLocationListener.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 illis, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.externalevents.gps;
 
 import android.location.Location;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/gps/GBLocationManager.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/gps/GBLocationManager.java
index 16f3a17de..2002d6ec8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/gps/GBLocationManager.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/gps/GBLocationManager.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 halemmerich, José Rebelo, LukasEdl, Martin Boonk
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.externalevents.gps;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/gps/LocationProviderType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/gps/LocationProviderType.java
index fb74873f3..c040abec1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/gps/LocationProviderType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/gps/LocationProviderType.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 LukasEdl
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.externalevents.gps;
 
 public enum LocationProviderType {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/gps/MockLocationProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/gps/MockLocationProvider.java
index f788a8a63..66ab2f2c9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/gps/MockLocationProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/gps/MockLocationProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo, LukasEdl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.externalevents.gps;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/gps/PhoneGpsLocationProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/gps/PhoneGpsLocationProvider.java
index 2a8f44b89..bb926e0f7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/gps/PhoneGpsLocationProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/gps/PhoneGpsLocationProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo, LukasEdl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.externalevents.gps;
 
 import android.Manifest;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/gps/PhoneNetworkLocationProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/gps/PhoneNetworkLocationProvider.java
index 9a0863a07..7d0a1a624 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/gps/PhoneNetworkLocationProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/gps/PhoneNetworkLocationProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 Lukas, LukasEdl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.externalevents.gps;
 
 import android.Manifest;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/notifications/GoogleMapsNotificationHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/notifications/GoogleMapsNotificationHandler.java
index e2777ff97..9a5071277 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/notifications/GoogleMapsNotificationHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/notifications/GoogleMapsNotificationHandler.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2023-2024 Arjan Schrijver, Gordon Williams
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.externalevents.notifications;
 
 import android.app.Notification;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/opentracks/OpenTracksContentObserver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/opentracks/OpenTracksContentObserver.java
index cd2374338..f9c60d116 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/opentracks/OpenTracksContentObserver.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/opentracks/OpenTracksContentObserver.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 Arjan Schrijver
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 package nodomain.freeyourgadget.gadgetbridge.externalevents.opentracks;
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/opentracks/OpenTracksController.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/opentracks/OpenTracksController.java
index 9b0d20bdb..8d256d24f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/opentracks/OpenTracksController.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/opentracks/OpenTracksController.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 Arjan Schrijver
+/*  Copyright (C) 2022-2024 Arjan Schrijver, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 package nodomain.freeyourgadget.gadgetbridge.externalevents.opentracks;
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/opentracks/Track.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/opentracks/Track.java
index 6b9032472..04a932e91 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/opentracks/Track.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/opentracks/Track.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 Arjan Schrijver
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 package nodomain.freeyourgadget.gadgetbridge.externalevents.opentracks;
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/opentracks/TrackStatistics.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/opentracks/TrackStatistics.java
index 3e40583b8..efd5fc250 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/opentracks/TrackStatistics.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/opentracks/TrackStatistics.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 Arjan Schrijver
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 package nodomain.freeyourgadget.gadgetbridge.externalevents.opentracks;
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDevice.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDevice.java
index e8f703692..2b254f334 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDevice.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDevice.java
@@ -1,5 +1,6 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniel
-    Dakhno, Daniele Gobbetti, José Rebelo, Taavi Eomäe, Uwe Hermann
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Arjan Schrijver, Carsten
+    Pfeiffer, Daniel Dakhno, Daniele Gobbetti, José Rebelo, Petr Vaněk, Taavi
+    Eomäe, Uwe Hermann
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +15,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.impl;
 
 import static nodomain.freeyourgadget.gadgetbridge.model.BatteryState.UNKNOWN;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceApp.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceApp.java
index 454ae2796..45d66d7dd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceApp.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceApp.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Arjan Schrijver, Carsten
+    Pfeiffer, Daniele Gobbetti
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.impl;
 
 import android.graphics.Bitmap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceCandidate.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceCandidate.java
index 54a992c3c..4975a5b60 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceCandidate.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceCandidate.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Taavi Eomäe
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniel
+    Dakhno, Daniele Gobbetti, José Rebelo, Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.impl;
 
 import android.bluetooth.BluetoothDevice;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceFolder.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceFolder.java
index b0c6e7e9b..36c24808d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceFolder.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceFolder.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 Daniel Dakhno
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.impl;
 
 import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceService.java
index bd9e68a14..463efe909 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceService.java
@@ -1,7 +1,8 @@
-/*  Copyright (C) 2015-2021 Alberto, Andreas Böhler, Andreas Shimokawa,
-    Carsten Pfeiffer, criogenic, Daniel Dakhno, Daniele Gobbetti, Frank Slezak,
-    ivanovlev, José Rebelo, Julien Pivotto, Kasha, Roi Greenberg, Sebastian
-    Kranz, Steffen Liebergeld
+/*  Copyright (C) 2015-2024 Alberto, Andreas Böhler, Andreas Shimokawa,
+    Arjan Schrijver, Carsten Pfeiffer, criogenic, Daniel Dakhno, Daniele Gobbetti,
+    Davis Mosenkovs, Frank Slezak, Gabriele Monaco, Gordon Williams, ivanovlev,
+    José Rebelo, Julien Pivotto, Kasha, mvn23, Petr Vaněk, Roi Greenberg,
+    Sebastian Kranz, Steffen Liebergeld
 
     This file is part of Gadgetbridge.
 
@@ -16,7 +17,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.impl;
 
 import android.app.Service;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBSummaryOfDay.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBSummaryOfDay.java
index a7ff467e0..eeb3397d5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBSummaryOfDay.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBSummaryOfDay.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Carsten Pfeiffer
+/*  Copyright (C) 2015-2024 Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.impl;
 
 import nodomain.freeyourgadget.gadgetbridge.model.SummaryOfDay;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/AbstractNotificationPattern.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/AbstractNotificationPattern.java
index f9bd647fd..56a26bf2a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/AbstractNotificationPattern.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/AbstractNotificationPattern.java
@@ -1,22 +1,19 @@
-/*
- *   Copyright (C) 2023 akasaka / Genjitsu Labs
- *
- *     This file is part of Gadgetbridge.
- *
- *     Gadgetbridge is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU Affero General Public License as published
- *     by the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Gadgetbridge is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU Affero General Public License for more details.
- *
- *     You should have received a copy of the GNU Affero General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.model;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityAmount.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityAmount.java
index e5e71c137..444b35d9f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityAmount.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityAmount.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer, Pavel Elagin
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Pavel Elagin
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.model;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityAmounts.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityAmounts.java
index 1302c48c9..812983eeb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityAmounts.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityAmounts.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2020 Carsten Pfeiffer
+/*  Copyright (C) 2015-2024 Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.model;
 
 import java.util.ArrayList;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityKind.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityKind.java
index 6a161373d..d80bed817 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityKind.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityKind.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+    Gobbetti, José Rebelo, Petr Vaněk, Sebastian Krey, Your Name
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.model;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityPoint.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityPoint.java
index cca603199..e36a5cfd4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityPoint.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityPoint.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2020 Carsten Pfeiffer, Daniele Gobbetti
+/*  Copyright (C) 2017-2024 Carsten Pfeiffer, Daniele Gobbetti, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.model;
 
 import java.util.Date;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySample.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySample.java
index e98d50bf0..bc5ec3419 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySample.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySample.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.model;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySession.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySession.java
index bf6016d07..6db9e7e9a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySession.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySession.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2020-2024 Petr Vaněk
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.model;
 
 import java.io.Serializable;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySummary.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySummary.java
index f069abd00..17efcb9f4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySummary.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySummary.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2020 Carsten Pfeiffer
+/*  Copyright (C) 2017-2024 Carsten Pfeiffer, José Rebelo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.model;
 
 import java.io.Serializable;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySummaryEntries.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySummaryEntries.java
index 525c94d4d..fb5c4894d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySummaryEntries.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySummaryEntries.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.model;
 
 public class ActivitySummaryEntries {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySummaryItems.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySummaryItems.java
index e0e667494..650ed6ce5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySummaryItems.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySummaryItems.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2020-2024 Petr Vaněk
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.model;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySummaryJsonSummary.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySummaryJsonSummary.java
index 5dbfd8ab5..55e8c2076 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySummaryJsonSummary.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySummaryJsonSummary.java
@@ -1,3 +1,20 @@
+/*  Copyright (C) 2020-2024 José Rebelo, Petr Vaněk, Reiner Herrmann,
+    Sebastian Krey
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.model;
 
 import static nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries.*;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySummaryParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySummaryParser.java
index 49799b8d7..1be80011a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySummaryParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySummaryParser.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020 Andreas Shimokawa
+/*  Copyright (C) 2020-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.model;
 
 import nodomain.freeyourgadget.gadgetbridge.entities.BaseActivitySummary;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityTrack.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityTrack.java
index 073f25b89..84563bf28 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityTrack.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityTrack.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2020 Carsten Pfeiffer
+/*  Copyright (C) 2017-2024 Carsten Pfeiffer, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.model;
 
 import java.util.ArrayList;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityUser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityUser.java
index 138eb7302..68102c6c8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityUser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityUser.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2016-2020 0nse, Andreas Shimokawa, Carsten Pfeiffer,
-    Daniele Gobbetti, Sebastian Kranz
+/*  Copyright (C) 2016-2024 0nse, Andreas Shimokawa, Carsten Pfeiffer,
+    Damien Gaignon, Daniele Gobbetti, José Rebelo, Petr Vaněk, Sebastian Kranz
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.model;
 
 import java.util.Calendar;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/Alarm.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/Alarm.java
index 29cb6faaa..5af2a2a3e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/Alarm.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/Alarm.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Dmitry
+    Markin, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.model;
 
 import java.io.Serializable;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/AppNotificationType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/AppNotificationType.java
index 8ddd2b59c..6f16a4d67 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/AppNotificationType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/AppNotificationType.java
@@ -1,6 +1,7 @@
-/*  Copyright (C) 2016-2020 Andreas Shimokawa, AnthonyDiGirolamo, Daniele
-    Gobbetti, Frank Slezak, Kaz Wolfe, Kevin Richter, Lukas Veneziano, Marvin D,
-    Matthieu Baerts, michaelneu, NotAFIle, Tomas Radej, w2q
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, AnthonyDiGirolamo, Daniele
+    Gobbetti, Davis Mosenkovs, foxstidious, Frank Slezak, Kaz Wolfe, Kevin Richter,
+    Lukas Veneziano, Marvin D, Matthieu Baerts, Mave95, Maxim Baz, michaelneu,
+    musover, NotAFIle, Tomas Radej, w2q
 
     This file is part of Gadgetbridge.
 
@@ -15,7 +16,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.model;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/BatteryConfig.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/BatteryConfig.java
index cc627b598..72a67c30f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/BatteryConfig.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/BatteryConfig.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Petr Vaněk
+/*  Copyright (C) 2021-2024 José Rebelo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 package nodomain.freeyourgadget.gadgetbridge.model;
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/BatteryState.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/BatteryState.java
index 7ce59226e..d54c66c56 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/BatteryState.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/BatteryState.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2020 Daniele Gobbetti, José Rebelo
+/*  Copyright (C) 2015-2024 Daniele Gobbetti, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.model;
 
 public enum BatteryState {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/CalendarEventSpec.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/CalendarEventSpec.java
index 13fed4e2e..198f132a5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/CalendarEventSpec.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/CalendarEventSpec.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2016-2020 Andreas Shimokawa, Daniele Gobbetti
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Daniele Gobbetti, Gabriele
+    Monaco
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.model;
 
 public class CalendarEventSpec {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/CallSpec.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/CallSpec.java
index ac1a09cb4..a7561c1d5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/CallSpec.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/CallSpec.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2016-2020 Andreas Shimokawa
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Davis Mosenkovs, Dmitry
+    Markin, mvn23
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.model;
 
 public class CallSpec {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/CannedMessagesSpec.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/CannedMessagesSpec.java
index ae16cfbc1..39351efdb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/CannedMessagesSpec.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/CannedMessagesSpec.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2020 Andreas Shimokawa
+/*  Copyright (C) 2016-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.model;
 
 public class CannedMessagesSpec {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/Contact.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/Contact.java
index 2c5361958..115f24e23 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/Contact.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/Contact.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.model;
 
 import java.io.Serializable;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DailyTotals.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DailyTotals.java
index a7e2bf90e..5abf7ea7d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DailyTotals.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DailyTotals.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2019-2020 Andreas Shimokawa, vanous
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniel
+    Dakhno, José Rebelo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.model;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceService.java
index e83ab9ab6..87ca68fca 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceService.java
@@ -1,6 +1,8 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer, Daniel
-    Dakhno, Daniele Gobbetti, Frank Slezak, ivanovlev, JohnnySun, José Rebelo,
-    Julien Pivotto, Kasha, Sebastian Kranz, Steffen Liebergeld, vanous
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Arjan Schrijver, Carsten
+    Pfeiffer, Daniel Dakhno, Daniele Gobbetti, Davis Mosenkovs, Frank Slezak,
+    Gabriele Monaco, Gordon Williams, ivanovlev, JohnnySun, José Rebelo, Julien
+    Pivotto, Kasha, mvn23, Petr Vaněk, Sebastian Kranz, Steffen Liebergeld,
+    Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -15,7 +17,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.model;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.EventHandler;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
index acd163f66..120ae4244 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
@@ -1,9 +1,15 @@
-/*  Copyright (C) 2015-2023 Andreas Böhler, Andreas Shimokawa, Carsten
-    Pfeiffer, Cre3per, Daniel Dakhno, Daniele Gobbetti, Gordon Williams,
-    Jean-François Greffier, João Paulo Barraca, José Rebelo, Kranz, ladbsoft,
-    Manuel Ruß, maxirnilian, Pavel, Pavel Elagin, protomors, Quallenauge,
-    Sami Alaoui, Sebastian Kranz, Sophanimus, tiparega, Vadim Kaushan,
-    Johannes Krude
+/*  Copyright (C) 2015-2024 115ek, akasaka / Genjitsu Labs, Alicia Hormann,
+    Andreas Böhler, Andreas Shimokawa, Andrew Watkins, angelpup, Carsten Pfeiffer,
+    Cre3per, Damien Gaignon, DanialHanif, Daniel Dakhno, Daniele Gobbetti, Daniel
+    Thompson, Da Pa, Dmytro Bielik, Frank Ertl, Gabriele Monaco, GeekosaurusR3x,
+    Gordon Williams, Jean-François Greffier, jfgreffier, jhey, João Paulo
+    Barraca, Jochen S, Johannes Krude, José Rebelo, ksiwczynski, ladbsoft,
+    Lesur Frederic, Maciej Kuśnierz, mamucho, Manuel Ruß, Maxime Reyrolle,
+    maxirnilian, Michael, narektor, Noodlez, odavo32nof, opavlov, pangwalla,
+    Pavel Elagin, Petr Kadlec, Petr Vaněk, protomors, Quallenauge, Quang Ngô,
+    Raghd Hamzeh, Sami Alaoui, Sebastian Kranz, sedy89, Sophanimus, Stefan Bora,
+    Taavi Eomäe, thermatk, tiparega, Vadim Kaushan, x29a, xaos, Yoran Vulker,
+    Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -18,7 +24,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.model;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.DeviceCoordinator;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/GPSCoordinate.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/GPSCoordinate.java
index d1a75f104..6938857ea 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/GPSCoordinate.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/GPSCoordinate.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2020 Carsten Pfeiffer
+/*  Copyright (C) 2017-2024 Carsten Pfeiffer, José Rebelo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.model;
 
 import java.math.BigDecimal;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/GenericItem.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/GenericItem.java
index e71197551..94fbd0ba8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/GenericItem.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/GenericItem.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2020 Carsten Pfeiffer
+/*  Copyright (C) 2015-2024 Arjan Schrijver, Carsten Pfeiffer, Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.model;
 
 import android.graphics.Bitmap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/HeartRateSample.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/HeartRateSample.java
index e327118a2..d446c9b8b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/HeartRateSample.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/HeartRateSample.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Carsten Pfeiffer, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.model;
 
 public interface HeartRateSample extends TimeSample {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ItemWithDetails.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ItemWithDetails.java
index 01bbd761d..60a9ccb94 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ItemWithDetails.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ItemWithDetails.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Arjan Schrijver, Carsten
+    Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.model;
 
 import android.graphics.Bitmap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/Measurement.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/Measurement.java
index 0790a24d8..2d2de2ac5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/Measurement.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/Measurement.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2020 Carsten Pfeiffer
+/*  Copyright (C) 2016-2024 Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.model;
 
 public class Measurement {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/MusicSpec.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/MusicSpec.java
index 7c51ca12f..215f9b7ef 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/MusicSpec.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/MusicSpec.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2016-2020 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+    Gobbetti, Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.model;
 
 import java.util.Objects;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/MusicStateSpec.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/MusicStateSpec.java
index ef0c44f8a..9af1747b6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/MusicStateSpec.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/MusicStateSpec.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2016-2020 Andreas Shimokawa, Avamander, Carsten Pfeiffer,
-    Daniele Gobbetti, Steffen Liebergeld
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Avamander, Carsten Pfeiffer,
+    Daniele Gobbetti, Steffen Liebergeld, Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.model;
 
 public class MusicStateSpec {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/NavigationInfoSpec.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/NavigationInfoSpec.java
index 134e37e04..7d45506d6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/NavigationInfoSpec.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/NavigationInfoSpec.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2020 Andreas Shimokawa
+/*  Copyright (C) 2021-2024 Andreas Shimokawa, Arjan Schrijver, Gordon Williams
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.model;
 
 public class NavigationInfoSpec {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/NotificationSpec.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/NotificationSpec.java
index b6c9103fa..c46079285 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/NotificationSpec.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/NotificationSpec.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Daniele Gobbetti, Frank Slezak
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Arjan Schrijver, Daniele
+    Gobbetti, Frank Slezak, José Rebelo, mvn23, Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.model;
 
 import java.io.Serializable;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/NotificationType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/NotificationType.java
index 3b1c93be6..760e39636 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/NotificationType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/NotificationType.java
@@ -1,6 +1,6 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, AnthonyDiGirolamo, Carsten
-    Pfeiffer, Daniele Gobbetti, Frank Slezak, Julien Pivotto, Kaz Wolfe, Kevin
-    Richter, Lukas Veneziano
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, AnthonyDiGirolamo, Carsten
+    Pfeiffer, Daniele Gobbetti, Davis Mosenkovs, Frank Slezak, José Rebelo,
+    Kaz Wolfe, Kevin Richter, Lukas Veneziano, Maxim Baz, musover
 
     This file is part of Gadgetbridge.
 
@@ -15,7 +15,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.model;
 
 import java.util.Arrays;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/PaiSample.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/PaiSample.java
index 3a8247777..afde7fc0b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/PaiSample.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/PaiSample.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.model;
 
 public interface PaiSample extends TimeSample {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/RecordedDataTypes.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/RecordedDataTypes.java
index 53b4dec1a..9439678a9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/RecordedDataTypes.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/RecordedDataTypes.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2018-2024 Andreas Shimokawa, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 package nodomain.freeyourgadget.gadgetbridge.model;
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/Reminder.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/Reminder.java
index 278f26cde..77da46173 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/Reminder.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/Reminder.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019 José Rebelo
+/*  Copyright (C) 2021-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.model;
 
 import java.io.Serializable;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/SleepRespiratoryRateSample.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/SleepRespiratoryRateSample.java
index 7c3a0f3cc..80294486e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/SleepRespiratoryRateSample.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/SleepRespiratoryRateSample.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.model;
 
 public interface SleepRespiratoryRateSample extends TimeSample {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/SleepState.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/SleepState.java
index 65a02ca1f..687a54817 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/SleepState.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/SleepState.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 Yoran Vulker
+/*  Copyright (C) 2023-2024 Yoran Vulker
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.model;
 
 public enum SleepState {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/Spo2Sample.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/Spo2Sample.java
index 9982d550d..67600ba38 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/Spo2Sample.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/Spo2Sample.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.model;
 
 public interface Spo2Sample extends TimeSample {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/StressSample.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/StressSample.java
index a63197593..dcab60e9e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/StressSample.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/StressSample.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.model;
 
 public interface StressSample extends TimeSample {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/SummaryOfDay.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/SummaryOfDay.java
index e123e0727..feb902c06 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/SummaryOfDay.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/SummaryOfDay.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2020 Carsten Pfeiffer
+/*  Copyright (C) 2015-2024 Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.model;
 
 public interface SummaryOfDay {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/TemperatureSample.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/TemperatureSample.java
index 2eac5acbe..ea6e73279 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/TemperatureSample.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/TemperatureSample.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 Alicia Hormann
+/*  Copyright (C) 2023-2024 Alicia Hormann
 
     This file is part of Gadgetbridge.
 
@@ -13,8 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.model;
 
 public interface TemperatureSample extends TimeSample {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/TimeSample.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/TimeSample.java
index 9be675557..1514923ad 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/TimeSample.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/TimeSample.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.model;
 
 public interface TimeSample {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/TimeStamped.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/TimeStamped.java
index 283bef95c..d909a54b2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/TimeStamped.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/TimeStamped.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2020 Carsten Pfeiffer
+/*  Copyright (C) 2016-2024 Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.model;
 
 public interface TimeStamped {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ValidByDate.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ValidByDate.java
index 06881f42b..6785d5edc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ValidByDate.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ValidByDate.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2020 Carsten Pfeiffer
+/*  Copyright (C) 2016-2024 Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.model;
 
 import java.util.Date;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/WearingState.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/WearingState.java
index 17217212c..853de611d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/WearingState.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/WearingState.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 Yoran Vulker
+/*  Copyright (C) 2023-2024 Yoran Vulker
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.model;
 
 public enum WearingState {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/Weather.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/Weather.java
index f83cf9d0d..5d7b78cf2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/Weather.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/Weather.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2016-2020 Andreas Shimokawa, Daniele Gobbetti, Sebastian
-    Kranz
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Daniele Gobbetti, José Rebelo,
+    Petr Vaněk, Sebastian Kranz
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.model;
 
 import org.json.JSONArray;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/WeatherSpec.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/WeatherSpec.java
index e3a78f35e..341ccadbe 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/WeatherSpec.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/WeatherSpec.java
@@ -1,5 +1,6 @@
-/*  Copyright (C) 2016-2020 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Arjan Schrijver, beardhatcode,
+    Carsten Pfeiffer, Daniele Gobbetti, Enrico Brambilla, José Rebelo, Taavi
+    Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +15,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 package nodomain.freeyourgadget.gadgetbridge.model;
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/WorldClock.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/WorldClock.java
index 7b21d9c2c..44b0a08c1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/WorldClock.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/WorldClock.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.model;
 
 import java.io.Serializable;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java
index 9790dc2aa..f701ce681 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java
@@ -1,6 +1,7 @@
-/*  Copyright (C) 2015-2023 Andreas Böhler, Andreas Shimokawa, Carsten
-    Pfeiffer, Daniele Gobbetti, José Rebelo, Pauli Salmenrinne, Sebastian Kranz,
-    Taavi Eomäe, Yoran Vulker
+/*  Copyright (C) 2015-2024 Alicia Hormann, Andreas Böhler, Andreas Shimokawa,
+    Arjan Schrijver, Carsten Pfeiffer, Daniele Gobbetti, Davis Mosenkovs,
+    Dmitriy Bogdanov, foxstidious, Ganblejs, José Rebelo, Pauli Salmenrinne,
+    Petr Vaněk, Taavi Eomäe, Yoran Vulker
 
     This file is part of Gadgetbridge.
 
@@ -15,7 +16,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service;
 
 import android.app.Notification;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
index ac664aecc..6e28e1809 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
@@ -1,8 +1,10 @@
-/*  Copyright (C) 2015-2023 Andreas Böhler, Andreas Shimokawa, Avamander,
-    Carsten Pfeiffer, Daniel Dakhno, Daniele Gobbetti, Daniel Hauck, Dikay900,
-    Frank Slezak, ivanovlev, João Paulo Barraca, José Rebelo, Julien Pivotto,
-    Kasha, keeshii, mamucho, Martin, Matthieu Baerts, Nephiel, Sebastian Kranz,
-    Sergey Trofimov, Steffen Liebergeld, Taavi Eomäe, Uwe Hermann, Yoran Vulker
+/*  Copyright (C) 2015-2024 Andreas Böhler, Andreas Shimokawa, Arjan
+    Schrijver, Avamander, Carsten Pfeiffer, Daniel Dakhno, Daniele Gobbetti,
+    Daniel Hauck, Davis Mosenkovs, Dikay900, Dmitriy Bogdanov, Frank Slezak,
+    Gabriele Monaco, Gordon Williams, ivanovlev, João Paulo Barraca, José
+    Rebelo, Julien Pivotto, Kasha, keeshii, Martin, Matthieu Baerts, mvn23,
+    NekoBox, Nephiel, Petr Vaněk, Sebastian Kranz, Sergey Trofimov, Steffen
+    Liebergeld, Taavi Eomäe, TylerWilliamson, Uwe Hermann, Yoran Vulker
 
     This file is part of Gadgetbridge.
 
@@ -17,7 +19,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service;
 
 import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.*;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceSupport.java
index dd54530f6..95b5d06d6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceSupport.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service;
 
 import android.bluetooth.BluetoothAdapter;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceSupportFactory.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceSupportFactory.java
index d6edb830b..06488dc8a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceSupportFactory.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceSupportFactory.java
@@ -1,10 +1,13 @@
-/*  Copyright (C) 2015-2021 0nse, 115ek, Andreas Böhler, Andreas Shimokawa,
-    angelpup, Carsten Pfeiffer, Cre3per, criogenic, DanialHanif, Daniel Dakhno,
-    Daniele Gobbetti, Dmytro Bielik, Gordon Williams, Jean-François Greffier,
-    João Paulo Barraca, José Rebelo, ladbsoft, Manuel Ruß, maxirnilian,
-    mkusnierz, odavo32nof, opavlov, pangwalla, Pavel Elagin, protomors,
-    Quallenauge, Sami Alaoui, Sebastian Kranz, Sergey Trofimov, Sophanimus,
-    Taavi Eomäe, tiparega, Vadim Kaushan, Yukai Li
+/*  Copyright (C) 2015-2024 115ek, Andreas Böhler, Andreas Shimokawa, Andrew
+    Watkins, angelpup, Carsten Pfeiffer, Cre3per, criogenic, DanialHanif, Daniel
+    Dakhno, Daniele Gobbetti, Daniel Thompson, Da Pa, Dmytro Bielik, Frank Ertl,
+    GeekosaurusR3x, Gordon Williams, Jean-François Greffier, jfgreffier, jhey,
+    João Paulo Barraca, Jochen S, Johannes Krude, José Rebelo, ladbsoft,
+    Lesur Frederic, mamucho, Manuel Ruß, maxirnilian, mkusnierz, narektor,
+    Noodlez, odavo32nof, opavlov, pangwalla, Pavel Elagin, Petr Kadlec, Petr
+    Vaněk, protomors, Quallenauge, Quang Ngô, Raghd Hamzeh, Sami Alaoui,
+    Sebastian Kranz, sedy89, Sergey Trofimov, Sophanimus, Stefan Bora, Taavi
+    Eomäe, thermatk, tiparega, Vadim Kaushan, x29a, xaos, Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -19,7 +22,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service;
 
 import android.bluetooth.BluetoothAdapter;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/NotificationCollectorMonitorService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/NotificationCollectorMonitorService.java
index e859ce713..15a3734cd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/NotificationCollectorMonitorService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/NotificationCollectorMonitorService.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Daniele Gobbetti
+/*  Copyright (C) 2017-2024 Daniele Gobbetti
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service;
 
 import android.app.ActivityManager;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/ServiceDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/ServiceDeviceSupport.java
index f26aa7719..70effe0c3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/ServiceDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/ServiceDeviceSupport.java
@@ -1,6 +1,6 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniel
-    Dakhno, Daniele Gobbetti, José Rebelo, Julien Pivotto, Kasha, Sebastian
-    Kranz, Steffen Liebergeld
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Arjan Schrijver, Carsten
+    Pfeiffer, Daniel Dakhno, José Rebelo, Julien Pivotto, Kasha, Sebastian Kranz,
+    Steffen Liebergeld
 
     This file is part of Gadgetbridge.
 
@@ -15,7 +15,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service;
 
 import android.bluetooth.BluetoothAdapter;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/AbstractBTBRDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/AbstractBTBRDeviceSupport.java
index 282f3525a..8ca3dc86d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/AbstractBTBRDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/AbstractBTBRDeviceSupport.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 Damien Gaignon
+/*  Copyright (C) 2022-2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btbr;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/AbstractTransaction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/AbstractTransaction.java
index f042f859e..1801eed58 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/AbstractTransaction.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/AbstractTransaction.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Böhler, Andreas Shimokawa, Carsten
-    Pfeiffer, Daniele Gobbetti
+/*  Copyright (C) 2022-2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btbr;
 
 import java.text.DateFormat;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/BtBRAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/BtBRAction.java
index 6a9b48a7d..6f80b7fd0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/BtBRAction.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/BtBRAction.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Uwe Hermann
+/*  Copyright (C) 2022-2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btbr;
 
 import android.bluetooth.BluetoothSocket;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/BtBRQueue.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/BtBRQueue.java
index 005a62b13..6cfb2a9dc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/BtBRQueue.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/BtBRQueue.java
@@ -1,20 +1,19 @@
-/*  Copyright (C) 2022 Damien Gaignon
-*
-*    This file is part of Gadgetbridge.
-*
-*    Gadgetbridge is free software: you can redistribute it and/or modify
-*    it under the terms of the GNU Affero General Public License as published
-*    by the Free Software Foundation, either version 3 of the License, or
-*    (at your option) any later version.
-*
-*    Gadgetbridge is distributed in the hope that it will be useful,
-*    but WITHOUT ANY WARRANTY; without even the implied warranty of
-*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*    GNU Affero General Public License for more details.
-*
-*    You should have received a copy of the GNU Affero General Public License
-*    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+/*  Copyright (C) 2022-2024 Damien Gaignon, José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btbr;
 
 import android.bluetooth.BluetoothAdapter;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/SocketCallback.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/SocketCallback.java
index f31effc68..e8aeaae5e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/SocketCallback.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/SocketCallback.java
@@ -1,20 +1,19 @@
-/** Copyright (C) 2022 Damien Gaignon
- *
- *  This file is part of Gadgetbridge.
- *
- *  Gadgetbridge is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as published
- *  by the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Gadgetbridge is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+/*  Copyright (C) 2022-2024 Damien Gaignon
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btbr;
 
 /**
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/Transaction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/Transaction.java
index 46dd4c0a8..3b1f5add4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/Transaction.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/Transaction.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Böhler, Andreas Shimokawa, Carsten
-    Pfeiffer, Daniele Gobbetti
+/*  Copyright (C) 2022-2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btbr;
 
 import java.util.ArrayList;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/TransactionBuilder.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/TransactionBuilder.java
index 2066d1d0e..07d939ba0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/TransactionBuilder.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/TransactionBuilder.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 Damien Gaignon
+/*  Copyright (C) 2022-2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btbr;
 
 import android.os.Build;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/actions/AbortTransactionAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/actions/AbortTransactionAction.java
index c7eed31da..a5736a898 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/actions/AbortTransactionAction.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/actions/AbortTransactionAction.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2022-2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btbr.actions;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/actions/CheckInitializedAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/actions/CheckInitializedAction.java
index ff967c6a1..37db3d9c6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/actions/CheckInitializedAction.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/actions/CheckInitializedAction.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2022-2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btbr.actions;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/actions/PlainAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/actions/PlainAction.java
index 34341b8df..53dc28052 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/actions/PlainAction.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/actions/PlainAction.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2022-2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btbr.actions;
 
 import nodomain.freeyourgadget.gadgetbridge.service.btbr.BtBRAction;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/actions/SetDeviceBusyAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/actions/SetDeviceBusyAction.java
index 2c7990bd6..e985897c3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/actions/SetDeviceBusyAction.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/actions/SetDeviceBusyAction.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2022-2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btbr.actions;
 
 import android.bluetooth.BluetoothSocket;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/actions/SetDeviceStateAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/actions/SetDeviceStateAction.java
index 63a53c3f0..6d7b9ea18 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/actions/SetDeviceStateAction.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/actions/SetDeviceStateAction.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2022-2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btbr.actions;
 
 import android.bluetooth.BluetoothSocket;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/actions/WaitAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/actions/WaitAction.java
index 48c8ab705..fd36b33f6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/actions/WaitAction.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/actions/WaitAction.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2022-2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btbr.actions;
 
 import android.bluetooth.BluetoothSocket;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/actions/WriteAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/actions/WriteAction.java
index 69c5e1099..1125ea41c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/actions/WriteAction.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/actions/WriteAction.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Uwe Hermann
+/*  Copyright (C) 2022-2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btbr.actions;
 
 import android.bluetooth.BluetoothSocket;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btclassic/BtClassicIoThread.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btclassic/BtClassicIoThread.java
index 10dad1269..8ff15e519 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btclassic/BtClassicIoThread.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btclassic/BtClassicIoThread.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Carsten Pfeiffer, Daniele Gobbetti, José Rebelo
+/*  Copyright (C) 2017-2024 Carsten Pfeiffer, Daniele Gobbetti, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btclassic;
 
 import android.bluetooth.BluetoothAdapter;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEDeviceSupport.java
index a07643e9d..234267cf1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEDeviceSupport.java
@@ -1,6 +1,5 @@
-/*  Copyright (C) 2015-2023 Andreas Böhler, Andreas Shimokawa, Carsten
-    Pfeiffer, Daniel Dakhno, Daniele Gobbetti, JohnnySun, José Rebelo,
-    Johannes Krude
+/*  Copyright (C) 2015-2024 Andreas Böhler, Arjan Schrijver, Carsten Pfeiffer,
+    Daniel Dakhno, Daniele Gobbetti, Johannes Krude, JohnnySun, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -15,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle;
 
 import android.bluetooth.BluetoothDevice;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEOperation.java
index 55dd62231..8cf49a89b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEOperation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEOperation.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniel
-    Dakhno, Uwe Hermann
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Damien
+    Gaignon, Daniel Dakhno, Uwe Hermann
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractGattCallback.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractGattCallback.java
index 38a955ccd..3a004a25f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractGattCallback.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractGattCallback.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Carsten Pfeiffer, Daniel Dakhno
+/*  Copyright (C) 2015-2024 Carsten Pfeiffer, Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractTransaction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractTransaction.java
index 7f6f5052c..b2b6309e6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractTransaction.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractTransaction.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Böhler, Andreas Shimokawa, Carsten
-    Pfeiffer, Daniele Gobbetti
+/*  Copyright (C) 2019-2024 Andreas Böhler
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle;
 
 import java.text.DateFormat;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BLETypeConversions.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BLETypeConversions.java
index 264459bbc..9de991709 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BLETypeConversions.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BLETypeConversions.java
@@ -1,5 +1,6 @@
-/*  Copyright (C) 2016-2023 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Lukas Veneziano, Maxim Baz, Johannes Krude
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+    Gobbetti, Johannes Krude, José Rebelo, Lukas Veneziano, Maxim Baz, Petr
+    Kadlec, Robbert Gurdeep Singh, uli
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +15,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle;
 
 import java.nio.charset.StandardCharsets;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BTLEOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BTLEOperation.java
index 10dd49e32..02cf50702 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BTLEOperation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BTLEOperation.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle;
 
 import java.io.IOException;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BleNamesResolver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BleNamesResolver.java
index 60899b13e..31c623b7b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BleNamesResolver.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BleNamesResolver.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, João
-    Paulo Barraca, JohnnySun
+/*  Copyright (C) 2016-2024 Carsten Pfeiffer, João Paulo Barraca, JohnnySun
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle;
 
 import android.util.SparseArray;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEAction.java
index b0ed5e5dc..bdafa4d50 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEAction.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEAction.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Uwe Hermann
+/*  Copyright (C) 2015-2024 Carsten Pfeiffer, Uwe Hermann
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEQueue.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEQueue.java
index a86f44015..492eb231e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEQueue.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEQueue.java
@@ -1,6 +1,6 @@
-/*  Copyright (C) 2015-2021 Andreas Böhler, Andreas Shimokawa, Carsten
-    Pfeiffer, Cre3per, Daniel Dakhno, Daniele Gobbetti, Sergey Trofimov, Taavi
-    Eomäe, Uwe Hermann
+/*  Copyright (C) 2015-2024 Andreas Böhler, Andreas Shimokawa, Carsten
+    Pfeiffer, Cre3per, Daniel Dakhno, Daniele Gobbetti, Gordon Williams, José
+    Rebelo, Sergey Trofimov, Taavi Eomäe, Uwe Hermann, Yoran Vulker
 
     This file is part of Gadgetbridge.
 
@@ -15,7 +15,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle;
 
 import android.bluetooth.BluetoothAdapter;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEServerAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEServerAction.java
index 0e3cb16ff..29ca88d34 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEServerAction.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEServerAction.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Böhler, Andreas Shimokawa, Carsten
-    Pfeiffer, Uwe Hermann
+/*  Copyright (C) 2019-2024 Andreas Böhler
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle;
 
 import android.bluetooth.BluetoothDevice;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/GattCallback.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/GattCallback.java
index a15f24076..16ec0f4f8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/GattCallback.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/GattCallback.java
@@ -1,19 +1,3 @@
-/*  Copyright (C) 2015-2019 Andreas Shimokawa, Carsten Pfeiffer, Daniel Dakhno
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 /*
  * Copyright (C) 2013 The Android Open Source Project
  *
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/GattCharacteristic.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/GattCharacteristic.java
index 1857b4812..acf6d8619 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/GattCharacteristic.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/GattCharacteristic.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2015-2021 Carsten Pfeiffer, Daniele Gobbetti
+/*  Copyright (C) 2015-2024 Carsten Pfeiffer, Daniele Gobbetti, Toby Murray,
+    uli
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle;
 
 import android.bluetooth.BluetoothGattCharacteristic;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/GattDescriptor.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/GattDescriptor.java
index 693a40a3e..9e6a8a960 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/GattDescriptor.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/GattDescriptor.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Daniele Gobbetti
+/*  Copyright (C) 2015-2024 Daniele Gobbetti
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle;
 
 import java.util.UUID;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/GattListenerAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/GattListenerAction.java
index 4f1b61f73..c8f347166 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/GattListenerAction.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/GattListenerAction.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2018-2021 Carsten Pfeiffer
+/*  Copyright (C) 2018-2024 Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle;
 
 public interface GattListenerAction {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/GattServerCallback.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/GattServerCallback.java
index ee6807e23..80ed2ff64 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/GattServerCallback.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/GattServerCallback.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Andreas Böhler
+/*  Copyright (C) 2019-2024 Andreas Böhler
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle;
 
 import android.bluetooth.BluetoothDevice;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/GattService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/GattService.java
index 3246dc77c..9c353b5f7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/GattService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/GattService.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Carsten Pfeiffer, Daniele Gobbetti
+/*  Copyright (C) 2015-2024 Carsten Pfeiffer, Daniele Gobbetti
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/ServerTransaction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/ServerTransaction.java
index e9682a933..bee6de098 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/ServerTransaction.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/ServerTransaction.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Böhler, Andreas Shimokawa, Carsten
-    Pfeiffer, Daniele Gobbetti
+/*  Copyright (C) 2019-2024 Andreas Böhler, Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle;
 
 import java.util.ArrayList;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/ServerTransactionBuilder.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/ServerTransactionBuilder.java
index 7d166a11d..8c2d31bc9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/ServerTransactionBuilder.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/ServerTransactionBuilder.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Andreas Böhler
+/*  Copyright (C) 2019-2024 Andreas Böhler, Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle;
 
 import android.bluetooth.BluetoothDevice;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/Transaction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/Transaction.java
index 90f8296c9..4c5bf4a27 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/Transaction.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/Transaction.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2015-2021 Andreas Böhler, Andreas Shimokawa, Carsten
-    Pfeiffer, Daniele Gobbetti
+/*  Copyright (C) 2015-2024 Andreas Böhler, Andreas Shimokawa, Carsten
+    Pfeiffer, Damien Gaignon, Daniele Gobbetti, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle;
 
 import java.util.ArrayList;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/TransactionBuilder.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/TransactionBuilder.java
index fc0669c1b..07f10e194 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/TransactionBuilder.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/TransactionBuilder.java
@@ -1,5 +1,6 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniel
-    Dakhno, Daniele Gobbetti
+/*  Copyright (C) 2015-2024 Andreas Böhler, Andreas Shimokawa, Carsten
+    Pfeiffer, Damien Gaignon, Daniel Dakhno, Daniele Gobbetti, Frank Ertl,
+    José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +15,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle;
 
 import android.bluetooth.BluetoothGattCharacteristic;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/AbortTransactionAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/AbortTransactionAction.java
index e56720898..f32f2cd2a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/AbortTransactionAction.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/AbortTransactionAction.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2015-2024 Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle.actions;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/AbstractGattListenerWriteAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/AbstractGattListenerWriteAction.java
index 0c8bf3c5c..91c952750 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/AbstractGattListenerWriteAction.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/AbstractGattListenerWriteAction.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2018-2021 Carsten Pfeiffer
+/*  Copyright (C) 2018-2024 Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle.actions;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/BondAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/BondAction.java
index 59face7cd..eacc9afee 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/BondAction.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/BondAction.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2023-2024 Andreas Böhler
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle.actions;
 
 import android.bluetooth.BluetoothDevice;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/CheckInitializedAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/CheckInitializedAction.java
index 6bc3de946..3dc83b5d0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/CheckInitializedAction.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/CheckInitializedAction.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2016-2024 Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle.actions;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/ConditionalWriteAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/ConditionalWriteAction.java
index f1c14b2c1..1c9b7887f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/ConditionalWriteAction.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/ConditionalWriteAction.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle.actions;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/NotifyAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/NotifyAction.java
index 0e923fb52..5986142e9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/NotifyAction.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/NotifyAction.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti
+/*  Copyright (C) 2015-2024 Alicia Hormann, Carsten Pfeiffer, Daniele Gobbetti
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle.actions;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/PlainAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/PlainAction.java
index 9898eb7af..56f4c2cd4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/PlainAction.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/PlainAction.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2015-2024 Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle.actions;
 
 import nodomain.freeyourgadget.gadgetbridge.service.btle.BtLEAction;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/ReadAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/ReadAction.java
index b8bd68057..ee0e8db25 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/ReadAction.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/ReadAction.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti
+/*  Copyright (C) 2015-2024 Carsten Pfeiffer, Daniele Gobbetti
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle.actions;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/RequestConnectionPriorityAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/RequestConnectionPriorityAction.java
index 0ff8c9bff..ab5c916ff 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/RequestConnectionPriorityAction.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/RequestConnectionPriorityAction.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle.actions;
 
 import android.annotation.SuppressLint;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/RequestMtuAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/RequestMtuAction.java
index 9405efcd3..5c20b2803 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/RequestMtuAction.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/RequestMtuAction.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle.actions;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/ServerResponseAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/ServerResponseAction.java
index 7e1a329f7..f49664bac 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/ServerResponseAction.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/ServerResponseAction.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Andreas Böhler
+/*  Copyright (C) 2019-2024 Andreas Böhler
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle.actions;
 
 import android.bluetooth.BluetoothDevice;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/SetDeviceBusyAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/SetDeviceBusyAction.java
index 3a775648f..293298dad 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/SetDeviceBusyAction.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/SetDeviceBusyAction.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2015-2024 Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle.actions;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/SetDeviceStateAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/SetDeviceStateAction.java
index 6a338bcc9..dcc3fd0a5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/SetDeviceStateAction.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/SetDeviceStateAction.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle.actions;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/SetProgressAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/SetProgressAction.java
index 46b4534a0..7996978de 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/SetProgressAction.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/SetProgressAction.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle.actions;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/WaitAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/WaitAction.java
index 1f1b173f4..89c152672 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/WaitAction.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/WaitAction.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2015-2024 Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle.actions;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/WriteAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/WriteAction.java
index 18d0ea1ce..8019aed6e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/WriteAction.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/WriteAction.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Uwe Hermann
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+    Gobbetti, José Rebelo, Uwe Hermann
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle.actions;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/AbstractBleProfile.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/AbstractBleProfile.java
index 3bc3350e7..1a9a8b49c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/AbstractBleProfile.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/AbstractBleProfile.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2016-2021 Carsten Pfeiffer, Daniele Gobbetti, Taavi Eomäe
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Carsten Pfeiffer, Damien
+    Gaignon, Daniele Gobbetti, Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle.profiles;
 
 import android.bluetooth.BluetoothGattCharacteristic;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/IntentListener.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/IntentListener.java
index d1f8a4ce0..6213a4bf7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/IntentListener.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/IntentListener.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2018-2021 Carsten Pfeiffer
+/*  Copyright (C) 2018-2024 Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle.profiles;
 
 import android.content.Intent;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/ValueDecoder.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/ValueDecoder.java
index 70689dbad..d3e9c0d2e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/ValueDecoder.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/ValueDecoder.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Carsten Pfeiffer
+/*  Copyright (C) 2016-2024 Alicia Hormann, Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle.profiles;
 
 import android.bluetooth.BluetoothGattCharacteristic;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/AlertCategory.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/AlertCategory.java
index 3351a8f03..faa726d18 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/AlertCategory.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/AlertCategory.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Uwe Hermann
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Carsten Pfeiffer, Uwe Hermann
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle.profiles.alertnotification;
 
 import java.util.ArrayList;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/AlertLevel.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/AlertLevel.java
index bdeaaae93..0df96b476 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/AlertLevel.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/AlertLevel.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Carsten Pfeiffer
+/*  Copyright (C) 2016-2024 Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle.profiles.alertnotification;
 
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/AlertNotificationControl.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/AlertNotificationControl.java
index fed5e53c2..60615fbfd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/AlertNotificationControl.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/AlertNotificationControl.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Carsten Pfeiffer
+/*  Copyright (C) 2016-2024 Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle.profiles.alertnotification;
 
 import nodomain.freeyourgadget.gadgetbridge.service.btle.BLETypeConversions;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/AlertNotificationProfile.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/AlertNotificationProfile.java
index f076220bc..23f7920bc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/AlertNotificationProfile.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/AlertNotificationProfile.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle.profiles.alertnotification;
 
 import android.bluetooth.BluetoothGattCharacteristic;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/AlertStatus.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/AlertStatus.java
index fc9e3a0ce..36f587a3a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/AlertStatus.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/AlertStatus.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Carsten Pfeiffer
+/*  Copyright (C) 2016-2024 Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle.profiles.alertnotification;
 
 /**
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/Command.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/Command.java
index 6c895a151..7e0908b43 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/Command.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/Command.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Carsten Pfeiffer
+/*  Copyright (C) 2017-2024 Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle.profiles.alertnotification;
 
 /**
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/NewAlert.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/NewAlert.java
index d28eb3404..fa04035aa 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/NewAlert.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/NewAlert.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+/*  Copyright (C) 2017-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
     Gobbetti
 
     This file is part of Gadgetbridge.
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle.profiles.alertnotification;
 
 /**
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/OverflowStrategy.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/OverflowStrategy.java
index 2a35c50b7..9aee0ff82 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/OverflowStrategy.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/OverflowStrategy.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Carsten Pfeiffer
+/*  Copyright (C) 2017-2024 Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle.profiles.alertnotification;
 
 public enum OverflowStrategy {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/SupportedNewAlertCategory.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/SupportedNewAlertCategory.java
index c82c66725..e5734a46d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/SupportedNewAlertCategory.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/alertnotification/SupportedNewAlertCategory.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Carsten Pfeiffer, Uwe Hermann
+/*  Copyright (C) 2016-2024 Carsten Pfeiffer, Uwe Hermann
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle.profiles.alertnotification;
 
 /**
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/battery/BatteryInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/battery/BatteryInfo.java
index 7388dac4f..98d70eb5b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/battery/BatteryInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/battery/BatteryInfo.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Carsten Pfeiffer
+/*  Copyright (C) 2016-2024 Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle.profiles.battery;
 
 import android.os.Parcel;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/battery/BatteryInfoProfile.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/battery/BatteryInfoProfile.java
index eef85c6ba..324a983de 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/battery/BatteryInfoProfile.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/battery/BatteryInfoProfile.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle.profiles.battery;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/deviceinfo/DeviceInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/deviceinfo/DeviceInfo.java
index 216111299..67c450594 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/deviceinfo/DeviceInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/deviceinfo/DeviceInfo.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Carsten Pfeiffer
+/*  Copyright (C) 2016-2024 Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle.profiles.deviceinfo;
 
 import android.os.Parcel;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/deviceinfo/DeviceInfoProfile.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/deviceinfo/DeviceInfoProfile.java
index d80c2b44e..0ebab4bc9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/deviceinfo/DeviceInfoProfile.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/deviceinfo/DeviceInfoProfile.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle.profiles.deviceinfo;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/healthThermometer/HealthThermometerProfile.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/healthThermometer/HealthThermometerProfile.java
index e749f6d84..45cf1c5fa 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/healthThermometer/HealthThermometerProfile.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/healthThermometer/HealthThermometerProfile.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 Alicia Hormann
+/*  Copyright (C) 2023-2024 Alicia Hormann
 
     This file is part of Gadgetbridge.
 
@@ -13,8 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle.profiles.healthThermometer;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/healthThermometer/TemperatureInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/healthThermometer/TemperatureInfo.java
index 4d5781b2e..f17d0e7f0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/healthThermometer/TemperatureInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/healthThermometer/TemperatureInfo.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 Alicia Hormann
+/*  Copyright (C) 2023-2024 Alicia Hormann
 
     This file is part of Gadgetbridge.
 
@@ -13,8 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle.profiles.healthThermometer;
 
 import android.os.Parcel;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/heartrate/BodySensorLocation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/heartrate/BodySensorLocation.java
index 5325bccdf..e3ff66dac 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/heartrate/BodySensorLocation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/heartrate/BodySensorLocation.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Carsten Pfeiffer, Uwe Hermann
+/*  Copyright (C) 2016-2024 Carsten Pfeiffer, Uwe Hermann
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle.profiles.heartrate;
 
 /**
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/heartrate/HeartRateProfile.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/heartrate/HeartRateProfile.java
index 47255f4d2..53e1ec94c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/heartrate/HeartRateProfile.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/profiles/heartrate/HeartRateProfile.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
     Gobbetti
 
     This file is part of Gadgetbridge.
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btle.profiles.heartrate;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/asteroidos/AsteroidOSDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/asteroidos/AsteroidOSDeviceSupport.java
index 4e4e21842..09a3330f3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/asteroidos/AsteroidOSDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/asteroidos/AsteroidOSDeviceSupport.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 Noodlez
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.asteroidos;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java
index c0cee6b81..3c006b109 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java
@@ -1,4 +1,7 @@
-/*  Copyright (C) 2019-2021 Andreas Shimokawa, Gordon Williams
+/*  Copyright (C) 2019-2024 Albert, Andreas Shimokawa, Arjan Schrijver, Damien
+    Gaignon, Gabriele Monaco, Ganblejs, gfwilliams, glemco, Gordon Williams,
+    halemmerich, illis, José Rebelo, Lukas, LukasEdl, Marc Nause, Martin Boonk,
+    rarder44, Richard de Boer, Simon Sievert
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +16,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.banglejs;
 
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_ALLOW_HIGH_MTU;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/BinarySensorBaseSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/BinarySensorBaseSupport.java
index 4369a4503..9154edf10 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/BinarySensorBaseSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/BinarySensorBaseSupport.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 Arjan Schrijver, Daniel Dakhno
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.binary_sensor;
 
 import android.net.Uri;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/BinarySensorSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/BinarySensorSupport.java
index bd176451a..c733c5e1b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/BinarySensorSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/BinarySensorSupport.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 Daniel Dakhno
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.binary_sensor;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/constants/MessageId.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/constants/MessageId.java
index f3e1ef104..2350e77a8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/constants/MessageId.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/constants/MessageId.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 Daniel Dakhno
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.binary_sensor.protocol.constants;
 
 public enum MessageId {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/constants/ParameterId.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/constants/ParameterId.java
index 7559b2b9e..f30b48586 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/constants/ParameterId.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/constants/ParameterId.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 Daniel Dakhno
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.binary_sensor.protocol.constants;
 
 public enum ParameterId {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/constants/ReportState.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/constants/ReportState.java
index cb3af1a5b..8c6b29ad9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/constants/ReportState.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/constants/ReportState.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 Daniel Dakhno
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.binary_sensor.protocol.constants;
 
 public enum ReportState {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/constants/ResultCode.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/constants/ResultCode.java
index f59d4525a..1f593ab58 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/constants/ResultCode.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/constants/ResultCode.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 Daniel Dakhno
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.binary_sensor.protocol.constants;
 
 public enum ResultCode {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/constants/SensorState.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/constants/SensorState.java
index 5bf67c1a3..78a6d350d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/constants/SensorState.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/constants/SensorState.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 Daniel Dakhno
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.binary_sensor.protocol.constants;
 
 public enum SensorState {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/constants/SensorType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/constants/SensorType.java
index 0e66a545e..be2a5bd37 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/constants/SensorType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/constants/SensorType.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 Daniel Dakhno
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.binary_sensor.protocol.constants;
 
 public enum SensorType {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/message/GetSensorRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/message/GetSensorRequest.java
index 6d79c1bd9..0c968a239 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/message/GetSensorRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/message/GetSensorRequest.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 Daniel Dakhno
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.binary_sensor.protocol.message;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.binary_sensor.protocol.constants.MessageId;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/message/Message.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/message/Message.java
index a75d25ae4..fd799af9c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/message/Message.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/message/Message.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 Daniel Dakhno
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.binary_sensor.protocol.message;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/message/Response.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/message/Response.java
index 074663740..bbae40c4a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/message/Response.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/message/Response.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 Daniel Dakhno
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.binary_sensor.protocol.message;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.binary_sensor.protocol.constants.MessageId;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/message/SetSensorRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/message/SetSensorRequest.java
index 676760a4f..97faac5b2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/message/SetSensorRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/message/SetSensorRequest.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 Daniel Dakhno
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.binary_sensor.protocol.message;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.binary_sensor.protocol.constants.MessageId;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/parameter/Parameter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/parameter/Parameter.java
index 2cd9fd445..55d2f132a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/parameter/Parameter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/parameter/Parameter.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 Daniel Dakhno
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.binary_sensor.protocol.parameter;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/parameter/ReportStatus.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/parameter/ReportStatus.java
index bcae3994d..1cea9c106 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/parameter/ReportStatus.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/parameter/ReportStatus.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 Daniel Dakhno
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.binary_sensor.protocol.parameter;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.binary_sensor.protocol.constants.ParameterId;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/parameter/ResultCode.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/parameter/ResultCode.java
index 66630249f..008e244a0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/parameter/ResultCode.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/parameter/ResultCode.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 Daniel Dakhno
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.binary_sensor.protocol.parameter;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.binary_sensor.protocol.constants.ParameterId;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/parameter/SensorState.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/parameter/SensorState.java
index 372e4f935..0d392f668 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/parameter/SensorState.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/parameter/SensorState.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 Daniel Dakhno
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.binary_sensor.protocol.parameter;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.binary_sensor.protocol.constants.ParameterId;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/parameter/SensorType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/parameter/SensorType.java
index 62b1d7ef1..1be77cc3d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/parameter/SensorType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/binary_sensor/protocol/parameter/SensorType.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 Daniel Dakhno
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.binary_sensor.protocol.parameter;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.binary_sensor.protocol.constants.ParameterId;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/Casio2C2DSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/Casio2C2DSupport.java
index 9473e4846..3c4828b7f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/Casio2C2DSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/Casio2C2DSupport.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2016-2023 Andreas Böhler, Andreas Shimokawa, Carsten
-    Pfeiffer, Sebastian Kranz, Johannes Krude
+/*  Copyright (C) 2023-2024 Johannes Krude
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.casio;
 
 import java.util.UUID;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/CasioSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/CasioSupport.java
index ea73b4746..8cdf0c430 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/CasioSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/CasioSupport.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021-2023 Andreas Böhler, Johannes Krude
+/*  Copyright (C) 2021-2024 Andreas Böhler, Arjan Schrijver, Johannes Krude
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.casio;
 
 import android.net.Uri;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gb6900/CasioGB6900DeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gb6900/CasioGB6900DeviceSupport.java
index 07f7d3fa8..5df7370ed 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gb6900/CasioGB6900DeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gb6900/CasioGB6900DeviceSupport.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2018-2021 Andreas Böhler, Sebastian Kranz, Taavi Eomäe
+/*  Copyright (C) 2023-2024 Andreas Böhler, Johannes Krude
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.casio.gb6900;
 
 import android.bluetooth.BluetoothDevice;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gb6900/CasioGB6900HandlerThread.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gb6900/CasioGB6900HandlerThread.java
index b6da77088..dd1c4c617 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gb6900/CasioGB6900HandlerThread.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gb6900/CasioGB6900HandlerThread.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2019-2021 Andreas Böhler, Carsten Pfeiffer, Daniele
-    Gobbetti, Taavi Eomäe
+/*  Copyright (C) 2023-2024 Johannes Krude
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.casio.gb6900;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gb6900/InitOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gb6900/InitOperation.java
index 9093d2f0c..1538d7c87 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gb6900/InitOperation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gb6900/InitOperation.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Andreas Böhler, Taavi Eomäe
+/*  Copyright (C) 2023-2024 Johannes Krude
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.casio.gb6900;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gb6900/SetAlarmOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gb6900/SetAlarmOperation.java
index ffbe7ba1e..26d3d5ff5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gb6900/SetAlarmOperation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gb6900/SetAlarmOperation.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Andreas Böhler
+/*  Copyright (C) 2023-2024 Johannes Krude
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.casio.gb6900;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/CasioGBX100DeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/CasioGBX100DeviceSupport.java
index 99d2cdebb..7c70d3a87 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/CasioGBX100DeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/CasioGBX100DeviceSupport.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2016-2023 Andreas Böhler, Andreas Shimokawa, Carsten
-    Pfeiffer, Sebastian Kranz, Johannes Krude
+/*  Copyright (C) 2023-2024 Andreas Böhler, foxstidious, Johannes Krude
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.casio.gbx100;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/FetchStepCountDataOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/FetchStepCountDataOperation.java
index 53f0a63c3..a83c1dc9d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/FetchStepCountDataOperation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/FetchStepCountDataOperation.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Andreas Böhler
+/*  Copyright (C) 2023-2024 Johannes Krude
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.casio.gbx100;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/GetConfigurationOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/GetConfigurationOperation.java
index 6d502cfed..e561714fb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/GetConfigurationOperation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/GetConfigurationOperation.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Andreas Böhler
+/*  Copyright (C) 2023-2024 Johannes Krude
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.casio.gbx100;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/InitOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/InitOperation.java
index c0ffa2579..9752c037b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/InitOperation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/InitOperation.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Andreas Böhler, Andreas Shimokawa
+/*  Copyright (C) 2023-2024 Andreas Böhler, Johannes Krude
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.casio.gbx100;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/SetConfigurationOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/SetConfigurationOperation.java
index aa0311e18..26bac73c1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/SetConfigurationOperation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/SetConfigurationOperation.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Andreas Böhler
+/*  Copyright (C) 2023-2024 Johannes Krude
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.casio.gbx100;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gwb5600/CasioGWB5600DeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gwb5600/CasioGWB5600DeviceSupport.java
index 3fd77d128..c1df78774 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gwb5600/CasioGWB5600DeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gwb5600/CasioGWB5600DeviceSupport.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 Johannes Krude
+/*  Copyright (C) 2023-2024 Johannes Krude
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.casio.gwb5600;
 
 import java.util.UUID;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gwb5600/CasioGWB5600TimeZone.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gwb5600/CasioGWB5600TimeZone.java
index d00aa827d..6993b5ac8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gwb5600/CasioGWB5600TimeZone.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gwb5600/CasioGWB5600TimeZone.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 Johannes Krude
+/*  Copyright (C) 2023-2024 Johannes Krude
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 package nodomain.freeyourgadget.gadgetbridge.service.devices.casio.gwb5600;
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gwb5600/InitOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gwb5600/InitOperation.java
index 0b6ca535f..d5072c2d6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gwb5600/InitOperation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gwb5600/InitOperation.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 Johannes Krude
+/*  Copyright (C) 2023-2024 Johannes Krude
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 package nodomain.freeyourgadget.gadgetbridge.service.devices.casio.gwb5600;
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/common/SimpleNotification.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/common/SimpleNotification.java
index 5812d71c2..3274a387c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/common/SimpleNotification.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/common/SimpleNotification.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2017-2024 Andreas Shimokawa, Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.common;
 
 import nodomain.freeyourgadget.gadgetbridge.model.NotificationType;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooIOThread.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooIOThread.java
index e6fc3fa17..40c99f2c7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooIOThread.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooIOThread.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 Andreas Shimokawa
+/*  Copyright (C) 2023-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 package nodomain.freeyourgadget.gadgetbridge.service.devices.divoom;
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooProtocol.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooProtocol.java
index 97258a5d8..3bb2e54b3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooProtocol.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooProtocol.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 Andreas Shimokawa
+/*  Copyright (C) 2023-2024 Andreas Shimokawa, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 package nodomain.freeyourgadget.gadgetbridge.service.devices.divoom;
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooSupport.java
index e595899b1..d08cc4735 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/divoom/PixooSupport.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 Andreas Shimokawa
+/*  Copyright (C) 2023-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 package nodomain.freeyourgadget.gadgetbridge.service.devices.divoom;
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/domyos/DomyosT540Support.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/domyos/DomyosT540Support.java
index b395fffd0..ec62b3306 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/domyos/DomyosT540Support.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/domyos/DomyosT540Support.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2016-2020 Andreas Shimokawa, Carsten Pfeiffer, Sebastian
-    Kranz
+/*  Copyright (C) 2020-2024 Andreas Shimokawa, Arjan Schrijver
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.domyos;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/femometer/FemometerVinca2DeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/femometer/FemometerVinca2DeviceSupport.java
index 3315baa89..55c4ff48c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/femometer/FemometerVinca2DeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/femometer/FemometerVinca2DeviceSupport.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 Alicia Hormann
+/*  Copyright (C) 2023-2024 Alicia Hormann
 
     This file is part of Gadgetbridge.
 
@@ -13,8 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.femometer;
 
 import android.bluetooth.BluetoothGattCharacteristic;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/fitpro/FitProDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/fitpro/FitProDeviceSupport.java
index 411a06af2..78f3b4436 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/fitpro/FitProDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/fitpro/FitProDeviceSupport.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2020 Petr Vaněk
+/*  Copyright (C) 2021-2024 Arjan Schrijver, Damien Gaignon, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 package nodomain.freeyourgadget.gadgetbridge.service.devices.fitpro;
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/flipper/zero/support/FlipperZeroBaseSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/flipper/zero/support/FlipperZeroBaseSupport.java
index 892b54eb6..d631561f2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/flipper/zero/support/FlipperZeroBaseSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/flipper/zero/support/FlipperZeroBaseSupport.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 Arjan Schrijver, Daniel Dakhno
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.flipper.zero.support;
 
 import android.net.Uri;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/flipper/zero/support/FlipperZeroSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/flipper/zero/support/FlipperZeroSupport.java
index cff651c3c..726afd6c0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/flipper/zero/support/FlipperZeroSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/flipper/zero/support/FlipperZeroSupport.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 Daniel Dakhno
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.flipper.zero.support;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/galaxy_buds/GalaxyBudsDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/galaxy_buds/GalaxyBudsDeviceSupport.java
index b63d071b0..43aa14318 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/galaxy_buds/GalaxyBudsDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/galaxy_buds/GalaxyBudsDeviceSupport.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2021-2024 Arjan Schrijver, Petr Vaněk
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.galaxy_buds;
 
 import android.net.Uri;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/galaxy_buds/GalaxyBudsIOThread.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/galaxy_buds/GalaxyBudsIOThread.java
index 5c37a8e8e..9a742fed2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/galaxy_buds/GalaxyBudsIOThread.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/galaxy_buds/GalaxyBudsIOThread.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2021-2024 narektor, Petr Vaněk
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.galaxy_buds;
 
 import static nodomain.freeyourgadget.gadgetbridge.util.GB.hexdump;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/galaxy_buds/GalaxyBudsProtocol.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/galaxy_buds/GalaxyBudsProtocol.java
index 0643b6210..26aae8c08 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/galaxy_buds/GalaxyBudsProtocol.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/galaxy_buds/GalaxyBudsProtocol.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2021-2024 narektor, Petr Vaněk
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.galaxy_buds;
 
 import static nodomain.freeyourgadget.gadgetbridge.util.CheckSums.crc16_ccitt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusDataRecord.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusDataRecord.java
index c5a83f6c5..bc2d3c566 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusDataRecord.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusDataRecord.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 João Paulo Barraca
+/*  Copyright (C) 2017-2024 João Paulo Barraca
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.hplus;
 
 import nodomain.freeyourgadget.gadgetbridge.model.ActivityKind;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusDataRecordDaySlot.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusDataRecordDaySlot.java
index 8816153de..c3265d7ea 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusDataRecordDaySlot.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusDataRecordDaySlot.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, João Paulo Barraca
+/*  Copyright (C) 2017-2024 João Paulo Barraca
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.hplus;
 
 /*
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusDataRecordDaySummary.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusDataRecordDaySummary.java
index 104b268bd..54550d43f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusDataRecordDaySummary.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusDataRecordDaySummary.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 João Paulo Barraca
+/*  Copyright (C) 2017-2024 João Paulo Barraca
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.hplus;
 
 /*
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusDataRecordRealtime.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusDataRecordRealtime.java
index 2337d3407..e22f507e6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusDataRecordRealtime.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusDataRecordRealtime.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Daniele Gobbetti, João Paulo Barraca
+/*  Copyright (C) 2017-2024 Daniele Gobbetti, João Paulo Barraca
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.hplus;
 
 /*
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusDataRecordSleep.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusDataRecordSleep.java
index 46b1d4643..172ea0e07 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusDataRecordSleep.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusDataRecordSleep.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 João Paulo Barraca
+/*  Copyright (C) 2017-2024 João Paulo Barraca
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.hplus;
 
 /*
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusHandlerThread.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusHandlerThread.java
index 987d33606..36e44222d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusHandlerThread.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusHandlerThread.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2017-2021 Daniele Gobbetti, João Paulo Barraca
-    Lesur Frederic
+/*  Copyright (C) 2017-2024 Daniele Gobbetti, João Paulo Barraca, Lesur
+    Frederic
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.hplus;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusSupport.java
index cc23fe4c9..8204afe78 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusSupport.java
@@ -1,6 +1,6 @@
-/*  Copyright (C) 2016-2021 Alberto, Andreas Shimokawa, Carsten Pfeiffer,
-    ivanovlev, João Paulo Barraca, Lesur Frederic, Pavel Motyrev, Quallenauge,
-    Sebastian Kranz
+/*  Copyright (C) 2016-2024 Alberto, Andreas Shimokawa, Arjan Schrijver,
+    Carsten Pfeiffer, Damien Gaignon, ivanovlev, João Paulo Barraca, Lesur
+    Frederic, Pavel Motyrev, Quallenauge, Sebastian Kranz
 
     This file is part of Gadgetbridge.
 
@@ -15,7 +15,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.hplus;
 
 /*
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/AbstractHuami2021FWInstallHandler.java
index 55b465456..722cfc160 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/AbstractHuami2021FWInstallHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/AbstractHuamiActivityDetailsParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/AbstractHuamiActivityDetailsParser.java
index 0514d15e3..89b289bbb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/AbstractHuamiActivityDetailsParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/AbstractHuamiActivityDetailsParser.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, AndrewH, Carsten Pfeiffer,
-    szilardx, José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami;
 
 import java.math.BigDecimal;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/AbstractHuamiFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/AbstractHuamiFirmwareInfo.java
index b768c0472..386f25aae 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/AbstractHuamiFirmwareInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/AbstractHuamiFirmwareInfo.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2022 Andreas Shimokawa, José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami;
 
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 81c27c9d2..c565c4fcb 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2018-2024 Andreas Shimokawa, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiService;
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/Huami2021ActivityDetailsParser.java
index 8f31512b9..1e3eae775 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/Huami2021ActivityDetailsParser.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami;
 
 import androidx.annotation.Nullable;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021ChunkedDecoder.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021ChunkedDecoder.java
index 3afd68774..d9e22add3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021ChunkedDecoder.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021ChunkedDecoder.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 Andreas Shimokawa
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami;
 
 import org.apache.commons.lang3.ArrayUtils;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021ChunkedEncoder.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021ChunkedEncoder.java
index 126b4a988..04908ef8b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021ChunkedEncoder.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021ChunkedEncoder.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 Andreas Shimokawa
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami;
 
 import android.bluetooth.BluetoothGattCharacteristic;
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/Huami2021FirmwareInfo.java
index 7e465ee64..75c740aaf 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/Huami2021FirmwareInfo.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo, MPeter
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami;
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021Handler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021Handler.java
index 154e37cd6..3873650ea 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021Handler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021Handler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami;
 
 public interface Huami2021Handler {
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/Huami2021MenuType.java
index 9eb14a4a8..f4649a9d1 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/Huami2021MenuType.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo, Maxime Reyrolle, Reiner Herrmann,
+    Sky233ml
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami;
 
 import java.util.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/Huami2021Support.java
index ad50e63e7..d0f0fcdb2 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 Daniel Dakhno, José Rebelo, Oleg Vasilev
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami;
 
 import static org.apache.commons.lang3.ArrayUtils.subarray;
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/Huami2021Weather.java
index 75810373b..32897ed25 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/Huami2021Weather.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2022-2023 José Rebelo
+/*  Copyright (C) 2022-2024 Andreas Shimokawa, Arjan Schrijver, José
+    Rebelo, rany
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami;
 
 import android.location.Location;
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/Huami2021WorkoutTrackActivityType.java
index 8e02b095c..e220cb849 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/Huami2021WorkoutTrackActivityType.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo, Sebastian Reichel
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiActivityDetailsParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiActivityDetailsParser.java
index dfedf189c..2f8139850 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiActivityDetailsParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiActivityDetailsParser.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, AndrewH, Carsten Pfeiffer,
-    szilardx
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, José Rebelo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiBatteryInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiBatteryInfo.java
index 9e658debf..43af0266b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiBatteryInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiBatteryInfo.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2018-2024 Andreas Shimokawa, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami;
 
 import java.util.GregorianCalendar;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiDeviceEvent.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiDeviceEvent.java
index 1efa93eb1..130fc7666 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiDeviceEvent.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiDeviceEvent.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2017-2024 Andreas Shimokawa, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami;
 
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiFirmwareInfo.java
index db6c8f6ce..7d73fb6a2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiFirmwareInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiFirmwareInfo.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa
+/*  Copyright (C) 2017-2024 Andreas Shimokawa, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami;
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiFirmwareType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiFirmwareType.java
index ec830c98c..549becccd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiFirmwareType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiFirmwareType.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2017-2024 Andreas Shimokawa, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami;
 
 public enum HuamiFirmwareType {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiIcon.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiIcon.java
index 72550e85b..6b012e2cb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiIcon.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiIcon.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Daniele Gobbetti, Lukas
-    Veneziano, Maxim Baz
+/*  Copyright (C) 2017-2024 Andreas Shimokawa, Daniele Gobbetti, Lukas
+    Veneziano, Maxim Baz, musover
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami;
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiLanguageType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiLanguageType.java
index e6690a52a..8e6abac6b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiLanguageType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiLanguageType.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Andreas Shimokawa, TinfoilSubmarine
+/*  Copyright (C) 2021-2024 Andreas Shimokawa, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami;
 
 import java.util.LinkedHashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiMenuType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiMenuType.java
index 6b43079a8..f36539738 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiMenuType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiMenuType.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2020-2021 Andreas Shimokawa, TinfoilSubmarine
+/*  Copyright (C) 2020-2024 Andreas Shimokawa, TinfoilSubmarine, Vianney le
+    Clément de Saint-Marcq
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiPhoneGpsStatus.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiPhoneGpsStatus.java
index c855f12d7..7ce82f54f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiPhoneGpsStatus.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiPhoneGpsStatus.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami;
 
 /**
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSportsActivityType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSportsActivityType.java
index d429376b5..8b6827d54 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSportsActivityType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSportsActivityType.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Sebastian Krey, Your Name
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami;
 
 import nodomain.freeyourgadget.gadgetbridge.model.ActivityKind;
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 13821a731..a657e3f89 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
@@ -1,7 +1,8 @@
-/*  Copyright (C) 2015-2023 Andreas Shimokawa, Carsten Pfeiffer, Christian
-    Fischer, Daniele Gobbetti, Dmitry Markin, JohnnySun, José Rebelo, Julien
-    Pivotto, Kasha, Michal Novotny, Petr Vaněk, Sebastian Kranz, Sergey Trofimov,
-    Steffen Liebergeld, Taavi Eomäe, Yoran Vulker, Zhong Jianxin
+/*  Copyright (C) 2018-2024 Andreas Shimokawa, Arjan Schrijver, beardhatcode,
+    Carsten Pfeiffer, Damien Gaignon, Daniel Dakhno, Daniele Gobbetti, Dmitry
+    Markin, José Rebelo, musover, Nathan Philipp Bo Seddig, NekoBox, Petr
+    Vaněk, Robbert Gurdeep Singh, Sebastian Kranz, Taavi Eomäe, Toby Murray,
+    uli, Yoran Vulker, Zhong Jianxin
 
     This file is part of Gadgetbridge.
 
@@ -16,7 +17,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami;
 
 import android.bluetooth.BluetoothAdapter;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiVibrationPatternNotificationType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiVibrationPatternNotificationType.java
index a0fee9aeb..631003e64 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiVibrationPatternNotificationType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiVibrationPatternNotificationType.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami;
 
 /**
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiWorkoutScreenActivityType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiWorkoutScreenActivityType.java
index 5323add7c..1ea6bba1d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiWorkoutScreenActivityType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiWorkoutScreenActivityType.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami;
 
 import java.util.Locale;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiWorkoutStatus.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiWorkoutStatus.java
index 651fb320a..44720b184 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiWorkoutStatus.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiWorkoutStatus.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami;
 
 public enum HuamiWorkoutStatus {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiWorkoutTrackActivityType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiWorkoutTrackActivityType.java
index 184cb2875..aa0b10056 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiWorkoutTrackActivityType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiWorkoutTrackActivityType.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami;
 
 import java.util.Locale;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/UIHHContainer.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/UIHHContainer.java
index 38dc43a2c..23d51d75c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/UIHHContainer.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/UIHHContainer.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami;
 
 import androidx.annotation.Nullable;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/actions/StopNotificationAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/actions/StopNotificationAction.java
index 473dc362c..a3430f08b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/actions/StopNotificationAction.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/actions/StopNotificationAction.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2018-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.actions;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitactive/AmazfitActiveFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitactive/AmazfitActiveFirmwareInfo.java
index bfc9eca24..ee353fc2e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitactive/AmazfitActiveFirmwareInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitactive/AmazfitActiveFirmwareInfo.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitactive;
 
 import java.util.Arrays;
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 93eba974e..4db9c45d7 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitactive;
 
 import android.content.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 f935cd093..3be01098e 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitactiveedge;
 
 import java.util.Arrays;
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 8bd1c0cbc..7ee42269c 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitactiveedge;
 
 import android.content.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 68391dd40..cda6695e4 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo, Maxime Reyrolle
+/*  Copyright (C) 2023-2024 Maxime Reyrolle
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitbalance;
 
 import java.util.Arrays;
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 237b2b572..89838e758 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo, Maxime Reyrolle
+/*  Copyright (C) 2023-2024 Maxime Reyrolle
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitbalance;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitband5/AmazfitBand5FirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitband5/AmazfitBand5FirmwareInfo.java
index 137c465bc..d8e32283b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitband5/AmazfitBand5FirmwareInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitband5/AmazfitBand5FirmwareInfo.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Cristian Alfano, Daniele
-    Gobbetti, odavo32nof
+/*  Copyright (C) 2020-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitband5;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitband5/AmazfitBand5Support.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitband5/AmazfitBand5Support.java
index d844e8ceb..cf7315f18 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitband5/AmazfitBand5Support.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitband5/AmazfitBand5Support.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer, Dmytro Bielik
+/*  Copyright (C) 2020-2024 Andreas Shimokawa, José Rebelo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitband5;
 
 import android.content.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 96cd494ec..63e5fafc4 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitband7;
 
 import java.util.Arrays;
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 54ec99027..992423f34 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitband7;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/AmazfitBipFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/AmazfitBipFirmwareInfo.java
index 497f89d5b..743da781c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/AmazfitBipFirmwareInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/AmazfitBipFirmwareInfo.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer, MyTimeKill
+/*  Copyright (C) 2018-2024 Andreas Shimokawa, MyTimeKill
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitbip;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/AmazfitBipLiteFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/AmazfitBipLiteFirmwareInfo.java
index 76cf7b0dd..76d24c062 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/AmazfitBipLiteFirmwareInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/AmazfitBipLiteFirmwareInfo.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Daniele Gobbetti
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitbip;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/AmazfitBipLiteSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/AmazfitBipLiteSupport.java
index e76fbfbbd..307c4dcd3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/AmazfitBipLiteSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/AmazfitBipLiteSupport.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2019-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitbip;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/AmazfitBipSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/AmazfitBipSupport.java
index 414768698..ca43c43fa 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/AmazfitBipSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/AmazfitBipSupport.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer, DerFetzer,
-    Matthieu Baerts, Roi Greenberg
+/*  Copyright (C) 2018-2024 Andreas Shimokawa, DerFetzer, José Rebelo,
+    Matthieu Baerts, NekoBox, Oleg Vasilev
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitbip;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/AmazfitBipTextNotificationStrategy.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/AmazfitBipTextNotificationStrategy.java
index 0b1894fb3..45f737488 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/AmazfitBipTextNotificationStrategy.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip/AmazfitBipTextNotificationStrategy.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Daniele Gobbetti
+/*  Copyright (C) 2018-2024 Andreas Shimokawa, Daniele Gobbetti
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitbip;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip3pro/AmazfitBip3ProFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip3pro/AmazfitBip3ProFirmwareInfo.java
index a182b651c..669799581 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip3pro/AmazfitBip3ProFirmwareInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip3pro/AmazfitBip3ProFirmwareInfo.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitbip3pro;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip3pro/AmazfitBip3ProSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip3pro/AmazfitBip3ProSupport.java
index 3cff3805f..2c421ddb5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip3pro/AmazfitBip3ProSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip3pro/AmazfitBip3ProSupport.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitbip3pro;
 
 import android.content.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 00e0bd1c7..01b6947e7 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitbip5;
 
 import java.util.Arrays;
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 cc4db2b64..5685faaa7 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitbip5;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbips/AmazfitBipSFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbips/AmazfitBipSFirmwareInfo.java
index e31eb8d60..1d70d8d1a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbips/AmazfitBipSFirmwareInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbips/AmazfitBipSFirmwareInfo.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Daniele Gobbetti
+/*  Copyright (C) 2020-2024 Andreas Shimokawa, Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitbips;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbips/AmazfitBipSLiteFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbips/AmazfitBipSLiteFirmwareInfo.java
index b1190ffef..c87dd4d10 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbips/AmazfitBipSLiteFirmwareInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbips/AmazfitBipSLiteFirmwareInfo.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Daniele Gobbetti
+/*  Copyright (C) 2020-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitbips;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbips/AmazfitBipSLiteSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbips/AmazfitBipSLiteSupport.java
index 051fa6233..91bada70d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbips/AmazfitBipSLiteSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbips/AmazfitBipSLiteSupport.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2020-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitbips;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbips/AmazfitBipSSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbips/AmazfitBipSSupport.java
index 3d6d90c28..e8bf4a49e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbips/AmazfitBipSSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbips/AmazfitBipSSupport.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer, Zhong Jianxin
+/*  Copyright (C) 2020-2024 Andreas Shimokawa, beardhatcode, José Rebelo,
+    Zhong Jianxin
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitbips;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbipu/AmazfitBipUFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbipu/AmazfitBipUFirmwareInfo.java
index fb36361bd..d4bea217c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbipu/AmazfitBipUFirmwareInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbipu/AmazfitBipUFirmwareInfo.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Daniele Gobbetti
+/*  Copyright (C) 2020-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitbipu;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbipu/AmazfitBipUSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbipu/AmazfitBipUSupport.java
index 3ffddd8e9..fb1613d09 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbipu/AmazfitBipUSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbipu/AmazfitBipUSupport.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer, Dmytro
-    Bielik, pangwalla
+/*  Copyright (C) 2020-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitbipu;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbipupro/AmazfitBipUProFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbipupro/AmazfitBipUProFirmwareInfo.java
index 9639cfdb7..de1104f83 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbipupro/AmazfitBipUProFirmwareInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbipupro/AmazfitBipUProFirmwareInfo.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, DanialHanif, Daniele Gobbetti
+/*  Copyright (C) 2021-2024 Andreas Shimokawa, DanialHanif
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitbipupro;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbipupro/AmazfitBipUProSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbipupro/AmazfitBipUProSupport.java
index b8a237a63..e335f48e0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbipupro/AmazfitBipUProSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbipupro/AmazfitBipUProSupport.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer, DanialHanif,
-    Dmytro Bielik, pangwalla
+/*  Copyright (C) 2021-2024 Andreas Shimokawa, DanialHanif
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitbipupro;
 
 import android.content.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 d1d1338b0..3370f7662 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo, Raghd Hamzeh
+/*  Copyright (C) 2023-2024 Raghd Hamzeh
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitcheetahpro;
 
 import java.util.Arrays;
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 b912d8dc1..859715345 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo, Raghd Hamzeh
+/*  Copyright (C) 2023-2024 Raghd Hamzeh
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitcheetahpro;
 
 import android.content.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 66bd01d9b..29e6fc7b8 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitcheetahround;
 
 import java.util.Arrays;
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 f5a55bcac..5b1f46555 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitcheetahround;
 
 import android.content.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 3b808afe9..b0685edca 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitcheetahsquare;
 
 import java.util.Collections;
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 799b2f5c0..23b3a8d29 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitcheetahsquare;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcor/AmazfitCorFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcor/AmazfitCorFirmwareInfo.java
index b08f7c967..6e170ca75 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcor/AmazfitCorFirmwareInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcor/AmazfitCorFirmwareInfo.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Daniele Gobbetti
+/*  Copyright (C) 2017-2024 Andreas Shimokawa, Daniele Gobbetti
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitcor;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcor/AmazfitCorSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcor/AmazfitCorSupport.java
index e4e4f4ad2..a654d5560 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcor/AmazfitCorSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcor/AmazfitCorSupport.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2017-2024 Andreas Shimokawa, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitcor;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcor2/AmazfitCor2FirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcor2/AmazfitCor2FirmwareInfo.java
index 1c5d1dd45..3949ae6dc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcor2/AmazfitCor2FirmwareInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcor2/AmazfitCor2FirmwareInfo.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Daniele Gobbetti
+/*  Copyright (C) 2019-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitcor2;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcor2/AmazfitCor2Support.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcor2/AmazfitCor2Support.java
index 9a16f1b57..59b2c477c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcor2/AmazfitCor2Support.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcor2/AmazfitCor2Support.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2019-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitcor2;
 
 import android.content.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 aaee2570b..dbcc05e2a 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitfalcon;
 
 import java.util.Arrays;
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 8a5266ea9..004904ee1 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitfalcon;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr/AmazfitGTRFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr/AmazfitGTRFirmwareInfo.java
index bfae44a11..18aef6d30 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr/AmazfitGTRFirmwareInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr/AmazfitGTRFirmwareInfo.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Daniele Gobbetti
+/*  Copyright (C) 2019-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgtr;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr/AmazfitGTRLiteFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr/AmazfitGTRLiteFirmwareInfo.java
index d078cbe03..2a4cf609e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr/AmazfitGTRLiteFirmwareInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr/AmazfitGTRLiteFirmwareInfo.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Daniele Gobbetti
+/*  Copyright (C) 2020-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgtr;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr/AmazfitGTRLiteSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr/AmazfitGTRLiteSupport.java
index ae0e8d05d..b8005fe7a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr/AmazfitGTRLiteSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr/AmazfitGTRLiteSupport.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2020-2024 Andreas Shimokawa, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgtr;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr/AmazfitGTRSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr/AmazfitGTRSupport.java
index b8509acdb..1535ef19d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr/AmazfitGTRSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr/AmazfitGTRSupport.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2019-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgtr;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr2/AmazfitGTR2FirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr2/AmazfitGTR2FirmwareInfo.java
index 7aa21b7e1..f5b4f0f9d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr2/AmazfitGTR2FirmwareInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr2/AmazfitGTR2FirmwareInfo.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Daniele Gobbetti, Dmytro
-    Bielik, pangwalla
+/*  Copyright (C) 2020-2024 Andreas Shimokawa, pangwalla
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgtr2;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr2/AmazfitGTR2Support.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr2/AmazfitGTR2Support.java
index a3ed0c460..d5decd984 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr2/AmazfitGTR2Support.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr2/AmazfitGTR2Support.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer, Dmytro
-    Bielik, pangwalla
+/*  Copyright (C) 2020-2024 Andreas Shimokawa, pangwalla, Vianney le Clément
+    de Saint-Marcq
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgtr2;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr2/AmazfitGTR2eFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr2/AmazfitGTR2eFirmwareInfo.java
index 4a15708b7..06662f9d4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr2/AmazfitGTR2eFirmwareInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr2/AmazfitGTR2eFirmwareInfo.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Daniele Gobbetti, Dmytro
-    Bielik, pangwalla
+/*  Copyright (C) 2021-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgtr2;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr2/AmazfitGTR2eSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr2/AmazfitGTR2eSupport.java
index 2e40534cb..8562503e7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr2/AmazfitGTR2eSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr2/AmazfitGTR2eSupport.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer, Dmytro
-    Bielik, pangwalla
+/*  Copyright (C) 2021-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgtr2;
 
 import android.content.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 ea10da33b..74305b1ff 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo, thermatk
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgtr3;
 
 import org.slf4j.Logger;
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 74dd268e2..1929f1541 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo, thermatk
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgtr3;
 
 import android.content.Context;
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 649f1c665..80c349895 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgtr3pro;
 
 import org.slf4j.Logger;
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 422bf9231..3b2e6f476 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgtr3pro;
 
 import android.content.Context;
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 af7f1cbba..fc1dd5d8d 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgtr4;
 
 import java.util.Arrays;
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 bd88707d4..5dd3144a2 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgtr4;
 
 import android.content.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 b988083bf..56322bf9a 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgtrmini;
 
 import java.util.Arrays;
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 14e162aba..de5acfbb8 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgtrmini;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts/AmazfitGTSFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts/AmazfitGTSFirmwareInfo.java
index bad140478..f9a06924a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts/AmazfitGTSFirmwareInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts/AmazfitGTSFirmwareInfo.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Daniele Gobbetti
+/*  Copyright (C) 2019-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgts;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts/AmazfitGTSSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts/AmazfitGTSSupport.java
index 2e976c3b0..1a93d6442 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts/AmazfitGTSSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts/AmazfitGTSSupport.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Andreas Shimokawa, Manuel Ruß
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, José Rebelo, Manuel Ruß
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgts;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts2/AmazfitGTS2FirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts2/AmazfitGTS2FirmwareInfo.java
index 03d6ea9c8..f6a88476a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts2/AmazfitGTS2FirmwareInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts2/AmazfitGTS2FirmwareInfo.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Daniele Gobbetti, Dmytro
-    Bielik, pangwalla
+/*  Copyright (C) 2020-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgts2;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts2/AmazfitGTS2MiniFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts2/AmazfitGTS2MiniFirmwareInfo.java
index 84b15225f..0c06c4026 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts2/AmazfitGTS2MiniFirmwareInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts2/AmazfitGTS2MiniFirmwareInfo.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Daniele Gobbetti, Dmytro
-    Bielik, pangwalla
+/*  Copyright (C) 2021-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgts2;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts2/AmazfitGTS2MiniSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts2/AmazfitGTS2MiniSupport.java
index d25479b89..b12b38854 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts2/AmazfitGTS2MiniSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts2/AmazfitGTS2MiniSupport.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer, Dmytro
-    Bielik, pangwalla
+/*  Copyright (C) 2021-2024 Andreas Shimokawa, José Rebelo, musover
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgts2;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts2/AmazfitGTS2Support.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts2/AmazfitGTS2Support.java
index 30a918beb..950e44bac 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts2/AmazfitGTS2Support.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts2/AmazfitGTS2Support.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer, Dmytro
-    Bielik, pangwalla
+/*  Copyright (C) 2020-2024 Andreas Shimokawa, Vianney le Clément de
+    Saint-Marcq
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgts2;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts2/AmazfitGTS2eFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts2/AmazfitGTS2eFirmwareInfo.java
index 3d9f20dbd..ec2845a8d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts2/AmazfitGTS2eFirmwareInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts2/AmazfitGTS2eFirmwareInfo.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Daniele Gobbetti, Dmytro
-    Bielik, pangwalla
+/*  Copyright (C) 2021-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgts2;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts2/AmazfitGTS2eSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts2/AmazfitGTS2eSupport.java
index 64fc8343e..7079aef5d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts2/AmazfitGTS2eSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts2/AmazfitGTS2eSupport.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer, Dmytro
-    Bielik, pangwalla
+/*  Copyright (C) 2021-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgts2;
 
 import android.content.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 e921611f9..d0533c537 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo, sedy89
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgts3;
 
 import org.slf4j.Logger;
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 35e041b4f..be1da6e5f 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo, sedy89
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgts3;
 
 import android.content.Context;
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 c4faaec9e..8c87d9a86 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgts4;
 
 import java.util.Arrays;
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 149131b9e..fbdc6f166 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgts4;
 
 import android.content.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 7d77e2359..845d17d2b 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgts4mini;
 
 import java.util.Arrays;
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 f70ce608e..ae7e2612b 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgts4mini;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitneo/AmazfitNeoFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitneo/AmazfitNeoFirmwareInfo.java
index a0af10f6f..633e8b968 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitneo/AmazfitNeoFirmwareInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitneo/AmazfitNeoFirmwareInfo.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020 Andreas Shimokawa
+/*  Copyright (C) 2021-2024 Andreas Shimokawa, xaos
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitneo;
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitneo/AmazfitNeoSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitneo/AmazfitNeoSupport.java
index 7fe936ab8..53d7b1fc5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitneo/AmazfitNeoSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitneo/AmazfitNeoSupport.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2020 Andreas Shimokawa
+/*  Copyright (C) 2021-2024 Andreas Shimokawa, José Rebelo, NekoBox, Petr
+    Vaněk, xaos
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitneo;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitpop/AmazfitPopFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitpop/AmazfitPopFirmwareInfo.java
index 1b23131e2..841734402 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitpop/AmazfitPopFirmwareInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitpop/AmazfitPopFirmwareInfo.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 Andreas Shimokawa
+/*  Copyright (C) 2022-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitpop;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitpop/AmazfitPopSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitpop/AmazfitPopSupport.java
index 5d0a113ca..5eb8c6821 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitpop/AmazfitPopSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitpop/AmazfitPopSupport.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 Andreas Shimokawa
+/*  Copyright (C) 2022-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitpop;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitpoppro/AmazfitPopProFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitpoppro/AmazfitPopProFirmwareInfo.java
index 28ddfc4d2..2d9d4ba1a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitpoppro/AmazfitPopProFirmwareInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitpoppro/AmazfitPopProFirmwareInfo.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 Andreas Shimokawa
+/*  Copyright (C) 2022-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitpoppro;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitpoppro/AmazfitPopProSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitpoppro/AmazfitPopProSupport.java
index e8ef61315..4f1fc1faf 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitpoppro/AmazfitPopProSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitpoppro/AmazfitPopProSupport.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 Andreas Shimokawa
+/*  Copyright (C) 2022-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitpoppro;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfittrex/AmazfitTRexFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfittrex/AmazfitTRexFirmwareInfo.java
index 80372a6d6..a7e4ec7bb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfittrex/AmazfitTRexFirmwareInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfittrex/AmazfitTRexFirmwareInfo.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Daniele Gobbetti, Dmytro Bielik
+/*  Copyright (C) 2020-2024 Dmytro Bielik
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfittrex;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfittrex/AmazfitTRexSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfittrex/AmazfitTRexSupport.java
index c95351177..e9b39e3b6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfittrex/AmazfitTRexSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfittrex/AmazfitTRexSupport.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer, Dmytro Bielik
+/*  Copyright (C) 2020-2024 Andreas Shimokawa, Dmytro Bielik
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfittrex;
 
 import android.content.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 6d66a29d5..25a7bd67d 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfittrex2;
 
 import java.util.Arrays;
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 76eab59d7..5e0f08602 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfittrex2;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfittrexpro/AmazfitTRexProFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfittrexpro/AmazfitTRexProFirmwareInfo.java
index 25ab466d7..1ab6f7acc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfittrexpro/AmazfitTRexProFirmwareInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfittrexpro/AmazfitTRexProFirmwareInfo.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Daniele Gobbetti, Dmytro Bielik
+/*  Copyright (C) 2021-2024 Andreas Shimokawa, GeekosaurusR3x
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfittrexpro;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfittrexpro/AmazfitTRexProSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfittrexpro/AmazfitTRexProSupport.java
index 022092351..5d78e57ee 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfittrexpro/AmazfitTRexProSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfittrexpro/AmazfitTRexProSupport.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer, Dmytro Bielik
+/*  Copyright (C) 2021-2024 GeekosaurusR3x
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfittrexpro;
 
 import android.content.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 4c705fe1f..4dc8da77b 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfittrexultra;
 
 import java.util.Arrays;
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 37ebdba96..ce495a2f5 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfittrexultra;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitvergel/AmazfitVergeLFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitvergel/AmazfitVergeLFirmwareInfo.java
index f5c9d69cd..6a9af8bde 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitvergel/AmazfitVergeLFirmwareInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitvergel/AmazfitVergeLFirmwareInfo.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, angelpup, Daniele Gobbetti,
-    Dmytro Bielik
+/*  Copyright (C) 2020-2024 angelpup
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitvergel;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitvergel/AmazfitVergeLSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitvergel/AmazfitVergeLSupport.java
index 79642a71a..255c69694 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitvergel/AmazfitVergeLSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitvergel/AmazfitVergeLSupport.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Andreas Shimokawa, angelpup, Manuel Ruß
+/*  Copyright (C) 2020-2024 Andreas Shimokawa, angelpup, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitvergel;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitx/AmazfitXFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitx/AmazfitXFirmwareInfo.java
index cc7061905..74554a785 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitx/AmazfitXFirmwareInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitx/AmazfitXFirmwareInfo.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Cristian Alfano, Daniele
-    Gobbetti, odavo32nof
+/*  Copyright (C) 2021-2024 Stefan Bora
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitx;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitx/AmazfitXSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitx/AmazfitXSupport.java
index 76a96ad9a..6697162b8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitx/AmazfitXSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitx/AmazfitXSupport.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer, Dmytro Bielik
+/*  Copyright (C) 2021-2024 Andreas Shimokawa, Stefan Bora
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitx;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband2/Mi2FirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband2/Mi2FirmwareInfo.java
index 8df70f978..e1ba97ab9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband2/Mi2FirmwareInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband2/Mi2FirmwareInfo.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Davis
-    Mosenkovs
+/*  Copyright (C) 2018-2024 Andreas Shimokawa, Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.miband2;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband2/Mi2NotificationStrategy.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband2/Mi2NotificationStrategy.java
index 6538c2c74..eebe4c903 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband2/Mi2NotificationStrategy.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband2/Mi2NotificationStrategy.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Dmitry Markin, Martin Piatka
+/*  Copyright (C) 2018-2024 Andreas Shimokawa, Daniele Gobbetti, Dmitry Markin
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.miband2;
 
 import android.bluetooth.BluetoothGattCharacteristic;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband2/Mi2TextNotificationStrategy.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband2/Mi2TextNotificationStrategy.java
index 3eba64be8..81ef45278 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband2/Mi2TextNotificationStrategy.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband2/Mi2TextNotificationStrategy.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti
+/*  Copyright (C) 2018-2024 Andreas Shimokawa, Daniele Gobbetti
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.miband2;
 
 import android.bluetooth.BluetoothGattCharacteristic;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband2/MiBand2Support.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband2/MiBand2Support.java
index b5f96f004..78791e02f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband2/MiBand2Support.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband2/MiBand2Support.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer, José Rebelo
+/*  Copyright (C) 2018-2024 Andreas Shimokawa, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.miband2;
 
 import static nodomain.freeyourgadget.gadgetbridge.service.btle.GattCharacteristic.UUID_CHARACTERISTIC_ALERT_LEVEL;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband3/MiBand3FirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband3/MiBand3FirmwareInfo.java
index dc99ea61a..d30420c9f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband3/MiBand3FirmwareInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband3/MiBand3FirmwareInfo.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Davis
-    Mosenkovs
+/*  Copyright (C) 2018-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.miband3;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband3/MiBand3Support.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband3/MiBand3Support.java
index be62b79c2..ab3d98d5c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband3/MiBand3Support.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband3/MiBand3Support.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer, José Rebelo
+/*  Copyright (C) 2018-2024 Andreas Shimokawa, Carsten Pfeiffer, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.miband3;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband4/MiBand4FirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband4/MiBand4FirmwareInfo.java
index 883177d06..b0b034c16 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband4/MiBand4FirmwareInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband4/MiBand4FirmwareInfo.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Daniele Gobbetti
+/*  Copyright (C) 2019-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.miband4;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband4/MiBand4Support.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband4/MiBand4Support.java
index 6da5e95a5..7b02662be 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband4/MiBand4Support.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband4/MiBand4Support.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.miband4;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband5/MiBand5FirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband5/MiBand5FirmwareInfo.java
index 215e779ed..6d47e60b6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband5/MiBand5FirmwareInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband5/MiBand5FirmwareInfo.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Cristian Alfano, Daniele
-    Gobbetti, odavo32nof
+/*  Copyright (C) 2020-2024 Andreas Shimokawa, Cristian Alfano, odavo32nof
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.miband5;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband5/MiBand5Support.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband5/MiBand5Support.java
index 99b3ca1b6..4108acec3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband5/MiBand5Support.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband5/MiBand5Support.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2019-2021 Andreas Shimokawa, Manuel Ruß, odavo32nof
+/*  Copyright (C) 2020-2024 Andreas Shimokawa, beardhatcode, José Rebelo,
+    odavo32nof
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.miband5;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband6/MiBand6FirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband6/MiBand6FirmwareInfo.java
index ec47bacea..b82123366 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband6/MiBand6FirmwareInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband6/MiBand6FirmwareInfo.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Cristian Alfano, Daniele
-    Gobbetti, odavo32nof
+/*  Copyright (C) 2021-2024 Andreas Shimokawa, jhey
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.miband6;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband6/MiBand6Support.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband6/MiBand6Support.java
index 0bd8021ae..8b8daf72e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband6/MiBand6Support.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband6/MiBand6Support.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Andreas Shimokawa, Manuel Ruß, odavo32nof
+/*  Copyright (C) 2021-2024 Andreas Shimokawa, jhey, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.miband6;
 
 import android.content.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 35b41c426..2150f6e0b 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.miband7;
 
 import org.slf4j.Logger;
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 863d78ef4..04ecbc674 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.miband7;
 
 import android.content.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 bf9dc1228..dd45a3de2 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
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Petr Vaněk
+/*  Copyright (C) 2018-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+    Gobbetti, José Rebelo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.operations;
 
 import android.bluetooth.BluetoothGatt;
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 9f03477af..f35e231b0 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.operations;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchActivityOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchActivityOperation.java
index 02960c0aa..d9022d9ea 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchActivityOperation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchActivityOperation.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti
+/*  Copyright (C) 2018-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniel
+    Dakhno, Daniele Gobbetti, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.operations;
 
 import android.widget.Toast;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchHeartRateManualOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchHeartRateManualOperation.java
index 2f6a48455..0d9252613 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchHeartRateManualOperation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchHeartRateManualOperation.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.operations;
 
 import android.widget.Toast;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchHeartRateMaxOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchHeartRateMaxOperation.java
index f43368b92..5947ae735 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchHeartRateMaxOperation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchHeartRateMaxOperation.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.operations;
 
 import android.widget.Toast;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchHeartRateRestingOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchHeartRateRestingOperation.java
index 43ca2f1ae..354ad5bf2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchHeartRateRestingOperation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchHeartRateRestingOperation.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.operations;
 
 import android.widget.Toast;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchPaiOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchPaiOperation.java
index 938e0c018..499461d62 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchPaiOperation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchPaiOperation.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.operations;
 
 import android.widget.Toast;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchSleepRespiratoryRateOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchSleepRespiratoryRateOperation.java
index fbc27dab2..1e63b1023 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchSleepRespiratoryRateOperation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchSleepRespiratoryRateOperation.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.operations;
 
 import android.widget.Toast;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchSpo2NormalOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchSpo2NormalOperation.java
index a88b0afe7..f553034eb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchSpo2NormalOperation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchSpo2NormalOperation.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.operations;
 
 import android.widget.Toast;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchSpo2SleepOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchSpo2SleepOperation.java
index e561fd717..d9326ae96 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchSpo2SleepOperation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchSpo2SleepOperation.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.operations;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchSportsDetailsOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchSportsDetailsOperation.java
index 484347ab3..c20883efe 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchSportsDetailsOperation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchSportsDetailsOperation.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti
+/*  Copyright (C) 2018-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+    Gobbetti, José Rebelo, Oleg Vasilev, Sebastian Krey, Your Name
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.operations;
 
 import android.text.format.DateUtils;
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 5a7e859a3..17476487a 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
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Petr Vaněk
+/*  Copyright (C) 2018-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniel
+    Dakhno, Daniele Gobbetti, José Rebelo, Oleg Vasilev, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.operations;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchStatisticsOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchStatisticsOperation.java
index 1f5720e16..240ac57ba 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchStatisticsOperation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchStatisticsOperation.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.operations;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchStressAutoOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchStressAutoOperation.java
index 05c082b95..ceabf1390 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchStressAutoOperation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchStressAutoOperation.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.operations;
 
 import android.widget.Toast;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchStressManualOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchStressManualOperation.java
index 860252aa4..2bb0027f3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchStressManualOperation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchStressManualOperation.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.operations;
 
 import android.widget.Toast;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchTemperatureOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchTemperatureOperation.java
index 6dab0e9c5..35642ab3d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchTemperatureOperation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchTemperatureOperation.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.operations;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/HuamiFetchDebugLogsOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/HuamiFetchDebugLogsOperation.java
index 53974b73d..9dcea9f33 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/HuamiFetchDebugLogsOperation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/HuamiFetchDebugLogsOperation.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.operations;
 
 import android.widget.Toast;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/InitOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/InitOperation.java
index c3136ec7b..23fa63e3f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/InitOperation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/InitOperation.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2018-2024 Andreas Shimokawa, Carsten Pfeiffer, Damien
+    Gaignon, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.operations;
 
 import android.annotation.SuppressLint;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/InitOperation2021.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/InitOperation2021.java
index 1ed4436a6..8b11d4455 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/InitOperation2021.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/InitOperation2021.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2021-2024 Andreas Shimokawa, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.operations;
 
 import static nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiService.RESPONSE;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/UpdateFirmwareOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/UpdateFirmwareOperation.java
index 492263b02..2d7846746 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/UpdateFirmwareOperation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/UpdateFirmwareOperation.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti
+/*  Copyright (C) 2018-2024 Andreas Shimokawa, Daniele Gobbetti, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.operations;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/UpdateFirmwareOperation2020.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/UpdateFirmwareOperation2020.java
index 2ab9d6277..eb3bcb7a5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/UpdateFirmwareOperation2020.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/UpdateFirmwareOperation2020.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Andreas Shimokawa
+/*  Copyright (C) 2020-2024 Andreas Shimokawa, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.operations;
 
 import android.net.Uri;
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 4cca1af29..a1ceee766 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.operations;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/UpdateFirmwareOperationNew.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/UpdateFirmwareOperationNew.java
index e187fbaf3..bb6dc7d9c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/UpdateFirmwareOperationNew.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/UpdateFirmwareOperationNew.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Andreas Shimokawa
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.operations;
 
 import android.net.Uri;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppe/ZeppEFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppe/ZeppEFirmwareInfo.java
index e8720f0b1..c3ca57fdd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppe/ZeppEFirmwareInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppe/ZeppEFirmwareInfo.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Daniele Gobbetti, Dmytro
-    Bielik, pangwalla, randnv20
+/*  Copyright (C) 2021-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppe;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppe/ZeppESupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppe/ZeppESupport.java
index aef430683..3a3619d81 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppe/ZeppESupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppe/ZeppESupport.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer, Dmytro
-    Bielik, pangwalla, randnv20
+/*  Copyright (C) 2021-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppe;
 
 import android.content.Context;
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 b6dd95ff6..2ea00c7d0 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/operations/ZeppOsAgpsFile.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/operations/ZeppOsAgpsFile.java
index c944dfd34..f13ac8953 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/operations/ZeppOsAgpsFile.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/operations/ZeppOsAgpsFile.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.operations;
 
 import org.json.JSONObject;
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 f5c574caa..e84e704dd 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.operations;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/operations/ZeppOsGpxRouteFile.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/operations/ZeppOsGpxRouteFile.java
index 5eeafe081..0f3267b84 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/operations/ZeppOsGpxRouteFile.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/operations/ZeppOsGpxRouteFile.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.operations;
 
 import android.location.Location;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/operations/ZeppOsGpxRouteUploadOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/operations/ZeppOsGpxRouteUploadOperation.java
index 83ddc2988..97a24f68e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/operations/ZeppOsGpxRouteUploadOperation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/operations/ZeppOsGpxRouteUploadOperation.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.operations;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAgpsService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAgpsService.java
index bf38b39be..4938c9efb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAgpsService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAgpsService.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services;
 
 import androidx.annotation.Nullable;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAlarmsService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAlarmsService.java
index 61d0e9534..8a1fe912c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAlarmsService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAlarmsService.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services;
 
 import android.content.Intent;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAlexaService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAlexaService.java
index 4bc76e025..209bc3304 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAlexaService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAlexaService.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 Andreas Shimokawa, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services;
 
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_VOICE_SERVICE_LANGUAGE;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAppsService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAppsService.java
index 1cc16a511..c017bd544 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAppsService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAppsService.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services;
 
 import org.apache.commons.lang3.ArrayUtils;
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 02aa527e5..4aa035ef7 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services;
 
 import org.slf4j.Logger;
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 fee65cfd4..81ab60e21 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services;
 
 import static org.apache.commons.lang3.ArrayUtils.subarray;
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 3179997a1..08a7a8ead 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 Andreas Shimokawa, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services;
 
 import static org.apache.commons.lang3.ArrayUtils.subarray;
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 c6860247f..37285f132 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services;
 
 import org.slf4j.Logger;
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 53e275c08..5933cce53 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services;
 
 import static org.apache.commons.lang3.ArrayUtils.subarray;
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 eea5ff75b..54f0ead87 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services;
 
 import org.apache.commons.lang3.ArrayUtils;
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 fa9ab0c35..79226d5d6 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services;
 
 import android.widget.Toast;
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 baa6e2be4..b33ca01cb 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services;
 
 import org.slf4j.Logger;
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 1c36d916d..80a183beb 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services;
 
 import android.annotation.SuppressLint;
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 b82aa308f..538159dee 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services;
 
 import org.slf4j.Logger;
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 3bf91e277..4dfe01f85 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo, Raghd Hamzeh
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services;
 
 import org.slf4j.Logger;
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 69abc6f14..611b26e32 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services;
 
 import org.apache.commons.lang3.ArrayUtils;
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 f6c12c56c..51a3f7de5 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services;
 
 import static org.apache.commons.lang3.ArrayUtils.subarray;
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 d625e199d..23a44e236 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services;
 
 import android.bluetooth.BluetoothAdapter;
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 e836bfc84..c1c49f79f 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services;
 
 import org.slf4j.Logger;
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 316f8bd61..1eb968544 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services;
 
 import android.annotation.SuppressLint;
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 920ea6542..6a1aa8829 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 Andreas Shimokawa, José Rebelo, Maxime Reyrolle
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services;
 
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.SHORTCUT_CARDS_SORTABLE;
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 73a126e09..d463bf19f 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 Andreas Shimokawa, José Rebelo, Maxime Reyrolle
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services;
 
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_WATCHFACE;
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 3d0bb9e5e..ae8acc02f 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
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services;
 
 import android.widget.Toast;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/AsynchronousResponse.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/AsynchronousResponse.java
index 3ef607468..252d61c45 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/AsynchronousResponse.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/AsynchronousResponse.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2022-2023 Martin.JM
-    Copyright (C) 2022-2023 Gaignon Damien
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei;
 
 import android.annotation.SuppressLint;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiBRSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiBRSupport.java
index c5d2e61a3..d8239225a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiBRSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiBRSupport.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2021-2023 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiLESupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiLESupport.java
index dad482e32..0d5c47696 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiLESupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiLESupport.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2021-2023 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiSupportProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiSupportProvider.java
index 443129cd2..2efa7ec79 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiSupportProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiSupportProvider.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2022-2023 Martin.JM
-    Copyright (C) 2023 Gaignon Damien
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei;
 
 import android.bluetooth.BluetoothGattCharacteristic;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiWorkoutGbParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiWorkoutGbParser.java
index 28d2405c0..0569bd826 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiWorkoutGbParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiWorkoutGbParser.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei;
 
 import android.widget.Toast;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/ResponseManager.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/ResponseManager.java
index 789d7860d..70cf21e25 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/ResponseManager.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/ResponseManager.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2022 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/AlarmsRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/AlarmsRequest.java
index 9e8174c92..c1088622c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/AlarmsRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/AlarmsRequest.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2021-2022 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import static nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.Alarms.EventAlarmsRequest;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/DebugRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/DebugRequest.java
index acf87180a..0efc39eed 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/DebugRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/DebugRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 Gaignon Damien, MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import java.util.List;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetActivityTypeRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetActivityTypeRequest.java
index 78aff25dc..22c6cc055 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetActivityTypeRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetActivityTypeRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 Gaignon Damien
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 /* In order to be compatible with all devices, request send all possible commands
 to all possible services. This implies long packet which is not handled on the device.
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetAuthRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetAuthRequest.java
index 087dd8e3a..c1974ae83 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetAuthRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetAuthRequest.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2021-2023 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetBatteryLevelRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetBatteryLevelRequest.java
index aff8f31d2..6e01d0a6b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetBatteryLevelRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetBatteryLevelRequest.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2021-2022 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetBondParamsRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetBondParamsRequest.java
index 2ea1489a4..5fe46e2ec 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetBondParamsRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetBondParamsRequest.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2021-2023 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetBondRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetBondRequest.java
index edf8d8603..b20ea24e6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetBondRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetBondRequest.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2021-2023 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetConnectStatusRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetConnectStatusRequest.java
index a51d026ad..ce2c6c4ed 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetConnectStatusRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetConnectStatusRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 Gaignon Damien
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetDeviceStatusRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetDeviceStatusRequest.java
index 710da6894..b1f0841ab 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetDeviceStatusRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetDeviceStatusRequest.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2021-2022 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetDndLiftWristTypeRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetDndLiftWristTypeRequest.java
index 614f9df3a..f066a8867 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetDndLiftWristTypeRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetDndLiftWristTypeRequest.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2021-2022 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import android.content.SharedPreferences;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetEventAlarmList.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetEventAlarmList.java
index 1ea4c2332..24218e0a6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetEventAlarmList.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetEventAlarmList.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import java.util.ArrayList;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetExpandCapabilityRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetExpandCapabilityRequest.java
index 98d21e750..782dbc144 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetExpandCapabilityRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetExpandCapabilityRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 Gaignon Damien
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 /* In order to be compatible with all devices, request send all possible commands
 to all possible services. This implies long packet which is not handled on the device.
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetFitnessTotalsRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetFitnessTotalsRequest.java
index 070803ce3..58a314313 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetFitnessTotalsRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetFitnessTotalsRequest.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2022 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import java.util.List;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetHiChainRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetHiChainRequest.java
index 19ca04804..9eeaa3c09 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetHiChainRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetHiChainRequest.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2021-2023 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import org.json.JSONObject;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetLinkParamsRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetLinkParamsRequest.java
index 32871a9d6..2cc88273b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetLinkParamsRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetLinkParamsRequest.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2021-2023 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import static nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.DeviceConfig.LinkParams;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetNotificationCapabilitiesRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetNotificationCapabilitiesRequest.java
index 4f990ce82..c75040a13 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetNotificationCapabilitiesRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetNotificationCapabilitiesRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 Gaignon Damien
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetNotificationConstraintsRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetNotificationConstraintsRequest.java
index b3399c928..17902bad4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetNotificationConstraintsRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetNotificationConstraintsRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 Gaignon Damien
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetPhoneInfoRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetPhoneInfoRequest.java
index ad65d5cb5..a4f9c5b78 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetPhoneInfoRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetPhoneInfoRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 Gaignon Damien
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetPincodeRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetPincodeRequest.java
index 7b3004f91..291c0cc4a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetPincodeRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetPincodeRequest.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2021-2022 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetProductInformationRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetProductInformationRequest.java
index 1c480d921..196bf1cca 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetProductInformationRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetProductInformationRequest.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2021-2022 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSecurityNegotiationRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSecurityNegotiationRequest.java
index 5dc11a33d..c1b49a045 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSecurityNegotiationRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSecurityNegotiationRequest.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2021-2022 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import android.os.Build;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSettingRelatedRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSettingRelatedRequest.java
index 1ceabd61b..440ac0911 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSettingRelatedRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSettingRelatedRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 Gaignon Damien
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSleepDataCountRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSleepDataCountRequest.java
index c9e7bb997..63b290d0e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSleepDataCountRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSleepDataCountRequest.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2022 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import java.util.List;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSleepDataRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSleepDataRequest.java
index 729e6e5b5..3b5055f91 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSleepDataRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSleepDataRequest.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2022 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSmartAlarmList.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSmartAlarmList.java
index 6ca4c6b0f..6686ec6c0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSmartAlarmList.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSmartAlarmList.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetStepDataCountRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetStepDataCountRequest.java
index 9a818a9fc..afbfc007e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetStepDataCountRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetStepDataCountRequest.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2022 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import java.util.List;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetStepDataRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetStepDataRequest.java
index d47609da6..24899acab 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetStepDataRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetStepDataRequest.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2022 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSupportedCommandsRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSupportedCommandsRequest.java
index 94c205c76..aaf6efcf0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSupportedCommandsRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSupportedCommandsRequest.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2022 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 /* In order to be compatible with all devices, request send all possible commands
 to all possible services. This implies long packet which is not handled on the device.
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSupportedServicesRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSupportedServicesRequest.java
index 55648fffe..62fc13be5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSupportedServicesRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSupportedServicesRequest.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2022 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWearStatusRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWearStatusRequest.java
index 986dc6931..5db70309a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWearStatusRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWearStatusRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021-2023 Gaignon Damien
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWorkoutCountRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWorkoutCountRequest.java
index 87559fb15..cf8894e4d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWorkoutCountRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWorkoutCountRequest.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2022 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import java.util.List;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWorkoutDataRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWorkoutDataRequest.java
index 13a88b372..71622422e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWorkoutDataRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWorkoutDataRequest.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2022 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWorkoutPaceRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWorkoutPaceRequest.java
index d6b9a1900..94e2df586 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWorkoutPaceRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWorkoutPaceRequest.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2022 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWorkoutTotalsRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWorkoutTotalsRequest.java
index 518ef270a..cbe470515 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWorkoutTotalsRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWorkoutTotalsRequest.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2022 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/Request.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/Request.java
index 65a8a2b37..61dcaec4a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/Request.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/Request.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2021-2023 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import android.bluetooth.BluetoothGattCharacteristic;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendAccountRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendAccountRequest.java
index 9fd3be50c..d442ea2a1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendAccountRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendAccountRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 Gaignon Damien
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendDndAddRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendDndAddRequest.java
index b27a4c4e1..9c61329c4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendDndAddRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendDndAddRequest.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2022 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import android.content.SharedPreferences;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendDndDeleteRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendDndDeleteRequest.java
index 692147ddf..7ee6276b3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendDndDeleteRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendDndDeleteRequest.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2022 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendFactoryResetRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendFactoryResetRequest.java
index aff94d018..ab6726692 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendFactoryResetRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendFactoryResetRequest.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2022 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendFitnessGoalRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendFitnessGoalRequest.java
index 7652f601e..8aa76663e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendFitnessGoalRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendFitnessGoalRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 Gaignon Damien
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendMenstrualCapabilityRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendMenstrualCapabilityRequest.java
index d75412ced..6769e3d00 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendMenstrualCapabilityRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendMenstrualCapabilityRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 Gaignon Damien
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendMenstrualModifyTimeRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendMenstrualModifyTimeRequest.java
index a87f777f9..46197d353 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendMenstrualModifyTimeRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendMenstrualModifyTimeRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 Gaignon Damien
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendNotificationRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendNotificationRequest.java
index e6588c304..c2b231174 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendNotificationRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendNotificationRequest.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2021-2022 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendNotifyHeartRateCapabilityRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendNotifyHeartRateCapabilityRequest.java
index b018aee59..70b62dac1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendNotifyHeartRateCapabilityRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendNotifyHeartRateCapabilityRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 Gaignon Damien
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendNotifyRestHeartRateCapabilityRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendNotifyRestHeartRateCapabilityRequest.java
index bb5363ab8..c17bdaec3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendNotifyRestHeartRateCapabilityRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendNotifyRestHeartRateCapabilityRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 Gaignon Damien
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendSetUpDeviceStatusRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendSetUpDeviceStatusRequest.java
index 9b49ef3d1..7de01e4e1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendSetUpDeviceStatusRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendSetUpDeviceStatusRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021-2023 Gaignon Damien
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetActivateOnLiftRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetActivateOnLiftRequest.java
index ba06249e5..44aa3f29b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetActivateOnLiftRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetActivateOnLiftRequest.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2021-2022 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetActivityReminderRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetActivityReminderRequest.java
index 7cd289094..1836eb7b0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetActivityReminderRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetActivityReminderRequest.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2021-2022 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import android.content.SharedPreferences;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetAutomaticHeartrateRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetAutomaticHeartrateRequest.java
index f83bc1259..2a5900ac0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetAutomaticHeartrateRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetAutomaticHeartrateRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetAutomaticSpoRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetAutomaticSpoRequest.java
index 2e27f192c..8cc391ac0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetAutomaticSpoRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetAutomaticSpoRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetDateFormatRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetDateFormatRequest.java
index cbf334df3..6d9edf7a5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetDateFormatRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetDateFormatRequest.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2021-2022 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetDisconnectNotification.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetDisconnectNotification.java
index f8f2ace98..464f730b9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetDisconnectNotification.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetDisconnectNotification.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import android.content.SharedPreferences;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetLanguageSettingRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetLanguageSettingRequest.java
index 889d8d61a..4bda40cb3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetLanguageSettingRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetLanguageSettingRequest.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2021-2022 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetMediumToStrengthThresholdRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetMediumToStrengthThresholdRequest.java
index 530f0c586..75b6578c4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetMediumToStrengthThresholdRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetMediumToStrengthThresholdRequest.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2021-2022 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetMusicRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetMusicRequest.java
index 956ddfe6f..2a1a08343 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetMusicRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetMusicRequest.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2022 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetMusicStatusRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetMusicStatusRequest.java
index ded5754b4..a2ce11ff6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetMusicStatusRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetMusicStatusRequest.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2022 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import java.util.List;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetNavigateOnRotateRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetNavigateOnRotateRequest.java
index 9e8dd12af..59ceabb0f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetNavigateOnRotateRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetNavigateOnRotateRequest.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2021-2022 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetNotificationRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetNotificationRequest.java
index 90d57c344..2389d16a9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetNotificationRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetNotificationRequest.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2022 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetTimeRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetTimeRequest.java
index 6c3ebb910..87bfa6006 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetTimeRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetTimeRequest.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2021-2022 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetTimeZoneIdRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetTimeZoneIdRequest.java
index f6cda5a6e..5c8649035 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetTimeZoneIdRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetTimeZoneIdRequest.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2021-2022 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetTruSleepRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetTruSleepRequest.java
index a029fcb1d..b64ab7bea 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetTruSleepRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetTruSleepRequest.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2021-2022 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetWearLocationRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetWearLocationRequest.java
index c5cfe3f42..630a3adab 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetWearLocationRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetWearLocationRequest.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2021-2022 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetWearMessagePushRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetWearMessagePushRequest.java
index e7d202d75..82d234eb6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetWearMessagePushRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetWearMessagePushRequest.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2022 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetWorkModeRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetWorkModeRequest.java
index c7e48192f..737aa6e5c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetWorkModeRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetWorkModeRequest.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2021-2022 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/StopFindPhoneRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/StopFindPhoneRequest.java
index a5581f9ca..b93f2b888 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/StopFindPhoneRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/StopFindPhoneRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 Martin.JM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import java.util.List;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/StopNotificationRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/StopNotificationRequest.java
index 69017d802..42d2caa1c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/StopNotificationRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/StopNotificationRequest.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2022 Gaignon Damien
-    Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2024 Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 
 import java.util.List;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/id115/AbstractID115Operation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/id115/AbstractID115Operation.java
index a25d6ce07..a124760da 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/id115/AbstractID115Operation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/id115/AbstractID115Operation.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2018-2021 Taavi Eomäe, Vadim Kaushan
+/*  Copyright (C) 2018-2024 Damien Gaignon, Taavi Eomäe, Vadim Kaushan
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.id115;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/id115/FetchActivityOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/id115/FetchActivityOperation.java
index b31b2b4f8..4eff90206 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/id115/FetchActivityOperation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/id115/FetchActivityOperation.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2018-2021 Vadim Kaushan
+/*  Copyright (C) 2018-2024 Vadim Kaushan
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.id115;
 
 import android.widget.Toast;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/id115/ID115Support.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/id115/ID115Support.java
index 776d3d0b0..1e07990f1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/id115/ID115Support.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/id115/ID115Support.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2018-2021 Andreas Shimokawa, Carsten Pfeiffer, Sebastian
-    Kranz, Vadim Kaushan
+/*  Copyright (C) 2018-2024 Andreas Shimokawa, Arjan Schrijver, Carsten
+    Pfeiffer, Sebastian Kranz, Vadim Kaushan
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.id115;
 
 import android.bluetooth.BluetoothGattCharacteristic;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/id115/SendNotificationOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/id115/SendNotificationOperation.java
index 2e621bec0..2418b7b61 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/id115/SendNotificationOperation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/id115/SendNotificationOperation.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2018-2021 Vadim Kaushan
+/*  Copyright (C) 2018-2024 Vadim Kaushan
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.id115;
 
 import android.widget.Toast;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/itag/ITagSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/itag/ITagSupport.java
index d2d33ca2f..d132160e7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/itag/ITagSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/itag/ITagSupport.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Sebastian
-    Kranz, Taavi Eomäe
+/*  Copyright (C) 2020-2024 Arjan Schrijver, Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.itag;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/jyou/BFH16DeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/jyou/BFH16DeviceSupport.java
index ca6836c58..3751e3734 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/jyou/BFH16DeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/jyou/BFH16DeviceSupport.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Sophanimus
+/*  Copyright (C) 2019-2024 Arjan Schrijver, Damien Gaignon, Sophanimus
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 /*
     Features:
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/jyou/JYouDataRecord.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/jyou/JYouDataRecord.java
index e6b1b9afc..cc4fb93d8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/jyou/JYouDataRecord.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/jyou/JYouDataRecord.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 João Paulo Barraca, Pavel Elagin
+/*  Copyright (C) 2018-2024 Pavel Elagin
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.jyou;
 
 /*
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/jyou/JYouSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/jyou/JYouSupport.java
index 39f629059..59325f1a7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/jyou/JYouSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/jyou/JYouSupport.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Da Pa, Pavel Elagin, Sami Alaoui
+/*  Copyright (C) 2020-2024 Arjan Schrijver, Damien Gaignon, Da Pa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.jyou;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/jyou/RealtimeSamplesSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/jyou/RealtimeSamplesSupport.java
index 66f136087..ce366d410 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/jyou/RealtimeSamplesSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/jyou/RealtimeSamplesSupport.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Carsten Pfeiffer, Pavel Elagin
+/*  Copyright (C) 2018-2024 Pavel Elagin
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.jyou;
 
 import java.util.Timer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/jyou/TeclastH30/TeclastH30Support.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/jyou/TeclastH30/TeclastH30Support.java
index aae5d994b..6793426f1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/jyou/TeclastH30/TeclastH30Support.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/jyou/TeclastH30/TeclastH30Support.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Da Pa, Pavel Elagin, Sami Alaoui
+/*  Copyright (C) 2018-2024 Da Pa, Pavel Elagin
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.jyou.TeclastH30;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/jyou/y5/Y5Support.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/jyou/y5/Y5Support.java
index c6a160dce..45b29d5cd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/jyou/y5/Y5Support.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/jyou/y5/Y5Support.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Da Pa, Pavel Elagin, Sami Alaoui
+/*  Copyright (C) 2018-2024 Da Pa, Pavel Elagin
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.jyou.y5;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/LefunDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/LefunDeviceSupport.java
index cec5523a8..ccd055f41 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/LefunDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/LefunDeviceSupport.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Sebastian
-    Kranz, Yukai Li
+/*  Copyright (C) 2020-2024 Arjan Schrijver, Damien Gaignon, José Rebelo,
+    Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.lefun;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/AbstractSendNotificationRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/AbstractSendNotificationRequest.java
index 2142fdbb7..c596b218b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/AbstractSendNotificationRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/AbstractSendNotificationRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.lefun.requests;
 
 import android.bluetooth.BluetoothGattCharacteristic;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/FindDeviceRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/FindDeviceRequest.java
index f60ceaf1e..eca869aa5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/FindDeviceRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/FindDeviceRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.lefun.requests;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.lefun.LefunConstants;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/GetActivityDataRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/GetActivityDataRequest.java
index 570b85333..ace1c7987 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/GetActivityDataRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/GetActivityDataRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.lefun.requests;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.lefun.LefunConstants;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/GetBatteryLevelRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/GetBatteryLevelRequest.java
index c5f66b31d..01abed039 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/GetBatteryLevelRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/GetBatteryLevelRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.lefun.requests;
 
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventBatteryInfo;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/GetEnabledFeaturesRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/GetEnabledFeaturesRequest.java
index 11d14fd6d..b42afa01a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/GetEnabledFeaturesRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/GetEnabledFeaturesRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.lefun.requests;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.lefun.LefunConstants;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/GetFirmwareInfoRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/GetFirmwareInfoRequest.java
index 5943ab76b..002f63d75 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/GetFirmwareInfoRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/GetFirmwareInfoRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.lefun.requests;
 
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventVersionInfo;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/GetGeneralSettingsRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/GetGeneralSettingsRequest.java
index 9e3a753ec..11115c2ec 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/GetGeneralSettingsRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/GetGeneralSettingsRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.lefun.requests;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.lefun.LefunConstants;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/GetHydrationReminderIntervalRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/GetHydrationReminderIntervalRequest.java
index 5ad98b9fd..afbee4554 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/GetHydrationReminderIntervalRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/GetHydrationReminderIntervalRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.lefun.requests;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.lefun.LefunConstants;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/GetPpgDataRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/GetPpgDataRequest.java
index e79c49976..e00e7b858 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/GetPpgDataRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/GetPpgDataRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.lefun.requests;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.lefun.LefunConstants;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/GetSedentaryReminderIntervalRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/GetSedentaryReminderIntervalRequest.java
index f7de50e78..421a4eadd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/GetSedentaryReminderIntervalRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/GetSedentaryReminderIntervalRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.lefun.requests;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.lefun.LefunConstants;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/GetSleepDataRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/GetSleepDataRequest.java
index eaf32afc1..6529e5fa8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/GetSleepDataRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/GetSleepDataRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.lefun.requests;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.lefun.LefunConstants;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/MultiFetchRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/MultiFetchRequest.java
index 05f8a3bdc..2011afd78 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/MultiFetchRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/MultiFetchRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Yukai Li
+/*  Copyright (C) 2020-2024 Damien Gaignon, Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.lefun.requests;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/Request.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/Request.java
index ce676aab3..fc0d512a6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/Request.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/Request.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.lefun.requests;
 
 import android.bluetooth.BluetoothGattCharacteristic;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/SendCallNotificationRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/SendCallNotificationRequest.java
index bfa413ecb..18d747390 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/SendCallNotificationRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/SendCallNotificationRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.lefun.requests;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.lefun.commands.NotificationCommand;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/SendNotificationRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/SendNotificationRequest.java
index 25cd75ce9..2d0eca263 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/SendNotificationRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/SendNotificationRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.lefun.requests;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.lefun.commands.NotificationCommand;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/SetAlarmRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/SetAlarmRequest.java
index 5ab067a55..3cb727126 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/SetAlarmRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/SetAlarmRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.lefun.requests;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.lefun.LefunConstants;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/SetEnabledFeaturesRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/SetEnabledFeaturesRequest.java
index 33ebb0178..102f9c6a0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/SetEnabledFeaturesRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/SetEnabledFeaturesRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.lefun.requests;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.lefun.LefunConstants;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/SetGeneralSettingsRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/SetGeneralSettingsRequest.java
index 75f8faa62..82b99f728 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/SetGeneralSettingsRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/SetGeneralSettingsRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.lefun.requests;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.lefun.LefunConstants;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/SetHydrationReminderIntervalRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/SetHydrationReminderIntervalRequest.java
index b7b55ae3e..2d99627ac 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/SetHydrationReminderIntervalRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/SetHydrationReminderIntervalRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.lefun.requests;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.lefun.LefunConstants;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/SetLanguageRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/SetLanguageRequest.java
index 115949e68..dcff74042 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/SetLanguageRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/SetLanguageRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.lefun.requests;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.lefun.LefunConstants;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/SetProfileRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/SetProfileRequest.java
index 7ccca5a8f..565c9fdee 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/SetProfileRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/SetProfileRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.lefun.requests;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.lefun.LefunConstants;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/SetSedentaryReminderIntervalRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/SetSedentaryReminderIntervalRequest.java
index a29eaf00b..fa018a966 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/SetSedentaryReminderIntervalRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/SetSedentaryReminderIntervalRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.lefun.requests;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.lefun.LefunConstants;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/SetTimeRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/SetTimeRequest.java
index 4fa4938f7..25222be2b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/SetTimeRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/SetTimeRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.lefun.requests;
 
 import java.util.Calendar;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/StartPpgRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/StartPpgRequest.java
index dc35f8939..5a4f80c4a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/StartPpgRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lefun/requests/StartPpgRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Yukai Li
+/*  Copyright (C) 2020-2024 Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.lefun.requests;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.lefun.LefunConstants;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lenovo/operations/InitOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lenovo/operations/InitOperation.java
index fa02283d3..5982e8219 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lenovo/operations/InitOperation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lenovo/operations/InitOperation.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2018-2021 mamucho, maxirnilian, mkusnierz
+/*  Copyright (C) 2019-2024 Damien Gaignon, mamucho, mkusnierz
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.lenovo.operations;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lenovo/watchxplus/WatchXPlusDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lenovo/watchxplus/WatchXPlusDeviceSupport.java
index 031dd0373..edcbc07a8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lenovo/watchxplus/WatchXPlusDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lenovo/watchxplus/WatchXPlusDeviceSupport.java
@@ -1,6 +1,5 @@
-/*  Copyright (C) 2018-2021 Andreas Böhler, Andreas Shimokawa, Carsten
-    Pfeiffer, Daniele Gobbetti, mamucho, maxirnilian, mkusnierz, Sebastian Kranz,
-    Taavi Eomäe
+/*  Copyright (C) 2019-2024 Andreas Böhler, Andreas Shimokawa, Arjan
+    Schrijver, Damien Gaignon, mamucho, mkusnierz, Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -15,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.lenovo.watchxplus;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/liveview/LiveviewIoThread.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/liveview/LiveviewIoThread.java
index 460918b05..bb79836e7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/liveview/LiveviewIoThread.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/liveview/LiveviewIoThread.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Carsten Pfeiffer, Daniele Gobbetti
+/*  Copyright (C) 2016-2024 Carsten Pfeiffer, Daniele Gobbetti
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.liveview;
 
 import android.bluetooth.BluetoothAdapter;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/liveview/LiveviewProtocol.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/liveview/LiveviewProtocol.java
index 2c9de53d8..e6ca9033d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/liveview/LiveviewProtocol.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/liveview/LiveviewProtocol.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Daniele Gobbetti
+/*  Copyright (C) 2016-2024 Daniele Gobbetti
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.liveview;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/liveview/LiveviewSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/liveview/LiveviewSupport.java
index 3e569a46e..3eae49099 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/liveview/LiveviewSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/liveview/LiveviewSupport.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Daniele Gobbetti, Sebastian
-    Kranz
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Arjan Schrijver, Daniele
+    Gobbetti, Sebastian Kranz
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.liveview;
 
 import android.net.Uri;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/makibeshr3/MakibesHR3DeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/makibeshr3/MakibesHR3DeviceSupport.java
index 3300a7aa5..695f9b195 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/makibeshr3/MakibesHR3DeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/makibeshr3/MakibesHR3DeviceSupport.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2019-2021 Andreas Shimokawa, Cre3per, Taavi Eomäe
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Arjan Schrijver, Cre3per,
+    Damien Gaignon, Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 // TODO: All the commands that aren't supported by GB should be added to device specific settings.
 
 // TODO: It'd be cool if we could change the language. There's no official way to do so, but the
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/AbstractInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/AbstractInfo.java
index 2c2c1c380..8b2493de3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/AbstractInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/AbstractInfo.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Carsten Pfeiffer
+/*  Copyright (C) 2015-2024 Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.miband;
 
 public class AbstractInfo {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/AbstractMi1FirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/AbstractMi1FirmwareInfo.java
index ff18505c2..edfc63f77 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/AbstractMi1FirmwareInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/AbstractMi1FirmwareInfo.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
     Gobbetti
 
     This file is part of Gadgetbridge.
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.miband;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/AbstractMi1SFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/AbstractMi1SFirmwareInfo.java
index 150c25fcb..f6e07117e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/AbstractMi1SFirmwareInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/AbstractMi1SFirmwareInfo.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Carsten Pfeiffer, Daniele Gobbetti
+/*  Copyright (C) 2016-2024 Carsten Pfeiffer, Daniele Gobbetti
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.miband;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/AbstractMiFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/AbstractMiFirmwareInfo.java
index 0bf1da1d6..fff9e5f36 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/AbstractMiFirmwareInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/AbstractMiFirmwareInfo.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
     Gobbetti
 
     This file is part of Gadgetbridge.
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.miband;
 
 import java.util.Arrays;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/BatteryInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/BatteryInfo.java
index 38d7f5a64..cb11a54ed 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/BatteryInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/BatteryInfo.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
     Gobbetti
 
     This file is part of Gadgetbridge.
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.miband;
 
 import java.util.GregorianCalendar;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/CheckAuthenticationNeededAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/CheckAuthenticationNeededAction.java
index d2a0c04b6..f5448c95c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/CheckAuthenticationNeededAction.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/CheckAuthenticationNeededAction.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Carsten Pfeiffer
+/*  Copyright (C) 2016-2024 Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.miband;
 
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/CompositeMiFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/CompositeMiFirmwareInfo.java
index 8e736a107..b11123aba 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/CompositeMiFirmwareInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/CompositeMiFirmwareInfo.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2016-2024 Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.miband;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/DeviceInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/DeviceInfo.java
index f10f5b7a4..262fd1499 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/DeviceInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/DeviceInfo.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Sergey Trofimov
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Sergey
+    Trofimov
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.miband;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/Mi1AFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/Mi1AFirmwareInfo.java
index bbc387969..49b217efe 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/Mi1AFirmwareInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/Mi1AFirmwareInfo.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Carsten Pfeiffer, Daniele Gobbetti
+/*  Copyright (C) 2016-2024 Carsten Pfeiffer, Daniele Gobbetti
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.miband;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/Mi1FirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/Mi1FirmwareInfo.java
index f8e9521bd..23ff085bc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/Mi1FirmwareInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/Mi1FirmwareInfo.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Carsten Pfeiffer, Daniele Gobbetti
+/*  Copyright (C) 2016-2024 Carsten Pfeiffer, Daniele Gobbetti
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.miband;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/Mi1SFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/Mi1SFirmwareInfo.java
index 71656280e..d929b6be2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/Mi1SFirmwareInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/Mi1SFirmwareInfo.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
     Gobbetti
 
     This file is part of Gadgetbridge.
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.miband;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/Mi1SFirmwareInfoFW1.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/Mi1SFirmwareInfoFW1.java
index a65fe2f73..ee0e0fbd3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/Mi1SFirmwareInfoFW1.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/Mi1SFirmwareInfoFW1.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
     Gobbetti
 
     This file is part of Gadgetbridge.
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.miband;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/Mi1SFirmwareInfoFW2.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/Mi1SFirmwareInfoFW2.java
index ab3680436..43cd1f3b4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/Mi1SFirmwareInfoFW2.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/Mi1SFirmwareInfoFW2.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
     Gobbetti
 
     This file is part of Gadgetbridge.
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.miband;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/MiBandSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/MiBandSupport.java
index 7b2134481..6e5a2337c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/MiBandSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/MiBandSupport.java
@@ -1,7 +1,7 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, atkyritsis, Carsten Pfeiffer,
-    Christian Fischer, Daniele Gobbetti, Dmitry Markin, freezed-or-frozen,
-    JohnnySun, Julien Pivotto, Kasha, Sebastian Kranz, Sergey Trofimov, Steffen
-    Liebergeld
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Arjan Schrijver, atkyritsis,
+    Carsten Pfeiffer, Christian Fischer, Daniele Gobbetti, Dmitry Markin,
+    freezed-or-frozen, JohnnySun, José Rebelo, Julien Pivotto, Kasha, Sebastian
+    Kranz, Sergey Trofimov, Steffen Liebergeld, Toby Murray
 
     This file is part of Gadgetbridge.
 
@@ -16,7 +16,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.miband;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/NoNotificationStrategy.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/NoNotificationStrategy.java
index fb2aed376..7eea51fc3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/NoNotificationStrategy.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/NoNotificationStrategy.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Carsten Pfeiffer, Daniele Gobbetti
+/*  Copyright (C) 2015-2024 Carsten Pfeiffer, Daniele Gobbetti
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.miband;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/NotificationStrategy.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/NotificationStrategy.java
index dc9ef9756..312d35518 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/NotificationStrategy.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/NotificationStrategy.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Carsten Pfeiffer, Daniele Gobbetti
+/*  Copyright (C) 2015-2024 Carsten Pfeiffer, Daniele Gobbetti
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.miband;
 
 import androidx.annotation.Nullable;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/RealtimeSamplesSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/RealtimeSamplesSupport.java
index df47611aa..5d688ab83 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/RealtimeSamplesSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/RealtimeSamplesSupport.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Carsten Pfeiffer
+/*  Copyright (C) 2016-2024 Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.miband;
 
 import java.util.Timer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/TestMi1AFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/TestMi1AFirmwareInfo.java
index 96ec182f6..6b93461d5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/TestMi1AFirmwareInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/TestMi1AFirmwareInfo.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
     Gobbetti
 
     This file is part of Gadgetbridge.
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.miband;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/V1NotificationStrategy.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/V1NotificationStrategy.java
index 3ce20ffbf..39fe6e515 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/V1NotificationStrategy.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/V1NotificationStrategy.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Carsten Pfeiffer
+/*  Copyright (C) 2015-2024 Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.miband;
 
 import android.bluetooth.BluetoothGattCharacteristic;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/V2NotificationStrategy.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/V2NotificationStrategy.java
index a8365e456..58e0496a5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/V2NotificationStrategy.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/V2NotificationStrategy.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Carsten Pfeiffer, Daniele Gobbetti
+/*  Copyright (C) 2015-2024 Carsten Pfeiffer, Daniele Gobbetti
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.miband;
 
 import android.bluetooth.BluetoothGattCharacteristic;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/AbstractMiBand1Operation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/AbstractMiBand1Operation.java
index cfa58d6d6..4bd72c9b8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/AbstractMiBand1Operation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/AbstractMiBand1Operation.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Carsten Pfeiffer
+/*  Copyright (C) 2016-2024 Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.miband.operations;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandService;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/AbstractMiBandOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/AbstractMiBandOperation.java
index 9abb9e450..1031c5897 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/AbstractMiBandOperation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/AbstractMiBandOperation.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.miband.operations;
 
 import android.widget.Toast;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/FetchActivityOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/FetchActivityOperation.java
index 02b5ed0c3..36a2c38fb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/FetchActivityOperation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/FetchActivityOperation.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
     Gobbetti, Taavi Eomäe
 
     This file is part of Gadgetbridge.
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.miband.operations;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/OperationStatus.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/OperationStatus.java
index aecc03955..ee20d3eef 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/OperationStatus.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/OperationStatus.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Carsten Pfeiffer
+/*  Copyright (C) 2016-2024 Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.miband.operations;
 
 public enum OperationStatus {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/UpdateFirmwareOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/UpdateFirmwareOperation.java
index 38fde1da9..bcbd53a30 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/UpdateFirmwareOperation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/operations/UpdateFirmwareOperation.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
     Gobbetti, Taavi Eomäe
 
     This file is part of Gadgetbridge.
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.miband.operations;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/mijia_lywsd/MijiaLywsdSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/mijia_lywsd/MijiaLywsdSupport.java
index 98a8176f7..688c43b4d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/mijia_lywsd/MijiaLywsdSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/mijia_lywsd/MijiaLywsdSupport.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Sebastian
-    Kranz, Davis Mosenkovs, José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.mijia_lywsd;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miscale2/MiScale2DeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miscale2/MiScale2DeviceSupport.java
index 3acc7f64a..ef81950a5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miscale2/MiScale2DeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miscale2/MiScale2DeviceSupport.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Jean-François
-    Greffier
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Arjan Schrijver, Damien Gaignon,
+    Jean-François Greffier
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.miscale2;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/no1f1/No1F1Support.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/no1f1/No1F1Support.java
index 67d240ef7..30159156c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/no1f1/No1F1Support.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/no1f1/No1F1Support.java
@@ -1,5 +1,6 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Pavel Elagin, protomors, Sebastian Kranz
+/*  Copyright (C) 2017-2024 Andreas Shimokawa, Arjan Schrijver, Carsten
+    Pfeiffer, Damien Gaignon, Daniele Gobbetti, Pavel Elagin, protomors,
+    Sebastian Kranz
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +15,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.no1f1;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/nothing/Ear1Support.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/nothing/Ear1Support.java
index 757d2df18..6547650f8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/nothing/Ear1Support.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/nothing/Ear1Support.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2021-2024 Arjan Schrijver, Daniele Gobbetti, Petr Vaněk
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.nothing;
 
 import android.net.Uri;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/nothing/NothingIOThread.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/nothing/NothingIOThread.java
index e72d52ff5..889a54641 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/nothing/NothingIOThread.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/nothing/NothingIOThread.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2021-2024 Daniele Gobbetti, Petr Vaněk
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.nothing;
 
 import android.bluetooth.BluetoothAdapter;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/nothing/NothingProtocol.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/nothing/NothingProtocol.java
index e3de16717..9d7c00027 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/nothing/NothingProtocol.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/nothing/NothingProtocol.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2021-2024 Daniele Gobbetti, José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.nothing;
 
 import android.content.SharedPreferences;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/nut/NutSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/nut/NutSupport.java
index ef83b0c11..cb22d2078 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/nut/NutSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/nut/NutSupport.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Taavi Eomäe
+/*  Copyright (C) 2020-2024 Arjan Schrijver, Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.nut;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandler.java
index 82a266536..9a3caaa30 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
     Gobbetti
 
     This file is part of Gadgetbridge.
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble;
 
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerGBPebble.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerGBPebble.java
index 64c0436bf..a59e5b21e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerGBPebble.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerGBPebble.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble;
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerHealthify.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerHealthify.java
index 14ae223ad..31a3f0534 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerHealthify.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerHealthify.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa
+/*  Copyright (C) 2016-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble;
 
 import android.util.Pair;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerM7S.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerM7S.java
index 29dad532a..b467e1473 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerM7S.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerM7S.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2018-2021 Carsten Pfeiffer, jcrode, Johann C. Rode,
-    Sergio Lopez
+/*  Copyright (C) 2018-2024 Carsten Pfeiffer, jcrode, Johann C. Rode
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble;
 
 import android.util.Pair;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerMarioTime.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerMarioTime.java
index 3db1c662a..a35232f16 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerMarioTime.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerMarioTime.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa
+/*  Copyright (C) 2016-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble;
 
 import android.util.Pair;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerMisfit.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerMisfit.java
index 82f6d0162..378b95eb1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerMisfit.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerMisfit.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble;
 
 import android.util.Pair;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerMorpheuz.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerMorpheuz.java
index 47811d23c..d2f0e4d8e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerMorpheuz.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerMorpheuz.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble;
 
 import android.util.Pair;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerObsidian.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerObsidian.java
index a9482bc10..62bea84df 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerObsidian.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerObsidian.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Daniele Gobbetti, Johann C. Rode
+/*  Copyright (C) 2017-2024 Andreas Shimokawa, Daniele Gobbetti, Johann C. Rode
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble;
 
 import android.util.Pair;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerPebStyle.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerPebStyle.java
index 373c120ea..29fcdd6a4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerPebStyle.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerPebStyle.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Daniele Gobbetti, Uwe Hermann
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Daniele Gobbetti, Uwe Hermann
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble;
 
 import android.util.Pair;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerRealWeather.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerRealWeather.java
index 7557d3f72..ccb66ecc2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerRealWeather.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerRealWeather.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2018-2021 Carsten Pfeiffer, Johann C. Rode, Sergio Lopez
+/*  Copyright (C) 2018-2024 Carsten Pfeiffer, Johann C. Rode
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble;
 
 import android.util.Pair;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerSimplyLight.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerSimplyLight.java
index 49309c252..4ecfbba17 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerSimplyLight.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerSimplyLight.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2018-2021 Carsten Pfeiffer, Sergio Lopez
+/*  Copyright (C) 2018-2024 Carsten Pfeiffer, Sergio Lopez
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble;
 
 import android.util.Pair;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerSquare.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerSquare.java
index 92dff5884..80b22d7d3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerSquare.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerSquare.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Daniele Gobbetti
+/*  Copyright (C) 2017-2024 Andreas Shimokawa, Daniele Gobbetti
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble;
 
 import android.util.Pair;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerTimeStylePebble.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerTimeStylePebble.java
index f3a4c07e0..26612e3f1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerTimeStylePebble.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerTimeStylePebble.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Daniele Gobbetti
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Daniele Gobbetti, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble;
 
 import android.util.Pair;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerTrekVolle.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerTrekVolle.java
index c1149c4dc..c7b0ca88c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerTrekVolle.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerTrekVolle.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa
+/*  Copyright (C) 2017-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble;
 
 import android.util.Pair;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerYWeather.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerYWeather.java
index 40d987d3c..cae3f27f9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerYWeather.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerYWeather.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2018-2021 Carsten Pfeiffer, Johann C. Rode
+/*  Copyright (C) 2018-2024 Carsten Pfeiffer, Johann C. Rode, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble;
 
 import android.util.Pair;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerZalewszczak.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerZalewszczak.java
index a872cd7c4..765e9a6e5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerZalewszczak.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/AppMessageHandlerZalewszczak.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+/*  Copyright (C) 2017-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
     Gobbetti
 
     This file is part of Gadgetbridge.
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble;
 
 import android.util.Pair;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSession.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSession.java
index 13d22e14b..54c70c254 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSession.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSession.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa
+/*  Copyright (C) 2016-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionAnalytics.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionAnalytics.java
index caeab85c1..6b74ecda3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionAnalytics.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionAnalytics.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+/*  Copyright (C) 2017-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
     Gobbetti
 
     This file is part of Gadgetbridge.
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionHealthHR.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionHealthHR.java
index 462762de2..1e971ed2b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionHealthHR.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionHealthHR.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa
+/*  Copyright (C) 2016-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionHealthOverlayData.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionHealthOverlayData.java
index 40bde8362..1bb2e5d9a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionHealthOverlayData.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionHealthOverlayData.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
     Gobbetti
 
     This file is part of Gadgetbridge.
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionHealthSleep.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionHealthSleep.java
index 903e7be8e..fb8fb0009 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionHealthSleep.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionHealthSleep.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2016-2021 0nse, Andreas Shimokawa, Carsten Pfeiffer,
-    Daniele Gobbetti
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+    Gobbetti
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionHealthSteps.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionHealthSteps.java
index 544d7ad31..d436da293 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionHealthSteps.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionHealthSteps.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2016-2021 0nse, Andreas Shimokawa, Carsten Pfeiffer,
-    Daniele Gobbetti
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+    Gobbetti
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble;
 
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionPebbleHealth.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionPebbleHealth.java
index bfa80ef20..73c1ae100 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionPebbleHealth.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/DatalogSessionPebbleHealth.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
     Gobbetti
 
     This file is part of Gadgetbridge.
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble;
 
 import java.util.UUID;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleActiveAppTracker.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleActiveAppTracker.java
index d9dd5f259..77114e7c7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleActiveAppTracker.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleActiveAppTracker.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Matej Drobnič
+/*  Copyright (C) 2019-2024 Matej Drobnič
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleIoThread.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleIoThread.java
index 67df664ac..23b528ed3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleIoThread.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleIoThread.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Julien Pivotto, Matej Drobnič, Taavi Eomäe, Uwe Hermann
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniel Dakhno,
+    Daniele Gobbetti, Julien Pivotto, Matej Drobnič, Taavi Eomäe, Uwe Hermann
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble;
 
 import android.bluetooth.BluetoothAdapter;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleKitSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleKitSupport.java
index ee0a3bfd0..a912af8a8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleKitSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleKitSupport.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Matej Drobnič
+/*  Copyright (C) 2017-2024 Andreas Shimokawa, Matej Drobnič
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble;
 
 import android.content.BroadcastReceiver;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleProtocol.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleProtocol.java
index 64bb7e68a..f3a719119 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleProtocol.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleProtocol.java
@@ -1,6 +1,6 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Frank Slezak, jcrode, Johann C. Rode, Julien Pivotto, Kevin Richter,
-    Matej Drobnič, Sergio Lopez, Steffen Liebergeld, Uwe Hermann
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+    Gobbetti, Frank Slezak, jcrode, Johann C. Rode, José Rebelo, Julien Pivotto,
+    Kevin Richter, Matej Drobnič, Sergio Lopez, Steffen Liebergeld, Uwe Hermann
 
     This file is part of Gadgetbridge.
 
@@ -15,7 +15,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble;
 
 import android.util.Base64;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleSupport.java
index 641f35c14..4bb447d48 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleSupport.java
@@ -1,5 +1,6 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Kasha, Sebastian Kranz, Steffen Liebergeld, Taavi Eomäe
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Arjan Schrijver, Carsten
+    Pfeiffer, Daniele Gobbetti, Kasha, Sebastian Kranz, Steffen Liebergeld,
+    Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +15,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble;
 
 import android.net.Uri;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/ble/PebbleGATTClient.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/ble/PebbleGATTClient.java
index 6eac527bb..0759741f4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/ble/PebbleGATTClient.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/ble/PebbleGATTClient.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Taavi Eomäe
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble.ble;
 
 import android.bluetooth.BluetoothDevice;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/ble/PebbleGATTServer.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/ble/PebbleGATTServer.java
index dd34fe6b4..ef0c18212 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/ble/PebbleGATTServer.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/ble/PebbleGATTServer.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Daniele Gobbetti, Uwe Hermann
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Daniele Gobbetti, Uwe Hermann
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble.ble;
 
 import android.bluetooth.BluetoothDevice;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/ble/PebbleLESupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/ble/PebbleLESupport.java
index d99a23918..c7a3df121 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/ble/PebbleLESupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/ble/PebbleLESupport.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Daniele Gobbetti
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Daniele Gobbetti
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble.ble;
 
 import android.bluetooth.BluetoothDevice;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/webview/CurrentPosition.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/webview/CurrentPosition.java
index a52cc39f6..f805ef4ce 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/webview/CurrentPosition.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/webview/CurrentPosition.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Daniele Gobbetti
+/*  Copyright (C) 2017-2024 Andreas Shimokawa, Daniele Gobbetti
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble.webview;
 
 import android.Manifest;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/webview/GBChromeClient.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/webview/GBChromeClient.java
index f20d070db..c7406b199 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/webview/GBChromeClient.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/webview/GBChromeClient.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Daniele Gobbetti
+/*  Copyright (C) 2017-2024 Daniele Gobbetti
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble.webview;
 
 import android.webkit.ConsoleMessage;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/webview/GBWebClient.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/webview/GBWebClient.java
index 66439416a..8295c0042 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/webview/GBWebClient.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/webview/GBWebClient.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+/*  Copyright (C) 2017-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
     Gobbetti, Pavel Elagin
 
     This file is part of Gadgetbridge.
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble.webview;
 
 import android.annotation.TargetApi;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/webview/JSInterface.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/webview/JSInterface.java
index 0c045a17c..295775195 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/webview/JSInterface.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/webview/JSInterface.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+/*  Copyright (C) 2017-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
     Gobbetti
 
     This file is part of Gadgetbridge.
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.pebble.webview;
 
 import android.webkit.JavascriptInterface;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pinetime/PineTimeJFSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pinetime/PineTimeJFSupport.java
index 2504d1cb6..39d12207c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pinetime/PineTimeJFSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pinetime/PineTimeJFSupport.java
@@ -1,5 +1,7 @@
-/*  Copyright (C) 2016-2022 Andreas Shimokawa, Carsten Pfeiffer, JF, Sebastian
-    Kranz, Taavi Eomäe
+/*  Copyright (C) 2020-2024 Andreas Shimokawa, Arjan Schrijver, Daniel
+    Dakhno, Davis Mosenkovs, Ernst, FintasticMan, Gordon Williams, ITCactus,
+    Jean-François Milants, JF, Johannes Krude, kieranc001, Patric Gruber,
+    Petr Kadlec, Taavi Eomäe, uli
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +16,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.pinetime;
 
 import static nodomain.freeyourgadget.gadgetbridge.devices.pinetime.weather.WeatherData.mapOpenWeatherConditionToCloudCover;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qc35/QC35BaseSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qc35/QC35BaseSupport.java
index 21850497a..cadd38a6c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qc35/QC35BaseSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qc35/QC35BaseSupport.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Daniel Dakhno
+/*  Copyright (C) 2021-2024 Arjan Schrijver, Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qc35;
 
 import android.net.Uri;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qc35/QC35IOThread.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qc35/QC35IOThread.java
index 964791bd1..0e75f3def 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qc35/QC35IOThread.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qc35/QC35IOThread.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Daniel Dakhno
+/*  Copyright (C) 2021-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qc35;
 
 import android.bluetooth.BluetoothAdapter;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qc35/QC35Protocol.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qc35/QC35Protocol.java
index cdd4b5162..7be16afd8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qc35/QC35Protocol.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qc35/QC35Protocol.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Daniel Dakhno
+/*  Copyright (C) 2021-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qc35;
 
 import android.content.SharedPreferences;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/QHybridBaseSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/QHybridBaseSupport.java
index 3d7950fd8..38fd2911f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/QHybridBaseSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/QHybridBaseSupport.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2015-2021 0nse, Andreas Shimokawa, Carsten Pfeiffer, Daniel
-    Dakhno, José Rebelo, Julien Pivotto, Sebastian Kranz, Steffen Liebergeld
+/*  Copyright (C) 2019-2024 Arjan Schrijver, Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid;
 
 import android.net.Uri;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/QHybridSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/QHybridSupport.java
index 7f91178a3..d90f88234 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/QHybridSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/QHybridSupport.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2019-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniel
-    Dakhno, Taavi Eomäe
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Arjan Schrijver, Carsten
+    Pfeiffer, Daniel Dakhno, Dmitriy Bogdanov, Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/WatchAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/WatchAdapter.java
index 68cef9193..0daafea3a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/WatchAdapter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/WatchAdapter.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2019-2021 Andreas Shimokawa, Daniel Dakhno
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Arjan Schrijver, Daniel Dakhno,
+    Hasan Ammar
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.adapter;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/WatchAdapterFactory.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/WatchAdapterFactory.java
index 57c2e8597..4e5d61a3d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/WatchAdapterFactory.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/WatchAdapterFactory.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Daniel Dakhno, Hasan Ammar
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.adapter;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.QHybridSupport;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil/FossilWatchAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil/FossilWatchAdapter.java
index 5ef92272a..084045f15 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil/FossilWatchAdapter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil/FossilWatchAdapter.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2019-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniel Dakhno
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Arjan Schrijver, Carsten
+    Pfeiffer, Daniel Dakhno, Hasan Ammar, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.adapter.fossil;
 
 import static nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.QHybridSupport.ITEM_STEP_GOAL;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil_hr/FossilHRWatchAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil_hr/FossilHRWatchAdapter.java
index 5bafe005c..1a291d937 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil_hr/FossilHRWatchAdapter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil_hr/FossilHRWatchAdapter.java
@@ -1,4 +1,6 @@
-/*  Copyright (C) 2019-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniel Dakhno, Arjan Schrijver
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Arjan Schrijver, Carsten
+    Pfeiffer, Daniel Dakhno, Enrico Brambilla, Hasan Ammar, José Rebelo, Morten
+    Rieger Hannemose, mvn23, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +15,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.adapter.fossil_hr;
 
 import static nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil.configuration.ConfigurationPutRequest.FitnessConfigItem;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/misfit/MisfitWatchAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/misfit/MisfitWatchAdapter.java
index 75044783e..cae3a684b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/misfit/MisfitWatchAdapter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/misfit/MisfitWatchAdapter.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniel Dakhno
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.adapter.misfit;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/buttonconfig/ConfigFileBuilder.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/buttonconfig/ConfigFileBuilder.java
index ad1cb640b..4ad6c5d0e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/buttonconfig/ConfigFileBuilder.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/buttonconfig/ConfigFileBuilder.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.buttonconfig;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/buttonconfig/ConfigPayload.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/buttonconfig/ConfigPayload.java
index 008ba3063..ea4728abb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/buttonconfig/ConfigPayload.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/buttonconfig/ConfigPayload.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.buttonconfig;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/encoder/RLEEncoder.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/encoder/RLEEncoder.java
index 04a8a148f..e518f39e9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/encoder/RLEEncoder.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/encoder/RLEEncoder.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Daniel Dakhno
+/*  Copyright (C) 2020-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.encoder;
 
 import java.io.ByteArrayOutputStream;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/file/FileHandle.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/file/FileHandle.java
index 6ad4f3c09..cf0a9926f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/file/FileHandle.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/file/FileHandle.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Daniel Dakhno
+/*  Copyright (C) 2020-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.file;
 
 public enum FileHandle {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/parser/ActivityEntry.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/parser/ActivityEntry.java
index c5b903507..7c46f0e4e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/parser/ActivityEntry.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/parser/ActivityEntry.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Andreas Shimokawa, Daniel Dakhno
+/*  Copyright (C) 2020-2024 Andreas Shimokawa, Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.parser;
 
 import nodomain.freeyourgadget.gadgetbridge.database.DBHelper;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/parser/ActivityFileParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/parser/ActivityFileParser.java
index 28ebbe38b..b79f4a01b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/parser/ActivityFileParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/parser/ActivityFileParser.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Andreas Shimokawa, Daniel Dakhno
+/*  Copyright (C) 2020-2024 Andreas Shimokawa, Benjamin Swartley, Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.parser;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/Request.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/Request.java
index e0a382adb..a7a3d3b5f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/Request.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/Request.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Carsten Pfeiffer, Daniel Dakhno
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests;
 
 import android.bluetooth.BluetoothGattCharacteristic;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/FossilRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/FossilRequest.java
index 6ad545fce..5c6bce2fd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/FossilRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/FossilRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil;
 
 import java.util.UUID;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/RequestMtuRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/RequestMtuRequest.java
index 3e2fef4e2..579d0373c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/RequestMtuRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/RequestMtuRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil;
 
 import android.os.Build;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/SetDeviceStateRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/SetDeviceStateRequest.java
index d1afe6040..a3938c0c2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/SetDeviceStateRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/SetDeviceStateRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil;
 
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/alarm/Alarm.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/alarm/Alarm.java
index 26cea5cbe..e5495e136 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/alarm/Alarm.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/alarm/Alarm.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno, Taavi Eomäe
+/*  Copyright (C) 2019-2024 Daniel Dakhno, Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil.alarm;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/alarm/AlarmsGetRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/alarm/AlarmsGetRequest.java
index 8be76236f..28c831dd3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/alarm/AlarmsGetRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/alarm/AlarmsGetRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil.alarm;
 
 import android.widget.Toast;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/alarm/AlarmsSetRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/alarm/AlarmsSetRequest.java
index 02a4ffc21..1f42bc74f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/alarm/AlarmsSetRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/alarm/AlarmsSetRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno, Taavi Eomäe
+/*  Copyright (C) 2019-2024 Arjan Schrijver, Daniel Dakhno, Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil.alarm;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/button/ButtonConfigurationGetRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/button/ButtonConfigurationGetRequest.java
index 585dec6ef..46863fff4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/button/ButtonConfigurationGetRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/button/ButtonConfigurationGetRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil.button;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/configuration/ConfigurationGetRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/configuration/ConfigurationGetRequest.java
index a2853ed32..7b35d723b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/configuration/ConfigurationGetRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/configuration/ConfigurationGetRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil.configuration;
 
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/configuration/ConfigurationPutRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/configuration/ConfigurationPutRequest.java
index eec0f8a69..9faaeb02a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/configuration/ConfigurationPutRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/configuration/ConfigurationPutRequest.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno, Taavi Eomäe
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Arjan Schrijver, Daniel Dakhno,
+    Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil.configuration;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/connection/SetConnectionParametersRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/connection/SetConnectionParametersRequest.java
index 15f2b7e7f..529c74a45 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/connection/SetConnectionParametersRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/connection/SetConnectionParametersRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil.connection;
 
 import android.bluetooth.BluetoothGattCharacteristic;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/device_info/DeviceInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/device_info/DeviceInfo.java
index 5e21cd36a..178d7f6f4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/device_info/DeviceInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/device_info/DeviceInfo.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Daniel Dakhno
+/*  Copyright (C) 2020-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil.device_info;
 
 public interface DeviceInfo {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/device_info/DeviceSecurityVersionInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/device_info/DeviceSecurityVersionInfo.java
index 5d6536854..3f5aa7165 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/device_info/DeviceSecurityVersionInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/device_info/DeviceSecurityVersionInfo.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Daniel Dakhno
+/*  Copyright (C) 2020-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil.device_info;
 
 import android.util.Log;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/device_info/GetDeviceInfoRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/device_info/GetDeviceInfoRequest.java
index 2dde57607..46ac1eaa0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/device_info/GetDeviceInfoRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/device_info/GetDeviceInfoRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Daniel Dakhno
+/*  Copyright (C) 2020-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil.device_info;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/device_info/SupportedFileVersionsInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/device_info/SupportedFileVersionsInfo.java
index 72d8863b7..3eb3c7ff6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/device_info/SupportedFileVersionsInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/device_info/SupportedFileVersionsInfo.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Daniel Dakhno
+/*  Copyright (C) 2020-2024 Arjan Schrijver, Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil.device_info;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/file/FileCloseAndPutRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/file/FileCloseAndPutRequest.java
index e7bac4662..7eadb8031 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/file/FileCloseAndPutRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/file/FileCloseAndPutRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil.file;
 
 import android.widget.Toast;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/file/FileCloseRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/file/FileCloseRequest.java
index 4a25f9ff0..19931e64e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/file/FileCloseRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/file/FileCloseRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil.file;
 
 import android.bluetooth.BluetoothGattCharacteristic;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/file/FileDeleteRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/file/FileDeleteRequest.java
index 2f1f512db..ef45c694d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/file/FileDeleteRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/file/FileDeleteRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil.file;
 
 import android.bluetooth.BluetoothGattCharacteristic;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/file/FileGetRawRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/file/FileGetRawRequest.java
index 422b67b21..abca4817e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/file/FileGetRawRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/file/FileGetRawRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2020-2024 Arjan Schrijver, Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil.file;
 
 import android.bluetooth.BluetoothGattCharacteristic;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/file/FileGetRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/file/FileGetRequest.java
index 624adb671..47afa67ab 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/file/FileGetRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/file/FileGetRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil.file;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.adapter.fossil.FossilWatchAdapter;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/file/FileLookupAndGetRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/file/FileLookupAndGetRequest.java
index 9ac974bed..1ecef6e24 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/file/FileLookupAndGetRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/file/FileLookupAndGetRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil.file;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.adapter.fossil.FossilWatchAdapter;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/file/FileLookupRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/file/FileLookupRequest.java
index 90f600959..40aa79379 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/file/FileLookupRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/file/FileLookupRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil.file;
 
 import android.bluetooth.BluetoothGattCharacteristic;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/file/FilePutRawRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/file/FilePutRawRequest.java
index 98bf2a420..e1b1bf549 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/file/FilePutRawRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/file/FilePutRawRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Andreas Shimokawa, Daniel Dakhno
+/*  Copyright (C) 2020-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil.file;
 
 import android.bluetooth.BluetoothGattCharacteristic;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/file/FilePutRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/file/FilePutRequest.java
index f8583c570..93f12ded9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/file/FilePutRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/file/FilePutRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Andreas Shimokawa, Daniel Dakhno
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Arjan Schrijver, Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil.file;
 
 import android.bluetooth.BluetoothGattCharacteristic;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/file/FileVerifyRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/file/FileVerifyRequest.java
index aad0074ac..2e4eeb565 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/file/FileVerifyRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/file/FileVerifyRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil.file;
 
 import android.bluetooth.BluetoothGattCharacteristic;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/file/FirmwareFilePutRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/file/FirmwareFilePutRequest.java
index a7ce75f7a..a16e4c4ff 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/file/FirmwareFilePutRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/file/FirmwareFilePutRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Andreas Shimokawa, Daniel Dakhno
+/*  Copyright (C) 2020-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil.file;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/microapp/MicroAppCommand.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/microapp/MicroAppCommand.java
index f53e658c6..0e73b8066 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/microapp/MicroAppCommand.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/microapp/MicroAppCommand.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil.microapp;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/microapp/PlayCrazyShitRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/microapp/PlayCrazyShitRequest.java
index 17fa55ce5..8c151660c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/microapp/PlayCrazyShitRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/microapp/PlayCrazyShitRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil.microapp;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/notification/DismissTextNotificationRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/notification/DismissTextNotificationRequest.java
index f9e374f15..0694c71aa 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/notification/DismissTextNotificationRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/notification/DismissTextNotificationRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Arjan Schrijver
+/*  Copyright (C) 2021-2024 Arjan Schrijver
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil.notification;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.adapter.fossil.FossilWatchAdapter;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/notification/NotificationFilterGetRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/notification/NotificationFilterGetRequest.java
index b1192e6f3..07e28fc7d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/notification/NotificationFilterGetRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/notification/NotificationFilterGetRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Andreas Shimokawa, Daniel Dakhno
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil.notification;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/notification/NotificationFilterPutRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/notification/NotificationFilterPutRequest.java
index 236227552..5653ffea4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/notification/NotificationFilterPutRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/notification/NotificationFilterPutRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil.notification;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/notification/NotificationType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/notification/NotificationType.java
index ff3c4bf0d..d220de43d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/notification/NotificationType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/notification/NotificationType.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Arjan Schrijver
+/*  Copyright (C) 2021-2024 Arjan Schrijver
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil.notification;
 
 public enum NotificationType {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/notification/PlayCallNotificationRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/notification/PlayCallNotificationRequest.java
index 64906aa85..391c61bb9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/notification/PlayCallNotificationRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/notification/PlayCallNotificationRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Daniel Dakhno
+/*  Copyright (C) 2020-2024 Arjan Schrijver, Daniel Dakhno, mvn23
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil.notification;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/notification/PlayNotificationRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/notification/PlayNotificationRequest.java
index ced20e3ca..7583e1a61 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/notification/PlayNotificationRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/notification/PlayNotificationRequest.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2019-2021 Andreas Shimokawa, Daniel Dakhno, hackoder
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Arjan Schrijver, Daniel
+    Dakhno, hackoder
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil.notification;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/notification/PlayTextNotificationRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/notification/PlayTextNotificationRequest.java
index c17b31eaf..3436e8edc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/notification/PlayTextNotificationRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil/notification/PlayTextNotificationRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Daniel Dakhno
+/*  Copyright (C) 2020-2024 Arjan Schrijver, Daniel Dakhno, mvn23
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil.notification;
 
 import nodomain.freeyourgadget.gadgetbridge.model.NotificationSpec;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/alexa/AlexaMessageSetRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/alexa/AlexaMessageSetRequest.java
index b8f50eaf5..459adae27 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/alexa/AlexaMessageSetRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/alexa/AlexaMessageSetRequest.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 Daniel Dakhno
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.alexa;
 
 import org.json.JSONException;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/application/ApplicationInformation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/application/ApplicationInformation.java
index 7f8d26396..e6f285a75 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/application/ApplicationInformation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/application/ApplicationInformation.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2021-2024 Arjan Schrijver, Daniel Dakhno
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.application;
 
 public class ApplicationInformation implements Comparable<ApplicationInformation> {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/application/ApplicationsListRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/application/ApplicationsListRequest.java
index 8c0888ec4..b5903dfe1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/application/ApplicationsListRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/application/ApplicationsListRequest.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2021-2024 Arjan Schrijver, Daniel Dakhno
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.application;
 
 import android.content.pm.ApplicationInfo;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/async/ConfirmAppStatusRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/async/ConfirmAppStatusRequest.java
index 2f7665a43..27f3431ba 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/async/ConfirmAppStatusRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/async/ConfirmAppStatusRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Daniel Dakhno
+/*  Copyright (C) 2020-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.async;
 
 import org.json.JSONException;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/authentication/AuthenticationRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/authentication/AuthenticationRequest.java
index 94a38b062..e6d50bee3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/authentication/AuthenticationRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/authentication/AuthenticationRequest.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2021-2024 Daniel Dakhno
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.authentication;
 
 import java.util.UUID;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/authentication/CheckDeviceNeedsConfirmationRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/authentication/CheckDeviceNeedsConfirmationRequest.java
index 38d49f949..675c31882 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/authentication/CheckDeviceNeedsConfirmationRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/authentication/CheckDeviceNeedsConfirmationRequest.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2021-2024 Daniel Dakhno
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.authentication;
 
 import android.bluetooth.BluetoothGattCharacteristic;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/authentication/CheckDevicePairingRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/authentication/CheckDevicePairingRequest.java
index 207953e9d..326b07a89 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/authentication/CheckDevicePairingRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/authentication/CheckDevicePairingRequest.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2023-2024 Arjan Schrijver
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.authentication;
 
 import android.bluetooth.BluetoothGattCharacteristic;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/authentication/ConfirmOnDeviceRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/authentication/ConfirmOnDeviceRequest.java
index fc9012b78..a6001d87f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/authentication/ConfirmOnDeviceRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/authentication/ConfirmOnDeviceRequest.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2021-2024 Daniel Dakhno
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.authentication;
 
 import android.bluetooth.BluetoothGattCharacteristic;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/authentication/PerformDevicePairingRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/authentication/PerformDevicePairingRequest.java
index 5490c2385..1fa9975cb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/authentication/PerformDevicePairingRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/authentication/PerformDevicePairingRequest.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2023-2024 Arjan Schrijver
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.authentication;
 
 public class PerformDevicePairingRequest extends CheckDevicePairingRequest {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/authentication/VerifyPrivateKeyRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/authentication/VerifyPrivateKeyRequest.java
index abbe36730..9c3e15e7e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/authentication/VerifyPrivateKeyRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/authentication/VerifyPrivateKeyRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.authentication;
 
 import android.bluetooth.BluetoothGattCharacteristic;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/buttons/ButtonConfiguration.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/buttons/ButtonConfiguration.java
index 4dd6a31c0..703cb10a9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/buttons/ButtonConfiguration.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/buttons/ButtonConfiguration.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Daniel Dakhno
+/*  Copyright (C) 2020-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.buttons;
 
 import org.json.JSONException;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/buttons/ButtonConfigurationPutRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/buttons/ButtonConfigurationPutRequest.java
index 650ace9f9..f17f7b6fc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/buttons/ButtonConfigurationPutRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/buttons/ButtonConfigurationPutRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Andreas Shimokawa, Daniel Dakhno
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.buttons;
 
 import android.widget.Toast;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/commute/CommuteConfigPutRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/commute/CommuteConfigPutRequest.java
index 65d349184..06d094063 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/commute/CommuteConfigPutRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/commute/CommuteConfigPutRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Andreas Shimokawa, Daniel Dakhno
+/*  Copyright (C) 2021-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.commute;
 
 import android.widget.Toast;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/configuration/ConfigurationGetRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/configuration/ConfigurationGetRequest.java
index 6a1d3af3c..53087a75d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/configuration/ConfigurationGetRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/configuration/ConfigurationGetRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Arjan Schrijver, Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.configuration;
 
 import android.widget.Toast;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/configuration/ConfigurationPutRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/configuration/ConfigurationPutRequest.java
index e1a0a5124..9849e1bc8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/configuration/ConfigurationPutRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/configuration/ConfigurationPutRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Andreas Shimokawa, Daniel Dakhno
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.configuration;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/file/AssetFile.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/file/AssetFile.java
index 27aa46f82..7757883db 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/file/AssetFile.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/file/AssetFile.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Andreas Shimokawa, Daniel Dakhno
+/*  Copyright (C) 2020-2024 Andreas Shimokawa, Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.file;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/file/AssetFilePutRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/file/AssetFilePutRequest.java
index 83bd7d2fc..0f759aa52 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/file/AssetFilePutRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/file/AssetFilePutRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Andreas Shimokawa, Daniel Dakhno
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.file;
 
 import java.io.ByteArrayOutputStream;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/file/FileEncryptedGetRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/file/FileEncryptedGetRequest.java
index c93351577..ce9a3bfb5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/file/FileEncryptedGetRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/file/FileEncryptedGetRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Arjan Schrijver, Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.file;
 
 import android.bluetooth.BluetoothGattCharacteristic;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/file/FileEncryptedInterface.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/file/FileEncryptedInterface.java
index 5f388713d..c4dbc5ee2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/file/FileEncryptedInterface.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/file/FileEncryptedInterface.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Daniel Dakhno
+/*  Copyright (C) 2020-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.file;
 
 public interface FileEncryptedInterface {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/file/FileEncryptedLookupAndGetRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/file/FileEncryptedLookupAndGetRequest.java
index 970456ecc..6b6d5f7d5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/file/FileEncryptedLookupAndGetRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/file/FileEncryptedLookupAndGetRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.file;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.adapter.fossil_hr.FossilHRWatchAdapter;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/file/FileEncryptedPutRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/file/FileEncryptedPutRequest.java
index ffed97fb4..a45e65d58 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/file/FileEncryptedPutRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/file/FileEncryptedPutRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Andreas Shimokawa, Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.file;
 
 import android.bluetooth.BluetoothGattCharacteristic;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/file/ResultCode.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/file/ResultCode.java
index 07b789915..01e0101a0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/file/ResultCode.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/file/ResultCode.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.file;
 
 import nodomain.freeyourgadget.gadgetbridge.util.GB;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/image/AssetImage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/image/AssetImage.java
index b527f502e..e784b3e58 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/image/AssetImage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/image/AssetImage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2020-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.image;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/image/AssetImageFactory.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/image/AssetImageFactory.java
index 17712fb7d..f828f81b8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/image/AssetImageFactory.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/image/AssetImageFactory.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Daniel Dakhno
+/*  Copyright (C) 2020-2024 Arjan Schrijver, Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.image;
 
 import android.graphics.Bitmap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/image/ImageConverter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/image/ImageConverter.java
index dd14ec90e..c56a8dba2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/image/ImageConverter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/image/ImageConverter.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Daniel Dakhno, Arjan Schrijver
+/*  Copyright (C) 2020-2024 Arjan Schrijver, Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.image;
 
 import android.graphics.Bitmap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/image/ImagesSetRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/image/ImagesSetRequest.java
index 4fccb37b1..734766b53 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/image/ImagesSetRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/image/ImagesSetRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2020-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.image;
 
 import org.json.JSONArray;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/json/JsonPutRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/json/JsonPutRequest.java
index ca24320df..f261dae81 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/json/JsonPutRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/json/JsonPutRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.json;
 
 import org.json.JSONObject;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/menu/SetCommuteMenuMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/menu/SetCommuteMenuMessage.java
index f6680ba6e..f86354649 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/menu/SetCommuteMenuMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/menu/SetCommuteMenuMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.menu;
 
 import org.json.JSONException;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/music/MusicControlRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/music/MusicControlRequest.java
index 086b67134..66b0d0d8d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/music/MusicControlRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/music/MusicControlRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Andreas Shimokawa, Daniel Dakhno
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.music;
 
 import java.util.UUID;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/music/MusicInfoSetRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/music/MusicInfoSetRequest.java
index ceb1f2cab..3c7a46922 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/music/MusicInfoSetRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/music/MusicInfoSetRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.music;
 
 import java.nio.BufferOverflowException;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/notification/NotificationFilterPutHRRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/notification/NotificationFilterPutHRRequest.java
index 752ffbcb1..ae2a414fb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/notification/NotificationFilterPutHRRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/notification/NotificationFilterPutHRRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Andreas Shimokawa, Daniel Dakhno
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Arjan Schrijver, Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.notification;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/notification/NotificationImage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/notification/NotificationImage.java
index 7ffc15b70..dc327865e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/notification/NotificationImage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/notification/NotificationImage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno, Arjan Schrijver
+/*  Copyright (C) 2019-2024 Arjan Schrijver, Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.notification;
 
 import android.graphics.Bitmap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/notification/NotificationImagePutRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/notification/NotificationImagePutRequest.java
index f3d2a11ec..f78fa1688 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/notification/NotificationImagePutRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/notification/NotificationImagePutRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Andreas Shimokawa, Daniel Dakhno
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Arjan Schrijver, Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.notification;
 
 import java.io.ByteArrayOutputStream;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/quickreply/QuickReplyConfigurationPutRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/quickreply/QuickReplyConfigurationPutRequest.java
index c705178f2..a2357a580 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/quickreply/QuickReplyConfigurationPutRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/quickreply/QuickReplyConfigurationPutRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Arjan Schrijver
+/*  Copyright (C) 2021-2024 Andreas Shimokawa, Arjan Schrijver
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.quickreply;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/quickreply/QuickReplyConfirmationPutRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/quickreply/QuickReplyConfirmationPutRequest.java
index b9fc0f85a..44e4c0e6c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/quickreply/QuickReplyConfirmationPutRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/quickreply/QuickReplyConfirmationPutRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Arjan Schrijver
+/*  Copyright (C) 2021-2024 Arjan Schrijver
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.quickreply;
 
 import java.util.UUID;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/theme/SelectedThemePutRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/theme/SelectedThemePutRequest.java
index 0a37c771b..46642873b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/theme/SelectedThemePutRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/theme/SelectedThemePutRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Arjan Schrijver
+/*  Copyright (C) 2021-2024 Arjan Schrijver
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.theme;
 
 import android.widget.Toast;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/translation/TranslationData.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/translation/TranslationData.java
index ace737224..f665ad79e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/translation/TranslationData.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/translation/TranslationData.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Daniel Dakhno
+/*  Copyright (C) 2020-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.translation;
 
 import nodomain.freeyourgadget.gadgetbridge.service.btle.Transaction;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/translation/TranslationItem.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/translation/TranslationItem.java
index 124a5d38d..469d8f1bd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/translation/TranslationItem.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/translation/TranslationItem.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Daniel Dakhno
+/*  Copyright (C) 2020-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.translation;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/translation/TranslationsGetRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/translation/TranslationsGetRequest.java
index 25413f1f7..b938862a8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/translation/TranslationsGetRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/translation/TranslationsGetRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Daniel Dakhno
+/*  Copyright (C) 2020-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.translation;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/translation/TranslationsPutRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/translation/TranslationsPutRequest.java
index bd776b3e1..dcff01a9e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/translation/TranslationsPutRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/translation/TranslationsPutRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Daniel Dakhno
+/*  Copyright (C) 2020-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.translation;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/widget/CustomBackgroundWidgetElement.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/widget/CustomBackgroundWidgetElement.java
index f14e10205..3b2901609 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/widget/CustomBackgroundWidgetElement.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/widget/CustomBackgroundWidgetElement.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Daniel Dakhno
+/*  Copyright (C) 2020-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.widget;
 
 public class CustomBackgroundWidgetElement extends CustomWidgetElement{
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/widget/CustomTextWidgetElement.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/widget/CustomTextWidgetElement.java
index 81db3c922..c3a5cab00 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/widget/CustomTextWidgetElement.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/widget/CustomTextWidgetElement.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Daniel Dakhno
+/*  Copyright (C) 2020-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.widget;
 
 public class CustomTextWidgetElement extends CustomWidgetElement{
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/widget/CustomWidget.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/widget/CustomWidget.java
index 5b93da27a..809fa7f1f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/widget/CustomWidget.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/widget/CustomWidget.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Andreas Shimokawa, Daniel Dakhno
+/*  Copyright (C) 2020-2024 Andreas Shimokawa, Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.widget;
 
 import java.util.ArrayList;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/widget/CustomWidgetElement.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/widget/CustomWidgetElement.java
index fcf53df08..3efcf6746 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/widget/CustomWidgetElement.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/widget/CustomWidgetElement.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Daniel Dakhno
+/*  Copyright (C) 2020-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.widget;
 
 import java.io.Serializable;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/widget/Widget.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/widget/Widget.java
index fb0155da4..a93d79d5c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/widget/Widget.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/widget/Widget.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Andreas Shimokawa, Daniel Dakhno
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.widget;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/widget/WidgetsPutRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/widget/WidgetsPutRequest.java
index 887f190ad..0611035de 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/widget/WidgetsPutRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/widget/WidgetsPutRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Andreas Shimokawa, Daniel Dakhno
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.widget;
 
 import org.json.JSONArray;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/workout/WorkoutRequestHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/workout/WorkoutRequestHandler.java
index 43d616997..8b6300b6f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/workout/WorkoutRequestHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/workout/WorkoutRequestHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 Arjan Schrijver
+/*  Copyright (C) 2022-2024 Arjan Schrijver, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.fossil_hr.workout;
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/ActivityPointGetRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/ActivityPointGetRequest.java
index d12d0958e..2e9b464cd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/ActivityPointGetRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/ActivityPointGetRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.misfit;
 
 import android.bluetooth.BluetoothGattCharacteristic;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/AnimationRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/AnimationRequest.java
index f4bcbecf0..39deddfe4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/AnimationRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/AnimationRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.misfit;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.Request;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/BatteryLevelRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/BatteryLevelRequest.java
index 335dfed0e..f15c1eec5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/BatteryLevelRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/BatteryLevelRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.misfit;
 
 import android.bluetooth.BluetoothGattCharacteristic;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/DownloadFileRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/DownloadFileRequest.java
index df0087a4d..9ce90951e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/DownloadFileRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/DownloadFileRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno, Taavi Eomäe
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Daniel Dakhno, Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.misfit;
 
 import android.bluetooth.BluetoothGattCharacteristic;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/EraseFileRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/EraseFileRequest.java
index 3f5b47ddc..b22e1d9b3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/EraseFileRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/EraseFileRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.misfit;
 
 import android.bluetooth.BluetoothGattCharacteristic;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/EventStreamRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/EventStreamRequest.java
index faf1af245..1874c939f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/EventStreamRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/EventStreamRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.misfit;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/FactoryResetRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/FactoryResetRequest.java
index 0191ab4c0..56a081452 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/FactoryResetRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/FactoryResetRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Daniel Dakhno
+/*  Copyright (C) 2020-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.misfit;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.Request;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/FileRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/FileRequest.java
index aafe89415..0835a6ad8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/FileRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/FileRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.misfit;
 
 import java.util.UUID;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/GetCountdownSettingsRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/GetCountdownSettingsRequest.java
index 012b8edff..4e640fde2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/GetCountdownSettingsRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/GetCountdownSettingsRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.misfit;
 
 import android.bluetooth.BluetoothGattCharacteristic;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/GetCurrentStepCountRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/GetCurrentStepCountRequest.java
index ec3b654b1..5d290b439 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/GetCurrentStepCountRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/GetCurrentStepCountRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.misfit;
 
 import android.bluetooth.BluetoothGattCharacteristic;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/GetStepGoalRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/GetStepGoalRequest.java
index 433ac0f1b..b7c539e88 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/GetStepGoalRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/GetStepGoalRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.misfit;
 
 import android.bluetooth.BluetoothGattCharacteristic;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/GetTripleTapEnabledRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/GetTripleTapEnabledRequest.java
index 91e37f165..22742df00 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/GetTripleTapEnabledRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/GetTripleTapEnabledRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.misfit;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.Request;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/GetVibrationStrengthRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/GetVibrationStrengthRequest.java
index 324fd2b70..744ed3cf1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/GetVibrationStrengthRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/GetVibrationStrengthRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.misfit;
 
 import android.bluetooth.BluetoothGattCharacteristic;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/GoalTrackingGetRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/GoalTrackingGetRequest.java
index 27ddbe928..76290bfad 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/GoalTrackingGetRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/GoalTrackingGetRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.misfit;
 
 import android.bluetooth.BluetoothGattCharacteristic;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/GoalTrackingSetRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/GoalTrackingSetRequest.java
index a726d1b4f..28cc1db40 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/GoalTrackingSetRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/GoalTrackingSetRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.misfit;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.Request;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/ListFilesRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/ListFilesRequest.java
index d1b00f877..13eb741aa 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/ListFilesRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/ListFilesRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.misfit;
 
 import android.bluetooth.BluetoothGattCharacteristic;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/MoveHandsRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/MoveHandsRequest.java
index 1ce9bcaca..c54c73950 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/MoveHandsRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/MoveHandsRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.misfit;
 
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/OTAEnterRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/OTAEnterRequest.java
index 251d6746a..b20d112d3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/OTAEnterRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/OTAEnterRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.misfit;
 
 import android.bluetooth.BluetoothGattCharacteristic;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/OTAEraseRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/OTAEraseRequest.java
index 0bc63339f..e1267ad5f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/OTAEraseRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/OTAEraseRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.misfit;
 
 import android.bluetooth.BluetoothGattCharacteristic;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/OTAResetRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/OTAResetRequest.java
index fe4592fef..11572063d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/OTAResetRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/OTAResetRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.misfit;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.Request;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/PlayNotificationRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/PlayNotificationRequest.java
index e9336e583..328711ff8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/PlayNotificationRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/PlayNotificationRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.misfit;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/PutSettingsFileRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/PutSettingsFileRequest.java
index c8a67b560..dafdc9a03 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/PutSettingsFileRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/PutSettingsFileRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.misfit;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.Request;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/ReleaseHandsControlRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/ReleaseHandsControlRequest.java
index 74a29818d..c54d6966e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/ReleaseHandsControlRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/ReleaseHandsControlRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.misfit;
 
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/RequestHandControlRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/RequestHandControlRequest.java
index 6ba8f1727..d9a790177 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/RequestHandControlRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/RequestHandControlRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.misfit;
 
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/SaveCalibrationRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/SaveCalibrationRequest.java
index 1801ca3c8..06b2ce7a0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/SaveCalibrationRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/SaveCalibrationRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Daniel Dakhno
+/*  Copyright (C) 2020-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.misfit;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.Request;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/SetCountdownSettings.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/SetCountdownSettings.java
index 396455943..1f370f2c2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/SetCountdownSettings.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/SetCountdownSettings.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.misfit;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/SetCurrentStepCountRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/SetCurrentStepCountRequest.java
index 7220340f7..87b89246c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/SetCurrentStepCountRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/SetCurrentStepCountRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.misfit;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/SetCurrentTimeServiceRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/SetCurrentTimeServiceRequest.java
index 02bbc45d4..169f6b7fd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/SetCurrentTimeServiceRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/SetCurrentTimeServiceRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.misfit;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/SetStepGoalRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/SetStepGoalRequest.java
index 97420dd58..7791cd85d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/SetStepGoalRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/SetStepGoalRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.misfit;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/SetTimeRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/SetTimeRequest.java
index 1a86f1624..95e634f28 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/SetTimeRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/SetTimeRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.misfit;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/SetTripleTapEnabledRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/SetTripleTapEnabledRequest.java
index 581e0493a..d28abec24 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/SetTripleTapEnabledRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/SetTripleTapEnabledRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.misfit;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.Request;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/SetVibrationStrengthRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/SetVibrationStrengthRequest.java
index ab3602999..a8d7bed50 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/SetVibrationStrengthRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/SetVibrationStrengthRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.misfit;
 
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/SettingsFilePutRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/SettingsFilePutRequest.java
index b17fb1403..9bd5a9bb9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/SettingsFilePutRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/SettingsFilePutRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.misfit;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/UploadFileRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/UploadFileRequest.java
index a776e07cc..77145654a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/UploadFileRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/UploadFileRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.misfit;
 
 import android.bluetooth.BluetoothGattCharacteristic;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/VibrateRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/VibrateRequest.java
index 8c4f260a7..970b39a74 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/VibrateRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/misfit/VibrateRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Daniel Dakhno
+/*  Copyright (C) 2019-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.misfit;
 
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/roidmi/Roidmi1Protocol.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/roidmi/Roidmi1Protocol.java
index 319e1d436..66a4a7781 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/roidmi/Roidmi1Protocol.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/roidmi/Roidmi1Protocol.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2018-2021 José Rebelo
+/*  Copyright (C) 2018-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.roidmi;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/roidmi/Roidmi3Protocol.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/roidmi/Roidmi3Protocol.java
index bd5d9eba0..33ea8f47f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/roidmi/Roidmi3Protocol.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/roidmi/Roidmi3Protocol.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2018-2021 José Rebelo
+/*  Copyright (C) 2018-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.roidmi;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/roidmi/RoidmiIoThread.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/roidmi/RoidmiIoThread.java
index 702ebe2b4..4d3671e8a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/roidmi/RoidmiIoThread.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/roidmi/RoidmiIoThread.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2018-2021 José Rebelo
+/*  Copyright (C) 2018-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.roidmi;
 
 import android.bluetooth.BluetoothAdapter;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/roidmi/RoidmiProtocol.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/roidmi/RoidmiProtocol.java
index c801cc6af..27867c895 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/roidmi/RoidmiProtocol.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/roidmi/RoidmiProtocol.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2018-2021 José Rebelo
+/*  Copyright (C) 2018-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.roidmi;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/roidmi/RoidmiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/roidmi/RoidmiSupport.java
index eb7bcd2a0..f889fa61b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/roidmi/RoidmiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/roidmi/RoidmiSupport.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2018-2021 José Rebelo, Sebastian Kranz
+/*  Copyright (C) 2018-2024 Arjan Schrijver, Daniel Dakhno, José Rebelo,
+    Sebastian Kranz
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.roidmi;
 
 import android.net.Uri;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/soflow/SoFlowSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/soflow/SoFlowSupport.java
index 5e7e2ca0a..3feed87ce 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/soflow/SoFlowSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/soflow/SoFlowSupport.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 Andreas Shimokawa
+/*  Copyright (C) 2022-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.soflow;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/SonyHeadphonesIoThread.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/SonyHeadphonesIoThread.java
index 6e9a79804..cc12743a0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/SonyHeadphonesIoThread.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/SonyHeadphonesIoThread.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 José Rebelo
+/*  Copyright (C) 2021-2024 Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.headphones;
 
 import android.bluetooth.BluetoothAdapter;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/SonyHeadphonesProtocol.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/SonyHeadphonesProtocol.java
index b6cf44e18..35d4e05d7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/SonyHeadphonesProtocol.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/SonyHeadphonesProtocol.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 José Rebelo
+/*  Copyright (C) 2021-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.headphones;
 
 import android.content.SharedPreferences;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/SonyHeadphonesSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/SonyHeadphonesSupport.java
index be7dd37ba..2222f55d8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/SonyHeadphonesSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/SonyHeadphonesSupport.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2021-2024 Arjan Schrijver, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.headphones;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/deviceevents/SonyHeadphonesEnqueueRequestEvent.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/deviceevents/SonyHeadphonesEnqueueRequestEvent.java
index 473d7e5cb..ac6870ee0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/deviceevents/SonyHeadphonesEnqueueRequestEvent.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/deviceevents/SonyHeadphonesEnqueueRequestEvent.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 José Rebelo
+/*  Copyright (C) 2021-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.headphones.deviceevents;
 
 import java.util.ArrayList;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/Message.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/Message.java
index ac7b7315a..4c5437c63 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/Message.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/Message.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 José Rebelo
+/*  Copyright (C) 2021-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.headphones.protocol;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/MessageType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/MessageType.java
index 906cb8341..11198c0d6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/MessageType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/MessageType.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 José Rebelo
+/*  Copyright (C) 2021-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.headphones.protocol;
 
 public enum MessageType {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/Request.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/Request.java
index 9c1ca06f2..ab28542ab 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/Request.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/Request.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 José Rebelo
+/*  Copyright (C) 2021-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.headphones.protocol;
 
 import nodomain.freeyourgadget.gadgetbridge.util.GB;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/impl/AbstractSonyProtocolImpl.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/impl/AbstractSonyProtocolImpl.java
index 34247c61e..52d356f5e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/impl/AbstractSonyProtocolImpl.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/impl/AbstractSonyProtocolImpl.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 José Rebelo
+/*  Copyright (C) 2021-2024 Daniel Dakhno, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.headphones.protocol.impl;
 
 import java.util.List;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/impl/v1/PayloadTypeV1.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/impl/v1/PayloadTypeV1.java
index 571717762..abc86b500 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/impl/v1/PayloadTypeV1.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/impl/v1/PayloadTypeV1.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.headphones.protocol.impl.v1;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.sony.headphones.protocol.MessageType;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/impl/v1/SonyProtocolImplV1.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/impl/v1/SonyProtocolImplV1.java
index 4139af7f3..532ef1f93 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/impl/v1/SonyProtocolImplV1.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/impl/v1/SonyProtocolImplV1.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 José Rebelo
+/*  Copyright (C) 2021-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.headphones.protocol.impl.v1;
 
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_SONY_NOISE_OPTIMIZER_STATE_PRESSURE;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/impl/v1/params/AudioCodec.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/impl/v1/params/AudioCodec.java
index 803d1ab30..7892eacb2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/impl/v1/params/AudioCodec.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/impl/v1/params/AudioCodec.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 José Rebelo
+/*  Copyright (C) 2021-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.headphones.protocol.impl.v1.params;
 
 public enum AudioCodec {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/impl/v1/params/BatteryType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/impl/v1/params/BatteryType.java
index 99b8c3183..b79facde2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/impl/v1/params/BatteryType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/impl/v1/params/BatteryType.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 José Rebelo
+/*  Copyright (C) 2021-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.headphones.protocol.impl.v1.params;
 
 public enum BatteryType {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/impl/v1/params/NoiseCancellingOptimizerStatus.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/impl/v1/params/NoiseCancellingOptimizerStatus.java
index 3d2f083a7..912a9bad8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/impl/v1/params/NoiseCancellingOptimizerStatus.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/impl/v1/params/NoiseCancellingOptimizerStatus.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.headphones.protocol.impl.v1.params;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/impl/v1/params/VirtualSoundParam.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/impl/v1/params/VirtualSoundParam.java
index cb1460da8..8bf654070 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/impl/v1/params/VirtualSoundParam.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/impl/v1/params/VirtualSoundParam.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 José Rebelo
+/*  Copyright (C) 2021-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.headphones.protocol.impl.v1.params;
 
 public enum VirtualSoundParam {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/impl/v2/PayloadTypeV2.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/impl/v2/PayloadTypeV2.java
index 718d94abf..9555a530c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/impl/v2/PayloadTypeV2.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/impl/v2/PayloadTypeV2.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.headphones.protocol.impl.v2;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.sony.headphones.protocol.MessageType;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/impl/v2/SonyProtocolImplV2.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/impl/v2/SonyProtocolImplV2.java
index 8120f2bc4..57068fcf1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/impl/v2/SonyProtocolImplV2.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/impl/v2/SonyProtocolImplV2.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.headphones.protocol.impl.v2;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/impl/v3/PayloadTypeV3.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/impl/v3/PayloadTypeV3.java
index 4d89bfd81..4389b5b46 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/impl/v3/PayloadTypeV3.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/impl/v3/PayloadTypeV3.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.headphones.protocol.impl.v3;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.sony.headphones.protocol.MessageType;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/impl/v3/SonyProtocolImplV3.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/impl/v3/SonyProtocolImplV3.java
index aba528fa8..0d4fe2d73 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/impl/v3/SonyProtocolImplV3.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/protocol/impl/v3/SonyProtocolImplV3.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.headphones.protocol.impl.v3;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/SonyWena3DeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/SonyWena3DeviceSupport.java
index 10019c5b3..351dcf6c6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/SonyWena3DeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/SonyWena3DeviceSupport.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3;
 
 import android.bluetooth.BluetoothDevice;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/Wena3Packetable.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/Wena3Packetable.java
index 124a1c559..09deabb5c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/Wena3Packetable.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/Wena3Packetable.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol;
 
 public interface Wena3Packetable {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/ActivityPacketCrc.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/ActivityPacketCrc.java
index 89f433ed3..ab9223648 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/ActivityPacketCrc.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/ActivityPacketCrc.java
@@ -1,22 +1,19 @@
-/*
- *   Copyright (C) 2023 akasaka / Genjitsu Labs
- *
- *     This file is part of Gadgetbridge.
- *
- *     Gadgetbridge is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU Affero General Public License as published
- *     by the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Gadgetbridge is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU Affero General Public License for more details.
- *
- *     You should have received a copy of the GNU Affero General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.logic;
 
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/ActivityPacketParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/ActivityPacketParser.java
index fce5bf6ce..856ea8a8b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/ActivityPacketParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/ActivityPacketParser.java
@@ -1,22 +1,19 @@
-/*
- *   Copyright (C) 2023 akasaka / Genjitsu Labs
- *
- *     This file is part of Gadgetbridge.
- *
- *     Gadgetbridge is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU Affero General Public License as published
- *     by the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Gadgetbridge is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU Affero General Public License for more details.
- *
- *     You should have received a copy of the GNU Affero General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.logic;
 
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/ActivitySyncPacketProcessor.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/ActivitySyncPacketProcessor.java
index e689f6997..339c45ed4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/ActivitySyncPacketProcessor.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/ActivitySyncPacketProcessor.java
@@ -1,22 +1,19 @@
-/*
- *   Copyright (C) 2023 akasaka / Genjitsu Labs
- *
- *     This file is part of Gadgetbridge.
- *
- *     Gadgetbridge is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU Affero General Public License as published
- *     by the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Gadgetbridge is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU Affero General Public License for more details.
- *
- *     You should have received a copy of the GNU Affero General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.logic;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/StepsSampleCollection.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/StepsSampleCollection.java
index 142ac3994..8fd969ce3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/StepsSampleCollection.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/StepsSampleCollection.java
@@ -1,22 +1,19 @@
-/*
- *   Copyright (C) 2023 akasaka / Genjitsu Labs
- *
- *     This file is part of Gadgetbridge.
- *
- *     Gadgetbridge is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU Affero General Public License as published
- *     by the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Gadgetbridge is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU Affero General Public License for more details.
- *
- *     You should have received a copy of the GNU Affero General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.logic;
 
 import java.util.Date;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/parsers/BehaviorPacketParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/parsers/BehaviorPacketParser.java
index bd58d9e5b..a6bd26607 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/parsers/BehaviorPacketParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/parsers/BehaviorPacketParser.java
@@ -1,22 +1,19 @@
-/*
- *   Copyright (C) 2023 akasaka / Genjitsu Labs
- *
- *     This file is part of Gadgetbridge.
- *
- *     Gadgetbridge is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU Affero General Public License as published
- *     by the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Gadgetbridge is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU Affero General Public License for more details.
- *
- *     You should have received a copy of the GNU Affero General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.logic.parsers;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/parsers/CaloriesPacketParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/parsers/CaloriesPacketParser.java
index acd30be03..448d7ee75 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/parsers/CaloriesPacketParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/parsers/CaloriesPacketParser.java
@@ -1,22 +1,19 @@
-/*
- *   Copyright (C) 2023 akasaka / Genjitsu Labs
- *
- *     This file is part of Gadgetbridge.
- *
- *     Gadgetbridge is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU Affero General Public License as published
- *     by the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Gadgetbridge is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU Affero General Public License for more details.
- *
- *     You should have received a copy of the GNU Affero General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.logic.parsers;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/parsers/EnergyPacketParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/parsers/EnergyPacketParser.java
index 930a1c8bc..f2d7e5911 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/parsers/EnergyPacketParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/parsers/EnergyPacketParser.java
@@ -1,22 +1,19 @@
-/*
- *   Copyright (C) 2023 akasaka / Genjitsu Labs
- *
- *     This file is part of Gadgetbridge.
- *
- *     Gadgetbridge is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU Affero General Public License as published
- *     by the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Gadgetbridge is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU Affero General Public License for more details.
- *
- *     You should have received a copy of the GNU Affero General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.logic.parsers;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/parsers/HeartRatePacketParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/parsers/HeartRatePacketParser.java
index 2fab70efc..42ba2bd29 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/parsers/HeartRatePacketParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/parsers/HeartRatePacketParser.java
@@ -1,22 +1,19 @@
-/*
- *   Copyright (C) 2023 akasaka / Genjitsu Labs
- *
- *     This file is part of Gadgetbridge.
- *
- *     Gadgetbridge is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU Affero General Public License as published
- *     by the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Gadgetbridge is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU Affero General Public License for more details.
- *
- *     You should have received a copy of the GNU Affero General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.logic.parsers;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/parsers/LinearSamplePacketParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/parsers/LinearSamplePacketParser.java
index d570cea32..643d9a27d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/parsers/LinearSamplePacketParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/parsers/LinearSamplePacketParser.java
@@ -1,22 +1,19 @@
-/*
- *   Copyright (C) 2023 akasaka / Genjitsu Labs
- *
- *     This file is part of Gadgetbridge.
- *
- *     Gadgetbridge is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU Affero General Public License as published
- *     by the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Gadgetbridge is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU Affero General Public License for more details.
- *
- *     You should have received a copy of the GNU Affero General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.logic.parsers;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/parsers/OneBytePerSamplePacketParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/parsers/OneBytePerSamplePacketParser.java
index 2ed004018..586e39eca 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/parsers/OneBytePerSamplePacketParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/parsers/OneBytePerSamplePacketParser.java
@@ -1,22 +1,19 @@
-/*
- *   Copyright (C) 2023 akasaka / Genjitsu Labs
- *
- *     This file is part of Gadgetbridge.
- *
- *     Gadgetbridge is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU Affero General Public License as published
- *     by the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Gadgetbridge is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU Affero General Public License for more details.
- *
- *     You should have received a copy of the GNU Affero General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.logic.parsers;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/parsers/SamplePacketParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/parsers/SamplePacketParser.java
index 339e3d715..ba35c347d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/parsers/SamplePacketParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/parsers/SamplePacketParser.java
@@ -1,22 +1,19 @@
-/*
- *   Copyright (C) 2023 akasaka / Genjitsu Labs
- *
- *     This file is part of Gadgetbridge.
- *
- *     Gadgetbridge is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU Affero General Public License as published
- *     by the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Gadgetbridge is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU Affero General Public License for more details.
- *
- *     You should have received a copy of the GNU Affero General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.logic.parsers;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/parsers/StepsPacketParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/parsers/StepsPacketParser.java
index 9856aa03e..2a9f57380 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/parsers/StepsPacketParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/parsers/StepsPacketParser.java
@@ -1,22 +1,19 @@
-/*
- *   Copyright (C) 2023 akasaka / Genjitsu Labs
- *
- *     This file is part of Gadgetbridge.
- *
- *     Gadgetbridge is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU Affero General Public License as published
- *     by the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Gadgetbridge is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU Affero General Public License for more details.
- *
- *     You should have received a copy of the GNU Affero General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.logic.parsers;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/parsers/StressPacketParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/parsers/StressPacketParser.java
index 164eacc97..c7884f6ce 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/parsers/StressPacketParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/parsers/StressPacketParser.java
@@ -1,22 +1,19 @@
-/*
- *   Copyright (C) 2023 akasaka / Genjitsu Labs
- *
- *     This file is part of Gadgetbridge.
- *
- *     Gadgetbridge is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU Affero General Public License as published
- *     by the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Gadgetbridge is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU Affero General Public License for more details.
- *
- *     You should have received a copy of the GNU Affero General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.logic.parsers;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/parsers/Vo2MaxPacketParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/parsers/Vo2MaxPacketParser.java
index 2afaf6e18..5c49bc1cd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/parsers/Vo2MaxPacketParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/parsers/Vo2MaxPacketParser.java
@@ -1,22 +1,19 @@
-/*
- *   Copyright (C) 2023 akasaka / Genjitsu Labs
- *
- *     This file is part of Gadgetbridge.
- *
- *     Gadgetbridge is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU Affero General Public License as published
- *     by the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Gadgetbridge is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU Affero General Public License for more details.
- *
- *     You should have received a copy of the GNU Affero General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.logic.parsers;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/activity/ActivitySyncDataPacket.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/activity/ActivitySyncDataPacket.java
index 0979ded18..fab905dbe 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/activity/ActivitySyncDataPacket.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/activity/ActivitySyncDataPacket.java
@@ -1,22 +1,19 @@
-/*
- *   Copyright (C) 2023 akasaka / Genjitsu Labs
- *
- *     This file is part of Gadgetbridge.
- *
- *     Gadgetbridge is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU Affero General Public License as published
- *     by the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Gadgetbridge is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU Affero General Public License for more details.
- *
- *     You should have received a copy of the GNU Affero General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.activity;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/activity/ActivitySyncStartPacket.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/activity/ActivitySyncStartPacket.java
index 54203b32b..d4a99f12a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/activity/ActivitySyncStartPacket.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/activity/ActivitySyncStartPacket.java
@@ -1,22 +1,19 @@
-/*
- *   Copyright (C) 2023 akasaka / Genjitsu Labs
- *
- *     This file is part of Gadgetbridge.
- *
- *     Gadgetbridge is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU Affero General Public License as published
- *     by the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Gadgetbridge is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU Affero General Public License for more details.
- *
- *     You should have received a copy of the GNU Affero General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.activity;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.Wena3Packetable;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/activity/ActivitySyncTimePacketTemplate.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/activity/ActivitySyncTimePacketTemplate.java
index 020ec45de..aca0c4536 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/activity/ActivitySyncTimePacketTemplate.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/activity/ActivitySyncTimePacketTemplate.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.activity;
 
 import androidx.annotation.Nullable;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/activity/ActivitySyncTimePacketTypeA.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/activity/ActivitySyncTimePacketTypeA.java
index ff8c77643..221973815 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/activity/ActivitySyncTimePacketTypeA.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/activity/ActivitySyncTimePacketTypeA.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.activity;
 
 import androidx.annotation.Nullable;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/activity/ActivitySyncTimePacketTypeB.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/activity/ActivitySyncTimePacketTypeB.java
index 22c49781d..2357e8f00 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/activity/ActivitySyncTimePacketTypeB.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/activity/ActivitySyncTimePacketTypeB.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.activity;
 
 import androidx.annotation.Nullable;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/activity/BehaviorSample.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/activity/BehaviorSample.java
index d986d8d03..feba50195 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/activity/BehaviorSample.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/activity/BehaviorSample.java
@@ -1,22 +1,19 @@
-/*
- *   Copyright (C) 2023 akasaka / Genjitsu Labs
- *
- *     This file is part of Gadgetbridge.
- *
- *     Gadgetbridge is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU Affero General Public License as published
- *     by the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Gadgetbridge is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU Affero General Public License for more details.
- *
- *     You should have received a copy of the GNU Affero General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.activity;
 
 import java.util.Date;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/activity/Vo2MaxSample.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/activity/Vo2MaxSample.java
index 72ec25640..976e9df11 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/activity/Vo2MaxSample.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/activity/Vo2MaxSample.java
@@ -1,22 +1,19 @@
-/*
- *   Copyright (C) 2023 akasaka / Genjitsu Labs
- *
- *     This file is part of Gadgetbridge.
- *
- *     Gadgetbridge is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU Affero General Public License as published
- *     by the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Gadgetbridge is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU Affero General Public License for more details.
- *
- *     You should have received a copy of the GNU Affero General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.activity;
 
 import java.util.Date;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/calendar/CalendarEntry.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/calendar/CalendarEntry.java
index 4bfc7f4d9..9957c71fc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/calendar/CalendarEntry.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/calendar/CalendarEntry.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.calendar;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/notification/EndOfIncomingCall.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/notification/EndOfIncomingCall.java
index ac641180b..8238fa03a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/notification/EndOfIncomingCall.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/notification/EndOfIncomingCall.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.notification;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.Wena3Packetable;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/notification/NotificationArrival.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/notification/NotificationArrival.java
index 7231cef3e..9ba409b58 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/notification/NotificationArrival.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/notification/NotificationArrival.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.notification;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/notification/NotificationRemoval.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/notification/NotificationRemoval.java
index b8f38a68c..71deb9cbb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/notification/NotificationRemoval.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/notification/NotificationRemoval.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.notification;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/notification/defines/LedColor.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/notification/defines/LedColor.java
index f0df1b932..5a7c8e524 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/notification/defines/LedColor.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/notification/defines/LedColor.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,8 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.notification.defines;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/notification/defines/NotificationFlags.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/notification/defines/NotificationFlags.java
index c6b9ae49e..559b471e2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/notification/defines/NotificationFlags.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/notification/defines/NotificationFlags.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,8 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.notification.defines;
 
 public enum NotificationFlags {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/notification/defines/NotificationKind.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/notification/defines/NotificationKind.java
index 774deceb0..8ba3cfc1e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/notification/defines/NotificationKind.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/notification/defines/NotificationKind.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.notification.defines;
 
 public enum NotificationKind {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/notification/defines/VibrationCount.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/notification/defines/VibrationCount.java
index 829434f3b..211507959 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/notification/defines/VibrationCount.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/notification/defines/VibrationCount.java
@@ -1,22 +1,19 @@
-/*
- *   Copyright (C) 2023 akasaka / Genjitsu Labs
- *
- *     This file is part of Gadgetbridge.
- *
- *     Gadgetbridge is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU Affero General Public License as published
- *     by the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Gadgetbridge is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU Affero General Public License for more details.
- *
- *     You should have received a copy of the GNU Affero General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.notification.defines;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/notification/defines/VibrationKind.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/notification/defines/VibrationKind.java
index 0c9d910ed..59642467b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/notification/defines/VibrationKind.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/notification/defines/VibrationKind.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,8 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.notification.defines;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/notification/defines/VibrationOptions.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/notification/defines/VibrationOptions.java
index bb354c7d1..5a5fda242 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/notification/defines/VibrationOptions.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/notification/defines/VibrationOptions.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,8 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.notification.defines;
 
 public class VibrationOptions {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/AlarmListSettings.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/AlarmListSettings.java
index 3f6923fd0..1dd69960e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/AlarmListSettings.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/AlarmListSettings.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.settings;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/AutoPowerOffSettings.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/AutoPowerOffSettings.java
index 667abc598..9ca874855 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/AutoPowerOffSettings.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/AutoPowerOffSettings.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.settings;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/BodyPropertiesSetting.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/BodyPropertiesSetting.java
index 42e1e9def..a8d7f5953 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/BodyPropertiesSetting.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/BodyPropertiesSetting.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.settings;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/CalendarNotificationEnableSetting.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/CalendarNotificationEnableSetting.java
index 40aae9fb8..845156e6e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/CalendarNotificationEnableSetting.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/CalendarNotificationEnableSetting.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.settings;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.Wena3Packetable;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/CameraAppTypeSetting.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/CameraAppTypeSetting.java
index b43b62c4b..39ae6c5f5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/CameraAppTypeSetting.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/CameraAppTypeSetting.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.settings;
 
 import android.content.pm.PackageManager;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/DayStartHourSetting.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/DayStartHourSetting.java
index 27dca57d0..a381a46bb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/DayStartHourSetting.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/DayStartHourSetting.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.settings;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.Wena3Packetable;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/DeviceButtonActionSetting.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/DeviceButtonActionSetting.java
index 49031412e..e070b7dfa 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/DeviceButtonActionSetting.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/DeviceButtonActionSetting.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.settings;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/DisplaySetting.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/DisplaySetting.java
index aa7b3b302..b5f763165 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/DisplaySetting.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/DisplaySetting.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.settings;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/DoNotDisturbSettings.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/DoNotDisturbSettings.java
index 333fff085..b1a367efd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/DoNotDisturbSettings.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/DoNotDisturbSettings.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.settings;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/GoalStepsSetting.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/GoalStepsSetting.java
index 9494dc8db..1eec5b37d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/GoalStepsSetting.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/GoalStepsSetting.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.settings;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/HomeIconOrderSetting.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/HomeIconOrderSetting.java
index f7010304d..8e93a6b4f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/HomeIconOrderSetting.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/HomeIconOrderSetting.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.settings;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/MenuIconSetting.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/MenuIconSetting.java
index 26ea4eea9..e62995752 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/MenuIconSetting.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/MenuIconSetting.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.settings;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/SingleAlarmSetting.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/SingleAlarmSetting.java
index f18664b32..9b8da80c4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/SingleAlarmSetting.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/SingleAlarmSetting.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.settings;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/StatusPageOrderSetting.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/StatusPageOrderSetting.java
index f0435c312..1f01c4a1a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/StatusPageOrderSetting.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/StatusPageOrderSetting.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.settings;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/TimeSetting.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/TimeSetting.java
index ef694141e..dcf1c5682 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/TimeSetting.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/TimeSetting.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.settings;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/TimeZoneSetting.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/TimeZoneSetting.java
index 3baa067d4..8c9ea4bef 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/TimeZoneSetting.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/TimeZoneSetting.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.settings;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/VibrationSetting.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/VibrationSetting.java
index ec11dc431..b876a9b78 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/VibrationSetting.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/VibrationSetting.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.settings;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.Wena3Packetable;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/defines/DeviceButtonActionId.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/defines/DeviceButtonActionId.java
index 767735b52..c5833db6c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/defines/DeviceButtonActionId.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/defines/DeviceButtonActionId.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.settings.defines;
 
 public enum DeviceButtonActionId {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/defines/DisplayDesign.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/defines/DisplayDesign.java
index c81e905d0..9a4c34814 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/defines/DisplayDesign.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/defines/DisplayDesign.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.settings.defines;
 
 public enum DisplayDesign {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/defines/DisplayOrientation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/defines/DisplayOrientation.java
index 4f4cb7952..4347f4657 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/defines/DisplayOrientation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/defines/DisplayOrientation.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.settings.defines;
 
 public enum DisplayOrientation {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/defines/FontSize.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/defines/FontSize.java
index 6d6da1245..84f9042f7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/defines/FontSize.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/defines/FontSize.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.settings.defines;
 
 public enum FontSize {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/defines/GenderSetting.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/defines/GenderSetting.java
index 9e24eaf75..58962800b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/defines/GenderSetting.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/defines/GenderSetting.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.settings.defines;
 
 public enum GenderSetting {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/defines/HomeIconId.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/defines/HomeIconId.java
index c15c9fb31..96a18ac24 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/defines/HomeIconId.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/defines/HomeIconId.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.settings.defines;
 
 // This is done via a class to be able to init the value from an arbitrary int (e.g. from prefs)
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/defines/Language.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/defines/Language.java
index f5ea8b502..799fc2853 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/defines/Language.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/defines/Language.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.settings.defines;
 
 public enum Language {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/defines/MenuIconId.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/defines/MenuIconId.java
index f85e73d0e..823ce5724 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/defines/MenuIconId.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/defines/MenuIconId.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.settings.defines;
 
 public enum MenuIconId {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/defines/StatusPageId.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/defines/StatusPageId.java
index eb851996d..ba75750d2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/defines/StatusPageId.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/defines/StatusPageId.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.settings.defines;
 
 public enum StatusPageId {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/defines/VibrationStrength.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/defines/VibrationStrength.java
index d93276d3c..fc54b8037 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/defines/VibrationStrength.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/settings/defines/VibrationStrength.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.settings.defines;
 
 public enum VibrationStrength {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/status/BatteryLevelInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/status/BatteryLevelInfo.java
index 7883ef5b0..805a47a1b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/status/BatteryLevelInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/status/BatteryLevelInfo.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.status;
 
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventBatteryInfo;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/status/DeviceInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/status/DeviceInfo.java
index 86a88b1dd..dc3d689d6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/status/DeviceInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/status/DeviceInfo.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.status;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/status/MusicInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/status/MusicInfo.java
index fb8ba4fbd..f07730259 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/status/MusicInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/status/MusicInfo.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.status;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/status/NotificationServiceStatusRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/status/NotificationServiceStatusRequest.java
index 9e0dffd03..ce3343b8e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/status/NotificationServiceStatusRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/status/NotificationServiceStatusRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.status;
 
 public class NotificationServiceStatusRequest {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/status/StatusRequestType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/status/StatusRequestType.java
index 4e43cfa60..8e1bb640c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/status/StatusRequestType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/status/StatusRequestType.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.status;
 
 public enum StatusRequestType {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/status/Weather.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/status/Weather.java
index b30374bfd..5aa1f4d68 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/status/Weather.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/status/Weather.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.status;
 
 import org.slf4j.LoggerFactory;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/status/WeatherDay.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/status/WeatherDay.java
index 7df8f7114..2c7998faf 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/status/WeatherDay.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/status/WeatherDay.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.status;
 
 import lineageos.weather.util.WeatherUtils;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/status/WeatherReport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/status/WeatherReport.java
index f4c4b26a9..008e1d9bd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/status/WeatherReport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/status/WeatherReport.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.status;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/status/WeatherType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/status/WeatherType.java
index 38d66b64d..f21a24cda 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/status/WeatherType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/packets/status/WeatherType.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.packets.status;
 
 public enum WeatherType {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/util/TimeUtil.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/util/TimeUtil.java
index d942b7acc..17871f0c1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/util/TimeUtil.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/util/TimeUtil.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 akasaka / Genjitsu Labs
+/*  Copyright (C) 2023-2024 akasaka / Genjitsu Labs
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sony.wena3.protocol.util;
 
 import java.util.Date;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/SonySWR12Constants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/SonySWR12Constants.java
index 2e6e50800..2b6cdec87 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/SonySWR12Constants.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/SonySWR12Constants.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 opavlov
+/*  Copyright (C) 2020-2024 opavlov
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sonyswr12;
 
 import java.util.UUID;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/SonySWR12DeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/SonySWR12DeviceSupport.java
index 2cfa5a777..6c90ea247 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/SonySWR12DeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/SonySWR12DeviceSupport.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 opavlov
+/*  Copyright (C) 2020-2024 Arjan Schrijver, opavlov
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sonyswr12;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/SonySWR12HandlerThread.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/SonySWR12HandlerThread.java
index 6caa8431f..1813441ea 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/SonySWR12HandlerThread.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/SonySWR12HandlerThread.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 opavlov
+/*  Copyright (C) 2020-2024 opavlov
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sonyswr12;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/SonySWR12Util.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/SonySWR12Util.java
index 54aa97694..4cd246b73 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/SonySWR12Util.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/SonySWR12Util.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 opavlov
+/*  Copyright (C) 2020-2024 opavlov
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sonyswr12;
 
 import java.text.SimpleDateFormat;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/activity/ActivityBase.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/activity/ActivityBase.java
index 6413db383..bf1817f0c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/activity/ActivityBase.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/activity/ActivityBase.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 opavlov
+/*  Copyright (C) 2020-2024 opavlov
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sonyswr12.entities.activity;
 
 public abstract class ActivityBase {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/activity/ActivityHeartRate.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/activity/ActivityHeartRate.java
index 119e93c17..ac8d2f868 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/activity/ActivityHeartRate.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/activity/ActivityHeartRate.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 opavlov
+/*  Copyright (C) 2020-2024 opavlov
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sonyswr12.entities.activity;
 
 public class ActivityHeartRate extends ActivityBase {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/activity/ActivitySleep.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/activity/ActivitySleep.java
index 083f798bf..de220e6c9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/activity/ActivitySleep.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/activity/ActivitySleep.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 opavlov
+/*  Copyright (C) 2020-2024 opavlov
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sonyswr12.entities.activity;
 
 public class ActivitySleep extends ActivityBase {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/activity/ActivityType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/activity/ActivityType.java
index e06ea0121..f6db09057 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/activity/ActivityType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/activity/ActivityType.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 opavlov
+/*  Copyright (C) 2020-2024 opavlov
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sonyswr12.entities.activity;
 
 public enum ActivityType {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/activity/ActivityWithData.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/activity/ActivityWithData.java
index 552174f89..c249c2103 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/activity/ActivityWithData.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/activity/ActivityWithData.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 opavlov
+/*  Copyright (C) 2020-2024 opavlov
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sonyswr12.entities.activity;
 
 public class ActivityWithData extends ActivityBase {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/activity/EventBase.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/activity/EventBase.java
index 024d968ff..e3eb436e7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/activity/EventBase.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/activity/EventBase.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 opavlov
+/*  Copyright (C) 2020-2024 opavlov
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sonyswr12.entities.activity;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.sonyswr12.util.ByteArrayWriter;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/activity/EventCode.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/activity/EventCode.java
index d5a123004..7f0dd88cb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/activity/EventCode.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/activity/EventCode.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 opavlov
+/*  Copyright (C) 2020-2024 opavlov
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sonyswr12.entities.activity;
 
 public enum EventCode {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/activity/EventFactory.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/activity/EventFactory.java
index 0e87ae3ff..c5f8bb0e1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/activity/EventFactory.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/activity/EventFactory.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 opavlov
+/*  Copyright (C) 2020-2024 opavlov
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sonyswr12.entities.activity;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.sonyswr12.util.IntFormat;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/activity/EventWithActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/activity/EventWithActivity.java
index a500067b8..37e821014 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/activity/EventWithActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/activity/EventWithActivity.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 opavlov
+/*  Copyright (C) 2020-2024 opavlov
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sonyswr12.entities.activity;
 
 import java.util.ArrayList;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/activity/EventWithValue.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/activity/EventWithValue.java
index 8105ae0aa..5723da73b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/activity/EventWithValue.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/activity/EventWithValue.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 opavlov
+/*  Copyright (C) 2020-2024 opavlov
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sonyswr12.entities.activity;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.sonyswr12.util.ByteArrayWriter;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/activity/SleepLevel.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/activity/SleepLevel.java
index f4b1a6120..bd2eb3847 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/activity/SleepLevel.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/activity/SleepLevel.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 opavlov
+/*  Copyright (C) 2020-2024 opavlov
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sonyswr12.entities.activity;
 
 public enum SleepLevel {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/alarm/AlarmRepeat.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/alarm/AlarmRepeat.java
index 97b99029d..0f1ff0a49 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/alarm/AlarmRepeat.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/alarm/AlarmRepeat.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 opavlov
+/*  Copyright (C) 2020-2024 opavlov
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sonyswr12.entities.alarm;
 
 import java.util.Arrays;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/alarm/AlarmState.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/alarm/AlarmState.java
index c8f421849..fc7e27690 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/alarm/AlarmState.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/alarm/AlarmState.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 opavlov
+/*  Copyright (C) 2020-2024 opavlov
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sonyswr12.entities.alarm;
 
 public enum AlarmState {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/alarm/BandAlarm.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/alarm/BandAlarm.java
index 203587ced..b3210284b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/alarm/BandAlarm.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/alarm/BandAlarm.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 opavlov
+/*  Copyright (C) 2020-2024 opavlov
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sonyswr12.entities.alarm;
 
 import nodomain.freeyourgadget.gadgetbridge.model.Alarm;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/alarm/BandAlarms.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/alarm/BandAlarms.java
index ab048eda9..7b799ef36 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/alarm/BandAlarms.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/alarm/BandAlarms.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 opavlov
+/*  Copyright (C) 2020-2024 opavlov
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sonyswr12.entities.alarm;
 
 import java.util.List;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/control/CommandCode.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/control/CommandCode.java
index d9908eafe..54f2a091e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/control/CommandCode.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/control/CommandCode.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 opavlov
+/*  Copyright (C) 2020-2024 opavlov
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sonyswr12.entities.control;
 
 public enum CommandCode {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/control/ControlPoint.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/control/ControlPoint.java
index 83ed9e369..a20a83b58 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/control/ControlPoint.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/control/ControlPoint.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 opavlov
+/*  Copyright (C) 2020-2024 opavlov
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sonyswr12.entities.control;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.sonyswr12.util.ByteArrayWriter;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/control/ControlPointLowVibration.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/control/ControlPointLowVibration.java
index 61ec85732..0dcd27957 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/control/ControlPointLowVibration.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/control/ControlPointLowVibration.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 opavlov
+/*  Copyright (C) 2020-2024 opavlov
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sonyswr12.entities.control;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.sonyswr12.util.UIntBitWriter;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/control/ControlPointWithValue.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/control/ControlPointWithValue.java
index 9a780c57b..a6553ae69 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/control/ControlPointWithValue.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/control/ControlPointWithValue.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 opavlov
+/*  Copyright (C) 2020-2024 opavlov
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sonyswr12.entities.control;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.sonyswr12.util.ByteArrayWriter;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/time/BandDaylightSavingTime.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/time/BandDaylightSavingTime.java
index dc9e06661..844a23e33 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/time/BandDaylightSavingTime.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/time/BandDaylightSavingTime.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 opavlov
+/*  Copyright (C) 2020-2024 opavlov
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sonyswr12.entities.time;
 
 public enum BandDaylightSavingTime {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/time/BandTime.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/time/BandTime.java
index 23a5120c4..af5096bcc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/time/BandTime.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/time/BandTime.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 opavlov
+/*  Copyright (C) 2020-2024 opavlov
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sonyswr12.entities.time;
 
 import java.util.Calendar;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/time/BandTimeZone.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/time/BandTimeZone.java
index 1f18903ec..489c97277 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/time/BandTimeZone.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/entities/time/BandTimeZone.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 opavlov
+/*  Copyright (C) 2020-2024 opavlov
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sonyswr12.entities.time;
 
 public enum BandTimeZone {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/util/ByteArrayReader.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/util/ByteArrayReader.java
index 2d06fe4c2..d4a44ccda 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/util/ByteArrayReader.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/util/ByteArrayReader.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 opavlov
+/*  Copyright (C) 2020-2024 opavlov
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sonyswr12.util;
 
 public class ByteArrayReader {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/util/ByteArrayWriter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/util/ByteArrayWriter.java
index 6facccbe7..85c1efafd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/util/ByteArrayWriter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/util/ByteArrayWriter.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 opavlov
+/*  Copyright (C) 2020-2024 opavlov
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sonyswr12.util;
 
 import java.util.Arrays;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/util/IntFormat.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/util/IntFormat.java
index 487ad0623..58e0c84c6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/util/IntFormat.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/util/IntFormat.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 opavlov
+/*  Copyright (C) 2020-2024 opavlov
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sonyswr12.util;
 
 public enum IntFormat {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/util/UIntBitReader.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/util/UIntBitReader.java
index d94817d8a..022ce8adf 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/util/UIntBitReader.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/util/UIntBitReader.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 opavlov
+/*  Copyright (C) 2020-2024 opavlov
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sonyswr12.util;
 
 public class UIntBitReader {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/util/UIntBitWriter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/util/UIntBitWriter.java
index b33260f57..a4bf1be3c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/util/UIntBitWriter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sonyswr12/util/UIntBitWriter.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 opavlov
+/*  Copyright (C) 2020-2024 opavlov
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.sonyswr12.util;
 
 public class UIntBitWriter {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/supercars/SuperCarsSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/supercars/SuperCarsSupport.java
index bfb33b19b..7cdceacfd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/supercars/SuperCarsSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/supercars/SuperCarsSupport.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 Arjan Schrijver, Damien Gaignon, Petr Vaněk
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.supercars;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/tlw64/TLW64Support.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/tlw64/TLW64Support.java
index 0390c2feb..18867baa5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/tlw64/TLW64Support.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/tlw64/TLW64Support.java
@@ -1,6 +1,4 @@
-/*  Copyright (C) 2015-2021 0nse, 115ek, Andreas Shimokawa, Carsten
-    Pfeiffer, Daniel Dakhno, José Rebelo, Julien Pivotto, Sebastian Kranz,
-    Steffen Liebergeld
+/*  Copyright (C) 2020-2024 115ek, Arjan Schrijver, Damien Gaignon
 
     This file is part of Gadgetbridge.
 
@@ -15,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 package nodomain.freeyourgadget.gadgetbridge.service.devices.tlw64;
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/um25/Data/CaptureGroup.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/um25/Data/CaptureGroup.java
index 79efac819..cd3d2a1dd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/um25/Data/CaptureGroup.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/um25/Data/CaptureGroup.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2020-2024 Daniel Dakhno
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.um25.Data;
 
 import java.io.Serializable;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/um25/Data/MeasurementData.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/um25/Data/MeasurementData.java
index 3d3db9725..48927b992 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/um25/Data/MeasurementData.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/um25/Data/MeasurementData.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2020-2024 Daniel Dakhno
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.um25.Data;
 
 import java.io.Serializable;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/um25/Support/UM25BaseSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/um25/Support/UM25BaseSupport.java
index 43e539dd7..8f236956f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/um25/Support/UM25BaseSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/um25/Support/UM25BaseSupport.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2020-2024 Arjan Schrijver, Daniel Dakhno
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.um25.Support;
 
 import android.net.Uri;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/um25/Support/UM25Support.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/um25/Support/UM25Support.java
index 176b023d8..2342c575e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/um25/Support/UM25Support.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/um25/Support/UM25Support.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2020-2024 Daniel Dakhno, José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.um25.Support;
 
 import android.app.Notification;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/unknown/UnknownDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/unknown/UnknownDeviceSupport.java
index 8d658b484..9dfc26b03 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/unknown/UnknownDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/unknown/UnknownDeviceSupport.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2023-2024 Daniel Dakhno
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.unknown;
 
 import nodomain.freeyourgadget.gadgetbridge.service.AbstractDeviceSupport;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vesc/CommandType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vesc/CommandType.java
index bd0ca8eae..914df84ca 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vesc/CommandType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vesc/CommandType.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Daniel Dakhno
+/*  Copyright (C) 2021-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vesc;
 
 public enum CommandType {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vesc/VescBaseDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vesc/VescBaseDeviceSupport.java
index 05eed88dc..00ed75ee2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vesc/VescBaseDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vesc/VescBaseDeviceSupport.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Daniel Dakhno
+/*  Copyright (C) 2021-2024 Arjan Schrijver, Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vesc;
 
 import android.net.Uri;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vesc/VescDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vesc/VescDeviceSupport.java
index f6ef830da..1c72c5af0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vesc/VescDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vesc/VescDeviceSupport.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Daniel Dakhno
+/*  Copyright (C) 2021-2024 Daniel Dakhno
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vesc;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vibratissimo/VibratissimoSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vibratissimo/VibratissimoSupport.java
index ebd197c7b..45a017fa3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vibratissimo/VibratissimoSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vibratissimo/VibratissimoSupport.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Sebastian
-    Kranz
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Arjan Schrijver, Carsten
+    Pfeiffer, Sebastian Kranz
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vibratissimo;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ChecksumCalculator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ChecksumCalculator.java
index dfad8292b..1b3da0e02 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ChecksumCalculator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ChecksumCalculator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr;
 
 public final class ChecksumCalculator {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/GarminDeviceSetting.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/GarminDeviceSetting.java
index bf2f704c5..cfd2f82a6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/GarminDeviceSetting.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/GarminDeviceSetting.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr;
 
 public enum GarminDeviceSetting {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/GarminMessageType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/GarminMessageType.java
index 469f3a6fa..153c6bed2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/GarminMessageType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/GarminMessageType.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr;
 
 public enum GarminMessageType {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/GarminMusicControlCommand.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/GarminMusicControlCommand.java
index c410c7e30..5e0b6e003 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/GarminMusicControlCommand.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/GarminMusicControlCommand.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr;
 
 public enum GarminMusicControlCommand {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/GarminSystemEventType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/GarminSystemEventType.java
index 35a7eadaf..edc341847 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/GarminSystemEventType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/GarminSystemEventType.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr;
 
 public enum GarminSystemEventType {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/GarminTimeUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/GarminTimeUtils.java
index 0bd5e9d84..92fde6da0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/GarminTimeUtils.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/GarminTimeUtils.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.vivomovehr.VivomoveConstants;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/GfdiPacketParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/GfdiPacketParser.java
index 2fa4ef19a..77833d597 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/GfdiPacketParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/GfdiPacketParser.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/RealTimeActivityHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/RealTimeActivityHandler.java
index 13222e637..0b9a0a890 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/RealTimeActivityHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/RealTimeActivityHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr;
 
 import android.content.Intent;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/VivomoveHrCommunicator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/VivomoveHrCommunicator.java
index 233fd2b7f..d20b56a7c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/VivomoveHrCommunicator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/VivomoveHrCommunicator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr;
 
 import android.bluetooth.BluetoothGattCharacteristic;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/VivomoveHrSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/VivomoveHrSupport.java
index 8332b1168..8aa7f11c6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/VivomoveHrSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/VivomoveHrSupport.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ams/AmsEntity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ams/AmsEntity.java
index 05f5f6282..e07645908 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ams/AmsEntity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ams/AmsEntity.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.ams;
 
 public enum AmsEntity {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ams/AmsEntityAttribute.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ams/AmsEntityAttribute.java
index e8850a806..d0bed4bce 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ams/AmsEntityAttribute.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ams/AmsEntityAttribute.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.ams;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages.MessageWriter;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsAction.java
index 5f483c644..48f59aa2e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsAction.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsAction.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.ancs;
 
 public enum AncsAction {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsAndroidAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsAndroidAction.java
index 9b511e631..3c941149b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsAndroidAction.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsAndroidAction.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.ancs;
 
 import android.util.SparseArray;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsAppAttribute.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsAppAttribute.java
index 11cdab92c..8ba395305 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsAppAttribute.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsAppAttribute.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.ancs;
 
 public enum AncsAppAttribute {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsAttribute.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsAttribute.java
index ca30fd9ea..6397533e3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsAttribute.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsAttribute.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.ancs;
 
 import android.util.SparseArray;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsAttributeRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsAttributeRequest.java
index c92f4e909..6dc9ba584 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsAttributeRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsAttributeRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.ancs;
 
 public class AncsAttributeRequest {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsCategory.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsCategory.java
index 1e7a227c5..db5be8ce5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsCategory.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsCategory.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.ancs;
 
 public enum AncsCategory {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsCommand.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsCommand.java
index 9639fd4d3..8cdbbbfb9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsCommand.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsCommand.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.ancs;
 
 import android.util.SparseArray;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsControlCommand.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsControlCommand.java
index 82aa71a2d..50e03ee9f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsControlCommand.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsControlCommand.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.ancs;
 
 import nodomain.freeyourgadget.gadgetbridge.service.btle.BLETypeConversions;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsEvent.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsEvent.java
index 37f4f2996..86c06569b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsEvent.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsEvent.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.ancs;
 
 public enum AncsEvent {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsEventFlag.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsEventFlag.java
index d084ed280..6775655b5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsEventFlag.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsEventFlag.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.ancs;
 
 public enum AncsEventFlag {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsGetAppAttributesCommand.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsGetAppAttributesCommand.java
index c67862365..94557365f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsGetAppAttributesCommand.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsGetAppAttributesCommand.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.ancs;
 
 import java.util.List;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsGetNotificationAttributeCommand.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsGetNotificationAttributeCommand.java
index 84cac3548..5558550d9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsGetNotificationAttributeCommand.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsGetNotificationAttributeCommand.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.ancs;
 
 import java.util.List;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsGetNotificationAttributesResponse.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsGetNotificationAttributesResponse.java
index 67eea7a0e..a4872b693 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsGetNotificationAttributesResponse.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsGetNotificationAttributesResponse.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.ancs;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages.MessageWriter;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsPerformAndroidAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsPerformAndroidAction.java
index fc0803f45..2db7c8659 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsPerformAndroidAction.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsPerformAndroidAction.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.ancs;
 
 public class AncsPerformAndroidAction extends AncsControlCommand {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsPerformNotificationAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsPerformNotificationAction.java
index 49ba07e99..316535010 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsPerformNotificationAction.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/AncsPerformNotificationAction.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.ancs;
 
 public class AncsPerformNotificationAction extends AncsControlCommand {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/GncsDataSourceQueue.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/GncsDataSourceQueue.java
index 6d144ae97..1b0aaeaf2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/GncsDataSourceQueue.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/ancs/GncsDataSourceQueue.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.ancs;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.VivomoveHrCommunicator;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/downloads/DirectoryData.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/downloads/DirectoryData.java
index 1eb80e8de..bdfea69ba 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/downloads/DirectoryData.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/downloads/DirectoryData.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.downloads;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.GarminTimeUtils;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/downloads/DirectoryEntry.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/downloads/DirectoryEntry.java
index 3cdfcc4c4..763304892 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/downloads/DirectoryEntry.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/downloads/DirectoryEntry.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.downloads;
 
 import java.util.Date;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/downloads/FileDownloadListener.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/downloads/FileDownloadListener.java
index bc7637790..f64898ec5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/downloads/FileDownloadListener.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/downloads/FileDownloadListener.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.downloads;
 
 public interface FileDownloadListener {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/downloads/FileDownloadQueue.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/downloads/FileDownloadQueue.java
index da6c77de4..22c233ec6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/downloads/FileDownloadQueue.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/downloads/FileDownloadQueue.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.downloads;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.vivomovehr.VivomoveConstants;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitBool.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitBool.java
index 5b7715afa..4b3e3c6ba 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitBool.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitBool.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.fit;
 
 public final class FitBool {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitDbImporter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitDbImporter.java
index 3979adce5..1d815a660 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitDbImporter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitDbImporter.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.fit;
 
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitFieldBaseType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitFieldBaseType.java
index f21622c0e..8fdad0071 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitFieldBaseType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitFieldBaseType.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.fit;
 
 import android.util.SparseArray;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitImportProcessor.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitImportProcessor.java
index 3a012d999..2558afcab 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitImportProcessor.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitImportProcessor.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.fit;
 
 import nodomain.freeyourgadget.gadgetbridge.entities.VivomoveHrActivitySample;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitImporter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitImporter.java
index 8b72d707d..b4fd75448 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitImporter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitImporter.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.fit;
 
 import android.util.SparseIntArray;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitLocalFieldDefinition.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitLocalFieldDefinition.java
index e018a69f8..e4d34d876 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitLocalFieldDefinition.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitLocalFieldDefinition.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.fit;
 
 class FitLocalFieldDefinition {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitLocalMessageDefinition.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitLocalMessageDefinition.java
index 92ced2e7c..c51c47bee 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitLocalMessageDefinition.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitLocalMessageDefinition.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.fit;
 
 import java.util.List;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitMessage.java
index 8604020a6..b30a0b6b6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Daniele Gobbetti, Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.fit;
 
 import android.util.SparseArray;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitMessageDefinition.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitMessageDefinition.java
index 3f966972b..a3b52377d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitMessageDefinition.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitMessageDefinition.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.fit;
 
 import android.util.SparseArray;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitMessageDefinitions.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitMessageDefinitions.java
index b5f049e39..8b33b7765 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitMessageDefinitions.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitMessageDefinitions.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.fit;
 
 import java.util.Arrays;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitMessageFieldDefinition.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitMessageFieldDefinition.java
index 3192a344d..9b9525c10 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitMessageFieldDefinition.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitMessageFieldDefinition.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.fit;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages.MessageWriter;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitParser.java
index 8208f18de..8bd92db76 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitParser.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.fit;
 
 import android.util.SparseArray;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitSerializer.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitSerializer.java
index f265d8774..edb09742a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitSerializer.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitSerializer.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.fit;
 
 import android.util.SparseArray;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitWeatherConditions.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitWeatherConditions.java
index a49b0d983..0e5e1007f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitWeatherConditions.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/fit/FitWeatherConditions.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.fit;
 
 public final class FitWeatherConditions {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/AuthNegotiationMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/AuthNegotiationMessage.java
index 0186262e7..902a1bc93 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/AuthNegotiationMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/AuthNegotiationMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.vivomovehr.VivomoveConstants;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/AuthNegotiationResponseMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/AuthNegotiationResponseMessage.java
index e06d61d43..b7df19fcf 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/AuthNegotiationResponseMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/AuthNegotiationResponseMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages;
 
 public class AuthNegotiationResponseMessage {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/BatteryStatusMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/BatteryStatusMessage.java
index 367699da1..24b8d66cd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/BatteryStatusMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/BatteryStatusMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.vivomovehr.VivomoveConstants;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/ConfigurationMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/ConfigurationMessage.java
index 7888fe021..1d1fcbeed 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/ConfigurationMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/ConfigurationMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.vivomovehr.VivomoveConstants;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/CreateFileRequestMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/CreateFileRequestMessage.java
index 6f8eb73c7..b8642c429 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/CreateFileRequestMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/CreateFileRequestMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.vivomovehr.VivomoveConstants;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/CreateFileResponseMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/CreateFileResponseMessage.java
index 37b5cee33..c418eb465 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/CreateFileResponseMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/CreateFileResponseMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages;
 
 public class CreateFileResponseMessage {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/CurrentTimeRequestMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/CurrentTimeRequestMessage.java
index 4b9e9ddae..31f7806f6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/CurrentTimeRequestMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/CurrentTimeRequestMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages;
 
 public class CurrentTimeRequestMessage {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/CurrentTimeRequestResponseMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/CurrentTimeRequestResponseMessage.java
index 28db8793d..766971668 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/CurrentTimeRequestResponseMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/CurrentTimeRequestResponseMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.vivomovehr.VivomoveConstants;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/DeviceInformationMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/DeviceInformationMessage.java
index cc205e054..de936bae1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/DeviceInformationMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/DeviceInformationMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages;
 
 import java.util.Locale;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/DeviceInformationResponseMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/DeviceInformationResponseMessage.java
index f93ed028f..247625e87 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/DeviceInformationResponseMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/DeviceInformationResponseMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.vivomovehr.VivomoveConstants;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/DirectoryFileFilterRequestMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/DirectoryFileFilterRequestMessage.java
index c6f9b74b0..ee11d3c2d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/DirectoryFileFilterRequestMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/DirectoryFileFilterRequestMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.vivomovehr.VivomoveConstants;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/DirectoryFileFilterResponseMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/DirectoryFileFilterResponseMessage.java
index d0cefdd29..4122a893e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/DirectoryFileFilterResponseMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/DirectoryFileFilterResponseMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages;
 
 public class DirectoryFileFilterResponseMessage {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/DownloadRequestMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/DownloadRequestMessage.java
index c549a2480..252ddacc1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/DownloadRequestMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/DownloadRequestMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.vivomovehr.VivomoveConstants;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/DownloadRequestResponseMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/DownloadRequestResponseMessage.java
index 09a42bb25..2188095ad 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/DownloadRequestResponseMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/DownloadRequestResponseMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages;
 
 public class DownloadRequestResponseMessage {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/FileReadyMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/FileReadyMessage.java
index 9383cbb02..f7864d60d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/FileReadyMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/FileReadyMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages;
 
 public class FileReadyMessage {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/FileTransferDataMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/FileTransferDataMessage.java
index fa687d8a2..5e426b84d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/FileTransferDataMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/FileTransferDataMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.vivomovehr.VivomoveConstants;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/FileTransferDataResponseMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/FileTransferDataResponseMessage.java
index c5d6d4a47..a40eb13b0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/FileTransferDataResponseMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/FileTransferDataResponseMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.vivomovehr.VivomoveConstants;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/FindMyPhoneRequestMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/FindMyPhoneRequestMessage.java
index 56c4298c0..930462ec9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/FindMyPhoneRequestMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/FindMyPhoneRequestMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages;
 
 public class FindMyPhoneRequestMessage {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/FitDataMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/FitDataMessage.java
index dab7bb93c..8ad57d785 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/FitDataMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/FitDataMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.vivomovehr.VivomoveConstants;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/FitDataResponseMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/FitDataResponseMessage.java
index d62732714..55bf3215a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/FitDataResponseMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/FitDataResponseMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages;
 
 public class FitDataResponseMessage {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/FitDefinitionMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/FitDefinitionMessage.java
index d1dcbf6ac..b9d6d5e9b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/FitDefinitionMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/FitDefinitionMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.vivomovehr.VivomoveConstants;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/FitDefinitionResponseMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/FitDefinitionResponseMessage.java
index 05f0374ed..2d236c8f3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/FitDefinitionResponseMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/FitDefinitionResponseMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages;
 
 public class FitDefinitionResponseMessage {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/GenericResponseMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/GenericResponseMessage.java
index f2abf70cd..865c86fe0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/GenericResponseMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/GenericResponseMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.vivomovehr.VivomoveConstants;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/GncsControlPointMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/GncsControlPointMessage.java
index 651dbd8c3..6d3bd8050 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/GncsControlPointMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/GncsControlPointMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.ancs.AncsControlCommand;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/GncsControlPointResponseMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/GncsControlPointResponseMessage.java
index df978f853..62c6f68f2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/GncsControlPointResponseMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/GncsControlPointResponseMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.vivomovehr.VivomoveConstants;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/GncsDataSourceMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/GncsDataSourceMessage.java
index 48e7c51cd..9ad1aa2ee 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/GncsDataSourceMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/GncsDataSourceMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.vivomovehr.VivomoveConstants;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/GncsDataSourceResponseMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/GncsDataSourceResponseMessage.java
index 3a13cc121..f4874d5f7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/GncsDataSourceResponseMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/GncsDataSourceResponseMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages;
 
 public class GncsDataSourceResponseMessage {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/GncsNotificationSourceMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/GncsNotificationSourceMessage.java
index 246214bb9..6952a5245 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/GncsNotificationSourceMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/GncsNotificationSourceMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.vivomovehr.VivomoveConstants;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/MessageReader.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/MessageReader.java
index bfb428b32..669d6e5a1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/MessageReader.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/MessageReader.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages;
 
 import nodomain.freeyourgadget.gadgetbridge.service.btle.BLETypeConversions;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/MessageWriter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/MessageWriter.java
index 40484804d..274f55616 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/MessageWriter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/MessageWriter.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages;
 
 import nodomain.freeyourgadget.gadgetbridge.service.btle.BLETypeConversions;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/MusicControlCapabilitiesMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/MusicControlCapabilitiesMessage.java
index c6f3a5fa5..3a7958eac 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/MusicControlCapabilitiesMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/MusicControlCapabilitiesMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages;
 
 public class MusicControlCapabilitiesMessage {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/MusicControlCapabilitiesResponseMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/MusicControlCapabilitiesResponseMessage.java
index 8a04be61e..616c9b17a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/MusicControlCapabilitiesResponseMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/MusicControlCapabilitiesResponseMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.vivomovehr.VivomoveConstants;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/MusicControlEntityUpdateMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/MusicControlEntityUpdateMessage.java
index ce841e64b..96c46069e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/MusicControlEntityUpdateMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/MusicControlEntityUpdateMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.vivomovehr.VivomoveConstants;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/NotificationServiceSubscriptionMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/NotificationServiceSubscriptionMessage.java
index 187ccb32e..5a3a4dadd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/NotificationServiceSubscriptionMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/NotificationServiceSubscriptionMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages;
 
 public class NotificationServiceSubscriptionMessage {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/NotificationServiceSubscriptionResponseMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/NotificationServiceSubscriptionResponseMessage.java
index 7cd84580d..588ac4189 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/NotificationServiceSubscriptionResponseMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/NotificationServiceSubscriptionResponseMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.vivomovehr.VivomoveConstants;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/ProtobufRequestMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/ProtobufRequestMessage.java
index 2b38cedba..deab2e665 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/ProtobufRequestMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/ProtobufRequestMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.vivomovehr.VivomoveConstants;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/ProtobufRequestResponseMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/ProtobufRequestResponseMessage.java
index 104e33694..5263eced1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/ProtobufRequestResponseMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/ProtobufRequestResponseMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages;
 
 public class ProtobufRequestResponseMessage {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/RequestMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/RequestMessage.java
index cea0b5100..929fc224e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/RequestMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/RequestMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.vivomovehr.VivomoveConstants;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/ResponseMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/ResponseMessage.java
index 2faa7b0f7..007cb39dd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/ResponseMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/ResponseMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.vivomovehr.VivomoveConstants;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/SetDeviceSettingsMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/SetDeviceSettingsMessage.java
index 83033a919..671848854 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/SetDeviceSettingsMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/SetDeviceSettingsMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.vivomovehr.VivomoveConstants;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/SetDeviceSettingsResponseMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/SetDeviceSettingsResponseMessage.java
index df70f84cb..3f608ff39 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/SetDeviceSettingsResponseMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/SetDeviceSettingsResponseMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages;
 
 public class SetDeviceSettingsResponseMessage {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/SupportedFileTypesRequestMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/SupportedFileTypesRequestMessage.java
index cdbc2c0ca..c66cf4d08 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/SupportedFileTypesRequestMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/SupportedFileTypesRequestMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.vivomovehr.VivomoveConstants;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/SupportedFileTypesResponseMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/SupportedFileTypesResponseMessage.java
index c56e6e615..a84a902e2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/SupportedFileTypesResponseMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/SupportedFileTypesResponseMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages;
 
 import java.util.ArrayList;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/SyncRequestMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/SyncRequestMessage.java
index 67ef53860..52225ee6b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/SyncRequestMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/SyncRequestMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages;
 
 import nodomain.freeyourgadget.gadgetbridge.service.btle.BLETypeConversions;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/SystemEventMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/SystemEventMessage.java
index 79a48dfae..fda18319f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/SystemEventMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/SystemEventMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.vivomovehr.VivomoveConstants;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/SystemEventResponseMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/SystemEventResponseMessage.java
index 08ed74e79..0d05c5097 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/SystemEventResponseMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/SystemEventResponseMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages;
 
 public class SystemEventResponseMessage {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/UploadRequestMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/UploadRequestMessage.java
index 6d70441ed..f1b0e3a82 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/UploadRequestMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/UploadRequestMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.vivomovehr.VivomoveConstants;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/UploadRequestResponseMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/UploadRequestResponseMessage.java
index 316c44dde..80fa53f4c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/UploadRequestResponseMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/UploadRequestResponseMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages;
 
 public class UploadRequestResponseMessage {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/WeatherRequestMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/WeatherRequestMessage.java
index 74442bec5..8789a3ae0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/WeatherRequestMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/WeatherRequestMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages;
 
 public class WeatherRequestMessage {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/WeatherRequestResponseMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/WeatherRequestResponseMessage.java
index acc09841a..d0a480a89 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/WeatherRequestResponseMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/messages/WeatherRequestResponseMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.messages;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.vivomovehr.VivomoveConstants;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/notifications/NotificationData.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/notifications/NotificationData.java
index 49d729a3c..7e71d96d6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/notifications/NotificationData.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/notifications/NotificationData.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.notifications;
 
 import android.util.SparseIntArray;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/notifications/NotificationStorage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/notifications/NotificationStorage.java
index 6899c7e22..f95b69b59 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/notifications/NotificationStorage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/notifications/NotificationStorage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.notifications;
 
 import android.util.SparseArray;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/uploads/FileUploadQueue.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/uploads/FileUploadQueue.java
index 91ed12525..06fc7ddde 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/uploads/FileUploadQueue.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/vivomovehr/uploads/FileUploadQueue.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Kadlec
+/*  Copyright (C) 2023-2024 Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.vivomovehr.uploads;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.vivomovehr.VivomoveConstants;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/waspos/WaspOSDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/waspos/WaspOSDeviceSupport.java
index bae2fd916..b1fc53304 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/waspos/WaspOSDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/waspos/WaspOSDeviceSupport.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2019-2020 Andreas Shimokawa, Gordon Williams
+/*  Copyright (C) 2020-2024 Andreas Shimokawa, Arjan Schrijver, Damien Gaignon,
+    Daniel Thompson, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.waspos;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/watch9/Watch9DeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/watch9/Watch9DeviceSupport.java
index a4c68f497..3b888b2bb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/watch9/Watch9DeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/watch9/Watch9DeviceSupport.java
@@ -1,5 +1,6 @@
-/*  Copyright (C) 2018-2021 Andreas Böhler, Andreas Shimokawa, Carsten
-    Pfeiffer, Daniele Gobbetti, maxirnilian, Sebastian Kranz
+/*  Copyright (C) 2018-2024 Andreas Böhler, Andreas Shimokawa, Arjan
+    Schrijver, Carsten Pfeiffer, Damien Gaignon, Daniele Gobbetti, maxirnilian,
+    Sebastian Kranz
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +15,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.watch9;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/watch9/operations/InitOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/watch9/operations/InitOperation.java
index cb34428da..31fd8e991 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/watch9/operations/InitOperation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/watch9/operations/InitOperation.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2018-2021 maxirnilian
+/*  Copyright (C) 2018-2024 Damien Gaignon, maxirnilian
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.watch9.operations;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/AuthenticationHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/AuthenticationHandler.java
index 1bc1a3ab8..d290d8fef 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/AuthenticationHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/AuthenticationHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr;
 
 import android.bluetooth.BluetoothGattCharacteristic;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/IconHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/IconHelper.java
index 8203b1e59..d90603b5b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/IconHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/IconHelper.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr;
 
 import android.graphics.Bitmap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/WithingsSteelHRDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/WithingsSteelHRDeviceSupport.java
index 10a637e80..c9a7588a0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/WithingsSteelHRDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/WithingsSteelHRDeviceSupport.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Ascense, Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr;
 
 import static nodomain.freeyourgadget.gadgetbridge.GBApplication.getContext;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/activity/ActivityEntry.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/activity/ActivityEntry.java
index 0b8e99638..7843478f8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/activity/ActivityEntry.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/activity/ActivityEntry.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.activity;
 
 public class ActivityEntry {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/activity/SleepActivitySampleHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/activity/SleepActivitySampleHelper.java
index 706f5e12b..4c5e3e28f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/activity/SleepActivitySampleHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/activity/SleepActivitySampleHelper.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.activity;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/activity/WithingsActivityType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/activity/WithingsActivityType.java
index f6ce0770b..68ce92da5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/activity/WithingsActivityType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/activity/WithingsActivityType.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.activity;
 
 import java.util.Locale;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/WithingsServerAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/WithingsServerAction.java
index 438a71a15..5bf42c6d3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/WithingsServerAction.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/WithingsServerAction.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication;
 
 import android.bluetooth.BluetoothDevice;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/WithingsUUID.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/WithingsUUID.java
index 064f90fcb..f36b0fcdc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/WithingsUUID.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/WithingsUUID.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication;
 
 import java.util.UUID;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/AbstractConversation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/AbstractConversation.java
index 9c3231a7d..5bee7850e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/AbstractConversation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/AbstractConversation.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.conversation;
 
 import java.util.ArrayList;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/AbstractResponseHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/AbstractResponseHandler.java
index 0549afc21..107bbafb7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/AbstractResponseHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/AbstractResponseHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.conversation;
 
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/ActivitySampleHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/ActivitySampleHandler.java
index 4bce8cdef..76969c9b0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/ActivitySampleHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/ActivitySampleHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.conversation;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/BatteryStateHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/BatteryStateHandler.java
index d7d15ca8e..ad7bc5d5b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/BatteryStateHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/BatteryStateHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.conversation;
 
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventBatteryInfo;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/Conversation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/Conversation.java
index 5cc7f283d..9720a0c68 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/Conversation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/Conversation.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.conversation;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.message.Message;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/ConversationObserver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/ConversationObserver.java
index 73f833d92..37d809b15 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/ConversationObserver.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/ConversationObserver.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.conversation;
 
 public interface ConversationObserver {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/ConversationQueue.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/ConversationQueue.java
index b4e49376c..d30179335 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/ConversationQueue.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/ConversationQueue.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.conversation;
 
 import android.bluetooth.BluetoothGattCharacteristic;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/HeartRateHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/HeartRateHandler.java
index d9f9c664d..21637bbf3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/HeartRateHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/HeartRateHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.conversation;
 
 import android.content.Intent;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/ResponseHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/ResponseHandler.java
index 096c6d64d..239bf9748 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/ResponseHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/ResponseHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.conversation;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.message.Message;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/SetupFinishedHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/SetupFinishedHandler.java
index 5f7945464..6d3f2aa99 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/SetupFinishedHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/SetupFinishedHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.conversation;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.WithingsSteelHRDeviceSupport;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/SimpleConversation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/SimpleConversation.java
index ca5e42228..0c959b46b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/SimpleConversation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/SimpleConversation.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.conversation;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.message.Message;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/SyncFinishedHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/SyncFinishedHandler.java
index fa98e90f2..6c0bcf55e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/SyncFinishedHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/SyncFinishedHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.conversation;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.WithingsSteelHRDeviceSupport;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/WorkoutScreenListHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/WorkoutScreenListHandler.java
index 76372895c..56cc8a747 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/WorkoutScreenListHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/conversation/WorkoutScreenListHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Andreas Shimokawa, Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.conversation;
 
 import android.content.SharedPreferences;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ActivityHeartrate.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ActivityHeartrate.java
index 457e474ff..3673ff100 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ActivityHeartrate.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ActivityHeartrate.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ActivitySampleCalories.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ActivitySampleCalories.java
index 71da171ee..c80c358d2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ActivitySampleCalories.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ActivitySampleCalories.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ActivitySampleCalories2.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ActivitySampleCalories2.java
index da61199d9..b94c0640d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ActivitySampleCalories2.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ActivitySampleCalories2.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 public class ActivitySampleCalories2 extends ActivitySampleCalories {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ActivitySampleDuration.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ActivitySampleDuration.java
index 4b23da7fd..bc85b6365 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ActivitySampleDuration.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ActivitySampleDuration.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ActivitySampleMovement.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ActivitySampleMovement.java
index 63df8f54c..9361b028a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ActivitySampleMovement.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ActivitySampleMovement.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ActivitySampleRun.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ActivitySampleRun.java
index 2a1ae803f..d3d2d946a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ActivitySampleRun.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ActivitySampleRun.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ActivitySampleSleep.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ActivitySampleSleep.java
index 9df227e52..d9a9130de 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ActivitySampleSleep.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ActivitySampleSleep.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ActivitySampleSwim.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ActivitySampleSwim.java
index efb3e32b1..18110ea2a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ActivitySampleSwim.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ActivitySampleSwim.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ActivitySampleTime.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ActivitySampleTime.java
index baaf95b9f..2d040af15 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ActivitySampleTime.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ActivitySampleTime.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ActivitySampleUnknown.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ActivitySampleUnknown.java
index 03ccfd696..d06ff2a30 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ActivitySampleUnknown.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ActivitySampleUnknown.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ActivitySampleWalk.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ActivitySampleWalk.java
index d68771148..40d54a67b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ActivitySampleWalk.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ActivitySampleWalk.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ActivityTarget.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ActivityTarget.java
index d4a9bf4e9..e764837b3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ActivityTarget.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ActivityTarget.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/AlarmName.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/AlarmName.java
index c2e05daef..c66f3f40a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/AlarmName.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/AlarmName.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/AlarmSettings.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/AlarmSettings.java
index bb19b062b..5e8e74467 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/AlarmSettings.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/AlarmSettings.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/AlarmStatus.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/AlarmStatus.java
index 708405be2..300f8816b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/AlarmStatus.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/AlarmStatus.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/AncsStatus.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/AncsStatus.java
index 0b95df5b5..2bbea2aed 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/AncsStatus.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/AncsStatus.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/BatteryValues.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/BatteryValues.java
index adfeee192..0f57128f2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/BatteryValues.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/BatteryValues.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/Challenge.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/Challenge.java
index a9709e052..4cb888fc3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/Challenge.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/Challenge.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ChallengeResponse.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ChallengeResponse.java
index 5fb86b32f..8bb2c05df 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ChallengeResponse.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ChallengeResponse.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/DataStructureFactory.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/DataStructureFactory.java
index 89a4b591c..251f8d110 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/DataStructureFactory.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/DataStructureFactory.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/EndOfTransmission.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/EndOfTransmission.java
index d969885f7..491696eaf 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/EndOfTransmission.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/EndOfTransmission.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/GetActivitySamples.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/GetActivitySamples.java
index 48d114ad8..c7c779971 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/GetActivitySamples.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/GetActivitySamples.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/GlyphId.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/GlyphId.java
index 0cc68df00..25a20ac56 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/GlyphId.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/GlyphId.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/HeartRate.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/HeartRate.java
index 2d4736b16..29c8e546c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/HeartRate.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/HeartRate.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ImageData.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ImageData.java
index d2e1123e7..b79bcd9bf 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ImageData.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ImageData.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ImageMetaData.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ImageMetaData.java
index 847e9e911..e6d6f1c3a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ImageMetaData.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ImageMetaData.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/LiveHeartRate.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/LiveHeartRate.java
index dfe801428..594fbf5a5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/LiveHeartRate.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/LiveHeartRate.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/LiveWorkoutEnd.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/LiveWorkoutEnd.java
index e5694a7b9..d4561eb46 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/LiveWorkoutEnd.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/LiveWorkoutEnd.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/LiveWorkoutPauseState.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/LiveWorkoutPauseState.java
index e919432c7..2268425af 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/LiveWorkoutPauseState.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/LiveWorkoutPauseState.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/LiveWorkoutStart.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/LiveWorkoutStart.java
index f59d648c3..f7a91a750 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/LiveWorkoutStart.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/LiveWorkoutStart.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/Locale.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/Locale.java
index e3e31a9d1..dc5563429 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/Locale.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/Locale.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/MoveHand.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/MoveHand.java
index be82c1e54..06e3347e2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/MoveHand.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/MoveHand.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/Probe.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/Probe.java
index 904f1caaf..62be1b53e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/Probe.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/Probe.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ProbeOsVersion.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ProbeOsVersion.java
index da5adbf5b..3ff5cd114 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ProbeOsVersion.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ProbeOsVersion.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ProbeReply.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ProbeReply.java
index 07ef568ec..c69452746 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ProbeReply.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ProbeReply.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ScreenSettings.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ScreenSettings.java
index 22c6f438f..6300379a5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ScreenSettings.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/ScreenSettings.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/SourceAppId.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/SourceAppId.java
index 98892a599..ce30e1075 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/SourceAppId.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/SourceAppId.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/Status.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/Status.java
index 861a6a1d5..0b210a2c4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/Status.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/Status.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/Time.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/Time.java
index e7d41f2d7..37c07bfdd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/Time.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/Time.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 import org.threeten.bp.Instant;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/TypeVersion.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/TypeVersion.java
index 5a5156986..3e12144b2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/TypeVersion.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/TypeVersion.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/User.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/User.java
index 950a89ab8..e33035a7d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/User.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/User.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/UserSecret.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/UserSecret.java
index a030fb267..98785e8f2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/UserSecret.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/UserSecret.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/UserUnit.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/UserUnit.java
index 2adc4ebce..f1de01ce7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/UserUnit.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/UserUnit.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/UserUnitConstants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/UserUnitConstants.java
index 7f4e38233..68cc30147 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/UserUnitConstants.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/UserUnitConstants.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 public final class UserUnitConstants {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/WithingsStructure.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/WithingsStructure.java
index 9e94d852f..97a46fc34 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/WithingsStructure.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/WithingsStructure.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/WithingsStructureType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/WithingsStructureType.java
index 14167c550..6ae75c925 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/WithingsStructureType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/WithingsStructureType.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 public class WithingsStructureType {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/WorkoutGpsState.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/WorkoutGpsState.java
index 9535e7e5a..5ef65718a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/WorkoutGpsState.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/WorkoutGpsState.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/WorkoutScreen.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/WorkoutScreen.java
index d7d5251d7..3634146b7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/WorkoutScreen.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/WorkoutScreen.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/WorkoutScreenData.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/WorkoutScreenData.java
index 3e7961f5c..255beeeb5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/WorkoutScreenData.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/WorkoutScreenData.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/WorkoutScreenList.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/WorkoutScreenList.java
index 8918cd038..cc83d0721 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/WorkoutScreenList.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/WorkoutScreenList.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/WorkoutType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/WorkoutType.java
index b33781c66..8c83aa110 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/WorkoutType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/datastructures/WorkoutType.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/AbstractMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/AbstractMessage.java
index 04e990b4e..1445eddf5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/AbstractMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/AbstractMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.message;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/ExpectedResponse.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/ExpectedResponse.java
index 55c186b4a..bbcfd7b85 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/ExpectedResponse.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/ExpectedResponse.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.message;
 
 public enum ExpectedResponse {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/GlyphRequestHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/GlyphRequestHandler.java
index 48c91dc01..125dc2c81 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/GlyphRequestHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/GlyphRequestHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.message;
 
 import android.graphics.Bitmap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/Message.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/Message.java
index 6e73ca786..1e7b7d309 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/Message.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/Message.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.message;
 
 import java.util.List;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/MessageBuilder.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/MessageBuilder.java
index eccd5039c..53ca9ab19 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/MessageBuilder.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/MessageBuilder.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.message;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/MessageFactory.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/MessageFactory.java
index 2a092c5c5..8032812a2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/MessageFactory.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/MessageFactory.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.message;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/SimpleHexToByteMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/SimpleHexToByteMessage.java
index 7a713c05f..b170d1acc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/SimpleHexToByteMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/SimpleHexToByteMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.message;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/WithingsMessage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/WithingsMessage.java
index 8a789b834..d2789a58a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/WithingsMessage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/WithingsMessage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.message;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.datastructures.WithingsStructure;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/WithingsMessageType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/WithingsMessageType.java
index e05fa31a4..d45de5ccb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/WithingsMessageType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/WithingsMessageType.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.message;
 
 /**
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/incoming/IncomingMessageHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/incoming/IncomingMessageHandler.java
index 508ab2257..c7b9441b2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/incoming/IncomingMessageHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/incoming/IncomingMessageHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.message.incoming;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.message.Message;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/incoming/IncomingMessageHandlerFactory.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/incoming/IncomingMessageHandlerFactory.java
index 5a7465411..e686721da 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/incoming/IncomingMessageHandlerFactory.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/incoming/IncomingMessageHandlerFactory.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.message.incoming;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/incoming/LiveHeartrateHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/incoming/LiveHeartrateHandler.java
index 8baee5bd4..18ddcbf75 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/incoming/LiveHeartrateHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/incoming/LiveHeartrateHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.message.incoming;
 
 import android.content.Intent;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/incoming/LiveWorkoutHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/incoming/LiveWorkoutHandler.java
index 28ccf7de7..d11745606 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/incoming/LiveWorkoutHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/incoming/LiveWorkoutHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.message.incoming;
 
 import android.location.LocationManager;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/incoming/NotificationRequestHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/incoming/NotificationRequestHandler.java
index f36d3d217..f1564c401 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/incoming/NotificationRequestHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/incoming/NotificationRequestHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.message.incoming;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/incoming/SyncRequestHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/incoming/SyncRequestHandler.java
index 90a436ada..c3a85fe44 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/incoming/SyncRequestHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/message/incoming/SyncRequestHandler.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.message.incoming;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.WithingsSteelHRDeviceSupport;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/notification/AncsConstants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/notification/AncsConstants.java
index b061ac3c2..bd58b3247 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/notification/AncsConstants.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/notification/AncsConstants.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.notification;
 
 public final class AncsConstants {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/notification/GetNotificationAttributes.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/notification/GetNotificationAttributes.java
index 760c17a11..a87717100 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/notification/GetNotificationAttributes.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/notification/GetNotificationAttributes.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.notification;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/notification/GetNotificationAttributesResponse.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/notification/GetNotificationAttributesResponse.java
index 14b7a8bd7..2c8a0edc3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/notification/GetNotificationAttributesResponse.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/notification/GetNotificationAttributesResponse.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.notification;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/notification/NotificationAttribute.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/notification/NotificationAttribute.java
index f5bbdee46..25b057414 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/notification/NotificationAttribute.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/notification/NotificationAttribute.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.notification;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/notification/NotificationProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/notification/NotificationProvider.java
index fe3ab81eb..e27a25ffd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/notification/NotificationProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/notification/NotificationProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.notification;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/notification/NotificationSource.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/notification/NotificationSource.java
index e18476fb9..bcd31a3f1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/notification/NotificationSource.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/notification/NotificationSource.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.notification;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/notification/RequestedNotificationAttribute.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/notification/RequestedNotificationAttribute.java
index ffd84229f..581db30f5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/notification/RequestedNotificationAttribute.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/withingssteelhr/communication/notification/RequestedNotificationAttribute.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2021 Frank Ertl
+/*  Copyright (C) 2023-2024 Frank Ertl
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.withingssteelhr.communication.notification;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java
index 9e8ed9aa3..9ab5e16da 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 Andreas Shimokawa, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi;
 
 import android.content.SharedPreferences;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiBleUuids.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiBleUuids.java
index feef9bddc..0a9423d35 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiBleUuids.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiBleUuids.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi;
 
 import java.util.LinkedHashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
index 08dab3da7..8ad1dcf28 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 Andreas Shimokawa, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi;
 
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPreferences.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPreferences.java
index 2864ff879..a40140eb6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPreferences.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiPreferences.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi;
 
 import java.util.ArrayList;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
index 157d2a6e8..154bf6059 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo, Andreas Shimokawa
+/*  Copyright (C) 2023-2024 Andreas Shimokawa, José Rebelo, Yoran Vulker
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi;
 
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileFetcher.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileFetcher.java
index f5547dd10..faad7ffae 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileFetcher.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileFetcher.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo, Yoran Vulker
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java
index ebd5e1160..400a70d39 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 Andreas Shimokawa, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityParser.java
index 9ec8df4a9..4ab0cc0a6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityParser.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity;
 
 import androidx.annotation.Nullable;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/DailyDetailsParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/DailyDetailsParser.java
index 8aed5b992..624368676 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/DailyDetailsParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/DailyDetailsParser.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl;
 
 import android.widget.Toast;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/DailySummaryParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/DailySummaryParser.java
index 16a069889..82c9226f1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/DailySummaryParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/DailySummaryParser.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl;
 
 import android.widget.Toast;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/SleepDetailsParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/SleepDetailsParser.java
index 3ae3f1804..17eb7217d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/SleepDetailsParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/SleepDetailsParser.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl;
 
 import android.widget.Toast;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/SleepStagesParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/SleepStagesParser.java
index 03a5f53bd..6f6243b86 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/SleepStagesParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/SleepStagesParser.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 Alice, José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl;
 
 import android.widget.Toast;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutGpsParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutGpsParser.java
index 1a4ef530c..2ff16119b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutGpsParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutGpsParser.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl;
 
 import android.widget.Toast;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java
index 223b6ec3c..d28173510 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo, Yoran Vulker
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl;
 
 import static nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries.ACTIVE_SECONDS;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/XiaomiSimpleActivityParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/XiaomiSimpleActivityParser.java
index ec5f21654..3378368de 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/XiaomiSimpleActivityParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/XiaomiSimpleActivityParser.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl;
 
 import static nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries.TIME_END;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/XiaomiSimpleDataEntry.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/XiaomiSimpleDataEntry.java
index 3ec131cdf..80482bd1a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/XiaomiSimpleDataEntry.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/XiaomiSimpleDataEntry.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl;
 
 import java.nio.ByteBuffer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/AbstractXiaomiService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/AbstractXiaomiService.java
index 044dd9563..b414be2df 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/AbstractXiaomiService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/AbstractXiaomiService.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiCalendarService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiCalendarService.java
index 482467708..f5342da2e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiCalendarService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiCalendarService.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services;
 
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_SYNC_CALENDAR;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiDataUploadService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiDataUploadService.java
index 9299fa81e..5695ced16 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiDataUploadService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiDataUploadService.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 Andreas Shimokawa, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services;
 
 import androidx.annotation.Nullable;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
index 1415afd47..b2bf9bd67 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiHealthService.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo, Yoran Vulker
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services;
 
 import android.content.Intent;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiMusicService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiMusicService.java
index d48eb66e4..129c3d603 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiMusicService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiMusicService.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo, Yoran Vulker
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
index 3a2bdeea1..4c9d5dbf1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 Andreas Shimokawa, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services;
 
 import android.Manifest;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiPhonebookService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiPhonebookService.java
index 43d7c7d22..ee1a0d7d7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiPhonebookService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiPhonebookService.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 Yoran Vulker, Andreas Shimokawa
+/*  Copyright (C) 2023-2024 Andreas Shimokawa, Yoran Vulker
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java
index ac838c6e0..dbe817e9a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services;
 
 import android.content.Intent;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
index ca75467c3..79608e770 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2023 José Rebelo, Yoran Vulker
+/*  Copyright (C) 2023-2024 Andreas Shimokawa, José Rebelo, LuK1337,
+    Yoran Vulker
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services;
 
 import android.text.TextUtils;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWatchfaceService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWatchfaceService.java
index 28cc84e16..7480eb0c8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWatchfaceService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWatchfaceService.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java
index 2ec584fee..996dac4b6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 Andreas Shimokawa, José Rebelo, opcode
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xwatch/XWatchSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xwatch/XWatchSupport.java
index ba225bb74..1058bffdf 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xwatch/XWatchSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xwatch/XWatchSupport.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2018-2021 Andreas Shimokawa, Carsten Pfeiffer, ladbsoft,
-    mamucho, Sebastian Kranz
+/*  Copyright (C) 2018-2024 Andreas Shimokawa, Arjan Schrijver, Carsten
+    Pfeiffer, ladbsoft, mamucho, SalavatR, Sebastian Kranz
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xwatch;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/zetime/ZeTimeDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/zetime/ZeTimeDeviceSupport.java
index 363cfa6dd..3c634d4ca 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/zetime/ZeTimeDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/zetime/ZeTimeDeviceSupport.java
@@ -1,5 +1,6 @@
-/*  Copyright (C) 2015-2021 0nse, Andreas Shimokawa, Carsten Pfeiffer,
-    Julien Pivotto, Maxim Baz, Sebastian Kranz, Steffen Liebergeld
+/*  Copyright (C) 2018-2024 Andreas Shimokawa, Arjan Schrijver, Carsten
+    Pfeiffer, chklump, Damien Gaignon, José Rebelo, Maxim Baz, Petr Vaněk,
+    Sebastian Kranz
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +15,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.zetime;
 
 import android.bluetooth.BluetoothGatt;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/receivers/AutoConnectIntervalReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/receivers/AutoConnectIntervalReceiver.java
index b5e79b8c3..cf403b555 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/receivers/AutoConnectIntervalReceiver.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/receivers/AutoConnectIntervalReceiver.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2019-2021 Andreas Shimokawa
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Daniel Dakhno, Ganblejs,
+    José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.receivers;
 
 import android.app.AlarmManager;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/receivers/GBAutoFetchReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/receivers/GBAutoFetchReceiver.java
index b0ca6fedb..dc1569a9f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/receivers/GBAutoFetchReceiver.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/receivers/GBAutoFetchReceiver.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2018-2021 Daniele Gobbetti, Martin
+/*  Copyright (C) 2018-2024 Daniele Gobbetti, José Rebelo, Martin
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.receivers;
 
 import android.content.BroadcastReceiver;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/receivers/GBCallControlReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/receivers/GBCallControlReceiver.java
index 775d9ff0b..197c487e5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/receivers/GBCallControlReceiver.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/receivers/GBCallControlReceiver.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Andrzej Surowiec, Carsten
-    Pfeiffer, Daniel Dakhno
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Andrzej Surowiec, Carsten
+    Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.receivers;
 
 import android.content.BroadcastReceiver;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/receivers/GBMusicControlReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/receivers/GBMusicControlReceiver.java
index 5f3cde82f..77e22ebe8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/receivers/GBMusicControlReceiver.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/receivers/GBMusicControlReceiver.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Gabe Schrecker, Petr Vaněk
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Benjamin Swartley, Carsten
+    Pfeiffer, Daniele Gobbetti, Gabe Schrecker, José Rebelo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.receivers;
 
 import android.content.BroadcastReceiver;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/AbstractSerialDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/AbstractSerialDeviceSupport.java
index 12dfa96df..44e57e904 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/AbstractSerialDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/AbstractSerialDeviceSupport.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, José Rebelo,
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, José Rebelo,
     Julien Pivotto, Steffen Liebergeld
 
     This file is part of Gadgetbridge.
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.serial;
 
 import android.location.Location;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/GBDeviceIoThread.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/GBDeviceIoThread.java
index e0509d5d9..528f455ac 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/GBDeviceIoThread.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/GBDeviceIoThread.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.serial;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/GBDeviceProtocol.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/GBDeviceProtocol.java
index 1b1389bc6..7db6a50af 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/GBDeviceProtocol.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/serial/GBDeviceProtocol.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, José Rebelo,
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, José Rebelo,
     Julien Pivotto, Steffen Liebergeld
 
     This file is part of Gadgetbridge.
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.serial;
 
 import android.location.Location;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/AlarmUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/AlarmUtils.java
index 8a356623f..ad267c629 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/AlarmUtils.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/AlarmUtils.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2019-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Dmitry Markin, Taavi Eomäe
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+    Gobbetti, Dmitry Markin, Petr Vaněk, Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/AndroidUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/AndroidUtils.java
index 07cad80df..732128ee2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/AndroidUtils.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/AndroidUtils.java
@@ -1,5 +1,6 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Felix Konstantin Maurer, Marc Nause, Petr Vaněk, Taavi Eomäe
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Arjan Schrijver, Carsten
+    Pfeiffer, Daniel Dakhno, Daniele Gobbetti, Felix Konstantin Maurer, José
+    Rebelo, Marc Nause, Petr Vaněk, Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +15,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util;
 
 import android.annotation.SuppressLint;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/ArrayUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/ArrayUtils.java
index 87b590cb6..cb68d12b9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/ArrayUtils.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/ArrayUtils.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Petr Vaněk
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Carsten Pfeiffer, Petr Kadlec,
+    Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util;
 
 import java.util.Collection;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/BcdUtil.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/BcdUtil.java
index 292cd6390..df6126e33 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/BcdUtil.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/BcdUtil.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Andreas Böhler
+/*  Copyright (C) 2020-2024 Andreas Böhler
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util;
 
 import androidx.annotation.IntRange;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/BitmapUtil.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/BitmapUtil.java
index 8ecb85909..b0fefef30 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/BitmapUtil.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/BitmapUtil.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2017-2021 Frank Slezak
+/*  Copyright (C) 2017-2024 Arjan Schrijver, Frank Slezak, HelloCodeberg,
+    José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 package nodomain.freeyourgadget.gadgetbridge.util;
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/BondingInterface.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/BondingInterface.java
index 564d1a759..f0f6fe90c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/BondingInterface.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/BondingInterface.java
@@ -1,20 +1,4 @@
-/*  Copyright (C) 2020-2021 Taavi Eomäe
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-/*  Copyright (C) 2020 Taavi Eomäe
+/*  Copyright (C) 2020-2024 Andreas Böhler, Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/BondingUtil.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/BondingUtil.java
index 442f18cc9..5db0c72d9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/BondingUtil.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/BondingUtil.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2020-2021 Andreas Böhler, Taavi Eomäe
+/*  Copyright (C) 2020-2024 Andreas Böhler, Arjan Schrijver, Daniel Dakhno,
+    José Rebelo, Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util;
 
 import static androidx.core.app.ActivityCompat.startIntentSenderForResult;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/CRC32C.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/CRC32C.java
index a008cd9af..a13ccea55 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/CRC32C.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/CRC32C.java
@@ -1,19 +1,3 @@
-/*  Copyright (C) 2019-2021 Andreas Shimokawa
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/CheckSums.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/CheckSums.java
index 4299eca1c..0931571a2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/CheckSums.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/CheckSums.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Damien
+    Gaignon, Daniele Gobbetti, José Rebelo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util;
 
 import androidx.annotation.Nullable;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/CryptoUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/CryptoUtils.java
index e5db22666..53ecf926e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/CryptoUtils.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/CryptoUtils.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2021-2024 Andreas Shimokawa, Damien Gaignon, José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util;
 
 import android.annotation.SuppressLint;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DateTimeUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DateTimeUtils.java
index 4625afc65..8fd06f0fd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DateTimeUtils.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DateTimeUtils.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, AndrewH, Carsten Pfeiffer,
-    Daniele Gobbetti, Pavel Elagin, Petr Vaněk
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, AndrewH, Carsten Pfeiffer,
+    Daniele Gobbetti, José Rebelo, Pavel Elagin, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util;
 
 import android.text.format.DateUtils;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DeviceHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DeviceHelper.java
index 00c6e5d43..c5ff4c44d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DeviceHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DeviceHelper.java
@@ -1,10 +1,14 @@
-/*  Copyright (C) 2015-2021 0nse, 115ek, Andreas Böhler, Andreas Shimokawa,
-    angelpup, Carsten Pfeiffer, Cre3per, DanialHanif, Daniel Dakhno, Daniele
-    Gobbetti, Dmytro Bielik, Gordon Williams, Jean-François Greffier, João Paulo
-    Barraca, José Rebelo, ksiwczynski, ladbsoft, Lesur Frederic, Manuel Ruß,
-    maxirnilian, mkusnierz, odavo32nof, opavlov, pangwalla, Pavel Elagin,
-    protomors, Quallenauge, Sami Alaoui, Sebastian Kranz, Sophanimus, Taavi
-    Eomäe, tiparega, Vadim Kaushan, Yukai Li
+/*  Copyright (C) 2015-2024 115ek, akasaka / Genjitsu Labs, Andreas Böhler,
+    Andreas Shimokawa, Andrew Watkins, angelpup, Arjan Schrijver, Carsten Pfeiffer,
+    Cre3per, DanialHanif, Daniel Dakhno, Daniele Gobbetti, Daniel Thompson, Da Pa,
+    Dmytro Bielik, Frank Ertl, GeekosaurusR3x, Gordon Williams, Jean-François
+    Greffier, jfgreffier, jhey, João Paulo Barraca, Jochen S, Johannes Krude,
+    José Rebelo, ksiwczynski, ladbsoft, Lesur Frederic, Maciej Kuśnierz, mamucho,
+    Manuel Ruß, maxirnilian, mkusnierz, narektor, Noodlez, odavo32nof, opavlov,
+    pangwalla, Pavel Elagin, Petr Kadlec, Petr Vaněk, protomors, Quallenauge,
+    Quang Ngô, Raghd Hamzeh, Sami Alaoui, Sebastian Kranz, sedy89, Sophanimus,
+    Stefan Bora, Taavi Eomäe, thermatk, tiparega, Vadim Kaushan, x29a, xaos,
+    Yukai Li
 
     This file is part of Gadgetbridge.
 
@@ -19,7 +23,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util;
 
 import android.bluetooth.BluetoothAdapter;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/ECDH_B163.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/ECDH_B163.java
index 9cf58428a..28d35091b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/ECDH_B163.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/ECDH_B163.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 Andreas Shimokawa
+/*  Copyright (C) 2022-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 
 /*
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/EmojiConverter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/EmojiConverter.java
index 0b269e63b..d12312fa6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/EmojiConverter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/EmojiConverter.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Matthieu Baerts, Taavi Eomäe
+/*  Copyright (C) 2018-2024 Carsten Pfeiffer, Matthieu Baerts, Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 package nodomain.freeyourgadget.gadgetbridge.util;
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/FileUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/FileUtils.java
index 94a9779e6..3d9ed130d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/FileUtils.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/FileUtils.java
@@ -1,5 +1,6 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Felix Konstantin Maurer, JohnnySun, Taavi Eomäe
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Arjan Schrijver, Carsten
+    Pfeiffer, Daniele Gobbetti, Felix Konstantin Maurer, JohnnySun, José Rebelo,
+    Petr Vaněk, Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +15,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util;
 
 import android.content.ContentResolver;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/FormatUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/FormatUtils.java
index ce6752682..f04483cd0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/FormatUtils.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/FormatUtils.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Petr Vaněk
+/*  Copyright (C) 2021-2024 Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 
 package nodomain.freeyourgadget.gadgetbridge.util;
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GB.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GB.java
index 7d00c98a2..820a93f66 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GB.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GB.java
@@ -1,6 +1,7 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniel Dakhno,
-    Daniele Gobbetti, Felix Konstantin Maurer, Pauli Salmenrinne, Taavi Eomäe,
-    Uwe Hermann, Yar
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniel Dakhno,
+    Daniele Gobbetti, Davis Mosenkovs, Dmitriy Bogdanov, Felix Konstantin Maurer,
+    Ganblejs, José Rebelo, Pauli Salmenrinne, Petr Vaněk, Roberto P. Rubio,
+    Taavi Eomäe, Uwe Hermann, Yar
 
     This file is part of Gadgetbridge.
 
@@ -15,7 +16,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GBChangeLog.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GBChangeLog.java
index a6e38c4e9..863ff7bfb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GBChangeLog.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GBChangeLog.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 Arjan Schrijver
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GBPrefs.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GBPrefs.java
index 55f1794f1..c1799e886 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GBPrefs.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GBPrefs.java
@@ -1,5 +1,6 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Dikay900, Felix Konstantin Maurer
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Anemograph, Carsten Pfeiffer,
+    Daniel Dakhno, Daniele Gobbetti, Davis Mosenkovs, Dikay900, Felix Konstantin
+    Maurer, José Rebelo, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +15,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util;
 
 import android.Manifest;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/ImportExportSharedPreferences.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/ImportExportSharedPreferences.java
index 111e61f67..05f186a60 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/ImportExportSharedPreferences.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/ImportExportSharedPreferences.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2017-2021 Alberto, Andreas Shimokawa, Carsten Pfeiffer,
-    Daniele Gobbetti, Taavi Eomäe
+/*  Copyright (C) 2017-2024 Alberto, Andreas Shimokawa, Carsten Pfeiffer,
+    Daniele Gobbetti, Joel Beckmeyer, José Rebelo, Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util;
 
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/JavaExtensions.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/JavaExtensions.java
index 4840eb6df..89646ac56 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/JavaExtensions.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/JavaExtensions.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 ivanovlev
+/*  Copyright (C) 2017-2024 ivanovlev
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util;
 
 public class JavaExtensions {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/LimitedQueue.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/LimitedQueue.java
index df51b110d..40110f556 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/LimitedQueue.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/LimitedQueue.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2021 Andreas Shimokawa, Daniel Dakhno, Daniele Gobbetti,
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Daniel Dakhno, José Rebelo,
     Julien Pivotto
 
     This file is part of Gadgetbridge.
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util;
 
 import android.util.Pair;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/MapUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/MapUtils.java
index e6a4edc71..b5df5b7ac 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/MapUtils.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/MapUtils.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/MediaManager.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/MediaManager.java
index 1c79a8e5a..3527da011 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/MediaManager.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/MediaManager.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util;
 
 import android.content.ComponentName;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/NotificationUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/NotificationUtils.java
index 2ff7c3104..9d2f29815 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/NotificationUtils.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/NotificationUtils.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Lukas Veneziano, Maxim Baz
+/*  Copyright (C) 2017-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+    Gobbetti, José Rebelo, Lukas Veneziano, Maxim Baz
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/Optional.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/Optional.java
index cac2b854b..0c038606c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/Optional.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/Optional.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util;
 
 import java.util.NoSuchElementException;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/PebbleUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/PebbleUtils.java
index a147e492a..2a02c7465 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/PebbleUtils.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/PebbleUtils.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
     Gobbetti, Frank Slezak
 
     This file is part of Gadgetbridge.
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util;
 
 import android.graphics.Color;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/PendingIntentUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/PendingIntentUtils.java
index eaedfd0d9..f6540bf48 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/PendingIntentUtils.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/PendingIntentUtils.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 Ganblejs
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util;
 
 import android.app.PendingIntent;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/Prefs.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/Prefs.java
index 822a11cdf..4e8a2f217 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/Prefs.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/Prefs.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Carsten Pfeiffer, JohnnySun
+/*  Copyright (C) 2016-2024 Carsten Pfeiffer, JohnnySun, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util;
 
 import android.content.SharedPreferences;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/RangeMap.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/RangeMap.java
index bf91153f3..6c96658b2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/RangeMap.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/RangeMap.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util;
 
 import android.util.Pair;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/RtlUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/RtlUtils.java
index 662df6d4c..1d94bcad7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/RtlUtils.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/RtlUtils.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2018-2021 Andreas Shimokawa, Carsten Pfeiffer, Roi Greenberg
+/*  Copyright (C) 2018-2024 Andreas Shimokawa, Carsten Pfeiffer, Roi Greenberg
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util;
 
 import android.text.TextUtils;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/SilentMode.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/SilentMode.java
index f80c99568..120493edc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/SilentMode.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/SilentMode.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util;
 
 import static nodomain.freeyourgadget.gadgetbridge.GBApplication.getContext;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/StringUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/StringUtils.java
index 76918c30b..882cff7a0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/StringUtils.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/StringUtils.java
@@ -1,6 +1,6 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, João Paulo Barraca, Nephiel, Roi Greenberg, Taavi Eomäe,
-    Zhong Jianxin
+/*  Copyright (C) 2017-2024 Andreas Shimokawa, Arjan Schrijver, Carsten
+    Pfeiffer, Daniel Dakhno, Daniele Gobbetti, João Paulo Barraca, José Rebelo,
+    Nephiel, Roi Greenberg, Taavi Eomäe, Zhong Jianxin
 
     This file is part of Gadgetbridge.
 
@@ -15,7 +15,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util;
 
 import java.io.ByteArrayOutputStream;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/SwipeEvents.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/SwipeEvents.java
index 361186386..d9e2ddf02 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/SwipeEvents.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/SwipeEvents.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Petr Vaněk
+/*  Copyright (C) 2020-2024 Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/TimePreference.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/TimePreference.java
index 5a38e528e..f95278bb9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/TimePreference.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/TimePreference.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Carsten Pfeiffer, José Rebelo
+/*  Copyright (C) 2017-2024 Carsten Pfeiffer, José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/UriHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/UriHelper.java
index 517f790b5..4d861817a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/UriHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/UriHelper.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2021 Carsten Pfeiffer, Daniele Gobbetti, Taavi Eomäe
+/*  Copyright (C) 2016-2024 Carsten Pfeiffer, Daniele Gobbetti, Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util;
 
 import android.content.ContentResolver;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/Version.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/Version.java
index 23ae62fe1..e88ce023f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/Version.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/Version.java
@@ -1,4 +1,5 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer, Michal Novotny
+/*  Copyright (C) 2017-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniel
+    Dakhno, Michal Novotny
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/WebViewSingleton.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/WebViewSingleton.java
index af7d486f7..d4b8e1b92 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/WebViewSingleton.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/WebViewSingleton.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2016-2021 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Lem Dulfo, Taavi Eomäe, Uwe Hermann
+/*  Copyright (C) 2016-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+    Gobbetti, José Rebelo, Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util;
 
 import android.app.Activity;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/WidgetPreferenceStorage.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/WidgetPreferenceStorage.java
index eb03b9656..be3a4d5b8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/WidgetPreferenceStorage.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/WidgetPreferenceStorage.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Petr Vaněk
+/*  Copyright (C) 2020-2024 Arjan Schrijver, Petr Vaněk
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/XTimePreference.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/XTimePreference.java
index 35048e95b..17d4e7bac 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/XTimePreference.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/XTimePreference.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2021 Andreas Shimokawa, Carsten Pfeiffer, José Rebelo
+/*  Copyright (C) 2019-2024 Andreas Shimokawa
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/XTimePreferenceFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/XTimePreferenceFragment.java
index 8762e830d..dfb616b05 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/XTimePreferenceFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/XTimePreferenceFragment.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019-2021 Andreas Shimokawa
+/*  Copyright (C) 2019-2024 Andreas Shimokawa, Arjan Schrijver
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util;
 
 import android.content.Context;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/ZipFile.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/ZipFile.java
index 5e2077255..4d194569b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/ZipFile.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/ZipFile.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 José Rebelo, MPeter
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util;
 
 import org.slf4j.Logger;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/ZipFileException.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/ZipFileException.java
index d2653b065..d5eaabc62 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/ZipFileException.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/ZipFileException.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 José Rebelo, MPeter
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util;
 
 public class ZipFileException extends Exception {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/calendar/CalendarEvent.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/calendar/CalendarEvent.java
index bf78fb506..03a82dd28 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/calendar/CalendarEvent.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/calendar/CalendarEvent.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2017-2020 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Daniel Hauck
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util.calendar;
 
 import java.util.Objects;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/calendar/CalendarManager.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/calendar/CalendarManager.java
index 3db11c6ed..e5f6af7ce 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/calendar/CalendarManager.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/calendar/CalendarManager.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Daniel Hauck
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util.calendar;
 
 import android.content.ContentUris;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/dialogs/MaterialDialogFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/dialogs/MaterialDialogFragment.java
index 27cfaacae..e4db48e37 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/dialogs/MaterialDialogFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/dialogs/MaterialDialogFragment.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 Arjan Schrijver
+/*  Copyright (C) 2023-2024 Arjan Schrijver
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util.dialogs;
 
 import android.app.Dialog;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/gpx/GpxParseException.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/gpx/GpxParseException.java
index 3df9a5344..cd917c3d8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/gpx/GpxParseException.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/gpx/GpxParseException.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util.gpx;
 
 public class GpxParseException extends Exception {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/gpx/GpxParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/gpx/GpxParser.java
index 8a29d2779..f4fe4aabb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/gpx/GpxParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/gpx/GpxParser.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2023 Petr Vaněk, José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util.gpx;
 
 import com.google.gson.internal.bind.util.ISO8601Utils;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/gpx/model/GpxFile.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/gpx/model/GpxFile.java
index 44682e0b0..cc94b00b0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/gpx/model/GpxFile.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/gpx/model/GpxFile.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util.gpx.model;
 
 import java.util.ArrayList;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/gpx/model/GpxTrack.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/gpx/model/GpxTrack.java
index f8e77fef4..a3bd8e2c2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/gpx/model/GpxTrack.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/gpx/model/GpxTrack.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util.gpx.model;
 
 import java.util.ArrayList;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/gpx/model/GpxTrackPoint.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/gpx/model/GpxTrackPoint.java
index 1867ffc35..0aac5b4cc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/gpx/model/GpxTrackPoint.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/gpx/model/GpxTrackPoint.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util.gpx.model;
 
 import java.util.Date;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/gpx/model/GpxTrackSegment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/gpx/model/GpxTrackSegment.java
index ad239e589..93ca5b47e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/gpx/model/GpxTrackSegment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/gpx/model/GpxTrackSegment.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util.gpx.model;
 
 import java.util.ArrayList;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/gpx/model/GpxWaypoint.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/gpx/model/GpxWaypoint.java
index df4cd9cd6..9874271b3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/gpx/model/GpxWaypoint.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/gpx/model/GpxWaypoint.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 José Rebelo
+/*  Copyright (C) 2023-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util.gpx.model;
 
 import androidx.annotation.Nullable;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/LanguageUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/LanguageUtils.java
index 52d926066..1283ee63a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/LanguageUtils.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/LanguageUtils.java
@@ -1,6 +1,5 @@
-/*  Copyright (C) 2017-2022 Andreas Shimokawa, Aniruddha Adhikary, Daniele
-    Gobbetti, ivanovlev, kalaee, lazarosfs, McSym28, M. Hadi, Roi Greenberg,
-    Taavi Eomäe, Ted Stein, Thomas, Yaron Shahrabani, José Rebelo
+/*  Copyright (C) 2022-2024 Cédric Bellegarde, Davis Mosenkovs, José Rebelo,
+    roolx, ssilverr, thirschbuechler
 
     This file is part of Gadgetbridge.
 
@@ -15,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util.language;
 
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_TRANSLITERATION_LANGUAGES;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/MultiTransliterator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/MultiTransliterator.java
index ee5a12596..537963ba5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/MultiTransliterator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/MultiTransliterator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util.language;
 
 import java.text.Normalizer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/SimpleTransliterator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/SimpleTransliterator.java
index 1b4c287bb..b18cbb71c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/SimpleTransliterator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/SimpleTransliterator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util.language;
 
 import org.apache.commons.lang3.text.WordUtils;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/Transliterator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/Transliterator.java
index 445721cd8..59676cb00 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/Transliterator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/Transliterator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util.language;
 
 public interface Transliterator {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/ArabicTransliterator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/ArabicTransliterator.java
index eafe22430..9c63a237b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/ArabicTransliterator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/ArabicTransliterator.java
@@ -1,6 +1,4 @@
-/*  Copyright (C) 2017-2022 Andreas Shimokawa, Aniruddha Adhikary, Daniele
-    Gobbetti, ivanovlev, kalaee, lazarosfs, McSym28, M. Hadi, Roi Greenberg,
-    Taavi Eomäe, Ted Stein, Thomas, Yaron Shahrabani, José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -15,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util.language.impl;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/BengaliTransliterator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/BengaliTransliterator.java
index 0db3dfa93..18667d211 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/BengaliTransliterator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/BengaliTransliterator.java
@@ -1,5 +1,4 @@
-/*  Copyright (C) 2017-2021 Aniruddha Adhikary, Carsten Pfeiffer, Daniele
-    Gobbetti, Utsob Roy
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util.language.impl;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/CommonSymbolsTransliterator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/CommonSymbolsTransliterator.java
index aa45de5ac..11057a654 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/CommonSymbolsTransliterator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/CommonSymbolsTransliterator.java
@@ -1,7 +1,4 @@
-/*  Copyright (C) 2017-2023 Andreas Shimokawa, Aniruddha Adhikary, Daniele
-    Gobbetti, ivanovlev, kalaee, lazarosfs, McSym28, M. Hadi, Roi Greenberg,
-    Taavi Eomäe, Ted Stein, Thomas, Yaron Shahrabani, José Rebelo, Davis
-    Mosenkovs
+/*  Copyright (C) 2023-2024 Daniel Dakhno, Davis Mosenkovs
 
     This file is part of Gadgetbridge.
 
@@ -16,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util.language.impl;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/CroatianTransliterator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/CroatianTransliterator.java
index bee47f62b..5038b257a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/CroatianTransliterator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/CroatianTransliterator.java
@@ -1,6 +1,4 @@
-/*  Copyright (C) 2017-2022 Andreas Shimokawa, Aniruddha Adhikary, Daniele
-    Gobbetti, ivanovlev, kalaee, lazarosfs, McSym28, M. Hadi, Roi Greenberg,
-    Taavi Eomäe, Ted Stein, Thomas, Yaron Shahrabani, José Rebelo
+/*  Copyright (C) 2023-2024 thirschbuechler
 
     This file is part of Gadgetbridge.
 
@@ -15,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
     package nodomain.freeyourgadget.gadgetbridge.util.language.impl;
 
     import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/CzechTransliterator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/CzechTransliterator.java
index e7c87c139..bdd7c14d7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/CzechTransliterator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/CzechTransliterator.java
@@ -1,6 +1,4 @@
-/*  Copyright (C) 2017-2022 Andreas Shimokawa, Aniruddha Adhikary, Daniele
-    Gobbetti, ivanovlev, kalaee, lazarosfs, McSym28, M. Hadi, Roi Greenberg,
-    Taavi Eomäe, Ted Stein, Thomas, Yaron Shahrabani, José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo, Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -15,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util.language.impl;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/EstonianTransliterator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/EstonianTransliterator.java
index de0e1020c..eb68a7856 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/EstonianTransliterator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/EstonianTransliterator.java
@@ -1,6 +1,4 @@
-/*  Copyright (C) 2017-2022 Andreas Shimokawa, Aniruddha Adhikary, Daniele
-    Gobbetti, ivanovlev, kalaee, lazarosfs, McSym28, M. Hadi, Roi Greenberg,
-    Taavi Eomäe, Ted Stein, Thomas, Yaron Shahrabani, José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -15,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util.language.impl;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/ExtendedAsciiTransliterator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/ExtendedAsciiTransliterator.java
index c6f72c463..3e125ccdd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/ExtendedAsciiTransliterator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/ExtendedAsciiTransliterator.java
@@ -1,6 +1,4 @@
-/*  Copyright (C) 2017-2022 Andreas Shimokawa, Aniruddha Adhikary, Daniele
-    Gobbetti, ivanovlev, kalaee, lazarosfs, McSym28, M. Hadi, Roi Greenberg,
-    Taavi Eomäe, Ted Stein, Thomas, Yaron Shahrabani, José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -15,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util.language.impl;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/FlattenToAsciiTransliterator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/FlattenToAsciiTransliterator.java
index 4478eda2b..edb2e9441 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/FlattenToAsciiTransliterator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/FlattenToAsciiTransliterator.java
@@ -1,6 +1,4 @@
-/*  Copyright (C) 2017-2022 Andreas Shimokawa, Aniruddha Adhikary, Daniele
-    Gobbetti, ivanovlev, kalaee, lazarosfs, McSym28, M. Hadi, Roi Greenberg,
-    Taavi Eomäe, Ted Stein, Thomas, Yaron Shahrabani, José Rebelo
+/*  Copyright (C) 2022-2024 Arjan Schrijver, José Rebelo, Petr Kadlec
 
     This file is part of Gadgetbridge.
 
@@ -15,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util.language.impl;
 
 import java.nio.charset.StandardCharsets;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/FrenchTransliterator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/FrenchTransliterator.java
index d59b30098..1960e24fa 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/FrenchTransliterator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/FrenchTransliterator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 Cédric Bellegarde, José Rebelo
+/*  Copyright (C) 2022-2024 Cédric Bellegarde
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util.language.impl;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/GeorgianTransliterator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/GeorgianTransliterator.java
index 4db3e5611..e094b9099 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/GeorgianTransliterator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/GeorgianTransliterator.java
@@ -1,6 +1,4 @@
-/*  Copyright (C) 2017-2022 Andreas Shimokawa, Aniruddha Adhikary, Daniele
-    Gobbetti, ivanovlev, kalaee, lazarosfs, McSym28, M. Hadi, Roi Greenberg,
-    Taavi Eomäe, Ted Stein, Thomas, Yaron Shahrabani, José Rebelo
+/*  Copyright (C) 2023-2024 Petr Vaněk, roolx
 
     This file is part of Gadgetbridge.
 
@@ -15,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
     package nodomain.freeyourgadget.gadgetbridge.util.language.impl;
 
     import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/GermanTransliterator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/GermanTransliterator.java
index 47fcce49e..b1083e995 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/GermanTransliterator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/GermanTransliterator.java
@@ -1,6 +1,4 @@
-/*  Copyright (C) 2017-2022 Andreas Shimokawa, Aniruddha Adhikary, Daniele
-    Gobbetti, ivanovlev, kalaee, lazarosfs, McSym28, M. Hadi, Roi Greenberg,
-    Taavi Eomäe, Ted Stein, Thomas, Yaron Shahrabani, José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -15,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util.language.impl;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/GreekTransliterator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/GreekTransliterator.java
index af76637d3..f9c2bfa33 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/GreekTransliterator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/GreekTransliterator.java
@@ -1,6 +1,4 @@
-/*  Copyright (C) 2017-2022 Andreas Shimokawa, Aniruddha Adhikary, Daniele
-    Gobbetti, ivanovlev, kalaee, lazarosfs, McSym28, M. Hadi, Roi Greenberg,
-    Taavi Eomäe, Ted Stein, Thomas, Yaron Shahrabani, José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -15,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util.language.impl;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/HebrewTransliterator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/HebrewTransliterator.java
index f0b85dfc3..984738637 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/HebrewTransliterator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/HebrewTransliterator.java
@@ -1,6 +1,4 @@
-/*  Copyright (C) 2017-2022 Andreas Shimokawa, Aniruddha Adhikary, Daniele
-    Gobbetti, ivanovlev, kalaee, lazarosfs, McSym28, M. Hadi, Roi Greenberg,
-    Taavi Eomäe, Ted Stein, Thomas, Yaron Shahrabani, José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -15,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util.language.impl;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/HungarianTransliterator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/HungarianTransliterator.java
index 6b1013fde..4749a5874 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/HungarianTransliterator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/HungarianTransliterator.java
@@ -1,6 +1,4 @@
-/*  Copyright (C) 2017-2022 Andreas Shimokawa, Aniruddha Adhikary, Daniele
-    Gobbetti, ivanovlev, kalaee, lazarosfs, McSym28, M. Hadi, Roi Greenberg,
-    Taavi Eomäe, Ted Stein, Thomas, Yaron Shahrabani, José Rebelo
+/*  Copyright (C) 2023-2024 ssilverr
 
     This file is part of Gadgetbridge.
 
@@ -15,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util.language.impl;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/IcelandicTransliterator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/IcelandicTransliterator.java
index 05d94a130..0ecf48294 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/IcelandicTransliterator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/IcelandicTransliterator.java
@@ -1,6 +1,4 @@
-/*  Copyright (C) 2017-2022 Andreas Shimokawa, Aniruddha Adhikary, Daniele
-    Gobbetti, ivanovlev, kalaee, lazarosfs, McSym28, M. Hadi, Roi Greenberg,
-    Taavi Eomäe, Ted Stein, Thomas, Yaron Shahrabani, José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -15,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util.language.impl;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/KoreanTransliterator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/KoreanTransliterator.java
index 362506f3c..c8f7e86a3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/KoreanTransliterator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/KoreanTransliterator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020-2021 Ted Stein
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -13,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util.language.impl;
 
 import java.text.Normalizer;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/LatvianTransliterator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/LatvianTransliterator.java
index 5e14df681..9b0f1f5f2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/LatvianTransliterator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/LatvianTransliterator.java
@@ -1,7 +1,4 @@
-/*  Copyright (C) 2017-2023 Andreas Shimokawa, Aniruddha Adhikary, Daniele
-    Gobbetti, ivanovlev, kalaee, lazarosfs, McSym28, M. Hadi, Roi Greenberg,
-    Taavi Eomäe, Ted Stein, Thomas, Yaron Shahrabani, José Rebelo, Davis
-    Mosenkovs
+/*  Copyright (C) 2023-2024 Davis Mosenkovs
 
     This file is part of Gadgetbridge.
 
@@ -16,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util.language.impl;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/LithuanianTransliterator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/LithuanianTransliterator.java
index 11268efff..e406a0d8e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/LithuanianTransliterator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/LithuanianTransliterator.java
@@ -1,6 +1,4 @@
-/*  Copyright (C) 2017-2022 Andreas Shimokawa, Aniruddha Adhikary, Daniele
-    Gobbetti, ivanovlev, kalaee, lazarosfs, McSym28, M. Hadi, Roi Greenberg,
-    Taavi Eomäe, Ted Stein, Thomas, Yaron Shahrabani, José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -15,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util.language.impl;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/PersianTransliterator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/PersianTransliterator.java
index 578e077ef..4fb5d4714 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/PersianTransliterator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/PersianTransliterator.java
@@ -1,6 +1,4 @@
-/*  Copyright (C) 2017-2022 Andreas Shimokawa, Aniruddha Adhikary, Daniele
-    Gobbetti, ivanovlev, kalaee, lazarosfs, McSym28, M. Hadi, Roi Greenberg,
-    Taavi Eomäe, Ted Stein, Thomas, Yaron Shahrabani, José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -15,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util.language.impl;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/PolishTransliterator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/PolishTransliterator.java
index 3af330ab3..b39ad11f2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/PolishTransliterator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/PolishTransliterator.java
@@ -1,6 +1,4 @@
-/*  Copyright (C) 2017-2022 Andreas Shimokawa, Aniruddha Adhikary, Daniele
-    Gobbetti, ivanovlev, kalaee, lazarosfs, McSym28, M. Hadi, Roi Greenberg,
-    Taavi Eomäe, Ted Stein, Thomas, Yaron Shahrabani, José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -15,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util.language.impl;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/RussianTransliterator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/RussianTransliterator.java
index e1f6b864d..4aafa7688 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/RussianTransliterator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/RussianTransliterator.java
@@ -1,6 +1,4 @@
-/*  Copyright (C) 2017-2022 Andreas Shimokawa, Aniruddha Adhikary, Daniele
-    Gobbetti, ivanovlev, kalaee, lazarosfs, McSym28, M. Hadi, Roi Greenberg,
-    Taavi Eomäe, Ted Stein, Thomas, Yaron Shahrabani, José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -15,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util.language.impl;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/ScandinavianTransliterator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/ScandinavianTransliterator.java
index e4ecfe841..a7c7f3a4e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/ScandinavianTransliterator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/ScandinavianTransliterator.java
@@ -1,6 +1,4 @@
-/*  Copyright (C) 2017-2022 Andreas Shimokawa, Aniruddha Adhikary, Daniele
-    Gobbetti, ivanovlev, kalaee, lazarosfs, McSym28, M. Hadi, Roi Greenberg,
-    Taavi Eomäe, Ted Stein, Thomas, Yaron Shahrabani, José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -15,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util.language.impl;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/TurkishTransliterator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/TurkishTransliterator.java
index 997835d99..99bda4006 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/TurkishTransliterator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/TurkishTransliterator.java
@@ -1,6 +1,4 @@
-/*  Copyright (C) 2017-2022 Andreas Shimokawa, Aniruddha Adhikary, Daniele
-    Gobbetti, ivanovlev, kalaee, lazarosfs, McSym28, M. Hadi, Roi Greenberg,
-    Taavi Eomäe, Ted Stein, Thomas, Yaron Shahrabani, José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -15,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util.language.impl;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/UkranianTransliterator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/UkranianTransliterator.java
index 3441585f0..280b2c6b1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/UkranianTransliterator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/language/impl/UkranianTransliterator.java
@@ -1,6 +1,4 @@
-/*  Copyright (C) 2017-2022 Andreas Shimokawa, Aniruddha Adhikary, Daniele
-    Gobbetti, ivanovlev, kalaee, lazarosfs, McSym28, M. Hadi, Roi Greenberg,
-    Taavi Eomäe, Ted Stein, Thomas, Yaron Shahrabani, José Rebelo
+/*  Copyright (C) 2022-2024 José Rebelo
 
     This file is part of Gadgetbridge.
 
@@ -15,7 +13,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util.language.impl;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/protobuf/ProtobufUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/protobuf/ProtobufUtils.java
index 8da030f1a..d25538e82 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/protobuf/ProtobufUtils.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/protobuf/ProtobufUtils.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 Daniel Dakhno
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util.protobuf;
 
 import java.io.ByteArrayOutputStream;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/protobuf/messagefields/BytesMessageField.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/protobuf/messagefields/BytesMessageField.java
index 5738fe14c..1dc9a223a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/protobuf/messagefields/BytesMessageField.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/protobuf/messagefields/BytesMessageField.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 Daniel Dakhno
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util.protobuf.messagefields;
 
 import java.io.ByteArrayOutputStream;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/protobuf/messagefields/Int32MessageField.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/protobuf/messagefields/Int32MessageField.java
index 349ca496d..68092b171 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/protobuf/messagefields/Int32MessageField.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/protobuf/messagefields/Int32MessageField.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 Daniel Dakhno
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util.protobuf.messagefields;
 
 public class Int32MessageField extends VarintMessageField{
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/protobuf/messagefields/Int64MessageField.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/protobuf/messagefields/Int64MessageField.java
index c5bfa3ae4..e94e96394 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/protobuf/messagefields/Int64MessageField.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/protobuf/messagefields/Int64MessageField.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 Daniel Dakhno
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util.protobuf.messagefields;
 
 public class Int64MessageField extends VarintMessageField{
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/protobuf/messagefields/MessageField.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/protobuf/messagefields/MessageField.java
index 61970a612..056c53006 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/protobuf/messagefields/MessageField.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/protobuf/messagefields/MessageField.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 Daniel Dakhno
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util.protobuf.messagefields;
 
 import java.io.ByteArrayOutputStream;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/protobuf/messagefields/NestedMessageField.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/protobuf/messagefields/NestedMessageField.java
index 53953aeb3..571a0ec75 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/protobuf/messagefields/NestedMessageField.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/protobuf/messagefields/NestedMessageField.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 Daniel Dakhno
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util.protobuf.messagefields;
 
 import java.io.ByteArrayOutputStream;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/protobuf/messagefields/RootMessageField.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/protobuf/messagefields/RootMessageField.java
index 61d3a8520..14bb6e520 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/protobuf/messagefields/RootMessageField.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/protobuf/messagefields/RootMessageField.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 Daniel Dakhno
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util.protobuf.messagefields;
 
 public class RootMessageField extends NestedMessageField{
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/protobuf/messagefields/StringMessageField.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/protobuf/messagefields/StringMessageField.java
index 9bac96d47..df59e0549 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/protobuf/messagefields/StringMessageField.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/protobuf/messagefields/StringMessageField.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 Daniel Dakhno
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util.protobuf.messagefields;
 
 import java.io.ByteArrayOutputStream;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/protobuf/messagefields/VarintMessageField.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/protobuf/messagefields/VarintMessageField.java
index 0456e5211..7bcf63f3d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/protobuf/messagefields/VarintMessageField.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/protobuf/messagefields/VarintMessageField.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2022-2024 Daniel Dakhno
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util.protobuf.messagefields;
 
 import java.io.ByteArrayOutputStream;
diff --git a/app/src/main/java/ru/gelin/android/weather/notification/ParcelableWeather2.java b/app/src/main/java/ru/gelin/android/weather/notification/ParcelableWeather2.java
index b75574ab8..b7d0963b0 100644
--- a/app/src/main/java/ru/gelin/android/weather/notification/ParcelableWeather2.java
+++ b/app/src/main/java/ru/gelin/android/weather/notification/ParcelableWeather2.java
@@ -1,5 +1,5 @@
-/*  Copyright (C) 2015-2020 Andreas Shimokawa, Carsten Pfeiffer, Daniele
-    Gobbetti, Taavi Eomäe
+/*  Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+    Gobbetti, José Rebelo, Petr Vaněk, Taavi Eomäe
 
     This file is part of Gadgetbridge.
 
@@ -14,7 +14,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package ru.gelin.android.weather.notification;
 
 import android.os.Bundle;

From 704875c3c294b6d0f0e7614b3bbba83be87bd283 Mon Sep 17 00:00:00 2001
From: "Martin.JM" <>
Date: Wed, 10 Jan 2024 18:25:13 +0000
Subject: [PATCH 322/595] Update license headers

---
 .../gadgetbridge/devices/huawei/HuaweiBRCoordinator.java        | 2 +-
 .../gadgetbridge/devices/huawei/HuaweiCoordinator.java          | 2 +-
 .../gadgetbridge/devices/huawei/HuaweiCoordinatorSupplier.java  | 2 +-
 .../gadgetbridge/devices/huawei/HuaweiCrypto.java               | 2 +-
 .../gadgetbridge/devices/huawei/HuaweiLECoordinator.java        | 2 +-
 .../gadgetbridge/devices/huawei/HuaweiPacket.java               | 2 +-
 .../gadgetbridge/devices/huawei/HuaweiSampleProvider.java       | 2 +-
 .../gadgetbridge/devices/huawei/HuaweiSettingsCustomizer.java   | 2 +-
 .../gadgetbridge/devices/huawei/HuaweiSpo2SampleProvider.java   | 2 +-
 .../freeyourgadget/gadgetbridge/devices/huawei/HuaweiTLV.java   | 2 +-
 .../devices/huawei/honorband3/HonorBand3Coordinator.java        | 2 +-
 .../devices/huawei/honorband4/HonorBand4Coordinator.java        | 2 +-
 .../devices/huawei/honorband5/HonorBand5Coordinator.java        | 2 +-
 .../devices/huawei/honorband6/HonorBand6Coordinator.java        | 2 +-
 .../devices/huawei/honorband7/HonorBand7Coordinator.java        | 2 +-
 .../huawei/huaweiband4pro/HuaweiBand4ProCoordinator.java        | 2 +-
 .../devices/huawei/huaweiband6/HuaweiBand6Coordinator.java      | 2 +-
 .../devices/huawei/huaweiband7/HuaweiBand7Coordinator.java      | 2 +-
 .../devices/huawei/huaweiband8/HuaweiBand8Coordinator.java      | 2 +-
 .../huawei/huaweibandaw70/HuaweiBandAw70Coordinator.java        | 2 +-
 .../huawei/huaweitalkbandb6/HuaweiTalkBandB6Coordinator.java    | 2 +-
 .../devices/huawei/huaweiwatchgt/HuaweiWatchGTCoordinator.java  | 2 +-
 .../huawei/huaweiwatchgt2/HuaweiWatchGT2Coordinator.java        | 2 +-
 .../huawei/huaweiwatchgt2e/HuaweiWatchGT2eCoordinator.java      | 2 +-
 .../huawei/huaweiwatchgt3/HuaweiWatchGT3Coordinator.java        | 2 +-
 .../gadgetbridge/devices/huawei/packets/Alarms.java             | 2 +-
 .../gadgetbridge/devices/huawei/packets/Calls.java              | 2 +-
 .../gadgetbridge/devices/huawei/packets/DeviceConfig.java       | 2 +-
 .../devices/huawei/packets/DisconnectNotification.java          | 2 +-
 .../gadgetbridge/devices/huawei/packets/FindPhone.java          | 2 +-
 .../gadgetbridge/devices/huawei/packets/FitnessData.java        | 2 +-
 .../gadgetbridge/devices/huawei/packets/LocaleConfig.java       | 2 +-
 .../gadgetbridge/devices/huawei/packets/MusicControl.java       | 2 +-
 .../gadgetbridge/devices/huawei/packets/Notifications.java      | 2 +-
 .../gadgetbridge/devices/huawei/packets/WorkMode.java           | 2 +-
 .../gadgetbridge/devices/huawei/packets/Workout.java            | 2 +-
 .../service/devices/huawei/AsynchronousResponse.java            | 2 +-
 .../gadgetbridge/service/devices/huawei/HuaweiBRSupport.java    | 2 +-
 .../gadgetbridge/service/devices/huawei/HuaweiLESupport.java    | 2 +-
 .../service/devices/huawei/HuaweiSupportProvider.java           | 2 +-
 .../service/devices/huawei/HuaweiWorkoutGbParser.java           | 2 +-
 .../gadgetbridge/service/devices/huawei/ResponseManager.java    | 2 +-
 .../service/devices/huawei/requests/AlarmsRequest.java          | 2 +-
 .../service/devices/huawei/requests/DebugRequest.java           | 2 +-
 .../service/devices/huawei/requests/GetAuthRequest.java         | 2 +-
 .../service/devices/huawei/requests/GetBatteryLevelRequest.java | 2 +-
 .../service/devices/huawei/requests/GetBondParamsRequest.java   | 2 +-
 .../service/devices/huawei/requests/GetBondRequest.java         | 2 +-
 .../service/devices/huawei/requests/GetDeviceStatusRequest.java | 2 +-
 .../devices/huawei/requests/GetDndLiftWristTypeRequest.java     | 2 +-
 .../service/devices/huawei/requests/GetEventAlarmList.java      | 2 +-
 .../devices/huawei/requests/GetFitnessTotalsRequest.java        | 2 +-
 .../service/devices/huawei/requests/GetHiChainRequest.java      | 2 +-
 .../service/devices/huawei/requests/GetLinkParamsRequest.java   | 2 +-
 .../service/devices/huawei/requests/GetPincodeRequest.java      | 2 +-
 .../devices/huawei/requests/GetProductInformationRequest.java   | 2 +-
 .../devices/huawei/requests/GetSecurityNegotiationRequest.java  | 2 +-
 .../devices/huawei/requests/GetSleepDataCountRequest.java       | 2 +-
 .../service/devices/huawei/requests/GetSleepDataRequest.java    | 2 +-
 .../service/devices/huawei/requests/GetSmartAlarmList.java      | 2 +-
 .../devices/huawei/requests/GetStepDataCountRequest.java        | 2 +-
 .../service/devices/huawei/requests/GetStepDataRequest.java     | 2 +-
 .../devices/huawei/requests/GetSupportedCommandsRequest.java    | 2 +-
 .../devices/huawei/requests/GetSupportedServicesRequest.java    | 2 +-
 .../service/devices/huawei/requests/GetWorkoutCountRequest.java | 2 +-
 .../service/devices/huawei/requests/GetWorkoutDataRequest.java  | 2 +-
 .../service/devices/huawei/requests/GetWorkoutPaceRequest.java  | 2 +-
 .../devices/huawei/requests/GetWorkoutTotalsRequest.java        | 2 +-
 .../gadgetbridge/service/devices/huawei/requests/Request.java   | 2 +-
 .../service/devices/huawei/requests/SendDndAddRequest.java      | 2 +-
 .../service/devices/huawei/requests/SendDndDeleteRequest.java   | 2 +-
 .../devices/huawei/requests/SendFactoryResetRequest.java        | 2 +-
 .../devices/huawei/requests/SendNotificationRequest.java        | 2 +-
 .../devices/huawei/requests/SetActivateOnLiftRequest.java       | 2 +-
 .../devices/huawei/requests/SetActivityReminderRequest.java     | 2 +-
 .../devices/huawei/requests/SetAutomaticHeartrateRequest.java   | 2 +-
 .../service/devices/huawei/requests/SetAutomaticSpoRequest.java | 2 +-
 .../service/devices/huawei/requests/SetDateFormatRequest.java   | 2 +-
 .../devices/huawei/requests/SetDisconnectNotification.java      | 2 +-
 .../devices/huawei/requests/SetLanguageSettingRequest.java      | 2 +-
 .../huawei/requests/SetMediumToStrengthThresholdRequest.java    | 2 +-
 .../service/devices/huawei/requests/SetMusicRequest.java        | 2 +-
 .../service/devices/huawei/requests/SetMusicStatusRequest.java  | 2 +-
 .../devices/huawei/requests/SetNavigateOnRotateRequest.java     | 2 +-
 .../service/devices/huawei/requests/SetNotificationRequest.java | 2 +-
 .../service/devices/huawei/requests/SetTimeRequest.java         | 2 +-
 .../service/devices/huawei/requests/SetTimeZoneIdRequest.java   | 2 +-
 .../service/devices/huawei/requests/SetTruSleepRequest.java     | 2 +-
 .../service/devices/huawei/requests/SetWearLocationRequest.java | 2 +-
 .../devices/huawei/requests/SetWearMessagePushRequest.java      | 2 +-
 .../service/devices/huawei/requests/SetWorkModeRequest.java     | 2 +-
 .../service/devices/huawei/requests/StopFindPhoneRequest.java   | 2 +-
 .../devices/huawei/requests/StopNotificationRequest.java        | 2 +-
 .../gadgetbridge/devices/huawei/TestHuaweiCrypto.java           | 2 +-
 .../gadgetbridge/devices/huawei/TestHuaweiPacket.java           | 2 +-
 .../gadgetbridge/devices/huawei/TestHuaweiTLV.java              | 2 +-
 .../freeyourgadget/gadgetbridge/devices/huawei/TestVarInt.java  | 2 +-
 .../gadgetbridge/devices/huawei/packets/TestAlarms.java         | 2 +-
 .../gadgetbridge/devices/huawei/packets/TestCalls.java          | 2 +-
 .../gadgetbridge/devices/huawei/packets/TestDeviceConfig.java   | 2 +-
 .../devices/huawei/packets/TestDisconnectNotification.java      | 2 +-
 .../gadgetbridge/devices/huawei/packets/TestFindPhone.java      | 2 +-
 .../gadgetbridge/devices/huawei/packets/TestFitnessData.java    | 2 +-
 .../gadgetbridge/devices/huawei/packets/TestLocaleConfig.java   | 2 +-
 .../gadgetbridge/devices/huawei/packets/TestMusicControl.java   | 2 +-
 .../gadgetbridge/devices/huawei/packets/TestNotifications.java  | 2 +-
 .../gadgetbridge/devices/huawei/packets/TestWorkMode.java       | 2 +-
 .../gadgetbridge/devices/huawei/packets/TestWorkout.java        | 2 +-
 .../service/devices/huawei/TestDebugRequestParser.java          | 2 +-
 .../service/devices/huawei/TestResponseManager.java             | 2 +-
 110 files changed, 110 insertions(+), 110 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiBRCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiBRCoordinator.java
index b8f786629..41c18384b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiBRCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiBRCoordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCoordinator.java
index 702e055ed..4902a4245 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCoordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCoordinatorSupplier.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCoordinatorSupplier.java
index c186faf83..9f260129d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCoordinatorSupplier.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCoordinatorSupplier.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCrypto.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCrypto.java
index 5859481ec..0be828c01 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCrypto.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCrypto.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiLECoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiLECoordinator.java
index 76add4b12..bd404efae 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiLECoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiLECoordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiPacket.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiPacket.java
index 24d76d81a..6df377190 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiPacket.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiPacket.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSampleProvider.java
index 7c17c1ee5..0653145c4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSampleProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSettingsCustomizer.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSettingsCustomizer.java
index c2f30af77..898eecf24 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSettingsCustomizer.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSettingsCustomizer.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSpo2SampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSpo2SampleProvider.java
index 824b1e7c7..d383e1fce 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSpo2SampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSpo2SampleProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiTLV.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiTLV.java
index 8d4aa354d..5cb2222df 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiTLV.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiTLV.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband3/HonorBand3Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband3/HonorBand3Coordinator.java
index c2ab21bc5..6b415d8a5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband3/HonorBand3Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband3/HonorBand3Coordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband4/HonorBand4Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband4/HonorBand4Coordinator.java
index 8d4517df6..8af057e86 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband4/HonorBand4Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband4/HonorBand4Coordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband5/HonorBand5Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband5/HonorBand5Coordinator.java
index b983875cd..1e55cedec 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband5/HonorBand5Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband5/HonorBand5Coordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband6/HonorBand6Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband6/HonorBand6Coordinator.java
index 3e32963cf..f0311e7d2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband6/HonorBand6Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband6/HonorBand6Coordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband7/HonorBand7Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband7/HonorBand7Coordinator.java
index dc14d947a..e18ada38e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband7/HonorBand7Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband7/HonorBand7Coordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband4pro/HuaweiBand4ProCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband4pro/HuaweiBand4ProCoordinator.java
index d09a506d9..12920b098 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband4pro/HuaweiBand4ProCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband4pro/HuaweiBand4ProCoordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband6/HuaweiBand6Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband6/HuaweiBand6Coordinator.java
index efc37af6b..f787350ff 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband6/HuaweiBand6Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband6/HuaweiBand6Coordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband7/HuaweiBand7Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband7/HuaweiBand7Coordinator.java
index 270e2b3fa..3a051679b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband7/HuaweiBand7Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband7/HuaweiBand7Coordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband8/HuaweiBand8Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband8/HuaweiBand8Coordinator.java
index 9464b92aa..3009e3208 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband8/HuaweiBand8Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband8/HuaweiBand8Coordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweibandaw70/HuaweiBandAw70Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweibandaw70/HuaweiBandAw70Coordinator.java
index 8ffe335a2..2b9a713eb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweibandaw70/HuaweiBandAw70Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweibandaw70/HuaweiBandAw70Coordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweitalkbandb6/HuaweiTalkBandB6Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweitalkbandb6/HuaweiTalkBandB6Coordinator.java
index fac70d314..9c6f7502f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweitalkbandb6/HuaweiTalkBandB6Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweitalkbandb6/HuaweiTalkBandB6Coordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt/HuaweiWatchGTCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt/HuaweiWatchGTCoordinator.java
index fb2aec26b..810c3890d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt/HuaweiWatchGTCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt/HuaweiWatchGTCoordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt2/HuaweiWatchGT2Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt2/HuaweiWatchGT2Coordinator.java
index dcbe595e4..6192b36bb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt2/HuaweiWatchGT2Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt2/HuaweiWatchGT2Coordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt2e/HuaweiWatchGT2eCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt2e/HuaweiWatchGT2eCoordinator.java
index 1dec4c737..268c587ed 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt2e/HuaweiWatchGT2eCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt2e/HuaweiWatchGT2eCoordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt3/HuaweiWatchGT3Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt3/HuaweiWatchGT3Coordinator.java
index 455d1a146..fff751882 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt3/HuaweiWatchGT3Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt3/HuaweiWatchGT3Coordinator.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Alarms.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Alarms.java
index 94995b049..b77fabe37 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Alarms.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Alarms.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Calls.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Calls.java
index 2a0e37117..c0e5f9c90 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Calls.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Calls.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DeviceConfig.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DeviceConfig.java
index 5b4cdfaca..fb88dda3e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DeviceConfig.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DeviceConfig.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon, José Rebelo
+/*  Copyright (C) 2024 Damien Gaignon, José Rebelo, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DisconnectNotification.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DisconnectNotification.java
index 0f6d9f6ba..847814b70 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DisconnectNotification.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DisconnectNotification.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/FindPhone.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/FindPhone.java
index ce510fa23..1f20b943a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/FindPhone.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/FindPhone.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/FitnessData.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/FitnessData.java
index 0d64c8065..bee7ea8b4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/FitnessData.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/FitnessData.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/LocaleConfig.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/LocaleConfig.java
index 7a1e255ba..d729fe48a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/LocaleConfig.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/LocaleConfig.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/MusicControl.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/MusicControl.java
index 358e52d7c..06d4e753b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/MusicControl.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/MusicControl.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Notifications.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Notifications.java
index b44a10a20..9974a3b7d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Notifications.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Notifications.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/WorkMode.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/WorkMode.java
index c46c37550..10d93e062 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/WorkMode.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/WorkMode.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Workout.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Workout.java
index 3be3928cb..107657b39 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Workout.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Workout.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/AsynchronousResponse.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/AsynchronousResponse.java
index 252d61c45..93723f3a6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/AsynchronousResponse.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/AsynchronousResponse.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiBRSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiBRSupport.java
index d8239225a..2a40a9f00 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiBRSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiBRSupport.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiLESupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiLESupport.java
index 0d5c47696..f2b920b8f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiLESupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiLESupport.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiSupportProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiSupportProvider.java
index 2efa7ec79..73b8c071b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiSupportProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiSupportProvider.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiWorkoutGbParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiWorkoutGbParser.java
index 0569bd826..262c89247 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiWorkoutGbParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiWorkoutGbParser.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/ResponseManager.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/ResponseManager.java
index 70cf21e25..18f03c29b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/ResponseManager.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/ResponseManager.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/AlarmsRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/AlarmsRequest.java
index c1088622c..3bd0e8db6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/AlarmsRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/AlarmsRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/DebugRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/DebugRequest.java
index 0efc39eed..df3d58d30 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/DebugRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/DebugRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetAuthRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetAuthRequest.java
index c1974ae83..091e2ee72 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetAuthRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetAuthRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetBatteryLevelRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetBatteryLevelRequest.java
index 6e01d0a6b..8b988e07f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetBatteryLevelRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetBatteryLevelRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetBondParamsRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetBondParamsRequest.java
index 5fe46e2ec..e4b5ba211 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetBondParamsRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetBondParamsRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetBondRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetBondRequest.java
index b20ea24e6..65bc0d30b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetBondRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetBondRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetDeviceStatusRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetDeviceStatusRequest.java
index b1f0841ab..d5f9cc41c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetDeviceStatusRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetDeviceStatusRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetDndLiftWristTypeRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetDndLiftWristTypeRequest.java
index f066a8867..1d6196bf1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetDndLiftWristTypeRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetDndLiftWristTypeRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetEventAlarmList.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetEventAlarmList.java
index 24218e0a6..33aa9d004 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetEventAlarmList.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetEventAlarmList.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetFitnessTotalsRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetFitnessTotalsRequest.java
index 58a314313..18fa0f33c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetFitnessTotalsRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetFitnessTotalsRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetHiChainRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetHiChainRequest.java
index 9eeaa3c09..fab47b303 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetHiChainRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetHiChainRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetLinkParamsRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetLinkParamsRequest.java
index 2cc88273b..9c7ff95ba 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetLinkParamsRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetLinkParamsRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetPincodeRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetPincodeRequest.java
index 291c0cc4a..11a3c6deb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetPincodeRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetPincodeRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetProductInformationRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetProductInformationRequest.java
index 196bf1cca..a6e5d5249 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetProductInformationRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetProductInformationRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSecurityNegotiationRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSecurityNegotiationRequest.java
index c1b49a045..f4bf41b00 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSecurityNegotiationRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSecurityNegotiationRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSleepDataCountRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSleepDataCountRequest.java
index 63b290d0e..53a339f9c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSleepDataCountRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSleepDataCountRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSleepDataRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSleepDataRequest.java
index 3b5055f91..345b142ca 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSleepDataRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSleepDataRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSmartAlarmList.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSmartAlarmList.java
index 6686ec6c0..f30f23fd2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSmartAlarmList.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSmartAlarmList.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetStepDataCountRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetStepDataCountRequest.java
index afbfc007e..3b6b9014a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetStepDataCountRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetStepDataCountRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetStepDataRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetStepDataRequest.java
index 24899acab..3f59b3c54 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetStepDataRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetStepDataRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSupportedCommandsRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSupportedCommandsRequest.java
index aaf6efcf0..93061bb9d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSupportedCommandsRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSupportedCommandsRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSupportedServicesRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSupportedServicesRequest.java
index 62fc13be5..f7c967711 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSupportedServicesRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSupportedServicesRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWorkoutCountRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWorkoutCountRequest.java
index cf8894e4d..994b8a299 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWorkoutCountRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWorkoutCountRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWorkoutDataRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWorkoutDataRequest.java
index 71622422e..1160285b9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWorkoutDataRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWorkoutDataRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWorkoutPaceRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWorkoutPaceRequest.java
index 94e2df586..c99dc914d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWorkoutPaceRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWorkoutPaceRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWorkoutTotalsRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWorkoutTotalsRequest.java
index cbe470515..42e14801d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWorkoutTotalsRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetWorkoutTotalsRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/Request.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/Request.java
index 61dcaec4a..193cb4edc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/Request.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/Request.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendDndAddRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendDndAddRequest.java
index 9c61329c4..65102fdf5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendDndAddRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendDndAddRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendDndDeleteRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendDndDeleteRequest.java
index 7ee6276b3..29d3837e3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendDndDeleteRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendDndDeleteRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendFactoryResetRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendFactoryResetRequest.java
index ab6726692..7ff97b8c2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendFactoryResetRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendFactoryResetRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendNotificationRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendNotificationRequest.java
index c2b231174..3b62a3ee8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendNotificationRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SendNotificationRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetActivateOnLiftRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetActivateOnLiftRequest.java
index 44aa3f29b..ebf3c4361 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetActivateOnLiftRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetActivateOnLiftRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetActivityReminderRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetActivityReminderRequest.java
index 1836eb7b0..fef823373 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetActivityReminderRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetActivityReminderRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetAutomaticHeartrateRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetAutomaticHeartrateRequest.java
index 2a5900ac0..39f6fd3d5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetAutomaticHeartrateRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetAutomaticHeartrateRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetAutomaticSpoRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetAutomaticSpoRequest.java
index 8cc391ac0..1bea25d77 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetAutomaticSpoRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetAutomaticSpoRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetDateFormatRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetDateFormatRequest.java
index 6d9edf7a5..24e015825 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetDateFormatRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetDateFormatRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetDisconnectNotification.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetDisconnectNotification.java
index 464f730b9..198fd72c8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetDisconnectNotification.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetDisconnectNotification.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetLanguageSettingRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetLanguageSettingRequest.java
index 4bda40cb3..7f1c1b3fb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetLanguageSettingRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetLanguageSettingRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetMediumToStrengthThresholdRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetMediumToStrengthThresholdRequest.java
index 75b6578c4..f8c2028a7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetMediumToStrengthThresholdRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetMediumToStrengthThresholdRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetMusicRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetMusicRequest.java
index 2a1a08343..30a7ceb80 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetMusicRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetMusicRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetMusicStatusRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetMusicStatusRequest.java
index a2ce11ff6..523505810 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetMusicStatusRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetMusicStatusRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetNavigateOnRotateRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetNavigateOnRotateRequest.java
index 59ceabb0f..0199db22b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetNavigateOnRotateRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetNavigateOnRotateRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetNotificationRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetNotificationRequest.java
index 2389d16a9..126bd0292 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetNotificationRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetNotificationRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetTimeRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetTimeRequest.java
index 87bfa6006..5b1b721af 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetTimeRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetTimeRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetTimeZoneIdRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetTimeZoneIdRequest.java
index 5c8649035..d7f3fe49f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetTimeZoneIdRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetTimeZoneIdRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetTruSleepRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetTruSleepRequest.java
index b64ab7bea..2cb5ad92b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetTruSleepRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetTruSleepRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetWearLocationRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetWearLocationRequest.java
index 630a3adab..7c689cfa0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetWearLocationRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetWearLocationRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetWearMessagePushRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetWearMessagePushRequest.java
index 82d234eb6..7d28a665e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetWearMessagePushRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetWearMessagePushRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetWorkModeRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetWorkModeRequest.java
index 737aa6e5c..86280c8b8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetWorkModeRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/SetWorkModeRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/StopFindPhoneRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/StopFindPhoneRequest.java
index b93f2b888..3aee8cf0a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/StopFindPhoneRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/StopFindPhoneRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/StopNotificationRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/StopNotificationRequest.java
index 42d2caa1c..27b9da76e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/StopNotificationRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/StopNotificationRequest.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2024 Damien Gaignon
+/*  Copyright (C) 2024 Damien Gaignon, Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/TestHuaweiCrypto.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/TestHuaweiCrypto.java
index ccb60eae6..622ed932a 100644
--- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/TestHuaweiCrypto.java
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/TestHuaweiCrypto.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 MartinJM
+/*  Copyright (C) 2022 Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/TestHuaweiPacket.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/TestHuaweiPacket.java
index 6fa7efce0..ee19ca808 100644
--- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/TestHuaweiPacket.java
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/TestHuaweiPacket.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 MartinJM
+/*  Copyright (C) 2023 Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/TestHuaweiTLV.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/TestHuaweiTLV.java
index ed0004071..83c6dfda1 100644
--- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/TestHuaweiTLV.java
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/TestHuaweiTLV.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 MartinJM
+/*  Copyright (C) 2022 Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/TestVarInt.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/TestVarInt.java
index 3bc298644..fde67f548 100644
--- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/TestVarInt.java
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/TestVarInt.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 MartinJM
+/*  Copyright (C) 2022 Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestAlarms.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestAlarms.java
index c3cf58107..3f1c5cfbc 100644
--- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestAlarms.java
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestAlarms.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2022-2023 Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestCalls.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestCalls.java
index c3cb3fd0b..366a19d05 100644
--- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestCalls.java
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestCalls.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 MartinJM
+/*  Copyright (C) 2022 Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestDeviceConfig.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestDeviceConfig.java
index 028aac98f..5ade9f698 100644
--- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestDeviceConfig.java
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestDeviceConfig.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 Gaignon Damien
+/*  Copyright (C) 2022 Gaignon Damien, Martin.JM
     Copyright (C) 2022-2023 MartinJM
 
     This file is part of Gadgetbridge.
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestDisconnectNotification.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestDisconnectNotification.java
index a9b30969a..dc28bd370 100644
--- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestDisconnectNotification.java
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestDisconnectNotification.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 MartinJM
+/*  Copyright (C) 2022 Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestFindPhone.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestFindPhone.java
index 3aa91ddbe..495c06fe0 100644
--- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestFindPhone.java
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestFindPhone.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 MartinJM
+/*  Copyright (C) 2022 Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestFitnessData.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestFitnessData.java
index 6b4fb760e..04774cde0 100644
--- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestFitnessData.java
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestFitnessData.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 MartinJM
+/*  Copyright (C) 2022 Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestLocaleConfig.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestLocaleConfig.java
index c628c3fe4..168e355f1 100644
--- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestLocaleConfig.java
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestLocaleConfig.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 MartinJM
+/*  Copyright (C) 2022 Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestMusicControl.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestMusicControl.java
index 7704bc4d7..a5eb5dad8 100644
--- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestMusicControl.java
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestMusicControl.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2022-2023 Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestNotifications.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestNotifications.java
index 31b899371..9911b3552 100644
--- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestNotifications.java
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestNotifications.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2022-2023 Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestWorkMode.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestWorkMode.java
index a2c4eabad..b6773f92d 100644
--- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestWorkMode.java
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestWorkMode.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 MartinJM
+/*  Copyright (C) 2022 Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestWorkout.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestWorkout.java
index a81671ce7..714d4b67f 100644
--- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestWorkout.java
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestWorkout.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022 MartinJM
+/*  Copyright (C) 2022 Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/TestDebugRequestParser.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/TestDebugRequestParser.java
index b93a546b7..1b20d1f89 100644
--- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/TestDebugRequestParser.java
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/TestDebugRequestParser.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2023 MartinJM
+/*  Copyright (C) 2023 Martin.JM
 
     This file is part of Gadgetbridge.
 
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/TestResponseManager.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/TestResponseManager.java
index f5d3982de..f400dc8e6 100644
--- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/TestResponseManager.java
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/TestResponseManager.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2022-2023 MartinJM
+/*  Copyright (C) 2022-2023 Martin.JM
 
     This file is part of Gadgetbridge.
 

From 823bd829ce566ddf9b7bab50b77ded6ea072b9dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Wed, 10 Jan 2024 19:47:25 +0000
Subject: [PATCH 323/595] Zepp OS: Add some missing control center items

---
 .../devices/huami/Huami2021MenuType.java      | 34 +++++++++++--------
 app/src/main/res/values/arrays.xml            |  2 ++
 app/src/main/res/values/strings.xml           |  1 +
 3 files changed, 23 insertions(+), 14 deletions(-)

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/Huami2021MenuType.java
index f4649a9d1..00a61727d 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/Huami2021MenuType.java
@@ -31,20 +31,19 @@ public class Huami2021MenuType {
         put("00000003", "workout");
         put("00000004", "weather");
         put("00000009", "alarm");
-        put("00000010", "cards");
         put("0000000A", "takephoto");
         put("0000000B", "music");
         put("0000000C", "stopwatch");
         put("0000000D", "countdown");
         put("0000000E", "findphone");
         put("0000000F", "mutephone");
+        put("00000010", "cards");
         put("00000011", "alipay");
         put("00000013", "settings");
         put("00000014", "workout_history");
         put("00000015", "eventreminder");
         put("00000016", "compass");
         put("00000019", "pai");
-        put("00000031", "wechat_pay");
         put("0000001A", "worldclock");
         put("0000001C", "stress");
         put("0000001D", "female_health");
@@ -54,21 +53,22 @@ public class Huami2021MenuType {
         put("00000024", "spo2");
         put("00000025", "phone");
         put("00000026", "events");
+        put("00000031", "wechat_pay");
         put("00000033", "breathing");
         put("00000038", "pomodoro");
         put("00000039", "alexa2");
         put("0000003B", "thermometer");
         put("0000003E", "todo");
         put("0000003F", "mi_ai");
-        put("00000046", "zepp_coach");
-        put("00000049", "body_composition");
-        put("0000004A", "readiness");
-        put("0000004C", "zepp_pay");
         put("00000041", "barometer");
         put("00000042", "voice_memos");
         put("00000044", "sun_moon");
         put("00000045", "one_tap_measuring");
+        put("00000046", "zepp_coach");
         put("00000047", "membership_cards");
+        put("00000049", "body_composition");
+        put("0000004A", "readiness");
+        put("0000004C", "zepp_pay");
         put("00000100", "alexa");
         put("00000101", "offline_voice");
         put("00000102", "flashlight");
@@ -112,20 +112,26 @@ public class Huami2021MenuType {
     }};
 
     public static final Map<String, String> controlCenterNameLookup = new HashMap<String, String>() {{
-        put("00000007", "battery");
+        put("00000000", "flashlight");
+        put("00000001", "brightness");
+        put("00000002", "lockscreen");
         put("00000003", "dnd");
         put("00000004", "sleep");
-        put("00000008", "theater_mode");
-        put("0000000D", "calendar");
+        put("00000005", "findphone");
         put("00000006", "volume");
+        put("00000007", "battery");
+        put("00000008", "theater_mode");
         put("00000009", "screen_always_lit");
-        put("00000001", "brightness");
-        put("00000013", "settings");
-        put("00000000", "flashlight");
         put("0000000A", "bluetooth");
         put("0000000B", "wifi");
-        put("00000002", "lockscreen");
-        put("00000005", "findphone");
+        put("0000000D", "calendar");
+        put("00000012", "alarm");
+        put("00000013", "settings");
+        put("00000014", "buzzer_intensity");
+        put("00000015", "barometer");
+        put("00000016", "compass");
+        put("00000017", "countdown");
+        put("00000018", "stopwatch");
         put("00000019", "eject_water");
         put("0000001A", "headphone");
     }};
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index ccc4113ea..d405422f9 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -1032,6 +1032,7 @@
         <item>@string/menuitem_findphone</item>
         <item>@string/menuitem_eject_water</item>
         <item>@string/menuitem_headphone</item>
+        <item>@string/menuitem_buzzer_intensity</item>
     </string-array>
 
     <string-array name="pref_huami2021_control_center_values">
@@ -1051,6 +1052,7 @@
         <item>findphone</item>
         <item>eject_water</item>
         <item>headphone</item>
+        <item>buzzer_intensity</item>
     </string-array>
 
     <string-array name="pref_miband5_workout_activity_types">
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index df1cafc7a..9d59456ae 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1543,6 +1543,7 @@
     <string name='menuitem_lockscreen'>Lockscreen</string>
     <string name='menuitem_eject_water'>Eject Water</string>
     <string name='menuitem_headphone'>Headphone</string>
+    <string name='menuitem_buzzer_intensity'>Buzzer Intensity</string>
     <string name="menuitem_unknown_app">Unknown (%s)</string>
     <string name="menuitem_unsupported">[UNSUPPORTED] %s</string>
     <string name="zepp_os_watchface_red_fantasy">Red Fantasy</string>

From 8d7a6be7ebf4df908e1f47ae40e1568e2ce809aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Wed, 10 Jan 2024 22:39:04 +0000
Subject: [PATCH 324/595] Xiaomi: Enable activity fetching for all devices

---
 .../gadgetbridge/devices/xiaomi/XiaomiCoordinator.java   | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
index 20e81c1ce..8b9232eef 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
@@ -224,20 +224,17 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
 
     @Override
     public boolean supportsActivityDataFetching() {
-        // TODO It does, but not yet fully working - only in Mi Band 8
-        return GBApplication.isDebug() || GBApplication.isNightly();
+        return true;
     }
 
     @Override
     public boolean supportsActivityTracking() {
-        // TODO It does, but not yet fully working - only in Mi Band 8
-        return GBApplication.isDebug() || GBApplication.isNightly();
+        return true;
     }
 
     @Override
     public boolean supportsActivityTracks() {
-        // TODO It does, but not yet fully working - only in Mi Band 8
-        return GBApplication.isDebug() || GBApplication.isNightly();
+        return true;
     }
 
     @Override

From 7642dc97cc6565f1e2861cc0f86c0d1c918eadec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Wed, 10 Jan 2024 22:53:59 +0000
Subject: [PATCH 325/595] Update changelog

---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 617ef4adc..ca88db951 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,7 +19,6 @@
 * Initial support for Nothing Ear (2)
 * Initial support for Nothing Ear (Stick)
 * Experimental support for Honor Band 7
-* Experimental support for Huawei Band 8
 * Experimental support for Redmi Watch 2 Lite
 * Experimental support for Redmi Smart Band Pro
 * Fossil/Skagen Hybrids: Update navigationApp to 1.1

From 984b22d55f12aa5dd101a5e0a121bea1e27680f7 Mon Sep 17 00:00:00 2001
From: Mozart Michael <michael.mozart@protonmail.com>
Date: Mon, 20 Nov 2023 12:05:20 +0000
Subject: [PATCH 326/595] Translated using Weblate (Romanian)

Currently translated at 6.9% (161 of 2323 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ro/
---
 app/src/main/res/values-ro/strings.xml | 99 ++++++++++++++++++++------
 1 file changed, 79 insertions(+), 20 deletions(-)

diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index b3fbb785a..83cddaf4e 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -2,20 +2,20 @@
 <resources>
     <string name="application_name_generic">Gadgetbridge</string>
     <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
-    <string name="action_settings">Setari</string>
-    <string name="action_debug">Depaneaza</string>
-    <string name="action_quit">Iesire</string>
-    <string name="action_donate">Doneaza</string>
-    <string name="controlcenter_fetch_activity_data">Sincronizeaza</string>
-    <string name="controlcenter_find_device">Găsește brățara</string>
-    <string name="controlcenter_connect">Conecteaza</string>
-    <string name="controlcenter_disconnect">Deconecteaza</string>
-    <string name="controlcenter_delete_device">Sterge bratara</string>
-    <string name="controlcenter_delete_device_name">Sterge %1$s</string>
-    <string name="controlcenter_delete_device_dialogmessage">Va fi stearsa bratara si datele asociate!</string>
-    <string name="controlcenter_navigation_drawer_open">Deschide meniul de navigatie</string>
-    <string name="controlcenter_navigation_drawer_close">Inchide meniul de navigatie</string>
-    <string name="controlcenter_snackbar_need_longpress">Apasati lung pentru a deconecta</string>
+    <string name="action_settings">Setări</string>
+    <string name="action_debug">Depanează</string>
+    <string name="action_quit">Ieșire</string>
+    <string name="action_donate">Donează</string>
+    <string name="controlcenter_fetch_activity_data">Sincronizează</string>
+    <string name="controlcenter_find_device">Găsește dispozitivul pierdut</string>
+    <string name="controlcenter_connect">Se conectează…</string>
+    <string name="controlcenter_disconnect">Deconectează</string>
+    <string name="controlcenter_delete_device">Șterge dispozitiv</string>
+    <string name="controlcenter_delete_device_name">Șterge %1$s</string>
+    <string name="controlcenter_delete_device_dialogmessage">Această opțiune va șterge dispozitivul și toate datele asociate cu acesta!</string>
+    <string name="controlcenter_navigation_drawer_open">Deschide meniul de navigație</string>
+    <string name="controlcenter_navigation_drawer_close">Închide meniul de navigație</string>
+    <string name="controlcenter_snackbar_need_longpress">Apăsați lung pe card pentru a deconecta</string>
     <string name="title_activity_appmanager">Manager aplicatii</string>
     <string name="appmananger_app_reinstall">Reinstaleaza</string>
     <string name="appmanager_health_activate">Activeaza</string>
@@ -56,10 +56,10 @@
     <string name="pref_call_privacy_mode_number">Afiseaza numele, ascunde numarul</string>
     <string name="pref_call_privacy_mode_complete">Ascunde numele si numarul</string>
     <string name="pref_title_weather">Meteo</string>
-    <string name="controlcenter_take_screenshot">Captura ecran</string>
-    <string name="controlcenter_snackbar_disconnecting">Se deconecteaza</string>
-    <string name="controlcenter_snackbar_connecting">Conectare…</string>
-    <string name="controlcenter_snackbar_requested_screenshot">Capturez ecranul dispozitivului</string>
+    <string name="controlcenter_take_screenshot">Captură ecran</string>
+    <string name="controlcenter_snackbar_disconnecting">Se deconectează</string>
+    <string name="controlcenter_snackbar_connecting">Se conectează…</string>
+    <string name="controlcenter_snackbar_requested_screenshot">Fă o captură de ecran</string>
     <string name="title_activity_debug">Depanare</string>
     <string name="appmanager_installed_watchapps">Aplicatii instalate</string>
     <string name="appmanager_installed_watchfaces">Fete de ceas instalate</string>
@@ -107,8 +107,8 @@
     <string name="menuitem_compass">Compas</string>
     <string name="menuitem_settings">Setari</string>
     <string name="menuitem_alipay">Alipay</string>
-    <string name="controlcenter_change_led_color">Modificare Culoare LED</string>
-    <string name="controlcenter_change_fm_frequency">Modificare Frecvență FM</string>
+    <string name="controlcenter_change_led_color">Modifică culoarea LED-ului</string>
+    <string name="controlcenter_change_fm_frequency">Modifică frecvența FM</string>
     <string name="controlcenter_calibrate_device">Calibrare Dispozitiv</string>
     <string name="pref_title_audio_player">Aplicație Redare Audio Preferată</string>
     <string name="pref_title_minimize_priority">Ascunde notificarea Gadgetbridge</string>
@@ -134,4 +134,63 @@
     <string name="sonyswr12_settings_stamina_summary">Modul de economisire a energiei dezactivează măsurarea automată periodică a ritmului cardiac, crescând astfel timpul de lucru</string>
     <string name="sonyswr12_settings_alarm_interval_summary">Intervalul de alarmă inteligentă este intervalul înainte de alarma instalată. În acest interval, dispozitivul încearcă să detecteze cea mai ușoară fază de somn pentru a trezi utilizatorul</string>
     <string name="sonyswr12_settings_low_vibration">Vibrație scăzută activată</string>
+    <string name="prefs_activity_in_device_card_distance_title_summary">Distanța este calculată din numărul de pași și valoarea lungimii pașilor (reglabile în Setări - Despre tine)</string>
+    <string name="application_name_main_nopebble">Gadgetbridge (Nightly, fără funizor Pebble)</string>
+    <string name="controlcenter_power_off">Oprire</string>
+    <string name="accuracy">Acuratețe</string>
+    <string name="title_activity_controlcenter_main_nightly">Gadgetbridge Nightly</string>
+    <string name="dual_band">Două brățări</string>
+    <string name="about_activity_title_banglejs_main">Despre Bangle.js Gadgetbridge</string>
+    <string name="calendar_three_months">3 luni</string>
+    <string name="title_activity_controlcenter_main_nopebble">Gadgetbridge Nightly fără Pebble</string>
+    <string name="title_activity_controlcenter_banglejs_main">Bangle.js Gadgetbridge</string>
+    <string name="balanced">Echilibrat</string>
+    <string name="prefs_activity_in_device_card_sleep_title">Somn</string>
+    <string name="controlcenter_set_alias">Setează poreclă</string>
+    <string name="all_satellites">Toți sateliții</string>
+    <string name="accuracy_first">Acuratețea are prioritate</string>
+    <string name="about_activity_title_main_nopebble">Despre Gadgetbridge Nightly fără Pebble</string>
+    <string name="calendar_week">Săptămână</string>
+    <string name="gps">GPS</string>
+    <string name="calendar_six_months">6 luni</string>
+    <string name="controlcenter_power_off_confirm_description">Ești sigur că dorești să oprești acest dispozitiv ?</string>
+    <string name="calendar_day">Zi</string>
+    <string name="device_card_activity_card_title">Informații despre activitate pe cardul dispozitivului</string>
+    <string name="about_activity_title_main_nightly">Despre Gadgetbridge Nightly</string>
+    <string name="single_band">O singură brățară</string>
+    <string name="gadgetbridge_running_main_nopebble">Nightly NoPebble GB running</string>
+    <string name="calendar_two_weeks">Două săptămâni</string>
+    <string name="about_activity_title_banglejs_nightly">Despre Bangle.js Gadgetbridge (Nightly)</string>
+    <string name="calendar_year">An</string>
+    <string name="power_saving">Economisirea energiei</string>
+    <string name="find_lost_device_message">Caută %1$s?</string>
+    <string name="gadgetbridge_running_banglejs_nightly">Nightly Bangle.js rulează</string>
+    <string name="controlcenter_get_heartrate_measurement">Obține valorile ritmului cardiac</string>
+    <string name="gadgetbridge_running_banglejs_main">Bangle.js rulează</string>
+    <string name="prefs_activity_in_device_card_steps_title_summary">Arată numărul total de pași</string>
+    <string name="title_activity_controlcenter_banglejs_nightly">Bangle.js Gadgetbridge (Nightly)</string>
+    <string name="prefs_activity_in_device_card_sleep_title_summary">Arată durata somnului</string>
+    <string name="battery_level">Nivelul bateriei</string>
+    <string name="application_name_banglejs_main">Bangle.js Gadgetbridge</string>
+    <string name="calendar_month">Lună</string>
+    <string name="prefs_activity_in_device_card_title">Arată informații despre activitate pe cardul dispozitivului</string>
+    <string name="battery_detail_activity_title">Informații despre baterie</string>
+    <string name="debugactivity_confirm_remove_device_preferences_title">Elimini preferințele dispozitivului?</string>
+    <string name="device_card_activity_card_title_summary">Alege ce detalii vor fii afișate pe cardul dispozitivului</string>
+    <string name="about_description_generic">Înlocuitor sub o licență copyleft pentru aplicațiile cu sursă închisă Android, de administrare a unor dispozitive portabile.</string>
+    <string name="gps_gnolass">GPS + GNOLASS</string>
+    <string name="gadgetbridge_running_main_nightly">Nightly GB este pornit</string>
+    <string name="action_changelog">Jurnal de modificări</string>
+    <string name="about_activity_title_generic">Despre Gadgetbridge</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge este pornit</string>
+    <string name="controlcenter_power_off_confirm_title">Oprire</string>
+    <string name="gps_bds">GPS + BDS</string>
+    <string name="low_power_gps">GPS cu consum mic</string>
+    <string name="custom">Personalizat</string>
+    <string name="speed_first">Viteza are prioritate</string>
+    <string name="prefs_activity_in_device_card_title_summary">Afișează numărul de pași, distanța sau somnul pe cardul dispozitivului</string>
+    <string name="application_name_banglejs_nightly">Bangle.js Gadgetbridge (Nightly)</string>
+    <string name="application_name_main_nightly">Gadgetbridge (Nightly)</string>
+    <string name="gps_galileo">GPS + GALILEO</string>
+    <string name="debugactivity_really_factoryreset_title">Chiar dorești o restaurare a setărilor din fabrică?</string>
 </resources>
\ No newline at end of file

From 79e419f12b4a034edc062f7782302e7304ca5840 Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Thu, 23 Nov 2023 21:40:45 +0000
Subject: [PATCH 327/595] Translated using Weblate (Spanish)

Currently translated at 100.0% (2327 of 2327 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/es/
---
 app/src/main/res/values-es/strings.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index ae666d130..b697160f2 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -2535,4 +2535,8 @@
     <string name="devicetype_amazfit_active_edge">Amazfit Active Edge</string>
     <string name="charts_legend_spo2_average">Promedio de oxígeno en sangre</string>
     <string name="devicetype_amazfit_active">Amazfit Active</string>
+    <string name="pref_summary_prefix_notification_with_app">Anteponer al título de la notificación el nombre de la aplicación de origen</string>
+    <string name="pref_summary_osmand_packagename">Permite seleccionar la versión de OsmAnd a la que conectarse</string>
+    <string name="pref_title_prefix_notification_with_app">Nombre de la aplicación en la notificación</string>
+    <string name="pref_title_osmand_packagename">Nombre del paquete OsmAnd</string>
 </resources>
\ No newline at end of file

From 7fe9ffa914bbfe4e1b9c86e90f5209470dbb8073 Mon Sep 17 00:00:00 2001
From: Manuel-Senpai <senpai99@hotmail.com>
Date: Thu, 23 Nov 2023 22:34:01 +0000
Subject: [PATCH 328/595] Translated using Weblate (Spanish)

Currently translated at 100.0% (2331 of 2331 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/es/
---
 app/src/main/res/values-es/strings.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index b697160f2..7caa1f89b 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -2539,4 +2539,8 @@
     <string name="pref_summary_osmand_packagename">Permite seleccionar la versión de OsmAnd a la que conectarse</string>
     <string name="pref_title_prefix_notification_with_app">Nombre de la aplicación en la notificación</string>
     <string name="pref_title_osmand_packagename">Nombre del paquete OsmAnd</string>
+    <string name="pref_title_navigation_apps">Aplicaciones de navegación</string>
+    <string name="pref_title_navigation_prefs">Preferencias de navegación</string>
+    <string name="pref_navigation_app_gmaps">Google Maps</string>
+    <string name="pref_navigation_app_osmand">OsmAnd(+)</string>
 </resources>
\ No newline at end of file

From f5b22824c8575eb6fda69095723f47ebf41477c2 Mon Sep 17 00:00:00 2001
From: glemco <glemco@posteo.net>
Date: Sat, 25 Nov 2023 14:31:00 +0000
Subject: [PATCH 329/595] Translated using Weblate (Italian)

Currently translated at 96.4% (2249 of 2331 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/it/
---
 app/src/main/res/values-it/strings.xml | 46 ++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 0bbc73d5e..d762c02c9 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -2405,4 +2405,50 @@
     <string name="common_symbols">Simboli Comuni</string>
     <string name="purple">Viola</string>
     <string name="blue">Blu</string>
+    <string name="prefs_wena3_menu_icon_hint">L\'icona Impostazioni è sempre visualizzata alla fine</string>
+    <string name="info_menu_structure_contents">Struttura menu: %s</string>
+    <string name="prefs_wena3_home_icon_name_calories">Calorie</string>
+    <string name="prefs_wena3_vibration_smart_item">Vibrazione Intelligente</string>
+    <string name="pref_message_privacy_mode_bodyonly">Nascondi solo il corpo</string>
+    <string name="prefs_wena3_hint_background_sync">Consenti a Wena di chiedere periodicamente a Gadgetbridge di scaricare i dati di attività dal dispositivo.</string>
+    <string name="prefs_wena3_vibration_strength_item_medium">Media</string>
+    <string name="error_invalid_menu_structure">Struttura menu JSON invalida</string>
+    <string name="prefs_wena3_home_icon_name_pedometer">Contapassi</string>
+    <string name="devicetype_miband2_hrx">Mi Band HRX</string>
+    <string name="busy_task_fetch_statistics">Recupero statistiche</string>
+    <string name="prefs_wena3_home_icon_name_clock">Ora Corrente</string>
+    <string name="prefs_wena3_item_background_sync">Sincronizzazione Dati Attività in Background</string>
+    <string name="prefs_wena3_vibration_strength_item_weak">Debole</string>
+    <string name="prefs_wena3_home_icon_title">Icone Schermata Iniziale</string>
+    <string name="devicetype_bohemic_smart_bracelet">Bohemic Smart Bracelet</string>
+    <string name="zepp_os_watchface_starry_sky">Cielo stellato</string>
+    <string name="devicetype_amazfit_balance">Amazfit Balance</string>
+    <string name="prefs_wena3_item_weather_statusbar">Meteo Nella Barra Di Stato</string>
+    <string name="temperature_scale_celsius">Centigradi</string>
+    <string name="prefs_wena3_home_icon_name_energy">Energia Corporea</string>
+    <string name="prefs_wena3_hint_lift_wrist">Accendi il display quando guardi il polso</string>
+    <string name="button_reset_menu_structure">Reimposta struttura menu</string>
+    <string name="prefs_wena3_button_action_item_double">Doppia Pressione</string>
+    <string name="devicetype_amazfit_falcon">Amazfit Falcon</string>
+    <string name="devicetype_amazfit_active_edge">Amazfit Active Edge</string>
+    <string name="busy_task_fetch_temperature">Recupero dati temperatura</string>
+    <string name="prefs_wena3_hint_weather_statusbar">Mostra le condizioni meteo attuali nell\'angolo in alto a sinistra della schermata iniziale</string>
+    <string name="devicetype_sony_wena3">Sony Wena 3</string>
+    <string name="prefs_wena3_menu_icon_title">Icone Menu</string>
+    <string name="charts_legend_spo2_average">Media ossigeno nel sangue</string>
+    <string name="temperature_scale_fahrenheit">Fahrenheit</string>
+    <string name="prefs_wena3_vibration_strength_item">Intensità Vibrazione</string>
+    <string name="prefs_wena3_button_action_item_long">Pressione Prolungata</string>
+    <string name="prefs_wena3_menu_icon_name_payment">Pagamento</string>
+    <string name="prefs_wena3_title_alarm">Impostazioni Sveglia</string>
+    <string name="info_menu_structure_removed">Struttura menu rimossa</string>
+    <string name="prefs_wena3_hint_rich_design">Aggiungi rettangoli arrotondati intorno alle icone della schermata iniziale</string>
+    <string name="info_fossil_rebuild_watchface_custom_menu">Ricompila il quadrante dell\'orologio per il menu personalizzato</string>
+    <string name="devicetype_amazfit_active">Amazfit Active</string>
+    <string name="info_menu_structure_set">Struttura menu JSON impostata in GB</string>
+    <string name="prefs_wena3_vibration_strength_item_strong">Forte</string>
+    <string name="prefs_wena3_button_action_name_activity_screen">Schermta Attività</string>
+    <string name="prefs_wena3_notification_settings_title">Impostazioni Notifiche</string>
+    <string name="devicetype_sony_wf_1000xm5">Sony WF-1000XM5</string>
+    <string name="devicetype_femometer_vinca2">Femometer Vinca II</string>
 </resources>
\ No newline at end of file

From 6cbf39aa84b0e736b743065c93c99fb93a721221 Mon Sep 17 00:00:00 2001
From: Xtremo3 <a.lewicki95@gmail.com>
Date: Sat, 25 Nov 2023 09:05:49 +0000
Subject: [PATCH 330/595] Translated using Weblate (Polish)

Currently translated at 100.0% (2331 of 2331 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/pl/
---
 app/src/main/res/values-pl/strings.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 821e8fac6..44936f8de 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -2542,4 +2542,12 @@
     <string name="devicetype_amazfit_active_edge">Amazfit Active Edge</string>
     <string name="charts_legend_spo2_average">Średnia zawartość tlenu we krwi</string>
     <string name="devicetype_amazfit_active">Amazfit Active</string>
+    <string name="pref_title_navigation_apps">Aplikacje nawigacyjne</string>
+    <string name="pref_title_navigation_prefs">Preferencje nawigacji</string>
+    <string name="pref_navigation_app_gmaps">Google Maps</string>
+    <string name="pref_summary_prefix_notification_with_app">Tytuł powiadomienia poprzedź nazwą aplikacji źródłowej</string>
+    <string name="pref_summary_osmand_packagename">Służy do wyboru wersji OsmAnd, z którą chcesz się połączyć</string>
+    <string name="pref_title_prefix_notification_with_app">Nazwa aplikacji w powiadomieniu</string>
+    <string name="pref_title_osmand_packagename">Nazwa pakietu OsmAnd</string>
+    <string name="pref_navigation_app_osmand">OsmAnd(+)</string>
 </resources>
\ No newline at end of file

From 8070800bbe2c5ed58aa2a31c08ac28d6024e4de4 Mon Sep 17 00:00:00 2001
From: 0que <0que@users.noreply.hosted.weblate.org>
Date: Fri, 24 Nov 2023 07:31:44 +0000
Subject: [PATCH 331/595] Translated using Weblate (Russian)

Currently translated at 99.4% (2319 of 2331 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ru/
---
 app/src/main/res/values-ru/strings.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 32e850233..9fad612a2 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -2526,4 +2526,12 @@
     <string name="devicetype_amazfit_active_edge">Amazfit Active Edge</string>
     <string name="charts_legend_spo2_average">Средний уровень кислорода в крови</string>
     <string name="devicetype_amazfit_active">Amazfit Active</string>
+    <string name="pref_title_navigation_apps">Навигационные приложения</string>
+    <string name="pref_title_navigation_prefs">Настройки навигации</string>
+    <string name="pref_navigation_app_gmaps">Google Карты</string>
+    <string name="pref_summary_prefix_notification_with_app">Начинать заголовок уведомления с названия приложения-источника</string>
+    <string name="pref_summary_osmand_packagename">Используется для выбора используемой версии OsmAnd</string>
+    <string name="pref_title_prefix_notification_with_app">Название приложения в уведомлении</string>
+    <string name="pref_title_osmand_packagename">Имя пакета OsmAnd</string>
+    <string name="pref_navigation_app_osmand">OsmAnd(+)</string>
 </resources>
\ No newline at end of file

From 29d9d0613d90d787b64dab415633c7c7e7668f54 Mon Sep 17 00:00:00 2001
From: arjan-s <a_gitlab@anymore.nl>
Date: Fri, 24 Nov 2023 17:11:59 +0000
Subject: [PATCH 332/595] Translated using Weblate (Dutch)

Currently translated at 100.0% (2331 of 2331 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/nl/
---
 app/src/main/res/values-nl/strings.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index d00f3f355..4a3fd4b60 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -2533,4 +2533,12 @@
     <string name="devicetype_amazfit_active_edge">Amazfit Active Edge</string>
     <string name="charts_legend_spo2_average">Zuurstofsaturatie</string>
     <string name="devicetype_amazfit_active">Amazfit Active</string>
+    <string name="pref_title_navigation_apps">Navigatie-apps</string>
+    <string name="pref_title_navigation_prefs">Navigatie-instellingen</string>
+    <string name="pref_navigation_app_gmaps">Google Maps</string>
+    <string name="pref_summary_prefix_notification_with_app">Plaats app-naam vooraan meldingen</string>
+    <string name="pref_summary_osmand_packagename">Selecteer met welke versie van OsmAnd verbonden moet worden</string>
+    <string name="pref_title_prefix_notification_with_app">App-naam in melding</string>
+    <string name="pref_title_osmand_packagename">OsmAnd-pakketnaam</string>
+    <string name="pref_navigation_app_osmand">OsmAnd(+)</string>
 </resources>
\ No newline at end of file

From aef6ff01ef8e0b0f3a58559ecda88e2b88f84ca5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B0=91=E4=B8=BE?= <oshirisu.red@gmail.com>
Date: Fri, 24 Nov 2023 00:55:21 +0000
Subject: [PATCH 333/595] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (2331 of 2331 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/zh_Hans/
---
 app/src/main/res/values-zh-rCN/strings.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 36fc2afdf..f68c00b74 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -2533,4 +2533,12 @@
     <string name="devicetype_amazfit_active_edge">跃我活动边界</string>
     <string name="charts_legend_spo2_average">血氧平均值</string>
     <string name="devicetype_amazfit_active">跃我活动</string>
+    <string name="pref_title_navigation_apps">导航应用</string>
+    <string name="pref_title_navigation_prefs">导航首选项</string>
+    <string name="pref_navigation_app_gmaps">谷歌地图</string>
+    <string name="pref_summary_prefix_notification_with_app">在通知标题前添加来自应用名称的前缀</string>
+    <string name="pref_summary_osmand_packagename">选择用于要连接的 OsmAnd 版本</string>
+    <string name="pref_title_prefix_notification_with_app">通知中的应用名</string>
+    <string name="pref_title_osmand_packagename">OsmAnd 包名</string>
+    <string name="pref_navigation_app_osmand">OsmAnd(+)</string>
 </resources>
\ No newline at end of file

From 53fae9d6b5bd195d13c441e32f084f2285a29568 Mon Sep 17 00:00:00 2001
From: Rex_sa <rex.sa@pm.me>
Date: Thu, 23 Nov 2023 22:44:09 +0000
Subject: [PATCH 334/595] Translated using Weblate (Arabic)

Currently translated at 100.0% (2331 of 2331 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ar/
---
 app/src/main/res/values-ar/strings.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 7539da684..f48189ced 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -2518,4 +2518,12 @@
     <string name="devicetype_amazfit_active_edge">Amazfit Active Edge</string>
     <string name="charts_legend_spo2_average">متوسط أكسجين الدم</string>
     <string name="devicetype_amazfit_active">Amazfit Active</string>
+    <string name="pref_title_navigation_apps">تطبيقات الملاحة</string>
+    <string name="pref_title_navigation_prefs">تفضيلات الملاحة</string>
+    <string name="pref_navigation_app_gmaps">خرائط قوقل</string>
+    <string name="pref_summary_prefix_notification_with_app">عنوان الإشعار المدمج مع اسم التطبيق الأساسي</string>
+    <string name="pref_summary_osmand_packagename">يستخدم لتحديد إصدار OsmAnd للاتصال به</string>
+    <string name="pref_title_prefix_notification_with_app">اسم التطبيق في الإشعار</string>
+    <string name="pref_title_osmand_packagename">اسم الحزمة OsmAnd</string>
+    <string name="pref_navigation_app_osmand">OsmAnd(+)</string>
 </resources>
\ No newline at end of file

From c2cd0d581f948999886e38d9149a270b57b9a819 Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Sun, 26 Nov 2023 12:26:48 +0000
Subject: [PATCH 335/595] Translated using Weblate (Spanish)

Currently translated at 100.0% (2356 of 2356 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/es/
---
 app/src/main/res/values-es/strings.xml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 7caa1f89b..64ea4e1f3 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -2543,4 +2543,29 @@
     <string name="pref_title_navigation_prefs">Preferencias de navegación</string>
     <string name="pref_navigation_app_gmaps">Google Maps</string>
     <string name="pref_navigation_app_osmand">OsmAnd(+)</string>
+    <string name="pref_title_casio_alert_other">Alerta para otras notificaciones</string>
+    <string name="pref_title_casio_alert_calendar">Alerta de las notificaciones en el calendario</string>
+    <string name="pref_summary_casio_alert_call">Alerta (vibración/pitido) de llamadas entrantes</string>
+    <string name="devicetype_miband8">Xiaomi Smart Band 8</string>
+    <string name="menuitem_running">Ejecutando</string>
+    <string name="pref_sleep_mode_schedule_title">Horario del modo de reposo</string>
+    <string name="pref_title_casio_alert_call">Alerta de llamadas entrantes</string>
+    <string name="bedtime">Hora de acostarse</string>
+    <string name="pref_title_casio_alert_email">Alerta de notificaciones por correo electrónico</string>
+    <string name="pref_summary_casio_alert_email">Alerta (vibración/pitido) para notificaciones por correo electrónico</string>
+    <string name="menuitem_focus">Enfocar</string>
+    <string name="pref_summary_casio_alert_sms">Alerta (vibración/pitido) para notificaciones SMS (mensajes de texto)</string>
+    <string name="pref_title_preview_message_in_title">Mostrar una vista previa del mensaje en el título</string>
+    <string name="devicetype_redmiwatch3active">Redmi Watch 3 Active</string>
+    <string name="pref_summary_casio_alert_calendar">Alerta (vibración/pitido) para las notificaciones de la agenda</string>
+    <string name="serial_number">Número de serie</string>
+    <string name="danish">Danés</string>
+    <string name="wake_up_time">Despertar</string>
+    <string name="menuitem_stats">Estadísticas</string>
+    <string name="pref_summary_casio_alert_other">Alerta (vibración/pitido) para las notificaciones de la otra categoría</string>
+    <string name="devicetype_xiaomi_watch_lite">Xiaomi Watch Lite</string>
+    <string name="pref_summary_preview_message_in_title">Muestra una vista previa del mensaje en el título de una notificación según lo permita el dispositivo</string>
+    <string name="pref_sleep_mode_schedule_summary">Envía un recordatorio y entra en modo reposo a la hora de acostarte. A la hora programada para despertarse, sonará la alarma del despertador.</string>
+    <string name="pref_title_casio_alert_sms">Alerta de notificaciones por SMS</string>
+    <string name="menuitem_alerts">Alertas</string>
 </resources>
\ No newline at end of file

From f3b0bc8132837763a899968455e4c0317d46cf35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B0=91=E4=B8=BE?= <oshirisu.red@gmail.com>
Date: Sun, 26 Nov 2023 02:41:38 +0000
Subject: [PATCH 336/595] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (2356 of 2356 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/zh_Hans/
---
 app/src/main/res/values-zh-rCN/strings.xml | 25 ++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index f68c00b74..9ce31851d 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -2541,4 +2541,29 @@
     <string name="pref_title_prefix_notification_with_app">通知中的应用名</string>
     <string name="pref_title_osmand_packagename">OsmAnd 包名</string>
     <string name="pref_navigation_app_osmand">OsmAnd(+)</string>
+    <string name="pref_title_casio_alert_other">其他通知提醒</string>
+    <string name="pref_title_casio_alert_calendar">日历通知提醒</string>
+    <string name="pref_summary_casio_alert_call">来电提醒（振动/鸣叫）</string>
+    <string name="devicetype_miband8">小米手环8</string>
+    <string name="menuitem_running">跑步</string>
+    <string name="pref_sleep_mode_schedule_title">睡眠模式计划</string>
+    <string name="pref_title_casio_alert_call">来电提醒</string>
+    <string name="bedtime">睡眠</string>
+    <string name="pref_title_casio_alert_email">电子邮件通知提醒</string>
+    <string name="pref_summary_casio_alert_email">电子邮件通知提醒（振动/鸣叫）</string>
+    <string name="menuitem_focus">专注</string>
+    <string name="pref_summary_casio_alert_sms">SMS（短信）通知的提醒（振动/鸣叫）</string>
+    <string name="pref_title_preview_message_in_title">在标题中显示消息的预览</string>
+    <string name="devicetype_redmiwatch3active">红米手表3 运动版</string>
+    <string name="pref_summary_casio_alert_calendar">日历通知提醒（振动/鸣叫）</string>
+    <string name="serial_number">序列号</string>
+    <string name="danish">丹麦语</string>
+    <string name="wake_up_time">起床</string>
+    <string name="menuitem_stats">统计</string>
+    <string name="pref_summary_casio_alert_other">针对其他类别的通知发出提醒（振动/鸣叫）</string>
+    <string name="devicetype_xiaomi_watch_lite">小米手表青春版</string>
+    <string name="pref_summary_preview_message_in_title">在设备允许的情况下，在通知标题中显示消息预览</string>
+    <string name="pref_sleep_mode_schedule_summary">发出一个提醒并在就寝时间进入睡眠模式。 在预定的起床时间，起床闹钟将会响起。</string>
+    <string name="pref_title_casio_alert_sms">短信通知提醒</string>
+    <string name="menuitem_alerts">提醒</string>
 </resources>
\ No newline at end of file

From a0ddfe07b13102ba60a5752e5a4748e5daa23e02 Mon Sep 17 00:00:00 2001
From: 0que <0que@users.noreply.hosted.weblate.org>
Date: Mon, 27 Nov 2023 05:53:31 +0000
Subject: [PATCH 337/595] Translated using Weblate (Russian)

Currently translated at 99.4% (2342 of 2356 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ru/
---
 app/src/main/res/values-ru/strings.xml | 57 ++++++++++++++++++--------
 1 file changed, 41 insertions(+), 16 deletions(-)

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 9fad612a2..81a503d95 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -460,8 +460,8 @@
     <string name="mi2_prefs_do_not_disturb_start">Начальное время</string>
     <string name="mi2_prefs_do_not_disturb_end">Время окончания</string>
     <string name="automatic">Автоматически</string>
-    <string name="simplified_chinese">Упрощённый китайский язык</string>
-    <string name="traditional_chinese">Традиционный китайский язык</string>
+    <string name="simplified_chinese">Китайский упрощённый</string>
+    <string name="traditional_chinese">Китайский традиционный</string>
     <string name="english">Английский язык</string>
     <string name="prefs_title_heartrate_measurement_interval">Измерение пульса в течение дня</string>
     <string name="interval_one_minute">раз в минуту</string>
@@ -566,12 +566,12 @@
     <string name="title_activity_watch9_calibration">Калибровка Watch 9</string>
     <string name="mi3_prefs_band_screen_unlock">Разблокировка экрана</string>
     <string name="mi3_prefs_band_screen_unlock_summary">Смахните вверх для разблокировки экрана браслета</string>
-    <string name="german">Немецкий язык</string>
-    <string name="italian">Итальянский язык</string>
-    <string name="french">Французский язык</string>
-    <string name="polish">Польский язык</string>
-    <string name="korean">Корейский язык</string>
-    <string name="japanese">Японский язык</string>
+    <string name="german">Немецкий</string>
+    <string name="italian">Итальянский</string>
+    <string name="french">Французский</string>
+    <string name="polish">Польский</string>
+    <string name="korean">Корейский</string>
+    <string name="japanese">Японский</string>
     <string name="norwegian_bokmal">Норвежский (литературный)</string>
     <string name="share_log">Поделиться лог-файлом</string>
     <string name="share_log_warning">Файлы журнала (log-файлы) Gadgetbridge могут содержать различную личную информацию, такую как уникальные идентификаторы (например, MAC-адрес устройства), информацию о музыкальных предпочтениях и т.д. Рекомендуется редактирование файла журнала и удаление личной информации перед отправкой в публичном отчете о проблеме.</string>
@@ -707,14 +707,14 @@
 \nВЫ ДЕЙСТВУЕТЕ НА СВОЙ СТРАХ И РИСК!
 \n
 \nПОЛНОСТЬЮ НЕ ПРОТЕСТИРОВАНО. ВОЗМОЖНО, НУЖНО ПРОШИТЬ ПРОШИВКУ BEATS_W, ЕСЛИ ИМЯ ВАШЕГО УСТРОЙСТВА \"Amazfit Band 2\"</string>
-    <string name="dutch">Голландский язык</string>
-    <string name="turkish">Турецкий язык</string>
-    <string name="ukrainian">Украинский язык</string>
-    <string name="arabic">Арабский язык</string>
-    <string name="indonesian">Индонезийский язык</string>
-    <string name="thai">Тайский язык</string>
-    <string name="vietnamese">Вьетнамский язык</string>
-    <string name="portuguese">Португальский язык</string>
+    <string name="dutch">Голландский</string>
+    <string name="turkish">Турецкий</string>
+    <string name="ukrainian">Украинский</string>
+    <string name="arabic">Арабский</string>
+    <string name="indonesian">Индонезийский</string>
+    <string name="thai">Тайский</string>
+    <string name="vietnamese">Вьетнамский</string>
+    <string name="portuguese">Португальский</string>
     <string name="devicetype_amazfit_cor2">Amazfit Cor 2</string>
     <string name="devicetype_miband4">Mi Band 4</string>
     <string name="fw_upgrade_notice_miband4">Вы собираетесь установить прошивку %s на ваш Mi Band 4.
@@ -2534,4 +2534,29 @@
     <string name="pref_title_prefix_notification_with_app">Название приложения в уведомлении</string>
     <string name="pref_title_osmand_packagename">Имя пакета OsmAnd</string>
     <string name="pref_navigation_app_osmand">OsmAnd(+)</string>
+    <string name="pref_title_casio_alert_other">Оповещения прочих уведомлений</string>
+    <string name="pref_title_casio_alert_calendar">Оповещения календаря</string>
+    <string name="pref_summary_casio_alert_call">Оповещать о входящих звонках вибрацией/пищанием</string>
+    <string name="devicetype_miband8">Xiaomi Smart Band 8</string>
+    <string name="menuitem_running">Бег</string>
+    <string name="pref_sleep_mode_schedule_title">Расписание режима сна</string>
+    <string name="pref_title_casio_alert_call">Оповещения о входящих</string>
+    <string name="bedtime">Начало сна</string>
+    <string name="pref_title_casio_alert_email">Оповещения эл. почты</string>
+    <string name="pref_summary_casio_alert_email">Оповещать о новых письмах вибрацией/пищанием</string>
+    <string name="menuitem_focus">Концентрация</string>
+    <string name="pref_summary_casio_alert_sms">Оповещать о полученных SMS (текстовых) сообщениях вибрацией/пищанием</string>
+    <string name="pref_title_preview_message_in_title">Показывать сообщение в заголовке</string>
+    <string name="devicetype_redmiwatch3active">Redmi Watch 3 Active</string>
+    <string name="pref_summary_casio_alert_calendar">Оповещать о событиях календаря вибрацией/пищанием</string>
+    <string name="serial_number">Серийный номер</string>
+    <string name="danish">Датский</string>
+    <string name="wake_up_time">Пробуждение</string>
+    <string name="menuitem_stats">Статистика</string>
+    <string name="pref_summary_casio_alert_other">Оповещать при прочих уведомлениях вибрацией/пищанием</string>
+    <string name="devicetype_xiaomi_watch_lite">Xiaomi Watch Lite</string>
+    <string name="pref_summary_preview_message_in_title">Показывать сообщение в заголовке уведомления в соответствии с настройками конфиденциальности устройства</string>
+    <string name="pref_sleep_mode_schedule_summary">Отправить напоминание и войти в режим сна во время начала сна. Активировать будильник при заданном времени пробуждения.</string>
+    <string name="pref_title_casio_alert_sms">Оповещения SMS-сообщений</string>
+    <string name="menuitem_alerts">Оповещения</string>
 </resources>
\ No newline at end of file

From 80f179a0ca851e56d3272fb1c029513f5dc356a9 Mon Sep 17 00:00:00 2001
From: arjan-s <a_gitlab@anymore.nl>
Date: Mon, 27 Nov 2023 13:59:27 +0000
Subject: [PATCH 338/595] Translated using Weblate (Dutch)

Currently translated at 100.0% (2356 of 2356 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/nl/
---
 app/src/main/res/values-nl/strings.xml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 4a3fd4b60..22fa5607a 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -2541,4 +2541,29 @@
     <string name="pref_title_prefix_notification_with_app">App-naam in melding</string>
     <string name="pref_title_osmand_packagename">OsmAnd-pakketnaam</string>
     <string name="pref_navigation_app_osmand">OsmAnd(+)</string>
+    <string name="pref_title_casio_alert_other">Overige meldingen</string>
+    <string name="pref_title_casio_alert_calendar">Kalendermeldingen</string>
+    <string name="pref_summary_casio_alert_call">Tril/piep voor binnenkomende telefoongesprekken</string>
+    <string name="devicetype_miband8">Xiaomi Smart Band 8</string>
+    <string name="menuitem_running">Hardlopen</string>
+    <string name="pref_sleep_mode_schedule_title">Planning slaapmodus</string>
+    <string name="pref_title_casio_alert_call">Melding voor telefoongesprekken</string>
+    <string name="bedtime">Bedtijd</string>
+    <string name="pref_title_casio_alert_email">Melding voor nieuwe e-mail</string>
+    <string name="pref_summary_casio_alert_email">Tril/piep bij e-mailmeldingen</string>
+    <string name="menuitem_focus">Focus</string>
+    <string name="pref_summary_casio_alert_sms">Tril/piep voor SMS-meldingen</string>
+    <string name="pref_title_preview_message_in_title">Toon een preview van het bericht in de titel</string>
+    <string name="devicetype_redmiwatch3active">Redmi Watch 3 Active</string>
+    <string name="pref_summary_casio_alert_calendar">Tril/piep voor kalendermeldingen</string>
+    <string name="serial_number">Serienummer</string>
+    <string name="danish">Deens</string>
+    <string name="wake_up_time">Wektijd</string>
+    <string name="menuitem_stats">Statistieken</string>
+    <string name="pref_summary_casio_alert_other">Tril/piep voor meldingen in de categorie Overig</string>
+    <string name="devicetype_xiaomi_watch_lite">Xiaomi Watch Lite</string>
+    <string name="pref_summary_preview_message_in_title">Laat een preview van het bericht zien in de titel van een melding voor zover toegestaan door het apparaat</string>
+    <string name="pref_sleep_mode_schedule_summary">Stuur een melding en start slaapmodus op de ingestelde bedtijd. Op de ingestelde wektijd klinkt een alarmsignaal.</string>
+    <string name="pref_title_casio_alert_sms">Melding voor SMS</string>
+    <string name="menuitem_alerts">Meldingen</string>
 </resources>
\ No newline at end of file

From eed97c7ff42dd4a1115dc4e1750523743cd0fb4e Mon Sep 17 00:00:00 2001
From: Rex_sa <rex.sa@pm.me>
Date: Mon, 27 Nov 2023 14:53:29 +0000
Subject: [PATCH 339/595] Translated using Weblate (Arabic)

Currently translated at 100.0% (2356 of 2356 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ar/
---
 app/src/main/res/values-ar/strings.xml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index f48189ced..e1182a792 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -2526,4 +2526,29 @@
     <string name="pref_title_prefix_notification_with_app">اسم التطبيق في الإشعار</string>
     <string name="pref_title_osmand_packagename">اسم الحزمة OsmAnd</string>
     <string name="pref_navigation_app_osmand">OsmAnd(+)</string>
+    <string name="pref_title_casio_alert_other">تنبيه للإخطارات الأخرى</string>
+    <string name="pref_title_casio_alert_calendar">التنبيه لإشعارات التقويم</string>
+    <string name="pref_summary_casio_alert_call">تنبيه (اهتزاز/صافرة) للمكالمات الواردة</string>
+    <string name="devicetype_miband8">سوار شاومي الذكي 8</string>
+    <string name="menuitem_running">الجري</string>
+    <string name="pref_sleep_mode_schedule_title">الجدول الزمني للنوم</string>
+    <string name="pref_title_casio_alert_call">تنبيه للمكالمات الواردة</string>
+    <string name="bedtime">وقت النوم</string>
+    <string name="pref_title_casio_alert_email">تنبيه لإشعارات البريد الإلكتروني</string>
+    <string name="pref_summary_casio_alert_email">تنبيه (اهتزاز/صافرة) لإشعارات البريد الإلكتروني</string>
+    <string name="menuitem_focus">التركيز</string>
+    <string name="pref_summary_casio_alert_sms">تنبيه (اهتزاز/صافرة) لإشعارات الرسائل القصيرة (الرسائل النصية)</string>
+    <string name="pref_title_preview_message_in_title">إظهار معاينة للرسالة في العنوان</string>
+    <string name="devicetype_redmiwatch3active">ساعة ريدمي 3 اكتيف</string>
+    <string name="pref_summary_casio_alert_calendar">تنبيه (اهتزاز/صافرة) لإشعارات التقويم</string>
+    <string name="serial_number">الرقم التسلسلي</string>
+    <string name="danish">الدانماركية</string>
+    <string name="wake_up_time">استيقظ</string>
+    <string name="menuitem_stats">الحالة</string>
+    <string name="pref_summary_casio_alert_other">تنبيه (اهتزاز/صافرة) للإشعارات في الفئة الأخرى</string>
+    <string name="devicetype_xiaomi_watch_lite">ساعة شاومي لايت</string>
+    <string name="pref_summary_preview_message_in_title">يظهر معاينة للرسالة في عنوان الإشعار حسب ما يسمح به الجهاز</string>
+    <string name="pref_sleep_mode_schedule_summary">أرسل تذكيرًا وادخل إلى وضع السكون في وقت النوم. في وقت الاستيقاظ المحدد، سيصدر منبه الاستيقاظ صوتًا.</string>
+    <string name="pref_title_casio_alert_sms">تنبيه لإشعارات الرسائل القصيرة</string>
+    <string name="menuitem_alerts">تنبيهات</string>
 </resources>
\ No newline at end of file

From a239cbb26d1c9d806ff53962e72e966505bc2c36 Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Wed, 29 Nov 2023 21:18:44 +0000
Subject: [PATCH 340/595] Translated using Weblate (Spanish)

Currently translated at 100.0% (2357 of 2357 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/es/
---
 app/src/main/res/values-es/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 64ea4e1f3..9e57c8793 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -2568,4 +2568,5 @@
     <string name="pref_sleep_mode_schedule_summary">Envía un recordatorio y entra en modo reposo a la hora de acostarte. A la hora programada para despertarse, sonará la alarma del despertador.</string>
     <string name="pref_title_casio_alert_sms">Alerta de notificaciones por SMS</string>
     <string name="menuitem_alerts">Alertas</string>
+    <string name="devicetype_xiaomi_watch_s1_active">Xiaomi Watch S1 Active</string>
 </resources>
\ No newline at end of file

From 02be91e85c51903b5542c9f3e2d895bc9d1fd40d Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Wed, 29 Nov 2023 21:20:59 +0000
Subject: [PATCH 341/595] Translated using Weblate (Spanish)

Currently translated at 100.0% (2358 of 2358 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/es/
---
 app/src/main/res/values-es/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 9e57c8793..a340bb8ae 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -2569,4 +2569,5 @@
     <string name="pref_title_casio_alert_sms">Alerta de notificaciones por SMS</string>
     <string name="menuitem_alerts">Alertas</string>
     <string name="devicetype_xiaomi_watch_s1_active">Xiaomi Watch S1 Active</string>
+    <string name="devicetype_miband7pro">Xiaomi Smart Band 7 Pro</string>
 </resources>
\ No newline at end of file

From 97d0ce44c4e7da5c8cea7eb9698323f6be5bd188 Mon Sep 17 00:00:00 2001
From: arjan-s <a_gitlab@anymore.nl>
Date: Thu, 30 Nov 2023 07:44:26 +0000
Subject: [PATCH 342/595] Translated using Weblate (Dutch)

Currently translated at 100.0% (2358 of 2358 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/nl/
---
 app/src/main/res/values-nl/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 22fa5607a..96c577b76 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -2566,4 +2566,6 @@
     <string name="pref_sleep_mode_schedule_summary">Stuur een melding en start slaapmodus op de ingestelde bedtijd. Op de ingestelde wektijd klinkt een alarmsignaal.</string>
     <string name="pref_title_casio_alert_sms">Melding voor SMS</string>
     <string name="menuitem_alerts">Meldingen</string>
+    <string name="devicetype_miband7pro">Xiaomi Smart Band 7 Pro</string>
+    <string name="devicetype_xiaomi_watch_s1_active">Xiaomi Watch S1 Active</string>
 </resources>
\ No newline at end of file

From 270c3269c6bb5fc8c92f166f879cdb911d3986cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B0=91=E4=B8=BE?= <oshirisu.red@gmail.com>
Date: Thu, 30 Nov 2023 00:49:22 +0000
Subject: [PATCH 343/595] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (2358 of 2358 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/zh_Hans/
---
 app/src/main/res/values-zh-rCN/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 9ce31851d..807dfe85c 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -2566,4 +2566,6 @@
     <string name="pref_sleep_mode_schedule_summary">发出一个提醒并在就寝时间进入睡眠模式。 在预定的起床时间，起床闹钟将会响起。</string>
     <string name="pref_title_casio_alert_sms">短信通知提醒</string>
     <string name="menuitem_alerts">提醒</string>
+    <string name="devicetype_miband7pro">小米智能手环 7 Pro</string>
+    <string name="devicetype_xiaomi_watch_s1_active">小米手表 S1 运动版</string>
 </resources>
\ No newline at end of file

From b914dd48c207038a89b253f6db4e5d02ec43c75d Mon Sep 17 00:00:00 2001
From: Mozart Michael <michael.mozart@protonmail.com>
Date: Thu, 30 Nov 2023 09:32:48 +0000
Subject: [PATCH 344/595] Translated using Weblate (Romanian)

Currently translated at 6.8% (161 of 2358 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ro/
---
 app/src/main/res/values-ro/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 83cddaf4e..91327b80a 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -193,4 +193,5 @@
     <string name="application_name_main_nightly">Gadgetbridge (Nightly)</string>
     <string name="gps_galileo">GPS + GALILEO</string>
     <string name="debugactivity_really_factoryreset_title">Chiar dorești o restaurare a setărilor din fabrică?</string>
+    <string name="devicetype_xiaomi_watch_s1_active">Xiaomi Watch S1 Active</string>
 </resources>
\ No newline at end of file

From 637d9048cbee47699c1dbdbdbe5616851b5713b0 Mon Sep 17 00:00:00 2001
From: Rex_sa <rex.sa@pm.me>
Date: Thu, 30 Nov 2023 00:19:26 +0000
Subject: [PATCH 345/595] Translated using Weblate (Arabic)

Currently translated at 100.0% (2358 of 2358 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ar/
---
 app/src/main/res/values-ar/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index e1182a792..c6a1596b8 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -2551,4 +2551,6 @@
     <string name="pref_sleep_mode_schedule_summary">أرسل تذكيرًا وادخل إلى وضع السكون في وقت النوم. في وقت الاستيقاظ المحدد، سيصدر منبه الاستيقاظ صوتًا.</string>
     <string name="pref_title_casio_alert_sms">تنبيه لإشعارات الرسائل القصيرة</string>
     <string name="menuitem_alerts">تنبيهات</string>
+    <string name="devicetype_miband7pro">سوار شاومي الذكي 7 برو</string>
+    <string name="devicetype_xiaomi_watch_s1_active">ساعة شاوميS1 النشطة</string>
 </resources>
\ No newline at end of file

From 8260016dc796cdbf98feefdcffaa53f3ed11b308 Mon Sep 17 00:00:00 2001
From: 0que <0que@users.noreply.hosted.weblate.org>
Date: Thu, 30 Nov 2023 14:52:39 +0000
Subject: [PATCH 346/595] Translated using Weblate (Russian)

Currently translated at 99.4% (2344 of 2358 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ru/
---
 app/src/main/res/values-ru/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 81a503d95..e264354ee 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -2559,4 +2559,6 @@
     <string name="pref_sleep_mode_schedule_summary">Отправить напоминание и войти в режим сна во время начала сна. Активировать будильник при заданном времени пробуждения.</string>
     <string name="pref_title_casio_alert_sms">Оповещения SMS-сообщений</string>
     <string name="menuitem_alerts">Оповещения</string>
+    <string name="devicetype_miband7pro">Xiaomi Smart Band 7 Pro</string>
+    <string name="devicetype_xiaomi_watch_s1_active">Xiaomi Watch S1 Active</string>
 </resources>
\ No newline at end of file

From 25eb1417b000cc10be1dfa511585bc48948be57a Mon Sep 17 00:00:00 2001
From: arjan-s <a_gitlab@anymore.nl>
Date: Fri, 1 Dec 2023 19:11:47 +0000
Subject: [PATCH 347/595] Translated using Weblate (Dutch)

Currently translated at 100.0% (2358 of 2358 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/nl/
---
 app/src/main/res/values-nl/strings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 96c577b76..0b957d776 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -141,7 +141,7 @@
 \nOpmerking: U hoeft de .res niet te installeren als deze exact dezelfde is als degene die ervoor al was geïnstalleerd.
 \n
 \nGA VERDER OP EIGEN RISICO!</string>
-    <string name="pref_title_charts_swipe">Activeer links/rechts vegen in grafiek schermen</string>
+    <string name="pref_title_charts_swipe">Activeer links/rechts vegen in grafiekschermen</string>
     <string name="pref_title_weather">Weer</string>
     <string name="pref_title_weather_location">Weerlocatie (voor LinageOS-weeraanbieder)</string>
     <string name="pref_title_autoremove_notifications">Verwijder automatisch verworpen meldingen</string>
@@ -580,7 +580,7 @@
     <string name="live_activity_max_heart_rate">Huidige / Max hartslag: %1$d / %2$d</string>
     <string name="mi3_prefs_night_mode">Nacht modus</string>
     <string name="mi3_prefs_night_mode_summary">Verlaag \'s nachts automatisch de scherm helderheid</string>
-    <string name="activity_prefs_charts">Grafiek instellingen</string>
+    <string name="activity_prefs_charts">Grafiekinstellingen</string>
     <string name="activity_prefs_chart_max_heart_rate">Maximum hartslag</string>
     <string name="activity_prefs_chart_min_heart_rate">Minimum hartslag</string>
     <string name="ok">OK</string>
@@ -712,7 +712,7 @@
     <string name="prefs_hr_alarm_low">Ondergrens</string>
     <string name="prefs_hr_alarm_high">Bovengrens</string>
     <string name="average">Gemiddelde: %1$s</string>
-    <string name="pref_header_charts">Grafiek instellingen</string>
+    <string name="pref_header_charts">Grafiekinstellingen</string>
     <string name="pref_title_charts_average">Toon gemiddelden in de grafieken</string>
     <string name="pref_title_charts_range">Grafiekbereik</string>
     <string name="pref_charts_range_on">Grafiekbereik ingesteld op 1 maand</string>

From 42763d1b8652790df1187e7d2be6498e254cc170 Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Sat, 2 Dec 2023 12:04:39 +0000
Subject: [PATCH 348/595] Translated using Weblate (Spanish)

Currently translated at 100.0% (2359 of 2359 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/es/
---
 app/src/main/res/values-es/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index a340bb8ae..37f93cc63 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -2570,4 +2570,5 @@
     <string name="menuitem_alerts">Alertas</string>
     <string name="devicetype_xiaomi_watch_s1_active">Xiaomi Watch S1 Active</string>
     <string name="devicetype_miband7pro">Xiaomi Smart Band 7 Pro</string>
+    <string name="devicetype_mi_watch_color_sport">Mi Watch Color Sport</string>
 </resources>
\ No newline at end of file

From dd779804e61f2b6e8a323c6763f7675d5fbad806 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B0=91=E4=B8=BE?= <oshirisu.red@gmail.com>
Date: Sat, 2 Dec 2023 12:29:02 +0000
Subject: [PATCH 349/595] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (2359 of 2359 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/zh_Hans/
---
 app/src/main/res/values-zh-rCN/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 807dfe85c..f349ab48f 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -2568,4 +2568,5 @@
     <string name="menuitem_alerts">提醒</string>
     <string name="devicetype_miband7pro">小米智能手环 7 Pro</string>
     <string name="devicetype_xiaomi_watch_s1_active">小米手表 S1 运动版</string>
+    <string name="devicetype_mi_watch_color_sport">小米手表彩色运动版</string>
 </resources>
\ No newline at end of file

From f4c353dca7e85691c24bdd68177ebf31335d55df Mon Sep 17 00:00:00 2001
From: Rex_sa <rex.sa@pm.me>
Date: Sat, 2 Dec 2023 16:56:53 +0000
Subject: [PATCH 350/595] Translated using Weblate (Arabic)

Currently translated at 100.0% (2359 of 2359 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ar/
---
 app/src/main/res/values-ar/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index c6a1596b8..dfe14e0a9 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -2553,4 +2553,5 @@
     <string name="menuitem_alerts">تنبيهات</string>
     <string name="devicetype_miband7pro">سوار شاومي الذكي 7 برو</string>
     <string name="devicetype_xiaomi_watch_s1_active">ساعة شاوميS1 النشطة</string>
+    <string name="devicetype_mi_watch_color_sport">ساعة مي كولور سبورت</string>
 </resources>
\ No newline at end of file

From 237048c8f72120c51e03cbd7a726b01391b3fcc5 Mon Sep 17 00:00:00 2001
From: Xtremo3 <a.lewicki95@gmail.com>
Date: Sun, 3 Dec 2023 17:17:14 +0000
Subject: [PATCH 351/595] Translated using Weblate (Polish)

Currently translated at 100.0% (2359 of 2359 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/pl/
---
 app/src/main/res/values-pl/strings.xml | 28 ++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 44936f8de..52f0d1e1c 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -2550,4 +2550,32 @@
     <string name="pref_title_prefix_notification_with_app">Nazwa aplikacji w powiadomieniu</string>
     <string name="pref_title_osmand_packagename">Nazwa pakietu OsmAnd</string>
     <string name="pref_navigation_app_osmand">OsmAnd(+)</string>
+    <string name="pref_title_casio_alert_other">Alert dla pozostałych powiadomień</string>
+    <string name="pref_title_casio_alert_calendar">Alert powiadomień z kalendarza</string>
+    <string name="devicetype_mi_watch_color_sport">Mi Watch Color Sport</string>
+    <string name="pref_summary_casio_alert_call">Alert (wibracja/beep) dla połączeń przychodzących</string>
+    <string name="devicetype_miband8">Xiaomi Smart Band 8</string>
+    <string name="menuitem_running">Bieganie</string>
+    <string name="pref_sleep_mode_schedule_title">Harmonogram snu</string>
+    <string name="pref_title_casio_alert_call">Alert dla połączeń przychodzących</string>
+    <string name="bedtime">Pora snu</string>
+    <string name="pref_title_casio_alert_email">Alert powiadomień email</string>
+    <string name="pref_summary_casio_alert_email">Alert (wibracja/beep) dla powiadomień email</string>
+    <string name="menuitem_focus">Skupienie</string>
+    <string name="pref_summary_casio_alert_sms">Alert (wibracja/beep) dla powiadomień SMS (wiadomości tekstowych)</string>
+    <string name="pref_title_preview_message_in_title">Pokaż podgląd wiadomości w tytule</string>
+    <string name="devicetype_redmiwatch3active">Redmi Watch 3 Active</string>
+    <string name="pref_summary_casio_alert_calendar">Alert (wibracja/beep) dla powiadomień z kalendarza</string>
+    <string name="serial_number">Numer seryjny</string>
+    <string name="danish">Danish</string>
+    <string name="wake_up_time">Pobudka</string>
+    <string name="devicetype_miband7pro">Xiaomi Smart Band 7 Pro</string>
+    <string name="menuitem_stats">Statystyki</string>
+    <string name="pref_summary_casio_alert_other">Alert (wibracja/beep) dla pozostałych powiadomień</string>
+    <string name="devicetype_xiaomi_watch_lite">Xiaomi Watch Lite</string>
+    <string name="pref_summary_preview_message_in_title">Pokaż podgląd wiadomości w tytule powiadomienia, jeżeli udzielone jest odpowiednie uprawnienie</string>
+    <string name="pref_sleep_mode_schedule_summary">Wyślij przypomnienie i przed snem wejdź w tryb uśpienia. O zaplanowanej godzinie pobudki zabrzmi alarm.</string>
+    <string name="pref_title_casio_alert_sms">Alert powiadomień SMS</string>
+    <string name="menuitem_alerts">Alerty</string>
+    <string name="devicetype_xiaomi_watch_s1_active">Xiaomi Watch S1 Active</string>
 </resources>
\ No newline at end of file

From d78354cd36b1834feb07bfe696c65f7369144daf Mon Sep 17 00:00:00 2001
From: 0que <0que@users.noreply.hosted.weblate.org>
Date: Sun, 3 Dec 2023 18:28:40 +0000
Subject: [PATCH 352/595] Translated using Weblate (Russian)

Currently translated at 99.4% (2345 of 2359 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ru/
---
 app/src/main/res/values-ru/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index e264354ee..d5676c44e 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -2561,4 +2561,5 @@
     <string name="menuitem_alerts">Оповещения</string>
     <string name="devicetype_miband7pro">Xiaomi Smart Band 7 Pro</string>
     <string name="devicetype_xiaomi_watch_s1_active">Xiaomi Watch S1 Active</string>
+    <string name="devicetype_mi_watch_color_sport">Mi Watch Color Sports</string>
 </resources>
\ No newline at end of file

From b04dbec56639666429754314b53c43b4979e4b65 Mon Sep 17 00:00:00 2001
From: Manuel-Senpai <senpai99@hotmail.com>
Date: Tue, 5 Dec 2023 15:28:10 +0000
Subject: [PATCH 353/595] Translated using Weblate (Spanish)

Currently translated at 100.0% (2359 of 2359 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/es/
---
 app/src/main/res/values-es/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 37f93cc63..ddcff8b43 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1959,7 +1959,7 @@
     <string name="activity_type_core_training">Entrenamiento básico</string>
     <string name="pref_workout_detection_categories_title">Categorías de entrenamiento</string>
     <string name="pref_workout_detection_categories_summary">Categorías de entrenamientos para detectar automáticamente</string>
-    <string name="pref_workout_detection_alert_title">Alertas</string>
+    <string name="pref_workout_detection_alert_title">Alerta</string>
     <string name="pref_workout_detection_alert_summary">Notificar cuando se detecta un entrenamiento</string>
     <string name="prefs_ambient_volume_left">Volumen sonido ambiente izquierdo</string>
     <string name="prefs_noise_control">Reducción del ruido</string>

From 89487b540d23ee4ff01e668703d6e3df0877fc69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81cs=20Zolt=C3=A1n?= <acszoltan111@gmail.com>
Date: Wed, 6 Dec 2023 08:15:36 +0000
Subject: [PATCH 354/595] Translated using Weblate (Hungarian)

Currently translated at 52.4% (1238 of 2359 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/hu/
---
 app/src/main/res/values-hu/strings.xml | 27 +++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 3d8cee9b5..d9e5c931f 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -455,7 +455,7 @@
     <string name="notif_battery_low_extended">%1$ akkumulátora merül: %2$s</string>
     <string name="debugactivity_really_factoryreset">A gyári beállítások visszaállítása minden adatot töröl a kapcsolódott eszközről (ha támogatott). A Xiaomi/Huami eszközöknek emellett megváltozik a Bluetooth MAC-címe is, így új eszközként jelennek meg a Gadgetbridge számára.</string>
     <string name="mi2_prefs_button_press_broadcast_default_value" translatable="false">nodomain.freeyourgadget.gadgetbridge.ButtonPressed</string>
-    <string name="prefs_title_heartrate_measurement_interval">Egész napos szívritmus mérés</string>
+    <string name="prefs_title_heartrate_measurement_interval">Egész napos pulzusmérés</string>
     <string name="prefs_screen_orientation">Képernyő tájolása</string>
     <string name="pref_summary_sync_calendar">Naptár értesítések bekapcsolása mikor nincs kapcsolat a telefonnal</string>
     <string name="fw_upgrade_notice_amazfitcor">Ön a %s firmware-t telepíti az Amazfit Cor-ra.
@@ -1253,4 +1253,29 @@
     <string name="gps_gnolass">GPS + GLONASS</string>
     <string name="gps_bds">GPS + BDS</string>
     <string name="low_power_gps">Alacsony energiájú GPS</string>
+    <string name="heartrate_bpm_110">110 bpm</string>
+    <string name="heartrate_bpm_135">135 bpm</string>
+    <string name="prefs_autoheartrate_interval">Mérések gyakorisága</string>
+    <string name="heartrate_bpm_105">105 bpm</string>
+    <string name="heartrate_bpm_40">40 bpm</string>
+    <string name="zetime_title_heart_rate_alarm">Pulzus riasztás</string>
+    <string name="heartrate_bpm_130">130 bpm</string>
+    <string name="zetime_title_heartrate">Pulzus beállítások</string>
+    <string name="live_activity_max_heart_rate">Jelenlegi / maximum pulzus: %1$d / %2$d</string>
+    <string name="mi2_prefs_heart_rate_monitoring_summary">Pulzusmérés beállítása</string>
+    <string name="pref_header_heartrate_allday">Egész napos mérés</string>
+    <string name="mi2_prefs_heart_rate_monitoring">Pulzusmérés</string>
+    <string name="pref_header_heartrate_alerts">Pulzus riasztások</string>
+    <string name="heartrate_bpm_125">125 bpm</string>
+    <string name="heartrate_bpm_100">100 bpm</string>
+    <string name="heartrate_bpm_145">145 bpm</string>
+    <string name="heartrate_bpm_115">115 bpm</string>
+    <string name="heartrate_bpm_150">150 bpm</string>
+    <string name="prefs_autoheartrate_measurement">Automatikus pulzusmérések</string>
+    <string name="heartrate_bpm_140">140 bpm</string>
+    <string name="prefs_autoheartrate_sleep">Alvás közben végezzen méréseket</string>
+    <string name="heartrate_bpm_45">45 bpm</string>
+    <string name="heartrate_bpm_120">120 bpm</string>
+    <string name="zetime_heart_rate_alarm_enable">Pulzus riasztás engedélyezése</string>
+    <string name="heartrate_bpm_50">50 bpm</string>
 </resources>
\ No newline at end of file

From 7c6fac1dabfc5f691756a97d491cb6139f336cab Mon Sep 17 00:00:00 2001
From: arjan-s <a_gitlab@anymore.nl>
Date: Tue, 5 Dec 2023 20:24:25 +0000
Subject: [PATCH 355/595] Translated using Weblate (Dutch)

Currently translated at 100.0% (2359 of 2359 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/nl/
---
 app/src/main/res/values-nl/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 0b957d776..f6864defa 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -2568,4 +2568,5 @@
     <string name="menuitem_alerts">Meldingen</string>
     <string name="devicetype_miband7pro">Xiaomi Smart Band 7 Pro</string>
     <string name="devicetype_xiaomi_watch_s1_active">Xiaomi Watch S1 Active</string>
+    <string name="devicetype_mi_watch_color_sport">Mi Watch Color Sport</string>
 </resources>
\ No newline at end of file

From 9ff4d4736851b5ebf5cbb0f961e449ca2be1146a Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Wed, 6 Dec 2023 16:06:29 +0000
Subject: [PATCH 356/595] Translated using Weblate (Spanish)

Currently translated at 100.0% (2360 of 2360 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/es/
---
 app/src/main/res/values-es/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index ddcff8b43..824419e51 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -2571,4 +2571,5 @@
     <string name="devicetype_xiaomi_watch_s1_active">Xiaomi Watch S1 Active</string>
     <string name="devicetype_miband7pro">Xiaomi Smart Band 7 Pro</string>
     <string name="devicetype_mi_watch_color_sport">Mi Watch Color Sport</string>
+    <string name="devicetype_pixoo">Pixoo</string>
 </resources>
\ No newline at end of file

From b01804049ff2efa5f6bb53769e9f413248fbdb26 Mon Sep 17 00:00:00 2001
From: Storm <storm+weblate@chemicalstorm.org>
Date: Wed, 6 Dec 2023 23:29:10 +0000
Subject: [PATCH 357/595] Translated using Weblate (French)

Currently translated at 100.0% (2360 of 2360 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/fr/
---
 app/src/main/res/values-fr/strings.xml | 40 +++++++++++++++++---------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index b892ce970..a8d2df52e 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -927,7 +927,7 @@ Temps de sommeil préféré en heures</string>
     <string name="activity_filter_name_contains">Étiquette</string>
     <string name="activity_filter_filter_title">Filtre</string>
     <string name="activity_filter_reset_filter">Effacer les filtres</string>
-    <string name="activity_filter_date_to">A</string>
+    <string name="activity_filter_date_to">À</string>
     <string name="activity_filter_date_from">De</string>
     <string name="pref_header_statistics">Statistiques sur les activités sportives</string>
     <string name="pref_header_filter">Filtre sur les activités sportives</string>
@@ -990,7 +990,7 @@ Temps de sommeil préféré en heures</string>
     <string name="error_retrieving_devices_database">Erreur lors de la récupération des appareils de la base de données</string>
     <string name="error_setting_alias">Erreur pour configurer l\'alias:</string>
     <string name="error_exporting_device_preferences">Erreur à l\'exportation des préférences spécifiques de cet appareil</string>
-    <string name="pref_check_permission_status_summary">Demander et vérifier les autorisations manquantes même si elles ne sont pas immédiatement nécessaires. Les désactiver uniquement si votre appareil ne supporte pas ces fonctions. Refuser une autorisation peut provoquer des problèmes !</string>
+    <string name="pref_check_permission_status_summary">Demander et vérifier les autorisations manquantes même si elles ne sont pas immédiatement nécessaires. Désactiver uniquement si votre appareil ne supporte pas ces fonctions. Refuser une autorisation peut provoquer des problèmes !</string>
     <string name="pref_check_permission_status">Vérifier l\'état des autorisations</string>
     <string name="error_background_service_reason">Le démarrage du service en arrière-plan n\'a pas réussi à cause d\'une exception. Erreur:</string>
     <string name="device_requires_key">CLÉ NÉCESSAIRE, APPUI LONG POUR ENTRER</string>
@@ -1008,8 +1008,8 @@ Temps de sommeil préféré en heures</string>
     <string name="about_contributors">Contributeurs</string>
     <string name="about_core_team_title">Équipe principal (dans l\'ordre de la première contribution au code)</string>
     <string name="about_description_generic">Un remplaçant libre et sans cloud aux applications Android propriétaires des fabricants de vos bracelets.</string>
-    <string name="about_activity_title_generic">A propos de Gadgetbridge</string>
-    <string name="about_title">A propos</string>
+    <string name="about_activity_title_generic">À propos de Gadgetbridge</string>
+    <string name="about_title">À propos</string>
     <string name="menuitem_worldclock">Horloge mondiale</string>
     <string name="menuitem_stress">Stress</string>
     <string name="menuitem_breathing">Respiration</string>
@@ -1033,7 +1033,7 @@ Temps de sommeil préféré en heures</string>
     <string name="activity_type_elliptical_trainer">Entraîneur elliptique</string>
     <string name="activity_type_indoor_cycling">Vélo d\'intérieur</string>
     <string name="activity_type_swimming_openwater">Natation (en eau libre)</string>
-    <string name="pref_title_weather_summary">Utilisé par le fournisseur météo de LineageOS, les autres versions d\'Android doivent utilisées une application comme Weather notification. Se reporter au wiki Gadgetbridge.</string>
+    <string name="pref_title_weather_summary">Utilisé par le fournisseur météo de LineageOS, les autres versions d\'Android doivent utiliser une application comme Weather notification. Se reporter au wiki Gadgetbridge.</string>
     <string name="fw_upgrade_notice_miband5">Vous êtes sur le point d\'installer le micrologiciel %s dans votre Mi Band 5.
 \n
 \nVeuillez installer le fichier .fw, puis le fichier .res. Votre montre redémarrera après avoir installé le fichier .fw.
@@ -1585,16 +1585,16 @@ Temps de sommeil préféré en heures</string>
     <string name="watchface_setting_light_up_on_notification">S\'allumer pour une nouvelle notification</string>
     <string name="menuitem_email">Email</string>
     <string name="title_activity_controlcenter_banglejs_main">Bangle.js Gadgetbridge</string>
-    <string name="about_activity_title_banglejs_main">A propos de Bangle.js Gadgetbridge</string>
+    <string name="about_activity_title_banglejs_main">À propos de Bangle.js Gadgetbridge</string>
     <string name="application_name_banglejs_main">Bangle.js Gadgetbridge</string>
     <string name="about_description_banglejs_main">Application complémentaire Android pour Bangle.js élaborée sur la base du projet Gadgetbridge, avec des fonctionnalités Internet supplémentaires.
 \n
 \nEn raison des règles du Google Play Store, nous ne pouvons pas mettre de lien de don directement dans l\'application, mais si vous appréciez cette application, pensez à faire un don via la page web de Gadgetbridge ci-dessous.</string>
     <string name="application_name_banglejs_nopebble">Bangle.js pour Gadgetbridge</string>
     <string name="title_activity_controlcenter_banglejs_nopebble">Bangle.js pour Gadgetbridge</string>
-    <string name="about_activity_title_main_nightly">A propos de Gatgetbridge Nightly</string>
+    <string name="about_activity_title_main_nightly">À propos de Gatgetbridge Nightly</string>
     <string name="about_activity_title_banglejs_nopebble">A propos de Bangle.js pour Gadgetbridge</string>
-    <string name="about_activity_title_main_nopebble">A propos de Gadgetbridge Nightly sans Pebble</string>
+    <string name="about_activity_title_main_nopebble">À propos de Gadgetbridge Nightly sans Pebble</string>
     <string name="about_description_main_nightly">Remplaçant autonome et sous licence libre pour remplacer les applications propriétaires des fabricants. Version Nightly de Gadgetbridge. Ne peut pas être installé si vous avez déja Gadgetbridge ou Pebble d\'installé, en raison d\'un conflit avec l\'application Pebble.</string>
     <string name="application_name_main_nopebble">Gadgetbridage (Nightly, pas defournisseur Pebble)</string>
     <string name="title_activity_controlcenter_main_nopebble">Gadgetbridge Nightly Sans Pebble</string>
@@ -1814,7 +1814,7 @@ Temps de sommeil préféré en heures</string>
     <string name="watchface_setting_title_custom_events">Événements personnalisés</string>
     <string name="pref_write_logfiles_not_available">Création du fichier journal ratée, l\'écriture du fichier journal est indisponible. Redémarrer l\'application pour essayer de nouveau l\'écriture du fichier journal.</string>
     <string name="controlcenter_get_heartrate_measurement">Obtenir les mesures de rythme cardiaque</string>
-    <string name="about_activity_title_banglejs_nightly">A propos de Bangle.js Gadgetbridge (Version quotidienne)</string>
+    <string name="about_activity_title_banglejs_nightly">À propos de Bangle.js Gadgetbridge (Version quotidienne)</string>
     <string name="title_activity_controlcenter_banglejs_nightly">Bangle.js Gadgetbridge (Version quotidienne)</string>
     <string name="application_name_banglejs_nightly">Bangle.js Gadgetbridge (Version quotidienne)</string>
     <string name="devicetype_binary_sensor">Capteur binaire</string>
@@ -1826,13 +1826,13 @@ Temps de sommeil préféré en heures</string>
     <string name="prefs_hourly_chime_summary">La montre fera un beep toutes les heures</string>
     <string name="step_streaks_achievements_sharing_title">Objectifs de pas</string>
     <string name="step_streaks_achievements_sharing_message">Mes résultats quotidiens de pas !</string>
-    <string name="permission_display_over_other_apps">%1$s a besoin d\'une autorisation pour s\'afficher au-dessus des autres apps afin de pouvoir lanter des activités via la commande vocale lorsque %1$s est en arrière-plan.
+    <string name="permission_display_over_other_apps">%1$s a besoin d\'une autorisation pour s\'afficher au-dessus des autres apps afin de pouvoir lancer des activités via la commande vocale lorsque %1$s est en arrière-plan.
 \n
 \nCela peut être utilisé pour démarrer une application de musique et jouer un morceau, et de nombreuses autres choses.
 \n
 \nMerci de choisir \'%2$s\' puis \'%1$s\' et activer \'Permettre l\'affichage au-dessus des autres apps\', puis faire \'Retour\' pour revenir à %1$s.
 \n
-\nPour empêcher %1$s de demander des permissions se rendre dans les \'Régalges\' et décocher \'Vérifier l\'état des permissions\'.
+\nPour empêcher %1$s de demander des permissions se rendre dans les \'Réglages\' et décocher \'Vérifier l\'état des permissions\'.
 \n
 \nAssurez-vous d\'accorder à %1$s les permissions nécessaires pour les fonctionnalités attendues.</string>
     <string name="pref_header_time">Heure</string>
@@ -2053,8 +2053,8 @@ Temps de sommeil préféré en heures</string>
     <string name="menuitem_phone">Téléphone</string>
     <string name="menuitem_brightness">Luminosité</string>
     <string name="pref_title_lower_button_short_press_action">Action sur un appui court du bouton inférieur</string>
-    <string name="pref_title_notification_media_ignores_application_list">liste des applications dont les notifications média doivent être ignorées</string>
-    <string name="pref_summary_notification_media_ignores_application_list">Traiter les notifications média avant la liste des app. Si la préférence n\'est pas cochée, les applicatioms média doivent être autorisées dans la liste des applications pour que les contrôles média fonctionnent sur l\'appareil.</string>
+    <string name="pref_title_notification_media_ignores_application_list">Liste des applications dont les notifications média doivent être ignorées</string>
+    <string name="pref_summary_notification_media_ignores_application_list">Traiter les notifications média avant la liste des app. Si la préférence n\'est pas cochée, les applications média doivent être autorisées dans la liste des applications pour que les contrôles média fonctionnent sur l\'appareil.</string>
     <string name="debugactivity_confirm_remove_device_preferences_title">Supprimer les préférences de l\'appareil \?</string>
     <string name="debugactivity_confirm_remove_device_preferences">Cela supprimera toutes les préférences appareil pour tous les appareils connectés. Etes-vous sûr \?</string>
     <string name="menuitem_eject_water">Éjecter l\'eau</string>
@@ -2167,7 +2167,7 @@ Temps de sommeil préféré en heures</string>
     <string name="pref_pair_bluetooth_calls_title">Coupler pour les appels Bluetooth</string>
     <string name="pref_pair_bluetooth_calls_help_summary">Afin de recevoir les appels en Bluetooth, vous devez pairer votre téléphone avec une seconde instance de la montre.</string>
     <string name="pref_pair_bluetooth_calls_help_2">2. Rendez-vous dans les réglages Bluetooth de votre téléphone, et pairez-le avec le nouvel appareil qui apparaitra (nom similaire à votre montre existante, mais avec un suffixe, du style \"Amazfit GTR 4 - AFC8\".</string>
-    <string name="pref_title_notification_cache_while_disconnected">Masquer lorsque hors de portée</string>
+    <string name="pref_title_notification_cache_while_disconnected">Garder en cache lorsque hors de portée</string>
     <string name="pref_summary_notification_cache_while_disconnected">Envoyer les notifications manquées lorsqu\'un appareil se reconnecte après avoir été hors de portée</string>
     <string name="pref_switch_controls_anc_ambient_off">Annulation de bruit ←→ Ambiance ←→ Off</string>
     <string name="single_tap">Appui simple</string>
@@ -2537,4 +2537,16 @@ Temps de sommeil préféré en heures</string>
     <string name="menuitem_thermometer">Thermomètre</string>
     <string name="devicetype_femometer_vinca2">Femometer Vinca II</string>
     <string name="fossil_hr_nav_app_not_installed_notify_title">App de navigation non installée sur le téléphone</string>
+    <string name="pref_title_casio_alert_other">Alerte pour les autres notifications</string>
+    <string name="pref_title_casio_alert_calendar">Alerte pour les notifications du calendrier</string>
+    <string name="pref_summary_casio_alert_call">Alerte (vibre/bipe) pour les appels entrants</string>
+    <string name="pref_title_casio_alert_call">Alerte pour les appels entrants</string>
+    <string name="pref_title_casio_alert_email">Alerte pour les notifications d\'email</string>
+    <string name="pref_summary_casio_alert_email">Alerte (vibre/bipe) pour les notifications d\'email</string>
+    <string name="pref_summary_casio_alert_sms">Alerte (vibre/bipe) pour les notifications SMS (message texte)</string>
+    <string name="pref_title_preview_message_in_title">Montrer un aperçu du message dans le titre</string>
+    <string name="pref_summary_casio_alert_calendar">Alerte (vibre/bipe) pour les notifications du calendrier</string>
+    <string name="pref_summary_casio_alert_other">Alerte (vibre/bipe) pour les notifications de la catégorie autre</string>
+    <string name="pref_title_prefix_notification_with_app">Nom de l\'app dans la notification</string>
+    <string name="pref_title_casio_alert_sms">Alerte pour les notifications SMS</string>
 </resources>
\ No newline at end of file

From 4423c7098b042ccdf223c463f7d994a917d369d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vinc=C3=A8n=20PUJOL?= <vincen@vincen.org>
Date: Thu, 7 Dec 2023 05:42:28 +0000
Subject: [PATCH 358/595] Translated using Weblate (French)

Currently translated at 100.0% (2360 of 2360 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/fr/
---
 app/src/main/res/values-fr/strings.xml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index a8d2df52e..da8deef6d 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -2549,4 +2549,29 @@ Temps de sommeil préféré en heures</string>
     <string name="pref_summary_casio_alert_other">Alerte (vibre/bipe) pour les notifications de la catégorie autre</string>
     <string name="pref_title_prefix_notification_with_app">Nom de l\'app dans la notification</string>
     <string name="pref_title_casio_alert_sms">Alerte pour les notifications SMS</string>
+    <string name="devicetype_mi_watch_color_sport">Mi Watch Color Sport</string>
+    <string name="pref_title_navigation_apps">Applications de navigation</string>
+    <string name="devicetype_miband8">Xiaomi Smart Band 8</string>
+    <string name="menuitem_running">Course à pieds</string>
+    <string name="pref_sleep_mode_schedule_title">Planification de l\'heure de coucher</string>
+    <string name="bedtime">Heure du coucher</string>
+    <string name="devicetype_pixoo">Pixoo</string>
+    <string name="pref_title_navigation_prefs">Préférences de navigation</string>
+    <string name="menuitem_focus">Focus</string>
+    <string name="pref_navigation_app_gmaps">Google Maps</string>
+    <string name="pref_summary_prefix_notification_with_app">Ajouter un préfixe au titre de la notification avec le nom de l\'application source</string>
+    <string name="devicetype_redmiwatch3active">Redmi Watch 3 Active</string>
+    <string name="serial_number">Numéro de série</string>
+    <string name="danish">Danois</string>
+    <string name="pref_summary_osmand_packagename">Utilisé pour sélectionner la version d\'OsmAnd à laquelle se connecter</string>
+    <string name="wake_up_time">Réveil</string>
+    <string name="devicetype_miband7pro">Xiaomi Smart Band 7 Pro</string>
+    <string name="menuitem_stats">Stats</string>
+    <string name="devicetype_xiaomi_watch_lite">Xiaomi Watch Lite</string>
+    <string name="pref_summary_preview_message_in_title">Afficher un aperçu du message dans le titre de la notification comme permis par l\'appareil</string>
+    <string name="pref_title_osmand_packagename">nom du paquet OsmAnd</string>
+    <string name="pref_navigation_app_osmand">OsmAnd(+)</string>
+    <string name="pref_sleep_mode_schedule_summary">Envoyer un rappel et se mettre en veille à l\'heure du coucher. A l\'heure prévue de réveil, l\'alarme de réveil sonnera.</string>
+    <string name="menuitem_alerts">Alertes</string>
+    <string name="devicetype_xiaomi_watch_s1_active">Xiaomi Watch S1 Active</string>
 </resources>
\ No newline at end of file

From 374fda85b65d59dbd25dd957c457c43a74245048 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81cs=20Zolt=C3=A1n?= <acszoltan111@gmail.com>
Date: Thu, 7 Dec 2023 09:20:57 +0000
Subject: [PATCH 359/595] Translated using Weblate (Hungarian)

Currently translated at 52.5% (1241 of 2360 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/hu/
---
 app/src/main/res/values-hu/strings.xml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index d9e5c931f..8396ca9e6 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -113,12 +113,12 @@
     <string name="pref_pebble_privacy_mode_off">Normál értesítések</string>
     <string name="pref_pebble_privacy_mode_content">Az értesítésszöveg eltolása képernyőn</string>
     <string name="pref_pebble_privacy_mode_complete">Csak az értesítési ikon megjelenítése</string>
-    <string name="pref_header_location">Helyzet</string>
-    <string name="pref_title_location_aquire">Pozició meghatározása</string>
+    <string name="pref_header_location">Hely</string>
+    <string name="pref_title_location_aquire">Hely meghatározása</string>
     <string name="pref_title_location_latitude">Szélesség</string>
     <string name="pref_title_location_longitude">Hosszúság</string>
-    <string name="pref_title_location_keep_uptodate">Helyzet frissen tartása</string>
-    <string name="pref_summary_location_keep_uptodate">Aktuális pozició meghatározásának megpróbálása futásidőben, hiba esetén az eltárolt pozíció használata</string>
+    <string name="pref_title_location_keep_uptodate">Hely frissen tartása</string>
+    <string name="pref_summary_location_keep_uptodate">Aktuális hely meghatározásának megpróbálása futásidőben, hiba esetén az eltárolt hely használata</string>
     <string name="toast_enable_networklocationprovider">Kérem, engedélyezze a hálózati helymeghatározást</string>
     <string name="toast_aqurired_networklocation">Hely meghatározva</string>
     <string name="pref_title_pebble_forceprotocol">Értesítési protokoll erőltetése</string>
@@ -1278,4 +1278,7 @@
     <string name="heartrate_bpm_120">120 bpm</string>
     <string name="zetime_heart_rate_alarm_enable">Pulzus riasztás engedélyezése</string>
     <string name="heartrate_bpm_50">50 bpm</string>
+    <string name="require_location_provider">A helymeghatározásnak engedélyezve kell lennie</string>
+    <string name="pref_title_banglejs_phone_gps_network_only">Hálózat használata csak a hely meghatározásához</string>
+    <string name="notification_gps_text">GPS hely küldése %1$d eszközökre</string>
 </resources>
\ No newline at end of file

From a39696d81a92de01e0e6d0b87109b15682a8f041 Mon Sep 17 00:00:00 2001
From: Xtremo3 <a.lewicki95@gmail.com>
Date: Wed, 6 Dec 2023 20:26:15 +0000
Subject: [PATCH 360/595] Translated using Weblate (Polish)

Currently translated at 100.0% (2360 of 2360 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/pl/
---
 app/src/main/res/values-pl/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 52f0d1e1c..5a74dc59c 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -2578,4 +2578,5 @@
     <string name="pref_title_casio_alert_sms">Alert powiadomień SMS</string>
     <string name="menuitem_alerts">Alerty</string>
     <string name="devicetype_xiaomi_watch_s1_active">Xiaomi Watch S1 Active</string>
+    <string name="devicetype_pixoo">Pixoo</string>
 </resources>
\ No newline at end of file

From 9846ae8988c41a74ebfe5f165a15d3a50ff91400 Mon Sep 17 00:00:00 2001
From: 0que <0que@users.noreply.hosted.weblate.org>
Date: Thu, 7 Dec 2023 14:41:24 +0000
Subject: [PATCH 361/595] Translated using Weblate (Russian)

Currently translated at 99.4% (2346 of 2360 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ru/
---
 app/src/main/res/values-ru/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index d5676c44e..d4ed79627 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -2562,4 +2562,5 @@
     <string name="devicetype_miband7pro">Xiaomi Smart Band 7 Pro</string>
     <string name="devicetype_xiaomi_watch_s1_active">Xiaomi Watch S1 Active</string>
     <string name="devicetype_mi_watch_color_sport">Mi Watch Color Sports</string>
+    <string name="devicetype_pixoo">Pixoo</string>
 </resources>
\ No newline at end of file

From 19aac0f738c051fa9202f128251d7abedaabdab8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B0=91=E4=B8=BE?= <oshirisu.red@gmail.com>
Date: Thu, 7 Dec 2023 02:44:31 +0000
Subject: [PATCH 362/595] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (2360 of 2360 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/zh_Hans/
---
 app/src/main/res/values-zh-rCN/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index f349ab48f..7761c341f 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -2569,4 +2569,5 @@
     <string name="devicetype_miband7pro">小米智能手环 7 Pro</string>
     <string name="devicetype_xiaomi_watch_s1_active">小米手表 S1 运动版</string>
     <string name="devicetype_mi_watch_color_sport">小米手表彩色运动版</string>
+    <string name="devicetype_pixoo">Pixoo</string>
 </resources>
\ No newline at end of file

From a795020b37c1e2495c95b698005518f759d6cbca Mon Sep 17 00:00:00 2001
From: Storm <storm+weblate@chemicalstorm.org>
Date: Wed, 6 Dec 2023 23:33:07 +0000
Subject: [PATCH 363/595] Translated using Weblate (French (Canada))

Currently translated at 34.0% (804 of 2360 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/fr_CA/
---
 app/src/main/res/values-fr-rCA/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/values-fr-rCA/strings.xml b/app/src/main/res/values-fr-rCA/strings.xml
index fdbef6cda..0cffe1aa9 100644
--- a/app/src/main/res/values-fr-rCA/strings.xml
+++ b/app/src/main/res/values-fr-rCA/strings.xml
@@ -898,4 +898,6 @@
 \nÀ VOS RISQUES ET PÉRILS!</string>
     <string name="controlcenter_set_alias">Définir un alias</string>
     <string name="find_lost_device_message">Rechercher %1$s\?</string>
+    <string name="pref_title_casio_alert_email">Alerte pour les notifications de courriel</string>
+    <string name="pref_summary_casio_alert_email">Alerte (vibre/bipe) pour les notifications de courriel</string>
 </resources>
\ No newline at end of file

From 48f30b3d262152573c4268c82bf831df18053ba2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B0=91=E4=B8=BE?= <oshirisu.red@gmail.com>
Date: Fri, 8 Dec 2023 11:47:59 +0000
Subject: [PATCH 364/595] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (2362 of 2362 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/zh_Hans/
---
 app/src/main/res/values-zh-rCN/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 7761c341f..8a5f7650c 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -2570,4 +2570,6 @@
     <string name="devicetype_xiaomi_watch_s1_active">小米手表 S1 运动版</string>
     <string name="devicetype_mi_watch_color_sport">小米手表彩色运动版</string>
     <string name="devicetype_pixoo">Pixoo</string>
+    <string name="pref_summary_send_app_notifications">向设备发送应用通知</string>
+    <string name="pref_title_send_app_notifications">发送通知</string>
 </resources>
\ No newline at end of file

From b85c40313bbd08367d1f485579a73581c556ba42 Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Fri, 8 Dec 2023 13:44:28 +0000
Subject: [PATCH 365/595] Translated using Weblate (Spanish)

Currently translated at 100.0% (2362 of 2362 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/es/
---
 app/src/main/res/values-es/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 824419e51..8bbd24f02 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -2572,4 +2572,6 @@
     <string name="devicetype_miband7pro">Xiaomi Smart Band 7 Pro</string>
     <string name="devicetype_mi_watch_color_sport">Mi Watch Color Sport</string>
     <string name="devicetype_pixoo">Pixoo</string>
+    <string name="pref_summary_send_app_notifications">Enviar notificaciones de las aplicaciones al dispositivo</string>
+    <string name="pref_title_send_app_notifications">Enviar notificaciones</string>
 </resources>
\ No newline at end of file

From 2dcac196659e6ee82514f07d834822df1ef12bbc Mon Sep 17 00:00:00 2001
From: 0que <0que@users.noreply.hosted.weblate.org>
Date: Fri, 8 Dec 2023 16:16:27 +0000
Subject: [PATCH 366/595] Translated using Weblate (Russian)

Currently translated at 99.4% (2348 of 2362 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ru/
---
 app/src/main/res/values-ru/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index d4ed79627..ff8ae624b 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -2563,4 +2563,6 @@
     <string name="devicetype_xiaomi_watch_s1_active">Xiaomi Watch S1 Active</string>
     <string name="devicetype_mi_watch_color_sport">Mi Watch Color Sports</string>
     <string name="devicetype_pixoo">Pixoo</string>
+    <string name="pref_summary_send_app_notifications">Передавать уведомления приложений на устройство</string>
+    <string name="pref_title_send_app_notifications">Передавать уведомления</string>
 </resources>
\ No newline at end of file

From 2bc0b33c697f0079535007e4308d901d8cf01e40 Mon Sep 17 00:00:00 2001
From: arjan-s <a_gitlab@anymore.nl>
Date: Fri, 8 Dec 2023 13:03:57 +0000
Subject: [PATCH 367/595] Translated using Weblate (Dutch)

Currently translated at 100.0% (2362 of 2362 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/nl/
---
 app/src/main/res/values-nl/strings.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index f6864defa..8469617cd 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -2569,4 +2569,7 @@
     <string name="devicetype_miband7pro">Xiaomi Smart Band 7 Pro</string>
     <string name="devicetype_xiaomi_watch_s1_active">Xiaomi Watch S1 Active</string>
     <string name="devicetype_mi_watch_color_sport">Mi Watch Color Sport</string>
+    <string name="devicetype_pixoo">Pixoo</string>
+    <string name="pref_summary_send_app_notifications">Stuur app-meldingen naar het apparaat</string>
+    <string name="pref_title_send_app_notifications">Stuur meldingen</string>
 </resources>
\ No newline at end of file

From 4eb30a79518555b3ccb5502f7db07c33d812a78b Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Sat, 9 Dec 2023 15:48:05 +0000
Subject: [PATCH 368/595] Translated using Weblate (Spanish)

Currently translated at 100.0% (2367 of 2367 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/es/
---
 app/src/main/res/values-es/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 8bbd24f02..667f3986f 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -2574,4 +2574,9 @@
     <string name="devicetype_pixoo">Pixoo</string>
     <string name="pref_summary_send_app_notifications">Enviar notificaciones de las aplicaciones al dispositivo</string>
     <string name="pref_title_send_app_notifications">Enviar notificaciones</string>
+    <string name="pref_device_action_dnd_on">No molestar - Activado</string>
+    <string name="pref_device_action_dnd_alarms">No molestar - Solo alarmas</string>
+    <string name="pref_device_action_dnd_priority">No molestar - Sólo con prioridad</string>
+    <string name="not_set">No fijado</string>
+    <string name="pref_device_action_dnd_off">No molestar - Desactivado</string>
 </resources>
\ No newline at end of file

From 4857b9284719aeea1ed19d4af11fa712b8551521 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B0=91=E4=B8=BE?= <oshirisu.red@gmail.com>
Date: Sat, 9 Dec 2023 13:35:14 +0000
Subject: [PATCH 369/595] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (2367 of 2367 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/zh_Hans/
---
 app/src/main/res/values-zh-rCN/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 8a5f7650c..77f72766e 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -2572,4 +2572,9 @@
     <string name="devicetype_pixoo">Pixoo</string>
     <string name="pref_summary_send_app_notifications">向设备发送应用通知</string>
     <string name="pref_title_send_app_notifications">发送通知</string>
+    <string name="pref_device_action_dnd_on">请勿打扰 - 已开启</string>
+    <string name="pref_device_action_dnd_alarms">请勿打扰 - 仅限闹钟</string>
+    <string name="pref_device_action_dnd_priority">请勿打扰 - 仅限优先</string>
+    <string name="not_set">未设置</string>
+    <string name="pref_device_action_dnd_off">请勿打扰 - 关闭</string>
 </resources>
\ No newline at end of file

From 555cf27aeb436bbe8a3e2ee915aaae8e3e4b21e1 Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Sun, 10 Dec 2023 11:07:24 +0000
Subject: [PATCH 370/595] Translated using Weblate (Spanish)

Currently translated at 100.0% (2370 of 2370 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/es/
---
 app/src/main/res/values-es/strings.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 667f3986f..1ee8adc71 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -2579,4 +2579,7 @@
     <string name="pref_device_action_dnd_priority">No molestar - Sólo con prioridad</string>
     <string name="not_set">No fijado</string>
     <string name="pref_device_action_dnd_off">No molestar - Desactivado</string>
+    <string name="pref_title_goal_secondary">Objetivo secundario</string>
+    <string name="standing_time">tiempo de reposo</string>
+    <string name="active_time">Tiempo activo</string>
 </resources>
\ No newline at end of file

From 972aaa310346def05c3e9c5d2419e9cfbde9318a Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Sun, 10 Dec 2023 11:53:03 +0000
Subject: [PATCH 371/595] Translated using Weblate (Spanish)

Currently translated at 99.8% (2372 of 2375 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/es/
---
 app/src/main/res/values-es/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 1ee8adc71..9d4f20afa 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -2582,4 +2582,6 @@
     <string name="pref_title_goal_secondary">Objetivo secundario</string>
     <string name="standing_time">tiempo de reposo</string>
     <string name="active_time">Tiempo activo</string>
+    <string name="pref_vitality_score_daily_title">Avances diarios</string>
+    <string name="pref_vitality_score_7_day_title">Progreso en 7 días</string>
 </resources>
\ No newline at end of file

From a69101ed3393c6fb99510a6c6b3bedc07e270049 Mon Sep 17 00:00:00 2001
From: Manuel-Senpai <senpai99@hotmail.com>
Date: Sun, 10 Dec 2023 13:15:26 +0000
Subject: [PATCH 372/595] Translated using Weblate (Spanish)

Currently translated at 100.0% (2375 of 2375 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/es/
---
 app/src/main/res/values-es/strings.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 9d4f20afa..d1cf9808d 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -2584,4 +2584,7 @@
     <string name="active_time">Tiempo activo</string>
     <string name="pref_vitality_score_daily_title">Avances diarios</string>
     <string name="pref_vitality_score_7_day_title">Progreso en 7 días</string>
+    <string name="pref_vitality_score_7_day_summary">Recibir una notificación cuando su puntuación de vitalidad alcance 30, 60 o 100 en los últimos 7 días</string>
+    <string name="pref_vitality_score_title">Nivel de vitalidad</string>
+    <string name="pref_vitality_score_daily_summary">Recibir una notificación cuando alcances el número máximo de puntos de vitalidad del día</string>
 </resources>
\ No newline at end of file

From 01f80500e3c5ba68a3b0ddda30e9a305c3d2078d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vinc=C3=A8n=20PUJOL?= <vincen@vincen.org>
Date: Sun, 10 Dec 2023 17:09:49 +0000
Subject: [PATCH 373/595] Translated using Weblate (French)

Currently translated at 100.0% (2375 of 2375 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/fr/
---
 app/src/main/res/values-fr/strings.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index da8deef6d..e605e45ac 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -2574,4 +2574,19 @@ Temps de sommeil préféré en heures</string>
     <string name="pref_sleep_mode_schedule_summary">Envoyer un rappel et se mettre en veille à l\'heure du coucher. A l\'heure prévue de réveil, l\'alarme de réveil sonnera.</string>
     <string name="menuitem_alerts">Alertes</string>
     <string name="devicetype_xiaomi_watch_s1_active">Xiaomi Watch S1 Active</string>
+    <string name="pref_device_action_dnd_on">Ne pas déranger - Actif</string>
+    <string name="pref_title_goal_secondary">Objectif secondaire</string>
+    <string name="pref_vitality_score_7_day_summary">Envoyer une notification quand votre score de vitalité atteint 30, 60 ou 100 sur les 7 derniers jours</string>
+    <string name="pref_vitality_score_title">Score Vitalité</string>
+    <string name="pref_device_action_dnd_alarms">Ne pas déranger - Alarmes uniquement</string>
+    <string name="pref_vitality_score_daily_summary">Envoyer une notification lorsque vous atteignez le maximum de points quotidiens de vitalité</string>
+    <string name="pref_summary_send_app_notifications">Envoyer les notifications de l\'application à l\'appareil</string>
+    <string name="pref_device_action_dnd_priority">Ne pas déranger - Prioritaire uniquement</string>
+    <string name="not_set">Non configuré</string>
+    <string name="standing_time">Temps de veille</string>
+    <string name="active_time">Temps actif</string>
+    <string name="pref_title_send_app_notifications">Envoyer des notifications</string>
+    <string name="pref_vitality_score_daily_title">Progrès quotidien</string>
+    <string name="pref_vitality_score_7_day_title">Progrès sur 7 jours</string>
+    <string name="pref_device_action_dnd_off">Ne pas déranger - Off</string>
 </resources>
\ No newline at end of file

From 13bb025c1bf63e38a1eb8878544bda14fa6b3bf5 Mon Sep 17 00:00:00 2001
From: Storm <storm+weblate@chemicalstorm.org>
Date: Sun, 10 Dec 2023 16:29:45 +0000
Subject: [PATCH 374/595] Translated using Weblate (French)

Currently translated at 100.0% (2375 of 2375 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/fr/
---
 app/src/main/res/values-fr/strings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index e605e45ac..60d898ee9 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -825,7 +825,7 @@ Temps de sommeil préféré en heures</string>
     <string name="pref_summary_sync_calendar">Permet les alertes de calendrier, même en cas de déconnexion</string>
     <string name="pref_title_sync_caldendar">Sync. calendrier des évènements</string>
     <string name="hr_widget_heart_rate">Fréquence cardiaque</string>
-    <string name="hr_widget_steps">Étapes</string>
+    <string name="hr_widget_steps">Pas</string>
     <string name="hr_widget_date">Date</string>
     <string name="hr_widget_active_minutes">Les minutes actives</string>
     <string name="hr_widget_calories">Calories</string>
@@ -1669,7 +1669,7 @@ Temps de sommeil préféré en heures</string>
     <string name="pref_summary_device_internet_access">Permettre aux apps sur cet appareil d\'accéder à Internet</string>
     <string name="pref_title_device_intents">Permettre les intentions</string>
     <string name="pref_workout_start_on_phone_title">Application de suivi sportif</string>
-    <string name="pref_workout_start_on_phone_summary">Démmare/arrête le suivi sportif sur le téléphone si une activité GPS est démarré sur le bracelet</string>
+    <string name="pref_workout_start_on_phone_summary">Démarre/arrête le suivi sportif sur le téléphone si une activité GPS est démarrée sur le bracelet</string>
     <string name="pref_workout_send_gps_title">Envoyer le GPS durant l\'exercice</string>
     <string name="pref_workout_send_gps_summary">Envoyer les données GPS en cours durant un exercice</string>
     <string name="notification_gps_title">GPS Gadgebridge</string>
@@ -2043,7 +2043,7 @@ Temps de sommeil préféré en heures</string>
     <string name="activity_prefs_goal_fat_burn_time_minutes">Objectif quotidien : temps d\'élimination de calories en minutes</string>
     <string name="menuitem_theater_mode">Mode Cinéma</string>
     <string name="pref_sleep_mode_smart_enable_summary">Activer le mode sommeil automatiquement lors du port du bracelet durant le sommeil</string>
-    <string name="pref_huami_truncate_fetch_operation_timestamps_title">Tronquer lse horaires lors de la récupération</string>
+    <string name="pref_huami_truncate_fetch_operation_timestamps_title">Tronquer les horaires lors de la récupération</string>
     <string name="menuitem_sun_moon">Soleil &amp; Lune</string>
     <string name="menuitem_offline_voice">Voix hors-ligne</string>
     <string name="menuitem_screen_always_lit">Écran tout le temps allumé</string>

From a9fab7dd8999d99d4b2c57b1d2a57ca2257531fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B0=91=E4=B8=BE?= <oshirisu.red@gmail.com>
Date: Mon, 11 Dec 2023 01:46:11 +0000
Subject: [PATCH 375/595] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (2379 of 2379 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/zh_Hans/
---
 app/src/main/res/values-zh-rCN/strings.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 77f72766e..e1116163d 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -2577,4 +2577,16 @@
     <string name="pref_device_action_dnd_priority">请勿打扰 - 仅限优先</string>
     <string name="not_set">未设置</string>
     <string name="pref_device_action_dnd_off">请勿打扰 - 关闭</string>
+    <string name="prefs_wearmode">佩戴方式</string>
+    <string name="wearmode_pebble">Pebble（鞋扣）</string>
+    <string name="pref_title_goal_secondary">次要目标</string>
+    <string name="pref_vitality_score_7_day_summary">当您的活力值在过去 7 天内达到 30、60 或 100 时，您会收到通知</string>
+    <string name="pref_vitality_score_title">活力值</string>
+    <string name="pref_vitality_score_daily_summary">当您达到当天的最大活力值时收到通知</string>
+    <string name="standing_time">站立时间</string>
+    <string name="active_time">活动时间</string>
+    <string name="wearmode_band">手环（腕带）</string>
+    <string name="wearmode_necklace">项链（颈带）</string>
+    <string name="pref_vitality_score_daily_title">每日进度</string>
+    <string name="pref_vitality_score_7_day_title">7天进展</string>
 </resources>
\ No newline at end of file

From 65f45297bc24e52cda9f2b70b2129a3ed15c288d Mon Sep 17 00:00:00 2001
From: arjan-s <a_gitlab@anymore.nl>
Date: Mon, 11 Dec 2023 12:16:49 +0000
Subject: [PATCH 376/595] Translated using Weblate (Dutch)

Currently translated at 100.0% (2383 of 2383 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/nl/
---
 app/src/main/res/values-nl/strings.xml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 8469617cd..d45bf84ee 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -2572,4 +2572,25 @@
     <string name="devicetype_pixoo">Pixoo</string>
     <string name="pref_summary_send_app_notifications">Stuur app-meldingen naar het apparaat</string>
     <string name="pref_title_send_app_notifications">Stuur meldingen</string>
+    <string name="pref_device_action_dnd_on">Niet storen - Aan</string>
+    <string name="prefs_phone_silent_mode">Stiltestand telefoon</string>
+    <string name="prefs_wearmode">Draagwijze</string>
+    <string name="wearmode_pebble">Pebble (schoengesp)</string>
+    <string name="silent_mode_normal_vibrate">Normaal / Trillen</string>
+    <string name="pref_title_goal_secondary">Tweede doel</string>
+    <string name="pref_vitality_score_7_day_summary">Krijg een melding wanneer je vitaliteitsscore 30, 60 of 100 bereikt in de afgelopen 7 dagen</string>
+    <string name="pref_vitality_score_title">Vitaliteitsscore</string>
+    <string name="pref_device_action_dnd_alarms">Niet storen - Alleen alarmen</string>
+    <string name="silent_mode_vibrate_silent">Trillen / Stil</string>
+    <string name="pref_vitality_score_daily_summary">Krijg een melding wanneer je het dagelijks maximum aantal vitaliteitspunten hebt bereikt</string>
+    <string name="pref_device_action_dnd_priority">Niet storen - Alleen belangrijk</string>
+    <string name="not_set">Niet ingesteld</string>
+    <string name="standing_time">Tijd staand</string>
+    <string name="active_time">Tijd actief</string>
+    <string name="wearmode_band">Band (armband)</string>
+    <string name="wearmode_necklace">Ketting (om de nek)</string>
+    <string name="pref_vitality_score_daily_title">Dagelijkse voortgang</string>
+    <string name="pref_vitality_score_7_day_title">7-daagse voortgang</string>
+    <string name="pref_device_action_dnd_off">Niet storen - Uit</string>
+    <string name="silent_mode_normal_silent">Normaal / Stil</string>
 </resources>
\ No newline at end of file

From c1929948b45a43ae4a1115b53d464429fb995af3 Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Mon, 11 Dec 2023 16:52:59 +0000
Subject: [PATCH 377/595] Translated using Weblate (Spanish)

Currently translated at 100.0% (2384 of 2384 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/es/
---
 app/src/main/res/values-es/strings.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index d1cf9808d..d283a28ae 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -2587,4 +2587,13 @@
     <string name="pref_vitality_score_7_day_summary">Recibir una notificación cuando su puntuación de vitalidad alcance 30, 60 o 100 en los últimos 7 días</string>
     <string name="pref_vitality_score_title">Nivel de vitalidad</string>
     <string name="pref_vitality_score_daily_summary">Recibir una notificación cuando alcances el número máximo de puntos de vitalidad del día</string>
+    <string name="prefs_phone_silent_mode">Modo silencio del teléfono</string>
+    <string name="prefs_wearmode">Modo de uso</string>
+    <string name="wearmode_pebble">Pebble (hebilla de zapato)</string>
+    <string name="silent_mode_normal_vibrate">Normal / Vibración</string>
+    <string name="silent_mode_vibrate_silent">Vibrar / Silencio</string>
+    <string name="devicetype_redmi_smart_band_2">Redmi Smart Band 2</string>
+    <string name="wearmode_band">Pulsera (Pulsera)</string>
+    <string name="wearmode_necklace">Collar (tira para el cuello)</string>
+    <string name="silent_mode_normal_silent">Normal / Silencio</string>
 </resources>
\ No newline at end of file

From e7dbc2d05285db59c07d3335b819a403830346e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B0=91=E4=B8=BE?= <oshirisu.red@gmail.com>
Date: Mon, 11 Dec 2023 15:50:45 +0000
Subject: [PATCH 378/595] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (2384 of 2384 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/zh_Hans/
---
 app/src/main/res/values-zh-rCN/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index e1116163d..eef6a09d9 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -2589,4 +2589,9 @@
     <string name="wearmode_necklace">项链（颈带）</string>
     <string name="pref_vitality_score_daily_title">每日进度</string>
     <string name="pref_vitality_score_7_day_title">7天进展</string>
+    <string name="prefs_phone_silent_mode">手机静音模式</string>
+    <string name="silent_mode_normal_vibrate">普通 / 振动</string>
+    <string name="silent_mode_vibrate_silent">震动 / 静音</string>
+    <string name="devicetype_redmi_smart_band_2">红米智能手环2</string>
+    <string name="silent_mode_normal_silent">普通 / 静音</string>
 </resources>
\ No newline at end of file

From c21fbb42bbf5e5d198281a188152b0ea76e958ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B0=91=E4=B8=BE?= <oshirisu.red@gmail.com>
Date: Tue, 12 Dec 2023 01:35:00 +0000
Subject: [PATCH 379/595] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (2405 of 2405 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/zh_Hans/
---
 app/src/main/res/values-zh-rCN/strings.xml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index eef6a09d9..1604a1822 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -2594,4 +2594,25 @@
     <string name="silent_mode_vibrate_silent">震动 / 静音</string>
     <string name="devicetype_redmi_smart_band_2">红米智能手环2</string>
     <string name="silent_mode_normal_silent">普通 / 静音</string>
+    <string name="activity_type_trail_run">越野跑</string>
+    <string name="widget_layout">小部件布局</string>
+    <string name="widget_screen_no_free_slots_description">该设备没有用于小部件屏幕的空闲位置（位置总数：%1$s）</string>
+    <string name="widget_unknown_workout">未知锻炼 - %s</string>
+    <string name="widget_move_up">上移</string>
+    <string name="widget_screen_delete_confirm_description">您确定要删除“%1$s”吗？</string>
+    <string name="activity_type_trekking">徒步</string>
+    <string name="widget_layout_two">2 个小部件</string>
+    <string name="widget_screen_delete_confirm_title">删除小部件屏幕</string>
+    <string name="widget_layout_top_1_bot_2">1 个顶部，2 个底部</string>
+    <string name="widget_layout_top_2_bot_2">2 个顶部，2 个底部</string>
+    <string name="widget_screen_min_screens">必须至少有 %1$s 个屏幕</string>
+    <string name="widget">小部件</string>
+    <string name="widget_screen">小部件屏幕</string>
+    <string name="widget_move_down">下移</string>
+    <string name="widget_layout_single">1 个小部件</string>
+    <string name="widget_subtype">小部件子类型</string>
+    <string name="widget_screen_x">屏幕 %s</string>
+    <string name="widget_missing_parts">请选择所有小部件</string>
+    <string name="widget_layout_top_2_bot_1">2 个顶部，1 个底部</string>
+    <string name="activity_type_wrestling">摔角</string>
 </resources>
\ No newline at end of file

From bac5d6e6ffb568a58115e56293ffd3e09c0ab654 Mon Sep 17 00:00:00 2001
From: Xtremo3 <a.lewicki95@gmail.com>
Date: Wed, 13 Dec 2023 05:30:53 +0000
Subject: [PATCH 380/595] Translated using Weblate (Polish)

Currently translated at 98.2% (2362 of 2405 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/pl/
---
 app/src/main/res/values-pl/strings.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 5a74dc59c..1aa1fb07d 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -2579,4 +2579,8 @@
     <string name="menuitem_alerts">Alerty</string>
     <string name="devicetype_xiaomi_watch_s1_active">Xiaomi Watch S1 Active</string>
     <string name="devicetype_pixoo">Pixoo</string>
+    <string name="pref_title_goal_secondary">Drugi punkt</string>
+    <string name="pref_summary_send_app_notifications">Wyślij powiadomienie do urządzenia</string>
+    <string name="wearmode_band">Opaska (na nadgarstek)</string>
+    <string name="pref_title_send_app_notifications">Wyślij powiadomienie</string>
 </resources>
\ No newline at end of file

From b50f214f450a128c86933492ba5b163dbaebd70e Mon Sep 17 00:00:00 2001
From: 0que <0que@users.noreply.hosted.weblate.org>
Date: Wed, 13 Dec 2023 14:26:44 +0000
Subject: [PATCH 381/595] Translated using Weblate (Russian)

Currently translated at 99.2% (2388 of 2405 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ru/
---
 app/src/main/res/values-ru/strings.xml | 53 +++++++++++++++++++++++---
 1 file changed, 48 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index ff8ae624b..8f48625f5 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -1758,7 +1758,7 @@
     <string name="appmanager_app_download">Скачать в кэш</string>
     <string name="pref_enable_unsupported_settings_title">Включить неподдерживаемые настройки</string>
     <string name="mi2_prefs_heart_rate_monitoring_summary">Настроить отслеживание сердечного ритма</string>
-    <string name="prefs_always_on_display">Всегда на экране</string>
+    <string name="prefs_always_on_display">Экран всегда включен</string>
     <string name="prefs_always_on_display_summary">Всегда держать экран устройства включенным</string>
     <string name="prefs_activate_display_on_lift_sensitivity">Чувствительность</string>
     <string name="activity_type_zumba">Зумба</string>
@@ -1971,7 +1971,7 @@
     <string name="pref_workout_detection_time">Минуты активности перед обнаружением</string>
     <string name="pref_workout_detection_time_summary">Количество минут, в течение которых тренировка должна продолжаться, прежде чем она будет обнаружена</string>
     <string name="pref_contacts_summary">Настроить контакты на часах</string>
-    <string name="contact_delete_confirm_description">Вы уверены что хотите удалить контакт \'%1$s\'\?</string>
+    <string name="contact_delete_confirm_description">Вы точно хотите удалить контакт «%1$s»?</string>
     <string name="title_activity_contact_details">Контактная информация</string>
     <string name="fwapp_install_device_not_supported">Файл не может быть установлен, устройство не поддерживается.</string>
     <string name="activity_error_share_failed">Не удалось поделиться файлом.</string>
@@ -2039,7 +2039,7 @@
     <string name="activity_detail_share_raw_summary">Поделиться Необработанной Сводкой</string>
     <string name="activity_detail_share_raw_details">Поделиться Необработанными Деталями</string>
     <string name="dev_tools">Инструменты Разработчика</string>
-    <string name="prefs_always_on_display_follow_watchface">Стиль повторяет циферблат часов</string>
+    <string name="prefs_always_on_display_follow_watchface">Стиль как на циферблате</string>
     <string name="sports_activity_confirm_delete_description">Вы уверены, что хотите удалить %d активностей\?</string>
     <string name="menuitem_offline_voice">Оффлайн голос</string>
     <string name="pref_title_mb_intents">Транслировать Интенты Медиа-кнопок Напрямую</string>
@@ -2155,7 +2155,7 @@
     <string name="sony_speak_to_chat_sensitivity_auto">Автоматически</string>
     <string name="stress_moderate">Умеренный</string>
     <string name="stress_high">Высокий</string>
-    <string name="pai_total">Общий индекс физ. активности</string>
+    <string name="pai_total">Всего</string>
     <string name="pref_theme_dynamic">Адаптивные цвета</string>
     <string name="devicetype_casiogmwb5000">Casio GMW-B5000</string>
     <string name="watchface_widget_type_uv_index">Индекс УФ-излучения</string>
@@ -2365,7 +2365,7 @@
     <string name="prefs_double_tap_edge_summary">Засчитывать двойное касание, даже если оно было по экрану</string>
     <string name="prefs_sleep_time_summary">Время, когда собирается информация о сне</string>
     <string name="prefs_voice_detect_duration">Завершить после тишины на протяжении:</string>
-    <string name="pai_day">Дневное увеличение индекса физической активности</string>
+    <string name="pai_day">Прирост за день</string>
     <string name="sony_anc_optimize_confirmation_description">Используйте наушники по-обычному. Если условия ношения или атмосферное давление изменятся, запустите оптимизацию ещё раз.</string>
     <string name="sony_speak_to_chat">Разговор при ношении гарнитуры</string>
     <string name="pref_header_sony_equalizer_preset_custom_1">Своя предустановка 1</string>
@@ -2565,4 +2565,47 @@
     <string name="devicetype_pixoo">Pixoo</string>
     <string name="pref_summary_send_app_notifications">Передавать уведомления приложений на устройство</string>
     <string name="pref_title_send_app_notifications">Передавать уведомления</string>
+    <string name="activity_type_trail_run">Трейлраннинг</string>
+    <string name="widget_layout">Макет виджета</string>
+    <string name="widget_screen_no_free_slots_description">На устройстве не осталось свободных мест под экраны виджетов (всего: %1$s)</string>
+    <string name="pref_device_action_dnd_on">Не беспокоить - Вкл.</string>
+    <string name="prefs_phone_silent_mode">Беззвучный режим телефона</string>
+    <string name="widget_unknown_workout">Неизвестный тип тренировки - %s</string>
+    <string name="prefs_wearmode">Тип ношения</string>
+    <string name="wearmode_pebble">Pebble (на обуви)</string>
+    <string name="widget_move_up">Переместить выше</string>
+    <string name="widget_screen_delete_confirm_description">Вы точно хотите удалить «%1$s»?</string>
+    <string name="silent_mode_normal_vibrate">Нормальный / На вибрации</string>
+    <string name="pref_title_goal_secondary">Дополнительная цель</string>
+    <string name="pref_vitality_score_7_day_summary">Отправлять уведомление, когда уровень жизненной энергии за последние 7 дней достигает 30, 60 или 100</string>
+    <string name="activity_type_trekking">Горный поход</string>
+    <string name="pref_vitality_score_title">Уровень жизненной энергии</string>
+    <string name="widget_layout_two">2 виджета</string>
+    <string name="widget_screen_delete_confirm_title">Удалить экран виджета</string>
+    <string name="pref_device_action_dnd_alarms">Не беспокоить - Только будильник</string>
+    <string name="widget_layout_top_1_bot_2">1 наверху, 2 внизу</string>
+    <string name="widget_layout_top_2_bot_2">2 наверху, 2 внизу</string>
+    <string name="widget_screen_min_screens">Должно быть минимум %1$s экранов</string>
+    <string name="silent_mode_vibrate_silent">На вибрации / Беззвучный</string>
+    <string name="widget">Виджет</string>
+    <string name="pref_vitality_score_daily_summary">Отправлять уведомление при достижении максимального уровня жиз. энергии за день</string>
+    <string name="devicetype_redmi_smart_band_2">Redmi Smart Band 2</string>
+    <string name="widget_screen">Экран виджета</string>
+    <string name="widget_move_down">Переместить ниже</string>
+    <string name="widget_layout_single">1 виджет</string>
+    <string name="pref_device_action_dnd_priority">Не беспокоить - Только важные</string>
+    <string name="not_set">Не задано</string>
+    <string name="widget_subtype">Подтип виджета</string>
+    <string name="standing_time">Время стоя</string>
+    <string name="active_time">Время активности</string>
+    <string name="wearmode_band">Наручный браслет</string>
+    <string name="widget_screen_x">Экран %s</string>
+    <string name="widget_missing_parts">Выберите все виджеты</string>
+    <string name="widget_layout_top_2_bot_1">2 наверху, 1 внизу</string>
+    <string name="wearmode_necklace">Колье (шнурок на шее)</string>
+    <string name="pref_vitality_score_daily_title">Прогресс сегодня</string>
+    <string name="pref_vitality_score_7_day_title">Прогресс за 7 дней</string>
+    <string name="pref_device_action_dnd_off">Не беспокоить - Выкл.</string>
+    <string name="silent_mode_normal_silent">Нормальный / Беззвучный</string>
+    <string name="activity_type_wrestling">Борьба</string>
 </resources>
\ No newline at end of file

From 257be4106aff5f8cdc901b969231e80446481ce6 Mon Sep 17 00:00:00 2001
From: Ray <RayL-er@outlook.com>
Date: Wed, 13 Dec 2023 14:13:03 +0000
Subject: [PATCH 382/595] Translated using Weblate (Russian)

Currently translated at 99.2% (2388 of 2405 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ru/
---
 app/src/main/res/values-ru/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 8f48625f5..1e6f50d20 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -1955,7 +1955,7 @@
     <string name="devicetype_amazfit_trex_2">Amazfit T-Rex 2</string>
     <string name="pref_contacts_title">Контакты</string>
     <string name="contact_delete_confirm_title">Удалить контакт</string>
-    <string name="activity_prefs_goal_standing_time_minutes">Ежедневная цель: время стояния в минутах</string>
+    <string name="activity_prefs_goal_standing_time_minutes">Ежедневная цель: время стоя в минутах</string>
     <string name="prefs_always_on_display_style">Стиль</string>
     <string name="croatian">Хорватский</string>
     <string name="activity_prefs_goal_fat_burn_time_minutes">Ежедневная цель: время сжигания жира в минутах</string>

From 9c5c45331ba24e7650c6dc97595525649255df0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B0=91=E4=B8=BE?= <oshirisu.red@gmail.com>
Date: Wed, 13 Dec 2023 00:46:16 +0000
Subject: [PATCH 383/595] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (2405 of 2405 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/zh_Hans/
---
 app/src/main/res/values-zh-rCN/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 1604a1822..de2ae16aa 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -2271,8 +2271,8 @@
     <string name="num_min">%d 分钟</string>
     <string name="pai_chart_per_week">每周 PAI</string>
     <string name="pai_plus_num">+%d</string>
-    <string name="pai_total">总计 PAI</string>
-    <string name="pai_day">每日 AAI 增长</string>
+    <string name="pai_total">总计</string>
+    <string name="pai_day">每日增长</string>
     <string name="loyalty_cards_catima_not_installed">需要 Catima 来管理会员卡</string>
     <string name="loyalty_cards_catima_package">Catima 包名</string>
     <string name="loyalty_cards_install">安装 Catima</string>

From 3ab8521801ea2a9aefc581114f77e7f06d9a3853 Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Thu, 14 Dec 2023 11:06:46 +0000
Subject: [PATCH 384/595] Translated using Weblate (Spanish)

Currently translated at 100.0% (2405 of 2405 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/es/
---
 app/src/main/res/values-es/strings.xml | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index d283a28ae..b57c694af 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -2273,8 +2273,8 @@
     <string name="pai_chart_per_month">PAI al mes</string>
     <string name="pai_plus_num">+%d</string>
     <string name="num_min">%d min</string>
-    <string name="pai_total">PAI total</string>
-    <string name="pai_day">Aumento del PAI por día</string>
+    <string name="pai_total">Total</string>
+    <string name="pai_day">Aumento del día</string>
     <string name="loyalty_cards_install">Instalar Catima</string>
     <string name="loyalty_cards_sync_groups">Grupos a sincronizar</string>
     <string name="loyalty_cards_sync_starred">Sincronizar sólo tarjetas favoritas</string>
@@ -2596,4 +2596,25 @@
     <string name="wearmode_band">Pulsera (Pulsera)</string>
     <string name="wearmode_necklace">Collar (tira para el cuello)</string>
     <string name="silent_mode_normal_silent">Normal / Silencio</string>
+    <string name="activity_type_trail_run">Carrera de montaña</string>
+    <string name="widget_layout">Diseño del widget</string>
+    <string name="widget_screen_no_free_slots_description">El dispositivo no tiene espacio libre para pantallas con widgets (espacio total: %1$s)</string>
+    <string name="widget_unknown_workout">Entrenamiento desconocido - %s</string>
+    <string name="widget_move_up">Subir</string>
+    <string name="widget_screen_delete_confirm_description">¿Seguro que quieres borrar \'%1$s\'?</string>
+    <string name="activity_type_trekking">Senderismo</string>
+    <string name="widget_layout_two">2 widgets</string>
+    <string name="widget_screen_delete_confirm_title">Eliminar la pantalla de widgets</string>
+    <string name="widget_layout_top_1_bot_2">1 superior, 2 inferiores</string>
+    <string name="widget_layout_top_2_bot_2">2 superiores, 2 inferiores</string>
+    <string name="widget_screen_min_screens">Debe haber un mínimo de %1$s pantallas</string>
+    <string name="widget">Widget</string>
+    <string name="widget_screen">Pantalla con los widgets</string>
+    <string name="widget_move_down">Bajar</string>
+    <string name="widget_layout_single">1 widget</string>
+    <string name="widget_subtype">Subtipo de widget</string>
+    <string name="widget_screen_x">Pantalla %s</string>
+    <string name="widget_missing_parts">Por favor, seleccione todos los widgets</string>
+    <string name="widget_layout_top_2_bot_1">2 superior, 1 inferior</string>
+    <string name="activity_type_wrestling">Lucha libre</string>
 </resources>
\ No newline at end of file

From e62d75b443366af409900197c96731ab4352d8b8 Mon Sep 17 00:00:00 2001
From: 0que <0que@users.noreply.hosted.weblate.org>
Date: Fri, 15 Dec 2023 10:16:53 +0000
Subject: [PATCH 385/595] Translated using Weblate (Russian)

Currently translated at 99.2% (2390 of 2407 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ru/
---
 app/src/main/res/values-ru/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 1e6f50d20..c032251fd 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -2608,4 +2608,6 @@
     <string name="pref_device_action_dnd_off">Не беспокоить - Выкл.</string>
     <string name="silent_mode_normal_silent">Нормальный / Беззвучный</string>
     <string name="activity_type_wrestling">Борьба</string>
+    <string name="devicetype_colacao23">ColaCao 2023</string>
+    <string name="devicetype_colacao21">ColaCao 2021</string>
 </resources>
\ No newline at end of file

From 2c45f4606ac23d11cdd5449514a2443eb503cc82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B0=91=E4=B8=BE?= <oshirisu.red@gmail.com>
Date: Fri, 15 Dec 2023 00:51:34 +0000
Subject: [PATCH 386/595] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (2407 of 2407 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/zh_Hans/
---
 app/src/main/res/values-zh-rCN/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index de2ae16aa..c0d059fe9 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -2615,4 +2615,6 @@
     <string name="widget_missing_parts">请选择所有小部件</string>
     <string name="widget_layout_top_2_bot_1">2 个顶部，1 个底部</string>
     <string name="activity_type_wrestling">摔角</string>
+    <string name="devicetype_colacao23">高乐高 2023</string>
+    <string name="devicetype_colacao21">高乐高 2021</string>
 </resources>
\ No newline at end of file

From 663e5ef40ebef7f5b13b73c10170f09694fbf18d Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Fri, 15 Dec 2023 21:30:25 +0000
Subject: [PATCH 387/595] Translated using Weblate (Spanish)

Currently translated at 100.0% (2407 of 2407 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/es/
---
 app/src/main/res/values-es/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index b57c694af..5c96e93c5 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -2617,4 +2617,6 @@
     <string name="widget_missing_parts">Por favor, seleccione todos los widgets</string>
     <string name="widget_layout_top_2_bot_1">2 superior, 1 inferior</string>
     <string name="activity_type_wrestling">Lucha libre</string>
+    <string name="devicetype_colacao23">ColaCao 2023</string>
+    <string name="devicetype_colacao21">ColaCao 2021</string>
 </resources>
\ No newline at end of file

From 47ef7ec9705b024d756c445b0b097f610b631490 Mon Sep 17 00:00:00 2001
From: Ihor Hordiichuk <igor_ck@outlook.com>
Date: Sun, 17 Dec 2023 23:54:31 +0000
Subject: [PATCH 388/595] Translated using Weblate (Ukrainian)

Currently translated at 98.1% (2363 of 2407 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/uk/
---
 app/src/main/res/values-uk/strings.xml | 44 ++++++++++++++++++++++++--
 1 file changed, 42 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 33f968611..6a7418901 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -2279,8 +2279,8 @@
     <string name="pai_chart_per_month">PAI на місяць</string>
     <string name="pai_plus_num">+%d</string>
     <string name="num_min">%d хв</string>
-    <string name="pai_day">Денний приріст PAI</string>
-    <string name="pai_total">Всього PAI</string>
+    <string name="pai_day">Денний приріст</string>
+    <string name="pai_total">Усього</string>
     <string name="loyalty_cards_catima_package">Назва пакунка Catima</string>
     <string name="loyalty_cards_install">Установити Catima</string>
     <string name="loyalty_cards_sync_groups_only">Синхронізувати лише певні групи</string>
@@ -2541,4 +2541,44 @@
     <string name="menuitem_thermometer">Термометр</string>
     <string name="devicetype_femometer_vinca2">Femometer Vinca II</string>
     <string name="fossil_hr_nav_app_not_installed_notify_title">На годиннику не встановлено навігаційний застосунок</string>
+    <string name="pref_title_casio_alert_other">Інші сповіщення</string>
+    <string name="pref_title_casio_alert_calendar">Сповіщення календаря</string>
+    <string name="pref_summary_casio_alert_call">Сповіщення про вхідні виклики (вібрація/пищання)</string>
+    <string name="pref_device_action_dnd_on">Не турбувати - Увімкнено</string>
+    <string name="prefs_phone_silent_mode">Беззвучний режим телефона</string>
+    <string name="prefs_wearmode">Тип носіння</string>
+    <string name="wearmode_pebble">Pebble (пряжка на взутті)</string>
+    <string name="devicetype_miband8">Xiaomi Smart Band 8</string>
+    <string name="pref_title_casio_alert_call">Сповіщення про вхідні виклики</string>
+    <string name="silent_mode_normal_vibrate">Звичайний / Вібрація</string>
+    <string name="pref_title_goal_secondary">Додаткова мета</string>
+    <string name="pref_title_casio_alert_email">Сповіщення е-пошти</string>
+    <string name="activity_type_trekking">Похід у гори</string>
+    <string name="pref_summary_casio_alert_email">Сповіщення е-пошти (вібрація/пищання)</string>
+    <string name="pref_device_action_dnd_alarms">Не турбувати - Лише будильник</string>
+    <string name="pref_summary_casio_alert_sms">Сповіщення про СМС (вібрація/пищання)</string>
+    <string name="devicetype_colacao23">ColaCao 2023</string>
+    <string name="pref_title_preview_message_in_title">Показати попередній перегляд повідомлення в заголовку</string>
+    <string name="devicetype_redmiwatch3active">Redmi Watch 3 Active</string>
+    <string name="silent_mode_vibrate_silent">Вібрація / Беззвучний</string>
+    <string name="devicetype_redmi_smart_band_2">Redmi Smart Band 2</string>
+    <string name="pref_summary_casio_alert_calendar">Сповіщення календаря (вібрація/пищання)</string>
+    <string name="pref_summary_send_app_notifications">Надіслати сповіщення застосунку на пристрій</string>
+    <string name="pref_device_action_dnd_priority">Не турбувати - Лише важливі</string>
+    <string name="danish">Данська</string>
+    <string name="devicetype_miband7pro">Xiaomi Smart Band 7 Pro</string>
+    <string name="pref_summary_casio_alert_other">Сповіщення інших категорій (вібрація/пищання)</string>
+    <string name="standing_time">Час стоячи</string>
+    <string name="active_time">Час діяльності</string>
+    <string name="pref_title_prefix_notification_with_app">Назва застосунку в сповіщенні</string>
+    <string name="wearmode_band">Наручний браслет</string>
+    <string name="devicetype_colacao21">ColaCao 2021</string>
+    <string name="wearmode_necklace">Кольє (шийний ремінець)</string>
+    <string name="devicetype_xiaomi_watch_lite">Xiaomi Watch Lite</string>
+    <string name="pref_summary_preview_message_in_title">Показати попередній перегляд повідомлення в заголовку повідомлення, як це дозволено пристроєм</string>
+    <string name="pref_title_send_app_notifications">Надіслати сповіщення</string>
+    <string name="pref_navigation_app_osmand">OsmAnd(+)</string>
+    <string name="pref_title_casio_alert_sms">Сповіщення про СМС</string>
+    <string name="pref_device_action_dnd_off">Не турбувати - Вимкнено</string>
+    <string name="silent_mode_normal_silent">Звичайний / Беззвучний</string>
 </resources>
\ No newline at end of file

From e8130fe699f74c754cbd631c509d698c2004ba9a Mon Sep 17 00:00:00 2001
From: 0que <0que@users.noreply.hosted.weblate.org>
Date: Wed, 20 Dec 2023 04:22:35 +0000
Subject: [PATCH 389/595] Translated using Weblate (Russian)

Currently translated at 99.2% (2393 of 2410 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ru/
---
 app/src/main/res/values-ru/strings.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index c032251fd..baa072320 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -1533,7 +1533,7 @@
     <string name="left_earbud">Левый наушник</string>
     <string name="watchface_widget_type_2nd_tz">2-ой часовой пояс</string>
     <string name="watchface_widget_type_chance_rain">Вероятность дождя</string>
-    <string name="watchface_setting_power_saving_display">Не обновлять информацию на экране, когда устроство не надето</string>
+    <string name="watchface_setting_power_saving_display">Не обновлять информацию на экране, когда устройство снято</string>
     <string name="pref_title_equalizer_normal">Нормальный</string>
     <string name="pref_title_equalizer_bass_boost">Усиление басов</string>
     <string name="enable_vibrations_summary">Вибрация при поступлении звонков, сообщений, оповещений и прочего</string>
@@ -2610,4 +2610,7 @@
     <string name="activity_type_wrestling">Борьба</string>
     <string name="devicetype_colacao23">ColaCao 2023</string>
     <string name="devicetype_colacao21">ColaCao 2021</string>
+    <string name="clap_hands_to_wakeup_device">Активировать экран хлопком руками</string>"
+    <string name="clap_hands_to_wakeup_device_summary">Повторный хлопок погасит его</string>"
+    <string name="pixoo_power_saving_summary">Экран погаснет после продолжительной тишины, замеченной микрофоном</string>
 </resources>
\ No newline at end of file

From 4d6ff446a013462296093fc92e36a380286fea54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B0=91=E4=B8=BE?= <oshirisu.red@gmail.com>
Date: Wed, 20 Dec 2023 01:45:48 +0000
Subject: [PATCH 390/595] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (2410 of 2410 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/zh_Hans/
---
 app/src/main/res/values-zh-rCN/strings.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index c0d059fe9..420d5532f 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -2617,4 +2617,7 @@
     <string name="activity_type_wrestling">摔角</string>
     <string name="devicetype_colacao23">高乐高 2023</string>
     <string name="devicetype_colacao21">高乐高 2021</string>
+    <string name="clap_hands_to_wakeup_device">拍手亮起屏幕</string>"
+    <string name="clap_hands_to_wakeup_device_summary">再次拍手关闭屏幕</string>"
+    <string name="pixoo_power_saving_summary">麦克风检测到静音一段时间后将屏幕关闭</string>
 </resources>
\ No newline at end of file

From 8503a5fdde0b2d2dde620e8c447f6ec98de2079d Mon Sep 17 00:00:00 2001
From: arjan-s <a_gitlab@anymore.nl>
Date: Wed, 20 Dec 2023 14:28:43 +0000
Subject: [PATCH 391/595] Translated using Weblate (Dutch)

Currently translated at 100.0% (2410 of 2410 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/nl/
---
 app/src/main/res/values-nl/strings.xml | 31 ++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index d45bf84ee..2d3bb6f8b 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -2268,11 +2268,11 @@
     <string name="changelog_ok_button">OK</string>
     <string name="title">Titel</string>
     <string name="num_min">%d min</string>
-    <string name="pai_total">PAI totaal</string>
+    <string name="pai_total">Totaal</string>
     <string name="pai_chart_per_week">PAI per week</string>
     <string name="pai_plus_num">+%d</string>
     <string name="pai_chart_per_month">PAI per maand</string>
-    <string name="pai_day">Dag PAI-toename</string>
+    <string name="pai_day">Dag-toename</string>
     <string name="loyalty_cards_catima_package">Catima-pakketnaam</string>
     <string name="loyalty_cards_sync_archived">Gearchiveerde kaarten synchroniseren</string>
     <string name="loyalty_cards_sync_starred">Alleen kaarten met ster synchroniseren</string>
@@ -2593,4 +2593,31 @@
     <string name="pref_vitality_score_7_day_title">7-daagse voortgang</string>
     <string name="pref_device_action_dnd_off">Niet storen - Uit</string>
     <string name="silent_mode_normal_silent">Normaal / Stil</string>
+    <string name="activity_type_trail_run">Trail run</string>
+    <string name="widget_layout">Widget-layout</string>
+    <string name="widget_screen_no_free_slots_description">Het apparaat heeft geen vrije plekken voor widget-schermen (totaal aantal plekken: %1$s)</string>
+    <string name="widget_unknown_workout">Onbekende training - %s</string>
+    <string name="widget_move_up">Omhoog</string>
+    <string name="widget_screen_delete_confirm_description">Weet u zeker dat u \'%1$s\' wilt verwijderen?</string>
+    <string name="clap_hands_to_wakeup_device">Klap in handen voor scherm aan</string>"
+    <string name="activity_type_trekking">Wandeltocht</string>
+    <string name="widget_layout_two">2 widgets</string>
+    <string name="widget_screen_delete_confirm_title">Verwijder widget-scherm</string>
+    <string name="clap_hands_to_wakeup_device_summary">Klap nog een keer voor scherm uit</string>"
+    <string name="widget_layout_top_1_bot_2">1 boven, 2 onder</string>
+    <string name="devicetype_colacao23">ColaCao 2023</string>
+    <string name="widget_layout_top_2_bot_2">2 boven, 2 onder</string>
+    <string name="widget_screen_min_screens">Er moeten minimaal %1$s schermen zijn</string>
+    <string name="widget">Widget</string>
+    <string name="devicetype_redmi_smart_band_2">Redmi Smart Band 2</string>
+    <string name="widget_screen">Widget-scherm</string>
+    <string name="widget_move_down">Omlaag</string>
+    <string name="widget_layout_single">1 widget</string>
+    <string name="widget_subtype">Widget-subtype</string>
+    <string name="widget_screen_x">Scherm %s</string>
+    <string name="widget_missing_parts">Selecteer alle widgets</string>
+    <string name="widget_layout_top_2_bot_1">2 boven, 1 onder</string>
+    <string name="devicetype_colacao21">ColaCao 2021</string>
+    <string name="pixoo_power_saving_summary">Het scherm zal uitgaan nadat de microfoon een tijd geen geluid heeft opgevangen</string>
+    <string name="activity_type_wrestling">Worstelen</string>
 </resources>
\ No newline at end of file

From d5245485ee1984116bd3844d23e62bd00906538f Mon Sep 17 00:00:00 2001
From: Rex_sa <rex.sa@pm.me>
Date: Thu, 21 Dec 2023 19:00:45 +0000
Subject: [PATCH 392/595] Translated using Weblate (Arabic)

Currently translated at 100.0% (2410 of 2410 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ar/
---
 app/src/main/res/values-ar/strings.xml | 55 +++++++++++++++++++++++++-
 1 file changed, 53 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index dfe14e0a9..f3a19eccd 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -2256,8 +2256,8 @@
     <string name="num_min">%d دقيقة</string>
     <string name="pai_chart_per_week">PAI في الأسبوع</string>
     <string name="pai_chart_per_month">PAI في الشهر</string>
-    <string name="pai_total">مجموع PAI</string>
-    <string name="pai_day">زيادة PAI في اليوم</string>
+    <string name="pai_total">المجموع</string>
+    <string name="pai_day">زيادة اليوم</string>
     <string name="loyalty_cards_install">تثبيت كاتيما</string>
     <string name="loyalty_cards_sync_groups_only">مزامنة مجموعات محددة فقط</string>
     <string name="loyalty_cards_install_catima_fail">فشل في فتح متجر التطبيقات لتثبيت كاتيما</string>
@@ -2554,4 +2554,55 @@
     <string name="devicetype_miband7pro">سوار شاومي الذكي 7 برو</string>
     <string name="devicetype_xiaomi_watch_s1_active">ساعة شاوميS1 النشطة</string>
     <string name="devicetype_mi_watch_color_sport">ساعة مي كولور سبورت</string>
+    <string name="activity_type_trail_run">مسار الجري</string>
+    <string name="widget_layout">تخطيط القطعة</string>
+    <string name="widget_screen_no_free_slots_description">لا يحتوي الجهاز على فتحات مجانية لشاشات الأدوات (إجمالي الفتحات: %1$s)</string>
+    <string name="pref_device_action_dnd_on">عدم الإزعاج - تشغيل</string>
+    <string name="prefs_phone_silent_mode">الوضع الصامت للهاتف</string>
+    <string name="widget_unknown_workout">تمرين غير معروف - %s</string>
+    <string name="prefs_wearmode">وضع الارتداء</string>
+    <string name="wearmode_pebble">حصاة (مشبك الحذاء)</string>
+    <string name="widget_move_up">تحرك للأعلى</string>
+    <string name="widget_screen_delete_confirm_description">هل أنت متأكد أنك تريد حذف \'%1$s\'؟</string>
+    <string name="clap_hands_to_wakeup_device">صفق اليدين لرفع الشاشة</string>"
+    <string name="silent_mode_normal_vibrate">عادي / اهتزاز</string>
+    <string name="pref_title_goal_secondary">هدف ثانوي</string>
+    <string name="pref_vitality_score_7_day_summary">احصل على إشعار عندما تصل درجة حيويتك إلى 30 أو 60 أو 100 خلال الأيام السبعة الماضية</string>
+    <string name="activity_type_trekking">الرحلات</string>
+    <string name="devicetype_pixoo">Pixoo</string>
+    <string name="pref_vitality_score_title">عدد الضحايا</string>
+    <string name="widget_layout_two">2 عناصر واجهة مستخدم</string>
+    <string name="widget_screen_delete_confirm_title">حذف شاشة القطعة</string>
+    <string name="pref_device_action_dnd_alarms">عدم الإزعاج - الإنذارات فقط</string>
+    <string name="clap_hands_to_wakeup_device_summary">التصفيق مرة أخرى سوف يطفئ الشاشة</string>"
+    <string name="widget_layout_top_1_bot_2">1 أعلى، 2 أسفل</string>
+    <string name="devicetype_colacao23">ColaCao 2023</string>
+    <string name="widget_layout_top_2_bot_2">2 أعلى، 2 أسفل</string>
+    <string name="widget_screen_min_screens">يجب أن يكون هناك %1$s من الشاشات على الأقل</string>
+    <string name="silent_mode_vibrate_silent">يهتز / صامت</string>
+    <string name="widget">التطبيقات المصغرة</string>
+    <string name="pref_vitality_score_daily_summary">احصل على إشعار عندما تصل إلى الحد الأقصى لعدد نقاط الحيوية لهذا اليوم</string>
+    <string name="devicetype_redmi_smart_band_2">ريدمي سمارت باند 2</string>
+    <string name="widget_screen">شاشة القطعة</string>
+    <string name="pref_summary_send_app_notifications">إرسال إشعارات التطبيق إلى الجهاز</string>
+    <string name="widget_move_down">تحرك لأسفل</string>
+    <string name="widget_layout_single">1 القطعة</string>
+    <string name="pref_device_action_dnd_priority">عدم الإزعاج - الأولوية فقط</string>
+    <string name="not_set">لم يتم تعيينه</string>
+    <string name="widget_subtype">النوع الفرعي للقطعة</string>
+    <string name="standing_time">الوقت الدائم</string>
+    <string name="active_time">وقت نشط</string>
+    <string name="wearmode_band">الفرقة (معصمه)</string>
+    <string name="widget_screen_x">الشاشة %s</string>
+    <string name="widget_missing_parts">الرجاء تحديد كافة القطع المصغرة</string>
+    <string name="widget_layout_top_2_bot_1">2 أعلى، 1 أسفل</string>
+    <string name="devicetype_colacao21">ColaCao 2021</string>
+    <string name="wearmode_necklace">قلادة (حزام الرقبة)</string>
+    <string name="pref_title_send_app_notifications">إرسال الإخطارات</string>
+    <string name="pixoo_power_saving_summary">سيتم إيقاف تشغيل الشاشة بعد أن يكتشف الميكروفون الصمت لفترة من الوقت</string>
+    <string name="pref_vitality_score_daily_title">التقدم اليومي</string>
+    <string name="pref_vitality_score_7_day_title">التقدم لمدة 7 أيام</string>
+    <string name="pref_device_action_dnd_off">عدم الإزعاج - إيقاف</string>
+    <string name="silent_mode_normal_silent">عادي / صامت</string>
+    <string name="activity_type_wrestling">المصارعة</string>
 </resources>
\ No newline at end of file

From 969758fc911a3ad7bb86cbb623d929e3be762cf4 Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Fri, 22 Dec 2023 17:14:08 +0000
Subject: [PATCH 393/595] Translated using Weblate (Spanish)

Currently translated at 100.0% (2411 of 2411 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/es/
---
 app/src/main/res/values-es/strings.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 5c96e93c5..3f5889ecc 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -2619,4 +2619,8 @@
     <string name="activity_type_wrestling">Lucha libre</string>
     <string name="devicetype_colacao23">ColaCao 2023</string>
     <string name="devicetype_colacao21">ColaCao 2021</string>
+    <string name="clap_hands_to_wakeup_device">Aplaudir para subir la pantalla</string>"
+    <string name="clap_hands_to_wakeup_device_summary">Si vuelves a aplaudir, se apagará la pantalla</string>"
+    <string name="devicetype_mijia_lywsd03">Sensor de temperatura y humedad Mijia 2</string>
+    <string name="pixoo_power_saving_summary">La pantalla se apagará después de que el micrófono haya detectado un silencio durante un tiempo</string>
 </resources>
\ No newline at end of file

From b3bcc241ba1e7569da7967bf52e6aa612e23404d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B0=91=E4=B8=BE?= <oshirisu.red@gmail.com>
Date: Fri, 22 Dec 2023 13:06:36 +0000
Subject: [PATCH 394/595] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (2411 of 2411 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/zh_Hans/
---
 app/src/main/res/values-zh-rCN/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 420d5532f..2451ee3f7 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -2620,4 +2620,5 @@
     <string name="clap_hands_to_wakeup_device">拍手亮起屏幕</string>"
     <string name="clap_hands_to_wakeup_device_summary">再次拍手关闭屏幕</string>"
     <string name="pixoo_power_saving_summary">麦克风检测到静音一段时间后将屏幕关闭</string>
+    <string name="devicetype_mijia_lywsd03">米家温湿度传感器2</string>
 </resources>
\ No newline at end of file

From 9db7f9df15b788e96ba5bf9fe8144d1ac3de12e5 Mon Sep 17 00:00:00 2001
From: arjan-s <a_gitlab@anymore.nl>
Date: Fri, 22 Dec 2023 20:29:07 +0000
Subject: [PATCH 395/595] Translated using Weblate (Dutch)

Currently translated at 100.0% (2411 of 2411 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/nl/
---
 app/src/main/res/values-nl/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 2d3bb6f8b..b2e256f7f 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -2620,4 +2620,5 @@
     <string name="devicetype_colacao21">ColaCao 2021</string>
     <string name="pixoo_power_saving_summary">Het scherm zal uitgaan nadat de microfoon een tijd geen geluid heeft opgevangen</string>
     <string name="activity_type_wrestling">Worstelen</string>
+    <string name="devicetype_mijia_lywsd03">Mijia thermo- en hygrometer 2</string>
 </resources>
\ No newline at end of file

From b169026c047d238440a99562bb66fd167ab64dbf Mon Sep 17 00:00:00 2001
From: Rex_sa <rex.sa@pm.me>
Date: Fri, 22 Dec 2023 19:39:38 +0000
Subject: [PATCH 396/595] Translated using Weblate (Arabic)

Currently translated at 100.0% (2411 of 2411 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ar/
---
 app/src/main/res/values-ar/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index f3a19eccd..d14e196af 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -2605,4 +2605,5 @@
     <string name="pref_device_action_dnd_off">عدم الإزعاج - إيقاف</string>
     <string name="silent_mode_normal_silent">عادي / صامت</string>
     <string name="activity_type_wrestling">المصارعة</string>
+    <string name="devicetype_mijia_lywsd03">Mijia مستشعر درجة الحرارة والرطوبة 2</string>
 </resources>
\ No newline at end of file

From d755456124cb831aa7b2385f9ae6b31e171302ee Mon Sep 17 00:00:00 2001
From: 0que <0que@users.noreply.hosted.weblate.org>
Date: Sat, 23 Dec 2023 10:25:36 +0000
Subject: [PATCH 397/595] Translated using Weblate (Russian)

Currently translated at 99.2% (2394 of 2411 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ru/
---
 app/src/main/res/values-ru/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index baa072320..c7c8e3696 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -2613,4 +2613,5 @@
     <string name="clap_hands_to_wakeup_device">Активировать экран хлопком руками</string>"
     <string name="clap_hands_to_wakeup_device_summary">Повторный хлопок погасит его</string>"
     <string name="pixoo_power_saving_summary">Экран погаснет после продолжительной тишины, замеченной микрофоном</string>
+    <string name="devicetype_mijia_lywsd03">Mijia Temperature and Humidity Sensor 2</string>
 </resources>
\ No newline at end of file

From 6a195bf935ebc8f5028eb980043fc5bc3434a054 Mon Sep 17 00:00:00 2001
From: Xtremo3 <a.lewicki95@gmail.com>
Date: Sat, 23 Dec 2023 15:59:52 +0000
Subject: [PATCH 398/595] Translated using Weblate (Polish)

Currently translated at 100.0% (2411 of 2411 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/pl/
---
 app/src/main/res/values-pl/strings.xml | 159 ++++++++++++++++---------
 1 file changed, 103 insertions(+), 56 deletions(-)

diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 1aa1fb07d..dead913f4 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <string name="application_name_generic">Gadgetbridge</string>
-    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
+    <string name="application_name_generic">Urządzenia na ciele</string>
+    <string name="title_activity_controlcenter_generic">Urządzenia na ciele</string>
     <string name="action_settings">Ustawienia</string>
     <string name="action_debug">Odpluskwiaj</string>
     <string name="action_quit">Wyjdź</string>
@@ -31,21 +31,21 @@
     <!--Strings related to FwAppInstaller-->
     <string name="title_activity_fw_app_insaller">Instalator oprogramowania układowego/aplikacji</string>
     <string name="fw_upgrade_notice">Zamierzasz zainstalować %s.</string>
-    <string name="miband_firmware_known">To oprogramowanie układowe zostało przetestowane i jest ono kompatybilne z Gadgetbridge.</string>
-    <string name="miband_firmware_unknown_warning">To oprogramowanie układowe nie zostało przetestowane i może być niekompatybilne z Gadgetbridge.
+    <string name="miband_firmware_known">To oprogramowanie układowe zostało przetestowane i jest ono kompatybilne z Urządzenia na ciele.</string>
+    <string name="miband_firmware_unknown_warning">To oprogramowanie układowe nie zostało przetestowane i może być niekompatybilne z Urządzenia na ciele.
 \n
 \nWgrywanie tego oprogramowania jest NIEZALECANE!</string>
-    <string name="miband_firmware_suggest_whitelist">Jeśli nadal chcesz kontynuować i po instalacji wszystko będzie działać prawidłowo, proszę powiadomić programistów Gadgetbridge, aby dodali wersję %s oprogramowania układowego do białej listy.</string>
+    <string name="miband_firmware_suggest_whitelist">Jeśli nadal chcesz kontynuować i po instalacji wszystko będzie działać prawidłowo, proszę powiadomić programistów Urządzenia na ciele, aby dodali wersję %s oprogramowania układowego do białej listy.</string>
     <!--Strings related to Settings-->
     <string name="title_activity_settings">Ustawienia</string>
     <string name="pref_header_general">Ustawienia ogólne</string>
-    <string name="pref_title_general_autoconnectonbluetooth">Połącz z urządzeniem Gadgetbridge, gdy Bluetooth jest włączony</string>
+    <string name="pref_title_general_autoconnectonbluetooth">Połącz z Urządzenia na ciele, gdy Bluetooth jest włączony</string>
     <string name="pref_title_general_autoreconnect">Automatycznie ponów połączenie</string>
     <string name="pref_title_audio_player">Preferowany odtwarzacz muzyki</string>
     <string name="pref_default">Domyślny</string>
     <string name="pref_header_datetime">Data i godzina</string>
     <string name="pref_title_datetime_syctimeonconnect">Synchronizuj czas</string>
-    <string name="pref_summary_datetime_syctimeonconnect">Synchronizuj czas urządzenia Gadgetbridge podczas łączenia lub gdy czas albo strefa czasowa zmienią się na urządzeniu Android</string>
+    <string name="pref_summary_datetime_syctimeonconnect">Synchronizuj czas urządzenia podczas łączenia lub gdy czas albo strefa czasowa zmienią się na urządzeniu Android</string>
     <string name="pref_title_theme">Motyw</string>
     <string name="pref_theme_light">Jasny</string>
     <string name="pref_theme_dark">Ciemny</string>
@@ -99,13 +99,13 @@
     <string name="_unknown_">(nieznane)</string>
     <string name="test">Testuj</string>
     <string name="test_notification">Test powiadomień</string>
-    <string name="this_is_a_test_notification_from_gadgetbridge">To jest testowe powiadomienie z Gadgetbridge</string>
+    <string name="this_is_a_test_notification_from_gadgetbridge">To jest testowe powiadomienie z Urządzenia na ciele</string>
     <string name="bluetooth_is_not_supported_">Bluetooth nie jest obsługiwany.</string>
     <string name="bluetooth_is_disabled_">Bluetooth jest wyłączony.</string>
     <string name="tap_connected_device_for_app_mananger">Kliknij połączone urządzenie, aby uruchomić menadżer aplikacji</string>
     <string name="tap_a_device_to_connect">Dotknij urządzenie aby połączyć</string>
     <string name="cannot_connect_bt_address_invalid_">Nie można połączyć. Nieprawidłowy adres Bluetooth\?</string>
-    <string name="gadgetbridge_running_generic">Gadgetbridge działa</string>
+    <string name="gadgetbridge_running_generic">Urządzenia na ciele uruchomione</string>
     <string name="installing_binary_d_d">Instalowanie binarki %1$d/%2$d</string>
     <string name="installation_failed_">Instalacja nie powiodła się</string>
     <string name="installation_successful">Zainstalowano</string>
@@ -220,7 +220,7 @@
     <string name="weeksteps_today_steps_description">Kroków dziś, cel: %1$s</string>
     <string name="pref_title_dont_ack_transfer">Nie przesyłaj danych aktywności ACK</string>
     <string name="pref_summary_dont_ack_transfers">Jeśli transmisja danych nie zostanie potwierdzona przez opaskę, dane dotyczące aktywności nie zostaną wyczyszczone. Przydatne, jeśli GB jest używany razem z innymi aplikacjami.</string>
-    <string name="pref_summary_keep_data_on_device">Dane aktywności będą zachowane na urządzeniu nawet po synchronizacji. Jest to przydatne, gdy Gadgetbridge jest używany razem z innymi aplikacjami.</string>
+    <string name="pref_summary_keep_data_on_device">Dane aktywności będą zachowane na urządzeniu nawet po synchronizacji. Jest to przydatne, gdy Urządzenia na ciele jest używany razem z innymi aplikacjami.</string>
     <string name="pref_summary_low_latency_fw_update">Może pomóc na urządzeniach gdzie aktualizacja kończy się błędem.</string>
     <string name="live_activity_steps_history">Historia kroków</string>
     <string name="live_activity_current_steps_per_minute">Aktualnie kroków/min</string>
@@ -276,7 +276,7 @@
     <string name="appmanager_weather_install_provider">Zainstaluj aplikację Weather Notification</string>
     <string name="title_activity_calblacklist">Lista zablokowanych kalendarzy</string>
     <string name="pref_title_general_autostartonboot">Uruchom automatycznie</string>
-    <string name="pref_title_minimize_priority">Ukryj powiadomienia Gadgetbridge</string>
+    <string name="pref_title_minimize_priority">Ukryj powiadomienia Urządzenia na ciele</string>
     <string name="pref_summary_minimize_priority_off">Ikona na pasku stanu i powiadomienia będą wyświetlane na zablokowanym ekranie</string>
     <string name="pref_summary_minimize_priority_on">Ikona na pasku stanu i powiadomienia będą ukrywane na zablokowanym ekranie</string>
     <string name="pref_summary_notification_filter">Blokuj wszystkie powiadomienia, gdy tryb \"Nie przeszkadzać\" jest włączony w telefonie</string>
@@ -391,7 +391,7 @@
     <string name="pref_summary_pebble_forcele">Użyj eksperymentalnego wsparcia Pebble LE (Low Energy), zamiast Bluetooth Classic, dla wszystkich typów Pebble. Wymaga sparowania poprzez BT Classic, a następnie LE</string>
     <string name="pref_title_pebble_gatt_clientonly">Tylko klient GATT</string>
     <string name="pref_summary_pebble_gatt_clientonly">Ta eksperymentalna opcja przeznaczona jest wyłącznie dla Pebble 2. Wypróbuj ją jeżeli masz problemy z połączeniem</string>
-    <string name="pref_summary_pebble_enable_applogs">Spowoduje, że logi z aplikacji zegarka będą zapisywane przez Gadgetbridge (wymaga ponownego połączenia)</string>
+    <string name="pref_summary_pebble_enable_applogs">Spowoduje, że logi z aplikacji zegarka będą zapisywane przez Urządzenia na ciele (wymaga ponownego połączenia)</string>
     <string name="pref_title_pebble_always_ack_pebblekit">Przedwczesne ACK PebbleKit</string>
     <string name="pref_summary_pebble_always_ack_pebblekit">Spowoduje, że wiadomości wysyłane do zewnętrznych aplikacji będą zawsze natychmiast potwierdzane</string>
     <string name="pref_title_screentime">Czas włączenia ekranu</string>
@@ -404,7 +404,7 @@
     <string name="pref_auto_fetch_limit_fetches_summary">Pobieranie co %d minut(y)</string>
     <string name="horizontal">Poziomo</string>
     <string name="vertical">Pionowo</string>
-    <string name="discovery_connected_devices_hint">Upewnij się, że urządzenie (opaska/smartwatch) jest wykrywalne. Aktualnie połączone urządzenia prawdopodobnie nie będą wykrywalne. Na Androidzie 6+ włącz dostęp do lokalizacji (GPS). Wyłącz Privacy Guard dla Gadgetbridge, ponieważ mogą ze sobą kolidować i zrestartuj telefon. Jeżeli urządzenie nie zostanie wykryte w przeciągu paru minut, spróbuj ponownie po ponownym uruchomieniu telefonu.</string>
+    <string name="discovery_connected_devices_hint">Upewnij się, że urządzenie (opaska/smartwatch) jest wykrywalne. Aktualnie połączone urządzenia prawdopodobnie nie będą wykrywalne. Na Androidzie 6+ włącz dostęp do lokalizacji (GPS). Wyłącz Privacy Guard dla Urządzenia na ciele, ponieważ mogą ze sobą kolidować i zrestartuj telefon. Jeżeli urządzenie nie zostanie wykryte w przeciągu paru minut, spróbuj ponownie po ponownym uruchomieniu telefonu.</string>
     <string name="watch9_pairing_tap_hint">Jeśli Twój zegarek (opaska) wibruje, potrząśnij nim lub wciśnij na nim przycisk.</string>
     <string name="stats_x_axis_label">Całkowicie minut</string>
     <string name="notif_battery_low">%1$s rozładowana bateria</string>
@@ -519,7 +519,7 @@
     <string name="watch9_time_hours">Godziny:</string>
     <string name="watch9_time_seconds">Sekundy:</string>
     <string name="watch9_calibration_button">Kalibruj</string>
-    <string name="share_log_warning">Prosimy pamiętać, że logi Gadgetbridge mogą zawierać wiele informacji osobistych, w tym dane dotyczące zdrowia, unikalne identyfikatory (takie jak adresy MAC urządzeń), preferencje muzyczne itd. Rozważ edycję logów i usunięcie takich informacji zanim wyślesz je przy zgłaszaniu problemu.</string>
+    <string name="share_log_warning">Prosimy pamiętać, że logi Urządzenia na ciele mogą zawierać wiele informacji osobistych, w tym dane dotyczące zdrowia, unikalne identyfikatory (takie jak adresy MAC urządzeń), preferencje muzyczne itd. Rozważ edycję logów i usunięcie takich informacji zanim wyślesz je przy zgłaszaniu problemu.</string>
     <string name="warning">Ostrzeżenie!</string>
     <string name="no_data">Brak danych</string>
     <string name="preferences_led_color">Kolor LED</string>
@@ -530,7 +530,7 @@
     <string name="pref_title_auto_export_interval">Częstość eksportowania</string>
     <string name="unit_imperial">imperialne</string>
     <string name="debugactivity_really_factoryreset_title">Przywrócić do ustawień fabrycznych\?</string>
-    <string name="debugactivity_really_factoryreset">Powrót do ustawień fabrycznych spowoduje usunięcie wszystkich danych z podłączonego urządzenia (jeśli jest obsługiwane). Urządzenia Xiaomi/Huami zmienią również adres MAC Bluetooth, więc pojawią się dla Gadgetbridge jako nowe urządzenia.</string>
+    <string name="debugactivity_really_factoryreset">Powrót do ustawień fabrycznych spowoduje usunięcie wszystkich danych z podłączonego urządzenia (jeśli jest obsługiwane). Urządzenia Xiaomi/Huami zmienią również adres MAC Bluetooth, więc pojawią się dla Urządzenia na ciele jako nowe urządzenia.</string>
     <string name="overslept">Nadmiar snu: %1$s</string>
     <string name="overstep">Przekroczenie: %1$d</string>
     <string name="you_did_not_sleep">Nie spałeś(-aś)</string>
@@ -682,7 +682,7 @@
     <string name="weeksleepchart_sleep_a_month">Sen w miesiącu</string>
     <string name="devicetype_mijia_lywsd02">Mijia Smart Clock</string>
     <string name="menuitem_nfc">NFC</string>
-    <string name="pref_summary_expose_hr">Zezwala innym aplikacjom na dostęp do danych HR w czasie rzeczywistym, gdy Gadgetbridge jest połączony</string>
+    <string name="pref_summary_expose_hr">Zezwala innym aplikacjom na dostęp do danych HR w czasie rzeczywistym, gdy urządzenie jest połączone</string>
     <string name="pref_title_use_custom_font">Użyj niestandardowej czcionki</string>
     <string name="pref_summary_use_custom_font">Włącz tę opcję, jeśli Twoje urządzenie ma niestandardowy firmware czcionek do obsługi emoji</string>
     <string name="activity_db_management_autoexport_label">Automatyczny eksport</string>
@@ -742,13 +742,13 @@
     <string name="devicetype_banglejs">Bangle.js</string>
     <string name="devicetype_y5">Y5</string>
     <string name="alarm_snooze">Drzemka</string>
-    <string name="activity_db_management_import_export_explanation">Działanie importu/eksportu używa następującej ścieżki (zobacz poniżej) do katalogu na urządzeniu. Katalog ten jest dostępny dla innych aplikacji Androida i twojego komputera. Należy pamiętać, że ten katalog i wszystkie zawarte w nim pliki zostaną usunięte, jeśli odinstalujesz Gadgetbridge.
+    <string name="activity_db_management_import_export_explanation">Działanie importu/eksportu używa następującej ścieżki (zobacz poniżej) do katalogu na urządzeniu. Katalog ten jest dostępny dla innych aplikacji Androida i twojego komputera. Należy pamiętać, że ten katalog i wszystkie zawarte w nim pliki zostaną usunięte, jeśli odinstalujesz Urządzenia na ciele.
 \n
 \nDane eksportu obejmują:
 \n • Export_preference – ustawienia globalne
 \n • Export_preference_MAC – ustawienia danego urządzenia
-\n • Gadgetbridge – baza danych urządzeń i aktywności
-\n • Gadgetbridge_date – baza danych wyeksportowana w danym dniu
+\n • Urządzenia na ciele – baza danych urządzeń i aktywności
+\n • Urządzenia na ciele_date – baza danych wyeksportowana w danym dniu
 \n • Pliki z rozszerzeniem GPX – trasy GPS
 \n • Pliki z rozszerzeniem LOG – pliki rejestrów dziennika
 \n
@@ -845,7 +845,7 @@
     <string name="pref_title_force_white_color_scheme">Wymuś schemat kolorów czarno na białym</string>
     <string name="pref_summary_force_white_color_scheme">Użyteczne, jeśli twój zegarek ma ciemne wskazówki</string>
     <string name="notification_channel_high_priority_name">Wysoki priorytet</string>
-    <string name="pref_summary_custom_deviceicon">Pokaż specyficzną dla urządzenia ikonę powiadomienia zamiast ikony Gadgetbridge, gdy połączono</string>
+    <string name="pref_summary_custom_deviceicon">Pokaż specyficzną dla urządzenia ikonę powiadomienia zamiast ikony Urządzenia na ciele, gdy połączono</string>
     <string name="hr_appname_workout">Trening</string>
     <string name="hr_appname_stopwatch">Stoper</string>
     <string name="pref_title_vibration_strength">Siła wibracji</string>
@@ -903,7 +903,7 @@
     <string name="hr_widget_last_notification">Ostatnie powiadomienie</string>
     <string name="controlcenter_set_alias">Ustaw własną nazwę (alias)</string>
     <string name="about_contributors">Współtwórcy</string>
-    <string name="about_activity_title_generic">O Gadgetbridge</string>
+    <string name="about_activity_title_generic">O Urządzeniach na ciele</string>
     <string name="devicetype_amazfit_trex">Amazfit T-Rex</string>
     <string name="backstroke">Styl grzbietowy</string>
     <string name="freestyle">Styl dowolny</string>
@@ -936,7 +936,7 @@
     <string name="devicetype_pinetime_jf">PineTime (Firmware JF)</string>
     <string name="activity_summary_detail">Szczegóły aktywności sportowej</string>
     <string name="activity_type_jump_roping">Skakanka</string>
-    <string name="pref_title_weather_summary">Używane przez dostawcę pogody LineageOS. Inne wersje systemu Android powinny używać innej aplikacji, np. Weather notification. Więcej informacji znajdziesz na stronie projektu Gadgetbridge.</string>
+    <string name="pref_title_weather_summary">Używane przez dostawcę pogody LineageOS. Inne wersje systemu Android powinny używać innej aplikacji, np. Weather notification. Więcej informacji znajdziesz na stronie projektu Urządzenia na ciele.</string>
     <string name="fw_upgrade_notice_miband5">Właśnie zamierzasz zainstalować oprogramowanie układowe %s na swoim Mi Band 5.
 \n
 \nProszę upewnić się, że zainstalowany został plik .fw, a następnie plik .res. Po zainstalowaniu pliku .fw Twój zegarek zostanie ponownie uruchomiony.
@@ -1015,13 +1015,13 @@
     <string name="error_background_service_reason">Uruchomienie usługi w tle nie powiodło się z powodu wyjątku. Błąd:</string>
     <string name="error_background_service_reason_truncated">Uruchomienie usługi w tle nie powiodło się, ponieważ…</string>
     <string name="error_background_service">Nie udało się uruchomić usługi w tle</string>
-    <string name="companiondevice_pairing_details">Włącza obsługę nowego interfejsu API urządzeń towarzyszących (CompanionDevice) (ma wpływ tylko na Android 8 lub nowszy), który zwiększa niezawodność, jeśli usługa będzie musiała zostać ponownie uruchomiona w tle, aby odniosło skutek wymaga to ponownego sparowania przy użyciu Gadgetbridge</string>
+    <string name="companiondevice_pairing_details">Włącza obsługę nowego interfejsu API urządzeń towarzyszących (CompanionDevice) (ma wpływ tylko na Android 8 lub nowszy), który zwiększa niezawodność, jeśli usługa będzie musiała zostać ponownie uruchomiona w tle, aby odniosło skutek wymaga to ponownego sparowania przy użyciu Urządzenia na ciele</string>
     <string name="companiondevice_pairing">Parowanie urządzeń towarzyszących (CompanionDevice Pairing)</string>
     <string name="error_version_check_extreme_caution">UWAGA: Błąd przy sprawdzaniu informacji o wersji! Nie należy kontynuować! Nazwa wersji \"%s\"</string>
     <string name="about_links">Linki</string>
     <string name="about_additional_contributions">Dziękujemy wszystkim nie notowanym na liście współtwórcom za udostępnienie kodu, tłumaczenia, wsparcie, pomysły, motywację, zgłoszenia błędów, pieniądze… ✊</string>
     <string name="about_core_team_title">Zespół główny (w kolejności od pierwszego wkładu w kod aplikacji)</string>
-    <string name="about_description_generic">Niewymagający chmury wolny zamiennik dla zamkniętoźródłowych aplikacji dostarczanych przez producentów gadżetów na system Android.</string>
+    <string name="about_description_generic">Niewymagający chmury wolny zamiennik dla zamknięto źródłowych aplikacji dostarczanych przez producentów gadżetów na system Android.</string>
     <string name="activity_summary_edit_name_title">Edytuj etykietę</string>
     <string name="activity_type_pingpong">Ping-pong</string>
     <string name="activity_type_cricket">Krykiet</string>
@@ -1263,7 +1263,7 @@
     <string name="set">Ustaw</string>
     <string name="gpx_receiver_files_received">Otrzymane pliki GPX:</string>
     <string name="gpx_receiver_overwrite_some_files">Niektóre pliki już istnieją. Nadpisać\?</string>
-    <string name="gpx_receiver_activity_title">Odbiornik GPX Gadgetbridge</string>
+    <string name="gpx_receiver_activity_title">Odbiornik GPX Urządzenia na ciele</string>
     <string name="activity_summary_detail_clear_gpx_track">Wyczyść trasę GPX</string>
     <string name="activity_summary_detail_select_gpx_track">Wybierz trasę GPX</string>
     <string name="watchface_dialog_widget_color">Kolor</string>
@@ -1600,9 +1600,9 @@
     <string name="pref_screen_vibration_patterns_summary">Skonfiguruj wzory wibracji dla różnych powiadomień</string>
     <string name="devicetype_sony_wf_1000xm3">Sony WF-1000XM3</string>
     <string name="devicetype_galaxybuds_pro">Galaxy Buds Pro</string>
-    <string name="about_activity_title_banglejs_main">O Bangle.js Gadgetbridge</string>
-    <string name="application_name_banglejs_main">Bangle.js Gadgetbridge</string>
-    <string name="title_activity_controlcenter_banglejs_main">Bangle.js Gadgetbridge</string>
+    <string name="about_activity_title_banglejs_main">O Bangle.js Urządzeń na ciele</string>
+    <string name="application_name_banglejs_main">Bangle.js Urządzeń na ciele</string>
+    <string name="title_activity_controlcenter_banglejs_main">Bangle.js Urządzeń na ciele</string>
     <string name="gadgetbridge_running_banglejs_main">Bangle.js jest uruchomiony</string>
     <string name="about_activity_title_banglejs_nopebble">O Bangle.js Gadgetbridge</string>
     <string name="application_name_banglejs_nopebble">Bangle.js Gadgetbridge</string>
@@ -1716,20 +1716,20 @@
     <string name="pref_title_banglejs_webview_url">Adres URL programu ładującego aplikacje</string>
     <string name="pref_summary_banglejs_webview_url">Jeśli chcesz mieć niestandardowy program ładujący aplikacje, umieść swój adres URL https://.../android.html tutaj. W przeciwnym razie pozostaw puste miejsce dla https://banglejs.com/apps</string>
     <string name="pref_summary_device_intents">Zezwalaj aplikacjom zegarkowym Bangle.js na wysyłanie intencji Androida i zezwalaj innym aplikacjom na Androida (jak Tasker) na wysyłanie danych do Bangle.js z intencją com.banglejs.uart.tx. Wymaga pozwolenia na wyświetlanie nad innymi aplikacjami, aby działać w tle.</string>
-    <string name="about_description_banglejs_main">Aplikacja towarzysząca dla Bangle.js, zbudowana na bazie projektu Gadgetbridge, z dodanym dostępem do Internetu.
+    <string name="about_description_banglejs_main">Aplikacja towarzysząca dla Bangle.js, zbudowana na bazie projektu Urządzeń na ciele, z dodanym dostępem do Internetu.
 \n
-\nZe względu na politykę Sklepu Google Play, nie możemy umieścić linku do darowizny w samej aplikacji, ale jeśli Ci się ona podoba, rozważ przekazanie darowizny poprzez stronę główną Gadgetbridge poniżej.</string>
-    <string name="application_name_main_nightly">Gadgetbridge (Wczesna)</string>
-    <string name="title_activity_controlcenter_main_nightly">Gadgetbridge Wczesna</string>
-    <string name="about_activity_title_main_nightly">O Gadgetbridge Nightly</string>
-    <string name="about_description_main_nightly">Niewymagający chmury wolny zamiennik dla zamkniętoźródłowych aplikacji dostarczanych przez producentów gadżetów na system Android. Wydania Nightly Gadgetbridge. Nie można go zainstalować, jeśli masz już zainstalowaną aplikację Gadgetbridge lub Pebble, ze względu na konflikt w dostawcy Pebble.</string>
-    <string name="gadgetbridge_running_main_nightly">Gadgetbridge (Nightly) działa</string>
-    <string name="application_name_main_nopebble">Gadgetbridge (Nightly, bez dostawcy Pebble)</string>
-    <string name="title_activity_controlcenter_main_nopebble">Gadgetbridge Nightly Bez Pebble</string>
-    <string name="about_activity_title_main_nopebble">O Gadgetbridge Nightly Bez Pebble</string>
-    <string name="about_description_main_nopebble">Niewymagający chmury wolny zamiennik dla zamkniętoźródłowych aplikacji dostarczanych przez producentów gadżetów na system Android. Wydania Nightly Gadgetbridge. W tej wersji zmieniono nazwę dostawcy Pebble, aby zapobiec konfliktom, więc niektóre integracje związane z Pebble nie będą działać, ale można ją zainstalować obok istniejącej instalacji Gadgetbridge.</string>
-    <string name="gadgetbridge_running_main_nopebble">Gadgetbridge (Nightly Bez Pebble) działa</string>
-    <string name="pref_summary_banglejs_text_bitmap">Jeśli słowo nie może być wygenerowane za pomocą czcionki zegarka, wygeneruj je do bitmapy w Gadgetbridge i wyświetl ją na zegarku</string>
+\nZe względu na politykę Sklepu Google Play, nie możemy umieścić linku do darowizny w samej aplikacji, ale jeśli Ci się ona podoba, rozważ przekazanie darowizny poprzez stronę główną Urządzenia na ciele poniżej.</string>
+    <string name="application_name_main_nightly">Urządzenia na ciele (Wczesna)</string>
+    <string name="title_activity_controlcenter_main_nightly">Urządzenia na ciele Wczesna</string>
+    <string name="about_activity_title_main_nightly">O Urządzenia na ciele Wczesna</string>
+    <string name="about_description_main_nightly">Niewymagający chmury wolny zamiennik dla zamknięto źródłowych aplikacji dostarczanych przez producentów gadżetów na system Android. Wydania Wczesne Urządzenia na ciele. Nie można go zainstalować, jeśli masz już zainstalowaną aplikację Urządzenia na ciele lub Pebble, ze względu na konflikt w dostawcy Pebble.</string>
+    <string name="gadgetbridge_running_main_nightly">Urządzenia na ciele (Wczesna) działa</string>
+    <string name="application_name_main_nopebble">Urządzenia na ciele (Wczesna, bez dostawcy Pebble)</string>
+    <string name="title_activity_controlcenter_main_nopebble">Urządzenia na ciele Wczesna bez Pebble</string>
+    <string name="about_activity_title_main_nopebble">O Urządzenia na ciele Wczesna bez Pebble</string>
+    <string name="about_description_main_nopebble">Niewymagający chmury wolny zamiennik dla zamknięto źródłowych aplikacji dostarczanych przez producentów gadżetów na system Android. Wydania Wczesne Urządzenia na ciele W tej wersji zmieniono nazwę dostawcy Pebble, aby zapobiec konfliktom, więc niektóre integracje związane z Pebble nie będą działać, ale można ją zainstalować obok istniejącej instalacji Urządzenia na ciele.</string>
+    <string name="gadgetbridge_running_main_nopebble">Urządzenia na ciele (Wczesna bez Pebble) działa</string>
+    <string name="pref_summary_banglejs_text_bitmap">Jeśli słowo nie może być wygenerowane za pomocą czcionki zegarka, wygeneruj je do bitmapy w Urządzenia na ciele i wyświetl ją na zegarku</string>
     <string name="open_fw_installer_warning_text">Ta funkcja ma potencjał, aby pozostawić z Twojego urządzenia cegłę. To powiedziawszy, taka sytuacja nigdy nie zdarzyła się żadnemu z programistów poprzez flashowanie, ale pamiętaj, że robisz to na własne ryzyko.</string>
     <string name="open_fw_installer_getting_files_title">Pobieranie pliku z oprogramowaniem sprzętowym/aplikacją</string>
     <string name="discovery_scanning_intensity">Intensywność skanowania</string>
@@ -1752,13 +1752,13 @@
     <string name="open_fw_installer_getting_files_text">Ponieważ nie możemy rozpowszechniać plików oprogramowania sprzętowego, będziesz musiał zdobyć je samodzielnie. Oznacza to, że będziesz musiał szukać plików w plikach apk, online, na forach, na Amazfitwatchfaces (dla urządzeń Miband/Amazfit) i tak dalej.</string>
     <string name="open_fw_installer_connect_minimum_one_device">Proszę podłączyć PRZYNAJMNIEJ JEDNO urządzenie, do którego chcesz wysłać plik.</string>
     <string name="pref_write_logfiles_not_available">Inicjalizacja logowania plików nie powiodła się, zapisywanie plików dziennika jest obecnie niedostępne. Uruchom ponownie aplikację, aby spróbować ponownie zainicjować pliki dziennika.</string>
-    <string name="application_name_banglejs_nightly">Bangle.js Gadgetbridge (Wczesna)</string>
-    <string name="title_activity_controlcenter_banglejs_nightly">Bangle.js Gadgetbridge (Wczesna)</string>
-    <string name="about_activity_title_banglejs_nightly">O Bangle.js Gadgetbridge (Nightly)</string>
-    <string name="about_description_banglejs_nightly">Aplikacja towarzysząca dla Bangle.js, zbudowana na bazie projektu Gadgetbridge, z dodanym dostępem do Internetu.
+    <string name="application_name_banglejs_nightly">Bangle.js Urządzenia na ciele (Wczesna)</string>
+    <string name="title_activity_controlcenter_banglejs_nightly">Bangle.js Urządzenia na ciele (Wczesna)</string>
+    <string name="about_activity_title_banglejs_nightly">O Bangle.js Urządzenia na ciele (Wczesna)</string>
+    <string name="about_description_banglejs_nightly">Aplikacja towarzysząca dla Bangle.js, zbudowana na bazie projektu Urządzenia na ciele, z dodanym dostępem do Internetu.
 \n
-\nZe względu na politykę Sklepu Google Play, nie możemy umieścić linku do darowizny w samej aplikacji, ale jeśli Ci się ona podoba, rozważ przekazanie darowizny poprzez stronę główną Gadgetbridge poniżej.</string>
-    <string name="gadgetbridge_running_banglejs_nightly">Bangle.js (Nightly) działa</string>
+\nZe względu na politykę Sklepu Google Play, nie możemy umieścić linku do darowizny w samej aplikacji, ale jeśli Ci się ona podoba, rozważ przekazanie darowizny poprzez stronę główną Urządzenia na ciele poniżej.</string>
+    <string name="gadgetbridge_running_banglejs_nightly">Bangle.js (Wczesna) działa</string>
     <string name="pref_summary_notification_delay_calls">Opóźnienie przed wysłaniem powiadomień o połączeniach przychodzących do urządzenia, w sekundach.</string>
     <string name="world_clock_delete_confirm_description">Czy na pewno chcesz usunąć zegar światowy\?</string>
     <string name="prefs_heartrate_alert_experimental_title">Alarm tętna (eksperymentalny)</string>
@@ -1777,7 +1777,7 @@
     <string name="controlcenter_connected_fraction">Połączono: %d/%d</string>
     <string name="activity_type_elliptical">Eliptyczna</string>
     <string name="error_deleting_device">Błąd przy usuwaniu urządzenia: %s</string>
-    <string name="notification_gps_title">GPS Gadgetbridge</string>
+    <string name="notification_gps_title">GPS Urządzenia na ciele</string>
     <string name="menuitem_unknown_app">Nieznane (%s)</string>
     <string name="devicetype_binary_sensor">Czujnik binarny</string>
     <string name="notification_gps_text">Wysyłanie lokalizacji GPS do %1$d urządzeń</string>
@@ -2287,7 +2287,7 @@
     <string name="prefs_wena3_vibration_smart_item">Inteligentne wibracje</string>
     <string name="prefs_wena3_home_icon_name_riiiver">Riiiver</string>
     <string name="pref_message_privacy_mode_bodyonly">Ukryj tylko główną treść</string>
-    <string name="prefs_wena3_hint_background_sync">Pozwól urządzeniu Wena okresowo prosić Gadgetbridge o pobranie danych o aktywności z urządzenia</string>
+    <string name="prefs_wena3_hint_background_sync">Pozwól urządzeniu Wena okresowo prosić Urządzenia na ciele o pobranie danych o aktywności z urządzenia</string>
     <string name="pref_morning_updates_categories_summary">Lista kategorii wyświetlana każdego ranka</string>
     <string name="english_in">English (India)</string>
     <string name="prefs_wena3_home_icon_name_suica">Równowaga Suica</string>
@@ -2330,14 +2330,14 @@
     <string name="prefs_wena3_vibration_strength_item_weak">Słabe</string>
     <string name="description">Opis</string>
     <string name="prefs_wena3_home_icon_title">Ikony ekranu głównego</string>
-    <string name="pref_show_changelog_summary">Wyświetl dziennik zmian od ostatniej wersji po aktualizacji Gadgetbridge</string>
+    <string name="pref_show_changelog_summary">Wyświetl dziennik zmian od ostatniej wersji po aktualizacji Urządzenia na ciele</string>
     <string name="busy_task_fetch_sleep_respiratory_rate_data">Pobieranie danych dotyczących częstości oddechów podczas snu</string>
     <string name="debug_companion_pair_current">Sparuj bieżące urządzenie jako towarzysza</string>
     <string name="pref_morning_updates_summary">Wyświetlaj aktualizacje każdego ranka</string>
     <string name="menuitem_cards">Karty</string>
     <string name="prefs_wena3_item_weather_statusbar">Pogoda w pasku stanu</string>
     <string name="loyalty_cards_sync_groups_only">Synchronizuj tylko określone grupy</string>
-    <string name="loyalty_cards_catima_permissions_summary">Gadgetbridge potrzebuje uprawnień do odczytu kart Catima, aby je zsynchronizować. Dotknij tego przycisku, aby je przyznać.</string>
+    <string name="loyalty_cards_catima_permissions_summary">Urządzenia na ciele potrzebuje uprawnień do odczytu kart Catima, aby je zsynchronizować. Dotknij tego przycisku, aby je przyznać.</string>
     <string name="zepp_os_watchface_red_fantasy">Czerwona fantazja</string>
     <string name="prefs_shortcut_cards">Karty skrótów</string>
     <string name="temperature_scale_celsius">Skala Celciusza</string>
@@ -2392,7 +2392,7 @@
     <string name="gpx_route_upload_failed">Przesyłanie trasy Gpx nie powiodło się</string>
     <string name="ftp_server_start_summary">Uruchom serwer FTP na zegarku</string>
     <string name="pref_activity_full_sync_trigger_warning">Spowoduje to pełną synchronizację wszystkich danych dotyczących aktywności z urządzenia. Ukończenie może zająć kilka minut.</string>
-    <string name="pai_day">Dzienny wzrost PAI</string>
+    <string name="pai_day">Dzienny wzrost</string>
     <string name="voice_service">Usługa głosowa</string>
     <string name="prefs_wena3_button_action_item">Akcja przycisku</string>
     <string name="prefs_wena3_auto_power_off_turn_on_time_item">Czas wznowienia działania</string>
@@ -2416,7 +2416,7 @@
     <string name="wifi_hotspot_stop_summary">Zatrzymaj hotspot Wi-Fi na zegarku</string>
     <string name="intent_api_allow_debug_commands_title">Zezwalaj na polecenia debugowania</string>
     <string name="fwapp_install_device_not_supported">Nie można zainstalować pliku, urządzenie nie jest obsługiwane.</string>
-    <string name="pref_theme_dynamic_colors_explanation">Uwaga: aby uzyskać motyw dynamicznych kolorów, musisz włączyć opcję Kolory tapety lub Paleta kolorów w ustawieniach wyglądu Androida 12+. Jeśli tego nie zrobisz, Gadgetbridge użyje domyślnych kolorów Material 3.</string>
+    <string name="pref_theme_dynamic_colors_explanation">Uwaga: aby uzyskać motyw dynamicznych kolorów, musisz włączyć opcję Kolory tapety lub Paleta kolorów w ustawieniach wyglądu Androida 12+. Jeśli tego nie zrobisz, Urządzenia na ciele użyje domyślnych kolorów Material 3.</string>
     <string name="zepp_os_watchface_simplicity_data">Proste dane</string>
     <string name="red">Czerwony</string>
     <string name="voice_service_class_title">Klasa usług głosowych</string>
@@ -2438,7 +2438,7 @@
     <string name="intent_api_allow_debug_commands_summary">Zezwalaj na uruchamianie poleceń menu debugowania za pośrednictwem interfejsu Intent API</string>
     <string name="loyalty_cards_sync_options">Opcje synchronizacji</string>
     <string name="prefs_wena3_notification_default_vibration">Wibracja powiadomień</string>
-    <string name="loyalty_cards_catima_not_compatible">Zainstalowana wersja Catimy nie jest kompatybilna z Gadgetbridge. Zaktualizuj Catima i Gadgetbridge do najnowszych wersji.</string>
+    <string name="loyalty_cards_catima_not_compatible">Zainstalowana wersja Catimy nie jest kompatybilna z Urządzenia na ciele. Zaktualizuj Catima i Urządzenia na ciele do najnowszych wersji.</string>
     <string name="prefs_wena3_notification_vibration_repetition_0">W sposób nieokreślony</string>
     <string name="activity_detail_share_raw_details">Udostępnij surowe szczegóły</string>
     <string name="activity_type_windsurfing">Windsurfing</string>
@@ -2447,7 +2447,7 @@
     <string name="temperature_scale_fahrenheit">Skala Fahrenheita</string>
     <string name="prefs_wena3_vibration_strength_item">Siła wibracji</string>
     <string name="english_us">English (United States)</string>
-    <string name="pref_theme_dynamic_colors_not_available_warning">Dynamiczne kolory nie są dostępne na Twoim urządzeniu, tylko Android 12+ obsługuje tę funkcję. Gadgetbridge użyje domyślnych kolorów Material 3.</string>
+    <string name="pref_theme_dynamic_colors_not_available_warning">Dynamiczne kolory nie są dostępne na Twoim urządzeniu, tylko Android 12+ obsługuje tę funkcję. Urządzenia na ciele użyje domyślnych kolorów Material 3.</string>
     <string name="withings_bt_calibration_previous">Wstecz</string>
     <string name="ftp_server_stop_summary">Zatrzymaj serwer FTP na zegarku</string>
     <string name="changelog_show_full">Więcej…</string>
@@ -2468,7 +2468,7 @@
     <string name="prefs_wena3_hint_rich_design">Dodaje zaokrąglone prostokąty wokół ikon ekranu głównego</string>
     <string name="info_fossil_rebuild_watchface_custom_menu">Przebuduj tarczę zegarka, aby uzyskać niestandardowe menu</string>
     <string name="withings_steel_hr">Withings Steel HR</string>
-    <string name="pai_total">Całkowite PAI</string>
+    <string name="pai_total">Całkowite</string>
     <string name="zepp_os_watchface_minimalist">Minimalistyczny</string>
     <string name="loyalty_cards_catima_not_installed">Catima jest potrzebna do zarządzania kartami lojalnościowymi</string>
     <string name="prefs_wena3_notification_default_led">Kolor diody powiadomień</string>
@@ -2583,4 +2583,51 @@
     <string name="pref_summary_send_app_notifications">Wyślij powiadomienie do urządzenia</string>
     <string name="wearmode_band">Opaska (na nadgarstek)</string>
     <string name="pref_title_send_app_notifications">Wyślij powiadomienie</string>
+    <string name="activity_type_trail_run">Bieg szlakiem</string>
+    <string name="widget_layout">Układ widżetu</string>
+    <string name="widget_screen_no_free_slots_description">Urządzenie nie ma wolnych miejsc na ekrany widżetów (łączna liczba miejsc: %1$s)</string>
+    <string name="pref_device_action_dnd_on">Nie przeszkadzać – Włączone</string>
+    <string name="prefs_phone_silent_mode">Tryb cichy telefonu</string>
+    <string name="widget_unknown_workout">Nieznany trening - %s</string>
+    <string name="prefs_wearmode">Tryb noszenia</string>
+    <string name="wearmode_pebble">Pebble (klamra do butów)</string>
+    <string name="widget_move_up">Przesuń w górę</string>
+    <string name="widget_screen_delete_confirm_description">Czy na pewno chcesz usunąć \'%1$s\'?</string>
+    <string name="clap_hands_to_wakeup_device">Klaśnij dłońmi, aby wybudzić ekran</string>"
+    <string name="silent_mode_normal_vibrate">Normalny / Wibracje</string>
+    <string name="pref_vitality_score_7_day_summary">Otrzymuj powiadomienie, gdy Twój wynik witalności osiągnie 30, 60 lub 100 w ciągu ostatnich 7 dni</string>
+    <string name="activity_type_trekking">Trekking</string>
+    <string name="pref_vitality_score_title">Wynik witalności</string>
+    <string name="widget_layout_two">2 widżety</string>
+    <string name="widget_screen_delete_confirm_title">Usuń ekran widżetu</string>
+    <string name="pref_device_action_dnd_alarms">Nie przeszkadzać — tylko alarmy</string>
+    <string name="clap_hands_to_wakeup_device_summary">Ponownie klaśnięcie spowoduje wygaszenie ekranu</string>"
+    <string name="widget_layout_top_1_bot_2">1 góra, 2 dół</string>
+    <string name="devicetype_colacao23">ColaCao 2023</string>
+    <string name="widget_layout_top_2_bot_2">2 góra, 2 dół</string>
+    <string name="devicetype_mijia_lywsd03">Czujnik temperatury i wilgotności Mijia 2</string>
+    <string name="widget_screen_min_screens">Musi być co najmniej %1$s ekranów</string>
+    <string name="silent_mode_vibrate_silent">Wibracje / Cichy</string>
+    <string name="widget">Widżet</string>
+    <string name="pref_vitality_score_daily_summary">Otrzymuj powiadomienie, gdy osiągniesz maksymalną liczbę punktów witalności na dany dzień</string>
+    <string name="devicetype_redmi_smart_band_2">Redmi Smart Band 2</string>
+    <string name="widget_screen">Ekran widżetu</string>
+    <string name="widget_move_down">Przesuń w dół</string>
+    <string name="widget_layout_single">1 widżet</string>
+    <string name="pref_device_action_dnd_priority">Nie przeszkadzać – tylko priorytetowe</string>
+    <string name="not_set">Nie ustawiono</string>
+    <string name="widget_subtype">Podtyp widżetu</string>
+    <string name="standing_time">Czas stania</string>
+    <string name="active_time">Czas aktywności</string>
+    <string name="widget_screen_x">Ekran %s</string>
+    <string name="widget_missing_parts">Wybierz wszystkie widżety</string>
+    <string name="widget_layout_top_2_bot_1">2 góra, 1 dół</string>
+    <string name="devicetype_colacao21">ColaCao 2021</string>
+    <string name="wearmode_necklace">Necklace (pasek na szyję)</string>
+    <string name="pixoo_power_saving_summary">Ekran wyłączy się, gdy mikrofon wykryje przez chwilę ciszę</string>
+    <string name="pref_vitality_score_daily_title">Dzienny postęp</string>
+    <string name="pref_vitality_score_7_day_title">7-dniowy postęp</string>
+    <string name="pref_device_action_dnd_off">Nie przeszkadzać – wyłączone</string>
+    <string name="silent_mode_normal_silent">Normalny / Cichy</string>
+    <string name="activity_type_wrestling">Zapasy</string>
 </resources>
\ No newline at end of file

From adaba8a4c67699f000f3f2bc683ee6477f7b6f10 Mon Sep 17 00:00:00 2001
From: Ihor Hordiichuk <igor_ck@outlook.com>
Date: Sat, 23 Dec 2023 20:40:05 +0000
Subject: [PATCH 399/595] Translated using Weblate (Ukrainian)

Currently translated at 99.1% (2391 of 2411 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/uk/
---
 app/src/main/res/values-uk/strings.xml | 28 ++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 6a7418901..cdb73cffb 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -2581,4 +2581,32 @@
     <string name="pref_title_casio_alert_sms">Сповіщення про СМС</string>
     <string name="pref_device_action_dnd_off">Не турбувати - Вимкнено</string>
     <string name="silent_mode_normal_silent">Звичайний / Беззвучний</string>
+    <string name="activity_type_trail_run">Трейлранінг</string>
+    <string name="devicetype_mi_watch_color_sport">Mi Watch Color Sport</string>
+    <string name="pref_title_navigation_apps">Навігаційні застосунки</string>
+    <string name="menuitem_running">Біг</string>
+    <string name="pref_sleep_mode_schedule_title">Графік режиму сну</string>
+    <string name="clap_hands_to_wakeup_device">Поплескайте в долоні, щоб увімкнути екран</string>"
+    <string name="bedtime">Початок сну</string>
+    <string name="pref_vitality_score_7_day_summary">Отримуйте сповіщення, коли ваш показник життєвої активності досягне 30, 60 або 100 за останні 7 днів</string>
+    <string name="devicetype_pixoo">Pixoo</string>
+    <string name="pref_vitality_score_title">Оцінка життєвої активності</string>
+    <string name="pref_title_navigation_prefs">Налаштування навігації</string>
+    <string name="menuitem_focus">Зосередження</string>
+    <string name="pref_navigation_app_gmaps">Карти Google</string>
+    <string name="clap_hands_to_wakeup_device_summary">Повторне плескання вимкне екран</string>"
+    <string name="devicetype_mijia_lywsd03">Mijia Temperature і Humidity Sensor 2</string>
+    <string name="pref_summary_prefix_notification_with_app">Префікс назви сповіщення з назвою застосунку-джерела</string>
+    <string name="serial_number">Серійний номер</string>
+    <string name="pref_summary_osmand_packagename">Використовується для вибору версії OsmAnd для під\'єднання</string>
+    <string name="wake_up_time">Пробудження</string>
+    <string name="menuitem_stats">Статистика</string>
+    <string name="not_set">Не налаштовано</string>
+    <string name="pref_title_osmand_packagename">Назва пакунка OsmAnd</string>
+    <string name="pixoo_power_saving_summary">Екран вимкнеться після того, як мікрофон зафіксує тишу протягом певного часу</string>
+    <string name="pref_sleep_mode_schedule_summary">Надсилати нагадування та переходити в режим сну перед сном. У запланований час пробудження пролунає будильник.</string>
+    <string name="pref_vitality_score_7_day_title">Прогрес за 7 днів</string>
+    <string name="menuitem_alerts">Оповіщення</string>
+    <string name="activity_type_wrestling">Боротьба</string>
+    <string name="devicetype_xiaomi_watch_s1_active">Xiaomi Watch S1 Active</string>
 </resources>
\ No newline at end of file

From 81a89d329281382a1b00bc6e832f4963c323b488 Mon Sep 17 00:00:00 2001
From: Ihor Hordiichuk <igor_ck@outlook.com>
Date: Sat, 23 Dec 2023 21:10:57 +0000
Subject: [PATCH 400/595] Translated using Weblate (Ukrainian)

Currently translated at 99.4% (2398 of 2411 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/uk/
---
 app/src/main/res/values-uk/strings.xml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index cdb73cffb..5a9798706 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -2235,7 +2235,7 @@
     <string name="contact_no_free_slots_description">У пристрої немає вільних слотів для контактів (усього слотів: %1$s)</string>
     <string name="contact_name">Ім\'я</string>
     <string name="title_activity_contact_details">Контактні дані</string>
-    <string name="contact_delete_confirm_description">Ви впевнені, що хочете видалити \'%1$s\'\?</string>
+    <string name="contact_delete_confirm_description">Ви дійсно хочете видалити \'%1$s\'?</string>
     <string name="contact_missing_number">Контактний номер порожній</string>
     <string name="pref_header_navigation">Навігація</string>
     <string name="pref_title_navigation_forward">Надсилати навігацію на годинник</string>
@@ -2588,9 +2588,9 @@
     <string name="pref_sleep_mode_schedule_title">Графік режиму сну</string>
     <string name="clap_hands_to_wakeup_device">Поплескайте в долоні, щоб увімкнути екран</string>"
     <string name="bedtime">Початок сну</string>
-    <string name="pref_vitality_score_7_day_summary">Отримуйте сповіщення, коли ваш показник життєвої активності досягне 30, 60 або 100 за останні 7 днів</string>
+    <string name="pref_vitality_score_7_day_summary">Отримуйте сповіщення, коли ваш показник життєвої енергії досягне 30, 60 або 100 за останні 7 днів</string>
     <string name="devicetype_pixoo">Pixoo</string>
-    <string name="pref_vitality_score_title">Оцінка життєвої активності</string>
+    <string name="pref_vitality_score_title">Оцінка життєвої енергії</string>
     <string name="pref_title_navigation_prefs">Налаштування навігації</string>
     <string name="menuitem_focus">Зосередження</string>
     <string name="pref_navigation_app_gmaps">Карти Google</string>
@@ -2609,4 +2609,11 @@
     <string name="menuitem_alerts">Оповіщення</string>
     <string name="activity_type_wrestling">Боротьба</string>
     <string name="devicetype_xiaomi_watch_s1_active">Xiaomi Watch S1 Active</string>
+    <string name="widget_screen_no_free_slots_description">У пристрої немає вільних слотів для екранів віджетів (усього слотів: %1$s)</string>
+    <string name="widget_screen_delete_confirm_description">Ви дійсно хочете видалити \'%1$s\'?</string>
+    <string name="widget_screen_delete_confirm_title">Видалити екран віджета</string>
+    <string name="widget">Віджет</string>
+    <string name="pref_vitality_score_daily_summary">Отримувати сповіщення, коли ви досягли максимальної кількості балів життєвої енергії за день</string>
+    <string name="widget_screen">Екран віджета</string>
+    <string name="pref_vitality_score_daily_title">Щоденний прогрес</string>
 </resources>
\ No newline at end of file

From 5e8d511f2f355f42a03910f907cde9f832c2d56e Mon Sep 17 00:00:00 2001
From: Ihor Hordiichuk <igor_ck@outlook.com>
Date: Sat, 23 Dec 2023 21:16:24 +0000
Subject: [PATCH 401/595] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (2417 of 2417 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/uk/
---
 app/src/main/res/values-uk/strings.xml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 5a9798706..f7d189bf8 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -2616,4 +2616,23 @@
     <string name="pref_vitality_score_daily_summary">Отримувати сповіщення, коли ви досягли максимальної кількості балів життєвої енергії за день</string>
     <string name="widget_screen">Екран віджета</string>
     <string name="pref_vitality_score_daily_title">Щоденний прогрес</string>
+    <string name="widget_layout">Макет віджета</string>
+    <string name="widget_unknown_workout">Невідомий тип тренування - %s</string>
+    <string name="widget_move_up">Перемістити вище</string>
+    <string name="pref_title_fossil_hr_navigation_instructions">Інструменти навігації</string>
+    <string name="pref_summary_fossil_hr_navigation_instructions">Налаштувати поведінку навігаційного застосунку на годиннику</string>
+    <string name="pref_summary_fossil_hr_nav_foreground">Чи повинен навігаційний застосунок автоматично відкриватися поверх інших вікон, коли він отримує навігаційні вказівки</string>
+    <string name="widget_layout_two">2 віджети</string>
+    <string name="widget_layout_top_1_bot_2">1 вгорі, 2 внизу</string>
+    <string name="widget_layout_top_2_bot_2">2 вгорі, 2 внизу</string>
+    <string name="widget_screen_min_screens">Має бути принаймні %1$s екранів</string>
+    <string name="pref_title_fossil_hr_nav_vibrate">Вібрувати отримавши нову вказівку</string>
+    <string name="widget_move_down">Перемістити вниз</string>
+    <string name="widget_layout_single">1 віджет</string>
+    <string name="pref_title_fossil_hr_nav_foreground">Перейти поверх усіх вікон</string>
+    <string name="widget_subtype">Підтип віджета</string>
+    <string name="widget_screen_x">Екран %s</string>
+    <string name="widget_missing_parts">Виберіть усі віджети</string>
+    <string name="widget_layout_top_2_bot_1">2 вгорі, 1 внизу</string>
+    <string name="pref_summary_fossil_hr_nav_vibrate">Чи повинен годинник вібрувати за кожною новою або зміненою навігаційною вказівкою (тільки коли застосунок показано поверх інших вікон)</string>
 </resources>
\ No newline at end of file

From b9544c2f37358b66ef0fb723e98b0cd9600fb0cf Mon Sep 17 00:00:00 2001
From: Shimon <simonfarm0@gmail.com>
Date: Sun, 24 Dec 2023 12:01:43 +0000
Subject: [PATCH 402/595] Translated using Weblate (Czech)

Currently translated at 89.7% (2170 of 2418 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/cs/
---
 app/src/main/res/values-cs/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index a10192daa..6b634b2df 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -2383,4 +2383,5 @@
     <string name="updatefirmwareoperation_failed_low_mtu">Aktuální MTU %1$d je příliš nízké, povolte, prosím, větší MTU v nastavení zařízení. Následně se odpojte a znovu připojte.</string>
     <string name="english_au">Angličtina (Austrálie)</string>
     <string name="english_ca">Angličtina (Kanada)</string>
+    <string name="pref_title_notifications_ignore_work_profile">Ignorovat oznámení z aplikací v pracovním profilu</string>
 </resources>
\ No newline at end of file

From 9644b999856fda7f96168570dc4562d9207c9a7e Mon Sep 17 00:00:00 2001
From: arjan-s <a_gitlab@anymore.nl>
Date: Sun, 24 Dec 2023 07:18:46 +0000
Subject: [PATCH 403/595] Translated using Weblate (Dutch)

Currently translated at 100.0% (2418 of 2418 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/nl/
---
 app/src/main/res/values-nl/strings.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index b2e256f7f..79be843bf 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -2621,4 +2621,11 @@
     <string name="pixoo_power_saving_summary">Het scherm zal uitgaan nadat de microfoon een tijd geen geluid heeft opgevangen</string>
     <string name="activity_type_wrestling">Worstelen</string>
     <string name="devicetype_mijia_lywsd03">Mijia thermo- en hygrometer 2</string>
+    <string name="pref_title_fossil_hr_navigation_instructions">Navigatie-instructies</string>
+    <string name="pref_summary_fossil_hr_navigation_instructions">Configureer gedrag van navigatie-app op horloge</string>
+    <string name="pref_summary_fossil_hr_nav_foreground">Mag de navigatie-app automatisch naar de voorgrond komen als er een navigatie-instructie ontvangen wordt?</string>
+    <string name="pref_title_fossil_hr_nav_vibrate">Tril bij nieuwe instructie</string>
+    <string name="pref_title_fossil_hr_nav_foreground">Naar voorgrond</string>
+    <string name="prefs_device_name">Apparaatnaam</string>
+    <string name="pref_summary_fossil_hr_nav_vibrate">Moet het horloge trillen bij elke nieuwe of veranderde navigatie-instructie (alleen als de app op de voorgrond is)?</string>
 </resources>
\ No newline at end of file

From 9504a1fe5ee7aab855281477509889bb62046644 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B0=91=E4=B8=BE?= <oshirisu.red@gmail.com>
Date: Sun, 24 Dec 2023 04:59:46 +0000
Subject: [PATCH 404/595] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (2418 of 2418 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/zh_Hans/
---
 app/src/main/res/values-zh-rCN/strings.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 2451ee3f7..9074760c6 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -2621,4 +2621,11 @@
     <string name="clap_hands_to_wakeup_device_summary">再次拍手关闭屏幕</string>"
     <string name="pixoo_power_saving_summary">麦克风检测到静音一段时间后将屏幕关闭</string>
     <string name="devicetype_mijia_lywsd03">米家温湿度传感器2</string>
+    <string name="pref_title_fossil_hr_navigation_instructions">导航说明</string>
+    <string name="pref_summary_fossil_hr_navigation_instructions">配置手表上导航应用的行为</string>
+    <string name="pref_summary_fossil_hr_nav_foreground">导航应用收到导航指令时是否自动进入前台</string>
+    <string name="pref_title_fossil_hr_nav_vibrate">根据新指令振动</string>
+    <string name="pref_title_fossil_hr_nav_foreground">来到前台</string>
+    <string name="prefs_device_name">设备名称</string>
+    <string name="pref_summary_fossil_hr_nav_vibrate">手表是否应该在每个新的或更改的导航指令时振动（仅当应用程序位于前台时）</string>
 </resources>
\ No newline at end of file

From 08301beb48d8945f3eda12bbd42f8502832c6d8b Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Mon, 25 Dec 2023 13:15:13 +0000
Subject: [PATCH 405/595] Translated using Weblate (Spanish)

Currently translated at 100.0% (2419 of 2419 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/es/
---
 app/src/main/res/values-es/strings.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 3f5889ecc..f3316d63a 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -2623,4 +2623,12 @@
     <string name="clap_hands_to_wakeup_device_summary">Si vuelves a aplaudir, se apagará la pantalla</string>"
     <string name="devicetype_mijia_lywsd03">Sensor de temperatura y humedad Mijia 2</string>
     <string name="pixoo_power_saving_summary">La pantalla se apagará después de que el micrófono haya detectado un silencio durante un tiempo</string>
+    <string name="pref_title_fossil_hr_navigation_instructions">Instrucciones de navegación</string>
+    <string name="pref_summary_fossil_hr_navigation_instructions">Configurar el comportamiento de la aplicación de navegación en el reloj</string>
+    <string name="pref_summary_fossil_hr_nav_foreground">Si la aplicación de navegación debe pasar automáticamente a primer plano cuando recibe una instrucción de navegación</string>
+    <string name="pref_title_fossil_hr_nav_vibrate">Vibrar al recibir una nueva instrucción</string>
+    <string name="pref_title_fossil_hr_nav_foreground">Pasar a primer plano</string>
+    <string name="prefs_device_name">Nombre del dispositivo</string>
+    <string name="pref_summary_fossil_hr_nav_vibrate">Si el reloj debe vibrar con cada instrucción de navegación nueva o modificada (sólo cuando la aplicación está en primer plano)</string>
+    <string name="devicetype_redmi_watch_2_lite">Redmi Watch 2 Lite</string>
 </resources>
\ No newline at end of file

From 4e4e64e7af7cd63c4a05a33efa6d6f9a4845677b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B0=91=E4=B8=BE?= <oshirisu.red@gmail.com>
Date: Mon, 25 Dec 2023 01:47:50 +0000
Subject: [PATCH 406/595] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (2419 of 2419 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/zh_Hans/
---
 app/src/main/res/values-zh-rCN/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 9074760c6..7c888ef35 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -2628,4 +2628,5 @@
     <string name="pref_title_fossil_hr_nav_foreground">来到前台</string>
     <string name="prefs_device_name">设备名称</string>
     <string name="pref_summary_fossil_hr_nav_vibrate">手表是否应该在每个新的或更改的导航指令时振动（仅当应用程序位于前台时）</string>
+    <string name="devicetype_redmi_watch_2_lite">红米手表2青春版</string>
 </resources>
\ No newline at end of file

From 3fed2abe65b4fa89bdf07901d12e2d65090ee293 Mon Sep 17 00:00:00 2001
From: Shimon <simonfarm0@gmail.com>
Date: Tue, 26 Dec 2023 10:52:02 +0000
Subject: [PATCH 407/595] Translated using Weblate (Czech)

Currently translated at 89.8% (2173 of 2419 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/cs/
---
 app/src/main/res/values-cs/strings.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 6b634b2df..a74e05b74 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -2050,7 +2050,7 @@
     <string name="debugactivity_confirm_remove_device_preferences_title">Odebrat předvolby zařízení\?</string>
     <string name="single_band">Jednoduché Pásmo</string>
     <string name="dual_band">Duální Pásmo</string>
-    <string name="low_power_gps">Nízká spotřeba GPS</string>
+    <string name="low_power_gps">GPS s nízkou spotřebou energie</string>
     <string name="accuracy_first">Upřednostnit přesnost</string>
     <string name="speed_first">Upřednostnit rychlost</string>
     <string name="debugactivity_confirm_remove_device_preferences">Tím se resetují předvolby zařízení pro všechna připojená zařízení. Jste si jisti\?</string>
@@ -2384,4 +2384,7 @@
     <string name="english_au">Angličtina (Austrálie)</string>
     <string name="english_ca">Angličtina (Kanada)</string>
     <string name="pref_title_notifications_ignore_work_profile">Ignorovat oznámení z aplikací v pracovním profilu</string>
+    <string name="pref_message_privacy_mode_bodyonly">Skrýt pouze obsah zprávy</string>
+    <string name="pref_title_preview_message_in_title">Ukázat náhled zprávy v názvu</string>
+    <string name="pref_summary_notifications_ignore_work_profile">Neposílat oznámení do hodinek z aplikací v pracovním profilu</string>
 </resources>
\ No newline at end of file

From fd56c2358d47a6d5dbb7c4628d3c030167f2b506 Mon Sep 17 00:00:00 2001
From: Rex_sa <rex.sa@pm.me>
Date: Tue, 26 Dec 2023 20:01:36 +0000
Subject: [PATCH 408/595] Translated using Weblate (Arabic)

Currently translated at 100.0% (2419 of 2419 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ar/
---
 app/src/main/res/values-ar/strings.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index d14e196af..7de64d4c1 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -2606,4 +2606,12 @@
     <string name="silent_mode_normal_silent">عادي / صامت</string>
     <string name="activity_type_wrestling">المصارعة</string>
     <string name="devicetype_mijia_lywsd03">Mijia مستشعر درجة الحرارة والرطوبة 2</string>
+    <string name="pref_title_fossil_hr_navigation_instructions">تعليمات الملاحة</string>
+    <string name="pref_summary_fossil_hr_navigation_instructions">قم بتكوين سلوك التطبيق أثناء التنقل</string>
+    <string name="pref_summary_fossil_hr_nav_foreground">ما إذا كان يجب أن يظهر تطبيق التنقل تلقائيًا في المقدمة عندما يتلقى تعليمات التنقل</string>
+    <string name="pref_title_fossil_hr_nav_vibrate">الاهتزاز عند التعليمات الجديدة</string>
+    <string name="pref_title_fossil_hr_nav_foreground">تعال إلى المقدمة</string>
+    <string name="prefs_device_name">اسم الجهاز</string>
+    <string name="pref_summary_fossil_hr_nav_vibrate">ما إذا كان يجب أن تهتز الساعة عند كل تعليمات تنقل جديدة أو تم تغييرها (فقط عندما يكون التطبيق في المقدمة)</string>
+    <string name="devicetype_redmi_watch_2_lite">ساعة ريدمي 2 لايت</string>
 </resources>
\ No newline at end of file

From 94ef8d58e11c2fd9467e3545e409e35f1ca93d1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Wed, 27 Dec 2023 09:47:15 +0000
Subject: [PATCH 409/595] Translated using Weblate (Spanish)

Currently translated at 100.0% (2419 of 2419 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/es/
---
 app/src/main/res/values-es/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index f3316d63a..af08cafa5 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1036,7 +1036,7 @@
     <string name="Strokes">Pulsaciones</string>
     <string name="km">km</string>
     <string name="bpm">lat/min</string>
-    <string name="minutes_km">km/min</string>
+    <string name="minutes_km">min/km</string>
     <string name="seconds_m">m/s</string>
     <string name="seconds_km">km/s</string>
     <string name="calories_unit">kcal</string>

From 9bcb9dc0dc1ea8d740cd345a43850b8bb9aa10b0 Mon Sep 17 00:00:00 2001
From: arjan-s <a_gitlab@anymore.nl>
Date: Wed, 27 Dec 2023 10:18:39 +0000
Subject: [PATCH 410/595] Translated using Weblate (Dutch)

Currently translated at 100.0% (2419 of 2419 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/nl/
---
 app/src/main/res/values-nl/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 79be843bf..65c64ce2d 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -2628,4 +2628,5 @@
     <string name="pref_title_fossil_hr_nav_foreground">Naar voorgrond</string>
     <string name="prefs_device_name">Apparaatnaam</string>
     <string name="pref_summary_fossil_hr_nav_vibrate">Moet het horloge trillen bij elke nieuwe of veranderde navigatie-instructie (alleen als de app op de voorgrond is)?</string>
+    <string name="devicetype_redmi_watch_2_lite">Redmi Watch 2 Lite</string>
 </resources>
\ No newline at end of file

From 199d57bcc92231288a4b318828d3facdea0dc106 Mon Sep 17 00:00:00 2001
From: Xtremo3 <a.lewicki95@gmail.com>
Date: Thu, 28 Dec 2023 17:15:32 +0000
Subject: [PATCH 411/595] Translated using Weblate (Polish)

Currently translated at 100.0% (2419 of 2419 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/pl/
---
 app/src/main/res/values-pl/strings.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index dead913f4..5369a0fd6 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -2630,4 +2630,12 @@
     <string name="pref_device_action_dnd_off">Nie przeszkadzać – wyłączone</string>
     <string name="silent_mode_normal_silent">Normalny / Cichy</string>
     <string name="activity_type_wrestling">Zapasy</string>
+    <string name="pref_title_fossil_hr_navigation_instructions">Instrukcje nawigacji</string>
+    <string name="pref_summary_fossil_hr_navigation_instructions">Konfiguracja zachowania aplikacji do nawigacji w zegarku</string>
+    <string name="pref_summary_fossil_hr_nav_foreground">Określ, czy aplikacja nawigacyjna powinna automatycznie wyświetlać się na pierwszym planie po otrzymaniu instrukcji nawigacyjnych</string>
+    <string name="pref_title_fossil_hr_nav_vibrate">Wibruj przy nowej instrukcji</string>
+    <string name="pref_title_fossil_hr_nav_foreground">Przejdź do pracy na pierwszym planie</string>
+    <string name="prefs_device_name">Nazwa urządzenia</string>
+    <string name="pref_summary_fossil_hr_nav_vibrate">Wibracje zegarka przy każdej nowej lub zmienionej instrukcji nawigacji (tylko gdy aplikacja jest na pierwszym planie)</string>
+    <string name="devicetype_redmi_watch_2_lite">Redmi Watch 2 Lite</string>
 </resources>
\ No newline at end of file

From 7220fda85b663f3f93a187a7632ad73c794d5e51 Mon Sep 17 00:00:00 2001
From: 0que <0que@users.noreply.hosted.weblate.org>
Date: Fri, 29 Dec 2023 12:22:18 +0000
Subject: [PATCH 412/595] Translated using Weblate (Russian)

Currently translated at 99.3% (2404 of 2419 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ru/
---
 app/src/main/res/values-ru/strings.xml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index c7c8e3696..8616ee71f 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -2514,7 +2514,7 @@
     <string name="menuitem_thermometer">Термометр</string>
     <string name="devicetype_femometer_vinca2">Femometer Vinca II</string>
     <string name="fossil_hr_nav_app_not_installed_notify_text">Навигация была начата, но navigationApp не установлено на часах. Пожалуйста, установите его в менеджере приложений.</string>
-    <string name="fossil_hr_nav_app_not_installed_notify_title">Приложение навигации не установлено на часах</string>
+    <string name="fossil_hr_nav_app_not_installed_notify_title">Приложение для навигации не установлено на часах</string>
     <string name="call_rejection_method_ignore">Игнорировать (прекратить уведомление)</string>
     <string name="call_rejection_method_reject">Отклонить</string>
     <string name="pref_call_rejection_method_title">Способ отклонения вызова</string>
@@ -2614,4 +2614,12 @@
     <string name="clap_hands_to_wakeup_device_summary">Повторный хлопок погасит его</string>"
     <string name="pixoo_power_saving_summary">Экран погаснет после продолжительной тишины, замеченной микрофоном</string>
     <string name="devicetype_mijia_lywsd03">Mijia Temperature and Humidity Sensor 2</string>
+    <string name="pref_title_fossil_hr_navigation_instructions">Указания по навигации</string>
+    <string name="pref_summary_fossil_hr_navigation_instructions">Настройки встроенного приложения навигации</string>
+    <string name="pref_summary_fossil_hr_nav_foreground">Должно ли появляться приложение навигации при получении навигационных указаний</string>
+    <string name="pref_title_fossil_hr_nav_vibrate">Вибрировать при новых указаниях</string>
+    <string name="pref_title_fossil_hr_nav_foreground">Автопоявление</string>
+    <string name="prefs_device_name">Имя устройства</string>
+    <string name="pref_summary_fossil_hr_nav_vibrate">Должны ли часы вибрировать при получении или изменении навигационных указаний (когда приложение показано)</string>
+    <string name="devicetype_redmi_watch_2_lite">Redmi Watch 2 Lite</string>
 </resources>
\ No newline at end of file

From 08b63a7dedddd986eecc653827ce806767f4b145 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D1=96=D0=B9?=
 <sergiy.goncharuk.1@gmail.com>
Date: Sun, 31 Dec 2023 15:07:06 +0000
Subject: [PATCH 413/595] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (2419 of 2419 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/uk/
---
 app/src/main/res/values-uk/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index f7d189bf8..42d7e5224 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -2635,4 +2635,6 @@
     <string name="widget_missing_parts">Виберіть усі віджети</string>
     <string name="widget_layout_top_2_bot_1">2 вгорі, 1 внизу</string>
     <string name="pref_summary_fossil_hr_nav_vibrate">Чи повинен годинник вібрувати за кожною новою або зміненою навігаційною вказівкою (тільки коли застосунок показано поверх інших вікон)</string>
+    <string name="prefs_device_name">Ім\'я пристрою</string>
+    <string name="devicetype_redmi_watch_2_lite">Redmi Watch 2 Lite</string>
 </resources>
\ No newline at end of file

From d73b209d91ad9374d614753aa42e071439ef7755 Mon Sep 17 00:00:00 2001
From: Hikaru <Hikali-47041@users.noreply.hosted.weblate.org>
Date: Mon, 1 Jan 2024 06:37:15 +0000
Subject: [PATCH 414/595] Translated using Weblate (Japanese)

Currently translated at 28.3% (686 of 2419 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ja/
---
 app/src/main/res/values-ja/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 83523144f..f6669efba 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -835,4 +835,5 @@
     <string name="blue">青</string>
     <string name="prefs_wena3_button_action_name_activity_screen">アクティビティ画面</string>
     <string name="prefs_wena3_notification_settings_title">通知設定</string>
+    <string name="application_name_banglejs_nightly">Bangle.js Gadgetbridge(Nightly)</string>
 </resources>
\ No newline at end of file

From ccbf25a05dae5fc138a363a79e3db88ea8cbff52 Mon Sep 17 00:00:00 2001
From: Ihor Hordiichuk <igor_ck@outlook.com>
Date: Sun, 31 Dec 2023 22:32:30 +0000
Subject: [PATCH 415/595] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (2419 of 2419 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/uk/
---
 app/src/main/res/values-uk/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 42d7e5224..8c7b9709f 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -2635,6 +2635,6 @@
     <string name="widget_missing_parts">Виберіть усі віджети</string>
     <string name="widget_layout_top_2_bot_1">2 вгорі, 1 внизу</string>
     <string name="pref_summary_fossil_hr_nav_vibrate">Чи повинен годинник вібрувати за кожною новою або зміненою навігаційною вказівкою (тільки коли застосунок показано поверх інших вікон)</string>
-    <string name="prefs_device_name">Ім\'я пристрою</string>
+    <string name="prefs_device_name">Назва пристрою</string>
     <string name="devicetype_redmi_watch_2_lite">Redmi Watch 2 Lite</string>
 </resources>
\ No newline at end of file

From abbd6c9a677232e5ae0c3bcdee3c3a351f13fbe3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D1=96=D0=B9?=
 <sergiy.goncharuk.1@gmail.com>
Date: Mon, 1 Jan 2024 13:50:28 +0000
Subject: [PATCH 416/595] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (2420 of 2420 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/uk/
---
 app/src/main/res/values-uk/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 8c7b9709f..371e8abfb 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -2637,4 +2637,5 @@
     <string name="pref_summary_fossil_hr_nav_vibrate">Чи повинен годинник вібрувати за кожною новою або зміненою навігаційною вказівкою (тільки коли застосунок показано поверх інших вікон)</string>
     <string name="prefs_device_name">Назва пристрою</string>
     <string name="devicetype_redmi_watch_2_lite">Redmi Watch 2 Lite</string>
+    <string name="devicetype_redmi_smart_band_pro">Redmi Smart Band Pro</string>
 </resources>
\ No newline at end of file

From 41c18dd2db46bae35f51e961a03a12129ab838b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B0=91=E4=B8=BE?= <oshirisu.red@gmail.com>
Date: Mon, 1 Jan 2024 15:14:15 +0000
Subject: [PATCH 417/595] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (2420 of 2420 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/zh_Hans/
---
 app/src/main/res/values-zh-rCN/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 7c888ef35..36a0e9e0b 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -2629,4 +2629,5 @@
     <string name="prefs_device_name">设备名称</string>
     <string name="pref_summary_fossil_hr_nav_vibrate">手表是否应该在每个新的或更改的导航指令时振动（仅当应用程序位于前台时）</string>
     <string name="devicetype_redmi_watch_2_lite">红米手表2青春版</string>
+    <string name="devicetype_redmi_smart_band_pro">红米智能手环Pro</string>
 </resources>
\ No newline at end of file

From 107669d60c8aacbf81265fe7528d236df2a9d904 Mon Sep 17 00:00:00 2001
From: Rex_sa <rex.sa@pm.me>
Date: Mon, 1 Jan 2024 13:50:13 +0000
Subject: [PATCH 418/595] Translated using Weblate (Arabic)

Currently translated at 100.0% (2420 of 2420 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ar/
---
 app/src/main/res/values-ar/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 7de64d4c1..459334822 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -2614,4 +2614,5 @@
     <string name="prefs_device_name">اسم الجهاز</string>
     <string name="pref_summary_fossil_hr_nav_vibrate">ما إذا كان يجب أن تهتز الساعة عند كل تعليمات تنقل جديدة أو تم تغييرها (فقط عندما يكون التطبيق في المقدمة)</string>
     <string name="devicetype_redmi_watch_2_lite">ساعة ريدمي 2 لايت</string>
+    <string name="devicetype_redmi_smart_band_pro">سوار ريدمي برو الذكي</string>
 </resources>
\ No newline at end of file

From b7c4d6551a84cf8afc22c74d161415e91e359338 Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Tue, 2 Jan 2024 15:39:44 +0000
Subject: [PATCH 419/595] Translated using Weblate (Spanish)

Currently translated at 100.0% (2421 of 2421 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/es/
---
 app/src/main/res/values-es/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index af08cafa5..c00b5aa98 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -2631,4 +2631,6 @@
     <string name="prefs_device_name">Nombre del dispositivo</string>
     <string name="pref_summary_fossil_hr_nav_vibrate">Si el reloj debe vibrar con cada instrucción de navegación nueva o modificada (sólo cuando la aplicación está en primer plano)</string>
     <string name="devicetype_redmi_watch_2_lite">Redmi Watch 2 Lite</string>
+    <string name="notification_channel_connection_status_name">Estado de la conexión</string>
+    <string name="devicetype_redmi_smart_band_pro">Redmi Smart Band Pro</string>
 </resources>
\ No newline at end of file

From 7d7a376aa875c08fb705fc0c36011e7eff5c79c4 Mon Sep 17 00:00:00 2001
From: Xtremo3 <a.lewicki95@gmail.com>
Date: Tue, 2 Jan 2024 16:14:12 +0000
Subject: [PATCH 420/595] Translated using Weblate (Polish)

Currently translated at 100.0% (2421 of 2421 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/pl/
---
 app/src/main/res/values-pl/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 5369a0fd6..86614ff32 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -2638,4 +2638,6 @@
     <string name="prefs_device_name">Nazwa urządzenia</string>
     <string name="pref_summary_fossil_hr_nav_vibrate">Wibracje zegarka przy każdej nowej lub zmienionej instrukcji nawigacji (tylko gdy aplikacja jest na pierwszym planie)</string>
     <string name="devicetype_redmi_watch_2_lite">Redmi Watch 2 Lite</string>
+    <string name="notification_channel_connection_status_name">Stan połączenia</string>
+    <string name="devicetype_redmi_smart_band_pro">Redmi Smart Band Pro</string>
 </resources>
\ No newline at end of file

From 5939691b689e879af6485e35028fa5779f184161 Mon Sep 17 00:00:00 2001
From: 0que <0que@users.noreply.hosted.weblate.org>
Date: Tue, 2 Jan 2024 07:10:42 +0000
Subject: [PATCH 421/595] Translated using Weblate (Russian)

Currently translated at 99.3% (2406 of 2421 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ru/
---
 app/src/main/res/values-ru/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 8616ee71f..b9dd3e4b3 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -2622,4 +2622,6 @@
     <string name="prefs_device_name">Имя устройства</string>
     <string name="pref_summary_fossil_hr_nav_vibrate">Должны ли часы вибрировать при получении или изменении навигационных указаний (когда приложение показано)</string>
     <string name="devicetype_redmi_watch_2_lite">Redmi Watch 2 Lite</string>
+    <string name="notification_channel_connection_status_name">Состояние соединения</string>
+    <string name="devicetype_redmi_smart_band_pro">Redmi Smart Band Pro</string>
 </resources>
\ No newline at end of file

From be3cab9388158eb02ac769d7a79285df1a55f913 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B0=91=E4=B8=BE?= <oshirisu.red@gmail.com>
Date: Tue, 2 Jan 2024 01:31:38 +0000
Subject: [PATCH 422/595] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (2421 of 2421 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/zh_Hans/
---
 app/src/main/res/values-zh-rCN/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 36a0e9e0b..5e4f32e81 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -2630,4 +2630,5 @@
     <string name="pref_summary_fossil_hr_nav_vibrate">手表是否应该在每个新的或更改的导航指令时振动（仅当应用程序位于前台时）</string>
     <string name="devicetype_redmi_watch_2_lite">红米手表2青春版</string>
     <string name="devicetype_redmi_smart_band_pro">红米智能手环Pro</string>
+    <string name="notification_channel_connection_status_name">连接状态</string>
 </resources>
\ No newline at end of file

From 0d421c574589a043fc407cfabfa941849e0a6718 Mon Sep 17 00:00:00 2001
From: Rex_sa <rex.sa@pm.me>
Date: Tue, 2 Jan 2024 06:32:17 +0000
Subject: [PATCH 423/595] Translated using Weblate (Arabic)

Currently translated at 100.0% (2421 of 2421 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ar/
---
 app/src/main/res/values-ar/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 459334822..6f658710d 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -2615,4 +2615,5 @@
     <string name="pref_summary_fossil_hr_nav_vibrate">ما إذا كان يجب أن تهتز الساعة عند كل تعليمات تنقل جديدة أو تم تغييرها (فقط عندما يكون التطبيق في المقدمة)</string>
     <string name="devicetype_redmi_watch_2_lite">ساعة ريدمي 2 لايت</string>
     <string name="devicetype_redmi_smart_band_pro">سوار ريدمي برو الذكي</string>
+    <string name="notification_channel_connection_status_name">حالة الإتصال</string>
 </resources>
\ No newline at end of file

From 3ef8965e2d2ebd6c7e0d07dbcaebe3530cecdd90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81cs=20Zolt=C3=A1n?= <acszoltan111@gmail.com>
Date: Thu, 4 Jan 2024 05:49:42 +0000
Subject: [PATCH 424/595] Translated using Weblate (Hungarian)

Currently translated at 55.0% (1333 of 2421 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/hu/
---
 app/src/main/res/values-hu/strings.xml | 170 +++++++++++++++++++------
 1 file changed, 134 insertions(+), 36 deletions(-)

diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 8396ca9e6..a9fe95814 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -8,14 +8,14 @@
     <string name="controlcenter_fetch_activity_data">Szinkronizálás</string>
     <string name="controlcenter_find_device">Elveszett eszköz keresése</string>
     <string name="controlcenter_take_screenshot">Képernyőkép készítése</string>
-    <string name="controlcenter_disconnect">Kapcsolat megszüntetése</string>
+    <string name="controlcenter_disconnect">Lekapcsolódás</string>
     <string name="controlcenter_delete_device">Eszköz törlése</string>
     <string name="controlcenter_delete_device_name">%1$s törlése</string>
     <string name="controlcenter_delete_device_dialogmessage">Az eszköz és az összes hozzátartozó adat törlésre kerül!</string>
     <string name="controlcenter_navigation_drawer_open">Navigációs fiók megnyitása</string>
     <string name="controlcenter_navigation_drawer_close">Navigációs fiók bezárása</string>
-    <string name="controlcenter_snackbar_need_longpress">Nyomja hosszan a szétkapcsoláshoz</string>
-    <string name="controlcenter_snackbar_disconnecting">Szétkapcsolódás</string>
+    <string name="controlcenter_snackbar_need_longpress">Nyomja hosszan a lekapcsolódáshoz</string>
+    <string name="controlcenter_snackbar_disconnecting">Lekapcsolódás</string>
     <string name="controlcenter_snackbar_connecting">Kapcsolódás…</string>
     <string name="controlcenter_snackbar_requested_screenshot">Képernyőkép készítése az eszközről</string>
     <string name="title_activity_debug">Hibakeresés</string>
@@ -51,12 +51,12 @@
     <string name="pref_header_general">Általános beállítások</string>
     <string name="pref_title_general_autoconnectonbluetooth">Kapcsolódjon a Gadgetbridge eszközhöz a Bluetooth bekapcsolásakor</string>
     <string name="pref_title_general_autostartonboot">Automatikus indulás</string>
-    <string name="pref_title_general_autoreconnect">Automatikus újracsatlakozás</string>
+    <string name="pref_title_general_autoreconnect">Automatikus újrakapcsolódás</string>
     <string name="pref_title_audio_player">Preferált zenelejátszó</string>
     <string name="pref_default">Alapértelmezett</string>
     <string name="pref_header_datetime">Dátum és idő</string>
     <string name="pref_title_datetime_syctimeonconnect">Idő szinkronizálása</string>
-    <string name="pref_summary_datetime_syctimeonconnect">Idő szinkronizálása a Gadgetbridge eszközzel csatlakozáskor, és amikor az Android eszköz ideje vagy időzónája változik</string>
+    <string name="pref_summary_datetime_syctimeonconnect">Idő szinkronizálása a Gadgetbridge eszközzel kapcsolódáskor, és amikor az Android eszköz ideje vagy időzónája változik</string>
     <string name="pref_title_theme">Téma</string>
     <string name="pref_theme_light">Világos</string>
     <string name="pref_theme_dark">Sötét</string>
@@ -130,18 +130,18 @@
     <string name="pref_title_pebble_mtu_limit">Pebble 2/LE GATT MTU határérték</string>
     <string name="pref_summary_pebble_mtu_limit">Ha a Pebble 2/Pebble LE nem működik elvártan, próbálja beállítani az MTU határértéket (az érvényes tartomány: 20–512)</string>
     <string name="pref_title_pebble_enable_applogs">Óraalkalmazás-naplózás engedélyezése</string>
-    <string name="pref_summary_pebble_enable_applogs">A karóra-alkalmazások naplóit a Gadgetbridge is naplózni fogja (újracsatlakozást igényel)</string>
+    <string name="pref_summary_pebble_enable_applogs">A karóra-alkalmazások naplóit a Gadgetbridge is naplózni fogja (újrakapcsolódást igényel)</string>
     <string name="pref_title_pebble_always_ack_pebblekit">Korai ACK PebbleKit</string>
     <string name="pref_summary_pebble_always_ack_pebblekit">Minden esetben azonnal felismeri az üzeneteket, amelyeket külső harmadik alkalmazásoknak küldenek</string>
-    <string name="pref_title_pebble_reconnect_attempts">Újracsatlakozási kísérletek</string>
+    <string name="pref_title_pebble_reconnect_attempts">Újrakapcsolódási kísérletek</string>
     <string name="pref_title_unit_system">Egységek</string>
     <string name="pref_title_timeformat">Időformátum</string>
     <string name="pref_title_screentime">Kijelző bekapcsolva tartásának ideje</string>
     <string name="prefs_title_all_day_heart_rate">Egész napos pulzusmérés</string>
     <string name="preferences_hplus_settings">HPlus/Makibes beállítások</string>
-    <string name="not_connected">Nincs csatlakozva</string>
-    <string name="connecting">Csatlakozás</string>
-    <string name="connected">Csatlakozva</string>
+    <string name="not_connected">Nincs kapcsolódva</string>
+    <string name="connecting">Kapcsolódás</string>
+    <string name="connected">Kapcsolódva</string>
     <string name="unknown_state">Ismeretlen állapot</string>
     <string name="_unknown_">(ismeretlen)</string>
     <string name="test">Teszt</string>
@@ -149,11 +149,11 @@
     <string name="this_is_a_test_notification_from_gadgetbridge">Ez egy teszt értesítés a Gadgetbridge-től</string>
     <string name="bluetooth_is_not_supported_">A Bluetooth nem támogatott.</string>
     <string name="bluetooth_is_disabled_">A Bluetooth ki van kapcsolva.</string>
-    <string name="tap_connected_device_for_app_mananger">Koppintson az eszközre az alkalmazáskezelőhöz</string>
-    <string name="tap_connected_device_for_activity">Koppintson az eszközre az aktivitáshoz</string>
-    <string name="tap_connected_device_for_vibration">Koppintson az eszközre a rezgetéshez</string>
-    <string name="tap_a_device_to_connect">Koppintson az eszközre a csatlakozáshoz</string>
-    <string name="cannot_connect_bt_address_invalid_">Nem lehet csatlakozni. Lehet, hogy érvénytelen a Bluetooth cím\?</string>
+    <string name="tap_connected_device_for_app_mananger">Koppintson a kapcsolódott eszközre az alkalmazáskezelőhöz</string>
+    <string name="tap_connected_device_for_activity">Koppintson a kapcsolódott eszközre az aktivitáshoz</string>
+    <string name="tap_connected_device_for_vibration">Koppintson a kapcsolódott eszközre a rezgetéshez</string>
+    <string name="tap_a_device_to_connect">Koppintson az eszközre a kapcsolódáshoz</string>
+    <string name="cannot_connect_bt_address_invalid_">Nem lehet kapcsolódni. Lehet, hogy érvénytelen a Bluetooth cím?</string>
     <string name="gadgetbridge_running_generic">A Gadgetbridge fut</string>
     <string name="installing_binary_d_d">%1$d/%2$d bináris telepítése</string>
     <string name="installation_failed_">Sikertelen telepítés</string>
@@ -170,10 +170,10 @@
     <string name="n_a">N/A</string>
     <string name="initialized">inicializált</string>
     <string name="appversion_by_creator">%1$s , tőle: %2$s</string>
-    <string name="title_activity_discovery">Eszköz keresése</string>
+    <string name="title_activity_discovery">Eszköz felderítése</string>
     <string name="discovery_stop_scanning">Keresés leállítása</string>
-    <string name="discovery_start_scanning">Keresés indítása</string>
-    <string name="action_discover">Új eszköz csatlakoztatása</string>
+    <string name="discovery_start_scanning">Felderítés indítása</string>
+    <string name="action_discover">Új eszköz kapcsolódása</string>
     <string name="device_with_rssi">%1$s (%2$s)</string>
     <string name="title_activity_android_pairing">Eszköz párosítása</string>
     <string name="android_pairing_hint">Használja az Android Bluetooth párosítás ablakot eszköz párosításához.</string>
@@ -182,7 +182,7 @@
     <string name="pairing_creating_bond_with">Összeköttetés létesítése ezzel: %1$s (%2$s)</string>
     <string name="pairing_unable_to_pair_with">Sikertelen párosítás ezzel: %1$s (%2$s)</string>
     <string name="pairing_in_progress">Összeköttetés folyamatban ezzel: %1$s (%2$s)</string>
-    <string name="pairing_already_bonded">%1$s (%2$s) már párosítva van, kapcsolódás…</string>
+    <string name="pairing_already_bonded">%1$s (%2$s) már össze van köttetve, kapcsolódás…</string>
     <string name="message_cannot_pair_no_mac">Nincs találat a MAC címre, nem lehet párosítani.</string>
     <string name="preferences_category_device_specific_settings">Eszközspecifikus beállítások</string>
     <string name="preferences_miband_settings">MI Band / Amazfit beállítások</string>
@@ -194,7 +194,7 @@
     <string name="miband_pairing_using_dummy_userdata">Érvénytelen felhasználói adatok vannak megadva, alapértelmezett adatok használata.</string>
     <string name="miband_pairing_tap_hint">Amikor rezegni kezd a Mi Band-je, érintse meg párszor egymás után.</string>
     <string name="appinstaller_install">Telepítés</string>
-    <string name="discovery_connected_devices_hint">Tegye láthatóvá a készülékét. A jelenleg csatlakoztatott készülékek nem fognak láthatóként megjelenni. Aktiválja a helymeghatározást (Pl: GPS) az Android 6+ készülékén. Kapcsolja ki a Privacy Guard-ban a Gadgetbridge-et (Ha van Privacy Guard beállítása), különben az alkalmazás összeomolhat, illetve újraindulhata készüléke. Ha nem található az eszköz pár percen belül, próbálja meg újraindítani a telefonját.</string>
+    <string name="discovery_connected_devices_hint">Tegye felderíthetővé a készülékét. A jelenleg kapcsolódott készülékek nem fognak felderíthetőként megjelenni. Aktiválja a helymeghatározást (Pl: GPS) az Android 6+ készülékén. Kapcsolja ki a Privacy Guard-ban a Gadgetbridge-et (Ha van Privacy Guard beállítása), különben az alkalmazás összeomolhat, illetve újraindulhat a telefonja. Ha nem található az eszköz pár percen belül, próbálja meg újraindítani a telefonját.</string>
     <string name="discovery_note">Megjegyzés:</string>
     <string name="candidate_item_device_image">Eszközkép</string>
     <string name="miband_prefs_alias">Név/álnév</string>
@@ -266,7 +266,7 @@
     <string name="installhandler_firmware_name">%1$s: %2$s %3$s</string>
     <string name="miband_fwinstaller_compatible_version">Kompatibilis verzió</string>
     <string name="miband_fwinstaller_untested_version">Nem tesztelt verzió!</string>
-    <string name="fwappinstaller_connection_state">Csatlakozás az eszközhöz: %1$s</string>
+    <string name="fwappinstaller_connection_state">Kapcsolódás az eszközhöz: %1$s</string>
     <string name="pbw_installhandler_pebble_firmware">Pebble Firmware %1$s</string>
     <string name="pbwinstallhandler_correct_hw_revision">Helyes hardververzió</string>
     <string name="pbwinstallhandler_incorrect_hw_revision">Hardververzió eltérés!</string>
@@ -298,7 +298,7 @@
     <string name="abstract_chart_fragment_kind_light_sleep">Könnyű alvás</string>
     <string name="abstract_chart_fragment_kind_deep_sleep">Mély alvás</string>
     <string name="abstract_chart_fragment_kind_not_worn">Nem viselt</string>
-    <string name="device_not_connected">Nincs csatlakoztatva.</string>
+    <string name="device_not_connected">Nincs kapcsolódva.</string>
     <string name="user_feedback_all_alarms_disabled">Mindegyik ébresztés letiltva</string>
     <string name="pref_title_keep_data_on_device">Aktivitásadatok eszközön hagyása</string>
     <string name="miband_fwinstaller_incompatible_version">Nem kompatibilis firmware</string>
@@ -324,7 +324,7 @@
     <string name="mi2_prefs_do_not_disturb_start">Kezdete</string>
     <string name="mi2_prefs_do_not_disturb_end">Vége</string>
     <string name="FetchActivityOperation_about_to_transfer_since">Adatátvitelre készül: %1$s óta</string>
-    <string name="waiting_for_reconnect">Várakozás az újracsatlakozásra</string>
+    <string name="waiting_for_reconnect">Várakozás az újrakapcsolódásra</string>
     <string name="activity_prefs_about_you">Önről</string>
     <string name="activity_prefs_year_birth">Születési év</string>
     <string name="activity_prefs_gender">Nem</string>
@@ -348,7 +348,14 @@
     <string name="pref_summary_pebble_health_store_raw">Ha bejelölöd, az adatok eredeti formában lesznek tárolva későbbi értelmezéshez. Megj.: az adatbázis ebben az esetben nagyobb lesz!</string>
     <string name="action_db_management">Adatkezelés</string>
     <string name="title_activity_db_management">Adatkezelés</string>
-    <string name="activity_db_management_import_export_explanation">Az adatbázisművelet ezt a helyet fogja használni. Ez a hely elérhető másik Android-alkalmazások és a számítógép számára. Itt keresd az exportált adatbázist is, illetve ide rakd az importálni kívánt adatbázist is.</string>
+    <string name="activity_db_management_import_export_explanation">Az exportálás/importálás műveletek a következő könyvtár útvonalát (lásd lentebb) használják az eszközén. Ez a könyvtár elérhető más Android alkalmazások és a számítógépe számára. Jegyezze meg, hogy ez a könyvár és az összes tartalmazott fájl törölve lesz, ha eltávolítja a Gadgetbridge-et. Az adatok tartalmazzák:
+\n Export_preference - globális beállítások
+\n Export_preference_MAC - eszközspecifikus beállítások
+\n Gadgetbridge - eszköz- és aktivitás-adatbázis
+\n Gadgetbridge_date - egy dátumon exportált adatbázis
+\n *.gpx - GPS feljegyzések
+\n *.log - naplófájlok
+\nVárhatóan itt megtalálja az exportált fájlokat (vagy helyezze ide az importálni kívánt fájlokat):</string>
     <string name="activity_db_management_merge_old_title">Régi adatbázis törlése</string>
     <string name="dbmanagementactivvity_cannot_access_export_path">Nem elérhető az exportálási útvonal. Kérjük vegye fel a kapcsolatot a fejlesztőkkel.</string>
     <string name="dbmanagementactivity_exported_to">Exportálva ide: %1$s</string>
@@ -377,7 +384,7 @@
     <string name="pebble_pairing_hint">Egy párosítási párbeszédablak fog megjelennie az Android eszközén. Ha ez nem történik meg, nézze meg az értesítési sávban és fogadja el a párosítási kérelmet. Utána fogadja el a kérelmet a Pebble-n is.</string>
     <string name="weather_notification_label">Bizonyosodjon meg róla, hogy a skin támogatja-e az Időjárás értesítések megjelenítését. Nincs szükség konfigurációra. A Pebble app management-ben tudja engedélyezni a rendszer időjárás alkalmazását. Azok a skinek amik támogatják az időjárás értesítésket, automatikusan megfogják jeleníteni azt.</string>
     <string name="pref_title_setup_bt_pairing">Bluetooth párosítás engedélyezése</string>
-    <string name="pref_summary_setup_bt_pairing">Kapcsolja ki ezt, ha gondja van a csatlakozással</string>
+    <string name="pref_summary_setup_bt_pairing">Kapcsolja ki ezt, ha gondja van a kapcsolódással</string>
     <string name="unit_metric">Metrikus</string>
     <string name="unit_imperial">Birodalmi</string>
     <string name="timeformat_24h">24H</string>
@@ -394,16 +401,16 @@
     <string name="mi2_dnd_automatic">Automatikus (alvásérzékelés)</string>
     <string name="mi2_dnd_scheduled">Időzített (idő intervallum)</string>
     <string name="discovery_attempting_to_pair">Párosítás megkísérlése ezzel: %1$s</string>
-    <string name="discovery_bonding_failed_immediately">A csatlakozás a(z) %1$s eszközzel azonnal megszakadt.</string>
-    <string name="discovery_trying_to_connect_to">Csatlakozás megkísérlése ezzel: %1$s</string>
+    <string name="discovery_bonding_failed_immediately">Az összeköttetés a(z) %1$s eszközzel azonnal megszakadt.</string>
+    <string name="discovery_trying_to_connect_to">Kapcsolódás megkísérlése ezzel: %1$s</string>
     <string name="discovery_enable_bluetooth">Engedélyezze a Bluetooth-ot az eszközök felderítéséhez.</string>
-    <string name="discovery_successfully_bonded">Párosítva ehhez: %1$s.</string>
-    <string name="discovery_pair_title">%1$s párosítása\?</string>
+    <string name="discovery_successfully_bonded">Összeköttetve ezzel: %1$s.</string>
+    <string name="discovery_pair_title">%1$s párosítása?</string>
     <string name="discovery_pair_question">Válassza ki a párosítást az eszköz párosításához. Ha ez nem sikerül, próbálja meg újra párosítás nélkül.</string>
     <string name="discovery_yes_pair">Párosítás</string>
     <string name="discovery_dont_pair">Ne párosítsa</string>
     <string name="action_donate">Adományozás</string>
-    <string name="controlcenter_connect">Csatlakoztatás…</string>
+    <string name="controlcenter_connect">Kapcsolódás…</string>
     <string name="pref_title_weather">Időjárás</string>
     <string name="pref_auto_fetch">Aktivitásadatok automatikus lekérdezése</string>
     <string name="horizontal">Vízszintes</string>
@@ -457,7 +464,7 @@
     <string name="mi2_prefs_button_press_broadcast_default_value" translatable="false">nodomain.freeyourgadget.gadgetbridge.ButtonPressed</string>
     <string name="prefs_title_heartrate_measurement_interval">Egész napos pulzusmérés</string>
     <string name="prefs_screen_orientation">Képernyő tájolása</string>
-    <string name="pref_summary_sync_calendar">Naptár értesítések bekapcsolása mikor nincs kapcsolat a telefonnal</string>
+    <string name="pref_summary_sync_calendar">Naptár értesítések bekapcsolása, akkor is, ha le van kapcsolódva a telefonról</string>
     <string name="fw_upgrade_notice_amazfitcor">Ön a %s firmware-t telepíti az Amazfit Cor-ra.
 \n
 \nGyőződjön meg, hogy a .fw, és végül a .res fájl is telepítésre kerül! Az óra a .fw file telepítése után újraindul.
@@ -568,7 +575,7 @@
     <string name="zetime_title_alarm_signaling">Jelzés típusának beállítása az ébresztőhöz</string>
     <string name="widget_set_alarm_after">Ébresztő beállítása ennyi idő múlva:</string>
     <string name="menuitem_alarm">Ébresztés</string>
-    <string name="appwidget_not_connected">Nincs csatlakozva, ébresztő nincs beállítva.</string>
+    <string name="appwidget_not_connected">Nincs kapcsolódva, ébresztő nincs beállítva.</string>
     <string name="zetime_analog_mode_handsandsteps">Kezek és lépések</string>
     <string name="find_lost_device_you_found_it">Megvan!</string>
     <string name="activity_db_management_empty_DB">Adatbázis ürítése</string>
@@ -897,7 +904,7 @@
     <string name="filter_mode_whitelist">Jelenítse meg, amikor ezeket a szavakat tartalmazza</string>
     <string name="mi3_night_mode_sunset">Naplementekor</string>
     <string name="busy_task_fetch_hr_data">Pulzusadatok lekérdezése</string>
-    <string name="devicestatus_connected">Eszköz csatlakoztatva</string>
+    <string name="devicestatus_connected">Eszköz kapcsolódva</string>
     <string name="traditional_chinese">Tradicionális kínai</string>
     <string name="devicetype_mykronoz_zetime">MyKronoz ZeTime</string>
     <string name="seconds_m">sec/m</string>
@@ -930,7 +937,7 @@
     <string name="activity_prefs_chart_min_steps_per_minute_for_run">Minimum percenkénti lépés futás észleléséhez</string>
     <string name="pref_screen_notification_profile_inactivity">Inaktivitási értesítés</string>
     <string name="qhybrid_changes_delay_prompt">a változtatás eltarthat néhány másodpercig…</string>
-    <string name="watch_not_connected">Az óra nincs csatlakozva</string>
+    <string name="watch_not_connected">Az óra nincs kapcsolódva</string>
     <string name="weeksleepchart_sleep_a_month">Havi alvás</string>
     <string name="descentSeconds">Csökkenő</string>
     <string name="activity_type_light_sleep">Könnyű alvás</string>
@@ -1190,7 +1197,7 @@
     <string name="address">Cím</string>
     <string name="devicetype_smaq2oss">SMA-Q2 OSS</string>
     <string name="pai_plus_num">+%d</string>
-    <string name="device_is_currently_bonded">MÁR PÁROSÍTVA VAN</string>
+    <string name="device_is_currently_bonded">MÁR ÖSSZE VAN KÖTTETVE</string>
     <string name="pref_media_previous">Előző szám</string>
     <string name="activity_type_strength_training">Erősítés</string>
     <string name="world_clock_code">Kód</string>
@@ -1249,7 +1256,7 @@
     <string name="appmanager_download_started">Az alkalmazás letöltése elindult</string>
     <string name="power_saving">Energiatakarékos</string>
     <string name="gadgetbridge_running_banglejs_main">Bangle.js jelenleg fut</string>
-    <string name="debugactivity_confirm_remove_device_preferences">Ez a művelet az összes kapcsolt eszköz beállítását alap helyzetbe helyezi. Biztos benne\?</string>
+    <string name="debugactivity_confirm_remove_device_preferences">Ez a művelet az összes kapcsolódott eszköz beállítását alap helyzetbe helyezi. Biztos benne?</string>
     <string name="gps_gnolass">GPS + GLONASS</string>
     <string name="gps_bds">GPS + BDS</string>
     <string name="low_power_gps">Alacsony energiájú GPS</string>
@@ -1281,4 +1288,95 @@
     <string name="require_location_provider">A helymeghatározásnak engedélyezve kell lennie</string>
     <string name="pref_title_banglejs_phone_gps_network_only">Hálózat használata csak a hely meghatározásához</string>
     <string name="notification_gps_text">GPS hely küldése %1$d eszközökre</string>
+    <string name="zepp_os_watchface_pure_white">Tiszta fehér</string>
+    <string name="charts_legend_heartrate_average">Átlagos pulzus</string>
+    <string name="pref_summary_authkey">Módosítsa a hitelesítési kulcsot egy közös kulcsra az összes olyan Android-eszközén, amelyről kapcsolódni szeretne. A korábbi alapértelmezett kulcs minden eszközön: 0123456789@ABCDE</string>
+    <string name="prefs_wena3_notification_vibration_repetition_3">Háromszor</string>
+    <string name="zepp_os_watchface_city_of_speed">Sebesség városa</string>
+    <string name="prefs_phone_silent_mode">Telefon néma mód</string>
+    <string name="watchface_dialog_widget_cat_2nd_tz_widget">Második időzóna widget</string>
+    <string name="pref_cache_weather">Időjárás-információ gyorsítótárazása</string>
+    <string name="prefs_wena3_vibration_short">Rövid</string>
+    <string name="devicestatus_connecting">Az eszköz kapcsolódik</string>
+    <string name="pref_title_chart_heartrate_color">Pulzus szín</string>
+    <string name="discovery_bluetooth_scan">Bluetooth keresés:</string>
+    <string name="zepp_os_watchface_free_combination">Szabad kombináció</string>
+    <string name="activity_db_management_autoexport_enabled_yes">Az automatikus exportálás engedélyezve van.</string>
+    <string name="activity_db_management_clean_export_directory_label">Fájlok törlése az exportálás/importálás könyvtárból</string>
+    <string name="prefs_wena3_vibration_smart_item">Okos rezgés</string>
+    <string name="zepp_os_watchface_business_style">Üzleti stílus</string>
+    <string name="watchface_cache_confirm_overwrite">Egy számlap ezzel a névvel már létezik a gyorsítótárban. Szeretné felülírni?</string>
+    <string name="prefs_wena3_vibration_strength_item_medium">Közepes</string>
+    <string name="zepp_os_watchface_emerald_moonlight">Smaragd holdfény</string>
+    <string name="activity_data_management_directory_content_title">Exportálás/importálás könyvtár tartalma</string>
+    <string name="silent_mode_normal_vibrate">Normál / rezgés</string>
+    <string name="prefs_disconnect_notification">Lekapcsolódási értesítés</string>
+    <string name="prefs_wena3_vibration_continuous">Folyamatos</string>
+    <string name="fossil_hr_connection_not_confirmed">A kapcsolódás nincs megerősítve az órán, hitelesítés nélküli mód használata</string>
+    <string name="zepp_os_watchface_vibrant">Élénk</string>
+    <string name="activity_db_management_autoexport_scheduled_no">Az automatikus exportálás nincs időzítve.</string>
+    <string name="activity_db_management_clean_export_directory_text">Az exportált fájlok az exportálás/importálás könyvtárban bármilyen alkalmazás számára elérhetőek az eszközén. Lehet, hogy törölni szeretné ezeket a fájlokat szinkronizálás vagy biztonsági mentés után. Győződjön meg, hogy van mentése, mielőtt törli őket. A GPX fájlok, az alkönyvtárak és az automatikusan exportált adatbázis-fájlok (ha léteznek) nem lesznek törölve. Az exportálás/importálás könyvtár útvonala:</string>
+    <string name="prefs_wena3_vibration_strength_item_weak">Gyenge</string>
+    <string name="activity_db_management_autoexport_enabled_no">Az automatikus exportálás nincs engedélyezve.</string>
+    <string name="pref_screen_vibration_patterns_summary">Rezgésminták beállítása a különböző értesítésekhez</string>
+    <string name="zepp_os_watchface_starry_sky">Csillagos ég</string>
+    <string name="discovery_entered_invalid_authkey">A beírt titkos hitelesítési kulcs érvénytelen! Nyomjon hosszan az eszközre a szerkesztéshez.</string>
+    <string name="activity_DB_ShowContentButton">Exportálás/importálás könyvtár tartalmának megjelenítése</string>
+    <string name="enable_vibrations_summary">Rezgés hívásokhoz, üzenetekhez, értesítésekhez és többhöz</string>
+    <string name="zepp_os_watchface_red_fantasy">Vörös fantázia</string>
+    <string name="prefs_hr_alarm_activity">Pulzus riasztás sport aktivitás közben</string>
+    <string name="devicestatus_disconnecting">Az eszköz lekapcsolódik!</string>
+    <string name="prefs_wena3_vibration_basic">Alap</string>
+    <string name="activity_DB_clean_export_directory_warning_title">Törli a fájlokat az exportálás/importálás könyvtárból?</string>
+    <string name="prefs_wena3_notification_vibration_repetition_2">Kétszer</string>
+    <string name="discovery_need_to_enter_authkey">Ennek az eszköznek szüksége van egy titkos hitelesítési kulcsra, nyomjon hosszan az eszközre, hogy be tudja írni. Olvassa ez a wikit.</string>
+    <string name="activity_DB_clean_export_directory_warning_message">Biztosan törli a fájlokat az exportálás/importálás könyvtárból?</string>
+    <string name="prefs_wena3_vibration_rapid">Gyors</string>
+    <string name="about_additional_contributions">Sok köszönet minden fel nem sorolt közreműködőnek, akik közreműködtek ezekben: kódok, fordítások, támogatás, ötletek, motiváció, hibajelentések, pénz… ✊</string>
+    <string name="silent_mode_vibrate_silent">Rezgés / néma</string>
+    <string name="prefs_wena3_notification_vibration_repetition_1">Egyszer</string>
+    <string name="pref_title_connected_advertisement">Látható, amíg kapcsolódva van</string>
+    <string name="HeartRateZones">Pulzus zónák</string>
+    <string name="button_watchface_save_apply">Mentés és alkalmazás</string>
+    <string name="prefs_wena3_notification_default_call_vibration">Bejövő hívás rezgés</string>
+    <string name="pref_cache_weather_summary">Az időjárás-információ gyorsítótárazva lesz az alkalmazás-újraindítások között.</string>
+    <string name="zepp_os_watchface_vast_sky">Hatalmas ég</string>
+    <string name="about_description_main_nopebble">A gyártók zárt forráskódú Android-kütyüalkalmazásainak felhő nélküli, szabad, copyleft helyettesítése. A Gadgetbridge nightly kiadása. Ebben a verzióban a Pebble szolgáltatót átnevezték az ütközések elkerülése érdekében, így egyes Pebble-lel kapcsolatos integrációk nem működnek, de telepíthető a meglévő Gadgetbridge-telepítés mellé.</string>
+    <string name="autoExport_lastTime_label">Utolsó automatikus exportálás: %1$s</string>
+    <string name="zepp_os_watchface_simplicity_data">Egyszerű adatok</string>
+    <string name="pref_title_huami_force_new_protocol">Új hitelesítési protokoll</string>
+    <string name="qhybrid_title_watchface">Számlap konfiguráció</string>
+    <string name="pref_title_notification_cache_while_disconnected">Gyorsítótárazás, amíg hatótávon kívül van</string>
+    <string name="discovery_bluetooth_le_scan">Bluetooth LE keresés:</string>
+    <string name="devicestatus_disconnected">Az eszköz lekapcsolódott!</string>
+    <string name="controlcenter_get_heartrate_measurement">Legyen pulzusmérés</string>
+    <string name="zepp_os_watchface_lightning_flash">Villámlás</string>
+    <string name="prefs_wena3_vibration_siren">Sziréna</string>
+    <string name="ignore_bonded_devices_description">Ennek az opciónak az engedélyezése ignorálni fogja kereséskor azokat az eszközöket, amik már összeköttetve/párosítva vannak</string>
+    <string name="activity_DB_test_export_button">Automatikus exportálás futtatása most</string>
+    <string name="prefs_wena3_notification_default_call_vibration_repetition">Bejövő hívás rezgés ismétlés</string>
+    <string name="prefs_wena3_notification_default_vibration">Értesítés rezgés</string>
+    <string name="prefs_wena3_notification_vibration_repetition_0">Folyamatosan</string>
+    <string name="activity_prefs_discovery_pairing">Felderítési és párosítási beállítások</string>
+    <string name="prefs_wena3_notification_vibration_repetition_4">Négyszer</string>
+    <string name="pref_summary_notification_cache_while_disconnected">Kihagyott értesítések elküldése, amikor az eszköz újrakapcsolódik, miután hatótávon kívül volt</string>
+    <string name="prefs_wena3_vibration_strength_item">Rezgés erőssége</string>
+    <string name="zetime_title_heart_rate_alarm_summary">Az óra figyelmeztetni fog, amikor a pulzus átlépi a határokat.</string>
+    <string name="lefun_prefs_antilost_summary">A karkötő rezegni fog, ha a telefon lekapcsolódik a karkötőről</string>
+    <string name="zepp_os_watchface_multiple_data">Sok adat</string>
+    <string name="about_description_main_nightly">A gyártók zárt forráskódú Android-kütyüalkalmazásainak felhő nélküli, szabad, copyleft helyettesítése. A Gadgetbridge nightly kiadása. Nem telepíthető, ha már telepítve van a Gadgetbridge vagy a Pebble alkalmazás, a Pebble szolgáltató ütközése miatt.</string>
+    <string name="ignore_bonded_devices">Összeköttetett eszközök ignorálása</string>
+    <string name="prefs_wena3_notification_default_vibration_repetition">Értesítés rezgés ismétlés</string>
+    <string name="zepp_os_watchface_rotating_earth">Forgó föld</string>
+    <string name="about_hash">Kommit %s</string>
+    <string name="pref_summary_disable_new_ble_scanning">Engedélyezze ezt az opciót, ha az eszköze nem található felderítés során</string>
+    <string name="fossil_hr_unavailable_unauthed">Nem elérhető hitelesítés nélküli módban</string>
+    <string name="silent_mode_normal_silent">Normál / néma</string>
+    <string name="prefs_wena3_vibration_warning">Figyelmeztetés</string>
+    <string name="fossil_hr_auth_failed">A hitelesítés sikertelen, korlátozott funkcionalitás</string>
+    <string name="pref_explanation_authkey_new_protocol">Ha \"Frissítse az alkalmazást a legutóbbi verzióra\" üzenetet kap, győződjön meg róla, hogy engedélyezte az \"Új hitelesítési protokoll\" opciót fentebb. Koppintson ide a további részletekért a wikiben.</string>
+    <string name="prefs_wena3_vibration_none">Nincs rezgés</string>
+    <string name="prefs_wena3_vibration_strength_item_strong">Erős</string>
+    <string name="prefs_wena3_vibration_triple">Háromszor</string>
+    <string name="pref_explanation_authkey">Néhány eszköznek szüksége van egy különleges párosítási kulcsra az első alkalommal. Koppintson ide a további részletekért a wikiben.</string>
 </resources>
\ No newline at end of file

From 42800ecfe47abcebe99107255c04099df0e8d9ea Mon Sep 17 00:00:00 2001
From: Koen <weblate.84wjw@simplelogin.com>
Date: Thu, 4 Jan 2024 13:26:08 +0000
Subject: [PATCH 425/595] Translated using Weblate (Dutch)

Currently translated at 100.0% (2421 of 2421 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/nl/
---
 app/src/main/res/values-nl/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 65c64ce2d..ed73c6b2e 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -2629,4 +2629,6 @@
     <string name="prefs_device_name">Apparaatnaam</string>
     <string name="pref_summary_fossil_hr_nav_vibrate">Moet het horloge trillen bij elke nieuwe of veranderde navigatie-instructie (alleen als de app op de voorgrond is)?</string>
     <string name="devicetype_redmi_watch_2_lite">Redmi Watch 2 Lite</string>
+    <string name="notification_channel_connection_status_name">Connectie status</string>
+    <string name="devicetype_redmi_smart_band_pro">Redmi Smart Band Pro</string>
 </resources>
\ No newline at end of file

From 70789c5b42370d1a9a2a567e03169de3651d14ef Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Thu, 4 Jan 2024 21:03:49 +0000
Subject: [PATCH 426/595] Translated using Weblate (Spanish)

Currently translated at 100.0% (2422 of 2422 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/es/
---
 app/src/main/res/values-es/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index c00b5aa98..dcc762605 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -2633,4 +2633,5 @@
     <string name="devicetype_redmi_watch_2_lite">Redmi Watch 2 Lite</string>
     <string name="notification_channel_connection_status_name">Estado de la conexión</string>
     <string name="devicetype_redmi_smart_band_pro">Redmi Smart Band Pro</string>
+    <string name="devicetype_nothingear2">Nothing Ear (2)</string>
 </resources>
\ No newline at end of file

From e9f82ed2f3c25b5eb5b37bf75b96e1045dbe6e66 Mon Sep 17 00:00:00 2001
From: Xtremo3 <a.lewicki95@gmail.com>
Date: Fri, 5 Jan 2024 08:14:47 +0000
Subject: [PATCH 427/595] Translated using Weblate (Polish)

Currently translated at 100.0% (2422 of 2422 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/pl/
---
 app/src/main/res/values-pl/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 86614ff32..282c06730 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -2640,4 +2640,5 @@
     <string name="devicetype_redmi_watch_2_lite">Redmi Watch 2 Lite</string>
     <string name="notification_channel_connection_status_name">Stan połączenia</string>
     <string name="devicetype_redmi_smart_band_pro">Redmi Smart Band Pro</string>
+    <string name="devicetype_nothingear2">Nothing Ear (2)</string>
 </resources>
\ No newline at end of file

From 705d9b7ff2d4136441d443bdf8badf4a8e2ce580 Mon Sep 17 00:00:00 2001
From: Rex_sa <rex.sa@pm.me>
Date: Fri, 5 Jan 2024 13:09:09 +0000
Subject: [PATCH 428/595] Translated using Weblate (Arabic)

Currently translated at 100.0% (2422 of 2422 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ar/
---
 app/src/main/res/values-ar/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 6f658710d..ee25ba62e 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -2616,4 +2616,5 @@
     <string name="devicetype_redmi_watch_2_lite">ساعة ريدمي 2 لايت</string>
     <string name="devicetype_redmi_smart_band_pro">سوار ريدمي برو الذكي</string>
     <string name="notification_channel_connection_status_name">حالة الإتصال</string>
+    <string name="devicetype_nothingear2">نوثينج Ear (2)</string>
 </resources>
\ No newline at end of file

From b233c1058dd0e83d8014cc9a4e5d4f88882d8320 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81cs=20Zolt=C3=A1n?= <acszoltan111@gmail.com>
Date: Fri, 5 Jan 2024 20:33:36 +0000
Subject: [PATCH 429/595] Translated using Weblate (Hungarian)

Currently translated at 54.9% (1333 of 2425 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/hu/
---
 app/src/main/res/values-hu/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index a9fe95814..5b7466fe4 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -1379,4 +1379,5 @@
     <string name="prefs_wena3_vibration_strength_item_strong">Erős</string>
     <string name="prefs_wena3_vibration_triple">Háromszor</string>
     <string name="pref_explanation_authkey">Néhány eszköznek szüksége van egy különleges párosítási kulcsra az első alkalommal. Koppintson ide a további részletekért a wikiben.</string>
+    <string name="about_description_banglejs_main"></string>
 </resources>
\ No newline at end of file

From ec5b922a458c391c4927b5607aa35f0a6e3ccb82 Mon Sep 17 00:00:00 2001
From: Rex_sa <rex.sa@pm.me>
Date: Fri, 5 Jan 2024 19:09:42 +0000
Subject: [PATCH 430/595] Translated using Weblate (Arabic)

Currently translated at 100.0% (2425 of 2425 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ar/
---
 app/src/main/res/values-ar/strings.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index ee25ba62e..4eeb11e4f 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -2617,4 +2617,7 @@
     <string name="devicetype_redmi_smart_band_pro">سوار ريدمي برو الذكي</string>
     <string name="notification_channel_connection_status_name">حالة الإتصال</string>
     <string name="devicetype_nothingear2">نوثينج Ear (2)</string>
+    <string name="prefs_active_noise_cancelling_transparency">الشفافية</string>
+    <string name="devicetype_nothingearstick">نوثينج Ear (Stick)</string>
+    <string name="prefs_active_noise_cancelling_light">إلغاء الضوضاء النشطة الخفيفة</string>
 </resources>
\ No newline at end of file

From 547da9de0d9f3bc833ebd9676f755c130b319884 Mon Sep 17 00:00:00 2001
From: Jan Peter <jaanpeeteer@gmail.com>
Date: Sat, 6 Jan 2024 13:15:48 +0000
Subject: [PATCH 431/595] Translated using Weblate (German)

Currently translated at 94.5% (2294 of 2425 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/de/
---
 app/src/main/res/values-de/strings.xml | 33 ++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 0fea947b6..242bec82a 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -2494,4 +2494,37 @@
     <string name="menuitem_thermometer">Thermometer</string>
     <string name="common_symbols">Gebräuchliche Symbole</string>
     <string name="devicetype_femometer_vinca2">Femometer Vinca II</string>
+    <string name="activity_type_trekking">Wandern</string>
+    <string name="activity_type_wrestling">Ringkampf</string>
+    <string name="devicetype_redmi_smart_band_pro">Redmi Smart Band Pro</string>
+    <string name="menuitem_readiness">Bereitschaft</string>
+    <string name="devicetype_xiaomi_watch_lite">Xiaomi Watch Lite</string>
+    <string name="devicetype_amazfit_active_edge">Amazfit Active Edge</string>
+    <string name="pref_summary_casio_alert_call">Alarm (Vibration/Ton) für eingehende Anrufe</string>
+    <string name="pref_title_casio_alert_email">Alarm für E-Mail-Benachrichtigungen</string>
+    <string name="devicetype_miband7pro">Xiaomi Smart Band 7 Pro</string>
+    <string name="clap_hands_to_wakeup_device">Klatsche in die Hände, um den Bildschirm zu aktivieren</string>"
+    <string name="devicetype_colacao21">ColaCao 2021</string>
+    <string name="devicetype_colacao23">ColaCao 2023</string>
+    <string name="devicetype_redmiwatch3active">Redmi Watch 3 Active</string>
+    <string name="devicetype_redmi_smart_band_2">Redmi Smart Band 2</string>
+    <string name="standing_time">Steh-Zeit</string>
+    <string name="active_time">Aktiv-Zeit</string>
+    <string name="pref_title_send_app_notifications">Sende Benachrichtigungen</string>
+    <string name="pref_summary_send_app_notifications">Sende App-Benachrichtigungen an das Gerät</string>
+    <string name="pref_title_preview_message_in_title">Zeige eine Vorschau der Nachricht im Titel</string>
+    <string name="pref_summary_preview_message_in_title">Zeige eine Vorschau der Nachricht im Titel der Benachrichtigung, wie es die Einstellungen des Gerätes erlaubt</string>
+    <string name="pref_title_casio_alert_calendar">Alarm für Kalenderbenachrichtigungen</string>
+    <string name="pref_summary_casio_alert_calendar">Alarm (Vibration/Ton) für Kalenderbenachrichtigungen</string>
+    <string name="pref_title_casio_alert_call">Alarm für eingehende Anrufe</string>
+    <string name="pref_summary_casio_alert_email">Alarm (Vibration/Ton) für E-Mail-Benachrichtigungen</string>
+    <string name="pref_title_casio_alert_sms">Alarm für SMS-Benachrichtigungen</string>
+    <string name="pref_title_casio_alert_other">Alarm für andere Benachrichtigungen</string>
+    <string name="pref_summary_casio_alert_other">Alarm (Vibration/Ton) für Benachrichtigungen in anderen Kategorien</string>
+    <string name="devicetype_miband8">Xiaomi Smart Band 8</string>
+    <string name="devicetype_mijia_lywsd03">Mijia Temperatur- und Feuchtigkeitssensor 2</string>
+    <string name="menuitem_body_composition">Körperzusammensetzung</string>
+    <string name="devicetype_amazfit_active">Amazfit Active</string>
+    <string name="pref_title_goal_secondary">Zweites Ziel</string>
+    <string name="devicetype_redmi_watch_2_lite">Redmi Watch 2 Lite</string>
 </resources>
\ No newline at end of file

From a7e1a7e2db9e9cab96368e6eec2c85774e09cf76 Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Sat, 6 Jan 2024 11:45:06 +0000
Subject: [PATCH 432/595] Translated using Weblate (Spanish)

Currently translated at 100.0% (2425 of 2425 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/es/
---
 app/src/main/res/values-es/strings.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index dcc762605..d07a3928c 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -2634,4 +2634,7 @@
     <string name="notification_channel_connection_status_name">Estado de la conexión</string>
     <string name="devicetype_redmi_smart_band_pro">Redmi Smart Band Pro</string>
     <string name="devicetype_nothingear2">Nothing Ear (2)</string>
+    <string name="devicetype_nothingearstick">Nothing Ear (Stick)</string>
+    <string name="prefs_active_noise_cancelling_transparency">Transparencia</string>
+    <string name="prefs_active_noise_cancelling_light">Cancelación activa del ruido ligera</string>
 </resources>
\ No newline at end of file

From 6f7788f151597bf0459cba6cbfb7ad2c354c6cea Mon Sep 17 00:00:00 2001
From: Xtremo3 <a.lewicki95@gmail.com>
Date: Sat, 6 Jan 2024 08:33:18 +0000
Subject: [PATCH 433/595] Translated using Weblate (Polish)

Currently translated at 100.0% (2425 of 2425 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/pl/
---
 app/src/main/res/values-pl/strings.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 282c06730..629a9d681 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -2641,4 +2641,7 @@
     <string name="notification_channel_connection_status_name">Stan połączenia</string>
     <string name="devicetype_redmi_smart_band_pro">Redmi Smart Band Pro</string>
     <string name="devicetype_nothingear2">Nothing Ear (2)</string>
+    <string name="devicetype_nothingearstick">Nothing Ear (Stick)</string>
+    <string name="prefs_active_noise_cancelling_light">Lekka aktywna redukcja szumów</string>
+    <string name="prefs_active_noise_cancelling_transparency">Przezroczyste</string>
 </resources>
\ No newline at end of file

From f3c82bfae849b91be00bef15f468c1f2957fb674 Mon Sep 17 00:00:00 2001
From: 0que <0que@users.noreply.hosted.weblate.org>
Date: Sat, 6 Jan 2024 04:59:30 +0000
Subject: [PATCH 434/595] Translated using Weblate (Russian)

Currently translated at 99.3% (2409 of 2425 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ru/
---
 app/src/main/res/values-ru/strings.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index b9dd3e4b3..f9ed299e2 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -2624,4 +2624,8 @@
     <string name="devicetype_redmi_watch_2_lite">Redmi Watch 2 Lite</string>
     <string name="notification_channel_connection_status_name">Состояние соединения</string>
     <string name="devicetype_redmi_smart_band_pro">Redmi Smart Band Pro</string>
+    <string name="devicetype_nothingear2">Nothing Ear (2)</string>
+    <string name="devicetype_nothingearstick">Nothing Ear (Stick)</string>
+    <string name="prefs_active_noise_cancelling_light">Лёгкое активное подавление шума</string>
+    <string name="prefs_active_noise_cancelling_transparency">Прозрачность</string>
 </resources>
\ No newline at end of file

From 00a9fb230319529b7c00e83b310e45d720d4b084 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B0=91=E4=B8=BE?= <oshirisu.red@gmail.com>
Date: Sat, 6 Jan 2024 02:06:33 +0000
Subject: [PATCH 435/595] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (2425 of 2425 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/zh_Hans/
---
 app/src/main/res/values-zh-rCN/strings.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 5e4f32e81..b43aa991f 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -2631,4 +2631,8 @@
     <string name="devicetype_redmi_watch_2_lite">红米手表2青春版</string>
     <string name="devicetype_redmi_smart_band_pro">红米智能手环Pro</string>
     <string name="notification_channel_connection_status_name">连接状态</string>
+    <string name="devicetype_nothingear2">Nothing Ear (2)</string>
+    <string name="devicetype_nothingearstick">Nothing Ear (Stick)</string>
+    <string name="prefs_active_noise_cancelling_light">轻度主动降噪</string>
+    <string name="prefs_active_noise_cancelling_transparency">通透度</string>
 </resources>
\ No newline at end of file

From 8a029cb8d2280ac552ba7c3a9e75eec842f76727 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D1=96=D0=B9?=
 <sergiy.goncharuk.1@gmail.com>
Date: Sat, 6 Jan 2024 14:52:31 +0000
Subject: [PATCH 436/595] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (2425 of 2425 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/uk/
---
 app/src/main/res/values-uk/strings.xml | 45 ++++++++++++++------------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 371e8abfb..1b2d7ed2c 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -1328,7 +1328,7 @@
     <string name="prefs_sleep_time">Час сну</string>
     <string name="devicetype_fitpro">FitPro</string>
     <string name="pref_title_ping_tone">Звуковий сигнал</string>
-    <string name="devicetype_nothingear1">Нічого прослуховувати (1)</string>
+    <string name="devicetype_nothingear1">Nothing Ear (1)</string>
     <string name="nothing_prefs_inear_title">Виявлення одягання на вуха</string>
     <string name="nothing_prefs_inear_summary">Відтворення/зупинка музики залежно від того, чи одягнено навушники</string>
     <string name="nothing_prefs_audiomode_title">Аудіорежим</string>
@@ -1359,7 +1359,7 @@
     <string name="prefs_touch_lock">Сенсорне блокування</string>
     <string name="prefs_touch_lock_summary">Вимкнути події торкання</string>
     <string name="prefs_galaxy_buds_experimental">Експериментальне</string>
-    <string name="prefs_ambient_volume">Гучність довкілля</string>
+    <string name="prefs_ambient_volume">Гучність оточення</string>
     <string name="prefs_ambient_voice_focus">Фокус голосу</string>
     <string name="prefs_ambient_voice_summary">Підсилення голосу</string>
     <string name="prefs_left">Лівий</string>
@@ -1379,7 +1379,7 @@
     <string name="pref_header_sony_ambient_sound_control">Керування навколишнім звуком</string>
     <string name="sony_ambient_sound_wind_noise_reduction">Зниження шуму вітру</string>
     <string name="prefs_pressure_relief">Зниження тиску через навколишній шум</string>
-    <string name="pressure_relief_summary">Запобігання відчуттю тиску у вухах за невикористання активного шумопридушення</string>
+    <string name="pressure_relief_summary">Запобігання відчуттю тиску у вухах, коли не використовується активне шумопоглинання</string>
     <string name="sony_ambient_sound_focus_voice">Зосередитися на голосі</string>
     <string name="sony_sound_position_off">Вимк.</string>
     <string name="sony_sound_position_front">Спереду</string>
@@ -1408,9 +1408,9 @@
     <string name="pref_title_equalizer_normal">Звичайні</string>
     <string name="devicetype_galaxybuds_live">Galaxy Buds Live</string>
     <string name="devicetype_sony_wh_1000xm3">Sony WH-1000XM3</string>
-    <string name="prefs_active_noise_cancelling">Активне шумозаглушення</string>
+    <string name="prefs_active_noise_cancelling">Активне шумопоглинання</string>
     <string name="sony_ambient_sound">Режим</string>
-    <string name="sony_ambient_sound_noise_cancelling">Шумозаглушення</string>
+    <string name="sony_ambient_sound_noise_cancelling">Шумопоглинання</string>
     <string name="sony_ambient_sound_ambient_sound">Навколишній звук</string>
     <string name="sony_ambient_sound_level">Рівень навколишніх звуків</string>
     <string name="sony_sound_position_front_right">Спереду праворуч</string>
@@ -1560,13 +1560,13 @@
     <string name="unknown">Невідомо</string>
     <string name="start">Розпочати</string>
     <string name="sony_anc_optimize_title">Оптимізувати</string>
-    <string name="pref_header_sony_anc_optimizer">Оптимізатор пригнічення шуму</string>
-    <string name="sony_anc_optimize_description">Натисніть, щоб запустити оптимізатор пригнічення шуму.</string>
+    <string name="pref_header_sony_anc_optimizer">Оптимізатор шумопоглинання</string>
+    <string name="sony_anc_optimize_description">Натисніть, щоб запустити оптимізатор шумопоглинання.</string>
     <string name="pref_anc_optimizer_state_pressure">Атмосферний тиск</string>
     <string name="sony_anc_optimizer_status_starting">Запуск…</string>
     <string name="sony_anc_optimizer_status_not_running">Не запущено</string>
     <string name="sony_anc_optimizer_status_analyzing">Аналізування…</string>
-    <string name="sony_anc_optimize_confirmation_title">Оптимізатор пригнічення шуму</string>
+    <string name="sony_anc_optimize_confirmation_title">Оптимізатор шумопоглинання</string>
     <string name="sony_anc_optimizer_status_wearing_condition">Вимірювання стану середовища…</string>
     <string name="sony_anc_optimize_confirmation_description">Використовуйте навушники, як зазвичай. Якщо середовище або атмосферний тиск змінюються, запустіть оптимізатор ще раз.</string>
     <string name="sony_anc_optimizer_status_atmospheric_pressure">Вимірювання атмосферного тиску…</string>
@@ -1640,24 +1640,24 @@
     <string name="devicetype_galaxybuds_pro">Galaxy Buds Pro</string>
     <string name="prefs_in_ear_detection_summary">Відтворення викликів через навушники, коли вони у ваших вухах</string>
     <string name="prefs_seamless_connection_switch_summary">Автоматичне перемикає навушники між пов\'язаними пристроями</string>
-    <string name="prefs_ambient_volume_left">Гучність навколишнього середовища зліва</string>
+    <string name="prefs_ambient_volume_left">Гучність оточення зліва</string>
     <string name="prefs_customize_ambient_sound_summary">Налаштування навколишнього звуку</string>
     <string name="prefs_ambient_sound_during_call_title">Навколишній звук під час виклику</string>
-    <string name="prefs_active_noise_cancelling_level">Активний рівень пригнічення шуму</string>
+    <string name="prefs_active_noise_cancelling_level">Рівень активного шумопоглинання</string>
     <string name="prefs_active_noise_cancelling_level_high">Високий</string>
     <string name="prefs_switch_control_left">Перемикання елемента керування ліворуч</string>
     <string name="prefs_switch_control_right">Перемикання елемента керування праворуч</string>
-    <string name="pref_title_touch_anc">Активне пригнічення шуму</string>
+    <string name="pref_title_touch_anc">Активне шумопоглинання</string>
     <string name="pref_title_touch_volume">Гучність</string>
     <string name="pref_ambient_sound_tone_summary">Від м\'якого до чистого</string>
-    <string name="pref_switch_controls_anc_off">Пригнічення шуму ←→ Вимкнено</string>
-    <string name="pref_switch_controls_ambient_off">Навколишнє середовище ←→ Вимкнено</string>
+    <string name="pref_switch_controls_anc_off">Шумопоглинання ←→ Вимкнено</string>
+    <string name="pref_switch_controls_ambient_off">Оточення ←→ Вимкнено</string>
     <string name="prefs_noise_control">Контроль шуму</string>
     <string name="prefs_voice_detect">Виявлення голосу</string>
     <string name="prefs_double_tap_edge">Подвійне торкання краю</string>
     <string name="prefs_voice_detect_duration">Завершення після тиші за:</string>
     <string name="pref_voice_detect_duration_15">15 секунд</string>
-    <string name="prefs_ambient_volume_right">Гучність навколишнього середовища вправо</string>
+    <string name="prefs_ambient_volume_right">Гучність оточення справа</string>
     <string name="prefs_ambient_sound_during_call_summary">Чітко чути власний голос під час викликів</string>
     <string name="prefs_seamless_connection_switch_title">Плавне перемикання з\'єднання</string>
     <string name="prefs_ambient_settings_title">Параметри навколишнього звуку</string>
@@ -1671,7 +1671,7 @@
     <string name="prefs_noise_control_with_one_earbud_summary">Дозволити контроль шуму під час використання лише одного навушника</string>
     <string name="pref_balance">Баланс</string>
     <string name="pref_ambient_sound_tone">Тон навколишнього звуку</string>
-    <string name="pref_switch_controls_anc_ambient">Пригнічення шуму ←→ Навколишнє середовище</string>
+    <string name="pref_switch_controls_anc_ambient">Шумопоглинання ←→ Оточення</string>
     <string name="prefs_voice_detect_summary">Увімкнути навколишній звук і автоматичне стишення відтворення після виявлення голосу</string>
     <string name="prefs_double_tap_edge_summary">Виявлення подвійного торкання, навіть якщо не торкатися тачпада</string>
     <string name="pref_voice_detect_duration_10">10 секунд</string>
@@ -2094,13 +2094,13 @@
     <string name="intent_api_allow_activity_sync_title">Дозволити ініціацію синхронізації дій</string>
     <string name="intent_api_allow_activity_sync_summary">Дозволити ініціювання синхронізації активності через Intent API</string>
     <string name="intent_api_allow_trigger_export_summary">Дозволити ініціювати експорт бази даних через Intent API</string>
-    <string name="sony_ambient_sound_control_button_mode_nc_as_off">Шумозаглушення, Навколишній звук, Вимк</string>
-    <string name="sony_ambient_sound_control_button_mode_nc_as">Шумозаглушення, навколишній звук</string>
+    <string name="sony_ambient_sound_control_button_mode_nc_as_off">Шумопоглинання, Навколишній звук, Вимк</string>
+    <string name="sony_ambient_sound_control_button_mode_nc_as">Шумопоглинання, навколишній звук</string>
     <string name="sony_ambient_sound_control_button_mode_as_off">Навколишній звук, Вимк</string>
     <string name="sony_quick_access_double_tap">Швидкий доступ (подвійне торкання)</string>
     <string name="sony_quick_access_triple_tap">Швидкий доступ (потрійне торкання)</string>
     <string name="sony_ambient_sound_control_button_modes">Режими кнопки керування навколишнім звуком</string>
-    <string name="sony_ambient_sound_control_button_mode_nc_off">Шумозаглушення, Вимк</string>
+    <string name="sony_ambient_sound_control_button_mode_nc_off">Шумопоглинання, Вимк</string>
     <string name="menuitem_wechat_pay">WeChat Pay</string>
     <string name="pref_agps_update_time">Час оновлення AGPS</string>
     <string name="pref_agps_expire_time">Термін дії AGPS</string>
@@ -2151,7 +2151,7 @@
     <string name="ftp_server_stop_summary">Зупинити FTP-сервер з годинника</string>
     <string name="ftp_server_status">Стан FTP-сервера</string>
     <string name="croatian">Хорватська</string>
-    <string name="sony_speak_to_chat_summary">Автоматично вимикати шумозаглушення, коли ви починаєте говорити.</string>
+    <string name="sony_speak_to_chat_summary">Автоматично вимикати шумопоглинання, коли ви починаєте говорити.</string>
     <string name="pref_morning_updates_title">Ранкові оновлення</string>
     <string name="pref_morning_updates_summary">Показувати оновлення щоранку</string>
     <string name="pref_morning_updates_categories_title">Категорії ранкових оновлень</string>
@@ -2180,7 +2180,7 @@
     <string name="continue_pressing">Продовжити натискання</string>
     <string name="quick_attention">Швидка увага</string>
     <string name="long_press">Затискання</string>
-    <string name="pref_switch_controls_anc_ambient_off">Шумозаглушення ←→ Навколишнє середовище ←→ Вимкнено</string>
+    <string name="pref_switch_controls_anc_ambient_off">Шумопоглинання ←→ Оточення ←→ Вимкнено</string>
     <string name="sony_button_mode_help_title">Режими кнопок - Довідка</string>
     <string name="menuitem_mi_ai">MI AI</string>
     <string name="menuitem_cards">Картки</string>
@@ -2638,4 +2638,9 @@
     <string name="prefs_device_name">Назва пристрою</string>
     <string name="devicetype_redmi_watch_2_lite">Redmi Watch 2 Lite</string>
     <string name="devicetype_redmi_smart_band_pro">Redmi Smart Band Pro</string>
+    <string name="devicetype_nothingear2">Nothing Ear (2)</string>
+    <string name="prefs_active_noise_cancelling_light">Легке активне шумопоглинання</string>
+    <string name="notification_channel_connection_status_name">Стан з\'єднання</string>
+    <string name="devicetype_nothingearstick">Nothing Ear (Stick)</string>
+    <string name="prefs_active_noise_cancelling_transparency">Прозорість</string>
 </resources>
\ No newline at end of file

From 69cf771504d2162e7323eda5af861b2047fda4cd Mon Sep 17 00:00:00 2001
From: MattSolo451 <mattsolo45@vivaldi.net>
Date: Mon, 8 Jan 2024 12:43:45 +0000
Subject: [PATCH 437/595] Translated using Weblate (Polish)

Currently translated at 98.0% (2433 of 2482 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/pl/
---
 app/src/main/res/values-pl/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 629a9d681..37eb5a9cb 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -2544,7 +2544,7 @@
     <string name="devicetype_amazfit_active">Amazfit Active</string>
     <string name="pref_title_navigation_apps">Aplikacje nawigacyjne</string>
     <string name="pref_title_navigation_prefs">Preferencje nawigacji</string>
-    <string name="pref_navigation_app_gmaps">Google Maps</string>
+    <string name="pref_navigation_app_gmaps">Mapy Google</string>
     <string name="pref_summary_prefix_notification_with_app">Tytuł powiadomienia poprzedź nazwą aplikacji źródłowej</string>
     <string name="pref_summary_osmand_packagename">Służy do wyboru wersji OsmAnd, z którą chcesz się połączyć</string>
     <string name="pref_title_prefix_notification_with_app">Nazwa aplikacji w powiadomieniu</string>

From 58058d7d489566727db0df8d3dbfe3b6ffdc1b87 Mon Sep 17 00:00:00 2001
From: 0que <0que@users.noreply.hosted.weblate.org>
Date: Mon, 8 Jan 2024 13:09:13 +0000
Subject: [PATCH 438/595] Translated using Weblate (Russian)

Currently translated at 98.0% (2433 of 2482 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ru/
---
 app/src/main/res/values-ru/strings.xml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index f9ed299e2..050b2fcc6 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -2628,4 +2628,28 @@
     <string name="devicetype_nothingearstick">Nothing Ear (Stick)</string>
     <string name="prefs_active_noise_cancelling_light">Лёгкое активное подавление шума</string>
     <string name="prefs_active_noise_cancelling_transparency">Прозрачность</string>
+    <string name="devicetype_honor_band5">Honor Band 5</string>
+    <string name="devicetype_huawei_watch_gt">Huawei Watch GT</string>
+    <string name="devicetype_huawei_band4pro">Huawei Band 4 Pro</string>
+    <string name="devicetype_huawei_watchgt2">Huawei Watch GT 2 Pro</string>
+    <string name="devicetype_huawei_watchgt2e">Huawei Watch GT 2e</string>
+    <string name="devicetype_huawei_talk_band_b6">Huawei Talk Band B6</string>
+    <string name="devicetype_huawei_watchgt3">Huawei Watch GT 3 Pro</string>
+    <string name="prefs_disconnect_notification_summary">Уведомление на устройстве при отсоединении от Bluetooth.</string>
+    <string name="do_not_disturb_lift_wrist_summary">Только если включена активация по поднятию руки</string>
+    <string name="pref_do_not_disturb_not_wear">\"Не беспокоить\", когда устройство снято</string>
+    <string name="manual">Вручную</string>
+    <string name="devicetype_honor_band4">Honor Band 4</string>
+    <string name="devicetype_honor_band6">Honor Band 6</string>
+    <string name="devicetype_honor_band7">Honor Band 7</string>
+    <string name="devicetype_huawei_band_aw70">Huawei Band (AW70)</string>
+    <string name="dnd_all_day">Весь день</string>
+    <string name="devicetype_honor_band3">Honor Band 3</string>
+    <string name="devicetype_huawei_band8">Huawei Band 8</string>
+    <string name="devicetype_huawei_band6">Huawei Band 6</string>
+    <string name="devicetype_huawei_band7">Huawei Band 7</string>
+    <string name="prefs_workmode">Режим работы</string>
+    <string name="huawei_alarm_smart_description">Не отключать \"умный подъём\".</string>
+    <string name="huawei_alarm_event_description">Не включать \"умный подъём\".</string>
+    <string name="huawei_trusleep_title">HUAWEI TruSleep ™</string>
 </resources>
\ No newline at end of file

From 101fd344fcd9a299dd3f97cf880713d10952e15d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B0=91=E4=B8=BE?= <oshirisu.red@gmail.com>
Date: Mon, 8 Jan 2024 01:16:07 +0000
Subject: [PATCH 439/595] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (2482 of 2482 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/zh_Hans/
---
 app/src/main/res/values-zh-rCN/strings.xml | 55 ++++++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index b43aa991f..bc64f8f0c 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -2635,4 +2635,59 @@
     <string name="devicetype_nothingearstick">Nothing Ear (Stick)</string>
     <string name="prefs_active_noise_cancelling_light">轻度主动降噪</string>
     <string name="prefs_active_noise_cancelling_transparency">通透度</string>
+    <string name="devicetype_honor_band4">荣耀手环4</string>
+    <string name="devicetype_honor_band5">荣耀手环5</string>
+    <string name="devicetype_huawei_talk_band_b6">华为语音手环B6</string>
+    <string name="huawei_alarm_smart_description">不要取消选中智能唤醒复选框。</string>
+    <string name="huawei_trusleep_summary">实时监控您的睡眠质量和呼吸模式。
+\n分析您的睡眠模式并准确诊断 6 种睡眠问题。</string>
+    <string name="devicetype_huawei_watchgt3">华为手表GT 3 （Pro）</string>
+    <string name="pref_enable_call_accept">启用接听电话</string>
+    <string name="pref_enable_call_accept_summary">启用从设备接受电话</string>
+    <string name="pref_heartrate_automatic_enable">启用自动心率测量</string>
+    <string name="pref_force_options_summary">某些设备错误地声称不支持某些选项。无论如何，此设置可用于启用它们。
+\n使用风险由您自行承担。
+\n阅读维基</string>
+    <string name="pref_force_smart_alarm_summary">强制智能报警支持。
+\n风险自担</string>
+    <string name="pref_force_dnd_support">强制请勿打扰支持</string>
+    <string name="huawei_reparse_workout_data">重新解析锻炼数据</string>
+    <string name="prefs_disconnect_notification_summary">当蓝牙断开时在设备上进行通知。</string>
+    <string name="do_not_disturb_lift_wrist_summary">仅当抬腕启用时激活显示</string>
+    <string name="pref_do_not_disturb_not_wear">不佩戴时启用请勿打扰</string>
+    <string name="manual">手动</string>
+    <string name="dnd_all_day">全天</string>
+    <string name="devicetype_honor_band3">荣耀手环3</string>
+    <string name="devicetype_honor_band6">荣耀手环6</string>
+    <string name="devicetype_honor_band7">荣耀手环7</string>
+    <string name="devicetype_huawei_band_aw70">华为手环（AW70）</string>
+    <string name="devicetype_huawei_band6">荣耀手环6</string>
+    <string name="devicetype_huawei_band7">荣耀手环7</string>
+    <string name="devicetype_huawei_band8">荣耀手环8</string>
+    <string name="devicetype_huawei_watch_gt">华为手表GT</string>
+    <string name="devicetype_huawei_band4pro">华为手环4（Pro）</string>
+    <string name="devicetype_huawei_watchgt2">华为手表GT 2（Pro）</string>
+    <string name="devicetype_huawei_watchgt2e">华为手表GT 2e</string>
+    <string name="prefs_workmode">工作模式</string>
+    <string name="huawei_alarm_event_description">不要选中智能唤醒复选框。</string>
+    <string name="huawei_trusleep_title">华为 TruSleep™</string>
+    <string name="huawei_trusleep_summary_light">改善睡眠监测</string>
+    <string name="pref_enable_call_reject">启用拒绝来电</string>
+    <string name="pref_enable_call_reject_summary">启用拒绝来自设备的呼叫</string>
+    <string name="pref_disable_find_phone_with_dnd">当请勿打扰处于活动状态时禁用查找我的手机</string>
+    <string name="pref_spo_automatic_enable">启用自动血氧测量</string>
+    <string name="pref_force_options">强制选项</string>
+    <string name="pref_force_smart_alarm">强制智能闹钟</string>
+    <string name="pref_force_wear_location">强制佩戴位置</string>
+    <string name="pref_force_wear_location_summary">强制佩戴位置支持。
+\n风险自担</string>
+    <string name="pref_force_dnd_support_summary">强制请勿打扰支持。
+\n风险自担</string>
+    <string name="huawei_ignore_wakeup_status_start">忽略唤醒启动状态</string>
+    <string name="huawei_ignore_wakeup_status_start_description">可能有助于正确的睡眠检测。 在日常活动视图中立即可见。</string>
+    <string name="huawei_ignore_wakeup_status_end">忽略唤醒结束状态</string>
+    <string name="huawei_ignore_wakeup_status_end_description">可能有助于正确的睡眠检测。 在日常活动视图中立即可见。</string>
+    <string name="huawei_reparse_workout_data_description">这只会在某些更新后执行某些操作</string>
+    <string name="pref_summary_debug">向华为设备发送调试请求</string>
+    <string name="pref_title_debug">调试请求</string>
 </resources>
\ No newline at end of file

From e1aeeaaf4587cd562af68a500d9c20accdce828e Mon Sep 17 00:00:00 2001
From: arjan-s <a_gitlab@anymore.nl>
Date: Mon, 8 Jan 2024 16:40:46 +0000
Subject: [PATCH 440/595] Translated using Weblate (Dutch)

Currently translated at 99.3% (2466 of 2482 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/nl/
---
 app/src/main/res/values-nl/strings.xml | 40 +++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index ed73c6b2e..47503b4dd 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -673,7 +673,7 @@
     <string name="pref_screen_notification_profile_anti_loss">Anti-verlies waarschuwing</string>
     <string name="interval_fifteen_minutes">elke 15 minuten</string>
     <string name="interval_forty_five_minutes">elke 45 minuten</string>
-    <string name="activity_prefs_calories_burnt">Dagelijks doel: calorieën verbrandt</string>
+    <string name="activity_prefs_calories_burnt">Dagelijks doel: calorieën verbrand</string>
     <string name="activity_prefs_distance_meters">Dagelijks doel: afstand in meters</string>
     <string name="activity_prefs_activetime_minutes">Dagelijks doel: tijd actief in minuten</string>
     <string name="devicetype_miscale2">Mi Scale 2</string>
@@ -2631,4 +2631,42 @@
     <string name="devicetype_redmi_watch_2_lite">Redmi Watch 2 Lite</string>
     <string name="notification_channel_connection_status_name">Connectie status</string>
     <string name="devicetype_redmi_smart_band_pro">Redmi Smart Band Pro</string>
+    <string name="devicetype_nothingear2">Nothing Ear (2)</string>
+    <string name="do_not_disturb_lift_wrist_summary">Alleen wanneer scherm-aan-bij-oppakken is ingeschakeld</string>
+    <string name="pref_do_not_disturb_not_wear">Niet storen wanneer het apparaat niet gedragen wordt</string>
+    <string name="manual">Handmatig</string>
+    <string name="dnd_all_day">Hele dag</string>
+    <string name="devicetype_honor_band3">Honor Band 3</string>
+    <string name="devicetype_honor_band4">Honor Band 4</string>
+    <string name="devicetype_honor_band5">Honor Band 5</string>
+    <string name="devicetype_honor_band6">Honor Band 6</string>
+    <string name="devicetype_honor_band7">Honor Band 7</string>
+    <string name="devicetype_huawei_band_aw70">Huawei Band (AW70)</string>
+    <string name="devicetype_huawei_band6">Huawei Band 6</string>
+    <string name="devicetype_huawei_band7">Huawei Band 7</string>
+    <string name="devicetype_huawei_band8">Huawei Band 8</string>
+    <string name="devicetype_huawei_watch_gt">Huawei Watch GT</string>
+    <string name="devicetype_huawei_band4pro">Huawei Band 4 (Pro)</string>
+    <string name="devicetype_huawei_watchgt2">Huawei Watch GT 2 (Pro)</string>
+    <string name="devicetype_huawei_watchgt2e">Huawei Watch GT 2e</string>
+    <string name="devicetype_huawei_talk_band_b6">Huawei Talk Band B6</string>
+    <string name="devicetype_huawei_watchgt3">Huawei Watch GT 3 (Pro)</string>
+    <string name="prefs_active_noise_cancelling_light">Lichte actieve geluidsonderdrukking</string>
+    <string name="prefs_active_noise_cancelling_transparency">Transparantie</string>
+    <string name="huawei_alarm_smart_description">Verwijder het vinkje niet bij slim wakker worden.</string>
+    <string name="huawei_trusleep_title">HUAWEI TruSleep ™</string>
+    <string name="huawei_trusleep_summary_light">Verbeterde slaapmonitoring</string>
+    <string name="pref_enable_call_accept">Telefoontjes accepteren inschakelen</string>
+    <string name="pref_enable_call_accept_summary">Het op het apparaat accepteren van binnenkomende telefoongespreken inschakelen</string>
+    <string name="pref_enable_call_reject">Telefoontjes weigeren inschakelen</string>
+    <string name="pref_enable_call_reject_summary">Het op het apparaat weigeren van binnenkomende telefoongespreken inschakelen</string>
+    <string name="pref_disable_find_phone_with_dnd">Vind mijn telefoon uitschakelen wanneer Niet Storen actief is</string>
+    <string name="pref_heartrate_automatic_enable">Automatische hartslagmeting inschakelen</string>
+    <string name="pref_spo_automatic_enable">Automatische bloedzuurstofmeting inschakelen</string>
+    <string name="prefs_disconnect_notification_summary">Melding op het apparaat bij verbroken Bluetooth-verbinding.</string>
+    <string name="devicetype_nothingearstick">Nothing Ear (Stick)</string>
+    <string name="prefs_workmode">Werkmodus</string>
+    <string name="huawei_alarm_event_description">Plaats geen vinkje bij slim wakker worden.</string>
+    <string name="huawei_trusleep_summary">Monitor uw slaapkwaliteit en adempatroon in realtime.
+\nAnalyseer uw slaappatronen en diagnosticeer 6 types slaapproblemen.</string>
 </resources>
\ No newline at end of file

From 5302a9b3c39db2336c4fb291854d6a1afd0298b0 Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Tue, 9 Jan 2024 10:37:31 +0000
Subject: [PATCH 441/595] Translated using Weblate (Spanish)

Currently translated at 100.0% (2484 of 2484 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/es/
---
 app/src/main/res/values-es/strings.xml | 59 +++++++++++++++++++++++++-
 1 file changed, 58 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index d07a3928c..e11bf3620 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -52,7 +52,7 @@
     <!--Strings related to Settings-->
     <string name="title_activity_settings">Ajustes</string>
     <string name="pref_header_general">Ajustes generales</string>
-    <string name="pref_title_general_autoconnectonbluetooth">Conectarse al dispositivo cuando el Bluetooth esté activado</string>
+    <string name="pref_title_general_autoconnectonbluetooth">Conectarse al (los) dispositivo(s) Gadgetbridge cuando el Bluetooth está(n) activado(s)</string>
     <string name="pref_title_general_autostartonboot">Iniciar automáticamente</string>
     <string name="pref_title_general_autoreconnect">Reconectar automáticamente</string>
     <string name="pref_title_audio_player">Reproductor de audio favorito</string>
@@ -2637,4 +2637,61 @@
     <string name="devicetype_nothingearstick">Nothing Ear (Stick)</string>
     <string name="prefs_active_noise_cancelling_transparency">Transparencia</string>
     <string name="prefs_active_noise_cancelling_light">Cancelación activa del ruido ligera</string>
+    <string name="pref_do_not_disturb_not_wear">No molestar cuando no lo use</string>
+    <string name="manual">Manual</string>
+    <string name="pref_force_dnd_support">Forzar la función No molestar</string>
+    <string name="pref_force_dnd_support_summary">Forzar el soporte de No Molestar.
+\nUTILÍCELO BAJO SU PROPIA RESPONSABILIDAD</string>
+    <string name="huawei_ignore_wakeup_status_start">Ignorar el estado de inicio del despertador</string>
+    <string name="huawei_ignore_wakeup_status_start_description">Puede ayudar a detectar correctamente el sueño. Visible inmediatamente en la vista de actividades diarias.</string>
+    <string name="huawei_ignore_wakeup_status_end">Ignorar estado de fin de despertador</string>
+    <string name="prefs_disconnect_notification_summary">Notificación en el dispositivo cuando se desconecta de BT.</string>
+    <string name="dnd_all_day">Todo el día</string>
+    <string name="devicetype_honor_band3">Honor Band 3</string>
+    <string name="devicetype_honor_band4">Honor Band 4</string>
+    <string name="devicetype_honor_band5">Honor Band 5</string>
+    <string name="devicetype_honor_band6">Honor Band 6</string>
+    <string name="devicetype_honor_band7">Honor Band 7</string>
+    <string name="devicetype_huawei_band6">Huawei Band 6</string>
+    <string name="devicetype_huawei_band7">Huawei Band 7</string>
+    <string name="devicetype_huawei_band8">Huawei Band 8</string>
+    <string name="devicetype_huawei_watch_gt">Huawei Watch GT</string>
+    <string name="devicetype_huawei_band4pro">Huawei Band 4 (Pro)</string>
+    <string name="devicetype_huawei_watchgt2">Huawei Watch GT 2 (Pro)</string>
+    <string name="devicetype_huawei_watchgt2e">Huawei Watch GT 2e</string>
+    <string name="devicetype_huawei_talk_band_b6">Huawei Talk Band B6</string>
+    <string name="devicetype_huawei_watchgt3">Huawei Watch GT 3 (Pro)</string>
+    <string name="prefs_workmode">Modo de trabajo</string>
+    <string name="huawei_alarm_smart_description">No desmarque la casilla de activación inteligente.</string>
+    <string name="huawei_trusleep_title">HUAWEI TruSleep ™</string>
+    <string name="huawei_trusleep_summary">Monitorice la calidad de su sueño y su patrón respiratorio en tiempo real.
+\nAnaliza tus patrones de sueño y diagnostica con precisión 6 tipos de problemas de sueño.</string>
+    <string name="huawei_trusleep_summary_light">Control del sueño mejorado</string>
+    <string name="pref_enable_call_accept">Permitir aceptar llamadas</string>
+    <string name="pref_enable_call_accept_summary">Activar la aceptación de llamadas desde el dispositivo</string>
+    <string name="pref_enable_call_reject">Permitir rechazar llamadas</string>
+    <string name="pref_enable_call_reject_summary">Activar el rechazo de llamadas desde el dispositivo</string>
+    <string name="pref_disable_find_phone_with_dnd">Desactivar encontrar mi teléfono cuando no molestar está activo</string>
+    <string name="pref_heartrate_automatic_enable">Activar la medición automática del ritmo cardíaco</string>
+    <string name="pref_spo_automatic_enable">Activar la medición automática de SpO2</string>
+    <string name="pref_force_options">Opción obligatoria</string>
+    <string name="pref_force_smart_alarm">Forzar la alarma inteligente</string>
+    <string name="pref_force_wear_location">Lugar de desgaste de la fuerza</string>
+    <string name="pref_force_wear_location_summary">Soporte de localización de desgaste forzoso.
+\nUSO BAJO SU PROPIA RESPONSABILIDAD</string>
+    <string name="huawei_reparse_workout_data">Reparar datos de entrenamiento</string>
+    <string name="huawei_reparse_workout_data_description">Esto sólo hará algo después de ciertas actualizaciones</string>
+    <string name="pref_summary_debug">Enviar una solicitud de depuración al dispositivo Huawei</string>
+    <string name="pref_title_debug">Solicitud de depuración</string>
+    <string name="pref_title_general_reconnectonlytoconnected">Reconectar sólo a los dispositivos conectados</string>
+    <string name="pref_summary_general_reconnectonlytoconnected">Reconectarse sólo a los dispositivos conectados, en lugar de volver a conectarse a todos los dispositivos</string>
+    <string name="do_not_disturb_lift_wrist_summary">Sólo si se activa la visualización al subir</string>
+    <string name="devicetype_huawei_band_aw70">Huawei Band (AW70)</string>
+    <string name="huawei_alarm_event_description">No marque la casilla de activación inteligente.</string>
+    <string name="pref_force_options_summary">Algunos dispositivos afirman falsamente no ser compatibles con algunas opciones. Esta configuración se puede utilizar para habilitarlos de todos modos.
+\nUTILÍZALO BAJO TU PROPIA RESPONSABILIDAD
+\nLea la wiki</string>
+    <string name="pref_force_smart_alarm_summary">Forzar el soporte de alarmas inteligentes.
+\nUSO BAJO SU PROPIA RESPONSABILIDAD</string>
+    <string name="huawei_ignore_wakeup_status_end_description">Puede ayudar a detectar correctamente el sueño. Visible inmediatamente en la vista de actividades diarias.</string>
 </resources>
\ No newline at end of file

From 0a6e75807dea302d6fda396f8b35b5292c6f638c Mon Sep 17 00:00:00 2001
From: 0que <0que@users.noreply.hosted.weblate.org>
Date: Tue, 9 Jan 2024 04:54:59 +0000
Subject: [PATCH 442/595] Translated using Weblate (Russian)

Currently translated at 99.5% (2472 of 2484 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ru/
---
 app/src/main/res/values-ru/strings.xml | 51 +++++++++++++++++++++++---
 1 file changed, 46 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 050b2fcc6..16711fa98 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -50,7 +50,7 @@
     <!--Strings related to Settings-->
     <string name="title_activity_settings">Настройки</string>
     <string name="pref_header_general">Общие настройки</string>
-    <string name="pref_title_general_autoconnectonbluetooth">Подключаться к добавленному устройству при включении Bluetooth</string>
+    <string name="pref_title_general_autoconnectonbluetooth">Подключаться к добавленным устройствам при включении Bluetooth</string>
     <string name="pref_title_general_autostartonboot">Запускать автоматически</string>
     <string name="pref_title_general_autoreconnect">Переподключаться автоматически</string>
     <string name="pref_title_audio_player">Предпочтительный музыкальный плеер</string>
@@ -302,7 +302,7 @@
     <string name="miband_fwinstaller_incompatible_version">Несовместимая прошивка</string>
     <string name="fwinstaller_firmware_not_compatible_to_device">Эта прошивка не совместима с устройством</string>
     <string name="miband_prefs_reserve_alarm_calendar">Резервные сигналы для предстоящих событий</string>
-    <string name="miband_prefs_hr_sleep_detection">Использовать датчик сердцебиения для улучшения мониторинга сна</string>
+    <string name="miband_prefs_hr_sleep_detection">Использовать датчик сердцебиения для улучшения отслеживания сна</string>
     <string name="miband_prefs_device_time_offset_hours">Смещение времени в часах (для тех, кто работает по ночам)</string>
     <string name="miband2_prefs_dateformat">Формат даты</string>
     <string name="dateformat_time">Время</string>
@@ -1604,7 +1604,7 @@
     <string name="pref_title_equalizer_trebble">Усиление ВЧ</string>
     <string name="pref_title_equalizer_dynamic">Динамичный</string>
     <string name="appmanager_app_share">Поделиться</string>
-    <string name="spo2_off">Выключено</string>
+    <string name="spo2_off">Выкл.</string>
     <string name="pref_workout_send_gps_title">Отправка GPS во время тренировки</string>
     <string name="pref_workout_start_on_phone_summary">Запуск/остановка отслеживания фитнес-приложения на телефоне при запущенной GPS-тренировке на браслете</string>
     <string name="pref_screen_notification_idle_alerts">Оповещения о простое</string>
@@ -2040,7 +2040,7 @@
     <string name="activity_detail_share_raw_details">Поделиться Необработанными Деталями</string>
     <string name="dev_tools">Инструменты Разработчика</string>
     <string name="prefs_always_on_display_follow_watchface">Стиль как на циферблате</string>
-    <string name="sports_activity_confirm_delete_description">Вы уверены, что хотите удалить %d активностей\?</string>
+    <string name="sports_activity_confirm_delete_description">Вы точно хотите удалить %d активности(-ей)?</string>
     <string name="menuitem_offline_voice">Оффлайн голос</string>
     <string name="pref_title_mb_intents">Транслировать Интенты Медиа-кнопок Напрямую</string>
     <string name="pref_summary_mb_intents">Включите, если управление медиа устройства не работает для определённых приложений</string>
@@ -2119,7 +2119,7 @@
 \nВнимание: если установлено официальное приложение Fossil, долгое зажатие верхней кнопки также будет переключать отображение виджетов.</string>
     <string name="busy_task_fetch_sports_summaries">Получение сводки по спорту</string>
     <string name="busy_task_fetch_pai_data">Получение данных индекса физ. активности</string>
-    <string name="busy_task_fetch_spo2_data">Получение данных о насыщеннии крови кислородом</string>
+    <string name="busy_task_fetch_spo2_data">Получение данных о кислороде в крови</string>
     <string name="busy_task_fetch_hr_data">Получение данных о серцебиении</string>
     <string name="pref_app_logs_title">Журнал приложения</string>
     <string name="pref_app_logs_summary">Включить ведение журнала из приложения часов</string>
@@ -2652,4 +2652,45 @@
     <string name="huawei_alarm_smart_description">Не отключать \"умный подъём\".</string>
     <string name="huawei_alarm_event_description">Не включать \"умный подъём\".</string>
     <string name="huawei_trusleep_title">HUAWEI TruSleep ™</string>
+    <string name="huawei_trusleep_summary">Отслеживание качества сна и характера дыхания в реальном времени.
+\nАнализ закономерностей сна и точный диагноз 6 типов проблем со сном.</string>
+    <string name="pref_title_general_reconnectonlytoconnected">Переподключаться только к подключенным устройствам</string>
+    <string name="pref_activity_recognize_biking">распознавать езду на велосипеде</string>
+    <string name="pref_activity_recognize_walking">распознавать ходьбу</string>
+    <string name="pref_activity_recognition_mode_ask">спрашивать</string>
+    <string name="pref_activity_recognition_mode_auto">автоматически</string>
+    <string name="pref_enable_call_accept">Принятие тел. вызовов</string>
+    <string name="pref_enable_call_accept_summary">Включить принятие вызовов с устройства</string>
+    <string name="pref_enable_call_reject">Отклонение тел. вызовов</string>
+    <string name="pref_heartrate_automatic_enable">Автоизмерение сердцебиения</string>
+    <string name="pref_spo_automatic_enable">Автоизмерение кислорода в крови</string>
+    <string name="pref_force_options">Форсирование опций</string>
+    <string name="pref_force_smart_alarm">Форсировать умный будильник</string>
+    <string name="pref_force_smart_alarm_summary">Форсировать поддержку умных будильников.
+\nИСПОЛЬЗУЙТЕ НА СВОЙ РИСК</string>
+    <string name="pref_force_wear_location">Форсировать место ношения</string>
+    <string name="pref_force_wear_location_summary">Форсировать поддержку расположения ношения устройства.
+\nИСПОЛЬЗУЙТЕ НА СВОЙ РИСК</string>
+    <string name="pref_force_dnd_support">Форсировать поддержку \"не беспокоить\"</string>
+    <string name="huawei_ignore_wakeup_status_start">Игнорировать статус начала вставания</string>
+    <string name="huawei_ignore_wakeup_status_start_description">Может помочь исправить распознание сна. Сразу видимо в обзоре дневных активностей.</string>
+    <string name="huawei_ignore_wakeup_status_end">Игнорировать статус окончания вставания</string>
+    <string name="huawei_reparse_workout_data">Повторный анализ данных тренировки</string>
+    <string name="pref_summary_debug">Отправить запрос отладки на устройство Huawei</string>
+    <string name="pref_title_debug">Запрос отладки</string>
+    <string name="huawei_trusleep_summary_light">Улучшенное отслеживание сна</string>
+    <string name="pref_activity_recognition_mode_none">нет</string>
+    <string name="prefs_activity_recognition">Настройки распознания активности</string>
+    <string name="pref_activity_recognize_running">распознавать бег</string>
+    <string name="pref_activity_recognize_rowing">распознавать греблю</string>
+    <string name="pref_enable_call_reject_summary">Включить отклонение вызовов с устройства</string>
+    <string name="pref_disable_find_phone_with_dnd">Запретить \"найти мой телефон\" при включенном режиме \"не беспокоить\"</string>
+    <string name="pref_force_options_summary">Некоторые устройства ложно помечают себя как не имеющие поддержки этих опций. В этих настройках их можно попытаться включить.
+\nИСПОЛЬЗУЙТЕ НА СВОЙ РИСК
+\nЗа помощью обращайтесь к Вики</string>
+    <string name="pref_force_dnd_support_summary">Форсировать поддержку режима \"не беспокоить\".
+\nИСПОЛЬЗУЙТЕ НА СВОЙ РИСК</string>
+    <string name="huawei_ignore_wakeup_status_end_description">Может помочь исправить распознание сна. Сразу видимо в обзоре дневных активностей.</string>
+    <string name="huawei_reparse_workout_data_description">Эта опция повлияет на что-то после некоторых обновлений</string>
+    <string name="pref_summary_general_reconnectonlytoconnected">Переподключаться только к подключенным устройствам, а не ко всем подряд</string>
 </resources>
\ No newline at end of file

From 023be0d603a0ad17012c5cdf3a5585a4a734ae6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B0=91=E4=B8=BE?= <oshirisu.red@gmail.com>
Date: Tue, 9 Jan 2024 01:05:57 +0000
Subject: [PATCH 443/595] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (2484 of 2484 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/zh_Hans/
---
 app/src/main/res/values-zh-rCN/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index bc64f8f0c..99908e1d3 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -2690,4 +2690,6 @@
     <string name="huawei_reparse_workout_data_description">这只会在某些更新后执行某些操作</string>
     <string name="pref_summary_debug">向华为设备发送调试请求</string>
     <string name="pref_title_debug">调试请求</string>
+    <string name="pref_title_general_reconnectonlytoconnected">仅重新连接到已连接的设备</string>
+    <string name="pref_summary_general_reconnectonlytoconnected">仅重新连接到已连接的设备，而不是重新连接到所有设备</string>
 </resources>
\ No newline at end of file

From 8a036596d5ebc3271442d929e818b6df380ce5d0 Mon Sep 17 00:00:00 2001
From: Gregory Blanco <qartez@protonmail.com>
Date: Wed, 10 Jan 2024 08:43:35 +0000
Subject: [PATCH 444/595] Translated using Weblate (Polish)

Currently translated at 98.6% (2452 of 2485 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/pl/
---
 app/src/main/res/values-pl/strings.xml | 48 ++++++++++++++++++--------
 1 file changed, 34 insertions(+), 14 deletions(-)

diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 37eb5a9cb..bae06da3b 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -541,7 +541,7 @@
     <string name="mi2_prefs_do_not_disturb_end">Koniec</string>
     <string name="mi3_prefs_band_screen_unlock">Odblokowanie ekranu opaski</string>
     <string name="mi3_prefs_band_screen_unlock_summary">Przesuń w górę, aby odblokować ekran opaski</string>
-    <string name="norwegian_bokmal">Norwegian Bokmål</string>
+    <string name="norwegian_bokmal">Norweski Bokmål</string>
     <string name="FetchActivityOperation_about_to_transfer_since">Przeniesienie danych z okresu %1$s</string>
     <string name="appwidget_setting_alarm">Ustawienie alarmu na %1$02d:%2$02d</string>
     <string name="error_creating_directory_for_logfiles">Błąd tworzenia folderu na pliki log: %1$s</string>
@@ -1773,7 +1773,7 @@
     <string name="prefs_heartrate_alert_high_threshold">Próg alarmowy wysokiego tętna</string>
     <string name="prefs_stress_monitoring_description">Monitorowanie poziomu stresu podczas odpoczynku</string>
     <string name="controlcenter_set_preferences">Ustaw preferencje</string>
-    <string name="controlcenter_toggle_details">Pokaż detale</string>
+    <string name="controlcenter_toggle_details">Pokaż szczegóły</string>
     <string name="controlcenter_connected_fraction">Połączono: %d/%d</string>
     <string name="activity_type_elliptical">Eliptyczna</string>
     <string name="error_deleting_device">Błąd przy usuwaniu urządzenia: %s</string>
@@ -2147,7 +2147,7 @@
     <string name="stress_relaxed">Zreleksowany</string>
     <string name="kind_gpx_route">Ślad GPX</string>
     <string name="preferences_miband_1_2_settings" tools:ignore="TypographyFractions">Ustawienia Mi Band 1/2</string>
-    <string name="croatian">chorwacki</string>
+    <string name="croatian">Chorwacki</string>
     <string name="stop">Zatrzymaj</string>
     <string name="devicetype_casiogmwb5000">Casio GMW-B5000</string>
     <string name="long_press">Długie naciśnięcie</string>
@@ -2259,7 +2259,7 @@
     <string name="status_icon">Ikona stanu</string>
     <string name="title">Tytuł</string>
     <string name="busy_task_fetch_spo2_data">Pobieranie danych SpO2</string>
-    <string name="french_ca">French (Canada)</string>
+    <string name="french_ca">Francuski (Kanada)</string>
     <string name="double_tap">Podwójne dotknięcie</string>
     <string name="prefs_wena3_button_action_name_qrio_lock">Blokada Qrio</string>
     <string name="pref_app_logs_stop_summary">Zatrzymaj rejestrowanie dzienników aplikacji zegarka</string>
@@ -2274,7 +2274,7 @@
     <string name="loyalty_cards_install">Zainstaluj Catimę</string>
     <string name="prefs_home_icon_left_item">Do lewej</string>
     <string name="prefs_wena3_led_none">Bez LED</string>
-    <string name="spanish_es">Spanish (Spain)</string>
+    <string name="spanish_es">Hiszpański (Hiszpania)</string>
     <string name="activity_type_skiing">Narciarstwo</string>
     <string name="activity_error_share_failed">Udostępnianie pliku nie powiodło się.</string>
     <string name="pref_morning_updates_categories_title">Kategorie porannych aktualizacji</string>
@@ -2289,7 +2289,7 @@
     <string name="pref_message_privacy_mode_bodyonly">Ukryj tylko główną treść</string>
     <string name="prefs_wena3_hint_background_sync">Pozwól urządzeniu Wena okresowo prosić Urządzenia na ciele o pobranie danych o aktywności z urządzenia</string>
     <string name="pref_morning_updates_categories_summary">Lista kategorii wyświetlana każdego ranka</string>
-    <string name="english_in">English (India)</string>
+    <string name="english_in">Angielski (Indie)</string>
     <string name="prefs_wena3_home_icon_name_suica">Równowaga Suica</string>
     <string name="zepp_os_watchface_business_style">Styl biznesowy</string>
     <string name="prefs_wena3_vibration_strength_item_medium">Średnie</string>
@@ -2353,7 +2353,7 @@
     <string name="prefs_wena3_item_large_font">Większy rozmiar czcionki</string>
     <string name="gpx_route_upload_in_progress">Przesyłanie trasy gpx</string>
     <string name="fossil_hr_pairing_failed">Parowanie z zegarkiem nie powiodło się</string>
-    <string name="english_au">English (Australia)</string>
+    <string name="english_au">Angielski (Australia)</string>
     <string name="prefs_wena3_home_icon_name_energy">Energia ciała</string>
     <string name="permission_request">%1$s umożliwia wysyłanie wiadomości i innych danych z Androida na Twoje urządzenie. Aby to zrobić, wymagany jest dostęp do tych danych i bez niego może nie działać poprawnie.
 \n
@@ -2412,7 +2412,7 @@
     <string name="prefs_wena3_notification_default_call_led">Kolor diody LED połączenia przychodzącego</string>
     <string name="pref_activity_full_sync_trigger_title">Pełna synchronizacja</string>
     <string name="loyalty_cards_syncing">Synchronizowanie %d kart lojalnościowych z urządzeniem</string>
-    <string name="french_fr">French (France)</string>
+    <string name="french_fr">Francuski (Francja)</string>
     <string name="wifi_hotspot_stop_summary">Zatrzymaj hotspot Wi-Fi na zegarku</string>
     <string name="intent_api_allow_debug_commands_title">Zezwalaj na polecenia debugowania</string>
     <string name="fwapp_install_device_not_supported">Nie można zainstalować pliku, urządzenie nie jest obsługiwane.</string>
@@ -2426,14 +2426,14 @@
     <string name="temperature_scale_cf_summary">Wybierz, czy urządzenie ma używać skali Celsjusza czy Fahrenheita.</string>
     <string name="prefs_wena3_menu_icon_title">Ikony Menu</string>
     <string name="withings_bt_calibration_next">Dalej</string>
-    <string name="spanish_mx">Spanish (Mexico)</string>
+    <string name="spanish_mx">Hiszpański (Meksyk)</string>
     <string name="loyalty_cards_sync_starred">Synchronizuj tylko karty oznaczone gwiazdką</string>
     <string name="changelog_full_title">Lista zmian</string>
     <string name="pref_contacts_summary">Skonfiguruj kontakty na zegarku</string>
     <string name="loyalty_cards_install_catima_fail">Nie udało się otworzyć sklepu z aplikacjami, aby zainstalować Catimę</string>
     <string name="preview_image">Miniaturka</string>
     <string name="loyalty_cards_sync">Synchronizuj</string>
-    <string name="english_gb">English (United Kingdom)</string>
+    <string name="english_gb">Angielski (Wielka Brytania)</string>
     <string name="prefs_wena3_notification_default_call_vibration_repetition">Powtórzenie wibracji połączenia przychodzącego</string>
     <string name="intent_api_allow_debug_commands_summary">Zezwalaj na uruchamianie poleceń menu debugowania za pośrednictwem interfejsu Intent API</string>
     <string name="loyalty_cards_sync_options">Opcje synchronizacji</string>
@@ -2446,17 +2446,17 @@
     <string name="activity_type_handball">Piłka ręczna</string>
     <string name="temperature_scale_fahrenheit">Skala Fahrenheita</string>
     <string name="prefs_wena3_vibration_strength_item">Siła wibracji</string>
-    <string name="english_us">English (United States)</string>
+    <string name="english_us">Angielski (Stany Zjednoczone)</string>
     <string name="pref_theme_dynamic_colors_not_available_warning">Dynamiczne kolory nie są dostępne na Twoim urządzeniu, tylko Android 12+ obsługuje tę funkcję. Urządzenia na ciele użyje domyślnych kolorów Material 3.</string>
     <string name="withings_bt_calibration_previous">Wstecz</string>
     <string name="ftp_server_stop_summary">Zatrzymaj serwer FTP na zegarku</string>
     <string name="changelog_show_full">Więcej…</string>
-    <string name="spanish_us">Spanish (United States)</string>
+    <string name="spanish_us">Hiszpański (Stany Zjednoczone)</string>
     <string name="prefs_wena3_receive_calls_hint">Jeśli ta opcja jest wyłączona, nie będziesz otrzymywać powiadomień o połączeniach przychodzących na urządzeniu Wena</string>
     <string name="zepp_os_watchface_multiple_data">Wiele danych</string>
     <string name="prefs_wena3_button_action_item_long">Długie naciśnięcie</string>
     <string name="prefs_wena3_menu_icon_name_payment">Płatności</string>
-    <string name="latvian">Latvian</string>
+    <string name="latvian">Łotewski</string>
     <string name="prefs_wena3_status_page_title">Strona stanu zamówień</string>
     <string name="single_tap">Pojedyncze dotknięcie</string>
     <string name="prefs_wena3_title_alarm">Ustawienia alarmów</string>
@@ -2481,7 +2481,7 @@
     <string name="contact_phone_number">Numer telefonu</string>
     <string name="fossil_hr_pairing_successful">Parowanie z zegarkiem powiodło się</string>
     <string name="prefs_wena3_item_rich_design">Użyj bogatego projektu</string>
-    <string name="english_ca">English (Canada)</string>
+    <string name="english_ca">Angielski (Kanada)</string>
     <string name="prefs_wena3_day_start_hour_item">Dzień zaczyna się o</string>
     <string name="error_no_bluetooth_connect">Aby skanowanie działało prawidłowo, należy przyznać i włączyć dostęp do połączenia Bluetooth</string>
     <string name="prefs_shortcut_cards_summary">Karty skrótów widoczne po przesunięciu palcem w prawo na tarczy zegarka. To ustawienie nie ma wpływu na automatycznie generowane karty, gdy aplikacja jest uruchomiona.</string>
@@ -2644,4 +2644,24 @@
     <string name="devicetype_nothingearstick">Nothing Ear (Stick)</string>
     <string name="prefs_active_noise_cancelling_light">Lekka aktywna redukcja szumów</string>
     <string name="prefs_active_noise_cancelling_transparency">Przezroczyste</string>
+    <string name="devicetype_huawei_talk_band_b6">Huawei Talk Band B6</string>
+    <string name="devicetype_huawei_watchgt2e">Huawei Watch GT 2e</string>
+    <string name="devicetype_honor_band4">Honor Band 4</string>
+    <string name="devicetype_honor_band5">Honor Band 5</string>
+    <string name="devicetype_honor_band7">Honor Band 7</string>
+    <string name="devicetype_huawei_watchgt2">Huawei Watch GT 2 (Pro)</string>
+    <string name="devicetype_huawei_band4pro">Huawei Band 4 (Pro)</string>
+    <string name="devicetype_huawei_watch_gt">Huawei Watch GT</string>
+    <string name="devicetype_huawei_band8">Huawei Band 8</string>
+    <string name="devicetype_huawei_band7">Huawei Band 7</string>
+    <string name="pref_summary_debug">Wyślij żądanie odpluskwienia do urządzenia Huawei</string>
+    <string name="pref_title_debug">Żądanie odpluskwienia</string>
+    <string name="huawei_trusleep_title">HUAWEI TruSleep ™</string>
+    <string name="devicetype_huawei_watchgt3">Huawei Watch GT 3 (Pro)</string>
+    <string name="devicetype_huawei_band6">Huawei Band 6</string>
+    <string name="devicetype_honor_band3">Honor Band 3</string>
+    <string name="devicetype_honor_band6">Honor Band 6</string>
+    <string name="devicetype_huawei_band_aw70">Huawei Band (AW70)</string>
+    <string name="pref_spo_automatic_enable">Włącz automatyczne mierzenie SpO2</string>
+    <string name="manual">Ręcznie</string>
 </resources>
\ No newline at end of file

From 8c43e53db4acc59a66b4d4e2ff53a53e98a705cf Mon Sep 17 00:00:00 2001
From: 0que <0que@users.noreply.hosted.weblate.org>
Date: Wed, 10 Jan 2024 09:05:35 +0000
Subject: [PATCH 445/595] Translated using Weblate (Russian)

Currently translated at 99.5% (2473 of 2485 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ru/
---
 app/src/main/res/values-ru/strings.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 16711fa98..51900466d 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -433,7 +433,7 @@
     <string name="stats_y_axis_label">Шагов в минуту</string>
     <string name="clock">Часы</string>
     <string name="heart_rate">Пульс</string>
-    <string name="battery">Заряд батарейки</string>
+    <string name="battery">Заряд батареи</string>
     <string name="mi2_prefs_button_actions">Действия кнопки</string>
     <string name="mi2_prefs_button_actions_summary">Настройте действия при нажатии на кнопку</string>
     <string name="mi2_prefs_button_press_count">Кол-во нажатий на кнопку</string>
@@ -2693,4 +2693,5 @@
     <string name="huawei_ignore_wakeup_status_end_description">Может помочь исправить распознание сна. Сразу видимо в обзоре дневных активностей.</string>
     <string name="huawei_reparse_workout_data_description">Эта опция повлияет на что-то после некоторых обновлений</string>
     <string name="pref_summary_general_reconnectonlytoconnected">Переподключаться только к подключенным устройствам, а не ко всем подряд</string>
+    <string name="updatefirmwareoperation_updateproblem_low_battery">Заряд батареи слишком низок</string>
 </resources>
\ No newline at end of file

From b23acf0de1c6991b86c0f3346b23f874434ed204 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B0=91=E4=B8=BE?= <oshirisu.red@gmail.com>
Date: Wed, 10 Jan 2024 01:34:55 +0000
Subject: [PATCH 446/595] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (2485 of 2485 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/zh_Hans/
---
 app/src/main/res/values-zh-rCN/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 99908e1d3..c75f75e2f 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -2692,4 +2692,5 @@
     <string name="pref_title_debug">调试请求</string>
     <string name="pref_title_general_reconnectonlytoconnected">仅重新连接到已连接的设备</string>
     <string name="pref_summary_general_reconnectonlytoconnected">仅重新连接到已连接的设备，而不是重新连接到所有设备</string>
+    <string name="updatefirmwareoperation_updateproblem_low_battery">设备电池电量过低</string>
 </resources>
\ No newline at end of file

From 493202e860ca4ef961858d784263842b18826c2d Mon Sep 17 00:00:00 2001
From: Kim Tae Kyeong <kim@taekyeong.me>
Date: Wed, 10 Jan 2024 16:02:54 +0000
Subject: [PATCH 447/595] Translated using Weblate (Korean)

Currently translated at 23.9% (595 of 2485 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ko/
---
 app/src/main/res/values-ko/strings.xml | 41 +++++++++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index e2eccdf8e..0ad3b7b5c 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -304,7 +304,7 @@
     <string name="pref_summary_pebble_always_ack_pebblekit">제 3자 앱으로 보내는 메세지에 언제나 바로 ACK을 보냅니다</string>
     <string name="pref_title_unit_system">단위</string>
     <string name="pref_title_timeformat">시간 형식</string>
-    <string name="controlcenter_connect">연결</string>
+    <string name="controlcenter_connect">연결…</string>
     <string name="fw_upgrade_notice_amazfitcor">지금 당신의 Amazfit Cor에 %s 펌웨어를 설치하려고 합니다.
 \n
 \n.fw 파일을 설치하고 .res 파일을 설치한 후 최종적으로 .gps 파일을 설치하세요. .fw 파일을 설치한 후 기기가 재시작 됩니다.
@@ -611,4 +611,43 @@
     <string name="sonyswr12_settings_stamina_summary">절전 모드는주기적인 심박수 자동 측정을 해제하여 작업 시간을 늘립니다.</string>
     <string name="sonyswr12_settings_alarm_interval">분 단위의 스마트 알람 간격</string>
     <string name="sonyswr12_settings_alarm_interval_summary">스마트 알람 간격은 설치된 알람 이전의 간격입니다. 이 간격에서 장치는 사용자를 깨우기 위해 가장 가벼운 수면 단계를 감지하려고합니다.</string>
+    <string name="controlcenter_power_off">전원 끄기</string>
+    <string name="calendar_day">일</string>
+    <string name="calendar_two_weeks">2주</string>
+    <string name="accuracy">정확도</string>
+    <string name="about_activity_title_generic">Gadgetbridge에 대하여</string>
+    <string name="application_name_banglejs_main">Bangle.js Gadgetbridge</string>
+    <string name="title_activity_controlcenter_banglejs_main">Bangle.js Gadgetbridge</string>
+    <string name="about_activity_title_banglejs_main">Bangle.js Gadgetbridge에 대하여</string>
+    <string name="controlcenter_power_off_confirm_title">전원 끄기</string>
+    <string name="controlcenter_power_off_confirm_description">기기의 전원을 끄고 싶은 것이 확실한가요?</string>
+    <string name="battery_level">배터리 레벨</string>
+    <string name="calendar_week">주</string>
+    <string name="controlcenter_set_alias">별명 설정</string>
+    <string name="prefs_activity_in_device_card_sleep_title">수면</string>
+    <string name="activity_list_summary_distance">거리</string>
+    <string name="activity_list_summary_active_steps">활성 걸음</string>
+    <string name="controlcenter_get_heartrate_measurement">심박수 측정 얻기</string>
+    <string name="battery_detail_activity_title">배터리 정보</string>
+    <string name="power_saving">절전</string>
+    <string name="custom">커스텀</string>
+    <string name="dialog_hide">숨기기</string>
+    <string name="charts_activity_list">활동 목록</string>
+    <string name="action_changelog">변경 기록</string>
+    <string name="balanced">균형</string>
+    <string name="low_power_gps">저전력 GPS</string>
+    <string name="gps">GPS</string>
+    <string name="gps_bds">GPS + BDS</string>
+    <string name="gps_gnolass">GPS + GNOLASS</string>
+    <string name="gps_galileo">GPS + GALILEO</string>
+    <string name="prefs_activity_in_device_card_sleep_title_summary">수면 기간 표시</string>
+    <string name="prefs_activity_in_device_card_distance_title_summary">거리는 걸음과 보폭에서 계산됩니다 (설정에서 변경 가능)</string>
+    <string name="prefs_activity_in_device_card_steps_title_summary">전체 걸음 수 표시</string>
+    <string name="calendar_month">달</string>
+    <string name="calendar_three_months">3달</string>
+    <string name="calendar_six_months">6달</string>
+    <string name="calendar_year">년</string>
+    <string name="appmanager_app_start">시작</string>
+    <string name="activity_list_summary_active_time">활성 시간</string>
+    <string name="activity_list_summary_activities">활동</string>
 </resources>
\ No newline at end of file

From fab6f540a44b0aa264f3a74eab7a5ba17b46bfaa Mon Sep 17 00:00:00 2001
From: Gregory Blanco <qartez@protonmail.com>
Date: Wed, 10 Jan 2024 13:56:45 +0000
Subject: [PATCH 448/595] Translated using Weblate (Polish)

Currently translated at 98.8% (2457 of 2485 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/pl/
---
 app/src/main/res/values-pl/strings.xml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index bae06da3b..097a53b53 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -2567,7 +2567,7 @@
     <string name="devicetype_redmiwatch3active">Redmi Watch 3 Active</string>
     <string name="pref_summary_casio_alert_calendar">Alert (wibracja/beep) dla powiadomień z kalendarza</string>
     <string name="serial_number">Numer seryjny</string>
-    <string name="danish">Danish</string>
+    <string name="danish">Duński</string>
     <string name="wake_up_time">Pobudka</string>
     <string name="devicetype_miband7pro">Xiaomi Smart Band 7 Pro</string>
     <string name="menuitem_stats">Statystyki</string>
@@ -2580,9 +2580,9 @@
     <string name="devicetype_xiaomi_watch_s1_active">Xiaomi Watch S1 Active</string>
     <string name="devicetype_pixoo">Pixoo</string>
     <string name="pref_title_goal_secondary">Drugi punkt</string>
-    <string name="pref_summary_send_app_notifications">Wyślij powiadomienie do urządzenia</string>
+    <string name="pref_summary_send_app_notifications">Wysyłaj powiadomienia do urządzenia</string>
     <string name="wearmode_band">Opaska (na nadgarstek)</string>
-    <string name="pref_title_send_app_notifications">Wyślij powiadomienie</string>
+    <string name="pref_title_send_app_notifications">Wysyłaj powiadomienia</string>
     <string name="activity_type_trail_run">Bieg szlakiem</string>
     <string name="widget_layout">Układ widżetu</string>
     <string name="widget_screen_no_free_slots_description">Urządzenie nie ma wolnych miejsc na ekrany widżetów (łączna liczba miejsc: %1$s)</string>
@@ -2664,4 +2664,9 @@
     <string name="devicetype_huawei_band_aw70">Huawei Band (AW70)</string>
     <string name="pref_spo_automatic_enable">Włącz automatyczne mierzenie SpO2</string>
     <string name="manual">Ręcznie</string>
+    <string name="pref_title_general_reconnectonlytoconnected">Połącz się ponownie tylko z połączonymi urządzeniami</string>
+    <string name="pref_summary_general_reconnectonlytoconnected">Połącz się ponownie tylko z połączonymi urządzeniami, zamiast ponownego łączenia z wszystkimi urządzeniami</string>
+    <string name="huawei_reparse_workout_data_description">Ta opcja będzie działać dopiero w nowszej wersji aplikacji</string>
+    <string name="updatefirmwareoperation_updateproblem_low_battery">Poziom baterii urządzenia jest zbyt niski</string>
+    <string name="dnd_all_day">Cały dzień</string>
 </resources>
\ No newline at end of file

From 40985f0f62ec3cbfe445d7f284e4aa448b4b0da4 Mon Sep 17 00:00:00 2001
From: Ihor Hordiichuk <igor_ck@outlook.com>
Date: Wed, 10 Jan 2024 17:39:58 +0000
Subject: [PATCH 449/595] Translated using Weblate (Ukrainian)

Currently translated at 97.8% (2432 of 2485 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/uk/
---
 app/src/main/res/values-uk/strings.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 1b2d7ed2c..f1178df21 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -1359,7 +1359,7 @@
     <string name="prefs_touch_lock">Сенсорне блокування</string>
     <string name="prefs_touch_lock_summary">Вимкнути події торкання</string>
     <string name="prefs_galaxy_buds_experimental">Експериментальне</string>
-    <string name="prefs_ambient_volume">Гучність оточення</string>
+    <string name="prefs_ambient_volume">Гучність середовища</string>
     <string name="prefs_ambient_voice_focus">Фокус голосу</string>
     <string name="prefs_ambient_voice_summary">Підсилення голосу</string>
     <string name="prefs_left">Лівий</string>
@@ -1640,7 +1640,7 @@
     <string name="devicetype_galaxybuds_pro">Galaxy Buds Pro</string>
     <string name="prefs_in_ear_detection_summary">Відтворення викликів через навушники, коли вони у ваших вухах</string>
     <string name="prefs_seamless_connection_switch_summary">Автоматичне перемикає навушники між пов\'язаними пристроями</string>
-    <string name="prefs_ambient_volume_left">Гучність оточення зліва</string>
+    <string name="prefs_ambient_volume_left">Гучність середовища зліва</string>
     <string name="prefs_customize_ambient_sound_summary">Налаштування навколишнього звуку</string>
     <string name="prefs_ambient_sound_during_call_title">Навколишній звук під час виклику</string>
     <string name="prefs_active_noise_cancelling_level">Рівень активного шумопоглинання</string>
@@ -1651,13 +1651,13 @@
     <string name="pref_title_touch_volume">Гучність</string>
     <string name="pref_ambient_sound_tone_summary">Від м\'якого до чистого</string>
     <string name="pref_switch_controls_anc_off">Шумопоглинання ←→ Вимкнено</string>
-    <string name="pref_switch_controls_ambient_off">Оточення ←→ Вимкнено</string>
+    <string name="pref_switch_controls_ambient_off">Середовище ←→ Вимкнено</string>
     <string name="prefs_noise_control">Контроль шуму</string>
     <string name="prefs_voice_detect">Виявлення голосу</string>
     <string name="prefs_double_tap_edge">Подвійне торкання краю</string>
     <string name="prefs_voice_detect_duration">Завершення після тиші за:</string>
     <string name="pref_voice_detect_duration_15">15 секунд</string>
-    <string name="prefs_ambient_volume_right">Гучність оточення справа</string>
+    <string name="prefs_ambient_volume_right">Гучність середовища справа</string>
     <string name="prefs_ambient_sound_during_call_summary">Чітко чути власний голос під час викликів</string>
     <string name="prefs_seamless_connection_switch_title">Плавне перемикання з\'єднання</string>
     <string name="prefs_ambient_settings_title">Параметри навколишнього звуку</string>
@@ -1671,7 +1671,7 @@
     <string name="prefs_noise_control_with_one_earbud_summary">Дозволити контроль шуму під час використання лише одного навушника</string>
     <string name="pref_balance">Баланс</string>
     <string name="pref_ambient_sound_tone">Тон навколишнього звуку</string>
-    <string name="pref_switch_controls_anc_ambient">Шумопоглинання ←→ Оточення</string>
+    <string name="pref_switch_controls_anc_ambient">Шумопоглинання ←→ Середовище</string>
     <string name="prefs_voice_detect_summary">Увімкнути навколишній звук і автоматичне стишення відтворення після виявлення голосу</string>
     <string name="prefs_double_tap_edge_summary">Виявлення подвійного торкання, навіть якщо не торкатися тачпада</string>
     <string name="pref_voice_detect_duration_10">10 секунд</string>
@@ -2180,7 +2180,7 @@
     <string name="continue_pressing">Продовжити натискання</string>
     <string name="quick_attention">Швидка увага</string>
     <string name="long_press">Затискання</string>
-    <string name="pref_switch_controls_anc_ambient_off">Шумопоглинання ←→ Оточення ←→ Вимкнено</string>
+    <string name="pref_switch_controls_anc_ambient_off">Шумопоглинання ←→ Середовище ←→ Вимкнено</string>
     <string name="sony_button_mode_help_title">Режими кнопок - Довідка</string>
     <string name="menuitem_mi_ai">MI AI</string>
     <string name="menuitem_cards">Картки</string>

From c179f96c638d0137b44678c3bf06d9ea534043fa Mon Sep 17 00:00:00 2001
From: arjan-s <a_gitlab@anymore.nl>
Date: Wed, 10 Jan 2024 19:40:06 +0000
Subject: [PATCH 450/595] Translated using Weblate (Dutch)

Currently translated at 99.8% (2481 of 2485 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/nl/
---
 app/src/main/res/values-nl/strings.xml | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 47503b4dd..97ae8aaa0 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -50,7 +50,7 @@
     <string name="miband_firmware_suggest_whitelist">Als u nog steeds wilt doorgaan en uw apparaat blijft goed functioneren, vertel dan alstublieft de ontwikkelaars van Gadgetbridge om de %s firmware-versie op de goedgekeurde lijst te zetten.</string>
     <string name="title_activity_settings">Instellingen</string>
     <string name="pref_header_general">Algemene instellingen</string>
-    <string name="pref_title_general_autoconnectonbluetooth">Verbind met Gadgetbridge-apparaat wanneer Bluetooth wordt ingeschakeld</string>
+    <string name="pref_title_general_autoconnectonbluetooth">Verbind met Gadgetbridge-apparaten wanneer Bluetooth wordt ingeschakeld</string>
     <string name="pref_title_general_autostartonboot">Start automatisch</string>
     <string name="pref_title_general_autoreconnect">Verbind automatisch opnieuw</string>
     <string name="pref_title_audio_player">Gewenste audiospeler</string>
@@ -2669,4 +2669,24 @@
     <string name="huawei_alarm_event_description">Plaats geen vinkje bij slim wakker worden.</string>
     <string name="huawei_trusleep_summary">Monitor uw slaapkwaliteit en adempatroon in realtime.
 \nAnalyseer uw slaappatronen en diagnosticeer 6 types slaapproblemen.</string>
+    <string name="pref_force_options">Opties forceren</string>
+    <string name="pref_force_options_summary">Sommige apparaten geven onterecht aan sommige opties niet te ondersteunen. Deze instellingen gebruikt worden om ze alsnog in te schakelen.
+\nGEBRUIK OP EIGEN RISICO
+\nLees de documentatie</string>
+    <string name="pref_force_smart_alarm">Forceer slim alarm</string>
+    <string name="pref_force_smart_alarm_summary">Forceer ondersteuning van slimme alarmen
+\nGEBRUIK OP EIGEN RISICO</string>
+    <string name="pref_title_general_reconnectonlytoconnected">Maak alleen opnieuw verbinding met verbonden apparaten</string>
+    <string name="pref_summary_general_reconnectonlytoconnected">Maak alleen opnieuw verbinding met verbonden apparaten, in plaats van met alle apparaten</string>
+    <string name="updatefirmwareoperation_updateproblem_low_battery">Het batterijniveau van het apparaat is te laag</string>
+    <string name="pref_force_wear_location">Forceer draaglocatie</string>
+    <string name="pref_force_dnd_support">Forceer ondersteuning voor Niet Storen</string>
+    <string name="huawei_ignore_wakeup_status_start">Negeer startstatus wakkerworden</string>
+    <string name="huawei_ignore_wakeup_status_start_description">Kan helpen voor correcte slaapdetectie. Direct zichtbaar in het dagelijkse activiteitenoverzicht.</string>
+    <string name="huawei_ignore_wakeup_status_end">Negeer eindstatus wakkerworden</string>
+    <string name="huawei_ignore_wakeup_status_end_description">Kan helpen voor correcte slaapdetectie. Direct zichtbaar in het dagelijkse activiteitenoverzicht.</string>
+    <string name="pref_force_wear_location_summary">Forceer ondersteuning voor draaglocatie
+\nGEBRUIK OP EIGEN RISICO</string>
+    <string name="pref_force_dnd_support_summary">Forceer ondersteuning voor Niet Storen
+\nGEBRUIK OP EIGEN RISICO</string>
 </resources>
\ No newline at end of file

From 849c6c29b3fa0b5ca26587fc11631116fc215a52 Mon Sep 17 00:00:00 2001
From: Gregory Blanco <qartez@protonmail.com>
Date: Wed, 10 Jan 2024 21:28:46 +0000
Subject: [PATCH 451/595] Translated using Weblate (Polish)

Currently translated at 98.8% (2458 of 2486 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/pl/
---
 app/src/main/res/values-pl/strings.xml | 45 ++++++++++++++------------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 097a53b53..e7b7be160 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -109,10 +109,10 @@
     <string name="installing_binary_d_d">Instalowanie binarki %1$d/%2$d</string>
     <string name="installation_failed_">Instalacja nie powiodła się</string>
     <string name="installation_successful">Zainstalowano</string>
-    <string name="firmware_install_warning">PRÓBUJESZ ZAINSTALOWAĆ FIRMWARE, POSTĘPUJESZ NA WŁASNĄ ODPOWIEDZIALNOŚĆ . 
-\n 
-\n 
-\n Ten firmware jest przeznaczony dla wersji HW: %s</string>
+    <string name="firmware_install_warning">PRÓBUJESZ ZAINSTALOWAĆ OPROGRAMOWANIE UKŁADOWE, KONTYNUUJ NA WŁASNE RYZYKO.
+\n
+\n
+\n Te oprogramowanie układowe jest przeznaczone dla wersji HW: %s</string>
     <string name="app_install_info">Zamierzasz zainstalować poniższą aplikację:
 \n
 \n%1$s
@@ -1178,7 +1178,7 @@
     <string name="devicetype_amazfit_gts2e">Amazfit GTS 2e</string>
     <string name="battery_detail_activity_title">Informacje o baterii</string>
     <string name="devicetype_amazfit_x">Amazfit X</string>
-    <string name="fw_upgrade_notice_amazfitx">Właśnie zamierzasz zainstalować oprogramowanie układowe %s na swoim Amazfit X.
+    <string name="fw_upgrade_notice_amazfitx">Właśnie zamierzasz zainstalować oprogramowanie układowe %s na Twoim Amazfit X.
 \n
 \nProszę upewnić się, że zainstalowany został plik .fw, a następnie plik .res. Po zainstalowaniu pliku .fw Twoja opaska zostanie ponownie uruchomiona.
 \n
@@ -1208,7 +1208,7 @@
     <string name="fossil_hr_warning_firmware_too_new">Niektóre funkcje są wyłączone, ponieważ oprogramowanie zegarka jest zbyt nowe</string>
     <string name="prefs_sounds_summary">Skonfiguruj, kiedy urządzenie będzie emitować sygnał dźwiękowy</string>
     <string name="prefs_sounds">Dźwięki</string>
-    <string name="fw_upgrade_notice_amazfitneo">Właśnie zamierzasz zainstalować oprogramowanie układowe %s na swoim Amazfit Neo.
+    <string name="fw_upgrade_notice_amazfitneo">Właśnie zamierzasz zainstalować oprogramowanie układowe %s na Twoim Amazfit Neo
 \n
 \nPo zainstalowaniu pliku .fw Twoja opaska zostanie ponownie uruchomiona.
 \n
@@ -1696,11 +1696,11 @@
     <string name="prefs_spo2_monitoring_description">Automatyczne monitorowanie poziomu tlenu we krwi przez cały dzień</string>
     <string name="prefs_spo2_alert_threshold">Próg alarmowy SPO2</string>
     <string name="pref_sleep_breathing_quality_monitoring">Monitorowanie jakości oddechu podczas snu</string>
-    <string name="fw_upgrade_notice_miband7">Zamierzasz zainstalować oprogramowanie %s na swoim Xiaomi Smart Band 7.
+    <string name="fw_upgrade_notice_miband7">Zamierzasz zainstalować oprogramowanie układowe %s na swoim Xiaomi Smart Band 7.
 \n
 \nTwoja opaska uruchomi się ponownie po zainstalowaniu pliku .zip.
 \n
-\nROBISZ TO NA WŁASNĄ ODPOWIEDZIALNOŚĆ!</string>
+\nKONTYNUUJ NA WŁASNE RYZYKO!</string>
     <string name="open_fw_installer_connect_maximum_one_device">Proszę podłączyć TYLKO JEDNO urządzenie, do którego chcesz wysłać plik.</string>
     <string name="pref_header_connection">Połączenie</string>
     <string name="pref_header_display">Wyświetlanie</string>
@@ -1928,11 +1928,11 @@
     <string name="supercars_lights_label">Klasyczne</string>
     <string name="supercars_turbo_speed_label">Turbo Speed</string>
     <string name="dismiss">Odrzuć</string>
-    <string name="fw_upgrade_notice_amazfit_gtr3">Właśnie zamierzasz zainstalować oprogramowanie układowe %s na Amazfit GTR3. 
-\n 
-\nUrządzenie uruchomi się ponownie po instalacji pliku .zip. 
-\n 
-\nWykonujesz to na własne ryzyko!</string>
+    <string name="fw_upgrade_notice_amazfit_gtr3">Właśnie zamierzasz zainstalować oprogramowanie układowe %s na Twoim Amazfit GTR3.
+\n
+\nUrządzenie uruchomi się ponownie po instalacji pliku .zip.
+\n
+\nKONTYNUUJ NA WŁASNE RYZYKO!</string>
     <string name="pref_title_third_party_app_device_settings">Pozwól aplikacjom firm trzecich na zmianę ustawień</string>
     <string name="activity_type_dance">Taniec</string>
     <string name="activity_type_indoor_fitness">Ćwiczenia w domu</string>
@@ -1979,7 +1979,7 @@
 \n
 \nOpaska uruchomi się ponownie po instalacji *.zip.
 \n
-\nKontynuujesz na własne ryzyko!</string>
+\nKONTYNUUJ NA WŁASNE RYZYKO!</string>
     <string name="pref_title_notification_media_ignores_application_list">Lista ignorowanych powiadomień ze stron społecznościowych</string>
     <string name="pref_summary_notification_media_ignores_application_list">Przetwarzaj powiadomienia multimedialne przed listą aplikacji. Jeśli ta preferencja nie jest zaznaczona, aplikacje multimedialne muszą być dozwolone na liście aplikacji, aby elementy sterujące multimediami działały na urządzeniu.</string>
     <string name="pref_workout_detection_categories_summary">Automatyczne wykrywanie kategorii ćwiczeń</string>
@@ -2079,7 +2079,7 @@
 \n
 \nOpaska uruchomi się ponownie po instalacji *.zip.
 \n
-\nKontynuujesz na własne ryzyko!</string>
+\nKONTYNUUJ NA WŁASNE RYZYKO!</string>
     <string name="pref_header_sound_vibration">Dźwięki i wibracje</string>
     <string name="pref_header_intent_api">Interfejs API intencji</string>
     <string name="pref_text_to_speech">Tekst na mowę</string>
@@ -2105,12 +2105,12 @@
 \n
 \nOpaska uruchomi się ponownie po instalacji *.zip.
 \n
-\nKontynuujesz na własne ryzyko!</string>
+\nKONTYNUUJ NA WŁASNE RYZYKO!</string>
     <string name="fw_upgrade_notice_amazfit_gtr4">Zamierzasz zainstalować oprogramowanie układowe %s na Twoim Amazfit GTR 4.
 \n
 \nOpaska uruchomi się ponownie po instalacji *.zip.
 \n
-\nKontynuujesz na własne ryzyko!</string>
+\nKONTYNUUJ NA WŁASNE RYZYKO!</string>
     <string name="pref_agps_expiry_reminder_time">Czas powiadamiania o wygasaniu AGPS</string>
     <string name="pref_workout_detection_title">Kierunek ćwiczeń</string>
     <string name="pref_enable_unsupported_settings_summary">Umożliwi to dostęp do wszystkich dostępnych ustawień, nawet jeśli nie są obsługiwane przez urządzenie. Może to spowodować niestabilność i awarie urządzenia.</string>
@@ -2121,7 +2121,7 @@
 \n
 \nOpaska uruchomi się ponownie po instalacji *.zip.
 \n
-\nKontynuujesz na własne ryzyko!</string>
+\nKONTYNUUJ NA WŁASNE RYZYKO!</string>
     <string name="pref_gps_combination">Mieszanie GPS</string>
     <string name="pref_gps_satellite_search">Wyszukiwanie satelit</string>
     <string name="pref_crown_vibration">Wibracja koronki</string>
@@ -2129,7 +2129,7 @@
     <string name="pref_cover_to_mute">Przykryj, aby wyciszyć</string>
     <string name="pref_workout_detection_summary">Automatyczny kierunek ćwiczeń</string>
     <string name="pref_screen_notification_profile_todo_list">Lista Do zrobienia</string>
-    <string name="fw_upgrade_notice_amazfit_gtr3_pro">Właśnie zamierzasz zainstalować oprogramowanie układowe %s na Amazfit GTR 3 Pro.
+    <string name="fw_upgrade_notice_amazfit_gtr3_pro">Właśnie zamierzasz zainstalować oprogramowanie układowe %s na Twoim Amazfit GTR 3 Pro.
 \n
 \nUrządzenie uruchomi się ponownie po instalacji pliku .zip.
 \n
@@ -2227,7 +2227,7 @@
     <string name="pref_camera_remote_summary">Umożliwia zegarkowi wyzwalanie aparatu telefonu</string>
     <string name="bluetooth_calls_settings">Ustawienia połączeń Bluetooth</string>
     <string name="bluetooth_calls_pairing">Parowanie połączeń Bluetooth</string>
-    <string name="fw_upgrade_notice_amazfit_cheetah_pro">Właśnie zamierzasz zainstalować oprogramowanie układowe %s na swoim Amazfit Cheetah Pro
+    <string name="fw_upgrade_notice_amazfit_cheetah_pro">Właśnie zamierzasz zainstalować oprogramowanie układowe %s na Twoim Amazfit Cheetah Pro
 \n
 \nTwój zegarek zostanie ponownie uruchomiony po instalacji pliku .zip
 \n
@@ -2235,7 +2235,7 @@
     <string name="pref_title_notification_cache_while_disconnected">Pamięć podręczna poza zasięgiem</string>
     <string name="pref_summary_banglejs_phone_gps_network_only">Do określenia lokalizacji używaj tylko dostawcy sieci. Zmniejsza to zużycie energii kosztem dokładności. Konieczne jest ponowne połączenie.</string>
     <string name="pref_title_banglejs_phone_gps_update_interval">Interwał aktualizacji danych GPS</string>
-    <string name="fw_upgrade_notice_zepp_os">Właśnie zamierzasz zainstalować oprogramowanie układowe %s na swoim %s.
+    <string name="fw_upgrade_notice_zepp_os">Właśnie zamierzasz zainstalować oprogramowanie układowe %s na Twoim %s.
 \n
 \nTwój zegarek zostanie ponownie uruchomiony po instalacji pliki .zip.
 \n
@@ -2669,4 +2669,7 @@
     <string name="huawei_reparse_workout_data_description">Ta opcja będzie działać dopiero w nowszej wersji aplikacji</string>
     <string name="updatefirmwareoperation_updateproblem_low_battery">Poziom baterii urządzenia jest zbyt niski</string>
     <string name="dnd_all_day">Cały dzień</string>
+    <string name="pref_force_options_summary">Niektóre urządzenia fałszywie twierdzą, że nie mają wsparcia dla pewnych funkcji. Tej opcji można użyć by włączyć je pomimo tego.
+\nKONTYNUUJ NA WŁASNE RYZYKO!
+\nPrzeczytaj wiki</string>
 </resources>
\ No newline at end of file

From 4ce5b59e15ab7e2928b7daf6ef9c98c849d51fcf Mon Sep 17 00:00:00 2001
From: arjan-s <a_gitlab@anymore.nl>
Date: Wed, 10 Jan 2024 19:50:14 +0000
Subject: [PATCH 452/595] Translated using Weblate (Dutch)

Currently translated at 100.0% (2486 of 2486 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/nl/
---
 app/src/main/res/values-nl/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 97ae8aaa0..cb93070c0 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -2689,4 +2689,9 @@
 \nGEBRUIK OP EIGEN RISICO</string>
     <string name="pref_force_dnd_support_summary">Forceer ondersteuning voor Niet Storen
 \nGEBRUIK OP EIGEN RISICO</string>
+    <string name="huawei_reparse_workout_data">Trainingsgegevens opnieuw analyseren</string>
+    <string name="pref_summary_debug">Stuur een foutopsporingsverzoek naar het Huawei-apparaat</string>
+    <string name="pref_title_debug">Foutopsporingsverzoek</string>
+    <string name="huawei_reparse_workout_data_description">Dit zal alleen iets doen na bepaalde updates</string>
+    <string name="menuitem_buzzer_intensity">Zoemerintensiteit</string>
 </resources>
\ No newline at end of file

From 1e1f0014c7dcb83bc3d5e7f90e653ab57231472a Mon Sep 17 00:00:00 2001
From: Damien 'Psolyca' Gaignon <damien.gaignon@gmail.com>
Date: Sat, 13 Jan 2024 17:24:36 +0100
Subject: [PATCH 453/595] Huawei : Change method to get device name round 2

---
 .../honorband3/HonorBand3Coordinator.java       | 14 ++++----------
 .../honorband4/HonorBand4Coordinator.java       | 14 ++++----------
 .../honorband5/HonorBand5Coordinator.java       | 14 ++++----------
 .../honorband6/HonorBand6Coordinator.java       | 14 ++++----------
 .../honorband7/HonorBand7Coordinator.java       | 14 ++++----------
 .../HuaweiBand4ProCoordinator.java              | 17 ++++-------------
 .../huaweiband6/HuaweiBand6Coordinator.java     |  2 +-
 .../huaweiband7/HuaweiBand7Coordinator.java     |  2 +-
 .../huaweiband8/HuaweiBand8Coordinator.java     |  2 +-
 .../HuaweiBandAw70Coordinator.java              |  2 +-
 .../HuaweiTalkBandB6Coordinator.java            |  2 +-
 .../huaweiwatchgt/HuaweiWatchGTCoordinator.java |  2 +-
 .../HuaweiWatchGT2Coordinator.java              |  2 +-
 .../HuaweiWatchGT2eCoordinator.java             |  2 +-
 .../HuaweiWatchGT3Coordinator.java              |  2 +-
 15 files changed, 33 insertions(+), 72 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband3/HonorBand3Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband3/HonorBand3Coordinator.java
index 6b415d8a5..2c90c11b3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband3/HonorBand3Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband3/HonorBand3Coordinator.java
@@ -19,6 +19,8 @@ package nodomain.freeyourgadget.gadgetbridge.devices.huawei.honorband3;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.regex.Pattern;
+
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants;
 import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiLECoordinator;
@@ -40,16 +42,8 @@ public class HonorBand3Coordinator extends HuaweiLECoordinator {
     }
 
     @Override
-    public boolean supports(GBDeviceCandidate candidate) {
-        try {
-            String name = candidate.getName();
-            if (name != null && name.toLowerCase().startsWith(HuaweiConstants.HO_BAND3_NAME)) {
-                return true;
-            }
-        } catch (Exception ex) {
-            LOG.error("unable to check device support", ex);
-        }
-        return false;
+    protected Pattern getSupportedDeviceName() {
+        return Pattern.compile(HuaweiConstants.HO_BAND3_NAME + ".*", Pattern.CASE_INSENSITIVE);
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband4/HonorBand4Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband4/HonorBand4Coordinator.java
index 8af057e86..4b7100b96 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband4/HonorBand4Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband4/HonorBand4Coordinator.java
@@ -19,6 +19,8 @@ package nodomain.freeyourgadget.gadgetbridge.devices.huawei.honorband4;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.regex.Pattern;
+
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiLECoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants;
@@ -44,16 +46,8 @@ public class HonorBand4Coordinator extends HuaweiLECoordinator {
     }
 
     @Override
-    public boolean supports(GBDeviceCandidate candidate) {
-        try {
-            String name = candidate.getName();
-            if (name != null && name.toLowerCase().startsWith(HuaweiConstants.HO_BAND4_NAME)) {
-                return true;
-            }
-        } catch (Exception ex) {
-            LOG.error("unable to check device support", ex);
-        }
-        return false;
+    protected Pattern getSupportedDeviceName() {
+        return Pattern.compile(HuaweiConstants.HO_BAND4_NAME + ".*", Pattern.CASE_INSENSITIVE);
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband5/HonorBand5Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband5/HonorBand5Coordinator.java
index 1e55cedec..098ebb45f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband5/HonorBand5Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband5/HonorBand5Coordinator.java
@@ -19,6 +19,8 @@ package nodomain.freeyourgadget.gadgetbridge.devices.huawei.honorband5;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.regex.Pattern;
+
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.TimeSampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiLECoordinator;
@@ -44,16 +46,8 @@ public class HonorBand5Coordinator extends HuaweiLECoordinator {
     }
 
     @Override
-    public boolean supports(GBDeviceCandidate candidate) {
-        try {
-            String name = candidate.getName();
-            if (name != null && name.toLowerCase().startsWith(HuaweiConstants.HO_BAND5_NAME)) {
-                return true;
-            }
-        } catch (Exception ex) {
-            LOG.error("unable to check device support", ex);
-        }
-        return false;
+    protected Pattern getSupportedDeviceName() {
+        return Pattern.compile(HuaweiConstants.HO_BAND5_NAME + ".*", Pattern.CASE_INSENSITIVE);
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband6/HonorBand6Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband6/HonorBand6Coordinator.java
index f0311e7d2..91135d3d1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband6/HonorBand6Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband6/HonorBand6Coordinator.java
@@ -19,6 +19,8 @@ package nodomain.freeyourgadget.gadgetbridge.devices.huawei.honorband6;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.regex.Pattern;
+
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.TimeSampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants;
@@ -39,16 +41,8 @@ public class HonorBand6Coordinator extends HuaweiLECoordinator {
     }
 
     @Override
-    public boolean supports(GBDeviceCandidate candidate) {
-        try {
-            String name = candidate.getName();
-            if (name != null && name.toLowerCase().startsWith(HuaweiConstants.HO_BAND6_NAME)) {
-                return true;
-            }
-        } catch (Exception ex) {
-            LOG.error("unable to check device support", ex);
-        }
-        return false;
+    protected Pattern getSupportedDeviceName() {
+        return Pattern.compile(HuaweiConstants.HO_BAND6_NAME + ".*", Pattern.CASE_INSENSITIVE);
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband7/HonorBand7Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband7/HonorBand7Coordinator.java
index e18ada38e..2d902ad7c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband7/HonorBand7Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honorband7/HonorBand7Coordinator.java
@@ -19,6 +19,8 @@ package nodomain.freeyourgadget.gadgetbridge.devices.huawei.honorband7;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.regex.Pattern;
+
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.TimeSampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants;
@@ -39,16 +41,8 @@ public class HonorBand7Coordinator extends HuaweiLECoordinator {
     }
 
     @Override
-    public boolean supports(GBDeviceCandidate candidate) {
-        try {
-            String name = candidate.getName();
-            if (name != null && name.toLowerCase().startsWith(HuaweiConstants.HO_BAND7_NAME)) {
-                return true;
-            }
-        } catch (Exception ex) {
-            LOG.error("unable to check device support", ex);
-        }
-        return false;
+    protected Pattern getSupportedDeviceName() {
+        return Pattern.compile(HuaweiConstants.HO_BAND7_NAME + ".*", Pattern.CASE_INSENSITIVE);
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband4pro/HuaweiBand4ProCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband4pro/HuaweiBand4ProCoordinator.java
index 12920b098..68802292b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband4pro/HuaweiBand4ProCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband4pro/HuaweiBand4ProCoordinator.java
@@ -19,6 +19,8 @@ package nodomain.freeyourgadget.gadgetbridge.devices.huawei.huaweiband4pro;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.regex.Pattern;
+
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.TimeSampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants;
@@ -39,19 +41,8 @@ public class HuaweiBand4ProCoordinator extends HuaweiLECoordinator {
     }
 
     @Override
-    public boolean supports(GBDeviceCandidate candidate) {
-        try {
-            String name = candidate.getName();
-            if (name != null && (
-                        name.toLowerCase().startsWith(HuaweiConstants.HU_BAND4_NAME) ||
-                        name.toLowerCase().startsWith(HuaweiConstants.HU_BAND4PRO_NAME)
-            )) {
-                return true;
-            }
-        } catch (Exception ex) {
-            LOG.error("unable to check device support", ex);
-        }
-        return false;
+    protected Pattern getSupportedDeviceName() {
+        return Pattern.compile("(" + HuaweiConstants.HU_BAND4_NAME + "|" + HuaweiConstants.HU_BAND4PRO_NAME + ").*", Pattern.CASE_INSENSITIVE);
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband6/HuaweiBand6Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband6/HuaweiBand6Coordinator.java
index f787350ff..332f21477 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband6/HuaweiBand6Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband6/HuaweiBand6Coordinator.java
@@ -42,7 +42,7 @@ public class HuaweiBand6Coordinator extends HuaweiLECoordinator {
 
     @Override
     protected Pattern getSupportedDeviceName() {
-        return Pattern.compile(HuaweiConstants.HU_BAND6_NAME + ".*");
+        return Pattern.compile(HuaweiConstants.HU_BAND6_NAME + ".*", Pattern.CASE_INSENSITIVE);
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband7/HuaweiBand7Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband7/HuaweiBand7Coordinator.java
index 3a051679b..47874081f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband7/HuaweiBand7Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband7/HuaweiBand7Coordinator.java
@@ -42,7 +42,7 @@ public class HuaweiBand7Coordinator extends HuaweiLECoordinator {
 
     @Override
     protected Pattern getSupportedDeviceName() {
-        return Pattern.compile(HuaweiConstants.HU_BAND7_NAME + ".*");
+        return Pattern.compile(HuaweiConstants.HU_BAND7_NAME + ".*", Pattern.CASE_INSENSITIVE);
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband8/HuaweiBand8Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband8/HuaweiBand8Coordinator.java
index 3009e3208..0ced42d26 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband8/HuaweiBand8Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiband8/HuaweiBand8Coordinator.java
@@ -42,7 +42,7 @@ public class HuaweiBand8Coordinator extends HuaweiLECoordinator {
 
     @Override
     protected Pattern getSupportedDeviceName() {
-        return Pattern.compile(HuaweiConstants.HU_BAND8_NAME + ".*");
+        return Pattern.compile(HuaweiConstants.HU_BAND8_NAME + ".*", Pattern.CASE_INSENSITIVE);
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweibandaw70/HuaweiBandAw70Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweibandaw70/HuaweiBandAw70Coordinator.java
index 2b9a713eb..a8923a441 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweibandaw70/HuaweiBandAw70Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweibandaw70/HuaweiBandAw70Coordinator.java
@@ -38,7 +38,7 @@ public class HuaweiBandAw70Coordinator extends HuaweiLECoordinator {
 
     @Override
     protected Pattern getSupportedDeviceName() {
-        return Pattern.compile("(" + HuaweiConstants.HU_BAND3E_NAME + "|" + HuaweiConstants.HU_BAND4E_NAME + ").*");
+        return Pattern.compile("(" + HuaweiConstants.HU_BAND3E_NAME + "|" + HuaweiConstants.HU_BAND4E_NAME + ").*", Pattern.CASE_INSENSITIVE);
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweitalkbandb6/HuaweiTalkBandB6Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweitalkbandb6/HuaweiTalkBandB6Coordinator.java
index 9c6f7502f..3f3f4e1f3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweitalkbandb6/HuaweiTalkBandB6Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweitalkbandb6/HuaweiTalkBandB6Coordinator.java
@@ -38,7 +38,7 @@ public class HuaweiTalkBandB6Coordinator extends HuaweiBRCoordinator {
 
     @Override
     protected Pattern getSupportedDeviceName() {
-        return Pattern.compile(HuaweiConstants.HU_TALKBANDB6_NAME + ".*");
+        return Pattern.compile(HuaweiConstants.HU_TALKBANDB6_NAME + ".*", Pattern.CASE_INSENSITIVE);
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt/HuaweiWatchGTCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt/HuaweiWatchGTCoordinator.java
index 810c3890d..600565b9c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt/HuaweiWatchGTCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt/HuaweiWatchGTCoordinator.java
@@ -42,7 +42,7 @@ public class HuaweiWatchGTCoordinator extends HuaweiLECoordinator {
 
     @Override
     protected Pattern getSupportedDeviceName() {
-        return Pattern.compile(HuaweiConstants.HU_WATCHGT_NAME + ".*");
+        return Pattern.compile(HuaweiConstants.HU_WATCHGT_NAME + ".*", Pattern.CASE_INSENSITIVE);
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt2/HuaweiWatchGT2Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt2/HuaweiWatchGT2Coordinator.java
index 6192b36bb..3540a54db 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt2/HuaweiWatchGT2Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt2/HuaweiWatchGT2Coordinator.java
@@ -46,7 +46,7 @@ public class HuaweiWatchGT2Coordinator extends HuaweiBRCoordinator {
 
     @Override
     protected Pattern getSupportedDeviceName() {
-        return Pattern.compile("(" + HuaweiConstants.HU_WATCHGT2_NAME + "|" + HuaweiConstants.HU_WATCHGT2PRO_NAME + ").*");
+        return Pattern.compile("(" + HuaweiConstants.HU_WATCHGT2_NAME + "|" + HuaweiConstants.HU_WATCHGT2PRO_NAME + ").*", Pattern.CASE_INSENSITIVE);
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt2e/HuaweiWatchGT2eCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt2e/HuaweiWatchGT2eCoordinator.java
index 268c587ed..0c05cc303 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt2e/HuaweiWatchGT2eCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt2e/HuaweiWatchGT2eCoordinator.java
@@ -46,7 +46,7 @@ public class HuaweiWatchGT2eCoordinator extends HuaweiLECoordinator {
 
     @Override
     protected Pattern getSupportedDeviceName() {
-        return Pattern.compile(HuaweiConstants.HU_WATCHGT2E_NAME + ".*");
+        return Pattern.compile(HuaweiConstants.HU_WATCHGT2E_NAME + ".*", Pattern.CASE_INSENSITIVE);
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt3/HuaweiWatchGT3Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt3/HuaweiWatchGT3Coordinator.java
index fff751882..0d5e13e5f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt3/HuaweiWatchGT3Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt3/HuaweiWatchGT3Coordinator.java
@@ -42,7 +42,7 @@ public class HuaweiWatchGT3Coordinator extends HuaweiBRCoordinator {
 
     @Override
     protected Pattern getSupportedDeviceName() {
-        return Pattern.compile("(" + HuaweiConstants.HU_WATCHGT3_NAME + "|" + HuaweiConstants.HU_WATCHGT3PRO_NAME + ").*");
+        return Pattern.compile("(" + HuaweiConstants.HU_WATCHGT3_NAME + "|" + HuaweiConstants.HU_WATCHGT3PRO_NAME + ").*", Pattern.CASE_INSENSITIVE);
     }
 
     @Override

From e06b2e1f955b50371bf3a94eb825cbe33a2b4d17 Mon Sep 17 00:00:00 2001
From: opcode <luigi@sciolla.net>
Date: Thu, 11 Jan 2024 16:05:05 +0100
Subject: [PATCH 454/595] Xiaomi: Implement sleep stage parsing

This allows sleep stage detection to work by parsing
some of the data sent in SleepDetails.

It's still missing parsing the summary contained inside SleepDetails.
and decoding the large amount of other mostly unknown data.
---
 .../activity/impl/SleepDetailsParser.java     | 110 +++++++++++++++++-
 1 file changed, 108 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/SleepDetailsParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/SleepDetailsParser.java
index 17eb7217d..90f98700a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/SleepDetailsParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/SleepDetailsParser.java
@@ -16,6 +16,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl;
 
+import android.util.Log;
 import android.widget.Toast;
 
 import org.slf4j.Logger;
@@ -23,13 +24,18 @@ import org.slf4j.LoggerFactory;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
+import java.util.ArrayList;
 import java.util.List;
 
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 import nodomain.freeyourgadget.gadgetbridge.database.DBHandler;
 import nodomain.freeyourgadget.gadgetbridge.database.DBHelper;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiSleepStageSampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiSleepTimeSampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.entities.Device;
+import nodomain.freeyourgadget.gadgetbridge.entities.User;
+import nodomain.freeyourgadget.gadgetbridge.entities.XiaomiSleepStageSample;
 import nodomain.freeyourgadget.gadgetbridge.entities.XiaomiSleepTimeSample;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
@@ -60,6 +66,68 @@ public class SleepDetailsParser extends XiaomiActivityParser {
         sample.setWakeupTime(wakeupTime * 1000L);
         sample.setIsAwake(isAwake == 1);
 
+        // SleepAssistItemInfo 2x
+        //  - 0: Heart rate samples
+        //  - 1: Sp02 samples
+        for (int i = 0; i < 2; i++) {
+            final int unit = buf.getShort(); // Time unit (i.e sample rate)
+            final int count = buf.getShort();
+            final int firstRecordTime = buf.getInt();
+
+            // Skip count samples - each sample is a u8
+            //   timestamp of each sample is firstRecordTime + (unit * index)
+            buf.position(buf.position() + count);
+        }
+
+        final List<XiaomiSleepStageSample> stages = new ArrayList<>();
+
+
+        while (buf.remaining() >= 17 && buf.getInt() == 0xFFFCFAFB) {
+            final int headerLen = buf.get() & 0xFF; // this seems to always be 17
+
+            // This timestamp is kind of weird, is seems to sometimes be in seconds
+            // and other times in nanoseconds. Message types 16 and 17 are in seconds
+            final long ts = buf.getLong();
+            final int unk = buf.get() & 0xFF;
+            final int type = buf.get() & 0xFF;
+
+            final int dataLen = ((buf.get() & 0xFF) << 8) | (buf.get() & 0xFF);
+
+            final byte[] data = new byte[dataLen];
+            buf.get(data);
+
+            final ByteBuffer dataBuf = ByteBuffer.wrap(data).order(ByteOrder.BIG_ENDIAN);
+
+//            Known types:
+//             - acc_unk = 0,
+//             - ppg_unk = 1,
+//             - fall_asleep = 2,
+//             - wake_up = 3,
+//             - switch_ts_unk1 = 12,
+//             - switch_ts_unk2 = 13,
+//             - Summary = 16,
+//             - Stages = 17
+
+            if (type == 17) { // Stages
+                long currentTime = ts * 1000;
+                for (int i = 0; i < dataLen / 2; i++) {
+                    // when the change to the phase occurs
+                    final int val = dataBuf.getShort() & 0xFFFF;
+
+                    final int stage = val >> 12;
+                    final int offsetMinutes = val & 0xFFF;
+
+                    final XiaomiSleepStageSample stageSample = new XiaomiSleepStageSample();
+                    stageSample.setTimestamp(currentTime);
+                    stageSample.setStage(decodeStage(stage));
+                    stages.add(stageSample);
+
+                    currentTime += offsetMinutes * 60000;
+                }
+            }
+        }
+
+
         // save all the samples that we got
         try (DBHandler handler = GBApplication.acquireDB()) {
             final DaoSession session = handler.getDaoSession();
@@ -83,12 +151,50 @@ public class SleepDetailsParser extends XiaomiActivityParser {
             }
 
             sampleProvider.addSample(sample);
-
-            return true;
         } catch (final Exception e) {
             GB.toast(support.getContext(), "Error saving sleep sample", Toast.LENGTH_LONG, GB.ERROR);
             LOG.error("Error saving sleep sample", e);
             return false;
         }
+
+        // Save the sleep stage samples
+        try (DBHandler handler = GBApplication.acquireDB()) {
+            final DaoSession session = handler.getDaoSession();
+            final GBDevice gbDevice = support.getDevice();
+            final Device device = DBHelper.getDevice(gbDevice, session);
+            final User user = DBHelper.getUser(session);
+
+            final XiaomiSleepStageSampleProvider sampleProvider = new XiaomiSleepStageSampleProvider(gbDevice, session);
+
+            for (final XiaomiSleepStageSample stageSample : stages) {
+                stageSample.setDevice(device);
+                stageSample.setUser(user);
+            }
+
+            sampleProvider.addSamples(stages);
+        } catch (final Exception e) {
+            GB.toast(support.getContext(), "Error saving sleep stage samples", Toast.LENGTH_LONG, GB.ERROR);
+            LOG.error("Error saving sleep stage samples", e);
+            return false;
+        }
+
+        return true;
+    }
+
+    static private int decodeStage(int rawStage) {
+        switch (rawStage) {
+            case 0:
+                return 5; // AWAKE
+            case 1:
+                return 3; // LIGHT_SLEEP
+            case 2:
+                return 2; // DEEP_SLEEP
+            case 3:
+                return 4; // REM_SLEEP
+            case 4:
+                return 0; // NOT_SLEEP
+            default:
+                return 1; // N/A
+        }
     }
 }

From f5cf21bf054ce8db481a83e462b362367840c3bb Mon Sep 17 00:00:00 2001
From: opcode <luigi@sciolla.net>
Date: Thu, 11 Jan 2024 21:19:39 +0100
Subject: [PATCH 455/595] Xiaomi: Parse SleepSummary

---
 .../activity/impl/SleepDetailsParser.java     | 72 ++++++++++++++-----
 1 file changed, 55 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/SleepDetailsParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/SleepDetailsParser.java
index 90f98700a..89715fe60 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/SleepDetailsParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/SleepDetailsParser.java
@@ -56,12 +56,14 @@ public class SleepDetailsParser extends XiaomiActivityParser {
         final ByteBuffer buf = ByteBuffer.wrap(bytes).order(ByteOrder.LITTLE_ENDIAN);
         buf.get(); // header ? 0xF0
 
-        final int isAwake = buf.get() & 0xff; // 0/1
+        final int isAwake = buf.get() & 0xff; // 0/1 - more correctly this would be !isSleepFinish
         final int bedTime = buf.getInt();
         final int wakeupTime = buf.getInt();
         LOG.debug("Sleep sample: bedTime: {}, wakeupTime: {}, isAwake: {}", bedTime, wakeupTime, isAwake);
 
-        final XiaomiSleepTimeSample sample = new XiaomiSleepTimeSample();
+        final List<XiaomiSleepTimeSample> summaries = new ArrayList<>();
+
+        XiaomiSleepTimeSample sample = new XiaomiSleepTimeSample();
         sample.setTimestamp(bedTime * 1000L);
         sample.setWakeupTime(wakeupTime * 1000L);
         sample.setIsAwake(isAwake == 1);
@@ -81,7 +83,6 @@ public class SleepDetailsParser extends XiaomiActivityParser {
 
         final List<XiaomiSleepStageSample> stages = new ArrayList<>();
 
-
         while (buf.remaining() >= 17 && buf.getInt() == 0xFFFCFAFB) {
             final int headerLen = buf.get() & 0xFF; // this seems to always be 17
 
@@ -108,7 +109,40 @@ public class SleepDetailsParser extends XiaomiActivityParser {
 //             - Summary = 16,
 //             - Stages = 17
 
-            if (type == 17) { // Stages
+            if (type == 16) {
+                final int data_0 = dataBuf.get() & 0xFF;
+                final int sleep_index = data_0 >> 4;
+                final int wake_count = data_0 & 0x0F;
+
+                final int sleep_duration = dataBuf.getShort() & 0xFFFF;
+                final int wake_duration  = dataBuf.getShort() & 0xFFFF;
+                final int light_duration = dataBuf.getShort() & 0xFFFF;
+                final int rem_duration   = dataBuf.getShort() & 0xFFFF;
+                final int deep_duration  = dataBuf.getShort() & 0xFFFF;
+
+                final int data_1 = dataBuf.get() & 0xFF;
+                final boolean has_rem = (data_1 >> 4) == 1;
+                final boolean has_stage = (data_1 >> 2) == 1;
+
+                // Could probably be an "awake" duration after sleep
+                final int unk_duration_minutes = dataBuf.get() & 0xFF;
+
+                if (sample == null) {
+                    sample = new XiaomiSleepTimeSample();
+                }
+
+                sample.setTimestamp(bedTime * 1000L);
+                sample.setWakeupTime(wakeupTime * 1000L);
+                sample.setTotalDuration(sleep_duration);
+                sample.setDeepSleepDuration(deep_duration);
+                sample.setLightSleepDuration(light_duration);
+                sample.setRemSleepDuration(rem_duration);
+                sample.setAwakeDuration(wake_duration);
+
+                summaries.add(sample);
+                sample = null;
+            }
+            else if (type == 17) { // Stages
                 long currentTime = ts * 1000;
                 for (int i = 0; i < dataLen / 2; i++) {
                     // when the change to the phase occurs
@@ -133,24 +167,28 @@ public class SleepDetailsParser extends XiaomiActivityParser {
             final DaoSession session = handler.getDaoSession();
             final GBDevice gbDevice = support.getDevice();
 
-            sample.setDevice(DBHelper.getDevice(gbDevice, session));
-            sample.setUser(DBHelper.getUser(session));
-
             final XiaomiSleepTimeSampleProvider sampleProvider = new XiaomiSleepTimeSampleProvider(gbDevice, session);
 
-            // Check if there is already a later sleep sample - if so, ignore this one
-            // Samples for the same sleep will always have the same bedtime (timestamp), but we might get
-            // multiple bedtimes until the user wakes up
-            final List<XiaomiSleepTimeSample> existingSamples = sampleProvider.getAllSamples(sample.getTimestamp(), sample.getTimestamp());
-            if (!existingSamples.isEmpty()) {
-                final XiaomiSleepTimeSample existingSample = existingSamples.get(0);
-                if (existingSample.getWakeupTime() > sample.getWakeupTime()) {
-                    LOG.warn("Ignoring sleep sample - existing sample is more recent ({})", existingSample.getWakeupTime());
-                    return true;
+
+            for (final XiaomiSleepTimeSample summary : summaries) {
+                summary.setDevice(DBHelper.getDevice(gbDevice, session));
+                summary.setUser(DBHelper.getUser(session));
+
+                // Check if there is already a later sleep sample - if so, ignore this one
+                // Samples for the same sleep will always have the same bedtime (timestamp), but we might get
+                // multiple bedtimes until the user wakes up
+                final List<XiaomiSleepTimeSample> existingSamples = sampleProvider.getAllSamples(summary.getTimestamp(), summary.getTimestamp());
+                if (!existingSamples.isEmpty()) {
+                    final XiaomiSleepTimeSample existingSample = existingSamples.get(0);
+                    if (existingSample.getWakeupTime() > summary.getWakeupTime()) {
+                        LOG.warn("Ignoring sleep sample - existing sample is more recent ({})", existingSample.getWakeupTime());
+                        continue;
+                    }
                 }
+
+                sampleProvider.addSample(summary);
             }
 
-            sampleProvider.addSample(sample);
         } catch (final Exception e) {
             GB.toast(support.getContext(), "Error saving sleep sample", Toast.LENGTH_LONG, GB.ERROR);
             LOG.error("Error saving sleep sample", e);

From 0b7c53698aaeb8bc009b3427f23d44538a66a4c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sat, 13 Jan 2024 11:57:10 +0000
Subject: [PATCH 456/595] Xiaomi: Fix sleep stages extending past wakeup time

---
 .../devices/xiaomi/XiaomiSampleProvider.java  | 33 ++++++++++++-------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSampleProvider.java
index 950e8b753..b3e36aefd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSampleProvider.java
@@ -92,6 +92,12 @@ public class XiaomiSampleProvider extends AbstractSampleProvider<XiaomiActivityS
     protected List<XiaomiActivitySample> getGBActivitySamples(final int timestamp_from, final int timestamp_to, final int activityType) {
         final List<XiaomiActivitySample> samples = super.getGBActivitySamples(timestamp_from, timestamp_to, activityType);
 
+        overlaySleep(samples, timestamp_from, timestamp_to);
+
+        return samples;
+    }
+
+    public void overlaySleep(final List<XiaomiActivitySample> samples, final int timestamp_from, final int timestamp_to) {
         final RangeMap<Long, Integer> stagesMap = new RangeMap<>();
 
         final XiaomiSleepStageSampleProvider sleepStagesSampleProvider = new XiaomiSleepStageSampleProvider(getDevice(), getSession());
@@ -122,16 +128,21 @@ public class XiaomiSampleProvider extends AbstractSampleProvider<XiaomiActivityS
                 }
                 stagesMap.put(stageSample.getTimestamp(), activityKind);
             }
-        } else {
-            // Fetch bed and wakeup times and overlay as light sleep on the activity
-            final XiaomiSleepTimeSampleProvider sleepTimeSampleProvider = new XiaomiSleepTimeSampleProvider(getDevice(), getSession());
-            final List<XiaomiSleepTimeSample> sleepSamples = sleepTimeSampleProvider.getAllSamples(timestamp_from * 1000L, timestamp_to * 1000L);
-            if (!sleepSamples.isEmpty()) {
-                LOG.debug("Found {} sleep samples between {} and {}", sleepSamples.size(), timestamp_from, timestamp_to);
-                for (final XiaomiSleepTimeSample stageSample : sleepSamples) {
+        }
+
+        // Fetch bed and wakeup times as well.
+        final XiaomiSleepTimeSampleProvider sleepTimeSampleProvider = new XiaomiSleepTimeSampleProvider(getDevice(), getSession());
+        final List<XiaomiSleepTimeSample> sleepTimeSamples = sleepTimeSampleProvider.getAllSamples(timestamp_from * 1000L, timestamp_to * 1000L);
+        if (!sleepTimeSamples.isEmpty()) {
+            LOG.debug("Found {} sleep samples between {} and {}", sleepTimeSamples.size(), timestamp_from, timestamp_to);
+            for (final XiaomiSleepTimeSample stageSample : sleepTimeSamples) {
+                if (stageSamples.isEmpty()) {
+                    // Only overlay them as light sleep if we don't have actual sleep stages
                     stagesMap.put(stageSample.getTimestamp(), ActivityKind.TYPE_LIGHT_SLEEP);
-                    stagesMap.put(stageSample.getWakeupTime(), ActivityKind.TYPE_UNKNOWN);
                 }
+
+                // We need to set the wakeup times, because some bands don't report them in the stage samples (see #3502)
+                stagesMap.put(stageSample.getWakeupTime(), ActivityKind.TYPE_UNKNOWN);
             }
         }
 
@@ -141,12 +152,12 @@ public class XiaomiSampleProvider extends AbstractSampleProvider<XiaomiActivityS
             for (final XiaomiActivitySample sample : samples) {
                 final long ts = sample.getTimestamp() * 1000L;
                 final Integer sleepType = stagesMap.get(ts);
-                if (sleepType != null) {
+                if (sleepType != null && !sleepType.equals(ActivityKind.TYPE_UNKNOWN)) {
                     sample.setRawKind(sleepType);
 
                     switch (sleepType) {
                         case ActivityKind.TYPE_DEEP_SLEEP:
-                            sample.setRawIntensity(10);
+                            sample.setRawIntensity(20);
                             break;
                         case ActivityKind.TYPE_LIGHT_SLEEP:
                             sample.setRawIntensity(30);
@@ -158,7 +169,5 @@ public class XiaomiSampleProvider extends AbstractSampleProvider<XiaomiActivityS
                 }
             }
         }
-
-        return samples;
     }
 }

From ba59c62fa46d22c0db0d09571d4fca97fcfdbe06 Mon Sep 17 00:00:00 2001
From: foxstidious <foxstidious@gmail.com>
Date: Sun, 14 Jan 2024 14:41:29 -0500
Subject: [PATCH 457/595] Add support for snooze alarm on CasioGBX100 devices

---
 .../devices/casio/gbx100/CasioGBX100DeviceCoordinator.java   | 5 +++++
 .../devices/casio/gbx100/CasioGBX100DeviceSupport.java       | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/gbx100/CasioGBX100DeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/gbx100/CasioGBX100DeviceCoordinator.java
index c8da6c419..e96e2f05f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/gbx100/CasioGBX100DeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/casio/gbx100/CasioGBX100DeviceCoordinator.java
@@ -97,6 +97,11 @@ public class CasioGBX100DeviceCoordinator extends CasioDeviceCoordinator {
         return false;
     }
 
+    @Override
+    public boolean supportsAlarmSnoozing() {
+        return true;
+    }
+
     @Override
     public boolean supportsFindDevice() {
         return false;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/CasioGBX100DeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/CasioGBX100DeviceSupport.java
index 7c70d3a87..6e8263426 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/CasioGBX100DeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/gbx100/CasioGBX100DeviceSupport.java
@@ -538,6 +538,9 @@ public class CasioGBX100DeviceSupport extends Casio2C2DSupport implements Shared
             Alarm alm = alarms.get(i);
             if(alm.getEnabled()) {
                 settings[0] = 0x40;
+                if (alm.getSnooze()) {
+                    settings[0] = 0x50;
+                }
             } else {
                 settings[0] = 0;
             }

From ace704b706b0bdbeede10183fbaa0113a8e83dd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sun, 14 Jan 2024 20:31:07 +0000
Subject: [PATCH 458/595] Update changelog

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca88db951..69a49c6c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@
 * Experimental support for Honor Band 7
 * Experimental support for Redmi Watch 2 Lite
 * Experimental support for Redmi Smart Band Pro
+* Casio GBX100: Add support for snooze alarm
 * Fossil/Skagen Hybrids: Update navigationApp to 1.1
 * Huami: Fetch SpO2 on devices that support it
 * Pebble: Attempt to fix app configuration webview
@@ -33,7 +34,7 @@
 * Xiaomi: Improve activity and workout parsing
 * Xiaomi: Improve stability and fix some crashes
 * Xiaomi: Improve weather
-* Xiaomi: Parse sleep stages on some devices
+* Xiaomi: Parse sleep stages
 * Add a notifications channel for connection status notifications
 * Improve automatic connection to all or previous devices
 * Fix devices sometimes staying stuck in a "Connecting" state

From 88ad74b87ab00e419d89070609be9be8d5aded67 Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Thu, 11 Jan 2024 14:57:03 +0000
Subject: [PATCH 459/595] Translated using Weblate (Spanish)

Currently translated at 100.0% (2486 of 2486 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/es/
---
 app/src/main/res/values-es/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index e11bf3620..d0ac140de 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -2694,4 +2694,6 @@
     <string name="pref_force_smart_alarm_summary">Forzar el soporte de alarmas inteligentes.
 \nUSO BAJO SU PROPIA RESPONSABILIDAD</string>
     <string name="huawei_ignore_wakeup_status_end_description">Puede ayudar a detectar correctamente el sueño. Visible inmediatamente en la vista de actividades diarias.</string>
+    <string name="updatefirmwareoperation_updateproblem_low_battery">La batería del dispositivo está demasiado baja</string>
+    <string name="menuitem_buzzer_intensity">Intensidad del zumbador</string>
 </resources>
\ No newline at end of file

From 3ddd00bd2ef36de2a62f6732416b790a453f9ad5 Mon Sep 17 00:00:00 2001
From: Xtremo3 <a.lewicki95@gmail.com>
Date: Thu, 11 Jan 2024 16:38:11 +0000
Subject: [PATCH 460/595] Translated using Weblate (Polish)

Currently translated at 100.0% (2486 of 2486 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/pl/
---
 app/src/main/res/values-pl/strings.xml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index e7b7be160..054f256f6 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -2672,4 +2672,24 @@
     <string name="pref_force_options_summary">Niektóre urządzenia fałszywie twierdzą, że nie mają wsparcia dla pewnych funkcji. Tej opcji można użyć by włączyć je pomimo tego.
 \nKONTYNUUJ NA WŁASNE RYZYKO!
 \nPrzeczytaj wiki</string>
+    <string name="prefs_disconnect_notification_summary">Powiadomienie na urządzeniu, po rozłączeniu Bluetooth.</string>
+    <string name="pref_force_options">Wymuś opcje</string>
+    <string name="pref_do_not_disturb_not_wear">Nie przeszkadzać, gdy nie noszone</string>
+    <string name="prefs_workmode">Tryb pracy</string>
+    <string name="huawei_alarm_smart_description">Nie odznaczaj inteligentnego wybudzania.</string>
+    <string name="huawei_alarm_event_description">Nie zaznaczaj inteligentnego wybudzania.</string>
+    <string name="huawei_trusleep_summary">Monitoruj jakość snu i sposób oddychania w czasie rzeczywistym.
+\nPrzeanalizuj swoje wzorce snu i dokładnie zdiagnozuj 6 rodzajów problemów ze snem.</string>
+    <string name="pref_force_smart_alarm">Wymuś inteligentny alarm</string>
+    <string name="huawei_ignore_wakeup_status_start">Ignoruj stan rozpoczęcia wybudzania</string>
+    <string name="huawei_ignore_wakeup_status_start_description">Może pomóc w prawidłowym wykrywaniu snu. Widoczne natychmiast w widoku codziennych aktywności.</string>
+    <string name="huawei_ignore_wakeup_status_end">Ignoruj stan zakończenia wybudzania</string>
+    <string name="huawei_ignore_wakeup_status_end_description">Może pomóc w prawidłowym wykrywaniu snu. Widoczne natychmiast w widoku codziennych aktywności.</string>
+    <string name="huawei_reparse_workout_data">Przeanalizuj ponownie dane treningu</string>
+    <string name="pref_force_smart_alarm_summary">Wymuś obsługę inteligentnych alarmów.
+\nUŻYWAJ NA WŁASNE RYZYKO</string>
+    <string name="pref_force_wear_location">Wymuś lokalizację zużycia</string>
+    <string name="pref_force_wear_location_summary">Wymuszone wsparcie lokalizacji zużycia.
+\nUŻYWAJ NA WŁASNE RYZYKO</string>
+    <string name="menuitem_buzzer_intensity">Intensywność brzęczyka</string>
 </resources>
\ No newline at end of file

From 26243daaf64f254ab17ed92bb297bca29853d3ba Mon Sep 17 00:00:00 2001
From: Gregory Blanco <qartez@protonmail.com>
Date: Thu, 11 Jan 2024 15:38:09 +0000
Subject: [PATCH 461/595] Translated using Weblate (Polish)

Currently translated at 100.0% (2486 of 2486 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/pl/
---
 app/src/main/res/values-pl/strings.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 054f256f6..0e6e20dd6 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -2692,4 +2692,15 @@
     <string name="pref_force_wear_location_summary">Wymuszone wsparcie lokalizacji zużycia.
 \nUŻYWAJ NA WŁASNE RYZYKO</string>
     <string name="menuitem_buzzer_intensity">Intensywność brzęczyka</string>
+    <string name="do_not_disturb_lift_wrist_summary">Jedynie gdy jest włączona opcja: podnieś, aby wybudzić ekran</string>
+    <string name="pref_enable_call_accept_summary">Włącz odbieranie połączeń z poziomu urządzenia</string>
+    <string name="pref_enable_call_accept">Włącz odbieranie połączeń</string>
+    <string name="pref_enable_call_reject">Włącz odrzucanie połączeń</string>
+    <string name="pref_enable_call_reject_summary">Włącz odrzucanie połączeń z poziomu urządzenia</string>
+    <string name="pref_heartrate_automatic_enable">Włącz automatyczny pomiar tętna</string>
+    <string name="pref_disable_find_phone_with_dnd">Wylącz funkcję Znajdź mój telefon, gdy tryb Nie przeszkadzać jest włączony</string>
+    <string name="pref_force_dnd_support_summary">Wymuś tryb Nie Przeszkadzać.
+\nKONTYNUUJ NA WŁASNE RYZYKO!</string>
+    <string name="pref_force_dnd_support">Wymuś wspacie dla trybu Nie przeszkadzać</string>
+    <string name="huawei_trusleep_summary_light">Poprawione monitorowanie snu</string>
 </resources>
\ No newline at end of file

From 019eca684382631040d6400c25e6884c8f81b7d0 Mon Sep 17 00:00:00 2001
From: 0que <0que@users.noreply.hosted.weblate.org>
Date: Thu, 11 Jan 2024 05:21:58 +0000
Subject: [PATCH 462/595] Translated using Weblate (Russian)

Currently translated at 99.5% (2474 of 2486 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ru/
---
 app/src/main/res/values-ru/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 51900466d..9d3b53ec5 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -2694,4 +2694,5 @@
     <string name="huawei_reparse_workout_data_description">Эта опция повлияет на что-то после некоторых обновлений</string>
     <string name="pref_summary_general_reconnectonlytoconnected">Переподключаться только к подключенным устройствам, а не ко всем подряд</string>
     <string name="updatefirmwareoperation_updateproblem_low_battery">Заряд батареи слишком низок</string>
+    <string name="menuitem_buzzer_intensity">Мощность звукоизлучателя</string>
 </resources>
\ No newline at end of file

From c6ab0fc2f6aab7b3ae3867f13e2ec0c3fea4971b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B0=91=E4=B8=BE?= <oshirisu.red@gmail.com>
Date: Thu, 11 Jan 2024 01:22:42 +0000
Subject: [PATCH 463/595] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (2486 of 2486 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/zh_Hans/
---
 app/src/main/res/values-zh-rCN/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index c75f75e2f..44e841a4c 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -2693,4 +2693,5 @@
     <string name="pref_title_general_reconnectonlytoconnected">仅重新连接到已连接的设备</string>
     <string name="pref_summary_general_reconnectonlytoconnected">仅重新连接到已连接的设备，而不是重新连接到所有设备</string>
     <string name="updatefirmwareoperation_updateproblem_low_battery">设备电池电量过低</string>
+    <string name="menuitem_buzzer_intensity">蜂鸣器强度</string>
 </resources>
\ No newline at end of file

From 37f342dae2e3523297f6804ebeccfcfd0944627a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81cs=20Zolt=C3=A1n?= <acszoltan111@gmail.com>
Date: Sat, 13 Jan 2024 11:45:00 +0000
Subject: [PATCH 464/595] Translated using Weblate (Hungarian)

Currently translated at 54.8% (1363 of 2486 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/hu/
---
 app/src/main/res/values-hu/strings.xml | 59 ++++++++++++++++++++------
 1 file changed, 47 insertions(+), 12 deletions(-)

diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 5b7466fe4..d63fe32cd 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -267,7 +267,7 @@
     <string name="miband_fwinstaller_compatible_version">Kompatibilis verzió</string>
     <string name="miband_fwinstaller_untested_version">Nem tesztelt verzió!</string>
     <string name="fwappinstaller_connection_state">Kapcsolódás az eszközhöz: %1$s</string>
-    <string name="pbw_installhandler_pebble_firmware">Pebble Firmware %1$s</string>
+    <string name="pbw_installhandler_pebble_firmware">Pebble firmware %1$s</string>
     <string name="pbwinstallhandler_correct_hw_revision">Helyes hardververzió</string>
     <string name="pbwinstallhandler_incorrect_hw_revision">Hardververzió eltérés!</string>
     <string name="pbwinstallhandler_app_item">%1$s (%2$s)</string>
@@ -345,7 +345,7 @@
     <string name="charts_legend_heartrate">Pulzus</string>
     <string name="live_activity_heart_rate">Pulzus</string>
     <string name="pref_title_pebble_health_store_raw">Nyers adatok tárolása az adatbázisban</string>
-    <string name="pref_summary_pebble_health_store_raw">Ha bejelölöd, az adatok eredeti formában lesznek tárolva későbbi értelmezéshez. Megj.: az adatbázis ebben az esetben nagyobb lesz!</string>
+    <string name="pref_summary_pebble_health_store_raw">Az adatokat eredeti formában tárolja, növelve az adatbázishasználatot a későbbi feldolgozás lehetővé tétele érdekében.</string>
     <string name="action_db_management">Adatkezelés</string>
     <string name="title_activity_db_management">Adatkezelés</string>
     <string name="activity_db_management_import_export_explanation">Az exportálás/importálás műveletek a következő könyvtár útvonalát (lásd lentebb) használják az eszközén. Ez a könyvtár elérhető más Android alkalmazások és a számítógépe számára. Jegyezze meg, hogy ez a könyvár és az összes tartalmazott fájl törölve lesz, ha eltávolítja a Gadgetbridge-et. Az adatok tartalmazzák:
@@ -652,7 +652,7 @@
     <string name="quick_alarm">Gyors ébresztés</string>
     <string name="sony_automatic_power_off_1_hour">1 óra</string>
     <string name="activity_prefs_goal_fat_burn_time_minutes">Napi cél: zsírégetés ideje percben</string>
-    <string name="title_activity_controlcenter_main_nightly">Gadgetbridge Nightly</string>
+    <string name="title_activity_controlcenter_main_nightly">Gadgetbridge nightly</string>
     <string name="sony_automatic_power_off_5_min">5 perc</string>
     <string name="sony_speak_to_chat_sensitivity_auto">Automatikus</string>
     <string name="reminder_time_every_day">%1$s, minden nap</string>
@@ -665,7 +665,7 @@
     <string name="pref_workout_keep_screen_on_title">Képernyő bekapcsolva tartása edzés közben</string>
     <string name="activity_summary_yesterday">Tegnap</string>
     <string name="devicetype_miband3">Mi Band 3</string>
-    <string name="title_activity_controlcenter_main_nopebble">Gadgetbridge Nightly Pebble nélkül</string>
+    <string name="title_activity_controlcenter_main_nopebble">Gadgetbridge nightly Pebble nélkül</string>
     <string name="pref_workout_send_gps_title">GPS küldése edzés közben</string>
     <string name="menuitem_total_workout">Összes edzés</string>
     <string name="sony_equalizer_band_6300">6.3k</string>
@@ -673,7 +673,7 @@
     <string name="appwidget_sleep_alarm_widget_label">Ébresztés</string>
     <string name="menuitem_workout">Edzés</string>
     <string name="pref_show_changelog_summary">A Gadgetbridge frissítése utáni változásnapló megjelenítése az utolsó verzió óta</string>
-    <string name="about_activity_title_main_nopebble">About Gadgetbridge Nightly Pebble nélkül névjegye</string>
+    <string name="about_activity_title_main_nopebble">Gadgetbridge nightly Pebble nélkül névjegye</string>
     <string name="activity_prefs_goal_standing_time_minutes">Napi cél: állási idő percben</string>
     <string name="automatic">Automatikus</string>
     <string name="title_activity_LenovoWatch_calibration">Watch X Plus kalibráció</string>
@@ -690,13 +690,13 @@
         <item quantity="one">%d óra</item>
         <item quantity="other">%d óra</item>
     </plurals>
-    <string name="about_activity_title_main_nightly">Gadgetbridge Nightly névjegye</string>
+    <string name="about_activity_title_main_nightly">Gadgetbridge nightly névjegye</string>
     <string name="single_band">Egy karkötő</string>
     <string name="menuitem_last_workout">Utolsó edzés</string>
     <string name="pref_show_changelog">Változásnapló megjelenítése induláskor</string>
     <string name="pref_title_device_spec_settings_show_raw_graph">NYERS adatok megjelenítése az aktivitásgrafikonon</string>
     <string name="changelog_title">Újdonságok</string>
-    <string name="about_activity_title_banglejs_nightly">Bangle.js Gadgetbridge (Nightly) névjegye</string>
+    <string name="about_activity_title_banglejs_nightly">Bangle.js Gadgetbridge (nightly) névjegye</string>
     <string name="sony_automatic_power_off_3_hour">3 óra</string>
     <string name="activity_prefs_alarm_min_heart_rate">Minimum pulzus</string>
     <string name="yesterdays_activity">Tegnapi aktivitás</string>
@@ -709,7 +709,7 @@
     <string name="activity_prefs_distance_meters">Napi cél: távolság méterben</string>
     <string name="steps_streaks_total_steps_average_hint">Összesen %d lépés naponta</string>
     <string name="pref_workout_detection_ask_first">Kérdezzen először</string>
-    <string name="title_activity_controlcenter_banglejs_nightly">Bangle.js Gadgetbridge (Nightly)</string>
+    <string name="title_activity_controlcenter_banglejs_nightly">Bangle.js Gadgetbridge (nightly)</string>
     <string name="sony_equalizer_band_1000">1k</string>
     <string name="pref_workout_detection_enabled">Észlelés engedélyezése</string>
     <string name="devicetype_amazfit_band5">Amazfit Band 5</string>
@@ -1081,8 +1081,8 @@
     <string name="speed_first">Sebesség először</string>
     <string name="devicetype_um25">UM-25</string>
     <string name="devicetype_bfh16">BFH-16</string>
-    <string name="application_name_banglejs_nightly">Bangle.js Gadgetbridge (Nightly)</string>
-    <string name="application_name_main_nightly">Gadgetbridge (Nightly)</string>
+    <string name="application_name_banglejs_nightly">Bangle.js Gadgetbridge (nightly)</string>
+    <string name="application_name_main_nightly">Gadgetbridge (nightly)</string>
     <string name="Steps">Lépések</string>
     <string name="activity_type_climbing">Mászás</string>
     <string name="activity_list_summary_distance">Távolság</string>
@@ -1255,7 +1255,7 @@
     <string name="qhybrid_calibration_1_step">1 lépés</string>
     <string name="appmanager_download_started">Az alkalmazás letöltése elindult</string>
     <string name="power_saving">Energiatakarékos</string>
-    <string name="gadgetbridge_running_banglejs_main">Bangle.js jelenleg fut</string>
+    <string name="gadgetbridge_running_banglejs_main">A Bangle.js fut</string>
     <string name="debugactivity_confirm_remove_device_preferences">Ez a művelet az összes kapcsolódott eszköz beállítását alap helyzetbe helyezi. Biztos benne?</string>
     <string name="gps_gnolass">GPS + GLONASS</string>
     <string name="gps_bds">GPS + BDS</string>
@@ -1379,5 +1379,40 @@
     <string name="prefs_wena3_vibration_strength_item_strong">Erős</string>
     <string name="prefs_wena3_vibration_triple">Háromszor</string>
     <string name="pref_explanation_authkey">Néhány eszköznek szüksége van egy különleges párosítási kulcsra az első alkalommal. Koppintson ide a további részletekért a wikiben.</string>
-    <string name="about_description_banglejs_main"></string>
+    <string name="about_description_banglejs_main">Android társalkalmazás a Bangle.js számára, amely a Gadgetbridge projektre épül, hozzáadott internet-hozzáféréssel.
+\n
+\nA Google Play Áruház szabályzata miatt nem lehet az adományozási link magában az alkalmazásban, de ha tetszik az alkalmazás, kérjük, fontolja meg az adományozást az alábbi Gadgetbridge honlapon keresztül.</string>
+    <string name="sony_quick_access_triple_tap">Gyors elérés (három érintés)</string>
+    <string name="devicetype_sony_wh_1000xm2">Sony WH-1000XM2</string>
+    <string name="gadgetbridge_running_main_nightly">A nightly GB fut</string>
+    <string name="application_name_main_nopebble">Gadgetbridge (nightly, Pebble szolgáltató nélkül)</string>
+    <string name="gadgetbridge_running_main_nopebble">a nightly Pebble nélküli GB fut</string>
+    <string name="activity_type_indoor_cycling">Beltéri kerékpározás</string>
+    <string name="devicetype_sony_wh_1000xm5">Sony WH-1000XM5</string>
+    <string name="gadgetbridge_running_banglejs_nightly">A nightly Bangle.js fut</string>
+    <string name="activity_type_indoor_fitness">Beltéri fitnesz</string>
+    <string name="sony_anc_optimizer_status_not_running">Nem fut</string>
+    <string name="pref_activity_recognize_walking">séta felismerése</string>
+    <string name="pref_activity_recognize_rowing">evezés felismerése</string>
+    <string name="activity_type_indoor_ice_skating">Beltéri jégkorcsolyázás</string>
+    <string name="activity_type_iceskating">Jégkorcsolyázás</string>
+    <string name="devicetype_sony_linkbuds_s">Sony LinkBuds S</string>
+    <string name="activity_type_indoor_walking">Beltéri séta</string>
+    <string name="sony_quick_access_double_tap">Gyors elérés (kettő érintés)</string>
+    <string name="devicetype_sony_wf_1000xm4">Sony WF-1000XM4</string>
+    <string name="devicetype_sony_wf_1000xm5">Sony WF-1000XM5</string>
+    <string name="menuitem_running">Futás</string>
+    <string name="pref_activity_recognize_biking">kerékpározás felismerése</string>
+    <string name="wearmode_pebble">Pebble (cipőcsat)</string>
+    <string name="pref_summary_pebble_gatt_clientonly">Ez csak a Pebble 2 számára van, és kísérleti, próbálja ezt, ha kapcsolódási problémái vannak</string>
+    <string name="pref_activity_recognize_running">futás felismerése</string>
+    <string name="about_description_banglejs_nightly">Android társalkalmazás a Bangle.js számára, amely a Gadgetbridge projektre épül, hozzáadott internet-hozzáféréssel.
+\n
+\nA Google Play Áruház szabályzata miatt nem lehet az adományozási link magában az alkalmazásban, de ha tetszik az alkalmazás, kérjük, fontolja meg az adományozást az alábbi Gadgetbridge honlapon keresztül.</string>
+    <string name="activity_type_outdoor_running">Kültéri futás</string>
+    <string name="_pebble_watch_open_on_phone">Megnyitás Android eszközön</string>
+    <string name="activity_type_outdoor_cycling">Kültéri kerékpározás</string>
+    <string name="pref_title_pebble_enable_bgjs">Háttérbeli JS engedélyezése</string>
+    <string name="devicetype_sony_wena3">Sony Wena 3</string>
+    <string name="sony_surround_mode_outdoor_stage">Kültéri színpad</string>
 </resources>
\ No newline at end of file

From aae820a6e770b00812469e529fb2dc2dd3f5ec2c Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Sun, 14 Jan 2024 22:42:05 +0100
Subject: [PATCH 465/595] make changelog smaller, bump version

---
 CHANGELOG.md     | 18 ++++--------------
 app/build.gradle |  4 ++--
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69a49c6c1..46c76c4d3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,20 +1,10 @@
 ### Changelog
 
-#### Next version (WIP)
-
-* Initial support for Honor Band 3
-* Initial support for Honor Band 4
-* Initial support for Honor Band 5
-* Initial support for Honor Band 6
-* Initial support for Huawei Band 4
-* Initial support for Huawei Band 4 Pro
-* Initial support for Huawei Band 6
-* Initial support for Huawei Band 7
-* Initial support for Huawei Band 3e
-* Initial support for Huawei Band 4e
+#### 0.78.0
+* Initial support for Honor Band 3,4,5,6
+* Initial support for Huawei Band 4, 4 Pro, 6, 7, 3e, 4e
 * Initial support for Huawei Talk Band B6
-* Initial support for Huawei Watch GT
-* Initial support for Huawei Watch GT 2
+* Initial support for Huawei Watch GT, GT 2
 * Initial support for Mijia LYWSD03MMC
 * Initial support for Nothing Ear (2)
 * Initial support for Nothing Ear (Stick)
diff --git a/app/build.gradle b/app/build.gradle
index 354dd25cd..c136090b8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -87,8 +87,8 @@ android {
         targetSdkVersion 33
 
         // Note: always bump BOTH versionCode and versionName!
-        versionName "0.77.0"
-        versionCode 227
+        versionName "0.78.0"
+        versionCode 228
         vectorDrawables.useSupportLibrary = true
         buildConfigField "String", "GIT_HASH_SHORT", "\"${getGitHashShort()}\""
         buildConfigField "boolean", "INTERNET_ACCESS", "false"

From baaee8f589b508f76a6ca7ceeab13feb0339900d Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Sun, 14 Jan 2024 22:55:22 +0100
Subject: [PATCH 466/595] update fastland and xml changelog

---
 app/src/main/res/xml/changelog_master.xml     | 30 +++++++++++++++++++
 .../metadata/android/en-US/changelogs/228.txt | 28 +++++++++++++++++
 2 files changed, 58 insertions(+)
 create mode 100644 src/main/fastlane/metadata/android/en-US/changelogs/228.txt

diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
index 1acf028d2..62ea1ad0b 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -1,5 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
+    <release version="0.78.0" versioncode="228">
+        <change>Initial support for Honor Band 3,4,5,6</change>
+        <change>Initial support for Huawei Band 4, 4 Pro, 6, 7, 3e, 4e</change>
+        <change>Initial support for Huawei Talk Band B6</change>
+        <change>Initial support for Huawei Watch GT, GT 2</change>
+        <change>Initial support for Mijia LYWSD03MMC</change>
+        <change>Initial support for Nothing Ear (2)</change>
+        <change>Initial support for Nothing Ear (Stick)</change>
+        <change>Experimental support for Honor Band 7</change>
+        <change>Experimental support for Redmi Watch 2 Lite</change>
+        <change>Experimental support for Redmi Smart Band Pro</change>
+        <change>Casio GBX100: Add support for snooze alarm</change>
+        <change>Fossil/Skagen Hybrids: Update navigationApp to 1.1</change>
+        <change>Huami: Fetch SpO2 on devices that support it</change>
+        <change>Pebble: Attempt to fix app configuration webview</change>
+        <change>PineTime: Add support for InfiniTime's new simple weather</change>
+        <change>PineTime: Fix freeze and reboot when upgrading firmware</change>
+        <change>Pixoo: Enable sending images (non-persistent)</change>
+        <change>Pixoo: Get and send alarms</change>
+        <change>Pixoo: Set custom device name</change>
+        <change>Pixoo: support "clap hands to turn off screen" and "sleep after silence" settings</change>
+        <change>Xiaomi: Improve activity and workout parsing</change>
+        <change>Xiaomi: Improve stability and fix some crashes</change>
+        <change>Xiaomi: Improve weather</change>
+        <change>Xiaomi: Parse sleep stages</change>
+        <change>Add a notifications channel for connection status notifications</change>
+        <change>Improve automatic connection to all or previous devices</change>
+        <change>Fix devices sometimes staying stuck in a "Connecting" state</change>
+        <change>Map some missing Google Maps navigation actions</change>
+    </release>
     <release version="0.77.0" versioncode="227">
         <change>Initial support for Amazfit Balance</change>
         <change>Initial support for Amazfit Active</change>
diff --git a/src/main/fastlane/metadata/android/en-US/changelogs/228.txt b/src/main/fastlane/metadata/android/en-US/changelogs/228.txt
new file mode 100644
index 000000000..d818f9535
--- /dev/null
+++ b/src/main/fastlane/metadata/android/en-US/changelogs/228.txt
@@ -0,0 +1,28 @@
+* Initial support for Honor Band 3,4,5,6
+* Initial support for Huawei Band 4, 4 Pro, 6, 7, 3e, 4e
+* Initial support for Huawei Talk Band B6
+* Initial support for Huawei Watch GT, GT 2
+* Initial support for Mijia LYWSD03MMC
+* Initial support for Nothing Ear (2)
+* Initial support for Nothing Ear (Stick)
+* Experimental support for Honor Band 7
+* Experimental support for Redmi Watch 2 Lite
+* Experimental support for Redmi Smart Band Pro
+* Casio GBX100: Add support for snooze alarm
+* Fossil/Skagen Hybrids: Update navigationApp to 1.1
+* Huami: Fetch SpO2 on devices that support it
+* Pebble: Attempt to fix app configuration webview
+* PineTime: Add support for InfiniTime's new simple weather
+* PineTime: Fix freeze and reboot when upgrading firmware
+* Pixoo: Enable sending images (non-persistent)
+* Pixoo: Get and send alarms
+* Pixoo: Set custom device name
+* Pixoo: support "clap hands to turn off screen" and "sleep after silence" settings
+* Xiaomi: Improve activity and workout parsing
+* Xiaomi: Improve stability and fix some crashes
+* Xiaomi: Improve weather
+* Xiaomi: Parse sleep stages
+* Add a notifications channel for connection status notifications
+* Improve automatic connection to all or previous devices
+* Fix devices sometimes staying stuck in a "Connecting" state
+* Map some missing Google Maps navigation actions

From 3a2b02df2af618337875383cac5b0575f83b99c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Mon, 15 Jan 2024 21:27:01 +0000
Subject: [PATCH 467/595] Zepp OS: Query supported services and encryption flag

---
 .../devices/huami/Huami2021Support.java       | 80 ++++++++++++++-----
 .../huami/zeppos/AbstractZeppOsService.java   | 30 ++++++-
 .../zeppos/services/ZeppOsAgpsService.java    |  7 +-
 .../zeppos/services/ZeppOsAlarmsService.java  |  7 +-
 .../zeppos/services/ZeppOsAlexaService.java   |  7 +-
 .../zeppos/services/ZeppOsAppsService.java    |  7 +-
 .../services/ZeppOsCalendarService.java       |  7 +-
 .../services/ZeppOsCannedMessagesService.java |  7 +-
 .../zeppos/services/ZeppOsConfigService.java  |  7 +-
 .../services/ZeppOsContactsService.java       |  7 +-
 .../services/ZeppOsDisplayItemsService.java   |  7 +-
 .../services/ZeppOsFileTransferService.java   |  7 +-
 .../services/ZeppOsFtpServerService.java      |  7 +-
 .../zeppos/services/ZeppOsHttpService.java    |  7 +-
 .../zeppos/services/ZeppOsLogsService.java    |  7 +-
 .../services/ZeppOsLoyaltyCardService.java    |  7 +-
 .../services/ZeppOsMorningUpdatesService.java |  7 +-
 .../zeppos/services/ZeppOsMusicService.java   |  7 +-
 .../services/ZeppOsNotificationService.java   |  7 +-
 .../zeppos/services/ZeppOsPhoneService.java   |  7 +-
 .../services/ZeppOsRemindersService.java      |  7 +-
 .../services/ZeppOsServicesService.java       | 37 +++------
 .../services/ZeppOsShortcutCardsService.java  |  7 +-
 .../services/ZeppOsWatchfaceService.java      |  7 +-
 .../zeppos/services/ZeppOsWifiService.java    |  7 +-
 25 files changed, 118 insertions(+), 183 deletions(-)

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 d0f0fcdb2..33838573d 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
@@ -43,6 +43,8 @@ import android.net.Uri;
 import android.os.Handler;
 import android.widget.Toast;
 
+import androidx.annotation.Nullable;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -57,10 +59,12 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
@@ -170,6 +174,7 @@ public abstract class Huami2021Support extends HuamiSupport implements ZeppOsFil
     private final ZeppOsLoyaltyCardService loyaltyCardService = new ZeppOsLoyaltyCardService(this);
     private final ZeppOsMusicService musicService = new ZeppOsMusicService(this);
 
+    private final Set<Short> mSupportedServices = new HashSet<>();
     private final Map<Short, AbstractZeppOsService> mServiceMap = new LinkedHashMap<Short, AbstractZeppOsService>() {{
         put(servicesService.getEndpoint(), servicesService);
         put(fileTransferService.getEndpoint(), fileTransferService);
@@ -967,33 +972,69 @@ public abstract class Huami2021Support extends HuamiSupport implements ZeppOsFil
 
     @Override
     public void phase3Initialize(final TransactionBuilder builder) {
+        LOG.info("2021 phase3Initialize...");
+
         // Make sure that performInitialized is not called accidentally in here
         // (eg. by creating a new TransactionBuilder).
         // In those cases, the device will be initialized twice, which will change the shared
-        // session key during these phase3 requests and decrypting messages will fail
+        // session key during these requests and decrypting messages will fail
 
-        final Huami2021Coordinator coordinator = getCoordinator();
+        // In here, we only request the list of supported services - they will all be initialized in
+        // initializeServices below
+        mSupportedServices.clear();
+        servicesService.requestServices(builder);
+    }
 
-        LOG.info("2021 phase3Initialize...");
-        setUserInfo(builder);
+    public void addSupportedService(final short endpoint) {
+        mSupportedServices.add(endpoint);
+    }
 
-        for (final HuamiVibrationPatternNotificationType type : coordinator.getVibrationPatternNotificationTypes(gbDevice)) {
-            // FIXME: Can we read these from the band?
-            final String typeKey = type.name().toLowerCase(Locale.ROOT);
-            setVibrationPattern(builder, HuamiConst.PREF_HUAMI_VIBRATION_PROFILE_PREFIX + typeKey);
+    public void initializeServices() {
+        LOG.info("2021 initializeServices...");
+
+        try {
+            final TransactionBuilder builder = createTransactionBuilder("initialize services");
+
+            // 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();
+
+            // TODO move this to a service
+            setUserInfo(builder);
+
+            // TODO move this to a service
+            for (final HuamiVibrationPatternNotificationType type : coordinator.getVibrationPatternNotificationTypes(gbDevice)) {
+                // FIXME: Can we read these from the band?
+                final String typeKey = type.name().toLowerCase(Locale.ROOT);
+                setVibrationPattern(builder, HuamiConst.PREF_HUAMI_VIBRATION_PROFILE_PREFIX + typeKey);
+            }
+
+            // TODO move these to a service
+            cannedMessagesService.requestCannedMessages(builder);
+            alarmsService.requestAlarms(builder);
+
+            for (AbstractZeppOsService service : mServiceMap.values()) {
+                if (mSupportedServices.contains(service.getEndpoint())) {
+                    // Only initialize supported services
+                    service.initialize(builder);
+                }
+            }
+
+            if (coordinator.supportsBluetoothPhoneCalls(gbDevice)) {
+                phoneService.requestCapabilities(builder);
+                phoneService.requestEnabled(builder);
+            }
+
+            builder.queue(getQueue());
+        } catch (Exception e) {
+            LOG.error("failed initializing device", e);
         }
+    }
 
-        cannedMessagesService.requestCannedMessages(builder);
-        alarmsService.requestAlarms(builder);
-
-        for (AbstractZeppOsService service : mServiceMap.values()) {
-            service.initialize(builder);
-        }
-
-        if (coordinator.supportsBluetoothPhoneCalls(gbDevice)) {
-            phoneService.requestCapabilities(builder);
-            phoneService.requestEnabled(builder);
-        }
+    @Nullable
+    public AbstractZeppOsService getService(final short endpoint) {
+        return mServiceMap.get(endpoint);
     }
 
     @Override
@@ -1099,6 +1140,7 @@ public abstract class Huami2021Support extends HuamiSupport implements ZeppOsFil
             return;
         }
 
+        // TODO: Move these services to dedicated classes, so they get the encryption correctly
         switch (type) {
             case CHUNKED2021_ENDPOINT_AUTH:
                 LOG.warn("Unexpected auth payload {}", GB.hexdump(payload));
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 2ea00c7d0..1b4780f55 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
@@ -18,25 +18,44 @@ package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos;
 
 import android.content.Context;
 
+import androidx.annotation.Nullable;
+
+import org.slf4j.Logger;
+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.service.btle.TransactionBuilder;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.Huami2021Support;
-import nodomain.freeyourgadget.gadgetbridge.util.DeviceHelper;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services.ZeppOsAlexaService;
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 
 public abstract class AbstractZeppOsService {
-    private final Huami2021Support mSupport;
+    private static final Logger LOG = LoggerFactory.getLogger(ZeppOsAlexaService.class);
 
-    public AbstractZeppOsService(final Huami2021Support support) {
+    private final Huami2021Support mSupport;
+    private boolean encrypted;
+
+    public AbstractZeppOsService(final Huami2021Support support, final boolean encryptedDefault) {
         this.mSupport = support;
+        this.encrypted = encryptedDefault;
     }
 
     public abstract short getEndpoint();
 
-    public abstract boolean isEncrypted();
+    public final boolean isEncrypted() {
+        return this.encrypted;
+    }
+
+    public final void setEncrypted(final boolean encrypted) {
+        if (encrypted != this.encrypted) {
+            LOG.warn("Replacing encrypted flag for {}, {} -> {}", this.getClass().getSimpleName(), this.encrypted, encrypted);
+        }
+
+        this.encrypted = encrypted;
+    }
 
     public abstract void handlePayload(final byte[] payload);
 
@@ -52,6 +71,8 @@ public abstract class AbstractZeppOsService {
 
     public void initialize(final TransactionBuilder builder) {
         // Do nothing by default
+        // TODO implement a "quick initialize" that runs for the same firmware + Gb versions, since
+        // we will already know the capabilities
     }
 
     protected Huami2021Support getSupport() {
@@ -91,6 +112,7 @@ public abstract class AbstractZeppOsService {
         return getSupport().getContext();
     }
 
+    @Nullable
     protected static Boolean booleanFromByte(final byte b) {
         switch (b) {
             case 0x00:
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAgpsService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAgpsService.java
index 4938c9efb..86aa27b5c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAgpsService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAgpsService.java
@@ -42,7 +42,7 @@ public class ZeppOsAgpsService extends AbstractZeppOsService {
     private Callback mCallback = null;
 
     public ZeppOsAgpsService(final Huami2021Support support) {
-        super(support);
+        super(support, false);
     }
 
     @Override
@@ -50,11 +50,6 @@ public class ZeppOsAgpsService extends AbstractZeppOsService {
         return ENDPOINT;
     }
 
-    @Override
-    public boolean isEncrypted() {
-        return false;
-    }
-
     @Override
     public void handlePayload(final byte[] payload) {
         switch (payload[0]) {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAlarmsService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAlarmsService.java
index 8a1fe912c..fca35ec6b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAlarmsService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAlarmsService.java
@@ -66,7 +66,7 @@ public class ZeppOsAlarmsService extends AbstractZeppOsService {
     public static final int FLAG_ENABLED = 0x04;
 
     public ZeppOsAlarmsService(final Huami2021Support support) {
-        super(support);
+        super(support, false);
     }
 
     @Override
@@ -74,11 +74,6 @@ public class ZeppOsAlarmsService extends AbstractZeppOsService {
         return ENDPOINT;
     }
 
-    @Override
-    public boolean isEncrypted() {
-        return false;
-    }
-
     @Override
     public void handlePayload(final byte[] payload) {
         switch (payload[0]) {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAlexaService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAlexaService.java
index 209bc3304..9d674a87d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAlexaService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAlexaService.java
@@ -83,7 +83,7 @@ public class ZeppOsAlexaService extends AbstractZeppOsService {
     final ByteArrayOutputStream voiceBuffer = new ByteArrayOutputStream();
 
     public ZeppOsAlexaService(final Huami2021Support support) {
-        super(support);
+        super(support, true);
     }
 
     @Override
@@ -91,11 +91,6 @@ public class ZeppOsAlexaService extends AbstractZeppOsService {
         return ENDPOINT;
     }
 
-    @Override
-    public boolean isEncrypted() {
-        return true;
-    }
-
     @Override
     public void handlePayload(final byte[] payload) {
         switch (payload[0]) {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAppsService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAppsService.java
index c017bd544..c81c68431 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAppsService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAppsService.java
@@ -55,7 +55,7 @@ public class ZeppOsAppsService extends AbstractZeppOsService {
     private final List<GBDeviceApp> apps = new ArrayList<>();
 
     public ZeppOsAppsService(final Huami2021Support support) {
-        super(support);
+        super(support, false);
     }
 
     @Override
@@ -63,11 +63,6 @@ public class ZeppOsAppsService extends AbstractZeppOsService {
         return ENDPOINT;
     }
 
-    @Override
-    public boolean isEncrypted() {
-        return false;
-    }
-
     @Override
     public void handlePayload(final byte[] payload) {
         switch (payload[0]) {
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 4aa035ef7..00dfd1637 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
@@ -50,7 +50,7 @@ public class ZeppOsCalendarService extends AbstractZeppOsService {
     private int version = -1;
 
     public ZeppOsCalendarService(final Huami2021Support support) {
-        super(support);
+        super(support, false);
     }
 
     @Override
@@ -58,11 +58,6 @@ public class ZeppOsCalendarService extends AbstractZeppOsService {
         return ENDPOINT;
     }
 
-    @Override
-    public boolean isEncrypted() {
-        return false;
-    }
-
     @Override
     public void initialize(final TransactionBuilder builder) {
         requestCapabilities(builder);
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 81ab60e21..ff765cb37 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
@@ -59,7 +59,7 @@ public class ZeppOsCannedMessagesService extends AbstractZeppOsService {
     public static final byte CMD_REPLY_SMS_ALLOW = 0x0e;
 
     public ZeppOsCannedMessagesService(final Huami2021Support support) {
-        super(support);
+        super(support, false);
     }
 
     @Override
@@ -67,11 +67,6 @@ public class ZeppOsCannedMessagesService extends AbstractZeppOsService {
         return ENDPOINT;
     }
 
-    @Override
-    public boolean isEncrypted() {
-        return false;
-    }
-
     @Override
     public void handlePayload(final byte[] payload) {
         switch (payload[0]) {
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 08a7a8ead..b338d9784 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
@@ -97,7 +97,7 @@ public class ZeppOsConfigService extends AbstractZeppOsService {
     private final Map<ConfigGroup, Byte> mGroupVersions = new HashMap<>();
 
     public ZeppOsConfigService(final Huami2021Support support) {
-        super(support);
+        super(support, true);
     }
 
     @Override
@@ -105,11 +105,6 @@ public class ZeppOsConfigService extends AbstractZeppOsService {
         return ENDPOINT;
     }
 
-    @Override
-    public boolean isEncrypted() {
-        return true;
-    }
-
     @Override
     public void handlePayload(final byte[] payload) {
         switch (payload[0]) {
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 37285f132..300e088e4 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
@@ -47,7 +47,7 @@ public class ZeppOsContactsService extends AbstractZeppOsService {
     public static final String PREF_CONTACTS_SLOT_COUNT = "zepp_os_contacts_slot_count";
 
     public ZeppOsContactsService(final Huami2021Support support) {
-        super(support);
+        super(support, true);
     }
 
     @Override
@@ -55,11 +55,6 @@ public class ZeppOsContactsService extends AbstractZeppOsService {
         return ENDPOINT;
     }
 
-    @Override
-    public boolean isEncrypted() {
-        return true;
-    }
-
     @Override
     public void handlePayload(final byte[] payload) {
         switch (payload[0]) {
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 5933cce53..989d137de 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
@@ -65,7 +65,7 @@ public class ZeppOsDisplayItemsService extends AbstractZeppOsService {
     public static final byte DISPLAY_ITEMS_SECTION_DISABLED = 0x03;
 
     public ZeppOsDisplayItemsService(final Huami2021Support support) {
-        super(support);
+        super(support, true);
     }
 
     @Override
@@ -73,11 +73,6 @@ public class ZeppOsDisplayItemsService extends AbstractZeppOsService {
         return ENDPOINT;
     }
 
-    @Override
-    public boolean isEncrypted() {
-        return true;
-    }
-
     @Override
     public void handlePayload(final byte[] payload) {
         switch (payload[0]) {
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 54f0ead87..ff9c0386a 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
@@ -56,7 +56,7 @@ public class ZeppOsFileTransferService extends AbstractZeppOsService {
     private int mChunkSize = -1;
 
     public ZeppOsFileTransferService(final Huami2021Support support) {
-        super(support);
+        super(support, false);
     }
 
     @Override
@@ -64,11 +64,6 @@ public class ZeppOsFileTransferService extends AbstractZeppOsService {
         return ENDPOINT;
     }
 
-    @Override
-    public boolean isEncrypted() {
-        return false;
-    }
-
     @Override
     public void handlePayload(final byte[] payload) {
         byte session;
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 79226d5d6..a03776493 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
@@ -47,7 +47,7 @@ public class ZeppOsFtpServerService extends AbstractZeppOsService {
     private Callback mCallback = null;
 
     public ZeppOsFtpServerService(final Huami2021Support support) {
-        super(support);
+        super(support, true);
     }
 
     @Override
@@ -55,11 +55,6 @@ public class ZeppOsFtpServerService extends AbstractZeppOsService {
         return ENDPOINT;
     }
 
-    @Override
-    public boolean isEncrypted() {
-        return true;
-    }
-
     @Override
     public void handlePayload(final byte[] payload) {
         switch (payload[0]) {
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 b33ca01cb..444a40199 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
@@ -45,7 +45,7 @@ public class ZeppOsHttpService extends AbstractZeppOsService {
     public static final byte RESPONSE_NO_INTERNET = 0x02;
 
     public ZeppOsHttpService(final Huami2021Support support) {
-        super(support);
+        super(support, true);
     }
 
     @Override
@@ -53,11 +53,6 @@ public class ZeppOsHttpService extends AbstractZeppOsService {
         return ENDPOINT;
     }
 
-    @Override
-    public boolean isEncrypted() {
-        return true;
-    }
-
     @Override
     public void handlePayload(final byte[] payload) {
         switch (payload[0]) {
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 80a183beb..4579ac2c6 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
@@ -63,7 +63,7 @@ public class ZeppOsLogsService extends AbstractZeppOsService {
     private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
 
     public ZeppOsLogsService(final Huami2021Support support) {
-        super(support);
+        super(support, false);
     }
 
     @Override
@@ -71,11 +71,6 @@ public class ZeppOsLogsService extends AbstractZeppOsService {
         return ENDPOINT;
     }
 
-    @Override
-    public boolean isEncrypted() {
-        return false;
-    }
-
     @Override
     public void handlePayload(final byte[] payload) {
         switch (payload[0]) {
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 538159dee..545fc09c4 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
@@ -58,7 +58,7 @@ public class ZeppOsLoyaltyCardService extends AbstractZeppOsService {
     public static final String PREF_VERSION = "zepp_os_loyalty_cards_version";
 
     public ZeppOsLoyaltyCardService(final Huami2021Support support) {
-        super(support);
+        super(support, false);
     }
 
     @Override
@@ -66,11 +66,6 @@ public class ZeppOsLoyaltyCardService extends AbstractZeppOsService {
         return ENDPOINT;
     }
 
-    @Override
-    public boolean isEncrypted() {
-        return false;
-    }
-
     @Override
     public void handlePayload(final byte[] payload) {
         switch (payload[0]) {
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 4dfe01f85..4da6d92e6 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
@@ -66,7 +66,7 @@ public class ZeppOsMorningUpdatesService extends AbstractZeppOsService {
     }};
 
     public ZeppOsMorningUpdatesService(Huami2021Support support) {
-        super(support);
+        super(support, false);
     }
 
     @Override
@@ -74,11 +74,6 @@ public class ZeppOsMorningUpdatesService extends AbstractZeppOsService {
         return ENDPOINT;
     }
 
-    @Override
-    public boolean isEncrypted() {
-        return false;
-    }
-
     @Override
     public void handlePayload(byte[] payload) {
         switch (payload[0]) {
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 611b26e32..9530a1067 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
@@ -45,7 +45,7 @@ public class ZeppOsMusicService extends AbstractZeppOsService {
     private static final byte BUTTON_VOLUME_DOWN = 0x06;
 
     public ZeppOsMusicService(final Huami2021Support support) {
-        super(support);
+        super(support, false);
     }
 
     @Override
@@ -53,11 +53,6 @@ public class ZeppOsMusicService extends AbstractZeppOsService {
         return ENDPOINT;
     }
 
-    @Override
-    public boolean isEncrypted() {
-        return false;
-    }
-
     @Override
     public void handlePayload(final byte[] payload) {
         switch (payload[0]) {
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 51a3f7de5..c1dda744f 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
@@ -75,7 +75,7 @@ public class ZeppOsNotificationService extends AbstractZeppOsService {
     private final ZeppOsFileTransferService fileTransferService;
 
     public ZeppOsNotificationService(final Huami2021Support support, final ZeppOsFileTransferService fileTransferService) {
-        super(support);
+        super(support, true);
         this.fileTransferService = fileTransferService;
     }
 
@@ -84,11 +84,6 @@ public class ZeppOsNotificationService extends AbstractZeppOsService {
         return ENDPOINT;
     }
 
-    @Override
-    public boolean isEncrypted() {
-        return true;
-    }
-
     @Override
     public void handlePayload(final byte[] payload) {
         final GBDeviceEventNotificationControl deviceEvtNotificationControl = new GBDeviceEventNotificationControl();
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 23a44e236..ece61b2a3 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
@@ -55,7 +55,7 @@ public class ZeppOsPhoneService extends AbstractZeppOsService {
     private int version = 0;
 
     public ZeppOsPhoneService(final Huami2021Support support) {
-        super(support);
+        super(support, true);
     }
 
     @Override
@@ -63,11 +63,6 @@ public class ZeppOsPhoneService extends AbstractZeppOsService {
         return ENDPOINT;
     }
 
-    @Override
-    public boolean isEncrypted() {
-        return true;
-    }
-
     @Override
     public void handlePayload(final byte[] payload) {
         switch (payload[0]) {
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 c1c49f79f..8250eab40 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
@@ -61,7 +61,7 @@ public class ZeppOsRemindersService extends AbstractZeppOsService {
     private static final String PREF_CAPABILITY = "huami_2021_capability_reminders";
 
     public ZeppOsRemindersService(final Huami2021Support support) {
-        super(support);
+        super(support, false);
     }
 
     @Override
@@ -69,11 +69,6 @@ public class ZeppOsRemindersService extends AbstractZeppOsService {
         return ENDPOINT;
     }
 
-    @Override
-    public boolean isEncrypted() {
-        return false;
-    }
-
     @Override
     public void handlePayload(final byte[] payload) {
         switch (payload[0]) {
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 1eb968544..4ce016505 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
@@ -16,30 +16,15 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services;
 
-import android.annotation.SuppressLint;
-import android.widget.Toast;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
-import java.nio.charset.StandardCharsets;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-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.AbstractZeppOsService;
-import nodomain.freeyourgadget.gadgetbridge.util.GB;
-import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
-import nodomain.freeyourgadget.gadgetbridge.util.StringUtils;
 
 public class ZeppOsServicesService extends AbstractZeppOsService {
     private static final Logger LOG = LoggerFactory.getLogger(ZeppOsServicesService.class);
@@ -50,7 +35,7 @@ public class ZeppOsServicesService extends AbstractZeppOsService {
     public static final byte CMD_RET_LIST = 0x04;
 
     public ZeppOsServicesService(final Huami2021Support support) {
-        super(support);
+        super(support, false);
     }
 
     @Override
@@ -58,11 +43,6 @@ public class ZeppOsServicesService extends AbstractZeppOsService {
         return ENDPOINT;
     }
 
-    @Override
-    public boolean isEncrypted() {
-        return false;
-    }
-
     @Override
     public void handlePayload(final byte[] payload) {
         switch (payload[0]) {
@@ -74,11 +54,6 @@ public class ZeppOsServicesService extends AbstractZeppOsService {
         }
     }
 
-    @Override
-    public void initialize(final TransactionBuilder builder) {
-        //requestServices(builder);
-    }
-
     public void requestServices(final TransactionBuilder builder) {
         write(builder, CMD_GET_LIST);
     }
@@ -95,11 +70,17 @@ public class ZeppOsServicesService extends AbstractZeppOsService {
             final byte encryptedByte = buf.get();
             final Boolean encrypted = booleanFromByte(encryptedByte);
 
-            LOG.debug("Service: endpoint={} encrypted={}", String.format("%04x", endpoint), encrypted);
+            final AbstractZeppOsService service = getSupport().getService(endpoint);
 
-            // TODO use this to initialize the services supported by the device
+            LOG.debug("Service: endpoint={} encrypted={} known={}", String.format("%04x", endpoint), encrypted, service != null);
+
+            if (service != null && encrypted != null) {
+                service.setEncrypted(encrypted);
+            }
         }
 
+        getSupport().initializeServices();
+
         final int remainingBytes = buf.limit() - buf.position();
         if (remainingBytes != 0) {
             LOG.warn("There are {} bytes remaining in the buffer", remainingBytes);
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 6a1aa8829..285d30f10 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
@@ -124,7 +124,7 @@ public class ZeppOsShortcutCardsService extends AbstractZeppOsService {
     private int maxCards = 0;
 
     public ZeppOsShortcutCardsService(final Huami2021Support support) {
-        super(support);
+        super(support, true);
     }
 
     @Override
@@ -132,11 +132,6 @@ public class ZeppOsShortcutCardsService extends AbstractZeppOsService {
         return ENDPOINT;
     }
 
-    @Override
-    public boolean isEncrypted() {
-        return true;
-    }
-
     @Override
     public void handlePayload(final byte[] payload) {
         switch (payload[0]) {
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 d463bf19f..0603cb2cb 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
@@ -112,7 +112,7 @@ public class ZeppOsWatchfaceService extends AbstractZeppOsService {
     final List<GBDeviceApp> watchfaces = new ArrayList<>();
 
     public ZeppOsWatchfaceService(final Huami2021Support support) {
-        super(support);
+        super(support, true);
     }
 
     @Override
@@ -120,11 +120,6 @@ public class ZeppOsWatchfaceService extends AbstractZeppOsService {
         return ENDPOINT;
     }
 
-    @Override
-    public boolean isEncrypted() {
-        return true;
-    }
-
     @Override
     public void handlePayload(final byte[] payload) {
         switch (payload[0]) {
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 ae8acc02f..da1ecf211 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
@@ -47,7 +47,7 @@ public class ZeppOsWifiService extends AbstractZeppOsService {
     private Callback mCallback = null;
 
     public ZeppOsWifiService(final Huami2021Support support) {
-        super(support);
+        super(support, true);
     }
 
     @Override
@@ -55,11 +55,6 @@ public class ZeppOsWifiService extends AbstractZeppOsService {
         return ENDPOINT;
     }
 
-    @Override
-    public boolean isEncrypted() {
-        return true;
-    }
-
     @Override
     public void handlePayload(final byte[] payload) {
         switch (payload[0]) {

From 3b8428e79565493ad4d8611a14cf16ee1a60e95b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Tue, 16 Jan 2024 20:52:10 +0000
Subject: [PATCH 468/595] Redmi Smart Band Pro: Fix password digits

---
 .../capabilities/password/PasswordCapabilityImpl.java    | 9 +++++++++
 .../redmismartbandpro/RedmiSmartBandProCoordinator.java  | 6 ++++++
 app/src/main/res/values/strings.xml                      | 1 +
 3 files changed, 16 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/password/PasswordCapabilityImpl.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/password/PasswordCapabilityImpl.java
index 5ef94ed0f..9e4aab92e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/password/PasswordCapabilityImpl.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/password/PasswordCapabilityImpl.java
@@ -39,6 +39,7 @@ public class PasswordCapabilityImpl {
 
     public enum Mode {
         NONE,
+        NUMBERS_4_DIGITS_0_TO_9,
         NUMBERS_4_DIGITS_1_TO_4,
         NUMBERS_6,
     }
@@ -60,6 +61,9 @@ public class PasswordCapabilityImpl {
             case NUMBERS_6:
                 password.setSummary(R.string.prefs_password_6_digits_0_to_9_summary);
                 break;
+            case NUMBERS_4_DIGITS_0_TO_9:
+                password.setSummary(R.string.prefs_password_4_digits_0_to_9_summary);
+                break;
             case NUMBERS_4_DIGITS_1_TO_4:
                 password.setSummary(R.string.prefs_password_4_digits_1_to_4_summary);
                 break;
@@ -79,6 +83,11 @@ public class PasswordCapabilityImpl {
                         editText.setInputType(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_VARIATION_PASSWORD);
                         expectedLength = 6;
                         break;
+                    case NUMBERS_4_DIGITS_0_TO_9:
+                        password.setSummary(R.string.prefs_password_4_digits_0_to_9_summary);
+                        editText.setInputType(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_VARIATION_PASSWORD);
+                        expectedLength = 4;
+                        break;
                     case NUMBERS_4_DIGITS_1_TO_4:
                         password.setSummary(R.string.prefs_password_4_digits_1_to_4_summary);
                         editText.setInputType(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_VARIATION_PASSWORD);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmismartbandpro/RedmiSmartBandProCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmismartbandpro/RedmiSmartBandProCoordinator.java
index f6f81ae7a..4ee78b490 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmismartbandpro/RedmiSmartBandProCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmismartbandpro/RedmiSmartBandProCoordinator.java
@@ -24,6 +24,7 @@ import androidx.annotation.Nullable;
 import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.capabilities.password.PasswordCapabilityImpl;
 import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiInstallHandler;
@@ -60,4 +61,9 @@ public class RedmiSmartBandProCoordinator extends XiaomiCoordinator {
     public int getDisabledIconResource() {
         return R.drawable.ic_device_default_disabled;
     }
+
+    @Override
+    public PasswordCapabilityImpl.Mode getPasswordCapability() {
+        return PasswordCapabilityImpl.Mode.NUMBERS_4_DIGITS_0_TO_9;
+    }
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9d59456ae..7b7e164b4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -985,6 +985,7 @@
     <string name="prefs_password_summary">Lock the band with a password when removed from the wrist</string>
     <string name="prefs_password_enabled">Password Enabled</string>
     <string name="prefs_password_4_digits_1_to_4_summary">The password must have 4 digits, using numbers 1 to 4</string>
+    <string name="prefs_password_4_digits_0_to_9_summary">The password must have 4 digits, using only numbers</string>
     <string name="prefs_password_6_digits_0_to_9_summary">The password must have 6 digits, using only numbers</string>
     <string name="mi2_prefs_heart_rate_monitoring_alerts_summary">Configure heart rate monitoring and alert thresholds</string>
     <string name="mi2_prefs_do_not_disturb_start">Start time</string>

From e6aa0afa7edde068e9998a4f7a2f4595767fc4cb Mon Sep 17 00:00:00 2001
From: "Martin.JM" <martin.jm@noreply.codeberg.org>
Date: Wed, 17 Jan 2024 14:55:13 +0100
Subject: [PATCH 469/595] Fix huawei debug request

---
 .../gadgetbridge/devices/huawei/HuaweiConstants.java  |  1 -
 .../devices/huawei/HuaweiSettingsCustomizer.java      |  2 --
 .../service/devices/huawei/requests/DebugRequest.java |  2 +-
 app/src/main/res/xml/devicesettings_huawei_debug.xml  | 11 -----------
 .../devicesettings_huawei_reparse_workout_data.xml    | 10 ----------
 5 files changed, 1 insertion(+), 25 deletions(-)
 delete mode 100644 app/src/main/res/xml/devicesettings_huawei_debug.xml
 delete mode 100644 app/src/main/res/xml/devicesettings_huawei_reparse_workout_data.xml

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiConstants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiConstants.java
index 01e5d5ccf..d0a7f15d2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiConstants.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiConstants.java
@@ -67,7 +67,6 @@ public final class HuaweiConstants {
     public static final String PREF_HUAWEI_WORKMODE = "workmode";
     public static final String PREF_HUAWEI_TRUSLEEP = "trusleep";
     public static final String PREF_HUAWEI_DND_LIFT_WRIST_TYPE = "dnd_lift_wrist_type"; // SharedPref for 0x01 0x1D
-    public static final String PREF_HUAWEI_DEBUG = "debug_huawei";
     public static final String PREF_HUAWEI_DEBUG_REQUEST = "debug_huawei_request";
 
     public static final String PKG_NAME = "com.huawei.devicegroupmanage";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSettingsCustomizer.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSettingsCustomizer.java
index 898eecf24..c7835cb93 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSettingsCustomizer.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSettingsCustomizer.java
@@ -37,7 +37,6 @@ import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 import nodomain.freeyourgadget.gadgetbridge.util.XTimePreference;
 
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.*;
-import static nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants.PREF_HUAWEI_DEBUG;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants.PREF_HUAWEI_DEBUG_REQUEST;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants.PREF_HUAWEI_TRUSLEEP;
 import static nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants.PREF_HUAWEI_WORKMODE;
@@ -111,7 +110,6 @@ public class HuaweiSettingsCustomizer implements DeviceSpecificSettingsCustomize
 
         handler.addPreferenceHandlerFor(PREF_HUAWEI_WORKMODE);
         handler.addPreferenceHandlerFor(PREF_HUAWEI_TRUSLEEP);
-        handler.addPreferenceHandlerFor(PREF_HUAWEI_DEBUG);
         handler.addPreferenceHandlerFor(PREF_HUAWEI_DEBUG_REQUEST);
 
         // Only supported on specific devices
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/DebugRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/DebugRequest.java
index df3d58d30..6a3e7e780 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/DebugRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/DebugRequest.java
@@ -38,7 +38,7 @@ public class DebugRequest extends Request {
     protected List<byte[]> createRequest() throws RequestCreationException {
         String debugString = GBApplication
             .getDeviceSpecificSharedPrefs(supportProvider.getDevice().getAddress())
-            .getString(HuaweiConstants.PREF_HUAWEI_DEBUG, "1,1,false,(1,/),(2,/),(3,/),(4,/)");
+            .getString(HuaweiConstants.PREF_HUAWEI_DEBUG_REQUEST, "1,1,false,(1,/),(2,/),(3,/),(4,/)");
         HuaweiPacket packet = parseDebugString(debugString);
         try {
             return packet.serialize();
diff --git a/app/src/main/res/xml/devicesettings_huawei_debug.xml b/app/src/main/res/xml/devicesettings_huawei_debug.xml
deleted file mode 100644
index b02d20acc..000000000
--- a/app/src/main/res/xml/devicesettings_huawei_debug.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <EditTextPreference
-        android:icon="@drawable/ic_warning"
-        android:key="debug_huawei"
-        android:maxLength="16"
-        android:summary="@string/pref_summary_debug"
-        android:title="@string/pref_title_debug" />
-
-</androidx.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml/devicesettings_huawei_reparse_workout_data.xml b/app/src/main/res/xml/devicesettings_huawei_reparse_workout_data.xml
deleted file mode 100644
index 9e1226c25..000000000
--- a/app/src/main/res/xml/devicesettings_huawei_reparse_workout_data.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <SwitchPreferenceCompat
-        android:defaultValue="false"
-        android:key="huawei_reparse_workout_data"
-        android:title="@string/huawei_reparse_workout_data"
-        android:summary="@string/huawei_reparse_workout_data_description" />
-
-</PreferenceScreen>
\ No newline at end of file

From 9095ffad8b204e4e882f350c7caa7c0a1220f3a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Wed, 17 Jan 2024 17:55:15 +0000
Subject: [PATCH 470/595] Mijia MHO-C303: Initial support

---
 .../mijia_lywsd/MijiaMhoC303Coordinator.java  | 48 +++++++++++++++++++
 .../gadgetbridge/model/DeviceType.java        |  2 +
 app/src/main/res/values/strings.xml           |  1 +
 3 files changed, 51 insertions(+)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/mijia_lywsd/MijiaMhoC303Coordinator.java

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/mijia_lywsd/MijiaMhoC303Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/mijia_lywsd/MijiaMhoC303Coordinator.java
new file mode 100644
index 000000000..faa99669c
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/mijia_lywsd/MijiaMhoC303Coordinator.java
@@ -0,0 +1,48 @@
+/*  Copyright (C) 2024 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.mijia_lywsd;
+
+import java.util.regex.Pattern;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+
+public class MijiaMhoC303Coordinator extends AbstractMijiaLywsdCoordinator {
+    @Override
+    protected Pattern getSupportedDeviceName() {
+        return Pattern.compile("MHO-C303");
+    }
+
+    @Override
+    public int getDeviceNameResource() {
+        return R.string.devicetype_mijia_mho_c303;
+    }
+
+    @Override
+    public int getDefaultIconResource() {
+        return R.drawable.ic_device_pebble;
+    }
+
+    @Override
+    public int getDisabledIconResource() {
+        return R.drawable.ic_device_pebble_disabled;
+    }
+
+    @Override
+    public boolean supportsSetTime() {
+        return true;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
index 120ae4244..10d295a98 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
@@ -130,6 +130,7 @@ import nodomain.freeyourgadget.gadgetbridge.devices.lenovo.watchxplus.WatchXPlus
 import nodomain.freeyourgadget.gadgetbridge.devices.liveview.LiveviewCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.makibeshr3.MakibesHR3Coordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.mijia_lywsd.MijiaMhoC303Coordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.mijia_lywsd.MijiaLywsd02Coordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.mijia_lywsd.MijiaLywsd03Coordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.miscale2.MiScale2DeviceCoordinator;
@@ -284,6 +285,7 @@ public enum DeviceType {
     PINETIME_JF(PineTimeJFCoordinator.class),
     MIJIA_LYWSD02(MijiaLywsd02Coordinator.class),
     MIJIA_LYWSD03(MijiaLywsd03Coordinator.class),
+    MIJIA_MHO_C303(MijiaMhoC303Coordinator.class),
     LEFUN(LefunDeviceCoordinator.class),
     BOHEMIC_SMART_BRACELET(BohemicSmartBraceletDeviceCoordinator.class),
     SMAQ2OSS(SMAQ2OSSCoordinator.class),
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7b7e164b4..cfebc8ade 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1411,6 +1411,7 @@
     <string name="devicetype_bfh16">BFH-16</string>
     <string name="devicetype_mijia_lywsd02">Mijia Smart Clock</string>
     <string name="devicetype_mijia_lywsd03">Mijia Temperature and Humidity Sensor 2</string>
+    <string name="devicetype_mijia_mho_c303">Mijia MHO-C303</string>
     <string name="devicetype_makibes_hr3">Makibes HR3</string>
     <string name="devicetype_banglejs">Bangle.js</string>
     <string name="devicetype_tlw64">TLW64</string>

From 414cf5e472040676b934cd0141061029b6d7db1a Mon Sep 17 00:00:00 2001
From: Oleg Afanasyev <oafanasiev@gmail.com>
Date: Tue, 16 Jan 2024 12:47:09 +0000
Subject: [PATCH 471/595] Sport Activity Summary: fix group order instability

Previously group order was determined on the fly by available entries order or appearance.
This commit changes it to use group definition order.
---
 .../model/ActivitySummaryJsonSummary.java     | 75 ++++++++++++-------
 1 file changed, 47 insertions(+), 28 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySummaryJsonSummary.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySummaryJsonSummary.java
index 55e8c2076..b8637b080 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySummaryJsonSummary.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySummaryJsonSummary.java
@@ -28,6 +28,7 @@ import org.slf4j.LoggerFactory;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -120,9 +121,9 @@ public class ActivitySummaryJsonSummary {
     private JSONObject setSummaryGroupedList(JSONObject summaryDatalist){
         this.groupData = createActivitySummaryGroups(); //structure for grouping activities into groups, when vizualizing
 
-        if (summaryDatalist ==null ) return null;
+        if (summaryDatalist == null) return null;
         Iterator<String> keys = summaryDatalist.keys();
-        JSONObject list=new JSONObject();
+        Map<String, JSONArray> activeGroups = new HashMap<>();
 
         while (keys.hasNext()) {
             String key = keys.next();
@@ -130,27 +131,43 @@ public class ActivitySummaryJsonSummary {
                 JSONObject innerData = (JSONObject) summaryDatalist.get(key);
                 Object value = innerData.get("value");
                 String unit = innerData.getString("unit");
-                String group = getGroup(key);
+                String groupName = getGroup(key);
 
-                if (!list.has(group)) {
-                    list.put(group,new JSONArray());
+                JSONArray group = activeGroups.get(groupName);
+                if (group == null) {
+                    group = new JSONArray();
+                    activeGroups.put(groupName, group);
                 }
 
-                JSONArray tmpl = (JSONArray) list.get(group);
-                JSONObject innernew = new JSONObject();
-                innernew.put("name", key);
-                innernew.put("value", value);
-                innernew.put("unit", unit);
-                tmpl.put(innernew);
-                list.put(group, tmpl);
+                JSONObject item = new JSONObject();
+                item.put("name", key);
+                item.put("value", value);
+                item.put("unit", unit);
+                group.put(item);
             } catch (JSONException e) {
-                LOG.error("SportsActivity", e);
+                LOG.error("SportsActivity internal error building grouped summary", e);
             }
         }
-        return list;
+
+        // Reorder collected groups according to the order set by this.groupData.
+        JSONObject grouped = new JSONObject();
+        Iterator<String> names = this.groupData.keys();
+        while(names.hasNext()) {
+            String groupName = names.next();
+            JSONArray group = activeGroups.get(groupName);
+            if (group != null) {
+                try {
+                    grouped.put(groupName, group);
+                } catch (JSONException e) {
+                    LOG.error("SportsActivity internal error building grouped summary", e);
+                }
+            }
+        }
+        return grouped;
     }
 
     private String getGroup(String searchItem) {
+        // NB: Default group must be present in group JSONObject created by createActivitySummaryGroups
         String defaultGroup = "Activity";
         if (groupData == null) return defaultGroup;
         Iterator<String> keys = groupData.keys();
@@ -170,31 +187,33 @@ public class ActivitySummaryJsonSummary {
         return defaultGroup;
     }
     private JSONObject createActivitySummaryGroups(){
-        final Map<String, List<String>> groupDefinitions = new HashMap<String, List<String>>() {{
-            put("Strokes", Arrays.asList(
-                    STROKE_DISTANCE_AVG, STROKE_AVG_PER_SECOND, STROKES,
-                    STROKE_RATE_AVG, STROKE_RATE_MAX
+        final Map<String, List<String>> groupDefinitions = new LinkedHashMap<String, List<String>>() {{
+            // NB: Default group Activity must be present in this definition, otherwise it wouldn't
+            // be shown.
+            put("Activity", Arrays.asList(
+                    DISTANCE_METERS, STEPS, ACTIVE_SECONDS, CALORIES_BURNT, STRIDE_TOTAL,
+                    HR_AVG, HR_MAX, HR_MIN, STRIDE_AVG, STRIDE_MAX, STRIDE_MIN
             ));
-            put("Swimming", Arrays.asList(
-                    SWOLF_INDEX, SWIM_STYLE
+            put("Speed", Arrays.asList(
+                    SPEED_AVG, SPEED_MAX, SPEED_MIN, PACE_AVG_SECONDS_KM, PACE_MIN,
+                    PACE_MAX, "averageSpeed2", CADENCE_AVG, CADENCE_MAX, CADENCE_MIN
             ));
             put("Elevation", Arrays.asList(
                     ASCENT_METERS, DESCENT_METERS, ALTITUDE_MAX, ALTITUDE_MIN, ALTITUDE_AVG,
                     ALTITUDE_BASE, ASCENT_SECONDS, DESCENT_SECONDS, FLAT_SECONDS, ASCENT_DISTANCE,
                     DESCENT_DISTANCE, FLAT_DISTANCE, ELEVATION_GAIN, ELEVATION_LOSS
             ));
-            put("Speed", Arrays.asList(
-                    SPEED_AVG, SPEED_MAX, SPEED_MIN, PACE_AVG_SECONDS_KM, PACE_MIN,
-                    PACE_MAX, "averageSpeed2", CADENCE_AVG, CADENCE_MAX, CADENCE_MIN
-            ));
-            put("Activity", Arrays.asList(
-                    DISTANCE_METERS, STEPS, ACTIVE_SECONDS, CALORIES_BURNT, STRIDE_TOTAL,
-                    HR_AVG, HR_MAX, HR_MIN, STRIDE_AVG, STRIDE_MAX, STRIDE_MIN
-            ));
             put("HeartRateZones", Arrays.asList(
                     HR_ZONE_NA, HR_ZONE_WARM_UP, HR_ZONE_FAT_BURN, HR_ZONE_AEROBIC, HR_ZONE_ANAEROBIC,
                     HR_ZONE_EXTREME
             ));
+            put("Strokes", Arrays.asList(
+                    STROKE_DISTANCE_AVG, STROKE_AVG_PER_SECOND, STROKES,
+                    STROKE_RATE_AVG, STROKE_RATE_MAX
+            ));
+            put("Swimming", Arrays.asList(
+                    SWOLF_INDEX, SWIM_STYLE
+            ));
             put("TrainingEffect", Arrays.asList(
                     TRAINING_EFFECT_AEROBIC, TRAINING_EFFECT_ANAEROBIC, WORKOUT_LOAD,
                     MAXIMUM_OXYGEN_UPTAKE

From c60ff907791c71d7fb5cefbebb3d16a220d21060 Mon Sep 17 00:00:00 2001
From: Oleg Afanasyev <oafanasiev@gmail.com>
Date: Tue, 16 Jan 2024 12:56:10 +0000
Subject: [PATCH 472/595] Missing string for sport activity summary.

---
 app/src/main/res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cfebc8ade..33637e8b2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1729,6 +1729,7 @@
     <string name="descentMeters">Downhill</string>
     <string name="ascentDistance">Uphill distance</string>
     <string name="descentDistance">Downhill distance</string>
+    <string name="flatDistance">Flat distance</string>
     <string name="elevationGain">Elevation gain</string>
     <string name="elevationLoss">Elevation loss</string>
     <string name="maxAltitude">Maximum</string>

From 4231e97cff1f854bfc3bc57f5fa5b94bf0b985cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Wed, 17 Jan 2024 18:48:10 +0000
Subject: [PATCH 473/595] Sony Headphones: Allow choice of protocol version

---
 .../DeviceSettingsPreferenceConst.java        |  2 +
 .../headphones/SonyHeadphonesCoordinator.java |  3 +
 .../headphones/SonyHeadphonesProtocol.java    | 85 +++++++++++++------
 app/src/main/res/values/arrays.xml            | 14 +++
 app/src/main/res/values/strings.xml           |  4 +
 ...cesettings_sony_headphones_device_info.xml |  9 ++
 ...tings_sony_headphones_protocol_version.xml | 15 ++++
 7 files changed, 108 insertions(+), 24 deletions(-)
 create mode 100644 app/src/main/res/xml/devicesettings_sony_headphones_protocol_version.xml

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
index d4d28ff59..d61fa848d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
@@ -335,6 +335,8 @@ public class DeviceSettingsPreferenceConst {
     public static final String PREFS_GALAXY_BUDS_SEAMLESS_CONNECTION="prefs_galaxy_buds_seamless_connection";
 
     public static final String PREF_SONY_AUDIO_CODEC = "pref_sony_audio_codec";
+    public static final String PREF_SONY_PROTOCOL_VERSION = "pref_protocol_version";
+    public static final String PREF_SONY_ACTUAL_PROTOCOL_VERSION = "pref_actual_protocol_version";
     public static final String PREF_SONY_AMBIENT_SOUND_CONTROL = "pref_sony_ambient_sound_control";
     public static final String PREF_SONY_AMBIENT_SOUND_CONTROL_BUTTON_MODE = "pref_sony_ambient_sound_control_button_mode";
     public static final String PREF_SONY_FOCUS_VOICE = "pref_sony_focus_voice";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/SonyHeadphonesCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/SonyHeadphonesCoordinator.java
index e7b93cab5..dd24a56db 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/SonyHeadphonesCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/SonyHeadphonesCoordinator.java
@@ -213,6 +213,9 @@ public abstract class SonyHeadphonesCoordinator extends AbstractBLClassicDeviceC
             put(SonyHeadphonesCapabilities.VoiceNotifications, R.xml.devicesettings_sony_headphones_notifications_voice_guide);
         }});
 
+        settings.add(R.xml.devicesettings_header_developer);
+        settings.add(R.xml.devicesettings_sony_headphones_protocol_version);
+
         settings.add(R.xml.devicesettings_sony_headphones_device_info);
 
         return ArrayUtils.toPrimitive(settings.toArray(new Integer[0]));
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/SonyHeadphonesProtocol.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/SonyHeadphonesProtocol.java
index 35d4e05d7..de70a2e21 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/SonyHeadphonesProtocol.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/SonyHeadphonesProtocol.java
@@ -31,6 +31,7 @@ import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSett
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEvent;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventSendBytes;
 import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdateDeviceState;
+import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdatePreferences;
 import nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.prefs.AmbientSoundControl;
 import nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.prefs.AmbientSoundControlButtonMode;
 import nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.prefs.AudioUpsampling;
@@ -99,42 +100,78 @@ public class SonyHeadphonesProtocol extends GBDeviceProtocol {
             return null;
         }
 
-        final List<Object> events = new ArrayList<>();
+        final SharedPreferences prefs = GBApplication.getDeviceSpecificSharedPrefs(getDevice().getAddress());
+
+        final List<GBDeviceEvent> events = new ArrayList<>();
 
         if (protocolImpl == null) {
             // Check if we got an init response, which should indicate the protocol version
             if (MessageType.COMMAND_1.equals(messageType) && message.getPayload()[0] == 0x01) {
                 // Init reply, set the protocol version
-                if (message.getPayload().length == 4) {
-                    // WH-1000XM3:      01:00:40:10
-                    // WF-SP800N 1.0.1: 01:00:70:00
-                    protocolImpl = new SonyProtocolImplV1(getDevice());
-                } else if (message.getPayload().length == 8) {
-                    switch (message.getPayload()[2]) {
-                        case 0x01:
-                            // WF-1000XM4 1.1.5: 01:00:01:00:00:00:00:00
-                            protocolImpl = new SonyProtocolImplV2(getDevice());
-                            break;
-                        case 0x03:
-                            // LinkBuds S 2.0.2: 01:00:03:00:00:07:00:00
-                            // WH-1000XM5 1.1.3: 01:00:03:00:00:00:00:00
-                            // WF-1000XM5 2.0.1: 01:00:03:00:10:04:00:00
-                            protocolImpl = new SonyProtocolImplV3(getDevice());
-                            break;
-                        default:
-                            LOG.error("Unexpected version for payload of length 8: {}", message.getPayload()[2]);
-                            return null;
+
+                final GBDeviceEventUpdatePreferences eventUpdatePreferences = new GBDeviceEventUpdatePreferences(
+                        DeviceSettingsPreferenceConst.PREF_SONY_ACTUAL_PROTOCOL_VERSION, null
+                );
+                events.add(eventUpdatePreferences);
+
+                final String protocolVersionPref = prefs.getString("pref_protocol_version", "auto");
+                final String protocolVersion;
+                if (protocolVersionPref.equals("auto")) {
+                    if (message.getPayload().length == 4) {
+                        // WH-1000XM3:      01:00:40:10
+                        // WF-SP800N 1.0.1: 01:00:70:00
+                        protocolVersion = "v1";
+                    } else if (message.getPayload().length == 8) {
+                        switch (message.getPayload()[2]) {
+                            case 0x01:
+                                // WF-1000XM4 1.1.5: 01:00:01:00:00:00:00:00
+                                protocolVersion = "v2";
+                                break;
+                            case 0x03:
+                                // LinkBuds S 2.0.2: 01:00:03:00:00:07:00:00
+                                // WH-1000XM5 1.1.3: 01:00:03:00:00:00:00:00
+                                // WF-1000XM5 2.0.1: 01:00:03:00:10:04:00:00
+                                protocolVersion = "v3";
+                                break;
+                            default:
+                                LOG.error("Unexpected version for payload of length 8: {}", message.getPayload()[2]);
+                                return events.toArray(new GBDeviceEvent[0]);
+                        }
+                    } else {
+                        LOG.error("Unexpected init response payload length: {}", message.getPayload().length);
+                        return events.toArray(new GBDeviceEvent[0]);
                     }
                 } else {
-                    LOG.error("Unexpected init response payload length: {}", message.getPayload().length);
-                    return null;
+                    protocolVersion = protocolVersionPref;
+                }
+
+                LOG.info("Sony protocol version: {}/{}", protocolVersionPref, protocolVersion);
+
+                eventUpdatePreferences.withPreference(
+                        DeviceSettingsPreferenceConst.PREF_SONY_ACTUAL_PROTOCOL_VERSION,
+                        protocolVersion
+                );
+
+                switch (protocolVersion) {
+                    case "v1":
+                        protocolImpl = new SonyProtocolImplV1(getDevice());
+                        break;
+                    case "v2":
+                        protocolImpl = new SonyProtocolImplV2(getDevice());
+                        break;
+                    case "v3":
+                        protocolImpl = new SonyProtocolImplV3(getDevice());
+                        break;
+                    default:
+                        LOG.warn("Unknown protocol version {}", protocolVersion);
+                        return events.toArray(new GBDeviceEvent[0]);
                 }
             }
         }
 
         if (protocolImpl == null) {
             LOG.error("No protocol implementation, ignoring message");
-            return null;
+            return events.toArray(new GBDeviceEvent[0]);
         }
 
         try {
@@ -146,7 +183,7 @@ public class SonyHeadphonesProtocol extends GBDeviceProtocol {
                     break;
                 default:
                     LOG.warn("Unknown message type for {}", message);
-                    return null;
+                    return events.toArray(new GBDeviceEvent[0]);
             }
         } catch (final Exception e) {
             // Don't crash the app if we somehow fail to handle the payload
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index d405422f9..d92181dde 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -3019,6 +3019,20 @@
         <item>ambient_sound</item>
     </string-array>
 
+    <string-array name="sony_protocol_version_names">
+        <item>@string/automatic</item>
+        <item>@string/sony_protocol_v1</item>
+        <item>@string/sony_protocol_v2</item>
+        <item>@string/sony_protocol_v3</item>
+    </string-array>
+
+    <string-array name="sony_protocol_version_values">
+        <item>auto</item>
+        <item>v1</item>
+        <item>v2</item>
+        <item>v3</item>
+    </string-array>
+
     <string-array name="sony_sound_position_names">
         <item>@string/sony_sound_position_off</item>
         <item>@string/sony_sound_position_front</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 33637e8b2..14c6722d4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2181,6 +2181,10 @@
     <string name="sony_ambient_sound_control_button_mode_as_off">Ambient Sound, Off</string>
     <string name="sony_quick_access_double_tap">Quick Access (Double Tap)</string>
     <string name="sony_quick_access_triple_tap">Quick Access (Triple Tap)</string>
+    <string name="sony_protocol_v1">Version 1</string>
+    <string name="sony_protocol_v2">Version 2</string>
+    <string name="sony_protocol_v3">Version 3</string>
+    <string name="protocol_version">Protocol Version</string>
     <string name="pref_screen_auto_brightness_title">Auto Brightness</string>
     <string name="pref_screen_auto_brightness_summary">Adjust screen brightness according to ambient light</string>
     <string name="pref_screen_brightness">Screen Brightness</string>
diff --git a/app/src/main/res/xml/devicesettings_sony_headphones_device_info.xml b/app/src/main/res/xml/devicesettings_sony_headphones_device_info.xml
index 0997efcfb..6bfc4c275 100644
--- a/app/src/main/res/xml/devicesettings_sony_headphones_device_info.xml
+++ b/app/src/main/res/xml/devicesettings_sony_headphones_device_info.xml
@@ -14,5 +14,14 @@
             android:title="@string/audio_codec"
             app:useSimpleSummaryProvider="true" />
 
+        <EditTextPreference
+            android:defaultValue="\?"
+            android:enabled="false"
+            android:icon="@drawable/ic_developer_mode"
+            android:key="pref_actual_protocol_version"
+            android:shouldDisableView="false"
+            android:title="@string/protocol_version"
+            app:useSimpleSummaryProvider="true" />
+
     </PreferenceCategory>
 </androidx.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml/devicesettings_sony_headphones_protocol_version.xml b/app/src/main/res/xml/devicesettings_sony_headphones_protocol_version.xml
new file mode 100644
index 000000000..c9e1d7337
--- /dev/null
+++ b/app/src/main/res/xml/devicesettings_sony_headphones_protocol_version.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <ListPreference
+        android:defaultValue="auto"
+        android:entries="@array/sony_protocol_version_names"
+        android:entryValues="@array/sony_protocol_version_values"
+        android:icon="@drawable/ic_developer_mode"
+        android:key="pref_protocol_version"
+        android:summary="%s"
+        android:title="@string/protocol_version"
+        app:useSimpleSummaryProvider="true" />
+
+</androidx.preference.PreferenceScreen>

From abb2960b6a10a47d2c6c8db2bf67caf0b1ff154c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Wed, 17 Jan 2024 19:17:45 +0000
Subject: [PATCH 474/595] Update changelog

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 46c76c4d3..3c37c6fb1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 ### Changelog
 
+#### Next Version (WIP)
+
+* Initial support for Mijia MHO-C303
+* Redmi Smart Band Pro: Fix password digits
+* Zepp OS: Fix weather not working on some devices
+* Fix sport activity summary group order
+
 #### 0.78.0
 * Initial support for Honor Band 3,4,5,6
 * Initial support for Huawei Band 4, 4 Pro, 6, 7, 3e, 4e

From 8574a41fe778aec4b8c2ed46be694c1a26acb012 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Wed, 17 Jan 2024 20:13:07 +0000
Subject: [PATCH 475/595] Xiaomi: Fix sleep sometimes extending past the wakeup
 time

---
 .../devices/xiaomi/XiaomiSampleProvider.java   | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSampleProvider.java
index b3e36aefd..5fd9581b2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSampleProvider.java
@@ -97,11 +97,22 @@ public class XiaomiSampleProvider extends AbstractSampleProvider<XiaomiActivityS
         return samples;
     }
 
+    /**
+     * Overlay sleep states on activity samples, since they are stored on a separate table.
+     *
+     * @implNote This currently needs to look back a further 24h, so that we are sure that we
+     * got the sleep start of a sleep session at the start of the samples, if any. This is especially
+     * noticeable if the charts are configured in a noon-to-noon setting. FIXME: This is not ideal,
+     * and we may need to rethink the way sleep samples are persisted in the database for Xiaomi devices.
+     */
     public void overlaySleep(final List<XiaomiActivitySample> samples, final int timestamp_from, final int timestamp_to) {
         final RangeMap<Long, Integer> stagesMap = new RangeMap<>();
 
         final XiaomiSleepStageSampleProvider sleepStagesSampleProvider = new XiaomiSleepStageSampleProvider(getDevice(), getSession());
-        final List<XiaomiSleepStageSample> stageSamples = sleepStagesSampleProvider.getAllSamples(timestamp_from * 1000L, timestamp_to * 1000L);
+        final List<XiaomiSleepStageSample> stageSamples = sleepStagesSampleProvider.getAllSamples(
+                timestamp_from * 1000L - 86400000L,
+                timestamp_to * 1000L
+        );
         if (!stageSamples.isEmpty()) {
             // We got actual sleep stages
             LOG.debug("Found {} sleep stage samples between {} and {}", stageSamples.size(), timestamp_from, timestamp_to);
@@ -132,7 +143,10 @@ public class XiaomiSampleProvider extends AbstractSampleProvider<XiaomiActivityS
 
         // Fetch bed and wakeup times as well.
         final XiaomiSleepTimeSampleProvider sleepTimeSampleProvider = new XiaomiSleepTimeSampleProvider(getDevice(), getSession());
-        final List<XiaomiSleepTimeSample> sleepTimeSamples = sleepTimeSampleProvider.getAllSamples(timestamp_from * 1000L, timestamp_to * 1000L);
+        final List<XiaomiSleepTimeSample> sleepTimeSamples = sleepTimeSampleProvider.getAllSamples(
+                timestamp_from * 1000L - 86400000L,
+                timestamp_to * 1000L
+        );
         if (!sleepTimeSamples.isEmpty()) {
             LOG.debug("Found {} sleep samples between {} and {}", sleepTimeSamples.size(), timestamp_from, timestamp_to);
             for (final XiaomiSleepTimeSample stageSample : sleepTimeSamples) {

From 25dcba23c39fbc742e4abb01ef8795c45c169b91 Mon Sep 17 00:00:00 2001
From: MrYoranimo <yvulker@gmail.com>
Date: Mon, 11 Dec 2023 16:38:06 +0100
Subject: [PATCH 476/595] Upgrade build-tools (33.0.0 -> 33.0.1)

This fixes a segfault in the aidl utility on Windows.
---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index c136090b8..f36a52fa5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -79,7 +79,7 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
     compileSdkVersion 33
-    buildToolsVersion "33.0.0"
+    buildToolsVersion "33.0.1"
 
     defaultConfig {
         applicationId "nodomain.freeyourgadget.gadgetbridge"

From 98e8ec23293ccd20e0130647b19b315e89d3826c Mon Sep 17 00:00:00 2001
From: MrYoranimo <yvulker@gmail.com>
Date: Thu, 14 Dec 2023 12:51:12 +0100
Subject: [PATCH 477/595] Xiaomi: Introduce XiaomiConnectionSupport
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: José Rebelo <joserebelo@outlook.com>
---
 .../devices/xiaomi/XiaomiAuthService.java     |  35 +--
 .../devices/xiaomi/XiaomiBleSupport.java      | 242 ++++++++++++++++
 .../devices/xiaomi/XiaomiChannelHandler.java  |   5 +
 .../devices/xiaomi/XiaomiCharacteristic.java  |  31 +-
 .../xiaomi/XiaomiConnectionSupport.java       |  33 +++
 .../service/devices/xiaomi/XiaomiSupport.java | 272 +++++++-----------
 .../services/XiaomiNotificationService.java   |   6 +-
 .../xiaomi/services/XiaomiSystemService.java  |  25 +-
 .../services/XiaomiWatchfaceService.java      |  25 +-
 app/src/main/res/values/strings.xml           |   4 +
 10 files changed, 428 insertions(+), 250 deletions(-)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiBleSupport.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiChannelHandler.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiConnectionSupport.java

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java
index 9ab5e16da..3ef9f5f11 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java
@@ -57,12 +57,10 @@ import nodomain.freeyourgadget.gadgetbridge.util.GB;
 public class XiaomiAuthService extends AbstractXiaomiService {
     private static final Logger LOG = LoggerFactory.getLogger(XiaomiAuthService.class);
 
-    public static final byte[] PAYLOAD_HEADER_AUTH = new byte[]{0, 0, 2, 2};
 
     public static final int COMMAND_TYPE = 1;
 
     public static final int CMD_SEND_USERID = 5;
-
     public static final int CMD_NONCE = 26;
     public static final int CMD_AUTH = 27;
 
@@ -83,7 +81,8 @@ public class XiaomiAuthService extends AbstractXiaomiService {
         return encryptionInitialized;
     }
 
-    protected void startEncryptedHandshake(final TransactionBuilder builder) {
+    // TODO also implement for spp
+    protected void startEncryptedHandshake(final XiaomiBleSupport support, final TransactionBuilder builder) {
         encryptionInitialized = false;
 
         builder.add(new SetDeviceStateAction(getSupport().getDevice(), GBDevice.State.AUTHENTICATING, getSupport().getContext()));
@@ -91,10 +90,10 @@ public class XiaomiAuthService extends AbstractXiaomiService {
         System.arraycopy(getSecretKey(getSupport().getDevice()), 0, secretKey, 0, 16);
         new SecureRandom().nextBytes(nonce);
 
-        getSupport().sendCommand(builder, buildNonceCommand(nonce));
+        support.sendCommand(builder, buildNonceCommand(nonce));
     }
 
-    protected void startClearTextHandshake(final TransactionBuilder builder) {
+    protected void startClearTextHandshake(final XiaomiBleSupport support, final TransactionBuilder builder) {
         builder.add(new SetDeviceStateAction(getSupport().getDevice(), GBDevice.State.AUTHENTICATING, getSupport().getContext()));
 
         final XiaomiProto.Auth auth = XiaomiProto.Auth.newBuilder()
@@ -107,7 +106,7 @@ public class XiaomiAuthService extends AbstractXiaomiService {
                 .setAuth(auth)
                 .build();
 
-        getSupport().sendCommand(builder, command);
+        support.sendCommand(builder, command);
     }
 
     @Override
@@ -121,33 +120,27 @@ public class XiaomiAuthService extends AbstractXiaomiService {
                 LOG.debug("Got watch nonce");
 
                 // Watch nonce
-                final XiaomiProto.Command reply = handleWatchNonce(cmd.getAuth().getWatchNonce());
-                if (reply == null) {
+                final XiaomiProto.Command command = handleWatchNonce(cmd.getAuth().getWatchNonce());
+                if (command == null) {
                     getSupport().disconnect();
                     return;
                 }
 
-                final TransactionBuilder builder = getSupport().createTransactionBuilder("auth step 2");
-                // TODO use sendCommand
-                builder.write(
-                        getSupport().getCharacteristic(getSupport().characteristicCommandWrite.getCharacteristicUUID()),
-                        ArrayUtils.addAll(PAYLOAD_HEADER_AUTH, reply.toByteArray())
-                );
-                builder.queue(getSupport().getQueue());
+                getSupport().sendCommand("auth step 2", command);
                 break;
             }
 
             case CMD_AUTH:
             case CMD_SEND_USERID: {
                 if (cmd.getSubtype() == CMD_AUTH || cmd.getAuth().getStatus() == 1) {
-                    LOG.info("Authenticated!");
-
                     encryptionInitialized = cmd.getSubtype() == CMD_AUTH;
 
-                    final TransactionBuilder builder = getSupport().createTransactionBuilder("phase 2 initialize");
-                    builder.add(new SetDeviceStateAction(getSupport().getDevice(), GBDevice.State.INITIALIZED, getSupport().getContext()));
-                    getSupport().phase2Initialize();
-                    builder.queue(getSupport().getQueue());
+                    LOG.info("Authenticated, further communications are {}", encryptionInitialized ? "encrypted" : "in plaintext");
+
+                    getSupport().getDevice().setState(GBDevice.State.INITIALIZED);
+                    getSupport().getDevice().sendDeviceUpdateIntent(getSupport().getContext(), GBDevice.DeviceUpdateSubject.DEVICE_STATE);
+
+                    getSupport().onAuthSuccess();
                 } else {
                     LOG.warn("could not authenticate");
                 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiBleSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiBleSupport.java
new file mode 100644
index 000000000..138c5a7c2
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiBleSupport.java
@@ -0,0 +1,242 @@
+package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi;
+
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothGatt;
+import android.bluetooth.BluetoothGattCharacteristic;
+import android.content.Context;
+import android.widget.Toast;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.AbstractBTLEDeviceSupport;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.BtLEQueue;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetDeviceStateAction;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetProgressAction;
+import nodomain.freeyourgadget.gadgetbridge.util.GB;
+
+public class XiaomiBleSupport extends XiaomiConnectionSupport {
+    private static final Logger LOG = LoggerFactory.getLogger(XiaomiBleSupport.class);
+
+    private XiaomiCharacteristic characteristicCommandRead;
+    private XiaomiCharacteristic characteristicCommandWrite;
+    private XiaomiCharacteristic characteristicActivityData;
+    private XiaomiCharacteristic characteristicDataUpload;
+
+    private final XiaomiSupport mXiaomiSupport;
+
+    final AbstractBTLEDeviceSupport commsSupport = new AbstractBTLEDeviceSupport(LOG) {
+        @Override
+        public boolean useAutoConnect() {
+            return mXiaomiSupport.useAutoConnect();
+        }
+
+        @Override
+        protected Set<UUID> getSupportedServices() {
+            return XiaomiBleUuids.UUIDS.keySet();
+        }
+
+        @Override
+        protected final TransactionBuilder initializeDevice(final TransactionBuilder builder) {
+            XiaomiBleUuids.XiaomiBleUuidSet uuidSet = null;
+            BluetoothGattCharacteristic btCharacteristicCommandRead = null;
+            BluetoothGattCharacteristic btCharacteristicCommandWrite = null;
+            BluetoothGattCharacteristic btCharacteristicActivityData = null;
+            BluetoothGattCharacteristic btCharacteristicDataUpload = null;
+
+            // Attempt to find a known xiaomi service
+            for (Map.Entry<UUID, XiaomiBleUuids.XiaomiBleUuidSet> xiaomiUuid : XiaomiBleUuids.UUIDS.entrySet()) {
+                if (getSupportedServices().contains(xiaomiUuid.getKey())) {
+                    LOG.debug("Found Xiaomi service: {}", xiaomiUuid.getKey());
+                    uuidSet = xiaomiUuid.getValue();
+
+                    btCharacteristicCommandRead = getCharacteristic(uuidSet.getCharacteristicCommandRead());
+                    btCharacteristicCommandWrite = getCharacteristic(uuidSet.getCharacteristicCommandWrite());
+                    btCharacteristicActivityData = getCharacteristic(uuidSet.getCharacteristicActivityData());
+                    btCharacteristicDataUpload = getCharacteristic(uuidSet.getCharacteristicDataUpload());
+                    if (btCharacteristicCommandRead == null) {
+                        LOG.warn("btCharacteristicCommandRead characteristicc is null");
+                        continue;
+                    } else if (btCharacteristicCommandWrite == null) {
+                        LOG.warn("btCharacteristicCommandWrite characteristicc is null");
+                        continue;
+                    } else if (btCharacteristicActivityData == null) {
+                        LOG.warn("btCharacteristicActivityData characteristicc is null");
+                        continue;
+                    } else if (btCharacteristicDataUpload == null) {
+                        LOG.warn("btCharacteristicDataUpload characteristicc is null");
+                        continue;
+                    }
+
+                    break;
+                }
+            }
+
+            if (uuidSet == null) {
+                GB.toast(getContext(), "Failed to find known Xiaomi service", Toast.LENGTH_LONG, GB.ERROR);
+                LOG.warn("Failed to find known Xiaomi service");
+                builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.NOT_CONNECTED, getContext()));
+                return builder;
+            }
+
+            // FIXME unsetDynamicState unsets the fw version, which causes problems..
+            if (getDevice().getFirmwareVersion() == null && mXiaomiSupport.getCachedFirmwareVersion() != null) {
+                getDevice().setFirmwareVersion(mXiaomiSupport.getCachedFirmwareVersion());
+            }
+
+            if (btCharacteristicCommandRead == null || btCharacteristicCommandWrite == null) {
+                LOG.warn("Characteristics are null, will attempt to reconnect");
+                builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.WAITING_FOR_RECONNECT, getContext()));
+                return builder;
+            }
+
+            XiaomiBleSupport.this.characteristicCommandRead = new XiaomiCharacteristic(XiaomiBleSupport.this, btCharacteristicCommandRead, mXiaomiSupport.getAuthService());
+            XiaomiBleSupport.this.characteristicCommandRead.setEncrypted(uuidSet.isEncrypted());
+            XiaomiBleSupport.this.characteristicCommandRead.setChannelHandler(mXiaomiSupport::handleCommandBytes);
+            XiaomiBleSupport.this.characteristicCommandWrite = new XiaomiCharacteristic(XiaomiBleSupport.this, btCharacteristicCommandWrite, mXiaomiSupport.getAuthService());
+            XiaomiBleSupport.this.characteristicCommandWrite.setEncrypted(uuidSet.isEncrypted());
+            XiaomiBleSupport.this.characteristicActivityData = new XiaomiCharacteristic(XiaomiBleSupport.this, btCharacteristicActivityData, mXiaomiSupport.getAuthService());
+            XiaomiBleSupport.this.characteristicActivityData.setChannelHandler(mXiaomiSupport.getHealthService().getActivityFetcher()::addChunk);
+            XiaomiBleSupport.this.characteristicActivityData.setEncrypted(uuidSet.isEncrypted());
+            XiaomiBleSupport.this.characteristicDataUpload = new XiaomiCharacteristic(XiaomiBleSupport.this, btCharacteristicDataUpload, mXiaomiSupport.getAuthService());
+            XiaomiBleSupport.this.characteristicDataUpload.setEncrypted(uuidSet.isEncrypted());
+            XiaomiBleSupport.this.characteristicDataUpload.setIncrementNonce(false);
+
+            mXiaomiSupport.getDataUploadService().setDataUploadCharacteristic(XiaomiBleSupport.this.characteristicDataUpload);
+
+            builder.requestMtu(247);
+            builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.INITIALIZING, getContext()));
+            builder.notify(btCharacteristicCommandWrite, true);
+            builder.notify(btCharacteristicCommandRead, true);
+            builder.notify(btCharacteristicActivityData, true);
+            builder.notify(btCharacteristicDataUpload, true);
+
+            if (uuidSet.isEncrypted()) {
+                mXiaomiSupport.getAuthService().startEncryptedHandshake(XiaomiBleSupport.this, builder);
+            } else {
+                mXiaomiSupport.getAuthService().startClearTextHandshake(XiaomiBleSupport.this, builder);
+            }
+
+            return builder;
+        }
+
+        @Override
+        public boolean onCharacteristicChanged(final BluetoothGatt gatt, final BluetoothGattCharacteristic characteristic) {
+            if (super.onCharacteristicChanged(gatt, characteristic)) {
+                return true;
+            }
+
+            final UUID characteristicUUID = characteristic.getUuid();
+            final byte[] value = characteristic.getValue();
+
+            if (characteristicCommandRead.getCharacteristicUUID().equals(characteristicUUID)) {
+                characteristicCommandRead.onCharacteristicChanged(value);
+                return true;
+            } else if (characteristicCommandWrite.getCharacteristicUUID().equals(characteristicUUID)) {
+                characteristicCommandWrite.onCharacteristicChanged(value);
+                return true;
+            } else if (characteristicActivityData.getCharacteristicUUID().equals(characteristicUUID)) {
+                characteristicActivityData.onCharacteristicChanged(value);
+                return true;
+            } else if (characteristicDataUpload.getCharacteristicUUID().equals(characteristicUUID)) {
+                characteristicDataUpload.onCharacteristicChanged(value);
+                return true;
+            }
+
+            LOG.warn("Unhandled characteristic changed: {} {}", characteristicUUID, GB.hexdump(value));
+            return false;
+        }
+
+        @Override
+        public boolean getImplicitCallbackModify() {
+            return mXiaomiSupport.getImplicitCallbackModify();
+        }
+    };
+
+    public XiaomiBleSupport(final XiaomiSupport xiaomiSupport) {
+        this.mXiaomiSupport = xiaomiSupport;
+    }
+
+    public void onAuthSuccess() {
+        characteristicCommandRead.reset();
+        characteristicCommandWrite.reset();
+        characteristicActivityData.reset();
+        characteristicDataUpload.reset();
+    }
+
+    @Override
+    public void setContext(GBDevice device, BluetoothAdapter adapter, Context context) {
+        this.commsSupport.setContext(device, adapter, context);
+    }
+
+    @Override
+    public void disconnect() {
+        this.commsSupport.disconnect();
+    }
+
+    public void sendCommand(final String taskName, final XiaomiProto.Command command) {
+        if (this.characteristicCommandWrite == null) {
+            // Can sometimes happen in race conditions when connecting + receiving calendar event or weather updates
+            LOG.warn("characteristicCommandWrite is null!");
+            return;
+        }
+
+        this.characteristicCommandWrite.write(taskName, command.toByteArray());
+    }
+
+    /**
+     * Realistically, this function should only be used during auth, as we must schedule the command after
+     * notifications were enabled on the characteristics, and for that we need the builder to guarantee the
+     * order.
+     */
+    public void sendCommand(final TransactionBuilder builder, final XiaomiProto.Command command) {
+        if (this.characteristicCommandWrite == null) {
+            // Can sometimes happen in race conditions when connecting + receiving calendar event or weather updates
+            LOG.warn("characteristicCommandWrite is null!");
+            return;
+        }
+
+        this.characteristicCommandWrite.write(builder, command.toByteArray());
+    }
+
+    public TransactionBuilder createTransactionBuilder(String taskName) {
+        return commsSupport.createTransactionBuilder(taskName);
+    }
+
+    public BtLEQueue getQueue() {
+        return commsSupport.getQueue();
+    }
+
+    @Override
+    public void onUploadProgress(int textRsrc, int progressPercent) {
+        try {
+            final TransactionBuilder builder = commsSupport.createTransactionBuilder("send data upload progress");
+            builder.add(new SetProgressAction(
+                    commsSupport.getContext().getString(textRsrc),
+                    true,
+                    progressPercent,
+                    commsSupport.getContext()
+            ));
+            builder.queue(commsSupport.getQueue());
+        } catch (final Exception e) {
+            LOG.error("Failed to update progress notification", e);
+        }
+    }
+
+    @Override
+    public boolean connect() {
+        return commsSupport.connect();
+    }
+
+    @Override
+    public void dispose() {
+        commsSupport.dispose();
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiChannelHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiChannelHandler.java
new file mode 100644
index 000000000..eee5a20e8
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiChannelHandler.java
@@ -0,0 +1,5 @@
+package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi;
+
+public interface XiaomiChannelHandler {
+    void handle(final byte[] payload);
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
index 8ad1dcf28..e66520c76 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
@@ -45,7 +45,7 @@ public class XiaomiCharacteristic {
     // max chunk size, including headers
     public static final int MAX_WRITE_SIZE = 242;
 
-    private final XiaomiSupport mSupport;
+    private final XiaomiBleSupport mSupport;
 
     private final BluetoothGattCharacteristic bluetoothGattCharacteristic;
     private final UUID characteristicUUID;
@@ -68,11 +68,11 @@ public class XiaomiCharacteristic {
     private boolean sendingChunked = false;
     private Payload currentPayload = null;
 
-    private Handler handler = null;
+    private XiaomiChannelHandler channelHandler = null;
 
     private SendCallback callback;
 
-    public XiaomiCharacteristic(final XiaomiSupport support,
+    public XiaomiCharacteristic(final XiaomiBleSupport support,
                                 final BluetoothGattCharacteristic bluetoothGattCharacteristic,
                                 @Nullable final XiaomiAuthService authService) {
         this.mSupport = support;
@@ -86,8 +86,8 @@ public class XiaomiCharacteristic {
         return characteristicUUID;
     }
 
-    public void setHandler(final Handler handler) {
-        this.handler = handler;
+    public void setChannelHandler(final XiaomiChannelHandler handler) {
+        this.channelHandler = handler;
     }
 
     public void setCallback(final SendCallback callback) {
@@ -162,11 +162,15 @@ public class XiaomiCharacteristic {
             if (chunk == numChunks) {
                 sendChunkEndAck();
 
-                if (isEncrypted) {
-                    // chunks are always encrypted if an auth service is available
-                    handler.handle(authService.decrypt(chunkBuffer.toByteArray()));
+                if (channelHandler != null) {
+                    if (isEncrypted) {
+                        // chunks are always encrypted if an auth service is available
+                        channelHandler.handle(authService.decrypt(chunkBuffer.toByteArray()));
+                    } else {
+                        channelHandler.handle(chunkBuffer.toByteArray());
+                    }
                 } else {
-                    handler.handle(chunkBuffer.toByteArray());
+                    LOG.warn("Channel handler for char {} is null!", characteristicUUID);
                 }
 
                 currentChunk = 0;
@@ -249,7 +253,10 @@ public class XiaomiCharacteristic {
                         buf.get(plainValue);
                     }
 
-                    handler.handle(plainValue);
+                    if (channelHandler != null)
+                        channelHandler.handle(plainValue);
+                    else
+                        LOG.warn("Channel handler for char {} is null!", characteristicUUID);
 
                     return;
                 case 3:
@@ -362,10 +369,6 @@ public class XiaomiCharacteristic {
         builder.queue(mSupport.getQueue());
     }
 
-    public interface Handler {
-        void handle(final byte[] payload);
-    }
-
     private static class Payload {
         private final String taskName;
         private final byte[] bytes;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiConnectionSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiConnectionSupport.java
new file mode 100644
index 000000000..df47cf4c9
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiConnectionSupport.java
@@ -0,0 +1,33 @@
+/*  Copyright (C) 2023 José Rebelo, Yoran Vulker
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi;
+
+import android.bluetooth.BluetoothAdapter;
+import android.content.Context;
+
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
+
+public abstract class XiaomiConnectionSupport {
+    public abstract boolean connect();
+    public abstract void onAuthSuccess();
+    public abstract void onUploadProgress(int textRsrc, int progressPercent);
+    public abstract void dispose();
+    public abstract void setContext(final GBDevice device, final BluetoothAdapter adapter, final Context context);
+    public abstract void disconnect();
+    public abstract void sendCommand(final String taskName, final XiaomiProto.Command command);
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
index 154bf6059..5fd6aaa41 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
@@ -18,12 +18,9 @@ package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi;
 
 
 import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.BluetoothGatt;
-import android.bluetooth.BluetoothGattCharacteristic;
 import android.content.Context;
 import android.location.Location;
 import android.net.Uri;
-import android.widget.Toast;
 
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -42,6 +39,7 @@ import java.util.UUID;
 
 import nodomain.freeyourgadget.gadgetbridge.BuildConfig;
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.devices.DeviceCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiFWHelper;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
@@ -57,9 +55,7 @@ import nodomain.freeyourgadget.gadgetbridge.model.Reminder;
 import nodomain.freeyourgadget.gadgetbridge.model.WeatherSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.WorldClock;
 import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
-import nodomain.freeyourgadget.gadgetbridge.service.btle.AbstractBTLEDeviceSupport;
-import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
-import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetDeviceStateAction;
+import nodomain.freeyourgadget.gadgetbridge.service.AbstractDeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.XiaomiActivityFileId;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.XiaomiActivityParser;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.AbstractXiaomiService;
@@ -77,27 +73,23 @@ import nodomain.freeyourgadget.gadgetbridge.util.FileUtils;
 import nodomain.freeyourgadget.gadgetbridge.util.GB;
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 
-public class XiaomiSupport extends AbstractBTLEDeviceSupport {
+public class XiaomiSupport extends AbstractDeviceSupport {
     private static final Logger LOG = LoggerFactory.getLogger(XiaomiSupport.class);
 
-    protected XiaomiCharacteristic characteristicCommandRead;
-    protected XiaomiCharacteristic characteristicCommandWrite;
-    protected XiaomiCharacteristic characteristicActivityData;
-    protected XiaomiCharacteristic characteristicDataUpload;
+    private final XiaomiAuthService authService = new XiaomiAuthService(this);
+    private final XiaomiMusicService musicService = new XiaomiMusicService(this);
+    private final XiaomiHealthService healthService = new XiaomiHealthService(this);
+    private final XiaomiNotificationService notificationService = new XiaomiNotificationService(this);
+    private final XiaomiScheduleService scheduleService = new XiaomiScheduleService(this);
+    private final XiaomiWeatherService weatherService = new XiaomiWeatherService(this);
+    private final XiaomiSystemService systemService = new XiaomiSystemService(this);
+    private final XiaomiCalendarService calendarService = new XiaomiCalendarService(this);
+    private final XiaomiWatchfaceService watchfaceService = new XiaomiWatchfaceService(this);
+    private final XiaomiDataUploadService dataUploadService = new XiaomiDataUploadService(this);
+    private final XiaomiPhonebookService phonebookService = new XiaomiPhonebookService(this);
 
-    protected final XiaomiAuthService authService = new XiaomiAuthService(this);
-    protected final XiaomiMusicService musicService = new XiaomiMusicService(this);
-    protected final XiaomiHealthService healthService = new XiaomiHealthService(this);
-    protected final XiaomiNotificationService notificationService = new XiaomiNotificationService(this);
-    protected final XiaomiScheduleService scheduleService = new XiaomiScheduleService(this);
-    protected final XiaomiWeatherService weatherService = new XiaomiWeatherService(this);
-    protected final XiaomiSystemService systemService = new XiaomiSystemService(this);
-    protected final XiaomiCalendarService calendarService = new XiaomiCalendarService(this);
-    protected final XiaomiWatchfaceService watchfaceService = new XiaomiWatchfaceService(this);
-    protected final XiaomiDataUploadService dataUploadService = new XiaomiDataUploadService(this);
-    protected final XiaomiPhonebookService phonebookService = new XiaomiPhonebookService(this);
-
-    private String mFirmwareVersion = null;
+    private String cachedFirmwareVersion = null;
+    private XiaomiConnectionSupport connectionSupport = null;
 
     private final Map<Integer, AbstractXiaomiService> mServiceMap = new LinkedHashMap<Integer, AbstractXiaomiService>() {{
         put(XiaomiAuthService.COMMAND_TYPE, authService);
@@ -113,98 +105,6 @@ public class XiaomiSupport extends AbstractBTLEDeviceSupport {
         put(XiaomiPhonebookService.COMMAND_TYPE, phonebookService);
     }};
 
-    public XiaomiSupport() {
-        super(LOG);
-        for (final UUID uuid : XiaomiBleUuids.UUIDS.keySet()) {
-            addSupportedService(uuid);
-        }
-    }
-
-    @Override
-    protected final TransactionBuilder initializeDevice(final TransactionBuilder builder) {
-        XiaomiBleUuids.XiaomiBleUuidSet uuidSet = null;
-        BluetoothGattCharacteristic btCharacteristicCommandRead = null;
-        BluetoothGattCharacteristic btCharacteristicCommandWrite = null;
-        BluetoothGattCharacteristic btCharacteristicActivityData = null;
-        BluetoothGattCharacteristic btCharacteristicDataUpload = null;
-
-        // Attempt to find a known xiaomi service
-        for (Map.Entry<UUID, XiaomiBleUuids.XiaomiBleUuidSet> xiaomiUuid : XiaomiBleUuids.UUIDS.entrySet()) {
-            if (getSupportedServices().contains(xiaomiUuid.getKey())) {
-                LOG.debug("Found Xiaomi service: {}", xiaomiUuid.getKey());
-                uuidSet = xiaomiUuid.getValue();
-
-                btCharacteristicCommandRead = getCharacteristic(uuidSet.getCharacteristicCommandRead());
-                btCharacteristicCommandWrite = getCharacteristic(uuidSet.getCharacteristicCommandWrite());
-                btCharacteristicActivityData = getCharacteristic(uuidSet.getCharacteristicActivityData());
-                btCharacteristicDataUpload = getCharacteristic(uuidSet.getCharacteristicDataUpload());
-                if (btCharacteristicCommandRead == null) {
-                    LOG.warn("btCharacteristicCommandRead characteristicc is null");
-                    continue;
-                } else if (btCharacteristicCommandWrite == null) {
-                    LOG.warn("btCharacteristicCommandWrite characteristicc is null");
-                    continue;
-                } else if (btCharacteristicActivityData == null) {
-                    LOG.warn("btCharacteristicActivityData characteristicc is null");
-                    continue;
-                } else if (btCharacteristicDataUpload == null) {
-                    LOG.warn("btCharacteristicDataUpload characteristicc is null");
-                    continue;
-                }
-
-                break;
-            }
-        }
-
-        if (uuidSet == null) {
-            GB.toast(getContext(), "Failed to find known Xiaomi service", Toast.LENGTH_LONG, GB.ERROR);
-            LOG.warn("Failed to find known Xiaomi service");
-            builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.NOT_CONNECTED, getContext()));
-            return builder;
-        }
-
-        // FIXME unsetDynamicState unsets the fw version, which causes problems..
-        if (getDevice().getFirmwareVersion() == null && mFirmwareVersion != null) {
-            getDevice().setFirmwareVersion(mFirmwareVersion);
-        }
-
-        if (btCharacteristicCommandRead == null || btCharacteristicCommandWrite == null) {
-            LOG.warn("Characteristics are null, will attempt to reconnect");
-            builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.WAITING_FOR_RECONNECT, getContext()));
-            return builder;
-        }
-
-        this.characteristicCommandRead = new XiaomiCharacteristic(this, btCharacteristicCommandRead, authService);
-        this.characteristicCommandRead.setEncrypted(uuidSet.isEncrypted());
-        this.characteristicCommandRead.setHandler(this::handleCommandBytes);
-        this.characteristicCommandWrite = new XiaomiCharacteristic(this, btCharacteristicCommandWrite, authService);
-        this.characteristicCommandWrite.setEncrypted(uuidSet.isEncrypted());
-        this.characteristicActivityData = new XiaomiCharacteristic(this, btCharacteristicActivityData, authService);
-        this.characteristicActivityData.setHandler(healthService.getActivityFetcher()::addChunk);
-        this.characteristicActivityData.setEncrypted(uuidSet.isEncrypted());
-        this.characteristicDataUpload = new XiaomiCharacteristic(this, btCharacteristicDataUpload, authService);
-        this.characteristicDataUpload.setEncrypted(uuidSet.isEncrypted());
-        this.characteristicDataUpload.setIncrementNonce(false);
-        this.dataUploadService.setDataUploadCharacteristic(this.characteristicDataUpload);
-
-        builder.requestMtu(247);
-
-        builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.INITIALIZING, getContext()));
-
-        builder.notify(btCharacteristicCommandWrite, true);
-        builder.notify(btCharacteristicCommandRead, true);
-        builder.notify(btCharacteristicActivityData, true);
-        builder.notify(btCharacteristicDataUpload, true);
-
-        if (uuidSet.isEncrypted()) {
-            authService.startEncryptedHandshake(builder);
-        } else {
-            authService.startClearTextHandshake(builder);
-        }
-
-        return builder;
-    }
-
     @Override
     public boolean useAutoConnect() {
         return true;
@@ -215,46 +115,84 @@ public class XiaomiSupport extends AbstractBTLEDeviceSupport {
         return false;
     }
 
-    @Override
-    public void setContext(final GBDevice gbDevice, final BluetoothAdapter btAdapter, final Context context) {
-        // FIXME unsetDynamicState unsets the fw version, which causes problems..
-        if (mFirmwareVersion == null && gbDevice.getFirmwareVersion() != null) {
-            mFirmwareVersion = gbDevice.getFirmwareVersion();
+    private XiaomiConnectionSupport createConnectionSpecificSupport() {
+        DeviceCoordinator.ConnectionType connType = getCoordinator().getConnectionType();
+
+        switch (connType) {
+            case BLE:
+            case BOTH:
+                return new XiaomiBleSupport(this);
         }
 
-        super.setContext(gbDevice, btAdapter, context);
-        for (final AbstractXiaomiService service : mServiceMap.values()) {
-            service.setContext(context);
+        LOG.error("Cannot create connection-specific support, unhanded {} connection type", connType);
+        return null;
+    }
+
+    public XiaomiConnectionSupport getConnectionSpecificSupport() {
+        if (connectionSupport == null) {
+            connectionSupport = createConnectionSpecificSupport();
         }
+
+        return connectionSupport;
     }
 
     @Override
-    public boolean onCharacteristicChanged(final BluetoothGatt gatt, final BluetoothGattCharacteristic characteristic) {
-        if (super.onCharacteristicChanged(gatt, characteristic)) {
-            return true;
-        }
+    public boolean connect() {
+        if (getConnectionSpecificSupport() != null)
+            return getConnectionSpecificSupport().connect();
 
-        final UUID characteristicUUID = characteristic.getUuid();
-        final byte[] value = characteristic.getValue();
-
-        if (characteristicCommandRead.getCharacteristicUUID().equals(characteristicUUID)) {
-            characteristicCommandRead.onCharacteristicChanged(value);
-            return true;
-        } else if (characteristicCommandWrite.getCharacteristicUUID().equals(characteristicUUID)) {
-            characteristicCommandWrite.onCharacteristicChanged(value);
-            return true;
-        } else if (characteristicActivityData.getCharacteristicUUID().equals(characteristicUUID)) {
-            characteristicActivityData.onCharacteristicChanged(value);
-            return true;
-        } else if (characteristicDataUpload.getCharacteristicUUID().equals(characteristicUUID)) {
-            characteristicDataUpload.onCharacteristicChanged(value);
-            return true;
-        }
-
-        LOG.warn("Unhandled characteristic changed: {} {}", characteristicUUID, GB.hexdump(value));
+        LOG.error("getConnectionSpecificSupport returned null, could not connect");
         return false;
     }
 
+    public void onUploadProgress(int textRsrc, int progressPercent) {
+        if (getConnectionSpecificSupport() == null) {
+            LOG.error("onUploadProgress called but connection specific unavailable");
+            return;
+        }
+
+        getConnectionSpecificSupport().onUploadProgress(textRsrc, progressPercent);
+    }
+
+    @Override
+    public void dispose() {
+        if (getConnectionSpecificSupport() != null) {
+            getConnectionSpecificSupport().dispose();
+            connectionSupport = null;
+        }
+    }
+
+    public void setContext(final GBDevice device, final BluetoothAdapter adapter, final Context context) {
+        // FIXME unsetDynamicState unsets the fw version, which causes problems..
+        if (getCachedFirmwareVersion() == null && device.getFirmwareVersion() != null) {
+            setCachedFirmwareVersion(device.getFirmwareVersion());
+        }
+
+        super.setContext(device, adapter, context);
+
+        for (AbstractXiaomiService service : mServiceMap.values()) {
+            service.setContext(context);
+        }
+
+        if (getConnectionSpecificSupport() != null) {
+            getConnectionSpecificSupport().setContext(device, adapter, context);
+        }
+    }
+
+    public String getCachedFirmwareVersion() {
+        return this.cachedFirmwareVersion;
+    }
+
+    public void setCachedFirmwareVersion(String version) {
+        this.cachedFirmwareVersion = version;
+    }
+
+    public void disconnect() {
+        if (getConnectionSpecificSupport() != null) {
+            getConnectionSpecificSupport().disconnect();
+        }
+    }
+
     public void handleCommandBytes(final byte[] plainValue) {
         LOG.debug("Got command: {}", GB.hexdump(plainValue));
 
@@ -459,13 +397,10 @@ public class XiaomiSupport extends AbstractBTLEDeviceSupport {
         return (XiaomiCoordinator) gbDevice.getDeviceCoordinator();
     }
 
-    protected void phase2Initialize() {
-        LOG.info("phase2Initialize");
+    protected void onAuthSuccess() {
+        LOG.info("onAuthSuccess");
 
-        characteristicCommandRead.reset();
-        characteristicCommandWrite.reset();
-        characteristicActivityData.reset();
-        characteristicDataUpload.reset();
+        getConnectionSpecificSupport().onAuthSuccess();
 
         if (GBApplication.getPrefs().getBoolean("datetime_synconconnect", true)) {
             systemService.setCurrentTime();
@@ -477,28 +412,7 @@ public class XiaomiSupport extends AbstractBTLEDeviceSupport {
     }
 
     public void sendCommand(final String taskName, final XiaomiProto.Command command) {
-        if (this.characteristicCommandWrite == null) {
-            // Can sometimes happen in race conditions when connecting + receiving calendar event or weather updates
-            LOG.warn("characteristicCommandWrite is null!");
-            return;
-        }
-
-        this.characteristicCommandWrite.write(taskName, command.toByteArray());
-    }
-
-    /**
-     * Realistically, this function should only be used during auth, as we must schedule the command after
-     * notifications were enabled on the characteristics, and for that we need the builder to guarantee the
-     * order.
-     */
-    public void sendCommand(final TransactionBuilder builder, final XiaomiProto.Command command) {
-        if (this.characteristicCommandWrite == null) {
-            // Can sometimes happen in race conditions when connecting + receiving calendar event or weather updates
-            LOG.warn("characteristicCommandWrite is null!");
-            return;
-        }
-
-        this.characteristicCommandWrite.write(builder, command.toByteArray());
+        getConnectionSpecificSupport().sendCommand(taskName, command);
     }
 
     public void sendCommand(final String taskName, final int type, final int subtype) {
@@ -511,10 +425,18 @@ public class XiaomiSupport extends AbstractBTLEDeviceSupport {
         );
     }
 
-    public XiaomiDataUploadService getDataUploader() {
+    public XiaomiAuthService getAuthService() {
+        return this.authService;
+    }
+
+    public XiaomiDataUploadService getDataUploadService() {
         return this.dataUploadService;
     }
 
+    public XiaomiHealthService getHealthService() {
+        return this.healthService;
+    }
+
     @Override
     public String customStringFilter(final String inputString) {
         return StringUtils.replaceEach(inputString, EMOJI_SOURCE, EMOJI_TARGET);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
index 4c9d5dbf1..18cb79859 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
@@ -538,15 +538,15 @@ public class XiaomiNotificationService extends AbstractXiaomiService implements
             }
         }
 
-        getSupport().getDataUploader().setCallback(this);
-        getSupport().getDataUploader().requestUpload(XiaomiDataUploadService.TYPE_NOTIFICATION_ICON, buf.array());
+        getSupport().getDataUploadService().setCallback(this);
+        getSupport().getDataUploadService().requestUpload(XiaomiDataUploadService.TYPE_NOTIFICATION_ICON, buf.array());
     }
 
     @Override
     public void onUploadFinish(final boolean success) {
         LOG.debug("Notification icon upload finished: {}", success);
 
-        getSupport().getDataUploader().setCallback(null);
+        getSupport().getDataUploadService().setCallback(null);
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
index 79608e770..b83edd108 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
@@ -53,8 +53,6 @@ import nodomain.freeyourgadget.gadgetbridge.model.BatteryState;
 import nodomain.freeyourgadget.gadgetbridge.model.SleepState;
 import nodomain.freeyourgadget.gadgetbridge.model.WearingState;
 import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
-import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
-import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetProgressAction;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiPreferences;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
 import nodomain.freeyourgadget.gadgetbridge.util.CheckSums;
@@ -143,8 +141,8 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
 
                 LOG.debug("Firmware install status 0, uploading");
                 setDeviceBusy();
-                getSupport().getDataUploader().setCallback(this);
-                getSupport().getDataUploader().requestUpload(XiaomiDataUploadService.TYPE_FIRMWARE, fwHelper.getBytes());
+                getSupport().getDataUploadService().setCallback(this);
+                getSupport().getDataUploadService().requestUpload(XiaomiDataUploadService.TYPE_FIRMWARE, fwHelper.getBytes());
                 return;
             case CMD_PASSWORD_GET:
                 handlePassword(cmd.getSystem().getPassword());
@@ -315,9 +313,9 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
         gbDeviceEventVersionInfo.fwVersion = deviceInfo.getFirmware();
         //gbDeviceEventVersionInfo.fwVersion2 = "N/A";
         gbDeviceEventVersionInfo.hwVersion = deviceInfo.getModel();
-        final GBDeviceEventUpdateDeviceInfo gbDeviceEventUpdateDeviceInfo = new GBDeviceEventUpdateDeviceInfo("SERIAL: ", deviceInfo.getSerialNumber());
-
         getSupport().evaluateGBDeviceEvent(gbDeviceEventVersionInfo);
+
+        final GBDeviceEventUpdateDeviceInfo gbDeviceEventUpdateDeviceInfo = new GBDeviceEventUpdateDeviceInfo("SERIAL: ", deviceInfo.getSerialNumber());
         getSupport().evaluateGBDeviceEvent(gbDeviceEventUpdateDeviceInfo);
     }
 
@@ -937,7 +935,7 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
     public void onUploadFinish(final boolean success) {
         LOG.debug("Firmware upload finished: {}", success);
 
-        getSupport().getDataUploader().setCallback(null);
+        getSupport().getDataUploadService().setCallback(null);
 
         final String notificationMessage = success ?
                 getSupport().getContext().getString(R.string.updatefirmwareoperation_update_complete) :
@@ -952,17 +950,6 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
 
     @Override
     public void onUploadProgress(final int progressPercent) {
-        try {
-            final TransactionBuilder builder = getSupport().createTransactionBuilder("send data upload progress");
-            builder.add(new SetProgressAction(
-                    getSupport().getContext().getString(R.string.updatefirmwareoperation_update_in_progress),
-                    true,
-                    progressPercent,
-                    getSupport().getContext()
-            ));
-            builder.queue(getSupport().getQueue());
-        } catch (final Exception e) {
-            LOG.error("Failed to update progress notification", e);
-        }
+        getSupport().onUploadProgress(R.string.updatefirmwareoperation_update_in_progress, progressPercent);
     }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWatchfaceService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWatchfaceService.java
index 7480eb0c8..02bec40d1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWatchfaceService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWatchfaceService.java
@@ -80,8 +80,8 @@ public class XiaomiWatchfaceService extends AbstractXiaomiService implements Xia
 
                 LOG.debug("Watchface install status 0, uploading");
                 setDeviceBusy();
-                getSupport().getDataUploader().setCallback(this);
-                getSupport().getDataUploader().requestUpload(XiaomiDataUploadService.TYPE_WATCHFACE, fwHelper.getBytes());
+                getSupport().getDataUploadService().setCallback(this);
+                getSupport().getDataUploadService().requestUpload(XiaomiDataUploadService.TYPE_WATCHFACE, fwHelper.getBytes());
                 return;
         }
 
@@ -230,11 +230,11 @@ public class XiaomiWatchfaceService extends AbstractXiaomiService implements Xia
     public void onUploadFinish(final boolean success) {
         LOG.debug("Watchface upload finished: {}", success);
 
-        getSupport().getDataUploader().setCallback(null);
+        getSupport().getDataUploadService().setCallback(null);
 
         final String notificationMessage = success ?
-                getSupport().getContext().getString(R.string.updatefirmwareoperation_update_complete) :
-                getSupport().getContext().getString(R.string.updatefirmwareoperation_write_failed);
+                getSupport().getContext().getString(R.string.uploadwatchfaceoperation_complete) :
+                getSupport().getContext().getString(R.string.uploadwatchfaceoperation_failed);
 
         GB.updateInstallNotification(notificationMessage, false, 100, getSupport().getContext());
 
@@ -250,23 +250,12 @@ public class XiaomiWatchfaceService extends AbstractXiaomiService implements Xia
 
     @Override
     public void onUploadProgress(final int progressPercent) {
-        try {
-            final TransactionBuilder builder = getSupport().createTransactionBuilder("send data upload progress");
-            builder.add(new SetProgressAction(
-                    getSupport().getContext().getString(R.string.updatefirmwareoperation_update_in_progress),
-                    true,
-                    progressPercent,
-                    getSupport().getContext()
-            ));
-            builder.queue(getSupport().getQueue());
-        } catch (final Exception e) {
-            LOG.error("Failed to update progress notification", e);
-        }
+        getSupport().onUploadProgress(R.string.uploadwatchfaceoperation_in_progress, progressPercent);
     }
 
     private void setDeviceBusy() {
         final GBDevice device = getSupport().getDevice();
-        device.setBusyTask(getSupport().getContext().getString(R.string.updating_firmware));
+        device.setBusyTask(getSupport().getContext().getString(R.string.uploading_watchface));
         device.sendDeviceUpdateIntent(getSupport().getContext());
     }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 14c6722d4..596d51c85 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2572,4 +2572,8 @@
     <string name="pref_title_fossil_hr_nav_vibrate">Vibrate on new instruction</string>
     <string name="pref_summary_fossil_hr_nav_vibrate">Whether the watch should vibrate on every new or changed navigation instruction (only when the app is in the foreground)</string>
     <string name="notification_channel_connection_status_name">Connection Status</string>
+    <string name="uploading_watchface">Uploading watchface…</string>
+    <string name="uploadwatchfaceoperation_in_progress">Uploading watchface</string>
+    <string name="uploadwatchfaceoperation_complete">Watchface installation completed</string>
+    <string name="uploadwatchfaceoperation_failed">Watchface installation failed</string>
 </resources>

From ac1991104b1de6ba2cb29f748e9ba5bff6c4bb67 Mon Sep 17 00:00:00 2001
From: MrYoranimo <yvulker@gmail.com>
Date: Wed, 10 Jan 2024 23:41:54 +0100
Subject: [PATCH 478/595] BtLEQueue: add null check in onMtuChanged for
 mWaitForActionResultLatch

---
 .../freeyourgadget/gadgetbridge/service/btle/BtLEQueue.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEQueue.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEQueue.java
index 492eb231e..fceb6ab82 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEQueue.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEQueue.java
@@ -583,7 +583,9 @@ public final class BtLEQueue {
                 getCallbackToUse().onMtuChanged(gatt, mtu, status);
             }
 
-            mWaitForActionResultLatch.countDown();
+            if (mWaitForActionResultLatch != null) {
+                mWaitForActionResultLatch.countDown();
+            }
         }
 
 

From ce179a29ae8d9c6c660de23851a90bfbf7ff563e Mon Sep 17 00:00:00 2001
From: MrYoranimo <yvulker@gmail.com>
Date: Wed, 10 Jan 2024 23:16:38 +0100
Subject: [PATCH 479/595] Xiaomi: introduce XiaomiSppSupport

---
 .../AbstractBLClassicDeviceCoordinator.java   |   2 +-
 .../devices/DeviceCoordinator.java            |   2 +-
 .../devices/xiaomi/XiaomiCoordinator.java     |   4 +-
 .../btbr/AbstractBTBRDeviceSupport.java       |   6 +
 .../gadgetbridge/service/btbr/BtBRQueue.java  | 138 +++++----
 .../btbr/actions/SetProgressAction.java       |  73 +++++
 .../devices/xiaomi/XiaomiAuthService.java     |  21 +-
 .../devices/xiaomi/XiaomiBleSupport.java      |  24 +-
 .../devices/xiaomi/XiaomiSppPacket.java       | 246 +++++++++++++++++
 .../devices/xiaomi/XiaomiSppSupport.java      | 261 ++++++++++++++++++
 .../service/devices/xiaomi/XiaomiSupport.java |   2 +
 .../{XiaomiBleUuids.java => XiaomiUuids.java} |   9 +-
 12 files changed, 722 insertions(+), 66 deletions(-)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/actions/SetProgressAction.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSppPacket.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSppSupport.java
 rename app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/{XiaomiBleUuids.java => XiaomiUuids.java} (90%)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractBLClassicDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractBLClassicDeviceCoordinator.java
index a2cf5c60d..64cda9847 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractBLClassicDeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractBLClassicDeviceCoordinator.java
@@ -19,6 +19,6 @@ package nodomain.freeyourgadget.gadgetbridge.devices;
 public abstract class AbstractBLClassicDeviceCoordinator extends AbstractDeviceCoordinator {
     @Override
     public ConnectionType getConnectionType() {
-        return ConnectionType.BL_CLASSIC;
+        return ConnectionType.BT_CLASSIC;
     }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java
index 011b9d6fa..db5b71116 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java
@@ -96,7 +96,7 @@ public interface DeviceCoordinator {
 
     enum ConnectionType{
         BLE(false, true),
-        BL_CLASSIC(true, false),
+        BT_CLASSIC(true, false),
         BOTH(true, true)
         ;
         boolean usesBluetoothClassic, usesBluetoothLE;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
index 8b9232eef..07d066ec6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
@@ -57,7 +57,7 @@ import nodomain.freeyourgadget.gadgetbridge.model.SleepRespiratoryRateSample;
 import nodomain.freeyourgadget.gadgetbridge.model.Spo2Sample;
 import nodomain.freeyourgadget.gadgetbridge.model.StressSample;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiBleUuids;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiUuids;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiPreferences;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl.WorkoutSummaryParser;
@@ -71,7 +71,7 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
     @Override
     public Collection<? extends ScanFilter> createBLEScanFilters() {
         final List<ScanFilter> filters = new ArrayList<>();
-        for (final UUID uuid : XiaomiBleUuids.UUIDS.keySet()) {
+        for (final UUID uuid : XiaomiUuids.BLE_UUIDS.keySet()) {
             final ParcelUuid service = new ParcelUuid(uuid);
             final ScanFilter filter = new ScanFilter.Builder().setServiceUuid(service).build();
             filters.add(filter);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/AbstractBTBRDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/AbstractBTBRDeviceSupport.java
index 8ca3dc86d..a531db083 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/AbstractBTBRDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/AbstractBTBRDeviceSupport.java
@@ -60,6 +60,12 @@ public abstract class AbstractBTBRDeviceSupport extends AbstractDeviceSupport im
         return mQueue.connect();
     }
 
+    public void disconnect() {
+        if (mQueue != null) {
+            mQueue.disconnect();
+        }
+    }
+
     /**
      * Subclasses should populate the given builder to initialize the device (if necessary).
      *
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/BtBRQueue.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/BtBRQueue.java
index 6cfb2a9dc..3da100165 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/BtBRQueue.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/BtBRQueue.java
@@ -16,51 +16,49 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.btbr;
 
+import android.annotation.SuppressLint;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothSocket;
 import android.content.Context;
-import android.os.ParcelUuid;
-
-import androidx.annotation.Nullable;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.List;
+import java.util.Locale;
 import java.util.UUID;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
 
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.util.StringUtils;
+import nodomain.freeyourgadget.gadgetbridge.util.GB;
 
 public final class BtBRQueue {
     private static final Logger LOG = LoggerFactory.getLogger(BtBRQueue.class);
 
     private BluetoothAdapter mBtAdapter = null;
     private BluetoothSocket mBtSocket = null;
-    private GBDevice mGbDevice;
-    private SocketCallback mCallback;
-    private UUID mService;
+    private final GBDevice mGbDevice;
+    private final SocketCallback mCallback;
+    private final UUID mService;
 
     private final BlockingQueue<AbstractTransaction> mTransactions = new LinkedBlockingQueue<>();
     private volatile boolean mDisposed;
     private volatile boolean mCrashed;
 
-    private Context mContext;
+    private final Context mContext;
     private CountDownLatch mConnectionLatch;
     private CountDownLatch mAvailableData;
-    private int mBufferSize;
+    private final int mBufferSize;
 
-    private Thread writeThread = new Thread("Gadgetbridge IO writeThread") {
+    private Thread writeThread = new Thread("Write Thread") {
         @Override
         public void run() {
-            LOG.debug("Socket Write Thread started.");
+            LOG.debug("Started write thread for {} (address {})", mGbDevice.getName(), mGbDevice.getAddress());
             
             while (!mDisposed && !mCrashed) {
                 try {
@@ -102,10 +100,14 @@ public final class BtBRQueue {
         }
     };
 
-    private Thread readThread = new Thread("Gadgetbridge IO readThread") {
+    private Thread readThread = new Thread("Read Thread") {
         @Override
         public void run() {
-            LOG.debug("Queue Read Thread started.");
+            byte[] buffer = new byte[mBufferSize];
+            int nRead;
+
+            LOG.debug("Read thread started, entering loop");
+
             while (!mDisposed && !mCrashed) {
                 try {
                     if (!isConnected()) {
@@ -119,24 +121,43 @@ public final class BtBRQueue {
                         mConnectionLatch.await();
                         mConnectionLatch = null;
                     }
+
                     if (mAvailableData != null) {
                         if (mBtSocket.getInputStream().available() == 0) {
                             mAvailableData.countDown();
                         }
                     }
-                    byte[] data = new byte[mBufferSize];
-                    int len = mBtSocket.getInputStream().read(data);
-                    LOG.debug("Received data: " + StringUtils.bytesToHex(data));
-                    mCallback.onSocketRead(Arrays.copyOf(data, len));
-                }  catch (InterruptedException ignored) {
-                    mConnectionLatch = null;
+
+                    nRead = mBtSocket.getInputStream().read(buffer);
+
+                    // safety measure
+                    if (nRead == -1) {
+                        throw new IOException("End of stream");
+                    }
+                } catch (InterruptedException ignored) {
                     LOG.debug("Thread interrupted");
-                } catch (Throwable ex) {
-                    LOG.error("IO Read Thread died: " + ex.getMessage(), ex);
-                    mCrashed = true;
                     mConnectionLatch = null;
+                    continue;
+                } catch (Throwable ex) {
+                    if (mAvailableData == null) {
+                        LOG.error("IO read thread died: " + ex.getMessage(), ex);
+                        mCrashed = true;
+                    }
+
+                    mConnectionLatch = null;
+                    continue;
+                }
+
+                LOG.debug("Received {} bytes: {}", nRead, GB.hexdump(buffer, 0, nRead));
+
+                try {
+                    mCallback.onSocketRead(Arrays.copyOf(buffer, nRead));
+                } catch (Throwable ex) {
+                    LOG.error("Failed to process received bytes in onSocketRead callback: ", ex);
                 }
             }
+
+            LOG.debug("Exited read thread loop");
         }
     };
 
@@ -147,9 +168,6 @@ public final class BtBRQueue {
         mCallback = socketCallback;
         mService = supportedService;
         mBufferSize = bufferSize;
-
-        writeThread.start();
-        readThread.start();
     }
 
     /**
@@ -159,39 +177,51 @@ public final class BtBRQueue {
      *
      * @return <code>true</code> whether the connection attempt was successfully triggered and <code>false</code> if that failed or if there is already a connection
      */
-
-    protected boolean connect() {
+    @SuppressLint("MissingPermission")
+    public boolean connect() {
         if (isConnected()) {
             LOG.warn("Ignoring connect() because already connected.");
             return false;
         }
 
-        LOG.info("Attemping to connect to " + mGbDevice.getName());
+        LOG.info("Attempting to connect to {} ({})", mGbDevice.getName(), mGbDevice.getAddress());
+
+        // stop discovery before connection is made
+        mBtAdapter.cancelDiscovery();
+
+        // revert to original state upon exception
         GBDevice.State originalState = mGbDevice.getState();
         setDeviceConnectionState(GBDevice.State.CONNECTING);
 
         try {
             BluetoothDevice btDevice = mBtAdapter.getRemoteDevice(mGbDevice.getAddress());
-            // UUID should be in a BluetoothSocket class and not in BluetoothSocketCharacteristic
             mBtSocket = btDevice.createRfcommSocketToServiceRecord(mService);
+
+            LOG.debug("RFCOMM socket created, connecting");
+
+            // TODO this call is blocking, which makes this method preferably called from a background thread
             mBtSocket.connect();
-            if (mBtSocket.isConnected()) {
-                setDeviceConnectionState(GBDevice.State.CONNECTED);
-            } else {
-                LOG.debug("Connection not established");
-            }
-            if (mConnectionLatch != null) {
-                mConnectionLatch.countDown();
-            }
+
+            LOG.info("Connected to RFCOMM socket for {}", mGbDevice.getName());
+            setDeviceConnectionState(GBDevice.State.CONNECTED);
+
+            // update thread names to show device names in logs
+            readThread.setName(String.format(Locale.ENGLISH,
+                    "Read Thread for %s", mGbDevice.getName()));
+            writeThread.setName(String.format(Locale.ENGLISH,
+                    "Write Thread for %s", mGbDevice.getName()));
+
+            // now that connect has been created, start the threads
+            readThread.start();
+            writeThread.start();
         } catch (IOException e) {
-            LOG.error("Server socket cannot be started.", e);
+            LOG.error("Unable to connect to RFCOMM endpoint: ", e);
             setDeviceConnectionState(originalState);
             mBtSocket = null;
             return false;
         }
 
         onConnectionEstablished();
-
         return true;
     }
 
@@ -203,19 +233,28 @@ public final class BtBRQueue {
         if (mBtSocket != null) {
             try {
                 mAvailableData = new CountDownLatch(1);
-                mAvailableData.await();
+
+                if (!mAvailableData.await(1, TimeUnit.SECONDS)) {
+                    LOG.warn("disconnect(): Latch timeout reached while waiting for incoming data");
+                }
+
                 mAvailableData = null;
                 mBtSocket.close();
-            } catch (IOException e) {
-                LOG.error(e.getMessage());
-            } catch (InterruptedException e) {
+            } catch (IOException | InterruptedException e) {
                 LOG.error(e.getMessage());
             }
         }
     }
 
-    protected boolean isConnected() {
-        return mGbDevice.isConnected();
+    /**
+     * Check whether a connection to the device exists and whether a socket connection has been
+     * initialized and connected
+     * @return true if the Bluetooth device is connected and the socket is ready, false otherwise
+     */
+    private boolean isConnected() {
+        return mGbDevice.isConnected() &&
+                mBtSocket != null &&
+                mBtSocket.isConnected();
     }
 
     /**
@@ -230,7 +269,7 @@ public final class BtBRQueue {
         }
     }
 
-    protected void setDeviceConnectionState(GBDevice.State newState) {
+    private void setDeviceConnectionState(GBDevice.State newState) {
         LOG.debug("New device connection state: " + newState);
         mGbDevice.setState(newState);
         mGbDevice.sendDeviceUpdateIntent(mContext, GBDevice.DeviceUpdateSubject.CONNECTION_STATE);
@@ -240,12 +279,13 @@ public final class BtBRQueue {
         if (mDisposed) {
             return;
         }
+
         mDisposed = true;
         disconnect();
         writeThread.interrupt();
         writeThread = null;
         readThread.interrupt();
         readThread = null;
+        mTransactions.clear();
     }
-
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/actions/SetProgressAction.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/actions/SetProgressAction.java
new file mode 100644
index 000000000..4a5e56d01
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/actions/SetProgressAction.java
@@ -0,0 +1,73 @@
+/*  Copyright (C) 2015-2023 Andreas Shimokawa, Carsten Pfeiffer, Daniele
+    Gobbetti, Yoran Vulker
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.btbr.actions;
+
+import android.bluetooth.BluetoothGatt;
+import android.bluetooth.BluetoothSocket;
+import android.content.Context;
+import android.content.Intent;
+
+import androidx.annotation.NonNull;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import nodomain.freeyourgadget.gadgetbridge.service.btbr.actions.PlainAction;
+import nodomain.freeyourgadget.gadgetbridge.util.GB;
+
+public class SetProgressAction extends PlainAction {
+    private static final Logger LOG = LoggerFactory.getLogger(SetProgressAction.class);
+
+    private final String text;
+    private final boolean ongoing;
+    private final int percentage;
+    private final Context context;
+
+    /**
+     * When run, will update the progress notification.
+     *
+     * @param text Text shown in the notification
+     * @param ongoing State of action, true when the action is still being performed
+     * @param percentage Current percentage indicating how far along the action has progressed
+     * @param context Context in which to create the notification
+     */
+    public SetProgressAction(String text, boolean ongoing, int percentage, Context context) {
+        this.text = text;
+        this.ongoing = ongoing;
+        this.percentage = percentage;
+        this.context = context;
+    }
+
+    @Override
+    public boolean run(BluetoothSocket unused) {
+        LOG.info(toString());
+        GB.updateInstallNotification(this.text, this.ongoing, this.percentage, this.context);
+
+        final LocalBroadcastManager broadcastManager = LocalBroadcastManager.getInstance(context);
+        broadcastManager.sendBroadcast(new Intent(GB.ACTION_SET_PROGRESS_BAR).putExtra(GB.PROGRESS_BAR_PROGRESS, percentage));
+
+        return true;
+    }
+
+    @NonNull
+    @Override
+    public String toString() {
+        return getCreationTime() + ": " + getClass().getSimpleName() + ": " + text + "; " + percentage + "%";
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java
index 3ef9f5f11..656c6c83b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java
@@ -49,8 +49,6 @@ import nodomain.freeyourgadget.gadgetbridge.BuildConfig;
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
-import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
-import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetDeviceStateAction;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services.AbstractXiaomiService;
 import nodomain.freeyourgadget.gadgetbridge.util.GB;
 
@@ -82,10 +80,10 @@ public class XiaomiAuthService extends AbstractXiaomiService {
     }
 
     // TODO also implement for spp
-    protected void startEncryptedHandshake(final XiaomiBleSupport support, final TransactionBuilder builder) {
+    protected void startEncryptedHandshake(final XiaomiBleSupport support, final nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder builder) {
         encryptionInitialized = false;
 
-        builder.add(new SetDeviceStateAction(getSupport().getDevice(), GBDevice.State.AUTHENTICATING, getSupport().getContext()));
+        builder.add(new nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetDeviceStateAction(getSupport().getDevice(), GBDevice.State.AUTHENTICATING, getSupport().getContext()));
 
         System.arraycopy(getSecretKey(getSupport().getDevice()), 0, secretKey, 0, 16);
         new SecureRandom().nextBytes(nonce);
@@ -93,8 +91,19 @@ public class XiaomiAuthService extends AbstractXiaomiService {
         support.sendCommand(builder, buildNonceCommand(nonce));
     }
 
-    protected void startClearTextHandshake(final XiaomiBleSupport support, final TransactionBuilder builder) {
-        builder.add(new SetDeviceStateAction(getSupport().getDevice(), GBDevice.State.AUTHENTICATING, getSupport().getContext()));
+    protected void startEncryptedHandshake(final XiaomiSppSupport support, final nodomain.freeyourgadget.gadgetbridge.service.btbr.TransactionBuilder builder) {
+        encryptionInitialized = false;
+
+        builder.add(new nodomain.freeyourgadget.gadgetbridge.service.btbr.actions.SetDeviceStateAction(getSupport().getDevice(), GBDevice.State.AUTHENTICATING, getSupport().getContext()));
+
+        System.arraycopy(getSecretKey(getSupport().getDevice()), 0, secretKey, 0, 16);
+        new SecureRandom().nextBytes(nonce);
+
+        support.sendCommand(builder, buildNonceCommand(nonce));
+    }
+
+    protected void startClearTextHandshake(final XiaomiBleSupport support, final nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder builder) {
+        builder.add(new nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetDeviceStateAction(getSupport().getDevice(), GBDevice.State.AUTHENTICATING, getSupport().getContext()));
 
         final XiaomiProto.Auth auth = XiaomiProto.Auth.newBuilder()
                 .setUserId(getUserId(getSupport().getDevice()))
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiBleSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiBleSupport.java
index 138c5a7c2..393f19be9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiBleSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiBleSupport.java
@@ -1,3 +1,19 @@
+/*  Copyright (C) 2023 José Rebelo, Yoran Vulker
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi;
 
 import android.bluetooth.BluetoothAdapter;
@@ -40,19 +56,19 @@ public class XiaomiBleSupport extends XiaomiConnectionSupport {
 
         @Override
         protected Set<UUID> getSupportedServices() {
-            return XiaomiBleUuids.UUIDS.keySet();
+            return XiaomiUuids.BLE_UUIDS.keySet();
         }
 
         @Override
-        protected final TransactionBuilder initializeDevice(final TransactionBuilder builder) {
-            XiaomiBleUuids.XiaomiBleUuidSet uuidSet = null;
+        protected TransactionBuilder initializeDevice(final TransactionBuilder builder) {
+            XiaomiUuids.XiaomiBleUuidSet uuidSet = null;
             BluetoothGattCharacteristic btCharacteristicCommandRead = null;
             BluetoothGattCharacteristic btCharacteristicCommandWrite = null;
             BluetoothGattCharacteristic btCharacteristicActivityData = null;
             BluetoothGattCharacteristic btCharacteristicDataUpload = null;
 
             // Attempt to find a known xiaomi service
-            for (Map.Entry<UUID, XiaomiBleUuids.XiaomiBleUuidSet> xiaomiUuid : XiaomiBleUuids.UUIDS.entrySet()) {
+            for (Map.Entry<UUID, XiaomiUuids.XiaomiBleUuidSet> xiaomiUuid : XiaomiUuids.BLE_UUIDS.entrySet()) {
                 if (getSupportedServices().contains(xiaomiUuid.getKey())) {
                     LOG.debug("Found Xiaomi service: {}", xiaomiUuid.getKey());
                     uuidSet = xiaomiUuid.getValue();
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSppPacket.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSppPacket.java
new file mode 100644
index 000000000..c9173de59
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSppPacket.java
@@ -0,0 +1,246 @@
+/*  Copyright (C) 2023 Yoran Vulker
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.Arrays;
+import java.util.Locale;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
+import nodomain.freeyourgadget.gadgetbridge.util.GB;
+
+public class XiaomiSppPacket {
+    private static final Logger LOG = LoggerFactory.getLogger(XiaomiSppPacket.class);
+
+    public static final byte[] PACKET_PREAMBLE = new byte[]{(byte) 0xba, (byte) 0xdc, (byte) 0xfe};
+    public static final byte[] PACKET_EPILOGUE = new byte[]{(byte) 0xef};
+
+    public static final int CHANNEL_VERSION = 0;
+    /**
+     * Channel ID for PROTO messages received from device
+     */
+    public static final int CHANNEL_PROTO_RX = 1;
+
+    /**
+     * Channel ID for PROTO messages sent to device
+     */
+    public static final int CHANNEL_PROTO_TX = 2;
+    public static final int CHANNEL_FITNESS = 3;
+    public static final int CHANNEL_VOICE = 4;
+    public static final int CHANNEL_MASS = 5;
+    public static final int CHANNEL_OTA = 7;
+
+    public static final int DATA_TYPE_PLAIN = 0;
+    public static final int DATA_TYPE_ENCRYPTED = 1;
+    public static final int DATA_TYPE_AUTH = 2;
+
+    private byte[] payload;
+    private boolean flag, needsResponse;
+    private int channel, opCode, frameSerial, dataType;
+
+    public static class Builder {
+        private byte[] payload = null;
+        private boolean flag = false, needsResponse = false;
+        private int channel = -1, opCode = -1, frameSerial = -1, dataType = -1;
+
+        public XiaomiSppPacket build() {
+            XiaomiSppPacket result = new XiaomiSppPacket();
+
+            result.channel = channel;
+            result.flag = flag;
+            result.needsResponse = needsResponse;
+            result.opCode = opCode;
+            result.frameSerial = frameSerial;
+            result.dataType = dataType;
+            result.payload = payload;
+
+            return result;
+        }
+
+        public Builder channel(final int channel) {
+            this.channel = channel;
+            return this;
+        }
+
+        public Builder flag(final boolean flag) {
+            this.flag = flag;
+            return this;
+        }
+
+        public Builder needsResponse(final boolean needsResponse) {
+            this.needsResponse = needsResponse;
+            return this;
+        }
+
+        public Builder opCode(final int opCode) {
+            this.opCode = opCode;
+            return this;
+        }
+
+        public Builder frameSerial(final int frameSerial) {
+            this.frameSerial = frameSerial;
+            return this;
+        }
+
+        public Builder dataType(final int dataType) {
+            this.dataType = dataType;
+            return this;
+        }
+
+        public Builder payload(final byte[] payload) {
+            this.payload = payload;
+            return this;
+        }
+    }
+
+    public int getChannel() {
+        return channel;
+    }
+
+    public int getDataType() {
+        return dataType;
+    }
+
+    public byte[] getPayload() {
+        return payload;
+    }
+
+    public boolean needsResponse() {
+        return needsResponse;
+    }
+
+    public boolean hasFlag() {
+        return this.flag;
+    }
+
+    public static XiaomiSppPacket fromXiaomiCommand(final XiaomiProto.Command command, int frameCounter, boolean needsResponse) {
+        return newBuilder().channel(CHANNEL_PROTO_TX).flag(true).needsResponse(needsResponse).dataType(
+                command.getType() == XiaomiAuthService.COMMAND_TYPE && command.getSubtype() >= 17 ? DATA_TYPE_AUTH : DATA_TYPE_ENCRYPTED
+        ).frameSerial(frameCounter).opCode(2).payload(command.toByteArray()).build();
+    }
+
+    public static Builder newBuilder() {
+        return new Builder();
+    }
+
+    public String toString() {
+        return String.format(Locale.ROOT,
+                "SppPacket{ channel=0x%x, flag=%b, needsResponse=%b, opCode=0x%x, frameSerial=0x%x, dataType=0x%x, payloadSize=%d }",
+                channel, flag, needsResponse, opCode, frameSerial, dataType, payload.length);
+    }
+
+    public static XiaomiSppPacket decode(final byte[] packet) {
+        if (packet.length < 11) {
+            LOG.error("Cannot decode incomplete packet");
+            return null;
+        }
+
+        ByteBuffer buffer = ByteBuffer.wrap(packet).order(ByteOrder.LITTLE_ENDIAN);
+        byte[] preamble = new byte[PACKET_PREAMBLE.length];
+        buffer.get(preamble);
+
+        if (!Arrays.equals(PACKET_PREAMBLE, preamble)) {
+            LOG.error("Expected preamble (0x{}) does not match found preamble (0x{})",
+                    GB.hexdump(PACKET_PREAMBLE),
+                    GB.hexdump(preamble));
+            return null;
+        }
+
+        byte channel = buffer.get();
+
+        if ((channel & 0xf0) != 0) {
+            LOG.warn("Reserved bits in channel byte are non-zero: 0b{}", Integer.toBinaryString((channel & 0xf0) >> 4));
+            channel = 0x0f;
+        }
+
+        byte flags = buffer.get();
+        boolean flag = (flags & 0x80) != 0;
+        boolean needsResponse = (flags & 0x40) != 0;
+
+        if ((flags & 0x0f) != 0) {
+            LOG.warn("Reserved bits in flags byte are non-zero: 0b{}", Integer.toBinaryString(flags & 0x0f));
+        }
+
+        // payload header is included in size
+        int payloadLength = (buffer.getShort() & 0xffff) - 3;
+
+        if (payloadLength + 11 > packet.length) {
+            LOG.error("Packet incomplete (expected length: {}, actual length: {})", payloadLength + 11, packet.length);
+            return null;
+        }
+
+        int opCode = buffer.get() & 0xff;
+        int frameSerial = buffer.get() & 0xff;
+        int dataType = buffer.get() & 0xff;
+        byte[] payload = new byte[payloadLength];
+        buffer.get(payload);
+
+        byte[] epilogue = new byte[PACKET_EPILOGUE.length];
+        buffer.get(epilogue);
+
+        if (!Arrays.equals(PACKET_EPILOGUE, epilogue)) {
+            LOG.error("Expected epilogue (0x{}) does not match actual epilogue (0x{})",
+                    GB.hexdump(PACKET_EPILOGUE),
+                    GB.hexdump(epilogue));
+            return null;
+        }
+
+        XiaomiSppPacket result = new XiaomiSppPacket();
+        result.channel = channel;
+        result.flag = flag;
+        result.needsResponse = needsResponse;
+        result.opCode = opCode;
+        result.frameSerial = frameSerial;
+        result.dataType = dataType;
+        result.payload = payload;
+
+        return result;
+    }
+
+    public byte[] encode(final XiaomiAuthService authService, final AtomicInteger encryptionCounter) {
+        byte[] payload = this.payload;
+
+        if (dataType == DATA_TYPE_ENCRYPTED && channel == CHANNEL_PROTO_TX) {
+            short packetCounter = (short) encryptionCounter.incrementAndGet();
+            payload = authService.encrypt(payload, packetCounter);
+            payload = ByteBuffer.allocate(payload.length + 2).order(ByteOrder.LITTLE_ENDIAN).putShort(packetCounter).put(payload).array();
+        } else if (dataType == DATA_TYPE_ENCRYPTED) {
+            payload = authService.encrypt(payload, (short) 0);
+        }
+
+        ByteBuffer buffer = ByteBuffer.allocate(11 + payload.length).order(ByteOrder.LITTLE_ENDIAN);
+        buffer.put(PACKET_PREAMBLE);
+
+        buffer.put((byte) (channel & 0xf));
+        buffer.put((byte) ((flag ? 0x80 : 0) | (needsResponse ? 0x40 : 0)));
+        buffer.putShort((short) (payload.length + 3));
+
+        buffer.put((byte) (opCode & 0xff));
+        buffer.put((byte) (frameSerial & 0xff));
+        buffer.put((byte) (dataType & 0xff));
+
+        buffer.put(payload);
+
+        buffer.put(PACKET_EPILOGUE);
+        return buffer.array();
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSppSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSppSupport.java
new file mode 100644
index 000000000..e3f79079d
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSppSupport.java
@@ -0,0 +1,261 @@
+/*  Copyright (C) 2023 José Rebelo, Yoran Vulker
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi;
+
+import static nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSppPacket.CHANNEL_FITNESS;
+import static nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSppPacket.CHANNEL_PROTO_RX;
+import static nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSppPacket.PACKET_PREAMBLE;
+
+import android.bluetooth.BluetoothAdapter;
+import android.content.Context;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
+import nodomain.freeyourgadget.gadgetbridge.service.btbr.AbstractBTBRDeviceSupport;
+import nodomain.freeyourgadget.gadgetbridge.service.btbr.TransactionBuilder;
+import nodomain.freeyourgadget.gadgetbridge.service.btbr.actions.SetDeviceStateAction;
+import nodomain.freeyourgadget.gadgetbridge.service.btbr.actions.SetProgressAction;
+
+public class XiaomiSppSupport extends XiaomiConnectionSupport {
+    private static final Logger LOG = LoggerFactory.getLogger(XiaomiSppSupport.class);
+
+    AbstractBTBRDeviceSupport commsSupport = new AbstractBTBRDeviceSupport(LOG) {
+        @Override
+        public boolean useAutoConnect() {
+            return mXiaomiSupport.useAutoConnect();
+        }
+
+        @Override
+        public void onSocketRead(byte[] data) {
+            XiaomiSppSupport.this.onSocketRead(data);
+        }
+
+        @Override
+        public boolean getAutoReconnect() {
+            return mXiaomiSupport.getAutoReconnect();
+        }
+
+        @Override
+        protected TransactionBuilder initializeDevice(TransactionBuilder builder) {
+            // FIXME unsetDynamicState unsets the fw version, which causes problems..
+            if (getDevice().getFirmwareVersion() == null && mXiaomiSupport.getCachedFirmwareVersion() != null) {
+                getDevice().setFirmwareVersion(mXiaomiSupport.getCachedFirmwareVersion());
+            }
+
+            builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.INITIALIZING, getContext()));
+            mXiaomiSupport.getAuthService().startEncryptedHandshake(XiaomiSppSupport.this, builder);
+
+            return builder;
+        }
+
+        @Override
+        protected UUID getSupportedService() {
+            return XiaomiUuids.UUID_SERVICE_SERIAL_PORT_PROFILE;
+        }
+    };
+
+    ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+    private final AtomicInteger frameCounter = new AtomicInteger(0);
+    private final AtomicInteger encryptionCounter = new AtomicInteger(0);
+    private final XiaomiSupport mXiaomiSupport;
+    private final Map<Integer, XiaomiChannelHandler> mChannelHandlers = new HashMap<>();
+
+    public XiaomiSppSupport(final XiaomiSupport xiaomiSupport) {
+        this.mXiaomiSupport = xiaomiSupport;
+
+        mChannelHandlers.put(CHANNEL_PROTO_RX, this.mXiaomiSupport::handleCommandBytes);
+        mChannelHandlers.put(CHANNEL_FITNESS, this.mXiaomiSupport.getHealthService().getActivityFetcher()::addChunk);
+    }
+
+    @Override
+    public boolean connect() {
+        return commsSupport.connect();
+    }
+
+    @Override
+    public void onAuthSuccess() {
+        // Do nothing.
+    }
+
+    @Override
+    public void onUploadProgress(final int textRsrc, final int progressPercent) {
+        try {
+            final TransactionBuilder builder = commsSupport.createTransactionBuilder("send data upload progress");
+            builder.add(new SetProgressAction(
+                    commsSupport.getContext().getString(textRsrc),
+                    true,
+                    progressPercent,
+                    commsSupport.getContext()
+            ));
+            builder.queue(commsSupport.getQueue());
+        } catch (final Exception e) {
+            LOG.error("Failed to update progress notification", e);
+        }
+    }
+
+    @Override
+    public void setContext(GBDevice device, BluetoothAdapter adapter, Context context) {
+        this.commsSupport.setContext(device, adapter, context);
+    }
+
+    @Override
+    public void disconnect() {
+        this.commsSupport.disconnect();
+    }
+
+    private int findNextPossiblePreamble(final byte[] haystack) {
+        for (int i = 1; i + 2 < haystack.length; i++) {
+            // check if first byte matches
+            if (haystack[i] == PACKET_PREAMBLE[0]) {
+                return i;
+            }
+        }
+
+        // did not find preamble
+        return -1;
+    }
+
+    private void processBuffer() {
+        // wait until at least an empty packet is in the buffer
+        while (buffer.size() >= 11) {
+            // start preamble compare
+            byte[] bufferState = buffer.toByteArray();
+            ByteBuffer headerBuffer = ByteBuffer.wrap(bufferState, 0, 7).order(ByteOrder.LITTLE_ENDIAN);
+            byte[] preamble = new byte[PACKET_PREAMBLE.length];
+            headerBuffer.get(preamble);
+
+            if (!Arrays.equals(PACKET_PREAMBLE, preamble)) {
+                int preambleOffset = findNextPossiblePreamble(bufferState);
+
+                if (preambleOffset == -1) {
+                    LOG.debug("Buffer did not contain a valid (start of) preamble, resetting");
+                    buffer.reset();
+                } else {
+                    LOG.debug("Found possible preamble at offset {}, dumping preceeding bytes", preambleOffset);
+                    byte[] remaining = new byte[bufferState.length - preambleOffset];
+                    System.arraycopy(bufferState, preambleOffset, remaining, 0, remaining.length);
+                    buffer.reset();
+                    try {
+                        buffer.write(remaining);
+                    } catch (IOException ex) {
+                        LOG.error("Failed to write bytes from found preamble offset back to buffer: ", ex);
+                    }
+                }
+
+                // continue processing at beginning of new buffer
+                continue;
+            }
+
+            headerBuffer.getShort(); // skip flags and channel ID
+            int payloadSize = headerBuffer.getShort() & 0xffff;
+            int packetSize = payloadSize + 8; // payload size includes payload header
+
+            if (bufferState.length < packetSize) {
+                LOG.debug("Packet buffer not yet satisfied: buffer size {} < expected packet size {}", bufferState.length, packetSize);
+                return;
+            }
+
+            LOG.debug("Full packet in buffer (buffer size: {}, packet size: {})", bufferState.length, packetSize);
+            XiaomiSppPacket receivedPacket = XiaomiSppPacket.decode(bufferState); // remaining bytes unaffected
+
+            onPacketReceived(receivedPacket);
+
+            // extract remaining bytes from buffer
+            byte[] remaining = new byte[bufferState.length - packetSize];
+            System.arraycopy(bufferState, packetSize, remaining, 0, remaining.length);
+
+            buffer.reset();
+
+            try {
+                buffer.write(remaining);
+            } catch (IOException ex) {
+                LOG.error("Failed to write remaining packet bytes back to buffer: ", ex);
+            }
+        }
+    }
+
+    @Override
+    public void dispose() {
+        commsSupport.dispose();
+    }
+
+    public void onSocketRead(byte[] data) {
+        try {
+            buffer.write(data);
+        } catch (IOException ex) {
+            LOG.error("Exception while writing buffer: ", ex);
+        }
+
+        processBuffer();
+    }
+
+    private void onPacketReceived(final XiaomiSppPacket packet) {
+        if (packet == null) {
+            // likely failed to parse the packet
+            LOG.warn("Received null packet, did we fail to decode?");
+            return;
+        }
+
+        LOG.debug("Packet received: {}", packet);
+        // TODO send response if needsResponse is set
+        byte[] payload = packet.getPayload();
+
+        if (packet.getDataType() == 1) {
+            payload = mXiaomiSupport.getAuthService().decrypt(payload);
+        }
+
+        int channel = packet.getChannel();
+        if (mChannelHandlers.containsKey(channel)) {
+            XiaomiChannelHandler handler = mChannelHandlers.get(channel);
+
+            if (handler != null)
+                handler.handle(payload);
+        }
+
+        LOG.warn("Unhandled SppPacket on channel {}", packet.getChannel());
+    }
+
+    @Override
+    public void sendCommand(String taskName, XiaomiProto.Command command) {
+        XiaomiSppPacket packet = XiaomiSppPacket.fromXiaomiCommand(command, frameCounter.getAndIncrement(), false);
+        LOG.debug("sending packet: {}", packet);
+        TransactionBuilder builder = this.commsSupport.createTransactionBuilder("send " + taskName);
+        builder.write(packet.encode(mXiaomiSupport.getAuthService(), encryptionCounter));
+        builder.queue(this.commsSupport.getQueue());
+    }
+
+    public void sendCommand(final TransactionBuilder builder, final XiaomiProto.Command command) {
+        XiaomiSppPacket packet = XiaomiSppPacket.fromXiaomiCommand(command, frameCounter.getAndIncrement(), false);
+        LOG.debug("sending packet: {}", packet);
+
+        builder.write(packet.encode(mXiaomiSupport.getAuthService(), encryptionCounter));
+        // do not queue here, that's the job of the caller
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
index 5fd6aaa41..b9783023d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
@@ -122,6 +122,8 @@ public class XiaomiSupport extends AbstractDeviceSupport {
             case BLE:
             case BOTH:
                 return new XiaomiBleSupport(this);
+            case BT_CLASSIC:
+                return new XiaomiSppSupport(this);
         }
 
         LOG.error("Cannot create connection-specific support, unhanded {} connection type", connType);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiBleUuids.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiUuids.java
similarity index 90%
rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiBleUuids.java
rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiUuids.java
index 0a9423d35..faa2e132c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiBleUuids.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiUuids.java
@@ -16,16 +16,19 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi;
 
+import static nodomain.freeyourgadget.gadgetbridge.service.btle.AbstractBTLEDeviceSupport.BASE_UUID;
+
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.UUID;
 
-public class XiaomiBleUuids {
-    public static final Map<UUID, XiaomiBleUuidSet> UUIDS = new LinkedHashMap<UUID, XiaomiBleUuidSet>() {{
+public class XiaomiUuids {
+    public static final UUID UUID_SERVICE_SERIAL_PORT_PROFILE = UUID.fromString(String.format(BASE_UUID, "1101"));
+    public static final Map<UUID, XiaomiBleUuidSet> BLE_UUIDS = new LinkedHashMap<UUID, XiaomiBleUuidSet>() {{
         // all encrypted devices seem to share the same characteristics
         // Mi Band 8
         // Redmi Watch 3 Active
-        // Xiaomi Watch S1 Active
+        // Xiaomi Watch S1 (Active)
         // Redmi Smart Band 2
         // Redmi Watch 2 Lite
         put(UUID.fromString("0000fe95-0000-1000-8000-00805f9b34fb"), new XiaomiBleUuidSet(

From 04460fc3f4fed3b401a63b4a80fcc439634abd70 Mon Sep 17 00:00:00 2001
From: MrYoranimo <yvulker@gmail.com>
Date: Fri, 15 Dec 2023 22:24:30 +0100
Subject: [PATCH 480/595] Xiaomi Watch S1 Pro: add experimental support

---
 .../XiaomiWatchS1ProCoordinator.java          | 61 +++++++++++++++++++
 .../gadgetbridge/model/DeviceType.java        |  2 +
 app/src/main/res/values/strings.xml           |  1 +
 3 files changed, 64 insertions(+)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs1pro/XiaomiWatchS1ProCoordinator.java

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs1pro/XiaomiWatchS1ProCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs1pro/XiaomiWatchS1ProCoordinator.java
new file mode 100644
index 000000000..9abf358ca
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs1pro/XiaomiWatchS1ProCoordinator.java
@@ -0,0 +1,61 @@
+/*  Copyright (C) 2023 Yoran Vulker
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.watchs1pro;
+
+import java.util.regex.Pattern;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiCoordinator;
+
+public class XiaomiWatchS1ProCoordinator extends XiaomiCoordinator {
+
+    @Override
+    protected Pattern getSupportedDeviceName() {
+        // TODO confirm that the secondary name is actually used in prod somewhere
+        return Pattern.compile("^(Xiaomi Watch S1 Pro [0-9A-F]{4}|[Ll]61.*[0-9A-F]{4})$");
+    }
+
+    @Override
+    public ConnectionType getConnectionType() {
+        return ConnectionType.BT_CLASSIC;
+    }
+
+    @Override
+    public int getDeviceNameResource() {
+        return R.string.devicetype_xiaomi_watch_s1_pro;
+    }
+
+    @Override
+    public boolean isExperimental() {
+        return true;
+    }
+
+    @Override
+    public int getDefaultIconResource() {
+        return R.drawable.ic_device_miwatch;
+    }
+
+    @Override
+    public int getDisabledIconResource() {
+        return R.drawable.ic_device_miwatch_disabled;
+    }
+
+    @Override
+    public boolean supportsFindDevice() {
+        return false;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
index 10d295a98..905633ee8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
@@ -175,6 +175,7 @@ import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.redmismartband2.Redmi
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.redmismartbandpro.RedmiSmartBandProCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.redmiwatch2lite.RedmiWatch2Lite;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.watchs1active.XiaomiWatchS1ActiveCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.watchs1pro.XiaomiWatchS1ProCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xwatch.XWatchCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.zetime.ZeTimeCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.miwatch.MiWatchLiteCoordinator;
@@ -238,6 +239,7 @@ public enum DeviceType {
     REDMIWATCH2LITE(RedmiWatch2Lite.class),
     REDMISMARTBANDPRO(RedmiSmartBandProCoordinator.class),
     XIAOMI_WATCH_S1_ACTIVE(XiaomiWatchS1ActiveCoordinator.class),
+    XIAOMI_WATCH_S1_PRO(XiaomiWatchS1ProCoordinator.class),
     AMAZFITGTS3(AmazfitGTS3Coordinator.class),
     AMAZFITGTR3(AmazfitGTR3Coordinator.class),
     AMAZFITGTR4(AmazfitGTR4Coordinator.class),
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 596d51c85..ee828d7ac 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2539,6 +2539,7 @@
     <string name="pref_sleep_mode_schedule_title">Sleep Mode Schedule</string>
     <string name="pref_sleep_mode_schedule_summary">Send a reminder and enter sleep mode at bedtime. At the scheduled wake-up time, the wake-up alarm will sound.</string>
     <string name="devicetype_xiaomi_watch_s1_active">Xiaomi Watch S1 Active</string>
+    <string name="devicetype_xiaomi_watch_s1_pro">Xiaomi Watch S1 Pro</string>
     <string name="devicetype_mi_watch_color_sport">Mi Watch Color Sport</string>
     <string name="devicetype_pixoo">Pixoo</string>
     <string name="not_set">Not set</string>

From 1d1ef9fba6bf49e6dcd0a6101568ce0532321f2a Mon Sep 17 00:00:00 2001
From: MrYoranimo <yvulker@gmail.com>
Date: Sat, 16 Dec 2023 00:08:26 +0100
Subject: [PATCH 481/595] Xiaomi Watch S1: add experimental support

---
 .../watchs1/XiaomiWatchS1Coordinator.java     | 61 +++++++++++++++++++
 .../gadgetbridge/model/DeviceType.java        |  2 +
 app/src/main/res/values/strings.xml           |  1 +
 3 files changed, 64 insertions(+)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs1/XiaomiWatchS1Coordinator.java

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs1/XiaomiWatchS1Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs1/XiaomiWatchS1Coordinator.java
new file mode 100644
index 000000000..a557e8cbc
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs1/XiaomiWatchS1Coordinator.java
@@ -0,0 +1,61 @@
+/*  Copyright (C) 2023 Yoran Vulker
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.watchs1;
+
+import java.util.regex.Pattern;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiCoordinator;
+
+public class XiaomiWatchS1Coordinator extends XiaomiCoordinator {
+
+    @Override
+    public int getDeviceNameResource() {
+        return R.string.devicetype_xiaomi_watch_s1;
+    }
+
+    @Override
+    public int getDefaultIconResource() {
+        return R.drawable.ic_device_miwatch;
+    }
+
+    @Override
+    public int getDisabledIconResource() {
+        return R.drawable.ic_device_miwatch_disabled;
+    }
+
+    @Override
+    public ConnectionType getConnectionType() {
+        // TODO make sure that the device can actually communicate in BLE mode
+        return ConnectionType.BOTH;
+    }
+
+    @Override
+    protected Pattern getSupportedDeviceName() {
+        return Pattern.compile("^Xiaomi Watch S1 [0-9A-F]{4}$");
+    }
+
+    @Override
+    public boolean isExperimental() {
+        return true;
+    }
+
+    @Override
+    public boolean supportsFindDevice() {
+        return false;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
index 905633ee8..288990acc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
@@ -174,6 +174,7 @@ import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.miwatchcolorsport.MiW
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.redmismartband2.RedmiSmartBand2Coordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.redmismartbandpro.RedmiSmartBandProCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.redmiwatch2lite.RedmiWatch2Lite;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.watchs1.XiaomiWatchS1Coordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.watchs1active.XiaomiWatchS1ActiveCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.watchs1pro.XiaomiWatchS1ProCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xwatch.XWatchCoordinator;
@@ -240,6 +241,7 @@ public enum DeviceType {
     REDMISMARTBANDPRO(RedmiSmartBandProCoordinator.class),
     XIAOMI_WATCH_S1_ACTIVE(XiaomiWatchS1ActiveCoordinator.class),
     XIAOMI_WATCH_S1_PRO(XiaomiWatchS1ProCoordinator.class),
+    XIAOMI_WATCH_S1(XiaomiWatchS1Coordinator.class),
     AMAZFITGTS3(AmazfitGTS3Coordinator.class),
     AMAZFITGTR3(AmazfitGTR3Coordinator.class),
     AMAZFITGTR4(AmazfitGTR4Coordinator.class),
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ee828d7ac..f3b26c1ed 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2538,6 +2538,7 @@
     <string name="wake_up_time">Wake Up</string>
     <string name="pref_sleep_mode_schedule_title">Sleep Mode Schedule</string>
     <string name="pref_sleep_mode_schedule_summary">Send a reminder and enter sleep mode at bedtime. At the scheduled wake-up time, the wake-up alarm will sound.</string>
+    <string name="devicetype_xiaomi_watch_s1">Xiaomi Watch S1</string>
     <string name="devicetype_xiaomi_watch_s1_active">Xiaomi Watch S1 Active</string>
     <string name="devicetype_xiaomi_watch_s1_pro">Xiaomi Watch S1 Pro</string>
     <string name="devicetype_mi_watch_color_sport">Mi Watch Color Sport</string>

From c9d880456a8ea32611dc2ae3e083d4cc5d1eea31 Mon Sep 17 00:00:00 2001
From: MrYoranimo <yvulker@gmail.com>
Date: Sat, 30 Dec 2023 21:43:35 +0100
Subject: [PATCH 482/595] Xiaomi Smart Band 8 Pro: add experimental support

---
 .../miband8pro/MiBand8ProCoordinator.java     | 68 +++++++++++++++++++
 .../gadgetbridge/model/DeviceType.java        |  2 +
 app/src/main/res/values/strings.xml           |  1 +
 3 files changed, 71 insertions(+)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8pro/MiBand8ProCoordinator.java

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8pro/MiBand8ProCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8pro/MiBand8ProCoordinator.java
new file mode 100644
index 000000000..0613ade38
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/miband8pro/MiBand8ProCoordinator.java
@@ -0,0 +1,68 @@
+/*  Copyright (C) 2023 Yoran Vulker
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.miband8pro;
+
+import android.content.Context;
+import android.net.Uri;
+
+import androidx.annotation.Nullable;
+
+import java.util.regex.Pattern;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiInstallHandler;
+
+public class MiBand8ProCoordinator extends XiaomiCoordinator {
+    @Override
+    public int getDeviceNameResource() {
+        return R.string.devicetype_miband8pro;
+    }
+
+    @Override
+    protected Pattern getSupportedDeviceName() {
+        return Pattern.compile("^Xiaomi Smart Band 8 Pro [0-9A-F]{4}$");
+    }
+
+    @Override
+    public boolean isExperimental() {
+        return true;
+    }
+
+    @Override
+    public ConnectionType getConnectionType() {
+        return ConnectionType.BT_CLASSIC;
+    }
+
+    @Nullable
+    @Override
+    public InstallHandler findInstallHandler(final Uri uri, final Context context) {
+        final XiaomiInstallHandler handler = new XiaomiInstallHandler(uri, context);
+        return handler.isValid() ? handler : null;
+    }
+
+    @Override
+    public int getDefaultIconResource() {
+        return R.drawable.ic_device_default;
+    }
+
+    @Override
+    public int getDisabledIconResource() {
+        return R.drawable.ic_device_default_disabled;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
index 288990acc..480902318 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
@@ -170,6 +170,7 @@ import nodomain.freeyourgadget.gadgetbridge.devices.watch9.Watch9DeviceCoordinat
 import nodomain.freeyourgadget.gadgetbridge.devices.withingssteelhr.WithingsSteelHRDeviceCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.miband7pro.MiBand7ProCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.miband8.MiBand8Coordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.miband8pro.MiBand8ProCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.miwatchcolorsport.MiWatchColorSportCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.redmismartband2.RedmiSmartBand2Coordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.redmismartbandpro.RedmiSmartBandProCoordinator;
@@ -233,6 +234,7 @@ public enum DeviceType {
     MIBAND7(MiBand7Coordinator.class),
     MIBAND7PRO(MiBand7ProCoordinator.class),
     MIBAND8(MiBand8Coordinator.class),
+    MIBAND8PRO(MiBand8ProCoordinator.class),
     MIWATCHLITE(MiWatchLiteCoordinator.class),
     MIWATCHCOLORSPORT(MiWatchColorSportCoordinator.class),
     REDMIWATCH3ACTIVE(RedmiWatch3ActiveCoordinator.class),
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f3b26c1ed..2d2ed46c9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1341,6 +1341,7 @@
     <string name="devicetype_miband7">Xiaomi Smart Band 7</string>
     <string name="devicetype_miband7pro">Xiaomi Smart Band 7 Pro</string>
     <string name="devicetype_miband8">Xiaomi Smart Band 8</string>
+    <string name="devicetype_miband8pro">Xiaomi Smart Band 8 Pro</string>
     <string name="devicetype_amazfit_balance">Amazfit Balance</string>
     <string name="devicetype_amazfit_active">Amazfit Active</string>
     <string name="devicetype_amazfit_active_edge">Amazfit Active Edge</string>

From 815582354d4c75fc4cf4006a78b96700bc3b7734 Mon Sep 17 00:00:00 2001
From: MrYoranimo <yvulker@gmail.com>
Date: Wed, 10 Jan 2024 23:42:23 +0100
Subject: [PATCH 483/595] Redmi Watch 3 Active: override connection type

---
 .../redmiwatch3active/RedmiWatch3ActiveCoordinator.java      | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch3active/RedmiWatch3ActiveCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch3active/RedmiWatch3ActiveCoordinator.java
index 4009d6fb8..53bef6f10 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch3active/RedmiWatch3ActiveCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch3active/RedmiWatch3ActiveCoordinator.java
@@ -35,6 +35,11 @@ public class RedmiWatch3ActiveCoordinator extends XiaomiCoordinator {
         return true;
     }
 
+    @Override
+    public ConnectionType getConnectionType() {
+        return ConnectionType.BOTH;
+    }
+
     @Override
     protected Pattern getSupportedDeviceName() {
         return Pattern.compile("^Redmi Watch 3 Active [A-Z0-9]{4}$");

From 2812ad14293fcd1b91909d254521b94f5658d4f2 Mon Sep 17 00:00:00 2001
From: MrYoranimo <yvulker@gmail.com>
Date: Fri, 15 Dec 2023 23:52:32 +0100
Subject: [PATCH 484/595] Xiaomi Watch S1 Active: disable find device and
 override connection type

---
 .../watchs1active/XiaomiWatchS1ActiveCoordinator.java  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs1active/XiaomiWatchS1ActiveCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs1active/XiaomiWatchS1ActiveCoordinator.java
index 04ac42316..e159234aa 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs1active/XiaomiWatchS1ActiveCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs1active/XiaomiWatchS1ActiveCoordinator.java
@@ -45,6 +45,16 @@ public class XiaomiWatchS1ActiveCoordinator extends XiaomiCoordinator {
         return true;
     }
 
+    @Override
+    public ConnectionType getConnectionType() {
+        return ConnectionType.BOTH;
+    }
+
+    @Override
+    public boolean supportsFindDevice() {
+        return false;
+    }
+
     @Nullable
     @Override
     public InstallHandler findInstallHandler(Uri uri, Context context) {

From 399248e22c9bbca0a570544d4d133e26002b7916 Mon Sep 17 00:00:00 2001
From: MrYoranimo <yvulker@gmail.com>
Date: Fri, 15 Dec 2023 23:31:16 +0100
Subject: [PATCH 485/595] Xiaomi: allow forcing the connection type from
 connection settings

---
 .../DeviceSettingsPreferenceConst.java        |  1 +
 .../devices/xiaomi/XiaomiCoordinator.java     | 14 +++++++++++++
 .../service/devices/xiaomi/XiaomiSupport.java | 21 +++++++++++++++++++
 app/src/main/res/values/arrays.xml            | 10 +++++++++
 app/src/main/res/values/strings.xml           |  8 +++++++
 .../devicesettings_force_connection_type.xml  | 12 +++++++++++
 6 files changed, 66 insertions(+)
 create mode 100644 app/src/main/res/xml/devicesettings_force_connection_type.xml

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
index d61fa848d..86feecb11 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
@@ -427,4 +427,5 @@ public class DeviceSettingsPreferenceConst {
     public static final String PREF_DEVICE_ACTION_START_NON_WEAR_BROADCAST = "prefs_events_forwarding_startnonwear_broadcast";
     public static final String PREF_CLAP_HANDS_TO_WAKEUP_DEVICE = "pref_key_clap_hands_to_wakeup_device";
     public static final String PREF_POWER_SAVING = "pref_key_power_saving";
+    public static final String PREF_FORCE_CONNECTION_TYPE = "pref_force_connection_type";
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
index 07d066ec6..9a1e7b90a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiCoordinator.java
@@ -355,6 +355,20 @@ public abstract class XiaomiCoordinator extends AbstractBLEDeviceCoordinator {
         return true;
     }
 
+    @Override
+    public int[] getSupportedDeviceSpecificConnectionSettings() {
+        final List<Integer> settings = new ArrayList<>();
+
+        if (getConnectionType().equals(ConnectionType.BOTH)) {
+            settings.add(R.xml.devicesettings_force_connection_type);
+        }
+
+        return ArrayUtils.addAll(
+                super.getSupportedDeviceSpecificConnectionSettings(),
+                ArrayUtils.toPrimitive(settings.toArray(new Integer[0]))
+        );
+    }
+
     @Override
     public int[] getSupportedDeviceSpecificSettings(final GBDevice device) {
         final List<Integer> settings = new ArrayList<>();
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
index b9783023d..c6e86a8ee 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
@@ -17,6 +17,8 @@
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi;
 
 
+import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_FORCE_CONNECTION_TYPE;
+
 import android.bluetooth.BluetoothAdapter;
 import android.content.Context;
 import android.location.Location;
@@ -39,6 +41,7 @@ import java.util.UUID;
 
 import nodomain.freeyourgadget.gadgetbridge.BuildConfig;
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.DeviceCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiFWHelper;
@@ -115,9 +118,27 @@ public class XiaomiSupport extends AbstractDeviceSupport {
         return false;
     }
 
+    private DeviceCoordinator.ConnectionType getForcedConnectionTypeFromPrefs() {
+        final String connTypeAuto = getContext().getString(R.string.pref_force_connection_type_auto_value);
+        String connTypePref = getDevicePrefs().getString(PREF_FORCE_CONNECTION_TYPE, connTypeAuto);
+
+        if (getContext().getString(R.string.pref_force_connection_type_ble_value).equals(connTypePref))
+            return DeviceCoordinator.ConnectionType.BLE;
+
+        if (getContext().getString(R.string.pref_force_connection_type_bt_classic_value).equals(connTypePref))
+            return DeviceCoordinator.ConnectionType.BT_CLASSIC;
+
+        // either set to default, unknown option selected, or has not been set
+        return DeviceCoordinator.ConnectionType.BOTH;
+    }
+
     private XiaomiConnectionSupport createConnectionSpecificSupport() {
         DeviceCoordinator.ConnectionType connType = getCoordinator().getConnectionType();
 
+        if (connType == DeviceCoordinator.ConnectionType.BOTH) {
+            connType = getForcedConnectionTypeFromPrefs();
+        }
+
         switch (connType) {
             case BLE:
             case BOTH:
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index d92181dde..e1042e8dd 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -3581,4 +3581,14 @@
         <item>ignore</item>
     </string-array>
 
+    <string-array name="pref_force_connection_type">
+        <item>@string/pref_force_connection_type_auto</item>
+        <item>@string/pref_force_connection_type_ble</item>
+        <item>@string/pref_force_connection_type_bt_classic</item>
+    </string-array>
+    <string-array name="pref_force_connection_type_values">
+        <item>@string/pref_force_connection_type_auto_value</item>
+        <item>@string/pref_force_connection_type_ble_value</item>
+        <item>@string/pref_force_connection_type_bt_classic_value</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2d2ed46c9..5ce3067aa 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2579,4 +2579,12 @@
     <string name="uploadwatchfaceoperation_in_progress">Uploading watchface</string>
     <string name="uploadwatchfaceoperation_complete">Watchface installation completed</string>
     <string name="uploadwatchfaceoperation_failed">Watchface installation failed</string>
+    <string name="pref_force_connection_type_title">Force connection type</string>
+    <string name="pref_force_connection_type_description">You may try forcing the connection type in case your device does not respond to Gadgetbridge</string>
+    <string name="pref_force_connection_type_auto">Automatic</string>
+    <string name="pref_force_connection_type_ble">Bluetooth LE</string>
+    <string name="pref_force_connection_type_bt_classic">Bluetooth Classic</string>
+    <string name="pref_force_connection_type_auto_value" translatable="false">BOTH</string>
+    <string name="pref_force_connection_type_ble_value" translatable="false">BLE</string>
+    <string name="pref_force_connection_type_bt_classic_value" translatable="false">BT_CLASSIC</string>
 </resources>
diff --git a/app/src/main/res/xml/devicesettings_force_connection_type.xml b/app/src/main/res/xml/devicesettings_force_connection_type.xml
new file mode 100644
index 000000000..3b584e03f
--- /dev/null
+++ b/app/src/main/res/xml/devicesettings_force_connection_type.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <ListPreference
+        android:key="pref_force_connection_type"
+        android:icon="@drawable/ic_bluetooth"
+        android:title="@string/pref_force_connection_type_title"
+        android:summary="@string/pref_force_connection_type_description"
+        android:entries="@array/pref_force_connection_type"
+        android:entryValues="@array/pref_force_connection_type_values"
+        android:defaultValue="@string/pref_force_connection_type_auto_value"
+        />
+</PreferenceScreen>

From 2ef461ab90cf23c46141d380983aa846e58f1788 Mon Sep 17 00:00:00 2001
From: MrYoranimo <yvulker@gmail.com>
Date: Sat, 13 Jan 2024 15:21:09 +0100
Subject: [PATCH 486/595] Add header to device-specific activity data settings

---
 .../devicesettings/DeviceSpecificSettingsFragment.java       | 1 +
 app/src/main/res/values/strings.xml                          | 1 +
 app/src/main/res/xml/devicesettings_activity_info_header.xml | 5 +++++
 3 files changed, 7 insertions(+)
 create mode 100644 app/src/main/res/xml/devicesettings_activity_info_header.xml

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
index 0ea61bccb..5bc3f4abc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
@@ -1024,6 +1024,7 @@ public class DeviceSpecificSettingsFragment extends AbstractPreferenceFragment i
             supportedSettings = ArrayUtils.insert(0, supportedSettings, coordinator.getSupportedDeviceSpecificConnectionSettings());
             supportedSettings = ArrayUtils.addAll(supportedSettings, coordinator.getSupportedDeviceSpecificApplicationSettings());
             if (coordinator.supportsActivityTracking()) {
+                supportedSettings = ArrayUtils.addAll(supportedSettings, R.xml.devicesettings_activity_info_header);
                 supportedSettings = ArrayUtils.addAll(supportedSettings, R.xml.devicesettings_chartstabs);
                 supportedSettings = ArrayUtils.addAll(supportedSettings, R.xml.devicesettings_device_card_activity_card_preferences);
             }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5ce3067aa..b44d1d618 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2587,4 +2587,5 @@
     <string name="pref_force_connection_type_auto_value" translatable="false">BOTH</string>
     <string name="pref_force_connection_type_ble_value" translatable="false">BLE</string>
     <string name="pref_force_connection_type_bt_classic_value" translatable="false">BT_CLASSIC</string>
+    <string name="activity_info">Activity info</string>
 </resources>
diff --git a/app/src/main/res/xml/devicesettings_activity_info_header.xml b/app/src/main/res/xml/devicesettings_activity_info_header.xml
new file mode 100644
index 000000000..5b281033c
--- /dev/null
+++ b/app/src/main/res/xml/devicesettings_activity_info_header.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <PreferenceCategory
+        android:title="@string/activity_info" />
+</androidx.preference.PreferenceScreen>
\ No newline at end of file

From 429d717630a9454252eea54327d81add03d4afaa Mon Sep 17 00:00:00 2001
From: MrYoranimo <yvulker@gmail.com>
Date: Tue, 19 Dec 2023 15:02:09 +0100
Subject: [PATCH 487/595] Xiaomi: recognize a full battery as a valid charger
 state

---
 .../service/devices/xiaomi/services/XiaomiSystemService.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
index b83edd108..db8a6d1bf 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
@@ -324,6 +324,7 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
             case 1:
                 return BatteryState.BATTERY_CHARGING;
             case 2:
+            case 3:
                 return BatteryState.BATTERY_NORMAL;
         }
 

From 592a52054f2ae3149e78eadbb6af5ea9f7507b9c Mon Sep 17 00:00:00 2001
From: MrYoranimo <yvulker@gmail.com>
Date: Tue, 19 Dec 2023 16:11:41 +0100
Subject: [PATCH 488/595] Xiaomi: request battery level and charging state on
 an interval

---
 .../xiaomi/services/XiaomiSystemService.java  | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
index db8a6d1bf..ba2013851 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
@@ -17,6 +17,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.services;
 
+import android.os.Handler;
 import android.text.TextUtils;
 
 import com.google.protobuf.InvalidProtocolBufferException;
@@ -33,6 +34,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.TimeZone;
+import java.util.concurrent.TimeUnit;
 
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 import nodomain.freeyourgadget.gadgetbridge.R;
@@ -68,6 +70,7 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
     // We persist the settings code when receiving the display items,
     // so we can enforce it when sending them
     private static final String PREF_SETTINGS_DISPLAY_ITEM_CODE = "xiaomi_settings_display_item_code";
+    private static final int BATTERY_STATE_REQUEST_INTERVAL = (int) TimeUnit.MINUTES.toMillis(15);
 
     public static final int COMMAND_TYPE = 2;
 
@@ -99,6 +102,16 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
 
     // Not null if we're installing a firmware
     private XiaomiFWHelper fwHelper = null;
+    private Handler handler = new Handler();
+    private final Runnable batteryStateRequestRunnable = new Runnable() {
+        @Override
+        public void run() {
+            getSupport().sendCommand("get device status", COMMAND_TYPE, CMD_DEVICE_STATE_GET);
+            getSupport().sendCommand("get battery state", COMMAND_TYPE, CMD_BATTERY);
+            handler.postDelayed(this, BATTERY_STATE_REQUEST_INTERVAL);
+        }
+    };
+
     private WearingState currentWearingState = WearingState.UNKNOWN;
     private BatteryState currentBatteryState = BatteryState.UNKNOWN;
     private SleepState currentSleepDetectionState = SleepState.UNKNOWN;
@@ -121,6 +134,8 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
         getSupport().sendCommand("get widgets", COMMAND_TYPE, CMD_WIDGET_SCREENS_GET);
         getSupport().sendCommand("get widget parts", COMMAND_TYPE, CMD_WIDGET_PARTS_GET);
         getSupport().sendCommand("get workout types", COMMAND_TYPE, CMD_WORKOUT_TYPES_GET);
+
+        handler.postDelayed(batteryStateRequestRunnable, BATTERY_STATE_REQUEST_INTERVAL);
     }
 
     @Override
@@ -351,6 +366,10 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
 
         batteryInfo.state = currentBatteryState;
         getSupport().evaluateGBDeviceEvent(batteryInfo);
+
+        // reset battery level request timer
+        handler.removeCallbacks(batteryStateRequestRunnable);
+        handler.postDelayed(batteryStateRequestRunnable, BATTERY_STATE_REQUEST_INTERVAL);
     }
 
     private void setPassword() {
@@ -779,6 +798,10 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
         }
 
         // TODO: handle activity state
+
+        // reset battery level refresh timer
+        handler.removeCallbacks(batteryStateRequestRunnable);
+        handler.postDelayed(batteryStateRequestRunnable, BATTERY_STATE_REQUEST_INTERVAL);
     }
 
     public void handleDeviceState(XiaomiProto.DeviceState deviceState) {

From e5c2bd51c2fdbf1763277832bad4180371b5f475 Mon Sep 17 00:00:00 2001
From: MrYoranimo <yvulker@gmail.com>
Date: Wed, 3 Jan 2024 17:46:57 +0100
Subject: [PATCH 489/595] Xiaomi: refactor XiaomiCharacteristic to use callback
 per message

---
 .../devices/xiaomi/XiaomiCharacteristic.java  | 86 ++++++++++++-------
 .../services/XiaomiDataUploadService.java     | 57 ++++++------
 2 files changed, 83 insertions(+), 60 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
index e66520c76..910a50395 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
@@ -70,8 +70,6 @@ public class XiaomiCharacteristic {
 
     private XiaomiChannelHandler channelHandler = null;
 
-    private SendCallback callback;
-
     public XiaomiCharacteristic(final XiaomiBleSupport support,
                                 final BluetoothGattCharacteristic bluetoothGattCharacteristic,
                                 @Nullable final XiaomiAuthService authService) {
@@ -90,10 +88,6 @@ public class XiaomiCharacteristic {
         this.channelHandler = handler;
     }
 
-    public void setCallback(final SendCallback callback) {
-        this.callback = callback;
-    }
-
     public void setEncrypted(final boolean encrypted) {
         this.isEncrypted = encrypted;
     }
@@ -113,11 +107,29 @@ public class XiaomiCharacteristic {
         this.currentPayload = null;
     }
 
+    /**
+     * Write bytes to this characteristic, encrypting and splitting it into chunks if necessary.
+     * Callback will be notified when a (n)ack has been received by the remote device.
+     */
+    public void write(final String taskName, final byte[] value, final SendCallback callback) {
+        write(null, new Payload(taskName, value, callback));
+    }
+
     /**
      * Write bytes to this characteristic, encrypting and splitting it into chunks if necessary.
      */
     public void write(final String taskName, final byte[] value) {
-        write(null, new Payload(taskName, value));
+        write(taskName, value, null);
+    }
+
+    /**
+     * Write bytes to this characteristic, encrypting and splitting it into chunks if necessary. Uses
+     * the provided builder if we need to schedule something, otherwise it will be queued as other
+     * commands. The callback will be notified when a (n)ack has been received from the remote
+     * device in response to the payload being sent.
+     */
+    public void write(final TransactionBuilder builder, final byte[] value, final SendCallback callback) {
+        write(builder, new Payload(builder.getTaskName(), value, callback));
     }
 
     /**
@@ -125,7 +137,7 @@ public class XiaomiCharacteristic {
      * the provided if we need to schedule something, otherwise it will be queued as other commands.
      */
     public void write(final TransactionBuilder builder, final byte[] value) {
-        write(builder, new Payload(builder.getTaskName(), value));
+        write(builder, value, null);
     }
 
     private void write(final TransactionBuilder builder, final Payload payload) {
@@ -134,17 +146,6 @@ public class XiaomiCharacteristic {
     }
 
     public void onCharacteristicChanged(final byte[] value) {
-        if (Arrays.equals(value, PAYLOAD_ACK)) {
-            LOG.debug("Got ack");
-            currentPayload = null;
-            waitingAck = false;
-            if (callback != null) {
-                callback.onSend(payloadQueue.size());
-            }
-            sendNext(null);
-            return;
-        }
-
         final ByteBuffer buf = ByteBuffer.wrap(value).order(ByteOrder.LITTLE_ENDIAN);
 
         final int chunk = buf.getShort();
@@ -201,11 +202,11 @@ public class XiaomiCharacteristic {
                     switch (subtype) {
                         case 0:
                             LOG.debug("Got chunked ack end");
+                            if (currentPayload != null && currentPayload.getCallback() != null) {
+                                currentPayload.getCallback().onSend();
+                            }
                             currentPayload = null;
                             sendingChunked = false;
-                            if (callback != null) {
-                                callback.onSend(payloadQueue.size());
-                            }
                             sendNext(null);
                             return;
                         case 1:
@@ -226,17 +227,16 @@ public class XiaomiCharacteristic {
                             return;
                         case 2:
                             LOG.warn("Got chunked nack for {}", currentPayload.getTaskName());
+                            if (currentPayload != null && currentPayload.getCallback() != null) {
+                                currentPayload.getCallback().onNack();
+                            }
                             currentPayload = null;
                             sendingChunked = false;
-                            if (callback != null) {
-                                callback.onSend(payloadQueue.size());
-                            }
                             sendNext(null);
                             return;
                     }
 
                     LOG.warn("Unknown chunked ack subtype {} for {}", subtype, currentPayload.getTaskName());
-
                     return;
                 case 2:
                     // Single command
@@ -261,8 +261,28 @@ public class XiaomiCharacteristic {
                     return;
                 case 3:
                     // ack
-                    LOG.debug("Got ack");
+                    final byte result = buf.get();
+
+                    if (result == 0) {
+                        LOG.debug("Got ack for {}", currentPayload.getTaskName());
+
+                        if (currentPayload != null && currentPayload.getCallback() != null) {
+                            currentPayload.getCallback().onSend();
+                        }
+                    } else {
+                        LOG.warn("Got single cmd NACK ({}) for {}", result, currentPayload.getTaskName());
+
+                        if (currentPayload != null && currentPayload.getCallback() != null) {
+                            currentPayload.getCallback().onNack();
+                        }
+                    }
+                    currentPayload = null;
+                    waitingAck = false;
+                    sendNext(null);
+                    return;
             }
+
+            LOG.warn("Unhandled command type {}", type);
         }
     }
 
@@ -375,10 +395,16 @@ public class XiaomiCharacteristic {
 
         // Bytes that will actually be sent (might be encrypted)
         private byte[] bytesToSend;
+        private final SendCallback callback;
 
-        public Payload(final String taskName, final byte[] bytes) {
+        public Payload(final String taskName, final byte[] bytes, final SendCallback callback) {
             this.taskName = taskName;
             this.bytes = bytes;
+            this.callback = callback;
+        }
+
+        public Payload(final String taskName, final byte[] bytes) {
+            this(taskName, bytes, null);
         }
 
         public String getTaskName() {
@@ -392,9 +418,11 @@ public class XiaomiCharacteristic {
         public byte[] getBytesToSend() {
             return bytesToSend != null ? bytesToSend : bytes;
         }
+        public SendCallback getCallback() { return this.callback; }
     }
 
     public interface SendCallback {
-        void onSend(int remaining);
+        void onSend();
+        void onNack();
     }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiDataUploadService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiDataUploadService.java
index 5695ced16..a0190610d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiDataUploadService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiDataUploadService.java
@@ -65,8 +65,7 @@ public class XiaomiDataUploadService extends AbstractXiaomiService {
 
                 if (dataUploadAck.getUnknown2() != 0 || dataUploadAck.getResumePosition() != 0) {
                     LOG.warn("Unexpected response");
-                    this.currentType = 0;
-                    this.currentBytes = null;
+                    onUploadFinish(false);
                     return;
                 }
 
@@ -76,6 +75,7 @@ public class XiaomiDataUploadService extends AbstractXiaomiService {
                     chunkSize = 2048;
                 }
 
+                LOG.debug("Using chunk size of {} bytes", chunkSize);
                 doUpload(currentType, currentBytes);
                 return;
         }
@@ -143,38 +143,35 @@ public class XiaomiDataUploadService extends AbstractXiaomiService {
         final int partSize = chunkSize - 4; // 2 + 2 at beginning of each for total and progress
         final int totalParts = (int) Math.ceil(payload.length / (float) partSize);
 
-        characteristic.setCallback(remainingParts -> {
-            final int totalBytes = totalParts * 4 + payload.length;
-            int progressBytes = totalParts * 4 + payload.length;
-            if (remainingParts > 1) {
-                progressBytes -= (remainingParts - 1) * partSize;
-            }
-            if (remainingParts > 0) {
-                progressBytes -= (payload.length % partSize);
-            }
-
-            final int progressPercent = Math.round((100.0f * progressBytes) / totalBytes);
-
-            LOG.debug("Data upload progress: {} parts remaining ({}%)", remainingParts, progressPercent);
-
-            if (remainingParts > 0) {
-                if (callback != null) {
-                    callback.onUploadProgress(progressPercent);
-                }
-            } else {
-                onUploadFinish(true);
-            }
-        });
-
         for (int i = 0; i * partSize < payload.length; i++) {
+            final int currentPart = i + 1;
             final int startIndex = i * partSize;
-            final int endIndex = Math.min((i + 1) * partSize, payload.length);
-            LOG.debug("Uploading part {} of {}, from {} to {}", (i + 1), totalParts, startIndex, endIndex);
+            final int endIndex = Math.min(currentPart * partSize, payload.length);
+            LOG.debug("Uploading part {} of {}, from {} to {}", currentPart, totalParts, startIndex, endIndex);
             final byte[] chunkToSend = new byte[4 + endIndex - startIndex];
             BLETypeConversions.writeUint16(chunkToSend, 0, totalParts);
-            BLETypeConversions.writeUint16(chunkToSend, 2, i + 1);
+            BLETypeConversions.writeUint16(chunkToSend, 2, currentPart);
             System.arraycopy(payload, startIndex, chunkToSend, 4, endIndex - startIndex);
-            characteristic.write("upload part " + (i + 1) + " of " + totalParts, chunkToSend);
+
+            characteristic.write("upload part " + currentPart + " of " + totalParts, chunkToSend, new XiaomiCharacteristic.SendCallback() {
+                @Override
+                public void onSend() {
+                    final int progressPercent = Math.round((100.0f * currentPart) / totalParts);
+                    LOG.debug("Data upload progress: {}/{} parts sent ({}% done)", currentPart, totalParts, progressPercent);
+
+                    if (currentPart >= totalParts) {
+                        onUploadFinish(true);
+                    } else if (callback != null) {
+                        callback.onUploadProgress(progressPercent);
+                    }
+                }
+
+                @Override
+                public void onNack() {
+                    LOG.warn("NACK received while uploading part {}/{}", currentPart, totalParts);
+                    // TODO callback.onUploadFinish(false); ?
+                }
+            });
         }
     }
 
@@ -189,8 +186,6 @@ public class XiaomiDataUploadService extends AbstractXiaomiService {
         if (callback != null) {
             callback.onUploadFinish(success);
         }
-
-        characteristic.setCallback(null);
     }
 
     public interface Callback {

From b31d98c7a0b64ecbff566a6c746d5f1ee786a0a9 Mon Sep 17 00:00:00 2001
From: MrYoranimo <yvulker@gmail.com>
Date: Thu, 4 Jan 2024 00:14:28 +0100
Subject: [PATCH 490/595] Xiaomi: add support for data uploading over SPP

---
 .../devices/xiaomi/XiaomiBleSupport.java      | 14 ++++++++--
 .../xiaomi/XiaomiConnectionSupport.java       |  3 +++
 .../devices/xiaomi/XiaomiSppSupport.java      | 26 +++++++++++++++++++
 .../services/XiaomiDataUploadService.java     |  7 +----
 4 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiBleSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiBleSupport.java
index 393f19be9..52dd38e3b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiBleSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiBleSupport.java
@@ -22,6 +22,8 @@ import android.bluetooth.BluetoothGattCharacteristic;
 import android.content.Context;
 import android.widget.Toast;
 
+import androidx.annotation.Nullable;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -125,8 +127,6 @@ public class XiaomiBleSupport extends XiaomiConnectionSupport {
             XiaomiBleSupport.this.characteristicDataUpload.setEncrypted(uuidSet.isEncrypted());
             XiaomiBleSupport.this.characteristicDataUpload.setIncrementNonce(false);
 
-            mXiaomiSupport.getDataUploadService().setDataUploadCharacteristic(XiaomiBleSupport.this.characteristicDataUpload);
-
             builder.requestMtu(247);
             builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.INITIALIZING, getContext()));
             builder.notify(btCharacteristicCommandWrite, true);
@@ -207,6 +207,16 @@ public class XiaomiBleSupport extends XiaomiConnectionSupport {
         this.characteristicCommandWrite.write(taskName, command.toByteArray());
     }
 
+    @Override
+    public void sendDataChunk(String taskName, byte[] chunk, @Nullable XiaomiCharacteristic.SendCallback callback) {
+        if (this.characteristicDataUpload == null) {
+            LOG.warn("characteristicDataUpload is null!");
+            return;
+        }
+
+        this.characteristicDataUpload.write(taskName, chunk, callback);
+    }
+
     /**
      * Realistically, this function should only be used during auth, as we must schedule the command after
      * notifications were enabled on the characteristics, and for that we need the builder to guarantee the
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiConnectionSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiConnectionSupport.java
index df47cf4c9..f3b86a07c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiConnectionSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiConnectionSupport.java
@@ -19,6 +19,8 @@ package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi;
 import android.bluetooth.BluetoothAdapter;
 import android.content.Context;
 
+import androidx.annotation.Nullable;
+
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
 
@@ -30,4 +32,5 @@ public abstract class XiaomiConnectionSupport {
     public abstract void setContext(final GBDevice device, final BluetoothAdapter adapter, final Context context);
     public abstract void disconnect();
     public abstract void sendCommand(final String taskName, final XiaomiProto.Command command);
+    public abstract void sendDataChunk(final String taskName, final byte[] chunk, @Nullable final XiaomiCharacteristic.SendCallback callback);
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSppSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSppSupport.java
index e3f79079d..607985743 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSppSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSppSupport.java
@@ -17,12 +17,17 @@
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi;
 
 import static nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSppPacket.CHANNEL_FITNESS;
+import static nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSppPacket.CHANNEL_MASS;
 import static nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSppPacket.CHANNEL_PROTO_RX;
+import static nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSppPacket.DATA_TYPE_ENCRYPTED;
 import static nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSppPacket.PACKET_PREAMBLE;
 
 import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothSocket;
 import android.content.Context;
 
+import androidx.annotation.Nullable;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -258,4 +263,25 @@ public class XiaomiSppSupport extends XiaomiConnectionSupport {
         builder.write(packet.encode(mXiaomiSupport.getAuthService(), encryptionCounter));
         // do not queue here, that's the job of the caller
     }
+
+    public void sendDataChunk(final String taskName, final byte[] chunk, @Nullable final XiaomiCharacteristic.SendCallback callback) {
+        XiaomiSppPacket packet = XiaomiSppPacket.newBuilder()
+                .channel(CHANNEL_MASS)
+                .needsResponse(false)
+                .flag(true)
+                .opCode(2)
+                .frameSerial(frameCounter.getAndIncrement())
+                .dataType(DATA_TYPE_ENCRYPTED)
+                .payload(chunk)
+                .build();
+        LOG.debug("sending data packet: {}", packet);
+        TransactionBuilder b = this.commsSupport.createTransactionBuilder("send " + taskName);
+        b.write(packet.encode(mXiaomiSupport.getAuthService(), encryptionCounter));
+        b.queue(commsSupport.getQueue());
+
+        if (callback != null) {
+            // callback puts a SetProgressAction onto the queue
+            callback.onSend();
+        }
+    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiDataUploadService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiDataUploadService.java
index a0190610d..4153d2c1b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiDataUploadService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiDataUploadService.java
@@ -44,7 +44,6 @@ public class XiaomiDataUploadService extends AbstractXiaomiService {
     public static final byte TYPE_FIRMWARE = 32;
     public static final byte TYPE_NOTIFICATION_ICON = 50;
 
-    private XiaomiCharacteristic characteristic;
     private Callback callback;
 
     private byte currentType;
@@ -153,7 +152,7 @@ public class XiaomiDataUploadService extends AbstractXiaomiService {
             BLETypeConversions.writeUint16(chunkToSend, 2, currentPart);
             System.arraycopy(payload, startIndex, chunkToSend, 4, endIndex - startIndex);
 
-            characteristic.write("upload part " + currentPart + " of " + totalParts, chunkToSend, new XiaomiCharacteristic.SendCallback() {
+            getSupport().getConnectionSpecificSupport().sendDataChunk("upload part " + currentPart + " of " + totalParts, chunkToSend, new XiaomiCharacteristic.SendCallback() {
                 @Override
                 public void onSend() {
                     final int progressPercent = Math.round((100.0f * currentPart) / totalParts);
@@ -175,10 +174,6 @@ public class XiaomiDataUploadService extends AbstractXiaomiService {
         }
     }
 
-    public void setDataUploadCharacteristic(final XiaomiCharacteristic characteristic) {
-        this.characteristic = characteristic;
-    }
-
     private void onUploadFinish(final boolean success) {
         this.currentType = 0;
         this.currentBytes = null;

From b9cbd14ffec7158825682a808303cf1b77f3a116 Mon Sep 17 00:00:00 2001
From: MrYoranimo <yvulker@gmail.com>
Date: Thu, 4 Jan 2024 22:39:23 +0100
Subject: [PATCH 491/595] Xiaomi: fix logic for ability to select widget
 workout type

---
 .../gadgetbridge/devices/xiaomi/XiaomiWidgetManager.java    | 6 ++----
 app/src/main/proto/xiaomi.proto                             | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiWidgetManager.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiWidgetManager.java
index 9e9db972d..63649618f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiWidgetManager.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiWidgetManager.java
@@ -104,8 +104,7 @@ public class XiaomiWidgetManager implements WidgetManager {
                         type
                 );
 
-                // FIXME are there others?
-                if (widgetPart.getId() == 2321) {
+                if (widgetPart.getFunction() == 16) {
                     if (StringUtils.isBlank(newPart.getName())) {
                         newPart.setName(GBApplication.getContext().getString(R.string.menuitem_workout));
                     }
@@ -170,8 +169,7 @@ public class XiaomiWidgetManager implements WidgetManager {
                     newPart.setName(rawPart1.getTitle());
                 }
 
-                // FIXME are there others?
-                if (widgetPart.getId() == 2321) {
+                if (widgetPart.getFunction() == 16) {
                     if (StringUtils.isBlank(newPart.getName())) {
                         newPart.setName(GBApplication.getContext().getString(R.string.menuitem_workout));
                     }
diff --git a/app/src/main/proto/xiaomi.proto b/app/src/main/proto/xiaomi.proto
index afd434a48..baad7813f 100644
--- a/app/src/main/proto/xiaomi.proto
+++ b/app/src/main/proto/xiaomi.proto
@@ -253,11 +253,11 @@ message WidgetParts {
 
 message WidgetPart {
   optional uint32 type = 1; // 1 for small 1x1, 2 for wide 2x1, 3 for tall 1x2
-  optional uint32 app = 2; // matches command type
+  optional uint32 function = 2; // matches command type
   optional uint32 id = 3; // they all seem unique
   optional string title = 4; // not set on create
   optional uint32 subType = 5; // usually 0 if no subtype
-  optional string unknown6 = 6; // "" on get
+  optional string appId = 6; // "" on get
   optional string unknown7 = 7; // "" on get
 }
 

From d217a0b15ffa0532ddfa5776f8fc423ea030b002 Mon Sep 17 00:00:00 2001
From: MrYoranimo <yvulker@gmail.com>
Date: Fri, 5 Jan 2024 16:46:21 +0100
Subject: [PATCH 492/595] Xiaomi: fix only short-bytes from int nonce being
 used during encryption

---
 .../service/devices/xiaomi/XiaomiAuthService.java          | 7 +++----
 .../service/devices/xiaomi/XiaomiCharacteristic.java       | 6 +++---
 .../service/devices/xiaomi/XiaomiSppPacket.java            | 4 ++--
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java
index 656c6c83b..3eb39478b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java
@@ -160,12 +160,11 @@ public class XiaomiAuthService extends AbstractXiaomiService {
         }
     }
 
-    public byte[] encrypt(final byte[] arr, final short i) {
+    public byte[] encrypt(final byte[] arr, final int i) {
         final ByteBuffer packetNonce = ByteBuffer.allocate(12).order(ByteOrder.LITTLE_ENDIAN)
                 .put(encryptionNonce)
                 .putInt(0)
-                .putShort(i) // TODO what happens once this overflows?
-                .putShort((short) 0);
+                .putInt(i);
 
         try {
             return encrypt(encryptionKey, packetNonce.array(), arr);
@@ -219,7 +218,7 @@ public class XiaomiAuthService extends AbstractXiaomiService {
                 .build();
 
         final byte[] encryptedNonces = hmacSHA256(encryptionKey, ArrayUtils.addAll(nonce, watchNonce.getNonce().toByteArray()));
-        final byte[] encryptedDeviceInfo = encrypt(authDeviceInfo.toByteArray(), (short) 0);
+        final byte[] encryptedDeviceInfo = encrypt(authDeviceInfo.toByteArray(), 0);
         final XiaomiProto.AuthStep3 authStep3 = XiaomiProto.AuthStep3.newBuilder()
                 .setEncryptedNonces(ByteString.copyFrom(encryptedNonces))
                 .setEncryptedDeviceInfo(ByteString.copyFrom(encryptedDeviceInfo))
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
index 910a50395..e246fe284 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
@@ -54,7 +54,7 @@ public class XiaomiCharacteristic {
     private final XiaomiAuthService authService;
     private boolean isEncrypted;
     public boolean incrementNonce = true;
-    private short encryptedIndex = 0;
+    private int encryptedIndex = 0;
 
     // Chunking
     private int numChunks = 0;
@@ -311,7 +311,7 @@ public class XiaomiCharacteristic {
                 // Prepend encrypted index for the nonce
                 currentPayload.setBytesToSend(
                         ByteBuffer.allocate(2 + currentPayload.getBytesToSend().length).order(ByteOrder.LITTLE_ENDIAN)
-                                .putShort(encryptedIndex++)
+                                .putShort((short) encryptedIndex++)
                                 .put(currentPayload.getBytesToSend())
                                 .array()
                 );
@@ -344,7 +344,7 @@ public class XiaomiCharacteristic {
             buf.put((byte) (encrypt ? 1 : 2));
             if (encrypt) {
                 if (incrementNonce) {
-                    buf.putShort(encryptedIndex++);
+                    buf.putShort((short) encryptedIndex++);
                 } else {
                     buf.putShort((short) 0);
                 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSppPacket.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSppPacket.java
index c9173de59..dc000dd04 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSppPacket.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSppPacket.java
@@ -220,9 +220,9 @@ public class XiaomiSppPacket {
         byte[] payload = this.payload;
 
         if (dataType == DATA_TYPE_ENCRYPTED && channel == CHANNEL_PROTO_TX) {
-            short packetCounter = (short) encryptionCounter.incrementAndGet();
+            int packetCounter = encryptionCounter.incrementAndGet();
             payload = authService.encrypt(payload, packetCounter);
-            payload = ByteBuffer.allocate(payload.length + 2).order(ByteOrder.LITTLE_ENDIAN).putShort(packetCounter).put(payload).array();
+            payload = ByteBuffer.allocate(payload.length + 2).order(ByteOrder.LITTLE_ENDIAN).putShort((short) packetCounter).put(payload).array();
         } else if (dataType == DATA_TYPE_ENCRYPTED) {
             payload = authService.encrypt(payload, (short) 0);
         }

From 53a7cc5b3028526649b8f434689a5a0628f7caa4 Mon Sep 17 00:00:00 2001
From: MrYoranimo <yvulker@gmail.com>
Date: Fri, 5 Jan 2024 16:49:55 +0100
Subject: [PATCH 493/595] Xiaomi: run data upload service finalization on
 respective queue

---
 .../devices/xiaomi/XiaomiBleSupport.java      | 18 ++++++++--
 .../xiaomi/XiaomiConnectionSupport.java       |  3 +-
 .../devices/xiaomi/XiaomiSppSupport.java      | 23 ++++++++++--
 .../service/devices/xiaomi/XiaomiSupport.java |  9 -----
 .../services/XiaomiNotificationService.java   |  6 ++--
 .../xiaomi/services/XiaomiSystemService.java  | 25 ++++++++-----
 .../services/XiaomiWatchfaceService.java      | 35 +++++++++++--------
 7 files changed, 80 insertions(+), 39 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiBleSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiBleSupport.java
index 52dd38e3b..b53f01c93 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiBleSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiBleSupport.java
@@ -36,6 +36,7 @@ import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.AbstractBTLEDeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.BtLEQueue;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.PlainAction;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetDeviceStateAction;
 import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetProgressAction;
 import nodomain.freeyourgadget.gadgetbridge.util.GB;
@@ -241,12 +242,12 @@ public class XiaomiBleSupport extends XiaomiConnectionSupport {
     }
 
     @Override
-    public void onUploadProgress(int textRsrc, int progressPercent) {
+    public void onUploadProgress(int textRsrc, int progressPercent, boolean ongoing) {
         try {
             final TransactionBuilder builder = commsSupport.createTransactionBuilder("send data upload progress");
             builder.add(new SetProgressAction(
                     commsSupport.getContext().getString(textRsrc),
-                    true,
+                    ongoing,
                     progressPercent,
                     commsSupport.getContext()
             ));
@@ -261,6 +262,19 @@ public class XiaomiBleSupport extends XiaomiConnectionSupport {
         return commsSupport.connect();
     }
 
+    @Override
+    public void runOnQueue(String taskName, Runnable runnable) {
+        final TransactionBuilder b = commsSupport.createTransactionBuilder("run task " + taskName + " on queue");
+        b.add(new PlainAction() {
+            @Override
+            public boolean run(BluetoothGatt gatt) {
+                runnable.run();
+                return true;
+            }
+        });
+        b.queue(commsSupport.getQueue());
+    }
+
     @Override
     public void dispose() {
         commsSupport.dispose();
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiConnectionSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiConnectionSupport.java
index f3b86a07c..1911bfbb4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiConnectionSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiConnectionSupport.java
@@ -27,7 +27,8 @@ import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
 public abstract class XiaomiConnectionSupport {
     public abstract boolean connect();
     public abstract void onAuthSuccess();
-    public abstract void onUploadProgress(int textRsrc, int progressPercent);
+    public abstract void onUploadProgress(int textRsrc, int progressPercent, boolean ongoing);
+    public abstract void runOnQueue(String taskName, Runnable run);
     public abstract void dispose();
     public abstract void setContext(final GBDevice device, final BluetoothAdapter adapter, final Context context);
     public abstract void disconnect();
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSppSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSppSupport.java
index 607985743..0c3b0e788 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSppSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSppSupport.java
@@ -45,6 +45,7 @@ import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.proto.xiaomi.XiaomiProto;
 import nodomain.freeyourgadget.gadgetbridge.service.btbr.AbstractBTBRDeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.service.btbr.TransactionBuilder;
+import nodomain.freeyourgadget.gadgetbridge.service.btbr.actions.PlainAction;
 import nodomain.freeyourgadget.gadgetbridge.service.btbr.actions.SetDeviceStateAction;
 import nodomain.freeyourgadget.gadgetbridge.service.btbr.actions.SetProgressAction;
 
@@ -110,12 +111,12 @@ public class XiaomiSppSupport extends XiaomiConnectionSupport {
     }
 
     @Override
-    public void onUploadProgress(final int textRsrc, final int progressPercent) {
+    public void onUploadProgress(final int textRsrc, final int progressPercent, final boolean ongoing) {
         try {
             final TransactionBuilder builder = commsSupport.createTransactionBuilder("send data upload progress");
             builder.add(new SetProgressAction(
                     commsSupport.getContext().getString(textRsrc),
-                    true,
+                    ongoing,
                     progressPercent,
                     commsSupport.getContext()
             ));
@@ -125,6 +126,24 @@ public class XiaomiSppSupport extends XiaomiConnectionSupport {
         }
     }
 
+    @Override
+    public void runOnQueue(String taskName, Runnable runnable) {
+        if (commsSupport == null) {
+            LOG.error("commsSupport is null, unable to queue task");
+            return;
+	}
+
+        final TransactionBuilder b = commsSupport.createTransactionBuilder("run task " + taskName + " on queue");
+        b.add(new PlainAction() {
+            @Override
+            public boolean run(BluetoothSocket socket) {
+                runnable.run();
+                return true;
+            }
+        });
+        b.queue(commsSupport.getQueue());
+    }
+
     @Override
     public void setContext(GBDevice device, BluetoothAdapter adapter, Context context) {
         this.commsSupport.setContext(device, adapter, context);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
index c6e86a8ee..dde826743 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
@@ -168,15 +168,6 @@ public class XiaomiSupport extends AbstractDeviceSupport {
         return false;
     }
 
-    public void onUploadProgress(int textRsrc, int progressPercent) {
-        if (getConnectionSpecificSupport() == null) {
-            LOG.error("onUploadProgress called but connection specific unavailable");
-            return;
-        }
-
-        getConnectionSpecificSupport().onUploadProgress(textRsrc, progressPercent);
-    }
-
     @Override
     public void dispose() {
         if (getConnectionSpecificSupport() != null) {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
index 18cb79859..7f772ea6f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiNotificationService.java
@@ -545,8 +545,10 @@ public class XiaomiNotificationService extends AbstractXiaomiService implements
     @Override
     public void onUploadFinish(final boolean success) {
         LOG.debug("Notification icon upload finished: {}", success);
-
-        getSupport().getDataUploadService().setCallback(null);
+        getSupport().getConnectionSpecificSupport().runOnQueue(
+                "notification icon upload finish",
+                () -> getSupport().getDataUploadService().setCallback(null)
+        );
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
index ba2013851..603afe325 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiSystemService.java
@@ -959,21 +959,28 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
     public void onUploadFinish(final boolean success) {
         LOG.debug("Firmware upload finished: {}", success);
 
-        getSupport().getDataUploadService().setCallback(null);
+        if (getSupport().getConnectionSpecificSupport() != null) {
+            getSupport().getConnectionSpecificSupport().runOnQueue("firmware upload finish", () -> {
+                getSupport().getDataUploadService().setCallback(null);
 
-        final String notificationMessage = success ?
-                getSupport().getContext().getString(R.string.updatefirmwareoperation_update_complete) :
-                getSupport().getContext().getString(R.string.updatefirmwareoperation_write_failed);
+                final int notificationMessage = success ?
+                        R.string.updatefirmwareoperation_update_complete :
+                        R.string.updatefirmwareoperation_write_failed;
 
-        GB.updateInstallNotification(notificationMessage, false, 100, getSupport().getContext());
+                onUploadProgress(notificationMessage, 100, false);
+                unsetDeviceBusy();
 
-        unsetDeviceBusy();
-
-        fwHelper = null;
+                fwHelper = null;
+            });
+        }
     }
 
     @Override
     public void onUploadProgress(final int progressPercent) {
-        getSupport().onUploadProgress(R.string.updatefirmwareoperation_update_in_progress, progressPercent);
+        onUploadProgress(R.string.updatefirmwareoperation_update_in_progress, progressPercent, true);
+    }
+
+    public void onUploadProgress(final int stringResource, final int progressPercent, final boolean ongoing) {
+        getSupport().getConnectionSpecificSupport().onUploadProgress(stringResource, progressPercent, ongoing);
     }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWatchfaceService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWatchfaceService.java
index 02bec40d1..eff5a3daa 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWatchfaceService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWatchfaceService.java
@@ -228,29 +228,36 @@ public class XiaomiWatchfaceService extends AbstractXiaomiService implements Xia
 
     @Override
     public void onUploadFinish(final boolean success) {
-        LOG.debug("Watchface upload finished: {}", success);
+        final int notificationMessage = success ?
+                R.string.uploadwatchfaceoperation_complete :
+                R.string.uploadwatchfaceoperation_failed;
 
-        getSupport().getDataUploadService().setCallback(null);
+        onUploadProgress(notificationMessage, 100, false);
 
-        final String notificationMessage = success ?
-                getSupport().getContext().getString(R.string.uploadwatchfaceoperation_complete) :
-                getSupport().getContext().getString(R.string.uploadwatchfaceoperation_failed);
+        if (getSupport().getConnectionSpecificSupport() != null) {
+            getSupport().getConnectionSpecificSupport().runOnQueue("watchface upload finish", () -> {
+                LOG.debug("Watchface upload finished: {}", success);
+                getSupport().getDataUploadService().setCallback(null);
+                unsetDeviceBusy();
 
-        GB.updateInstallNotification(notificationMessage, false, 100, getSupport().getContext());
+                if (success) {
+                    setWatchface(fwHelper.getId());
+                    requestWatchfaceList();
+                }
 
-        unsetDeviceBusy();
-
-        if (success) {
-            setWatchface(fwHelper.getId());
-            requestWatchfaceList();
+                fwHelper = null;
+            });
         }
-
-        fwHelper = null;
     }
 
     @Override
     public void onUploadProgress(final int progressPercent) {
-        getSupport().onUploadProgress(R.string.uploadwatchfaceoperation_in_progress, progressPercent);
+        onUploadProgress(R.string.uploadwatchfaceoperation_in_progress, progressPercent, true);
+    }
+
+    private void onUploadProgress(final int stringResource, final int progressPercent, final boolean ongoing) {
+        if (getSupport().getConnectionSpecificSupport() != null)
+            getSupport().getConnectionSpecificSupport().onUploadProgress(stringResource, progressPercent, ongoing);
     }
 
     private void setDeviceBusy() {

From 339859c8297e38d81822364b9c841a21c322c7e8 Mon Sep 17 00:00:00 2001
From: MrYoranimo <yvulker@gmail.com>
Date: Fri, 5 Jan 2024 16:51:54 +0100
Subject: [PATCH 494/595] Xiaomi: change BLE max chunk size with MTU changes

---
 .../btle/AbstractBTLEDeviceSupport.java       |  2 +-
 .../devices/xiaomi/XiaomiAuthService.java     | 24 +----
 .../devices/xiaomi/XiaomiBleSupport.java      | 67 +++++++++++---
 .../devices/xiaomi/XiaomiCharacteristic.java  | 88 +++++++++++++++----
 .../devices/xiaomi/XiaomiSppSupport.java      |  9 +-
 5 files changed, 138 insertions(+), 52 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEDeviceSupport.java
index 234267cf1..7ecd3ce26 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEDeviceSupport.java
@@ -55,7 +55,7 @@ import nodomain.freeyourgadget.gadgetbridge.service.btle.profiles.AbstractBlePro
 public abstract class AbstractBTLEDeviceSupport extends AbstractDeviceSupport implements GattCallback, GattServerCallback {
     private static final Logger LOG = LoggerFactory.getLogger(AbstractBTLEDeviceSupport.class);
 
-    private int mMTU = 0;
+    private int mMTU = 23;
     private BtLEQueue mQueue;
     private Map<UUID, BluetoothGattCharacteristic> mAvailableCharacteristics;
     private final Set<UUID> mSupportedServices = new HashSet<>(4);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java
index 3eb39478b..f1bd341ff 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiAuthService.java
@@ -79,32 +79,16 @@ public class XiaomiAuthService extends AbstractXiaomiService {
         return encryptionInitialized;
     }
 
-    // TODO also implement for spp
-    protected void startEncryptedHandshake(final XiaomiBleSupport support, final nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder builder) {
+    protected void startEncryptedHandshake() {
         encryptionInitialized = false;
 
-        builder.add(new nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetDeviceStateAction(getSupport().getDevice(), GBDevice.State.AUTHENTICATING, getSupport().getContext()));
-
         System.arraycopy(getSecretKey(getSupport().getDevice()), 0, secretKey, 0, 16);
         new SecureRandom().nextBytes(nonce);
 
-        support.sendCommand(builder, buildNonceCommand(nonce));
+        getSupport().sendCommand("auth step 1", buildNonceCommand(nonce));
     }
 
-    protected void startEncryptedHandshake(final XiaomiSppSupport support, final nodomain.freeyourgadget.gadgetbridge.service.btbr.TransactionBuilder builder) {
-        encryptionInitialized = false;
-
-        builder.add(new nodomain.freeyourgadget.gadgetbridge.service.btbr.actions.SetDeviceStateAction(getSupport().getDevice(), GBDevice.State.AUTHENTICATING, getSupport().getContext()));
-
-        System.arraycopy(getSecretKey(getSupport().getDevice()), 0, secretKey, 0, 16);
-        new SecureRandom().nextBytes(nonce);
-
-        support.sendCommand(builder, buildNonceCommand(nonce));
-    }
-
-    protected void startClearTextHandshake(final XiaomiBleSupport support, final nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder builder) {
-        builder.add(new nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetDeviceStateAction(getSupport().getDevice(), GBDevice.State.AUTHENTICATING, getSupport().getContext()));
-
+    protected void startClearTextHandshake() {
         final XiaomiProto.Auth auth = XiaomiProto.Auth.newBuilder()
                 .setUserId(getUserId(getSupport().getDevice()))
                 .build();
@@ -115,7 +99,7 @@ public class XiaomiAuthService extends AbstractXiaomiService {
                 .setAuth(auth)
                 .build();
 
-        support.sendCommand(builder, command);
+        getSupport().sendCommand("auth step 1", command);
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiBleSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiBleSupport.java
index b53f01c93..757fae5bb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiBleSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiBleSupport.java
@@ -116,29 +116,54 @@ public class XiaomiBleSupport extends XiaomiConnectionSupport {
                 return builder;
             }
 
-            XiaomiBleSupport.this.characteristicCommandRead = new XiaomiCharacteristic(XiaomiBleSupport.this, btCharacteristicCommandRead, mXiaomiSupport.getAuthService());
-            XiaomiBleSupport.this.characteristicCommandRead.setEncrypted(uuidSet.isEncrypted());
-            XiaomiBleSupport.this.characteristicCommandRead.setChannelHandler(mXiaomiSupport::handleCommandBytes);
-            XiaomiBleSupport.this.characteristicCommandWrite = new XiaomiCharacteristic(XiaomiBleSupport.this, btCharacteristicCommandWrite, mXiaomiSupport.getAuthService());
-            XiaomiBleSupport.this.characteristicCommandWrite.setEncrypted(uuidSet.isEncrypted());
-            XiaomiBleSupport.this.characteristicActivityData = new XiaomiCharacteristic(XiaomiBleSupport.this, btCharacteristicActivityData, mXiaomiSupport.getAuthService());
-            XiaomiBleSupport.this.characteristicActivityData.setChannelHandler(mXiaomiSupport.getHealthService().getActivityFetcher()::addChunk);
-            XiaomiBleSupport.this.characteristicActivityData.setEncrypted(uuidSet.isEncrypted());
-            XiaomiBleSupport.this.characteristicDataUpload = new XiaomiCharacteristic(XiaomiBleSupport.this, btCharacteristicDataUpload, mXiaomiSupport.getAuthService());
-            XiaomiBleSupport.this.characteristicDataUpload.setEncrypted(uuidSet.isEncrypted());
-            XiaomiBleSupport.this.characteristicDataUpload.setIncrementNonce(false);
+            // FIXME:
+            // Because the first handshake packet is sent before the actions in the builder are run,
+            // the maximum message size is not properly initialized if the device itself does not request
+            // the MTU to be upgraded. However, since we will upgrade the MTU ourselves to the highest
+            // possible (512) and the device will (likely) respond with something higher than 247,
+            // we will initialize the characteristics with that MTU.
+            final int expectedMtu = 247;
+            characteristicCommandRead = new XiaomiCharacteristic(XiaomiBleSupport.this, btCharacteristicCommandRead, mXiaomiSupport.getAuthService());
+            characteristicCommandRead.setEncrypted(uuidSet.isEncrypted());
+            characteristicCommandRead.setChannelHandler(mXiaomiSupport::handleCommandBytes);
+            characteristicCommandRead.setMtu(expectedMtu);
+            characteristicCommandWrite = new XiaomiCharacteristic(XiaomiBleSupport.this, btCharacteristicCommandWrite, mXiaomiSupport.getAuthService());
+            characteristicCommandWrite.setEncrypted(uuidSet.isEncrypted());
+            characteristicCommandWrite.setMtu(expectedMtu);
+            characteristicActivityData = new XiaomiCharacteristic(XiaomiBleSupport.this, btCharacteristicActivityData, mXiaomiSupport.getAuthService());
+            characteristicActivityData.setChannelHandler(mXiaomiSupport.getHealthService().getActivityFetcher()::addChunk);
+            characteristicActivityData.setEncrypted(uuidSet.isEncrypted());
+            characteristicActivityData.setMtu(expectedMtu);
+            characteristicDataUpload = new XiaomiCharacteristic(XiaomiBleSupport.this, btCharacteristicDataUpload, mXiaomiSupport.getAuthService());
+            characteristicDataUpload.setEncrypted(uuidSet.isEncrypted());
+            characteristicDataUpload.setIncrementNonce(false);
+            characteristicDataUpload.setMtu(expectedMtu);
 
-            builder.requestMtu(247);
+            // request highest possible MTU; device should response with the highest supported MTU anyway
+            builder.requestMtu(512);
             builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.INITIALIZING, getContext()));
             builder.notify(btCharacteristicCommandWrite, true);
             builder.notify(btCharacteristicCommandRead, true);
             builder.notify(btCharacteristicActivityData, true);
             builder.notify(btCharacteristicDataUpload, true);
+            builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.AUTHENTICATING, getContext()));
 
             if (uuidSet.isEncrypted()) {
-                mXiaomiSupport.getAuthService().startEncryptedHandshake(XiaomiBleSupport.this, builder);
+                builder.add(new PlainAction() {
+                    @Override
+                    public boolean run(BluetoothGatt gatt) {
+                        mXiaomiSupport.getAuthService().startEncryptedHandshake();
+                        return true;
+                    }
+                });
             } else {
-                mXiaomiSupport.getAuthService().startClearTextHandshake(XiaomiBleSupport.this, builder);
+                builder.add(new PlainAction() {
+                    @Override
+                    public boolean run(BluetoothGatt gatt) {
+                        mXiaomiSupport.getAuthService().startClearTextHandshake();
+                        return true;
+                    }
+                });
             }
 
             return builder;
@@ -175,6 +200,20 @@ public class XiaomiBleSupport extends XiaomiConnectionSupport {
         public boolean getImplicitCallbackModify() {
             return mXiaomiSupport.getImplicitCallbackModify();
         }
+
+        @Override
+        public void onMtuChanged(BluetoothGatt gatt, int mtu, int status) {
+            super.onMtuChanged(gatt, mtu, status);
+
+            if (characteristicCommandRead != null)
+                characteristicCommandRead.setMtu(mtu);
+            if (characteristicCommandWrite != null)
+                characteristicCommandWrite.setMtu(mtu);
+            if (characteristicDataUpload != null)
+                characteristicDataUpload.setMtu(mtu);
+            if (characteristicActivityData != null)
+                characteristicActivityData.setMtu(mtu);
+        }
     };
 
     public XiaomiBleSupport(final XiaomiSupport xiaomiSupport) {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
index e246fe284..8638d3c30 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiCharacteristic.java
@@ -42,9 +42,6 @@ public class XiaomiCharacteristic {
 
     public static final byte[] PAYLOAD_ACK = new byte[]{0, 0, 3, 0};
 
-    // max chunk size, including headers
-    public static final int MAX_WRITE_SIZE = 242;
-
     private final XiaomiBleSupport mSupport;
 
     private final BluetoothGattCharacteristic bluetoothGattCharacteristic;
@@ -56,6 +53,10 @@ public class XiaomiCharacteristic {
     public boolean incrementNonce = true;
     private int encryptedIndex = 0;
 
+    // max chunk size, including headers
+    private int maxWriteSize = 244; // MTU of 247 - 3 bytes for the ATT overhead (based on lowest MTU observed after increasing MTU to 512)
+    private int maxWriteSizeForCurrentMessage;
+
     // Chunking
     private int numChunks = 0;
     private int currentChunk = 0;
@@ -145,6 +146,17 @@ public class XiaomiCharacteristic {
         sendNext(builder);
     }
 
+    private void sendChunk(final TransactionBuilder builder, final int index, final int chunkPayloadSize) {
+        final byte[] payload = currentPayload.getBytesToSend();
+        final int startIndex = index * chunkPayloadSize;
+        final int endIndex = Math.min((index + 1) * chunkPayloadSize, payload.length);
+        LOG.debug("Sending chunk {} from {} to {} for {}", index, startIndex, endIndex, currentPayload.getTaskName());
+        final byte[] chunkToSend = new byte[2 + endIndex - startIndex];
+        BLETypeConversions.writeUint16(chunkToSend, 0, index + 1);
+        System.arraycopy(payload, startIndex, chunkToSend, 2, endIndex - startIndex);
+        builder.write(bluetoothGattCharacteristic, chunkToSend);
+    }
+
     public void onCharacteristicChanged(final byte[] value) {
         final ByteBuffer buf = ByteBuffer.wrap(value).order(ByteOrder.LITTLE_ENDIAN);
 
@@ -199,8 +211,16 @@ public class XiaomiCharacteristic {
                 case 1:
                     // Chunked ack
                     final byte subtype = buf.get();
+
+                    final byte[] remaining = new byte[buf.remaining()];
+                    if (buf.hasRemaining()) {
+                        buf.get(remaining);
+                        LOG.debug("Operation CHUNK_ACK of type {} has additional payload: {}",
+                                subtype, GB.hexdump(remaining));
+                    }
+
                     switch (subtype) {
-                        case 0:
+                        case 0: {
                             LOG.debug("Got chunked ack end");
                             if (currentPayload != null && currentPayload.getCallback() != null) {
                                 currentPayload.getCallback().onSend();
@@ -209,23 +229,21 @@ public class XiaomiCharacteristic {
                             sendingChunked = false;
                             sendNext(null);
                             return;
-                        case 1:
+                        }
+                        case 1: {
                             LOG.debug("Got chunked ack start");
                             final TransactionBuilder builder = mSupport.createTransactionBuilder("send chunks for " + currentPayload.getTaskName());
                             final byte[] payload = currentPayload.getBytesToSend();
-                            for (int i = 0; i * MAX_WRITE_SIZE < payload.length; i++) {
-                                final int startIndex = i * MAX_WRITE_SIZE;
-                                final int endIndex = Math.min((i + 1) * MAX_WRITE_SIZE, payload.length);
-                                LOG.debug("Sending chunk {} from {} to {} for {}", i, startIndex, endIndex, currentPayload.getTaskName());
-                                final byte[] chunkToSend = new byte[2 + endIndex - startIndex];
-                                BLETypeConversions.writeUint16(chunkToSend, 0, i + 1);
-                                System.arraycopy(payload, startIndex, chunkToSend, 2, endIndex - startIndex);
-                                builder.write(bluetoothGattCharacteristic, chunkToSend);
+                            final int chunkPayloadSize = maxWriteSizeForCurrentMessage - 2;
+
+                            for (int i = 0; i * chunkPayloadSize < payload.length; i++) {
+                                sendChunk(builder, i, chunkPayloadSize);
                             }
 
                             builder.queue(mSupport.getQueue());
                             return;
-                        case 2:
+                        }
+                        case 2: {
                             LOG.warn("Got chunked nack for {}", currentPayload.getTaskName());
                             if (currentPayload != null && currentPayload.getCallback() != null) {
                                 currentPayload.getCallback().onNack();
@@ -234,6 +252,35 @@ public class XiaomiCharacteristic {
                             sendingChunked = false;
                             sendNext(null);
                             return;
+                        }
+                        case 5: {
+                            short[] invalidChunks = new short[remaining.length / 2];
+                            if (remaining.length > 0) {
+                                ByteBuffer remainingBuffer = ByteBuffer.wrap(remaining).order(ByteOrder.LITTLE_ENDIAN);
+                                for (int i = 0; i < remaining.length / 2; i++) {
+                                    invalidChunks[i] = remainingBuffer.getShort();
+                                }
+
+                                LOG.info("Got chunk request, requested chunks: {}", Arrays.toString(invalidChunks));
+                                final TransactionBuilder builder = mSupport.createTransactionBuilder("resend chunks for " + currentPayload.getTaskName());
+
+                                for (short chunkIndex : invalidChunks) {
+                                    // chunk indices start at 1
+                                    sendChunk(builder, chunkIndex - 1, maxWriteSizeForCurrentMessage - 2);
+                                }
+                            } else {
+                                LOG.warn("Got chunk request, no chunk indices requested");
+
+                                if (maxWriteSize != maxWriteSizeForCurrentMessage) {
+                                    LOG.info("MTU changed while sending message, prepending message to queue and resending");
+                                    ((LinkedList<Payload>) payloadQueue).addFirst(currentPayload);
+                                    currentPayload = null;
+                                    sendingChunked = false;
+                                    sendNext(null);
+                                    return;
+                                }
+                            }
+                        }
                     }
 
                     LOG.warn("Unknown chunked ack subtype {} for {}", subtype, currentPayload.getTaskName());
@@ -276,6 +323,7 @@ public class XiaomiCharacteristic {
                             currentPayload.getCallback().onNack();
                         }
                     }
+
                     currentPayload = null;
                     waitingAck = false;
                     sendNext(null);
@@ -306,6 +354,9 @@ public class XiaomiCharacteristic {
             currentPayload.setBytesToSend(authService.encrypt(currentPayload.getBytesToSend(), incrementNonce ? encryptedIndex : 0));
         }
 
+        // before checking whether message should be chunked, read the maximum message size for this transaction
+        maxWriteSizeForCurrentMessage = maxWriteSize;
+
         if (shouldWriteChunked(currentPayload.getBytesToSend())) {
             if (encrypt && incrementNonce) {
                 // Prepend encrypted index for the nonce
@@ -325,7 +376,7 @@ public class XiaomiCharacteristic {
             buf.putShort((short) 0);
             buf.put((byte) 0);
             buf.put((byte) (encrypt ? 1 : 0));
-            buf.putShort((short) Math.ceil(currentPayload.getBytesToSend().length / (float) MAX_WRITE_SIZE));
+            buf.putShort((short) Math.ceil(currentPayload.getBytesToSend().length / (float) (maxWriteSizeForCurrentMessage - 2)));
 
             final TransactionBuilder builder = b == null ? mSupport.createTransactionBuilder("send chunked start for " + currentPayload.getTaskName()) : b;
             builder.write(bluetoothGattCharacteristic, buf.array());
@@ -368,7 +419,7 @@ public class XiaomiCharacteristic {
         }
 
         // payload + 6 bytes at the start with the encryption stuff
-        return payload.length + 6 > MAX_WRITE_SIZE;
+        return payload.length + 6 > maxWriteSizeForCurrentMessage;
     }
 
     private void sendAck() {
@@ -389,6 +440,11 @@ public class XiaomiCharacteristic {
         builder.queue(mSupport.getQueue());
     }
 
+    public void setMtu(final int newMtu) {
+        // subtract ATT packet header size
+        maxWriteSize = newMtu - 3;
+    }
+
     private static class Payload {
         private final String taskName;
         private final byte[] bytes;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSppSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSppSupport.java
index 0c3b0e788..240964989 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSppSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSppSupport.java
@@ -76,7 +76,14 @@ public class XiaomiSppSupport extends XiaomiConnectionSupport {
             }
 
             builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.INITIALIZING, getContext()));
-            mXiaomiSupport.getAuthService().startEncryptedHandshake(XiaomiSppSupport.this, builder);
+            builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.AUTHENTICATING, getContext()));
+            builder.add(new PlainAction() {
+                @Override
+                public boolean run(BluetoothSocket socket) {
+                    mXiaomiSupport.getAuthService().startEncryptedHandshake();
+                    return true;
+                }
+            });
 
             return builder;
         }

From ae97e961b9924e08ce2848aba8eddc179109c797 Mon Sep 17 00:00:00 2001
From: MrYoranimo <yvulker@gmail.com>
Date: Fri, 5 Jan 2024 17:42:54 +0100
Subject: [PATCH 495/595] Xiaomi: add potential service and characteristic
 UUIDs

---
 .../service/btle/BleNamesResolver.java        |  7 +++++-
 .../devices/xiaomi/XiaomiBleSupport.java      | 25 ++++++++++++-------
 .../service/devices/xiaomi/XiaomiUuids.java   | 22 +++++++++++++++-
 3 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BleNamesResolver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BleNamesResolver.java
index 31c623b7b..98f7164c6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BleNamesResolver.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BleNamesResolver.java
@@ -99,10 +99,15 @@ public class BleNamesResolver {
 		mServices.put("00001814-0000-1000-8000-00805f9b34fb", "Running Speed and Cadence");
 		mServices.put("00001813-0000-1000-8000-00805f9b34fb", "Scan Parameters");
 		mServices.put("00001804-0000-1000-8000-00805f9b34fb", "Tx Power");
+		mServices.put("0000fdab-0000-1000-8000-00805f9b34fb", "(Propr: Xiaomi Proximity Unlock Service)");
+		mServices.put("0000fe95-0000-1000-8000-00805f9b34fb", "(Propr: Xiaomi Wear Service)");
 		mServices.put("0000fee0-0000-3512-2118-0009af100700", "(Propr: Xiaomi MiLi Service)");
 		mServices.put("00001530-0000-3512-2118-0009af100700", "(Propr: Xiaomi Weight Service)");
 		mServices.put("14701820-620a-3973-7c78-9cfff0876abd", "(Propr: HPLUS Service)");
-
+		mServices.put("16186f00-0000-1000-8000-00807f9b34fb", "(Propr: Xiaomi Wear Service - Mi Watch Lite/Redmi Watch)");
+		mServices.put("16187f00-0000-1000-8000-00807f9b34fb", "(Propr: Xiaomi Wear Service - Mi Smart Watch 4C/Redmi Band)");
+		mServices.put("1314f000-1000-9000-7000-301291e21220", "(Propr: Xiaomi Wear Service - Mi Watch/Mi Watch Color/Mi Watch Color Sport)");
+		mServices.put("7495fe00-a7f3-424b-92dd-4a006a3aef56", "(Propr: Xiaomi Wear Service - Mi Watch CN)");
 		
 		mCharacteristics.put("00002a43-0000-1000-8000-00805f9b34fb", "Alert AlertCategory ID");
 		mCharacteristics.put("00002a42-0000-1000-8000-00805f9b34fb", "Alert AlertCategory ID Bit Mask");
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiBleSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiBleSupport.java
index 757fae5bb..268db4805 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiBleSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiBleSupport.java
@@ -75,23 +75,30 @@ public class XiaomiBleSupport extends XiaomiConnectionSupport {
                 if (getSupportedServices().contains(xiaomiUuid.getKey())) {
                     LOG.debug("Found Xiaomi service: {}", xiaomiUuid.getKey());
                     uuidSet = xiaomiUuid.getValue();
+                    UUID currentChar;
 
-                    btCharacteristicCommandRead = getCharacteristic(uuidSet.getCharacteristicCommandRead());
-                    btCharacteristicCommandWrite = getCharacteristic(uuidSet.getCharacteristicCommandWrite());
-                    btCharacteristicActivityData = getCharacteristic(uuidSet.getCharacteristicActivityData());
-                    btCharacteristicDataUpload = getCharacteristic(uuidSet.getCharacteristicDataUpload());
-                    if (btCharacteristicCommandRead == null) {
+                    if ((currentChar = uuidSet.getCharacteristicCommandRead()) == null ||
+                            (btCharacteristicCommandRead = getCharacteristic(currentChar)) == null) {
                         LOG.warn("btCharacteristicCommandRead characteristicc is null");
                         continue;
-                    } else if (btCharacteristicCommandWrite == null) {
+                    }
+
+                    if ((currentChar = uuidSet.getCharacteristicCommandWrite()) == null ||
+                            (btCharacteristicCommandWrite = getCharacteristic(currentChar)) == null) {
                         LOG.warn("btCharacteristicCommandWrite characteristicc is null");
                         continue;
-                    } else if (btCharacteristicActivityData == null) {
+                    }
+
+                    if ((currentChar = uuidSet.getCharacteristicActivityData()) == null ||
+                            (btCharacteristicActivityData= getCharacteristic(currentChar)) == null) {
                         LOG.warn("btCharacteristicActivityData characteristicc is null");
                         continue;
-                    } else if (btCharacteristicDataUpload == null) {
+                    }
+
+                    if ((currentChar = uuidSet.getCharacteristicDataUpload()) == null ||
+                            (btCharacteristicDataUpload= getCharacteristic(currentChar)) == null) {
                         LOG.warn("btCharacteristicDataUpload characteristicc is null");
-                        continue;
+                        // this characteristic may not be supported by all models
                     }
 
                     break;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiUuids.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiUuids.java
index faa2e132c..62534d70a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiUuids.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiUuids.java
@@ -40,6 +40,7 @@ public class XiaomiUuids {
         ));
 
         // Mi Watch Lite
+        // Redmi Watch
         put(UUID.fromString("16186f00-0000-1000-8000-00807f9b34fb"), new XiaomiBleUuidSet(
                 false,
                 UUID.fromString("16186f01-0000-1000-8000-00807f9b34fb"),
@@ -48,7 +49,17 @@ public class XiaomiUuids {
                 UUID.fromString("16186f04-0000-1000-8000-00807f9b34fb")
         ));
 
-        // Mi Watch Color Sport
+        // Mi Smart Watch 4C
+        // Redmi Band
+        put(UUID.fromString("16187f00-0000-1000-8000-00807f9b34fb"), new XiaomiBleUuidSet(
+                false, // FIXME check
+                UUID.fromString("16187f02-0000-1000-8000-00807f9b34fb"),
+                UUID.fromString("16187f01-0000-1000-8000-00807f9b34fb"),
+                UUID.fromString("16187f03-0000-1000-8000-00807f9b34fb"),
+                UUID.fromString("16187f04-0000-1000-8000-00807f9b34fb")
+        ));
+
+        // Mi Watch (Color (Sport))
         put(UUID.fromString("1314f000-1000-9000-7000-301291e21220"), new XiaomiBleUuidSet(
                 false,
                 UUID.fromString("1314f005-1000-9000-7000-301291e21220"),
@@ -56,6 +67,15 @@ public class XiaomiUuids {
                 UUID.fromString("1314f002-1000-9000-7000-301291e21220"),
                 UUID.fromString("1314f007-1000-9000-7000-301291e21220")
         ));
+
+        // Mi Watch CN
+        put(UUID.fromString("7495fe00-a7f3-424b-92dd-4a006a3aef56"), new XiaomiBleUuidSet(
+                false, // FIXME check
+                UUID.fromString("74950002-a7f3-424b-92dd-4a006a3aef56"),
+                UUID.fromString("74950001-a7f3-424b-92dd-4a006a3aef56"),
+                UUID.fromString("74950003-a7f3-424b-92dd-4a006a3aef56"),
+                null
+        ));
     }};
 
     public static class XiaomiBleUuidSet {

From 1185699c569e945b47c8fd149c5a1c8b745e2b85 Mon Sep 17 00:00:00 2001
From: MrYoranimo <yvulker@gmail.com>
Date: Mon, 15 Jan 2024 15:11:56 +0100
Subject: [PATCH 496/595] BtBRQueue: use Handler(Thread) for sending messages
 and connecting socket

---
 .../gadgetbridge/service/btbr/BtBRQueue.java  | 217 +++++++++---------
 1 file changed, 103 insertions(+), 114 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/BtBRQueue.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/BtBRQueue.java
index 3da100165..21715c3f2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/BtBRQueue.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btbr/BtBRQueue.java
@@ -21,6 +21,12 @@ import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothSocket;
 import android.content.Context;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Message;
+import android.os.Process;
+
+import androidx.annotation.NonNull;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -29,16 +35,16 @@ import java.io.IOException;
 import java.util.Arrays;
 import java.util.Locale;
 import java.util.UUID;
-import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
 
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.util.GB;
 
 public final class BtBRQueue {
     private static final Logger LOG = LoggerFactory.getLogger(BtBRQueue.class);
+    public static final int HANDLER_SUBJECT_CONNECT = 0;
+    public static final int HANDLER_SUBJECT_PERFORM_TRANSACTION = 1;
 
     private BluetoothAdapter mBtAdapter = null;
     private BluetoothSocket mBtSocket = null;
@@ -46,57 +52,83 @@ public final class BtBRQueue {
     private final SocketCallback mCallback;
     private final UUID mService;
 
-    private final BlockingQueue<AbstractTransaction> mTransactions = new LinkedBlockingQueue<>();
     private volatile boolean mDisposed;
-    private volatile boolean mCrashed;
 
     private final Context mContext;
-    private CountDownLatch mConnectionLatch;
-    private CountDownLatch mAvailableData;
     private final int mBufferSize;
 
-    private Thread writeThread = new Thread("Write Thread") {
+    private Handler mWriteHandler;
+
+    private final HandlerThread mWriteHandlerThread = new HandlerThread("Write Thread", Process.THREAD_PRIORITY_BACKGROUND) {
         @Override
-        public void run() {
-            LOG.debug("Started write thread for {} (address {})", mGbDevice.getName(), mGbDevice.getAddress());
-            
-            while (!mDisposed && !mCrashed) {
-                try {
-                    AbstractTransaction qTransaction = mTransactions.take();
-                    if (!isConnected()) {
-                        LOG.debug("Not connected, waiting for connection...");
-                        setDeviceConnectionState(GBDevice.State.NOT_CONNECTED);
-                        // wait until the connection succeeds before running the actions
-                        // Note that no automatic connection is performed. This has to be triggered
-                        // on the outside typically by the DeviceSupport. The reason is that
-                        // devices have different kinds of initializations and this class has no
-                        // idea about them.
-                        mConnectionLatch = new CountDownLatch(1);
-                        mConnectionLatch.await();
-                        mConnectionLatch = null;
-                    }
-                    LOG.info("Ready for a new message exchange.");
-                    Transaction transaction = (Transaction)qTransaction;
-                    for (BtBRAction action : transaction.getActions()) {
-                        if (LOG.isDebugEnabled()) {
-                            LOG.debug("About to run action: " + action);
+        protected void onLooperPrepared() {
+            LOG.debug("Write handler thread's looper prepared, creating write handler");
+            mWriteHandler = new Handler(mWriteHandlerThread.getLooper()) {
+                @SuppressLint("MissingPermission")
+                @Override
+                public void handleMessage(@NonNull Message msg) {
+                    switch (msg.what) {
+                        case HANDLER_SUBJECT_CONNECT: {
+                            try {
+                                mBtSocket.connect();
+
+                                LOG.info("Connected to RFCOMM socket for {}", mGbDevice.getName());
+                                setDeviceConnectionState(GBDevice.State.CONNECTED);
+
+                                // update thread names to show device names in logs
+                                readThread.setName(String.format(Locale.ENGLISH,
+                                        "Read Thread for %s", mGbDevice.getName()));
+                                mWriteHandlerThread.setName(String.format(Locale.ENGLISH,
+                                        "Write Thread for %s", mGbDevice.getName()));
+
+                                // now that connect has been created, start the threads
+                                readThread.start();
+                                onConnectionEstablished();
+                            } catch (IOException e) {
+                                LOG.error("IO exception while establishing socket connection: ", e);
+                                setDeviceConnectionState(GBDevice.State.NOT_CONNECTED);
+                            }
+
+                            return;
                         }
-                        if (action.run(mBtSocket)) {
-                            LOG.debug("Action ok: " + action);
-                        } else {
-                            LOG.error("Action returned false: " + action);
-                            break;
+                        case HANDLER_SUBJECT_PERFORM_TRANSACTION: {
+                            try {
+                                if (!isConnected()) {
+                                    LOG.debug("Not connected, updating device state to WAITING_FOR_RECONNECT");
+                                    setDeviceConnectionState(GBDevice.State.WAITING_FOR_RECONNECT);
+                                    return;
+                                }
+
+                                if (!(msg.obj instanceof Transaction)) {
+                                    LOG.error("msg.obj is not an instance of Transaction");
+                                    return;
+                                }
+
+                                Transaction transaction = (Transaction) msg.obj;
+
+                                for (BtBRAction action : transaction.getActions()) {
+                                    if (LOG.isDebugEnabled()) {
+                                        LOG.debug("About to run action: {}", action);
+                                    }
+
+                                    if (action.run(mBtSocket)) {
+                                        LOG.debug("Action ok: {}", action);
+                                    } else {
+                                        LOG.error("Action returned false, cancelling further actions in transaction: {}", action);
+                                        break;
+                                    }
+                                }
+                            } catch (Throwable ex) {
+                                LOG.error("IO Write Thread died: " + ex.getMessage(), ex);
+                            }
+
+                            return;
                         }
                     }
-                }  catch (InterruptedException ignored) {
-                    mConnectionLatch = null;
-                    LOG.debug("Thread interrupted");
-                } catch (Throwable ex) {
-                    LOG.error("IO Write Thread died: " + ex.getMessage(), ex);
-                    mCrashed = true;
-                    mConnectionLatch = null;
+
+                    LOG.warn("Unhandled write handler message {}", msg.what);
                 }
-            }
+            };
         }
     };
 
@@ -108,44 +140,17 @@ public final class BtBRQueue {
 
             LOG.debug("Read thread started, entering loop");
 
-            while (!mDisposed && !mCrashed) {
+            while (!mDisposed) {
                 try {
-                    if (!isConnected()) {
-                        LOG.debug("not connected, waiting for connection...");
-                        // wait until the connection succeeds before running the actions
-                        // Note that no automatic connection is performed. This has to be triggered
-                        // on the outside typically by the DeviceSupport. The reason is that
-                        // devices have different kinds of initializations and this class has no
-                        // idea about them.
-                        mConnectionLatch = new CountDownLatch(1);
-                        mConnectionLatch.await();
-                        mConnectionLatch = null;
-                    }
-
-                    if (mAvailableData != null) {
-                        if (mBtSocket.getInputStream().available() == 0) {
-                            mAvailableData.countDown();
-                        }
-                    }
-
                     nRead = mBtSocket.getInputStream().read(buffer);
 
                     // safety measure
                     if (nRead == -1) {
                         throw new IOException("End of stream");
                     }
-                } catch (InterruptedException ignored) {
-                    LOG.debug("Thread interrupted");
-                    mConnectionLatch = null;
-                    continue;
-                } catch (Throwable ex) {
-                    if (mAvailableData == null) {
-                        LOG.error("IO read thread died: " + ex.getMessage(), ex);
-                        mCrashed = true;
-                    }
-
-                    mConnectionLatch = null;
-                    continue;
+                } catch (IOException ex) {
+                    LOG.error("IO exception while reading message from socket, breaking out of read thread: ", ex);
+                    break;
                 }
 
                 LOG.debug("Received {} bytes: {}", nRead, GB.hexdump(buffer, 0, nRead));
@@ -157,7 +162,8 @@ public final class BtBRQueue {
                 }
             }
 
-            LOG.debug("Exited read thread loop");
+            LOG.debug("Exited read thread loop, calling disconnect()");
+            disconnect();
         }
     };
 
@@ -168,6 +174,8 @@ public final class BtBRQueue {
         mCallback = socketCallback;
         mService = supportedService;
         mBufferSize = bufferSize;
+
+        mWriteHandlerThread.start();
     }
 
     /**
@@ -196,24 +204,6 @@ public final class BtBRQueue {
         try {
             BluetoothDevice btDevice = mBtAdapter.getRemoteDevice(mGbDevice.getAddress());
             mBtSocket = btDevice.createRfcommSocketToServiceRecord(mService);
-
-            LOG.debug("RFCOMM socket created, connecting");
-
-            // TODO this call is blocking, which makes this method preferably called from a background thread
-            mBtSocket.connect();
-
-            LOG.info("Connected to RFCOMM socket for {}", mGbDevice.getName());
-            setDeviceConnectionState(GBDevice.State.CONNECTED);
-
-            // update thread names to show device names in logs
-            readThread.setName(String.format(Locale.ENGLISH,
-                    "Read Thread for %s", mGbDevice.getName()));
-            writeThread.setName(String.format(Locale.ENGLISH,
-                    "Write Thread for %s", mGbDevice.getName()));
-
-            // now that connect has been created, start the threads
-            readThread.start();
-            writeThread.start();
         } catch (IOException e) {
             LOG.error("Unable to connect to RFCOMM endpoint: ", e);
             setDeviceConnectionState(originalState);
@@ -221,7 +211,8 @@ public final class BtBRQueue {
             return false;
         }
 
-        onConnectionEstablished();
+        LOG.debug("Socket created, connecting in handler");
+        mWriteHandler.sendMessageAtFrontOfQueue(mWriteHandler.obtainMessage(HANDLER_SUBJECT_CONNECT));
         return true;
     }
 
@@ -230,18 +221,15 @@ public final class BtBRQueue {
     }
 
     public void disconnect() {
-        if (mBtSocket != null) {
+        if (mWriteHandlerThread.isAlive()) {
+            mWriteHandlerThread.quit();
+        }
+
+        if (mBtSocket != null && mBtSocket.isConnected()) {
             try {
-                mAvailableData = new CountDownLatch(1);
-
-                if (!mAvailableData.await(1, TimeUnit.SECONDS)) {
-                    LOG.warn("disconnect(): Latch timeout reached while waiting for incoming data");
-                }
-
-                mAvailableData = null;
                 mBtSocket.close();
-            } catch (IOException | InterruptedException e) {
-                LOG.error(e.getMessage());
+            } catch (IOException e) {
+                LOG.error("IO exception while closing socket in disconnect(): ", e);
             }
         }
     }
@@ -258,14 +246,15 @@ public final class BtBRQueue {
     }
 
     /**
-     * Adds a transaction to the end of the queue.
+     * Add a finalized {@link Transaction} to the write handler's queue
      *
-     * @param transaction
+     * @param transaction The transaction to be run in the handler thread's looper
      */
     public void add(Transaction transaction) {
-        LOG.debug("about to add: " + transaction);
+        LOG.debug("Adding transaction to looper message queue: {}", transaction);
+
         if (!transaction.isEmpty()) {
-            mTransactions.add(transaction);
+            mWriteHandler.obtainMessage(HANDLER_SUBJECT_PERFORM_TRANSACTION, transaction).sendToTarget();
         }
     }
 
@@ -282,10 +271,10 @@ public final class BtBRQueue {
 
         mDisposed = true;
         disconnect();
-        writeThread.interrupt();
-        writeThread = null;
-        readThread.interrupt();
-        readThread = null;
-        mTransactions.clear();
+
+        if (readThread != null && readThread.isAlive()) {
+            readThread.interrupt();
+            readThread = null;
+        }
     }
 }

From 7f68dc5449476e847faf7b99ff5f9fb2b69de136 Mon Sep 17 00:00:00 2001
From: MrYoranimo <yvulker@gmail.com>
Date: Tue, 16 Jan 2024 13:50:23 +0100
Subject: [PATCH 497/595] Set default year for date-of-birth to 1970

Prevent undefined behavior on devices that do not have a range check on
the year from the DOB before calculating someone's age
---
 .../freeyourgadget/gadgetbridge/model/ActivityUser.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityUser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityUser.java
index 68102c6c8..e4765119f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityUser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityUser.java
@@ -49,7 +49,7 @@ public class ActivityUser {
 
     private static final String defaultUserName = "gadgetbridge-user";
     public static final int defaultUserGender = GENDER_FEMALE;
-    public static final int defaultUserYearOfBirth = 0;
+    public static final int defaultUserYearOfBirth = 1970;
     public static final int defaultUserAge = 0;
     public static final int defaultUserHeightCm = 175;
     public static final int defaultUserWeightKg = 70;

From b395e889c3edd4041360784a4d8fb08e2d1b1867 Mon Sep 17 00:00:00 2001
From: MrYoranimo <yvulker@gmail.com>
Date: Tue, 16 Jan 2024 13:55:06 +0100
Subject: [PATCH 498/595] Xiaomi: temporary fix for database errors when
 reconnecting

---
 .../service/devices/xiaomi/XiaomiBleSupport.java            | 6 ++++--
 .../service/devices/xiaomi/XiaomiSppSupport.java            | 6 ++++--
 .../gadgetbridge/service/devices/xiaomi/XiaomiSupport.java  | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiBleSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiBleSupport.java
index 268db4805..5b8f95206 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiBleSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiBleSupport.java
@@ -113,8 +113,10 @@ public class XiaomiBleSupport extends XiaomiConnectionSupport {
             }
 
             // FIXME unsetDynamicState unsets the fw version, which causes problems..
-            if (getDevice().getFirmwareVersion() == null && mXiaomiSupport.getCachedFirmwareVersion() != null) {
-                getDevice().setFirmwareVersion(mXiaomiSupport.getCachedFirmwareVersion());
+            if (getDevice().getFirmwareVersion() == null) {
+                getDevice().setFirmwareVersion(mXiaomiSupport.getCachedFirmwareVersion() != null ?
+                        mXiaomiSupport.getCachedFirmwareVersion() :
+                        "N/A");
             }
 
             if (btCharacteristicCommandRead == null || btCharacteristicCommandWrite == null) {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSppSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSppSupport.java
index 240964989..e974bed05 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSppSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSppSupport.java
@@ -71,8 +71,10 @@ public class XiaomiSppSupport extends XiaomiConnectionSupport {
         @Override
         protected TransactionBuilder initializeDevice(TransactionBuilder builder) {
             // FIXME unsetDynamicState unsets the fw version, which causes problems..
-            if (getDevice().getFirmwareVersion() == null && mXiaomiSupport.getCachedFirmwareVersion() != null) {
-                getDevice().setFirmwareVersion(mXiaomiSupport.getCachedFirmwareVersion());
+            if (getDevice().getFirmwareVersion() == null) {
+                getDevice().setFirmwareVersion(mXiaomiSupport.getCachedFirmwareVersion() != null ?
+                        mXiaomiSupport.getCachedFirmwareVersion() :
+                        "N/A");
             }
 
             builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.INITIALIZING, getContext()));
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
index dde826743..80064424b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/XiaomiSupport.java
@@ -178,7 +178,7 @@ public class XiaomiSupport extends AbstractDeviceSupport {
 
     public void setContext(final GBDevice device, final BluetoothAdapter adapter, final Context context) {
         // FIXME unsetDynamicState unsets the fw version, which causes problems..
-        if (getCachedFirmwareVersion() == null && device.getFirmwareVersion() != null) {
+        if (device.getFirmwareVersion() != null) {
             setCachedFirmwareVersion(device.getFirmwareVersion());
         }
 

From 0e56af4ce96dea57d084c336bca3b5d82bfc2bea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Wed, 17 Jan 2024 20:29:06 +0000
Subject: [PATCH 499/595] Xiaomi Watch S3: Experimental support

---
 .../watchs3/XiaomiWatchS3Coordinator.java     | 60 +++++++++++++++++++
 .../gadgetbridge/model/DeviceType.java        |  2 +
 app/src/main/res/values/strings.xml           |  1 +
 3 files changed, 63 insertions(+)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs3/XiaomiWatchS3Coordinator.java

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs3/XiaomiWatchS3Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs3/XiaomiWatchS3Coordinator.java
new file mode 100644
index 000000000..9d6cd7997
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/watchs3/XiaomiWatchS3Coordinator.java
@@ -0,0 +1,60 @@
+/*  Copyright (C) 2023 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.watchs3;
+
+import java.util.regex.Pattern;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiCoordinator;
+
+public class XiaomiWatchS3Coordinator extends XiaomiCoordinator {
+    @Override
+    public int getDeviceNameResource() {
+        return R.string.devicetype_xiaomi_watch_s3;
+    }
+
+    @Override
+    public int getDefaultIconResource() {
+        return R.drawable.ic_device_miwatch;
+    }
+
+    @Override
+    public int getDisabledIconResource() {
+        return R.drawable.ic_device_miwatch_disabled;
+    }
+
+    @Override
+    public ConnectionType getConnectionType() {
+        return ConnectionType.BT_CLASSIC;
+    }
+
+    @Override
+    protected Pattern getSupportedDeviceName() {
+        // only saw it with eSIM in #3506, but allowing both just in case
+        return Pattern.compile("^Xiaomi Watch S3( eSIM)? [0-9A-F]{4}$");
+    }
+
+    @Override
+    public boolean isExperimental() {
+        return true;
+    }
+
+    @Override
+    public boolean supportsFindDevice() {
+        return false;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
index 480902318..6f930ad59 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
@@ -178,6 +178,7 @@ import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.redmiwatch2lite.Redmi
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.watchs1.XiaomiWatchS1Coordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.watchs1active.XiaomiWatchS1ActiveCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.watchs1pro.XiaomiWatchS1ProCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.watchs3.XiaomiWatchS3Coordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xwatch.XWatchCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.zetime.ZeTimeCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.miwatch.MiWatchLiteCoordinator;
@@ -244,6 +245,7 @@ public enum DeviceType {
     XIAOMI_WATCH_S1_ACTIVE(XiaomiWatchS1ActiveCoordinator.class),
     XIAOMI_WATCH_S1_PRO(XiaomiWatchS1ProCoordinator.class),
     XIAOMI_WATCH_S1(XiaomiWatchS1Coordinator.class),
+    XIAOMI_WATCH_S3(XiaomiWatchS3Coordinator.class),
     AMAZFITGTS3(AmazfitGTS3Coordinator.class),
     AMAZFITGTR3(AmazfitGTR3Coordinator.class),
     AMAZFITGTR4(AmazfitGTR4Coordinator.class),
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b44d1d618..e3a355941 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2540,6 +2540,7 @@
     <string name="pref_sleep_mode_schedule_title">Sleep Mode Schedule</string>
     <string name="pref_sleep_mode_schedule_summary">Send a reminder and enter sleep mode at bedtime. At the scheduled wake-up time, the wake-up alarm will sound.</string>
     <string name="devicetype_xiaomi_watch_s1">Xiaomi Watch S1</string>
+    <string name="devicetype_xiaomi_watch_s3">Xiaomi Watch S3</string>
     <string name="devicetype_xiaomi_watch_s1_active">Xiaomi Watch S1 Active</string>
     <string name="devicetype_xiaomi_watch_s1_pro">Xiaomi Watch S1 Pro</string>
     <string name="devicetype_mi_watch_color_sport">Mi Watch Color Sport</string>

From aa4c9c08776f42fc0cee2db45c0f2d6dea72353c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Wed, 17 Jan 2024 20:29:13 +0000
Subject: [PATCH 500/595] Update changelog

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3c37c6fb1..f2d5ca440 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,13 @@
 #### Next Version (WIP)
 
 * Initial support for Mijia MHO-C303
+* Experimental support for Xiaomi Smart Band 8 Pro
+* Experimental support for Xiaomi Watch S1 Pro
+* Experimental support for Xiaomi Watch S1
+* Experimental support for Xiaomi Watch S3
 * Redmi Smart Band Pro: Fix password digits
+* Xiaomi: Fix sleep sometimes extending past the wakeup time
+* Xiaomi: Request battery level and charging state periodically
 * Zepp OS: Fix weather not working on some devices
 * Fix sport activity summary group order
 

From 94c763ef9981ab02aec4a8d71d682ede315080d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Wed, 17 Jan 2024 20:43:17 +0000
Subject: [PATCH 501/595] Zepp OS: Ensure all communication respects service
 encryption flag

Not all communication was moved to services, and some might not be
respecting the encryption flag sent during initialization implemented
in 3a2b02df2. Some services are encrypted or not across different
watches - see #3308.
---
 .../service/devices/huami/Huami2021Support.java   | 15 ++++++++++++++-
 .../zeppos/services/ZeppOsServicesService.java    |  2 ++
 2 files changed, 16 insertions(+), 1 deletion(-)

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 33838573d..39e3f3220 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
@@ -175,6 +175,8 @@ public abstract class Huami2021Support extends HuamiSupport implements ZeppOsFil
     private final ZeppOsMusicService musicService = new ZeppOsMusicService(this);
 
     private final Set<Short> mSupportedServices = new HashSet<>();
+    // FIXME: We need to keep track of which services are encrypted for now, since not all of them were yet migrated to a service
+    private final Set<Short> mIsEncrypted = new HashSet<>();
     private final Map<Short, AbstractZeppOsService> mServiceMap = new LinkedHashMap<Short, AbstractZeppOsService>() {{
         put(servicesService.getEndpoint(), servicesService);
         put(fileTransferService.getEndpoint(), fileTransferService);
@@ -923,6 +925,13 @@ public abstract class Huami2021Support extends HuamiSupport implements ZeppOsFil
         LOG.warn("writeToChunkedOld is not supported");
     }
 
+    @Override
+    public void writeToChunked2021(final TransactionBuilder builder, final short endpoint, final byte[] data, final boolean encryptIgnored) {
+        // Ensure communication for all services contains the encrypted flag reported by the service, since not all
+        // watches have the same services encrypted (eg. #3308).
+        huami2021ChunkedEncoder.write(builder, endpoint, data, force2021Protocol(), mIsEncrypted.contains(endpoint));
+    }
+
     @Override
     public void writeToConfiguration(final TransactionBuilder builder, final byte[] data) {
         LOG.warn("writeToConfiguration is not supported");
@@ -982,11 +991,15 @@ public abstract class Huami2021Support extends HuamiSupport implements ZeppOsFil
         // In here, we only request the list of supported services - they will all be initialized in
         // initializeServices below
         mSupportedServices.clear();
+        mIsEncrypted.clear();
         servicesService.requestServices(builder);
     }
 
-    public void addSupportedService(final short endpoint) {
+    public void addSupportedService(final short endpoint, final boolean encrypted) {
         mSupportedServices.add(endpoint);
+        if (encrypted) {
+            mIsEncrypted.add(endpoint);
+        }
     }
 
     public void initializeServices() {
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 4ce016505..d1e729d19 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
@@ -77,6 +77,8 @@ public class ZeppOsServicesService extends AbstractZeppOsService {
             if (service != null && encrypted != null) {
                 service.setEncrypted(encrypted);
             }
+
+            getSupport().addSupportedService(endpoint, encrypted != null && encrypted);
         }
 
         getSupport().initializeServices();

From ec01e456aa3cbf58f011d561e1c1ec139550def9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Thu, 18 Jan 2024 18:12:25 +0000
Subject: [PATCH 502/595] Fix material design switch on sleep mode preferences

Fixes #3516
---
 app/src/main/res/xml/devicesettings_sleep_mode_schedule.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/xml/devicesettings_sleep_mode_schedule.xml b/app/src/main/res/xml/devicesettings_sleep_mode_schedule.xml
index a746b4afb..8dce9b59c 100644
--- a/app/src/main/res/xml/devicesettings_sleep_mode_schedule.xml
+++ b/app/src/main/res/xml/devicesettings_sleep_mode_schedule.xml
@@ -6,7 +6,7 @@
         android:persistent="false"
         android:title="@string/pref_sleep_mode_title">
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:icon="@drawable/ic_activity_sleep"
             android:key="sleep_mode_schedule_enabled"

From 6b2cb05027984c78beea1a2ab794c85904936b2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Thu, 18 Jan 2024 21:06:40 +0000
Subject: [PATCH 503/595] Xiaomi: Fetch manual samples

---
 .../gadgetbridge/daogen/GBDaoGenerator.java   |  11 +-
 .../xiaomi/XiaomiManualSampleProvider.java    |  61 +++++++++
 .../xiaomi/activity/XiaomiActivityFileId.java |   1 +
 .../xiaomi/activity/XiaomiActivityParser.java |   7 +
 .../activity/impl/ManualSamplesParser.java    | 121 ++++++++++++++++++
 5 files changed, 200 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiManualSampleProvider.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/ManualSamplesParser.java

diff --git a/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java b/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java
index ce2001cd0..10883f697 100644
--- a/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java
+++ b/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java
@@ -45,7 +45,7 @@ public class GBDaoGenerator {
 
 
     public static void main(String[] args) throws Exception {
-        final Schema schema = new Schema(67, MAIN_PACKAGE + ".entities");
+        final Schema schema = new Schema(68, MAIN_PACKAGE + ".entities");
 
         Entity userAttributes = addUserAttributes(schema);
         Entity user = addUserInfo(schema, userAttributes);
@@ -73,6 +73,7 @@ public class GBDaoGenerator {
         addXiaomiActivitySample(schema, user, device);
         addXiaomiSleepTimeSamples(schema, user, device);
         addXiaomiSleepStageSamples(schema, user, device);
+        addXiaomiManualSamples(schema, user, device);
         addXiaomiDailySummarySamples(schema, user, device);
         addPebbleHealthActivitySample(schema, user, device);
         addPebbleHealthActivityKindOverlay(schema, user, device);
@@ -367,6 +368,14 @@ public class GBDaoGenerator {
         return sample;
     }
 
+    private static Entity addXiaomiManualSamples(Schema schema, Entity user, Entity device) {
+        Entity sample = addEntity(schema, "XiaomiManualSample");
+        addCommonTimeSampleProperties("AbstractTimeSample", sample, user, device);
+        sample.addIntProperty("type");
+        sample.addIntProperty("value");
+        return sample;
+    }
+
     private static Entity addXiaomiDailySummarySamples(Schema schema, Entity user, Entity device) {
         Entity sample = addEntity(schema, "XiaomiDailySummarySample");
         addCommonTimeSampleProperties("AbstractTimeSample", sample, user, device);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiManualSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiManualSampleProvider.java
new file mode 100644
index 000000000..7f73dcaa6
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiManualSampleProvider.java
@@ -0,0 +1,61 @@
+/*  Copyright (C) 2024 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi;
+
+import androidx.annotation.NonNull;
+
+import de.greenrobot.dao.AbstractDao;
+import de.greenrobot.dao.Property;
+import nodomain.freeyourgadget.gadgetbridge.devices.AbstractTimeSampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.entities.XiaomiManualSample;
+import nodomain.freeyourgadget.gadgetbridge.entities.XiaomiSleepStageSampleDao;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+
+public class XiaomiManualSampleProvider extends AbstractTimeSampleProvider<XiaomiManualSample> {
+    public static final int TYPE_HR = 0x11;
+    public static final int TYPE_SPO2 = 0x12;
+    public static final int TYPE_STRESS = 0x13;
+    public static final int TYPE_TEMPERATURE = 0x44;
+
+    public XiaomiManualSampleProvider(final GBDevice device, final DaoSession session) {
+        super(device, session);
+    }
+
+    @NonNull
+    @Override
+    public AbstractDao<XiaomiManualSample, ?> getSampleDao() {
+        return getSession().getXiaomiManualSampleDao();
+    }
+
+    @NonNull
+    @Override
+    protected Property getTimestampSampleProperty() {
+        return XiaomiSleepStageSampleDao.Properties.Timestamp;
+    }
+
+    @NonNull
+    @Override
+    protected Property getDeviceIdentifierSampleProperty() {
+        return XiaomiSleepStageSampleDao.Properties.DeviceId;
+    }
+
+    @Override
+    public XiaomiManualSample createSample() {
+        return new XiaomiManualSample();
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java
index 400a70d39..f6571841f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityFileId.java
@@ -193,6 +193,7 @@ public class XiaomiActivityFileId implements Comparable<XiaomiActivityFileId> {
         UNKNOWN(Type.UNKNOWN, -1),
         ACTIVITY_DAILY(Type.ACTIVITY, 0x00),
         ACTIVITY_SLEEP_STAGES(Type.ACTIVITY, 0x03),
+        ACTIVITY_MANUAL_SAMPLES(Type.ACTIVITY, 0x06),
         ACTIVITY_SLEEP(Type.ACTIVITY, 0x08),
         SPORTS_OUTDOOR_RUNNING(Type.SPORTS, 0x01),
         SPORTS_OUTDOOR_WALKING_V1(Type.SPORTS, 0x02),
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityParser.java
index 4ab0cc0a6..8a759ac9e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityParser.java
@@ -31,6 +31,7 @@ import nodomain.freeyourgadget.gadgetbridge.entities.Device;
 import nodomain.freeyourgadget.gadgetbridge.entities.User;
 import nodomain.freeyourgadget.gadgetbridge.model.ActivityKind;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl.ManualSamplesParser;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl.DailyDetailsParser;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl.DailySummaryParser;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl.SleepDetailsParser;
@@ -102,6 +103,12 @@ public abstract class XiaomiActivityParser {
                     return new SleepStagesParser();
                 }
 
+                break;
+            case ACTIVITY_MANUAL_SAMPLES:
+                if (fileId.getDetailType() == XiaomiActivityFileId.DetailType.DETAILS) {
+                    return new ManualSamplesParser();
+                }
+
                 break;
             case ACTIVITY_SLEEP:
                 if (fileId.getDetailType() == XiaomiActivityFileId.DetailType.DETAILS) {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/ManualSamplesParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/ManualSamplesParser.java
new file mode 100644
index 000000000..1a51d7499
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/ManualSamplesParser.java
@@ -0,0 +1,121 @@
+/*  Copyright (C) 2024 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl;
+
+import android.widget.Toast;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.ArrayList;
+import java.util.List;
+
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.database.DBHandler;
+import nodomain.freeyourgadget.gadgetbridge.database.DBHelper;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiManualSampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.entities.Device;
+import nodomain.freeyourgadget.gadgetbridge.entities.User;
+import nodomain.freeyourgadget.gadgetbridge.entities.XiaomiManualSample;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.XiaomiSupport;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.XiaomiActivityFileId;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.XiaomiActivityParser;
+import nodomain.freeyourgadget.gadgetbridge.util.GB;
+
+public class ManualSamplesParser extends XiaomiActivityParser {
+    private static final Logger LOG = LoggerFactory.getLogger(ManualSamplesParser.class);
+
+    @Override
+    public boolean parse(final XiaomiSupport support, final XiaomiActivityFileId fileId, final byte[] bytes) {
+        if (fileId.getVersion() != 2) {
+            LOG.warn("Unknown manual samples version {}", fileId.getVersion());
+            return false;
+        }
+
+        final ByteBuffer buf = ByteBuffer.wrap(bytes).order(ByteOrder.LITTLE_ENDIAN);
+
+        // Looks like there is no header, it starts right away with samples:
+        // 8A90A965 12 63 <- spo2
+        // ... multiple 13 00
+        // C793A965 13 00
+        // 9698A965 13 1C <- stress
+        // E79CA965 44 5A0E0000 <- body temperature
+        // 729FA965 44 590E0000 <- body temperature
+
+        final List<XiaomiManualSample> samples = new ArrayList<>();
+
+        while (buf.position() < buf.limit()) {
+            final int timestamp = buf.getInt();
+            final int type = buf.get() & 0xff;
+
+            final int value;
+            switch (type) {
+                case XiaomiManualSampleProvider.TYPE_HR:
+                case XiaomiManualSampleProvider.TYPE_SPO2:
+                case XiaomiManualSampleProvider.TYPE_STRESS:
+                    value = buf.get() & 0xff;
+                    break;
+                case XiaomiManualSampleProvider.TYPE_TEMPERATURE:
+                    value = buf.getInt();
+                    break;
+                default:
+                    LOG.warn("Unknown sample type {}", type);
+                    // We need to abort parsing, as we don't know the sample size
+                    return false;
+            }
+
+            if (value == 0) {
+                continue;
+            }
+
+            LOG.debug("Got manual sample: ts={} type={} value={}", timestamp, type, value);
+
+            final XiaomiManualSample sample = new XiaomiManualSample();
+            sample.setTimestamp(timestamp * 1000L);
+            sample.setType(type);
+            sample.setValue(value);
+
+            samples.add(sample);
+        }
+
+        try (DBHandler handler = GBApplication.acquireDB()) {
+            final DaoSession session = handler.getDaoSession();
+
+            final GBDevice gbDevice = support.getDevice();
+            final Device device = DBHelper.getDevice(gbDevice, session);
+            final User user = DBHelper.getUser(session);
+
+            for (final XiaomiManualSample sample : samples) {
+                sample.setDevice(device);
+                sample.setUser(user);
+            }
+
+            final XiaomiManualSampleProvider sampleProvider = new XiaomiManualSampleProvider(gbDevice, session);
+            sampleProvider.addSamples(samples);
+        } catch (final Exception e) {
+            GB.toast(support.getContext(), "Error saving manual samples", Toast.LENGTH_LONG, GB.ERROR);
+            LOG.error("Error saving manual samples", e);
+            return false;
+        }
+
+        return true;
+    }
+}

From 7955bdfb6f668418128b6cf5ce4532d92d7233df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sat, 20 Jan 2024 23:16:36 +0000
Subject: [PATCH 504/595] Xiaomi: Improve sleep parsing

- Some devices send a random int 0, which would prevent sleep stage
  parsing
- Some devices send the details as a file of type summary, but same
  structure
- It is still not stable for all devices

Thanks to @opcode for the parsing logic
---
 .../xiaomi/activity/XiaomiActivityParser.java |   6 +-
 .../activity/impl/SleepDetailsParser.java     | 248 +++++++++++-------
 2 files changed, 147 insertions(+), 107 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityParser.java
index 8a759ac9e..2143377ef 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/XiaomiActivityParser.java
@@ -111,11 +111,7 @@ public abstract class XiaomiActivityParser {
 
                 break;
             case ACTIVITY_SLEEP:
-                if (fileId.getDetailType() == XiaomiActivityFileId.DetailType.DETAILS) {
-                    return new SleepDetailsParser();
-                }
-
-                break;
+                return new SleepDetailsParser();
         }
 
         return null;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/SleepDetailsParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/SleepDetailsParser.java
index 89715fe60..e7f8d31f7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/SleepDetailsParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/SleepDetailsParser.java
@@ -16,12 +16,12 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.xiaomi.activity.impl;
 
-import android.util.Log;
 import android.widget.Toast;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.nio.BufferUnderflowException;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.ArrayList;
@@ -48,17 +48,23 @@ public class SleepDetailsParser extends XiaomiActivityParser {
 
     @Override
     public boolean parse(final XiaomiSupport support, final XiaomiActivityFileId fileId, final byte[] bytes) {
-        if (fileId.getVersion() != 2) {
+        // Seems to come both as DetailType.DETAILS (version 2) and DetailType.SUMMARY (version 4)
+        if (fileId.getVersion() < 2 || fileId.getVersion() > 4) {
             LOG.warn("Unknown sleep details version {}", fileId.getVersion());
             return false;
         }
 
         final ByteBuffer buf = ByteBuffer.wrap(bytes).order(ByteOrder.LITTLE_ENDIAN);
-        buf.get(); // header ? 0xF0
+        final byte header = buf.get();
 
         final int isAwake = buf.get() & 0xff; // 0/1 - more correctly this would be !isSleepFinish
         final int bedTime = buf.getInt();
         final int wakeupTime = buf.getInt();
+        int sleepQuality = -1;
+        if (fileId.getVersion() >= 4) {
+            sleepQuality = buf.get() & 0xff;
+        }
+
         LOG.debug("Sleep sample: bedTime: {}, wakeupTime: {}, isAwake: {}", bedTime, wakeupTime, isAwake);
 
         final List<XiaomiSleepTimeSample> summaries = new ArrayList<>();
@@ -68,10 +74,8 @@ public class SleepDetailsParser extends XiaomiActivityParser {
         sample.setWakeupTime(wakeupTime * 1000L);
         sample.setIsAwake(isAwake == 1);
 
-        // SleepAssistItemInfo 2x
-        //  - 0: Heart rate samples
-        //  - 1: Sp02 samples
-        for (int i = 0; i < 2; i++) {
+        // Heart rate samples
+        if ((header & (1 << 4)) != 0) {
             final int unit = buf.getShort(); // Time unit (i.e sample rate)
             final int count = buf.getShort();
             final int firstRecordTime = buf.getInt();
@@ -81,86 +85,123 @@ public class SleepDetailsParser extends XiaomiActivityParser {
             buf.position(buf.position() + count);
         }
 
-        final List<XiaomiSleepStageSample> stages = new ArrayList<>();
+        // SpO2 samples
+        if ((header & (1 << 3)) != 0) {
+            final int unit = buf.getShort(); // Time unit (i.e sample rate)
+            final int count = buf.getShort();
+            final int firstRecordTime = buf.getInt();
 
-        while (buf.remaining() >= 17 && buf.getInt() == 0xFFFCFAFB) {
-            final int headerLen = buf.get() & 0xFF; // this seems to always be 17
-
-            // This timestamp is kind of weird, is seems to sometimes be in seconds
-            // and other times in nanoseconds. Message types 16 and 17 are in seconds
-            final long ts = buf.getLong();
-            final int unk = buf.get() & 0xFF;
-            final int type = buf.get() & 0xFF;
-
-            final int dataLen = ((buf.get() & 0xFF) << 8) | (buf.get() & 0xFF);
-
-            final byte[] data = new byte[dataLen];
-            buf.get(data);
-
-            final ByteBuffer dataBuf = ByteBuffer.wrap(data).order(ByteOrder.BIG_ENDIAN);
-
-//            Known types:
-//             - acc_unk = 0,
-//             - ppg_unk = 1,
-//             - fall_asleep = 2,
-//             - wake_up = 3,
-//             - switch_ts_unk1 = 12,
-//             - switch_ts_unk2 = 13,
-//             - Summary = 16,
-//             - Stages = 17
-
-            if (type == 16) {
-                final int data_0 = dataBuf.get() & 0xFF;
-                final int sleep_index = data_0 >> 4;
-                final int wake_count = data_0 & 0x0F;
-
-                final int sleep_duration = dataBuf.getShort() & 0xFFFF;
-                final int wake_duration  = dataBuf.getShort() & 0xFFFF;
-                final int light_duration = dataBuf.getShort() & 0xFFFF;
-                final int rem_duration   = dataBuf.getShort() & 0xFFFF;
-                final int deep_duration  = dataBuf.getShort() & 0xFFFF;
-
-                final int data_1 = dataBuf.get() & 0xFF;
-                final boolean has_rem = (data_1 >> 4) == 1;
-                final boolean has_stage = (data_1 >> 2) == 1;
-
-                // Could probably be an "awake" duration after sleep
-                final int unk_duration_minutes = dataBuf.get() & 0xFF;
-
-                if (sample == null) {
-                    sample = new XiaomiSleepTimeSample();
-                }
-
-                sample.setTimestamp(bedTime * 1000L);
-                sample.setWakeupTime(wakeupTime * 1000L);
-                sample.setTotalDuration(sleep_duration);
-                sample.setDeepSleepDuration(deep_duration);
-                sample.setLightSleepDuration(light_duration);
-                sample.setRemSleepDuration(rem_duration);
-                sample.setAwakeDuration(wake_duration);
-
-                summaries.add(sample);
-                sample = null;
-            }
-            else if (type == 17) { // Stages
-                long currentTime = ts * 1000;
-                for (int i = 0; i < dataLen / 2; i++) {
-                    // when the change to the phase occurs
-                    final int val = dataBuf.getShort() & 0xFFFF;
-
-                    final int stage = val >> 12;
-                    final int offsetMinutes = val & 0xFFF;
-
-                    final XiaomiSleepStageSample stageSample = new XiaomiSleepStageSample();
-                    stageSample.setTimestamp(currentTime);
-                    stageSample.setStage(decodeStage(stage));
-                    stages.add(stageSample);
-
-                    currentTime += offsetMinutes * 60000;
-                }
-            }
+            // Skip count samples - each sample is a u8
+            //   timestamp of each sample is firstRecordTime + (unit * index)
+            buf.position(buf.position() + count);
         }
 
+        // snore samples
+        if (fileId.getVersion() >= 3 && (header & (1 << 2)) != 0) {
+            final int unit = buf.getShort(); // Time unit (i.e sample rate)
+            final int count = buf.getShort();
+            final int firstRecordTime = buf.getInt();
+
+            // Skip count samples - each sample is a float
+            //   timestamp of each sample is firstRecordTime + (unit * index)
+            buf.position(buf.position() + count * 4);
+        }
+
+        final List<XiaomiSleepStageSample> stages = new ArrayList<>();
+
+        // Do not crash if we face a buffer underflow, as the next parsing is not 100% fool-proof,
+        // and we still want to persist whatever we got so far
+        boolean stagesParseFailed = false;
+        try {
+            // FIXME: Sometimes there's a random zero here..?
+            if (buf.getInt() != 0) {
+                // If it wasn't a zero, rewind
+                buf.position(buf.position() - 4);
+            }
+
+            while (buf.remaining() >= 17 && buf.getInt() == 0xFFFCFAFB) {
+                final int headerLen = buf.get() & 0xFF; // this seems to always be 17
+
+                // This timestamp is kind of weird, is seems to sometimes be in seconds
+                // and other times in nanoseconds. Message types 16 and 17 are in seconds
+                final long ts = buf.getLong();
+                final int unk = buf.get() & 0xFF;
+                final int type = buf.get() & 0xFF;
+
+                final int dataLen = ((buf.get() & 0xFF) << 8) | (buf.get() & 0xFF);
+
+                final byte[] data = new byte[dataLen];
+                buf.get(data);
+
+                final ByteBuffer dataBuf = ByteBuffer.wrap(data).order(ByteOrder.BIG_ENDIAN);
+
+                // Known types:
+                //  - acc_unk = 0,
+                //  - ppg_unk = 1,
+                //  - fall_asleep = 2,
+                //  - wake_up = 3,
+                //  - switch_ts_unk1 = 12,
+                //  - switch_ts_unk2 = 13,
+                //  - Summary = 16,
+                //  - Stages = 17
+
+                if (type == 16) {
+                    final int data_0 = dataBuf.get() & 0xFF;
+                    final int sleep_index = data_0 >> 4;
+                    final int wake_count = data_0 & 0x0F;
+
+                    final int sleep_duration = dataBuf.getShort() & 0xFFFF;
+                    final int wake_duration  = dataBuf.getShort() & 0xFFFF;
+                    final int light_duration = dataBuf.getShort() & 0xFFFF;
+                    final int rem_duration   = dataBuf.getShort() & 0xFFFF;
+                    final int deep_duration  = dataBuf.getShort() & 0xFFFF;
+
+                    final int data_1 = dataBuf.get() & 0xFF;
+                    final boolean has_rem = (data_1 >> 4) == 1;
+                    final boolean has_stage = (data_1 >> 2) == 1;
+
+                    // Could probably be an "awake" duration after sleep
+                    final int unk_duration_minutes = dataBuf.get() & 0xFF;
+
+                    if (sample == null) {
+                        sample = new XiaomiSleepTimeSample();
+                    }
+
+                    sample.setTimestamp(bedTime * 1000L);
+                    sample.setWakeupTime(wakeupTime * 1000L);
+                    sample.setTotalDuration(sleep_duration);
+                    sample.setDeepSleepDuration(deep_duration);
+                    sample.setLightSleepDuration(light_duration);
+                    sample.setRemSleepDuration(rem_duration);
+                    sample.setAwakeDuration(wake_duration);
+
+                    // FIXME: This is an array, but we end up persisting only the last sample, since
+                    // the timestamp is the primary key
+                    summaries.add(sample);
+                    sample = null;
+                }
+                else if (type == 17) { // Stages
+                    long currentTime = ts * 1000;
+                    for (int i = 0; i < dataLen / 2; i++) {
+                        // when the change to the phase occurs
+                        final int val = dataBuf.getShort() & 0xFFFF;
+
+                        final int stage = val >> 12;
+                        final int offsetMinutes = val & 0xFFF;
+
+                        final XiaomiSleepStageSample stageSample = new XiaomiSleepStageSample();
+                        stageSample.setTimestamp(currentTime);
+                        stageSample.setStage(decodeStage(stage));
+                        stages.add(stageSample);
+
+                        currentTime += offsetMinutes * 60000;
+                    }
+                }
+            }
+        } catch (final BufferUnderflowException e) {
+            LOG.warn("Buffer underflow while parsing sleep stages...", e);
+            stagesParseFailed = true;
+        }
 
         // save all the samples that we got
         try (DBHandler handler = GBApplication.acquireDB()) {
@@ -169,7 +210,6 @@ public class SleepDetailsParser extends XiaomiActivityParser {
 
             final XiaomiSleepTimeSampleProvider sampleProvider = new XiaomiSleepTimeSampleProvider(gbDevice, session);
 
-
             for (final XiaomiSleepTimeSample summary : summaries) {
                 summary.setDevice(DBHelper.getDevice(gbDevice, session));
                 summary.setUser(DBHelper.getUser(session));
@@ -195,28 +235,32 @@ public class SleepDetailsParser extends XiaomiActivityParser {
             return false;
         }
 
-        // Save the sleep stage samples
-        try (DBHandler handler = GBApplication.acquireDB()) {
-            final DaoSession session = handler.getDaoSession();
-            final GBDevice gbDevice = support.getDevice();
-            final Device device = DBHelper.getDevice(gbDevice, session);
-            final User user = DBHelper.getUser(session);
+        if (!stagesParseFailed && !stages.isEmpty()) {
+            LOG.debug("Persisting {} sleep stage samples", stages.size());
 
-            final XiaomiSleepStageSampleProvider sampleProvider = new XiaomiSleepStageSampleProvider(gbDevice, session);
+            // Save the sleep stage samples
+            try (DBHandler handler = GBApplication.acquireDB()) {
+                final DaoSession session = handler.getDaoSession();
+                final GBDevice gbDevice = support.getDevice();
+                final Device device = DBHelper.getDevice(gbDevice, session);
+                final User user = DBHelper.getUser(session);
 
-            for (final XiaomiSleepStageSample stageSample : stages) {
-                stageSample.setDevice(device);
-                stageSample.setUser(user);
+                final XiaomiSleepStageSampleProvider sampleProvider = new XiaomiSleepStageSampleProvider(gbDevice, session);
+
+                for (final XiaomiSleepStageSample stageSample : stages) {
+                    stageSample.setDevice(device);
+                    stageSample.setUser(user);
+                }
+
+                sampleProvider.addSamples(stages);
+            } catch (final Exception e) {
+                GB.toast(support.getContext(), "Error saving sleep stage samples", Toast.LENGTH_LONG, GB.ERROR);
+                LOG.error("Error saving sleep stage samples", e);
+                return false;
             }
-
-            sampleProvider.addSamples(stages);
-        } catch (final Exception e) {
-            GB.toast(support.getContext(), "Error saving sleep stage samples", Toast.LENGTH_LONG, GB.ERROR);
-            LOG.error("Error saving sleep stage samples", e);
-            return false;
         }
 
-        return true;
+        return stagesParseFailed;
     }
 
     static private int decodeStage(int rawStage) {

From 8a7de1584133ab00200553c29fca0efb3b243ce2 Mon Sep 17 00:00:00 2001
From: MrYoranimo <yvulker@gmail.com>
Date: Sun, 21 Jan 2024 01:56:34 +0100
Subject: [PATCH 505/595] BtLEQueue: update device state on main looper

If the device connection state is updated from two threads simultaneously
(as in, from the main looper and from the thread that handles
BluetoothDevice.connectGatt), a second update may get overridden by the
first update if the broadcasts are handled out-of-order by the
LocalBroadcastManager.

By updating the device state through a handler on the main looper, the
broadcasts are sent in order as they are processed from the looper's
queue.

This may be a potential solve for issue #3524.
---
 .../gadgetbridge/service/btle/BtLEQueue.java   | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEQueue.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEQueue.java
index fceb6ab82..83bdb5695 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEQueue.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEQueue.java
@@ -227,7 +227,12 @@ public final class BtLEQueue {
     }
 
     protected boolean isConnected() {
-        return mGbDevice.isConnected();
+        if (mGbDevice.isConnected()) {
+            return true;
+        }
+
+        LOG.debug("isConnected(): current state = {}", mGbDevice.getState());
+        return false;
     }
 
     /**
@@ -285,11 +290,12 @@ public final class BtLEQueue {
         return result;
     }
 
-    private void setDeviceConnectionState(State newState) {
-        LOG.debug("new device connection state: " + newState);
-
-        mGbDevice.setState(newState);
-        mGbDevice.sendDeviceUpdateIntent(mContext, GBDevice.DeviceUpdateSubject.CONNECTION_STATE);
+    private void setDeviceConnectionState(final State newState) {
+        new Handler(Looper.getMainLooper()).post(() -> {
+            LOG.debug("new device connection state: " + newState);
+            mGbDevice.setState(newState);
+            mGbDevice.sendDeviceUpdateIntent(mContext, GBDevice.DeviceUpdateSubject.CONNECTION_STATE);
+        });
     }
 
     public void disconnect() {

From 1a92bcf8a5d54fd8097e1d4bf58c0d4e2203528e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 19 Jan 2024 17:49:37 +0000
Subject: [PATCH 506/595] Upgrade to Android Gradle Plugin 7.4.2

Rename "main" flavor to "mainline", since that breaks the build.

https://stackoverflow.com/questions/72775247/productflavors-main-gradle-error-multiple-entries-with-same-key-main-and
---
 .woodpecker/nightly.yml                  |  4 +--
 app/build.gradle                         | 31 ++++++++++++------------
 app/src/main/AndroidManifest.xml         |  3 +--
 build.gradle                             |  2 +-
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/.woodpecker/nightly.yml b/.woodpecker/nightly.yml
index b245e61fc..38894cc10 100644
--- a/.woodpecker/nightly.yml
+++ b/.woodpecker/nightly.yml
@@ -26,8 +26,8 @@ steps:
       - if [ -f .do_not_build ]; then return 0; fi
       # build the apks
       - echo "$${SIGNING_KEY}" | base64 -d > app/keystore.p12
-      - ./gradlew assembleMainNightly -Dnightly_store_file="keystore.p12" -Dnightly_store_password="$${KEYSTOREPASS}" -Dnightly_key_alias="gadgetbridge" -Dnightly_key_password="$${KEYPASS}"
-      - ./gradlew assembleMainNopebble -Dnightly_store_file="keystore.p12" -Dnightly_store_password="$${KEYSTOREPASS}" -Dnightly_key_alias="gadgetbridge" -Dnightly_key_password="$${KEYPASS}"
+      - ./gradlew assembleMainlineNightly -Dnightly_store_file="keystore.p12" -Dnightly_store_password="$${KEYSTOREPASS}" -Dnightly_key_alias="gadgetbridge" -Dnightly_key_password="$${KEYPASS}"
+      - ./gradlew assembleMainlineNopebble -Dnightly_store_file="keystore.p12" -Dnightly_store_password="$${KEYSTOREPASS}" -Dnightly_key_alias="gadgetbridge" -Dnightly_key_password="$${KEYPASS}"
       - ./gradlew assembleBanglejsNightly -Dnightly_store_file="keystore.p12" -Dnightly_store_password="$${KEYSTOREPASS}" -Dnightly_key_alias="gadgetbridge" -Dnightly_key_password="$${KEYPASS}"
     secrets: [ signing_key, keystorepass, keypass ]
 
diff --git a/app/build.gradle b/app/build.gradle
index f36a52fa5..c3389ed8f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -78,13 +78,15 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    compileSdkVersion 33
-    buildToolsVersion "33.0.1"
+
+    namespace 'nodomain.freeyourgadget.gadgetbridge'
 
     defaultConfig {
         applicationId "nodomain.freeyourgadget.gadgetbridge"
+
         minSdkVersion 21
         targetSdkVersion 33
+        compileSdk 33
 
         // Note: always bump BOTH versionCode and versionName!
         versionName "0.78.0"
@@ -112,8 +114,8 @@ android {
 
     flavorDimensions "device_type"
     productFlavors {
-        main {
-            // Ensure that when starting from scratch, 'main' is selected, not 'banglejs'
+        mainline {
+            // Ensure that when starting from scratch, 'mainline' is selected, not 'banglejs'
             getIsDefault().set(true)
             // the default build product flavor
             dimension "device_type"
@@ -162,20 +164,20 @@ android {
             resValue "string", "about_activity_title", "@string/about_activity_title_main_nightly"
             resValue "string", "about_description", "@string/about_description_main_nightly"
             resValue "string", "gadgetbridge_running", "@string/gadgetbridge_running_main_nightly"
-            
+
             debuggable true
 
             if (System.getProperty("nightly_store_file") != null) {
                 signingConfig signingConfigs.nightly
 
                 //this was conflicting with regular debug type (it should not), so it is only available for CI builds:
-                productFlavors.main.resValue "string", "pebble_content_provider", "com.getpebble.android.provider"
-                productFlavors.main.resValue "string", "app_name", "@string/application_name_main_nightly"
-                productFlavors.main.resValue "string", "title_activity_controlcenter", "@string/title_activity_controlcenter_main_nightly"
-                productFlavors.main.resValue "string", "about_activity_title", "@string/about_activity_title_main_nightly"
-                productFlavors.main.resValue "string", "about_description", "@string/about_description_main_nightly"
-                productFlavors.main.resValue "string", "gadgetbridge_running", "@string/gadgetbridge_running_main_nightly"
-                
+                productFlavors.mainline.resValue "string", "pebble_content_provider", "com.getpebble.android.provider"
+                productFlavors.mainline.resValue "string", "app_name", "@string/application_name_main_nightly"
+                productFlavors.mainline.resValue "string", "title_activity_controlcenter", "@string/title_activity_controlcenter_main_nightly"
+                productFlavors.mainline.resValue "string", "about_activity_title", "@string/about_activity_title_main_nightly"
+                productFlavors.mainline.resValue "string", "about_description", "@string/about_description_main_nightly"
+                productFlavors.mainline.resValue "string", "gadgetbridge_running", "@string/gadgetbridge_running_main_nightly"
+
                 //keep the pebble provider for people who want this. In case of need we can create Banglejs Nopebble
                 productFlavors.banglejs.resValue "string", "pebble_content_provider", "com.getpebble.android.provider"
                 productFlavors.banglejs.resValue "string", "app_name", "@string/application_name_banglejs_nightly"
@@ -222,10 +224,9 @@ android {
 
     }
 
-
-    lintOptions {
+    lint {
         abortOnError ABORT_ON_CHECK_FAILURE
-        lintConfig file("${project.rootDir}/app/src/main/lint.xml")
+        lintConfig file("$rootDir/app/src/main/lint.xml")
         // If true, generate an HTML report (with issue explanations, sourcecode, etc)
         htmlReport true
         // Optional path to report (default will be lint-results.html in the builddir)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 41bdf43b2..fe0f9b349 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="nodomain.freeyourgadget.gadgetbridge">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <!--
         Comment in for testing Pebble Emulator
diff --git a/build.gradle b/build.gradle
index e09271d1c..ed86e9363 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.3'
+        classpath 'com.android.tools.build:gradle:7.4.2'
 
         classpath 'gradle.plugin.com.github.spotbugs:spotbugs-gradle-plugin:2.0.0'
         classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.17'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 99b91f965..b7edb58a8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sun Oct 08 20:08:12 CEST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

From 4dbe5744daa905e59296b40f5829d1bfd621c6d7 Mon Sep 17 00:00:00 2001
From: opcode <luigi@sciolla.net>
Date: Mon, 22 Jan 2024 15:59:23 +0100
Subject: [PATCH 507/595] Xiaomi: Fix parsing sleep headers

---
 .../activity/impl/SleepDetailsParser.java     | 52 +++++++++++--------
 1 file changed, 30 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/SleepDetailsParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/SleepDetailsParser.java
index e7f8d31f7..dbf9c949d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/SleepDetailsParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/SleepDetailsParser.java
@@ -49,11 +49,15 @@ public class SleepDetailsParser extends XiaomiActivityParser {
     @Override
     public boolean parse(final XiaomiSupport support, final XiaomiActivityFileId fileId, final byte[] bytes) {
         // Seems to come both as DetailType.DETAILS (version 2) and DetailType.SUMMARY (version 4)
-        if (fileId.getVersion() < 2 || fileId.getVersion() > 4) {
+        if (fileId.getVersion() > 4) {
             LOG.warn("Unknown sleep details version {}", fileId.getVersion());
             return false;
         }
 
+        // Stores number of fields which are only present in certain versions of the message
+        // this is required for correct header offset calculation
+        int versionDependentFields = 0;
+
         final ByteBuffer buf = ByteBuffer.wrap(bytes).order(ByteOrder.LITTLE_ENDIAN);
         final byte header = buf.get();
 
@@ -62,6 +66,7 @@ public class SleepDetailsParser extends XiaomiActivityParser {
         final int wakeupTime = buf.getInt();
         int sleepQuality = -1;
         if (fileId.getVersion() >= 4) {
+            versionDependentFields += 1;
             sleepQuality = buf.get() & 0xff;
         }
 
@@ -75,36 +80,45 @@ public class SleepDetailsParser extends XiaomiActivityParser {
         sample.setIsAwake(isAwake == 1);
 
         // Heart rate samples
-        if ((header & (1 << 4)) != 0) {
+        if ((header & (1 << (5 - versionDependentFields))) != 0) {
             final int unit = buf.getShort(); // Time unit (i.e sample rate)
             final int count = buf.getShort();
-            final int firstRecordTime = buf.getInt();
 
-            // Skip count samples - each sample is a u8
-            //   timestamp of each sample is firstRecordTime + (unit * index)
-            buf.position(buf.position() + count);
+            if (count > 0) {
+                final int firstRecordTime = buf.getInt();
+
+                // Skip count samples - each sample is a u8
+                //   timestamp of each sample is firstRecordTime + (unit * index)
+                buf.position(buf.position() + count);
+            }
         }
 
         // SpO2 samples
-        if ((header & (1 << 3)) != 0) {
+        if ((header & (1 << (4 - versionDependentFields))) != 0) {
             final int unit = buf.getShort(); // Time unit (i.e sample rate)
             final int count = buf.getShort();
-            final int firstRecordTime = buf.getInt();
 
-            // Skip count samples - each sample is a u8
-            //   timestamp of each sample is firstRecordTime + (unit * index)
-            buf.position(buf.position() + count);
+            if (count > 0) {
+                final int firstRecordTime = buf.getInt();
+
+                // Skip count samples - each sample is a u8
+                //   timestamp of each sample is firstRecordTime + (unit * index)
+                buf.position(buf.position() + count);
+            }
         }
 
         // snore samples
-        if (fileId.getVersion() >= 3 && (header & (1 << 2)) != 0) {
+        if (fileId.getVersion() >= 3 && (header & (1 << (3 - versionDependentFields))) != 0) {
             final int unit = buf.getShort(); // Time unit (i.e sample rate)
             final int count = buf.getShort();
-            final int firstRecordTime = buf.getInt();
 
-            // Skip count samples - each sample is a float
-            //   timestamp of each sample is firstRecordTime + (unit * index)
-            buf.position(buf.position() + count * 4);
+            if (count > 0) {
+                final int firstRecordTime = buf.getInt();
+
+                // Skip count samples - each sample is a float
+                //   timestamp of each sample is firstRecordTime + (unit * index)
+                buf.position(buf.position() + count * 4);
+            }
         }
 
         final List<XiaomiSleepStageSample> stages = new ArrayList<>();
@@ -113,12 +127,6 @@ public class SleepDetailsParser extends XiaomiActivityParser {
         // and we still want to persist whatever we got so far
         boolean stagesParseFailed = false;
         try {
-            // FIXME: Sometimes there's a random zero here..?
-            if (buf.getInt() != 0) {
-                // If it wasn't a zero, rewind
-                buf.position(buf.position() - 4);
-            }
-
             while (buf.remaining() >= 17 && buf.getInt() == 0xFFFCFAFB) {
                 final int headerLen = buf.get() & 0xFF; // this seems to always be 17
 

From 139e9cfb14dba91b95b5c40bdd5ace0d457d36f7 Mon Sep 17 00:00:00 2001
From: Aleksandr Ivanov <sqsvp@ya.ru>
Date: Sun, 28 Jan 2024 01:32:15 +0300
Subject: [PATCH 508/595] Pebble: fix of app configuration webview

---
 .../gadgetbridge/activities/ExternalPebbleJSActivity.java      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ExternalPebbleJSActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ExternalPebbleJSActivity.java
index 82060a52e..665eaaab7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ExternalPebbleJSActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ExternalPebbleJSActivity.java
@@ -192,6 +192,9 @@ public class ExternalPebbleJSActivity extends AbstractGBActivity {
         webSettings.setDomStorageEnabled(true);
         //needed for localstorage
         webSettings.setDatabaseEnabled(true);
+        // #3373 #3424 - Fix configuration for pebble apps
+        // TODO: this should use a WebViewAssetLoader
+        webSettings.setAllowFileAccess(true);
 
         JSInterface gbJSInterface = new JSInterface(device, uuid);
         myWebView.addJavascriptInterface(gbJSInterface, "GBjs");

From 207a2a9b0132ab0450ec0ca420d9b90fc13df981 Mon Sep 17 00:00:00 2001
From: Denis Pitzalis <denics@free.fr>
Date: Sat, 27 Jan 2024 23:21:11 +0000
Subject: [PATCH 509/595] initial support for sony WI-SP600N (#3522)

Initial support for sony wi-sp600n reported working . minor difference with the inspiring wf-sp800n

Reviewed-on: https://codeberg.org/Freeyourgadget/Gadgetbridge/pulls/3522
Co-authored-by: Denis Pitzalis <denics@free.fr>
Co-committed-by: Denis Pitzalis <denics@free.fr>
---
 CHANGELOG.md                                  |  1 +
 .../coordinators/SonyWISP600NCoordinator.java | 56 +++++++++++++++++++
 .../gadgetbridge/model/DeviceType.java        |  2 +
 .../headphones/SonyHeadphonesProtocol.java    |  1 +
 app/src/main/res/values/strings.xml           |  1 +
 5 files changed, 61 insertions(+)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWISP600NCoordinator.java

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f2d5ca440..818df2a0a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 #### Next Version (WIP)
 
 * Initial support for Mijia MHO-C303
+* Initial support for Sony WI-SP600N
 * Experimental support for Xiaomi Smart Band 8 Pro
 * Experimental support for Xiaomi Watch S1 Pro
 * Experimental support for Xiaomi Watch S1
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWISP600NCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWISP600NCoordinator.java
new file mode 100644
index 000000000..c1c4800b4
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyWISP600NCoordinator.java
@@ -0,0 +1,56 @@
+/*  Copyright (C) 2021-2024 Daniel Dakhno, José Rebelo, Petr Vaněk
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.coordinators;
+
+import androidx.annotation.NonNull;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.regex.Pattern;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.SonyHeadphonesCapabilities;
+import nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.SonyHeadphonesCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
+import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
+
+public class SonyWISP600NCoordinator extends SonyHeadphonesCoordinator {
+    @Override
+    protected Pattern getSupportedDeviceName() {
+        return Pattern.compile(".*WI-SP600N.*");
+    }
+    @Override
+    public int getDeviceNameResource() {
+        return R.string.devicetype_sony_wi_sp600n;
+    }
+
+    @Override
+    public List<SonyHeadphonesCapabilities> getCapabilities() {
+        return Arrays.asList(
+                SonyHeadphonesCapabilities.BatterySingle,
+                SonyHeadphonesCapabilities.AmbientSoundControl,
+                SonyHeadphonesCapabilities.WindNoiseReduction,
+                SonyHeadphonesCapabilities.EqualizerWithCustomBands,
+                SonyHeadphonesCapabilities.SoundPosition,
+                SonyHeadphonesCapabilities.SurroundMode,
+                SonyHeadphonesCapabilities.PowerOffFromPhone,
+                SonyHeadphonesCapabilities.AutomaticPowerOffByTime,
+                SonyHeadphonesCapabilities.VoiceNotifications,
+                SonyHeadphonesCapabilities.Volume
+        );
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
index 6f930ad59..c2f5be716 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
@@ -152,6 +152,7 @@ import nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.coordinators
 import nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.coordinators.SonyWF1000XM4Coordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.coordinators.SonyWF1000XM5Coordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.coordinators.SonyWFSP800NCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.coordinators.SonyWISP600NCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.coordinators.SonyWH1000XM2Coordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.coordinators.SonyWH1000XM3Coordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.coordinators.SonyWH1000XM4Coordinator;
@@ -319,6 +320,7 @@ public enum DeviceType {
     GALAXY_BUDS2_PRO(GalaxyBuds2ProDeviceCoordinator.class),
     SONY_WH_1000XM3(SonyWH1000XM3Coordinator.class),
     SONY_WF_SP800N(SonyWFSP800NCoordinator.class),
+    SONY_WI_SP600N(SonyWISP600NCoordinator.class),
     SONY_WH_1000XM4(SonyWH1000XM4Coordinator.class),
     SONY_WF_1000XM3(SonyWF1000XM3Coordinator.class),
     SONY_WH_1000XM2(SonyWH1000XM2Coordinator.class),
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/SonyHeadphonesProtocol.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/SonyHeadphonesProtocol.java
index de70a2e21..4804d44e5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/SonyHeadphonesProtocol.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/headphones/SonyHeadphonesProtocol.java
@@ -120,6 +120,7 @@ public class SonyHeadphonesProtocol extends GBDeviceProtocol {
                     if (message.getPayload().length == 4) {
                         // WH-1000XM3:      01:00:40:10
                         // WF-SP800N 1.0.1: 01:00:70:00
+                        // Wi-SP600N:       01:00:40:10
                         protocolVersion = "v1";
                     } else if (message.getPayload().length == 8) {
                         switch (message.getPayload()[2]) {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e3a355941..078a7ed5a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1432,6 +1432,7 @@
     <string name="devicetype_sony_wf_1000xm3">Sony WF-1000XM3</string>
     <string name="devicetype_sony_wf_1000xm4">Sony WF-1000XM4</string>
     <string name="devicetype_sony_wf_1000xm5">Sony WF-1000XM5</string>
+    <string name="devicetype_sony_wi_sp600n">Sony WI-SP600N</string>
     <string name="devicetype_sony_linkbuds_s">Sony LinkBuds S</string>
     <string name="devicetype_binary_sensor">Binary sensor</string>
     <string name="devicetype_honor_band3">Honor Band 3</string>

From 5999eb01d0e8b4cda8a52838a81a50b691febcc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sun, 28 Jan 2024 18:46:13 +0000
Subject: [PATCH 510/595] Nothing CMF Watch Pro: Initial support

---
 .../gadgetbridge/daogen/GBDaoGenerator.java   |  73 +-
 .../gadgetbridge/activities/AlarmDetails.java |  29 +-
 .../DeviceSettingsPreferenceConst.java        |   4 +
 .../DeviceSpecificSettingsFragment.java       |   3 +
 .../capabilities/HeartRateCapability.java     |   7 +-
 .../devices/AbstractDeviceCoordinator.java    |  10 +
 .../devices/DeviceCoordinator.java            |  12 +
 .../cmfwatchpro/CmfWatchProCoordinator.java   | 368 ++++++++++
 .../CmfWatchProSettingsCustomizer.java        |  82 +++
 .../samples/CmfActivitySampleProvider.java    | 224 ++++++
 .../samples/CmfHeartRateSampleProvider.java   |  56 ++
 .../CmfSleepSessionSampleProvider.java        |  56 ++
 .../samples/CmfSleepStageSampleProvider.java  |  56 ++
 .../samples/CmfSpo2SampleProvider.java        |  56 ++
 .../samples/CmfStressSampleProvider.java      |  56 ++
 .../samples/CmfWorkoutGpsSampleProvider.java  |  56 ++
 .../workout/CmfWorkoutSummaryParser.java      |  95 +++
 .../huami/HuamiSettingsCustomizer.java        |   6 +
 .../devices/huawei/HuaweiBRCoordinator.java   |   5 +
 .../devices/huawei/HuaweiLECoordinator.java   |   5 +
 .../huawei/HuaweiSpo2SampleProvider.java      |   5 -
 .../devices/qhybrid/QHybridCoordinator.java   |   5 +
 .../WithingsSteelHRDeviceCoordinator.java     |   5 +
 .../xiaomi/XiaomiSettingsCustomizer.java      |   5 +
 .../entities/AbstractSpo2Sample.java          |   9 +-
 .../entities/AbstractStressSample.java        |   9 +-
 .../gadgetbridge/model/DeviceType.java        |   2 +
 .../service/btle/BleNamesResolver.java        |   9 +-
 .../devices/cmfwatchpro/CmfActivitySync.java  | 663 ++++++++++++++++++
 .../devices/cmfwatchpro/CmfActivityType.java  | 184 +++++
 .../cmfwatchpro/CmfCharacteristic.java        | 310 ++++++++
 .../devices/cmfwatchpro/CmfCommand.java       | 124 ++++
 .../devices/cmfwatchpro/CmfDataUploader.java  | 198 ++++++
 .../devices/cmfwatchpro/CmfFwHelper.java      | 187 +++++
 .../cmfwatchpro/CmfInstallHandler.java        |  90 +++
 .../cmfwatchpro/CmfNotificationIcon.java      |  75 ++
 .../devices/cmfwatchpro/CmfPreferences.java   | 392 +++++++++++
 .../cmfwatchpro/CmfWatchProSupport.java       | 594 ++++++++++++++++
 .../operations/FetchSpo2NormalOperation.java  |   2 +-
 .../operations/FetchStressAutoOperation.java  |   2 +-
 .../FetchStressManualOperation.java           |   2 +-
 .../logic/parsers/StressPacketParser.java     |   2 +-
 app/src/main/res/values/arrays.xml            | 251 +++++++
 app/src/main/res/values/strings.xml           |  85 +++
 ...trate_sleep_alert_activity_stress_spo2.xml |   9 +
 .../devicesettings_hydration_reminder_dnd.xml |  39 ++
 .../devicesettings_workout_activity_types.xml |  13 +
 .../devices/cmfwatchpro/CmfCommandTest.java   |  39 ++
 48 files changed, 4538 insertions(+), 31 deletions(-)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/cmfwatchpro/CmfWatchProCoordinator.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/cmfwatchpro/CmfWatchProSettingsCustomizer.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/cmfwatchpro/samples/CmfActivitySampleProvider.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/cmfwatchpro/samples/CmfHeartRateSampleProvider.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/cmfwatchpro/samples/CmfSleepSessionSampleProvider.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/cmfwatchpro/samples/CmfSleepStageSampleProvider.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/cmfwatchpro/samples/CmfSpo2SampleProvider.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/cmfwatchpro/samples/CmfStressSampleProvider.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/cmfwatchpro/samples/CmfWorkoutGpsSampleProvider.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/cmfwatchpro/workout/CmfWorkoutSummaryParser.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/cmfwatchpro/CmfActivitySync.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/cmfwatchpro/CmfActivityType.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/cmfwatchpro/CmfCharacteristic.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/cmfwatchpro/CmfCommand.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/cmfwatchpro/CmfDataUploader.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/cmfwatchpro/CmfFwHelper.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/cmfwatchpro/CmfInstallHandler.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/cmfwatchpro/CmfNotificationIcon.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/cmfwatchpro/CmfPreferences.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/cmfwatchpro/CmfWatchProSupport.java
 create mode 100644 app/src/main/res/xml/devicesettings_hydration_reminder_dnd.xml
 create mode 100644 app/src/main/res/xml/devicesettings_workout_activity_types.xml
 create mode 100644 app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/devices/cmfwatchpro/CmfCommandTest.java

diff --git a/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java b/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java
index 10883f697..3fcec24ef 100644
--- a/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java
+++ b/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java
@@ -45,7 +45,7 @@ public class GBDaoGenerator {
 
 
     public static void main(String[] args) throws Exception {
-        final Schema schema = new Schema(68, MAIN_PACKAGE + ".entities");
+        final Schema schema = new Schema(70, MAIN_PACKAGE + ".entities");
 
         Entity userAttributes = addUserAttributes(schema);
         Entity user = addUserInfo(schema, userAttributes);
@@ -75,6 +75,13 @@ public class GBDaoGenerator {
         addXiaomiSleepStageSamples(schema, user, device);
         addXiaomiManualSamples(schema, user, device);
         addXiaomiDailySummarySamples(schema, user, device);
+        addCmfActivitySample(schema, user, device);
+        addCmfStressSample(schema, user, device);
+        addCmfSpo2Sample(schema, user, device);
+        addCmfSleepSessionSample(schema, user, device);
+        addCmfSleepStageSample(schema, user, device);
+        addCmfHeartRateSample(schema, user, device);
+        addCmfWorkoutGpsSample(schema, user, device);
         addPebbleHealthActivitySample(schema, user, device);
         addPebbleHealthActivityKindOverlay(schema, user, device);
         addPebbleMisfitActivitySample(schema, user, device);
@@ -275,7 +282,7 @@ public class GBDaoGenerator {
     private static Entity addHuamiStressSample(Schema schema, Entity user, Entity device) {
         Entity stressSample = addEntity(schema, "HuamiStressSample");
         addCommonTimeSampleProperties("AbstractStressSample", stressSample, user, device);
-        stressSample.addIntProperty("typeNum").notNull().codeBeforeGetterAndSetter(OVERRIDE);
+        stressSample.addIntProperty("typeNum").notNull().codeBeforeGetter(OVERRIDE);
         stressSample.addIntProperty("stress").notNull().codeBeforeGetter(OVERRIDE);
         return stressSample;
     }
@@ -283,7 +290,7 @@ public class GBDaoGenerator {
     private static Entity addHuamiSpo2Sample(Schema schema, Entity user, Entity device) {
         Entity spo2sample = addEntity(schema, "HuamiSpo2Sample");
         addCommonTimeSampleProperties("AbstractSpo2Sample", spo2sample, user, device);
-        spo2sample.addIntProperty("typeNum").notNull().codeBeforeGetterAndSetter(OVERRIDE);
+        spo2sample.addIntProperty("typeNum").notNull().codeBeforeGetter(OVERRIDE);
         spo2sample.addIntProperty("spo2").notNull().codeBeforeGetter(OVERRIDE);
         return spo2sample;
     }
@@ -407,6 +414,64 @@ public class GBDaoGenerator {
         return sample;
     }
 
+    private static Entity addCmfActivitySample(Schema schema, Entity user, Entity device) {
+        Entity activitySample = addEntity(schema, "CmfActivitySample");
+        addCommonActivitySampleProperties("AbstractActivitySample", activitySample, user, device);
+        activitySample.implementsSerializable();
+        activitySample.addIntProperty(SAMPLE_RAW_INTENSITY).notNull().codeBeforeGetterAndSetter(OVERRIDE);
+        activitySample.addIntProperty(SAMPLE_STEPS).notNull().codeBeforeGetterAndSetter(OVERRIDE);
+        activitySample.addIntProperty(SAMPLE_RAW_KIND).notNull().codeBeforeGetterAndSetter(OVERRIDE);
+        addHeartRateProperties(activitySample);
+        activitySample.addIntProperty("distance");
+        activitySample.addIntProperty("calories");
+        return activitySample;
+    }
+
+    private static Entity addCmfStressSample(Schema schema, Entity user, Entity device) {
+        Entity stressSample = addEntity(schema, "CmfStressSample");
+        addCommonTimeSampleProperties("AbstractStressSample", stressSample, user, device);
+        stressSample.addIntProperty("stress").notNull().codeBeforeGetter(OVERRIDE);
+        return stressSample;
+    }
+
+    private static Entity addCmfSpo2Sample(Schema schema, Entity user, Entity device) {
+        Entity spo2sample = addEntity(schema, "CmfSpo2Sample");
+        addCommonTimeSampleProperties("AbstractSpo2Sample", spo2sample, user, device);
+        spo2sample.addIntProperty("spo2").notNull().codeBeforeGetter(OVERRIDE);
+        return spo2sample;
+    }
+
+    private static Entity addCmfSleepSessionSample(Schema schema, Entity user, Entity device) {
+        Entity sleepSessionSample = addEntity(schema, "CmfSleepSessionSample");
+        addCommonTimeSampleProperties("AbstractTimeSample", sleepSessionSample, user, device);
+        sleepSessionSample.addLongProperty("wakeupTime");
+        sleepSessionSample.addByteArrayProperty("metadata");
+        return sleepSessionSample;
+    }
+
+    private static Entity addCmfSleepStageSample(Schema schema, Entity user, Entity device) {
+        Entity sleepStageSample = addEntity(schema, "CmfSleepStageSample");
+        addCommonTimeSampleProperties("AbstractTimeSample", sleepStageSample, user, device);
+        sleepStageSample.addIntProperty("duration").notNull();
+        sleepStageSample.addIntProperty("stage").notNull();
+        return sleepStageSample;
+    }
+
+    private static Entity addCmfHeartRateSample(Schema schema, Entity user, Entity device) {
+        Entity heartRateSample = addEntity(schema, "CmfHeartRateSample");
+        addCommonTimeSampleProperties("AbstractHeartRateSample", heartRateSample, user, device);
+        heartRateSample.addIntProperty(SAMPLE_HEART_RATE).notNull().codeBeforeGetter(OVERRIDE);
+        return heartRateSample;
+    }
+
+    private static Entity addCmfWorkoutGpsSample(Schema schema, Entity user, Entity device) {
+        Entity sample = addEntity(schema, "CmfWorkoutGpsSample");
+        addCommonTimeSampleProperties("AbstractTimeSample", sample, user, device);
+        sample.addIntProperty("latitude");
+        sample.addIntProperty("longitude");
+        return sample;
+    }
+
     private static void addHeartRateProperties(Entity activitySample) {
         activitySample.addIntProperty(SAMPLE_HEART_RATE).notNull().codeBeforeGetterAndSetter(OVERRIDE);
     }
@@ -981,7 +1046,7 @@ public class GBDaoGenerator {
     private static Entity addWena3StressSample(Schema schema, Entity user, Entity device) {
         Entity stressSample = addEntity(schema, "Wena3StressSample");
         addCommonTimeSampleProperties("AbstractStressSample", stressSample, user, device);
-        stressSample.addIntProperty("typeNum").notNull().codeBeforeGetterAndSetter(OVERRIDE);
+        stressSample.addIntProperty("typeNum").notNull().codeBeforeGetter(OVERRIDE);
         stressSample.addIntProperty("stress").notNull().codeBeforeGetter(OVERRIDE);
         return stressSample;
     }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AlarmDetails.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AlarmDetails.java
index 2308662c3..d201c95f3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AlarmDetails.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AlarmDetails.java
@@ -18,6 +18,7 @@
 package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import android.os.Bundle;
+import android.text.InputFilter;
 import android.text.format.DateFormat;
 import android.view.MenuItem;
 import android.view.View;
@@ -132,10 +133,15 @@ public class AlarmDetails extends AbstractGBActivity {
         int snoozeVisibility = supportsSnoozing() ? View.VISIBLE : View.GONE;
         cbSnooze.setVisibility(snoozeVisibility);
 
-        int descriptionVisibility = supportsDescription() ? View.VISIBLE : View.GONE;
-        title.setVisibility(descriptionVisibility);
+        title.setVisibility(supportsTitle() ? View.VISIBLE : View.GONE);
         title.setText(alarm.getTitle());
-        description.setVisibility(descriptionVisibility);
+
+        final int titleLimit = getAlarmTitleLimit();
+        if (titleLimit > 0) {
+            title.setFilters(new InputFilter[]{new InputFilter.LengthFilter(titleLimit)});
+        }
+
+        description.setVisibility(supportsDescription() ? View.VISIBLE : View.GONE);
         description.setText(alarm.getDescription());
 
         cbMonday.setChecked(alarm.getRepetition(Alarm.ALARM_MON));
@@ -145,7 +151,6 @@ public class AlarmDetails extends AbstractGBActivity {
         cbFriday.setChecked(alarm.getRepetition(Alarm.ALARM_FRI));
         cbSaturday.setChecked(alarm.getRepetition(Alarm.ALARM_SAT));
         cbSunday.setChecked(alarm.getRepetition(Alarm.ALARM_SUN));
-
     }
 
     private boolean supportsSmartWakeup() {
@@ -156,6 +161,22 @@ public class AlarmDetails extends AbstractGBActivity {
         return false;
     }
 
+    private boolean supportsTitle() {
+        if (device != null) {
+            DeviceCoordinator coordinator = device.getDeviceCoordinator();
+            return coordinator.supportsAlarmTitle(device);
+        }
+        return false;
+    }
+
+    private int getAlarmTitleLimit() {
+        if (device != null) {
+            DeviceCoordinator coordinator = device.getDeviceCoordinator();
+            return coordinator.getAlarmTitleLimit(device);
+        }
+        return -1;
+    }
+
     private boolean supportsDescription() {
         if (device != null) {
             DeviceCoordinator coordinator = device.getDeviceCoordinator();
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
index 86feecb11..751e372be 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsPreferenceConst.java
@@ -177,6 +177,7 @@ public class DeviceSettingsPreferenceConst {
     public static final String PREF_HEARTRATE_MEASUREMENT_INTERVAL = "heartrate_measurement_interval";
     public static final String PREF_HEARTRATE_ACTIVITY_MONITORING = "heartrate_activity_monitoring";
     public static final String PREF_HEARTRATE_ALERT_ENABLED = "heartrate_alert_enabled";
+    public static final String PREF_HEARTRATE_ALERT_ACTIVE_HIGH_THRESHOLD = "heartrate_alert_active_high_threshold";
     public static final String PREF_HEARTRATE_ALERT_HIGH_THRESHOLD = "heartrate_alert_threshold";
     public static final String PREF_HEARTRATE_ALERT_LOW_THRESHOLD = "heartrate_alert_low_threshold";
     public static final String PREF_HEARTRATE_STRESS_MONITORING = "heartrate_stress_monitoring";
@@ -262,6 +263,9 @@ public class DeviceSettingsPreferenceConst {
     public static final String PREF_ANTILOST_ENABLED = "pref_antilost_enabled";
     public static final String PREF_HYDRATION_SWITCH = "pref_hydration_switch";
     public static final String PREF_HYDRATION_PERIOD = "pref_hydration_period";
+    public static final String PREF_HYDRATION_DND = "pref_hydration_dnd";
+    public static final String PREF_HYDRATION_DND_START = "pref_hydration_dnd_start";
+    public static final String PREF_HYDRATION_DND_END = "pref_hydration_dnd_end";
     public static final String PREF_AMPM_ENABLED = "pref_ampm_enabled";
 
     public static final String PREF_SONYSWR12_LOW_VIBRATION = "vibration_preference";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
index 5bc3f4abc..b7419c8ac 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSpecificSettingsFragment.java
@@ -426,6 +426,9 @@ public class DeviceSpecificSettingsFragment extends AbstractPreferenceFragment i
         addPreferenceHandlerFor(PREF_ANTILOST_ENABLED);
         addPreferenceHandlerFor(PREF_HYDRATION_SWITCH);
         addPreferenceHandlerFor(PREF_HYDRATION_PERIOD);
+        addPreferenceHandlerFor(PREF_HYDRATION_DND);
+        addPreferenceHandlerFor(PREF_HYDRATION_DND_START);
+        addPreferenceHandlerFor(PREF_HYDRATION_DND_END);
         addPreferenceHandlerFor(PREF_AMPM_ENABLED);
         addPreferenceHandlerFor(PREF_SOUNDS);
         addPreferenceHandlerFor(PREF_CAMERA_REMOTE);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/HeartRateCapability.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/HeartRateCapability.java
index 17e3124cd..c6029fb6b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/HeartRateCapability.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/capabilities/HeartRateCapability.java
@@ -17,6 +17,7 @@
 package nodomain.freeyourgadget.gadgetbridge.capabilities;
 
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_HEARTRATE_ACTIVITY_MONITORING;
+import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_HEARTRATE_ALERT_ACTIVE_HIGH_THRESHOLD;
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_HEARTRATE_ALERT_ENABLED;
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_HEARTRATE_ALERT_HIGH_THRESHOLD;
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_HEARTRATE_ALERT_LOW_THRESHOLD;
@@ -82,20 +83,23 @@ public class HeartRateCapability {
             });
         }
 
+        handler.addPreferenceHandlerFor(PREF_HEARTRATE_ALERT_ACTIVE_HIGH_THRESHOLD);
         handler.addPreferenceHandlerFor(PREF_HEARTRATE_ALERT_HIGH_THRESHOLD);
         handler.addPreferenceHandlerFor(PREF_HEARTRATE_ALERT_LOW_THRESHOLD);
 
         final ListPreference heartrateMeasurementInterval = handler.findPreference(PREF_HEARTRATE_MEASUREMENT_INTERVAL);
+        final ListPreference heartrateAlertActiveHigh = handler.findPreference(PREF_HEARTRATE_ALERT_ACTIVE_HIGH_THRESHOLD);
         final ListPreference heartrateAlertHigh = handler.findPreference(PREF_HEARTRATE_ALERT_HIGH_THRESHOLD);
         final ListPreference heartrateAlertLow = handler.findPreference(PREF_HEARTRATE_ALERT_LOW_THRESHOLD);
         // Newer devices that have low alert threshold can only use it if measurement interval is smart (-1) or 1 minute
-        final boolean hrAlertsNeedSmartOrOne = heartrateAlertHigh != null && heartrateAlertLow != null && heartrateMeasurementInterval != null;
+        final boolean hrAlertsNeedSmartOrOne = heartrateAlertActiveHigh != null && heartrateAlertHigh != null && heartrateAlertLow != null && heartrateMeasurementInterval != null;
         if (hrAlertsNeedSmartOrOne) {
             final boolean hrMonitoringIsSmartOrOne = heartrateMeasurementInterval.getValue().equals("60") ||
                     heartrateMeasurementInterval.getValue().equals("-1");
 
             heartrateAlertHigh.setEnabled(hrMonitoringIsSmartOrOne);
             heartrateAlertLow.setEnabled(hrMonitoringIsSmartOrOne);
+            heartrateAlertActiveHigh.setEnabled(hrMonitoringIsSmartOrOne);
         }
 
         if (heartrateMeasurementInterval != null) {
@@ -129,6 +133,7 @@ public class HeartRateCapability {
                         // Same as above, check if smart or 1 minute
                         final boolean hrMonitoringIsSmartOrOne = newVal.equals("60") || newVal.equals("-1");
 
+                        heartrateAlertActiveHigh.setEnabled(hrMonitoringIsSmartOrOne);
                         heartrateAlertHigh.setEnabled(hrMonitoringIsSmartOrOne);
                         heartrateAlertLow.setEnabled(hrMonitoringIsSmartOrOne);
                     }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java
index ba8399137..e6e8115c3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java
@@ -436,6 +436,16 @@ public abstract class AbstractDeviceCoordinator implements DeviceCoordinator {
         return false;
     }
 
+    @Override
+    public boolean supportsAlarmTitle(GBDevice device) {
+        return false;
+    }
+
+    @Override
+    public int getAlarmTitleLimit(GBDevice device) {
+        return -1;
+    }
+
     @Override
     public boolean supportsAlarmDescription(GBDevice device) {
         return false;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java
index db5b71116..b0af24587 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java
@@ -343,6 +343,18 @@ public interface DeviceCoordinator {
      */
     boolean supportsAlarmSnoozing();
 
+    /**
+     * Returns true if this device/coordinator supports alarm titles
+     * @return
+     */
+    boolean supportsAlarmTitle(GBDevice device);
+
+    /**
+     * Returns the character limit for the alarm title, negative if no limit.
+     * @return
+     */
+    int getAlarmTitleLimit(GBDevice device);
+
     /**
      * Returns true if this device/coordinator supports alarm descriptions
      * @return
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/cmfwatchpro/CmfWatchProCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/cmfwatchpro/CmfWatchProCoordinator.java
new file mode 100644
index 000000000..efceba4d7
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/cmfwatchpro/CmfWatchProCoordinator.java
@@ -0,0 +1,368 @@
+/*  Copyright (C) 2024 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.cmfwatchpro;
+
+import android.app.Activity;
+import android.bluetooth.le.ScanFilter;
+import android.content.Context;
+import android.net.Uri;
+import android.os.ParcelUuid;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.apache.commons.lang3.ArrayUtils;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.regex.Pattern;
+
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.GBException;
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.activities.appmanager.AppManagerActivity;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSpecificSettingsCustomizer;
+import nodomain.freeyourgadget.gadgetbridge.capabilities.HeartRateCapability;
+import nodomain.freeyourgadget.gadgetbridge.devices.AbstractBLEDeviceCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
+import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.devices.TimeSampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.devices.cmfwatchpro.samples.CmfActivitySampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.devices.cmfwatchpro.samples.CmfSpo2SampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.devices.cmfwatchpro.samples.CmfStressSampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.devices.cmfwatchpro.workout.CmfWorkoutSummaryParser;
+import nodomain.freeyourgadget.gadgetbridge.entities.CmfActivitySampleDao;
+import nodomain.freeyourgadget.gadgetbridge.entities.CmfHeartRateSampleDao;
+import nodomain.freeyourgadget.gadgetbridge.entities.CmfSleepSessionSampleDao;
+import nodomain.freeyourgadget.gadgetbridge.entities.CmfSleepStageSampleDao;
+import nodomain.freeyourgadget.gadgetbridge.entities.CmfSpo2SampleDao;
+import nodomain.freeyourgadget.gadgetbridge.entities.CmfStressSampleDao;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.entities.Device;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
+import nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryParser;
+import nodomain.freeyourgadget.gadgetbridge.model.Spo2Sample;
+import nodomain.freeyourgadget.gadgetbridge.model.StressSample;
+import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.cmfwatchpro.CmfInstallHandler;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.cmfwatchpro.CmfWatchProSupport;
+import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
+
+public class CmfWatchProCoordinator extends AbstractBLEDeviceCoordinator {
+    @Override
+    protected Pattern getSupportedDeviceName() {
+        return Pattern.compile("^Watch Pro$");
+    }
+
+    @NonNull
+    @Override
+    public Collection<? extends ScanFilter> createBLEScanFilters() {
+        final ParcelUuid casioService = new ParcelUuid(CmfWatchProSupport.UUID_SERVICE_CMF_CMD);
+        final ScanFilter filter = new ScanFilter.Builder().setServiceUuid(casioService).build();
+        return Collections.singletonList(filter);
+    }
+
+    @Nullable
+    @Override
+    public InstallHandler findInstallHandler(final Uri uri, final Context context) {
+        final CmfInstallHandler handler = new CmfInstallHandler(uri, context);
+        return handler.isValid() ? handler : null;
+    }
+
+    @Override
+    protected void deleteDevice(@NonNull final GBDevice gbDevice,
+                                @NonNull final Device device,
+                                @NonNull final DaoSession session) throws GBException {
+        final Long deviceId = device.getId();
+
+        session.getCmfActivitySampleDao().queryBuilder()
+                .where(CmfActivitySampleDao.Properties.DeviceId.eq(deviceId))
+                .buildDelete().executeDeleteWithoutDetachingEntities();
+
+        session.getCmfStressSampleDao().queryBuilder()
+                .where(CmfStressSampleDao.Properties.DeviceId.eq(deviceId))
+                .buildDelete().executeDeleteWithoutDetachingEntities();
+
+        session.getCmfHeartRateSampleDao().queryBuilder()
+                .where(CmfHeartRateSampleDao.Properties.DeviceId.eq(deviceId))
+                .buildDelete().executeDeleteWithoutDetachingEntities();
+
+        session.getCmfSleepSessionSampleDao().queryBuilder()
+                .where(CmfSleepSessionSampleDao.Properties.DeviceId.eq(deviceId))
+                .buildDelete().executeDeleteWithoutDetachingEntities();
+
+        session.getCmfSleepStageSampleDao().queryBuilder()
+                .where(CmfSleepStageSampleDao.Properties.DeviceId.eq(deviceId))
+                .buildDelete().executeDeleteWithoutDetachingEntities();
+
+        session.getCmfSpo2SampleDao().queryBuilder()
+                .where(CmfSpo2SampleDao.Properties.DeviceId.eq(deviceId))
+                .buildDelete().executeDeleteWithoutDetachingEntities();
+    }
+
+    @Override
+    public String getManufacturer() {
+        return "Nothing";
+    }
+
+    @Override
+    public int getDeviceNameResource() {
+        return R.string.devicetype_nothing_cmf_watch_pro;
+    }
+
+    @Override
+    public int getDefaultIconResource() {
+        return R.drawable.ic_device_amazfit_bip;
+    }
+
+    @Override
+    public int getDisabledIconResource() {
+        return R.drawable.ic_device_amazfit_bip_disabled;
+    }
+
+    @NonNull
+    @Override
+    public Class<? extends DeviceSupport> getDeviceSupportClass() {
+        return CmfWatchProSupport.class;
+    }
+
+    @Override
+    public int getBondingStyle() {
+        return BONDING_STYLE_REQUIRE_KEY;
+    }
+
+    @Override
+    public boolean validateAuthKey(final String authKey) {
+        final byte[] authKeyBytes = authKey.trim().getBytes();
+        return authKeyBytes.length == 32 || (authKey.startsWith("0x") && authKeyBytes.length == 34);
+    }
+
+    @Override
+    public int[] getSupportedDeviceSpecificAuthenticationSettings() {
+        return new int[]{R.xml.devicesettings_pairingkey};
+    }
+
+    @Override
+    public SampleProvider<? extends ActivitySample> getSampleProvider(final GBDevice device, DaoSession session) {
+        return new CmfActivitySampleProvider(device, session);
+    }
+
+    @Override
+    public TimeSampleProvider<? extends StressSample> getStressSampleProvider(final GBDevice device, final DaoSession session) {
+        return new CmfStressSampleProvider(device, session);
+    }
+
+    @Override
+    public int[] getStressRanges() {
+        // 1-29 = relaxed
+        // 30-59 = normal
+        // 60-79 = medium
+        // 80-99 = high
+        return new int[]{1, 30, 60, 80};
+    }
+
+    @Override
+    public TimeSampleProvider<? extends Spo2Sample> getSpo2SampleProvider(final GBDevice device, final DaoSession session) {
+        return new CmfSpo2SampleProvider(device, session);
+    }
+
+    @Nullable
+    @Override
+    public ActivitySummaryParser getActivitySummaryParser(final GBDevice device) {
+        return new CmfWorkoutSummaryParser(device);
+    }
+
+    @Override
+    public boolean supportsFlashing() {
+        return true;
+    }
+
+    @Override
+    public int getAlarmSlotCount(final GBDevice device) {
+        return 5;
+    }
+
+    @Override
+    public boolean supportsAlarmTitle(final GBDevice device) {
+        return true;
+    }
+
+    @Override
+    public int getAlarmTitleLimit(final GBDevice device) {
+        return 8;
+    }
+
+    @Override
+    public boolean supportsAppsManagement(final GBDevice device) {
+        return false; // TODO for watchface management
+    }
+
+    @Override
+    public boolean supportsCachedAppManagement(GBDevice device) {
+        return false;
+    }
+
+    @Override
+    public boolean supportsInstalledAppManagement(GBDevice device) {
+        return false;
+    }
+
+    @Override
+    public boolean supportsWatchfaceManagement(GBDevice device) {
+        return supportsAppsManagement(device);
+    }
+
+    @Override
+    public Class<? extends Activity> getAppsManagementActivity() {
+        return AppManagerActivity.class;
+    }
+
+    @Override
+    public boolean supportsAppListFetching() {
+        return false; // TODO it does not, but we can fake it for watchfaces
+    }
+
+    @Override
+    public boolean supportsActivityDataFetching() {
+        return true;
+    }
+
+    @Override
+    public boolean supportsActivityTracking() {
+        return true;
+    }
+
+    @Override
+    public boolean supportsActivityTracks() {
+        return true;
+    }
+
+    @Override
+    public boolean supportsStressMeasurement() {
+        return true;
+    }
+
+    @Override
+    public boolean supportsSpo2() {
+        return true;
+    }
+
+    @Override
+    public boolean supportsMusicInfo() {
+        return true;
+    }
+
+    @Override
+    public int getContactsSlotCount(final GBDevice device) {
+        return 20;
+    }
+
+    @Override
+    public boolean supportsHeartRateMeasurement(final GBDevice device) {
+        return true;
+    }
+
+    @Override
+    public boolean supportsManualHeartRateMeasurement(final GBDevice device) {
+        return false;
+    }
+
+    @Override
+    public boolean supportsRemSleep() {
+        return true;
+    }
+
+    @Override
+    public boolean supportsWeather() {
+        return false; // TODO weather is not implemented
+    }
+
+    @Override
+    public boolean supportsFindDevice() {
+        return true;
+    }
+
+    @Override
+    public int[] getSupportedDeviceSpecificSettings(final GBDevice device) {
+        final List<Integer> settings = new ArrayList<>();
+
+        settings.add(R.xml.devicesettings_header_time);
+        settings.add(R.xml.devicesettings_timeformat);
+
+        settings.add(R.xml.devicesettings_header_display);
+        settings.add(R.xml.devicesettings_workout_activity_types);
+        settings.add(R.xml.devicesettings_liftwrist_display_noshed);
+
+        settings.add(R.xml.devicesettings_header_health);
+        settings.add(R.xml.devicesettings_heartrate_sleep_alert_activity_stress_spo2);
+        settings.add(R.xml.devicesettings_inactivity_dnd);
+        settings.add(R.xml.devicesettings_hydration_reminder_dnd);
+
+        settings.add(R.xml.devicesettings_header_notifications);
+        settings.add(R.xml.devicesettings_send_app_notifications);
+        settings.add(R.xml.devicesettings_transliteration);
+
+        settings.add(R.xml.devicesettings_header_other);
+        if (getContactsSlotCount(device) > 0) {
+            settings.add(R.xml.devicesettings_contacts);
+        }
+
+        return ArrayUtils.toPrimitive(settings.toArray(new Integer[0]));
+    }
+
+    @Override
+    public DeviceSpecificSettingsCustomizer getDeviceSpecificSettingsCustomizer(final GBDevice device) {
+        return new CmfWatchProSettingsCustomizer();
+    }
+
+    @Override
+    public String[] getSupportedLanguageSettings(final GBDevice device) {
+        return null;
+        // FIXME language setting does not seem to work from phone
+        //return new String[]{
+        //        "auto",
+        //        "ar_SA",
+        //        "de_DE",
+        //        "en_US",
+        //        "es_ES",
+        //        "fr_FR",
+        //        "hi_IN",
+        //        "id_ID",
+        //        "it_IT",
+        //        "ja_JP",
+        //        "ko_KO",
+        //        "zh_CN",
+        //        "zh_HK",
+        //};
+    }
+
+    @Override
+    public List<HeartRateCapability.MeasurementInterval> getHeartRateMeasurementIntervals() {
+        return Arrays.asList(
+                HeartRateCapability.MeasurementInterval.OFF,
+                HeartRateCapability.MeasurementInterval.SMART
+        );
+    }
+
+    protected static Prefs getPrefs(final GBDevice device) {
+        return new Prefs(GBApplication.getDeviceSpecificSharedPrefs(device.getAddress()));
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/cmfwatchpro/CmfWatchProSettingsCustomizer.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/cmfwatchpro/CmfWatchProSettingsCustomizer.java
new file mode 100644
index 000000000..c83df700c
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/cmfwatchpro/CmfWatchProSettingsCustomizer.java
@@ -0,0 +1,82 @@
+/*  Copyright (C) 2024 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.cmfwatchpro;
+
+import android.os.Parcel;
+
+import androidx.annotation.NonNull;
+import androidx.preference.Preference;
+
+import java.util.Collections;
+import java.util.Set;
+
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSpecificSettingsCustomizer;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSpecificSettingsHandler;
+import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
+
+public class CmfWatchProSettingsCustomizer implements DeviceSpecificSettingsCustomizer {
+    @Override
+    public void onPreferenceChange(final Preference preference, final DeviceSpecificSettingsHandler handler) {
+    }
+
+    @Override
+    public void customizeSettings(final DeviceSpecificSettingsHandler handler, final Prefs prefs) {
+        final String[] prefsToHide = new String[]{
+                "pref_key_header_heartrate_sleep",
+                DeviceSettingsPreferenceConst.PREF_HEARTRATE_USE_FOR_SLEEP_DETECTION,
+                DeviceSettingsPreferenceConst.PREF_HEARTRATE_SLEEP_BREATHING_QUALITY_MONITORING,
+                DeviceSettingsPreferenceConst.PREF_HEARTRATE_ACTIVITY_MONITORING,
+                DeviceSettingsPreferenceConst.PREF_HEARTRATE_STRESS_RELAXATION_REMINDER,
+                DeviceSettingsPreferenceConst.PREF_INACTIVITY_START,
+                DeviceSettingsPreferenceConst.PREF_INACTIVITY_END,
+        };
+
+        for (final String prefKey : prefsToHide) {
+            final Preference pref = handler.findPreference(prefKey);
+            if (pref != null) {
+                pref.setVisible(false);
+            }
+        }
+    }
+
+    @Override
+    public Set<String> getPreferenceKeysWithSummary() {
+        return Collections.emptySet();
+    }
+
+    public static final Creator<CmfWatchProSettingsCustomizer> CREATOR = new Creator<CmfWatchProSettingsCustomizer>() {
+        @Override
+        public CmfWatchProSettingsCustomizer createFromParcel(final Parcel in) {
+            return new CmfWatchProSettingsCustomizer();
+        }
+
+        @Override
+        public CmfWatchProSettingsCustomizer[] newArray(final int size) {
+            return new CmfWatchProSettingsCustomizer[size];
+        }
+    };
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(@NonNull final Parcel dest, final int flags) {
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/cmfwatchpro/samples/CmfActivitySampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/cmfwatchpro/samples/CmfActivitySampleProvider.java
new file mode 100644
index 000000000..1dec31d0b
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/cmfwatchpro/samples/CmfActivitySampleProvider.java
@@ -0,0 +1,224 @@
+/*  Copyright (C) 2024 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.cmfwatchpro.samples;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.threeten.bp.LocalDate;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import de.greenrobot.dao.AbstractDao;
+import de.greenrobot.dao.Property;
+import nodomain.freeyourgadget.gadgetbridge.devices.AbstractSampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.entities.CmfActivitySample;
+import nodomain.freeyourgadget.gadgetbridge.entities.CmfActivitySampleDao;
+import nodomain.freeyourgadget.gadgetbridge.entities.CmfHeartRateSample;
+import nodomain.freeyourgadget.gadgetbridge.entities.CmfSleepStageSample;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.model.ActivityKind;
+
+public class CmfActivitySampleProvider extends AbstractSampleProvider<CmfActivitySample> {
+    private static final Logger LOG = LoggerFactory.getLogger(CmfActivitySampleProvider.class);
+
+    public CmfActivitySampleProvider(final GBDevice device, final DaoSession session) {
+        super(device, session);
+    }
+
+    @Override
+    public AbstractDao<CmfActivitySample, ?> getSampleDao() {
+        return getSession().getCmfActivitySampleDao();
+    }
+
+    @Nullable
+    @Override
+    protected Property getRawKindSampleProperty() {
+        return CmfActivitySampleDao.Properties.RawKind;
+    }
+
+    @NonNull
+    @Override
+    protected Property getTimestampSampleProperty() {
+        return CmfActivitySampleDao.Properties.Timestamp;
+    }
+
+    @NonNull
+    @Override
+    protected Property getDeviceIdentifierSampleProperty() {
+        return CmfActivitySampleDao.Properties.DeviceId;
+    }
+
+    @Override
+    public int normalizeType(final int rawType) {
+        return rawType;
+    }
+
+    @Override
+    public int toRawActivityKind(final int activityKind) {
+        return activityKind;
+    }
+
+    @Override
+    public float normalizeIntensity(final int rawIntensity) {
+        return rawIntensity / 100f;
+    }
+
+    @Override
+    public CmfActivitySample createActivitySample() {
+        return new CmfActivitySample();
+    }
+
+    @Override
+    protected List<CmfActivitySample> getGBActivitySamples(final int timestamp_from, final int timestamp_to, final int activityType) {
+        LOG.trace(
+                "Getting cmf activity samples for {} between {} and {}",
+                String.format("0x%08x", activityType),
+                timestamp_from,
+                timestamp_to
+        );
+
+        final long nanoStart = System.nanoTime();
+
+        final List<CmfActivitySample> samples = super.getGBActivitySamples(timestamp_from, timestamp_to, activityType);
+
+        if (!samples.isEmpty()) {
+            convertCumulativeSteps(samples);
+        }
+
+        final Map<Integer, CmfActivitySample> sampleByTs = new HashMap<>();
+        for (final CmfActivitySample sample : samples) {
+            sampleByTs.put(sample.getTimestamp(), sample);
+        }
+
+        overlayHeartRate(sampleByTs, timestamp_from, timestamp_to);
+        overlaySleep(sampleByTs, timestamp_from, timestamp_to);
+
+        final List<CmfActivitySample> finalSamples = new ArrayList<>(sampleByTs.values());
+        Collections.sort(finalSamples, (a, b) -> Integer.compare(a.getTimestamp(), b.getTimestamp()));
+
+        final long nanoEnd = System.nanoTime();
+
+        final long executionTime = (nanoEnd - nanoStart) / 1000000;
+
+        LOG.trace("Getting cmf samples took {}ms", executionTime);
+
+        return finalSamples;
+    }
+
+    private void convertCumulativeSteps(final List<CmfActivitySample> samples) {
+        final Calendar cal = Calendar.getInstance();
+
+        // Steps on the Cmf Watch are reported cumulatively per day - convert them to
+        // This slightly breaks activity recognition, because we don't have per-minute granularity...
+        int prevSteps = samples.get(0).getSteps();
+        samples.get(0).setTimestamp((int) (samples.get(0).getTimestamp() / 60) * 60);
+
+        for (int i = 1; i < samples.size(); i++) {
+            final CmfActivitySample s1 = samples.get(i - 1);
+            final CmfActivitySample s2 = samples.get(i);
+            s2.setTimestamp((int) (s2.getTimestamp() / 60) * 60);
+
+            cal.setTimeInMillis(s1.getTimestamp() * 1000L - 1000L);
+            final LocalDate d1 = LocalDate.of(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH) + 1, cal.get(Calendar.DAY_OF_MONTH));
+            cal.setTimeInMillis(s2.getTimestamp() * 1000L - 1000L);
+            final LocalDate d2 = LocalDate.of(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH) + 1, cal.get(Calendar.DAY_OF_MONTH));
+
+            if (d1.equals(d2)) {
+                int bak = s2.getSteps();
+                s2.setSteps(s2.getSteps() - prevSteps);
+                prevSteps = bak;
+            }
+        }
+    }
+
+    private void overlayHeartRate(final Map<Integer, CmfActivitySample> sampleByTs, final int timestamp_from, final int timestamp_to) {
+        final CmfHeartRateSampleProvider heartRateSampleProvider = new CmfHeartRateSampleProvider(getDevice(), getSession());
+        final List<CmfHeartRateSample> hrSamples = heartRateSampleProvider.getAllSamples(timestamp_from * 1000L, timestamp_to * 1000L);
+
+        for (final CmfHeartRateSample hrSample : hrSamples) {
+            // round to the nearest minute, we don't need per-second granularity
+            final int tsSeconds = (int) ((hrSample.getTimestamp() / 1000) / 60) * 60;
+            CmfActivitySample sample = sampleByTs.get(tsSeconds);
+            if (sample == null) {
+                //LOG.debug("Adding dummy sample at {} for hr", tsSeconds);
+                sample = new CmfActivitySample();
+                sample.setTimestamp(tsSeconds);
+                sample.setProvider(this);
+                sampleByTs.put(tsSeconds, sample);
+            }
+
+            sample.setHeartRate(hrSample.getHeartRate());
+        }
+    }
+
+    private void overlaySleep(final Map<Integer, CmfActivitySample> sampleByTs, final int timestamp_from, final int timestamp_to) {
+        final CmfSleepStageSampleProvider sleepStageSampleProvider = new CmfSleepStageSampleProvider(getDevice(), getSession());
+        final List<CmfSleepStageSample> sleepStageSamples = sleepStageSampleProvider.getAllSamples(timestamp_from * 1000L, timestamp_to * 1000L);
+
+        for (final CmfSleepStageSample sleepStageSample : sleepStageSamples) {
+            // round to the nearest minute, we don't need per-second granularity
+            final int tsSeconds = (int) ((sleepStageSample.getTimestamp() / 1000) / 60) * 60;
+            for (int i = tsSeconds; i < tsSeconds + sleepStageSample.getDuration(); i += 60) {
+                CmfActivitySample sample = sampleByTs.get(i);
+                if (sample == null) {
+                    //LOG.debug("Adding dummy sample at {} for sleep", i);
+                    sample = new CmfActivitySample();
+                    sample.setTimestamp(i);
+                    sample.setProvider(this);
+                    sampleByTs.put(i, sample);
+                }
+
+                final int sleepRawKind = sleepStageToActivityKind(sleepStageSample.getStage());
+                sample.setRawKind(sleepRawKind);
+
+                switch (sleepRawKind) {
+                    case ActivityKind.TYPE_DEEP_SLEEP:
+                        sample.setRawIntensity(20);
+                        break;
+                    case ActivityKind.TYPE_LIGHT_SLEEP:
+                        sample.setRawIntensity(30);
+                        break;
+                    case ActivityKind.TYPE_REM_SLEEP:
+                        sample.setRawIntensity(40);
+                        break;
+                }
+            }
+        }
+    }
+
+    final int sleepStageToActivityKind(final int sleepStage) {
+        switch (sleepStage) {
+            case 1:
+                return ActivityKind.TYPE_DEEP_SLEEP;
+            case 2:
+                return ActivityKind.TYPE_LIGHT_SLEEP;
+            case 3:
+                return ActivityKind.TYPE_REM_SLEEP;
+            default:
+                return ActivityKind.TYPE_UNKNOWN;
+        }
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/cmfwatchpro/samples/CmfHeartRateSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/cmfwatchpro/samples/CmfHeartRateSampleProvider.java
new file mode 100644
index 000000000..268e44ddb
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/cmfwatchpro/samples/CmfHeartRateSampleProvider.java
@@ -0,0 +1,56 @@
+/*  Copyright (C) 2024 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.cmfwatchpro.samples;
+
+import androidx.annotation.NonNull;
+
+import de.greenrobot.dao.AbstractDao;
+import de.greenrobot.dao.Property;
+import nodomain.freeyourgadget.gadgetbridge.devices.AbstractTimeSampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.entities.CmfHeartRateSample;
+import nodomain.freeyourgadget.gadgetbridge.entities.CmfHeartRateSampleDao;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+
+public class CmfHeartRateSampleProvider extends AbstractTimeSampleProvider<CmfHeartRateSample> {
+    public CmfHeartRateSampleProvider(final GBDevice device, final DaoSession session) {
+        super(device, session);
+    }
+
+    @NonNull
+    @Override
+    public AbstractDao<CmfHeartRateSample, ?> getSampleDao() {
+        return getSession().getCmfHeartRateSampleDao();
+    }
+
+    @NonNull
+    @Override
+    protected Property getTimestampSampleProperty() {
+        return CmfHeartRateSampleDao.Properties.Timestamp;
+    }
+
+    @NonNull
+    @Override
+    protected Property getDeviceIdentifierSampleProperty() {
+        return CmfHeartRateSampleDao.Properties.DeviceId;
+    }
+
+    @Override
+    public CmfHeartRateSample createSample() {
+        return new CmfHeartRateSample();
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/cmfwatchpro/samples/CmfSleepSessionSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/cmfwatchpro/samples/CmfSleepSessionSampleProvider.java
new file mode 100644
index 000000000..b907137f6
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/cmfwatchpro/samples/CmfSleepSessionSampleProvider.java
@@ -0,0 +1,56 @@
+/*  Copyright (C) 2024 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.cmfwatchpro.samples;
+
+import androidx.annotation.NonNull;
+
+import de.greenrobot.dao.AbstractDao;
+import de.greenrobot.dao.Property;
+import nodomain.freeyourgadget.gadgetbridge.devices.AbstractTimeSampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.entities.CmfSleepSessionSample;
+import nodomain.freeyourgadget.gadgetbridge.entities.CmfSleepSessionSampleDao;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+
+public class CmfSleepSessionSampleProvider extends AbstractTimeSampleProvider<CmfSleepSessionSample> {
+    public CmfSleepSessionSampleProvider(final GBDevice device, final DaoSession session) {
+        super(device, session);
+    }
+
+    @NonNull
+    @Override
+    public AbstractDao<CmfSleepSessionSample, ?> getSampleDao() {
+        return getSession().getCmfSleepSessionSampleDao();
+    }
+
+    @NonNull
+    @Override
+    protected Property getTimestampSampleProperty() {
+        return CmfSleepSessionSampleDao.Properties.Timestamp;
+    }
+
+    @NonNull
+    @Override
+    protected Property getDeviceIdentifierSampleProperty() {
+        return CmfSleepSessionSampleDao.Properties.DeviceId;
+    }
+
+    @Override
+    public CmfSleepSessionSample createSample() {
+        return new CmfSleepSessionSample();
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/cmfwatchpro/samples/CmfSleepStageSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/cmfwatchpro/samples/CmfSleepStageSampleProvider.java
new file mode 100644
index 000000000..c78a1b519
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/cmfwatchpro/samples/CmfSleepStageSampleProvider.java
@@ -0,0 +1,56 @@
+/*  Copyright (C) 2024 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.cmfwatchpro.samples;
+
+import androidx.annotation.NonNull;
+
+import de.greenrobot.dao.AbstractDao;
+import de.greenrobot.dao.Property;
+import nodomain.freeyourgadget.gadgetbridge.devices.AbstractTimeSampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.entities.CmfSleepStageSample;
+import nodomain.freeyourgadget.gadgetbridge.entities.CmfSleepStageSampleDao;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+
+public class CmfSleepStageSampleProvider extends AbstractTimeSampleProvider<CmfSleepStageSample> {
+    public CmfSleepStageSampleProvider(final GBDevice device, final DaoSession session) {
+        super(device, session);
+    }
+
+    @NonNull
+    @Override
+    public AbstractDao<CmfSleepStageSample, ?> getSampleDao() {
+        return getSession().getCmfSleepStageSampleDao();
+    }
+
+    @NonNull
+    @Override
+    protected Property getTimestampSampleProperty() {
+        return CmfSleepStageSampleDao.Properties.Timestamp;
+    }
+
+    @NonNull
+    @Override
+    protected Property getDeviceIdentifierSampleProperty() {
+        return CmfSleepStageSampleDao.Properties.DeviceId;
+    }
+
+    @Override
+    public CmfSleepStageSample createSample() {
+        return new CmfSleepStageSample();
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/cmfwatchpro/samples/CmfSpo2SampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/cmfwatchpro/samples/CmfSpo2SampleProvider.java
new file mode 100644
index 000000000..860c50eef
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/cmfwatchpro/samples/CmfSpo2SampleProvider.java
@@ -0,0 +1,56 @@
+/*  Copyright (C) 2024 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.cmfwatchpro.samples;
+
+import androidx.annotation.NonNull;
+
+import de.greenrobot.dao.AbstractDao;
+import de.greenrobot.dao.Property;
+import nodomain.freeyourgadget.gadgetbridge.devices.AbstractTimeSampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.entities.CmfSpo2Sample;
+import nodomain.freeyourgadget.gadgetbridge.entities.CmfSpo2SampleDao;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+
+public class CmfSpo2SampleProvider extends AbstractTimeSampleProvider<CmfSpo2Sample> {
+    public CmfSpo2SampleProvider(final GBDevice device, final DaoSession session) {
+        super(device, session);
+    }
+
+    @NonNull
+    @Override
+    public AbstractDao<CmfSpo2Sample, ?> getSampleDao() {
+        return getSession().getCmfSpo2SampleDao();
+    }
+
+    @NonNull
+    @Override
+    protected Property getTimestampSampleProperty() {
+        return CmfSpo2SampleDao.Properties.Timestamp;
+    }
+
+    @NonNull
+    @Override
+    protected Property getDeviceIdentifierSampleProperty() {
+        return CmfSpo2SampleDao.Properties.DeviceId;
+    }
+
+    @Override
+    public CmfSpo2Sample createSample() {
+        return new CmfSpo2Sample();
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/cmfwatchpro/samples/CmfStressSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/cmfwatchpro/samples/CmfStressSampleProvider.java
new file mode 100644
index 000000000..3e1a94a20
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/cmfwatchpro/samples/CmfStressSampleProvider.java
@@ -0,0 +1,56 @@
+/*  Copyright (C) 2024 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.cmfwatchpro.samples;
+
+import androidx.annotation.NonNull;
+
+import de.greenrobot.dao.AbstractDao;
+import de.greenrobot.dao.Property;
+import nodomain.freeyourgadget.gadgetbridge.devices.AbstractTimeSampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.entities.CmfStressSample;
+import nodomain.freeyourgadget.gadgetbridge.entities.CmfStressSampleDao;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+
+public class CmfStressSampleProvider extends AbstractTimeSampleProvider<CmfStressSample> {
+    public CmfStressSampleProvider(final GBDevice device, final DaoSession session) {
+        super(device, session);
+    }
+
+    @NonNull
+    @Override
+    public AbstractDao<CmfStressSample, ?> getSampleDao() {
+        return getSession().getCmfStressSampleDao();
+    }
+
+    @NonNull
+    @Override
+    protected Property getTimestampSampleProperty() {
+        return CmfStressSampleDao.Properties.Timestamp;
+    }
+
+    @NonNull
+    @Override
+    protected Property getDeviceIdentifierSampleProperty() {
+        return CmfStressSampleDao.Properties.DeviceId;
+    }
+
+    @Override
+    public CmfStressSample createSample() {
+        return new CmfStressSample();
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/cmfwatchpro/samples/CmfWorkoutGpsSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/cmfwatchpro/samples/CmfWorkoutGpsSampleProvider.java
new file mode 100644
index 000000000..680906e51
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/cmfwatchpro/samples/CmfWorkoutGpsSampleProvider.java
@@ -0,0 +1,56 @@
+/*  Copyright (C) 2024 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.cmfwatchpro.samples;
+
+import androidx.annotation.NonNull;
+
+import de.greenrobot.dao.AbstractDao;
+import de.greenrobot.dao.Property;
+import nodomain.freeyourgadget.gadgetbridge.devices.AbstractTimeSampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.entities.CmfWorkoutGpsSample;
+import nodomain.freeyourgadget.gadgetbridge.entities.CmfWorkoutGpsSampleDao;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+
+public class CmfWorkoutGpsSampleProvider extends AbstractTimeSampleProvider<CmfWorkoutGpsSample> {
+    public CmfWorkoutGpsSampleProvider(final GBDevice device, final DaoSession session) {
+        super(device, session);
+    }
+
+    @NonNull
+    @Override
+    public AbstractDao<CmfWorkoutGpsSample, ?> getSampleDao() {
+        return getSession().getCmfWorkoutGpsSampleDao();
+    }
+
+    @NonNull
+    @Override
+    protected Property getTimestampSampleProperty() {
+        return CmfWorkoutGpsSampleDao.Properties.Timestamp;
+    }
+
+    @NonNull
+    @Override
+    protected Property getDeviceIdentifierSampleProperty() {
+        return CmfWorkoutGpsSampleDao.Properties.DeviceId;
+    }
+
+    @Override
+    public CmfWorkoutGpsSample createSample() {
+        return new CmfWorkoutGpsSample();
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/cmfwatchpro/workout/CmfWorkoutSummaryParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/cmfwatchpro/workout/CmfWorkoutSummaryParser.java
new file mode 100644
index 000000000..ae4ff6e0a
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/cmfwatchpro/workout/CmfWorkoutSummaryParser.java
@@ -0,0 +1,95 @@
+/*  Copyright (C) 2024 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.cmfwatchpro.workout;
+
+import static nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries.ACTIVE_SECONDS;
+import static nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries.UNIT_SECONDS;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.Date;
+
+import nodomain.freeyourgadget.gadgetbridge.entities.BaseActivitySummary;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.model.ActivityKind;
+import nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryParser;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.cmfwatchpro.CmfActivityType;
+
+public class CmfWorkoutSummaryParser implements ActivitySummaryParser {
+    private final GBDevice gbDevice;
+
+    public CmfWorkoutSummaryParser(final GBDevice device) {
+        this.gbDevice = device;
+    }
+
+    @Override
+    public BaseActivitySummary parseBinaryData(final BaseActivitySummary summary) {
+        final JSONObject summaryData = new JSONObject();
+
+        final ByteBuffer buf = ByteBuffer.wrap(summary.getRawSummaryData()).order(ByteOrder.LITTLE_ENDIAN);
+
+        final int startTime = buf.getInt();
+        final int duration = buf.getShort();
+        final byte workoutType = buf.get();
+
+        buf.get(new byte[19]); // ?
+        final int endTime = buf.getInt();
+        final boolean gps = buf.get() == 1;
+        buf.get(); // ?
+
+        summary.setStartTime(new Date(startTime * 1000L));
+        summary.setEndTime(new Date(endTime * 1000L));
+
+        final CmfActivityType cmfActivityType = CmfActivityType.fromCode(workoutType);
+        if (cmfActivityType != null) {
+            summary.setActivityKind(cmfActivityType.getActivityKind());
+        } else {
+            summary.setActivityKind(ActivityKind.TYPE_UNKNOWN);
+        }
+
+        addSummaryData(summaryData, ACTIVE_SECONDS, duration, UNIT_SECONDS);
+
+        return summary;
+    }
+
+    protected void addSummaryData(final JSONObject summaryData, final String key, final float value, final String unit) {
+        if (value > 0) {
+            try {
+                final JSONObject innerData = new JSONObject();
+                innerData.put("value", value);
+                innerData.put("unit", unit);
+                summaryData.put(key, innerData);
+            } catch (final JSONException ignore) {
+            }
+        }
+    }
+
+    protected void addSummaryData(final JSONObject summaryData, final String key, final String value) {
+        if (key != null && !key.equals("") && value != null && !value.equals("")) {
+            try {
+                final JSONObject innerData = new JSONObject();
+                innerData.put("value", value);
+                innerData.put("unit", "string");
+                summaryData.put(key, innerData);
+            } catch (final JSONException ignore) {
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiSettingsCustomizer.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiSettingsCustomizer.java
index d992b5a79..57015cfd4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiSettingsCustomizer.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiSettingsCustomizer.java
@@ -28,6 +28,7 @@ import java.util.Locale;
 import java.util.Set;
 
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
 import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSpecificSettingsCustomizer;
 import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSpecificSettingsHandler;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
@@ -51,6 +52,11 @@ public class HuamiSettingsCustomizer implements DeviceSpecificSettingsCustomizer
 
     @Override
     public void customizeSettings(final DeviceSpecificSettingsHandler handler, final Prefs prefs) {
+        final Preference hrAlertActivePref = handler.findPreference(DeviceSettingsPreferenceConst.PREF_HEARTRATE_ALERT_ACTIVE_HIGH_THRESHOLD);
+        if (hrAlertActivePref != null) {
+            hrAlertActivePref.setVisible(false);
+        }
+
         // Setup the vibration patterns for all supported notification types
         for (HuamiVibrationPatternNotificationType notificationType : HuamiVibrationPatternNotificationType.values()) {
             final String typeKey = notificationType.name().toLowerCase(Locale.ROOT);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiBRCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiBRCoordinator.java
index 41c18384b..228645812 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiBRCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiBRCoordinator.java
@@ -126,6 +126,11 @@ public abstract class HuaweiBRCoordinator extends AbstractBLClassicDeviceCoordin
         return false;
     }
 
+    @Override
+    public boolean supportsAlarmTitle(GBDevice device) {
+        return true;
+    }
+
     @Override
     public boolean supportsAlarmDescription(GBDevice device) {
         // TODO: only name is supported
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiLECoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiLECoordinator.java
index bd404efae..45421af7a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiLECoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiLECoordinator.java
@@ -126,6 +126,11 @@ public abstract class HuaweiLECoordinator extends AbstractBLEDeviceCoordinator i
         return false;
     }
 
+    @Override
+    public boolean supportsAlarmTitle(GBDevice device) {
+        return true;
+    }
+
     @Override
     public boolean supportsAlarmDescription(GBDevice device) {
         // TODO: only name is supported
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSpo2SampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSpo2SampleProvider.java
index d383e1fce..a6a5d091f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSpo2SampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSpo2SampleProvider.java
@@ -180,11 +180,6 @@ public class HuaweiSpo2SampleProvider extends AbstractTimeSampleProvider<HuaweiS
             return typeNum;
         }
 
-        @Override
-        public void setTypeNum(int num) {
-            this.typeNum = num;
-        }
-
         @Override
         public void setTimestamp(long timestamp) {
             this.timestamp = timestamp;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridCoordinator.java
index 26b7ca962..8f949b410 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridCoordinator.java
@@ -156,6 +156,11 @@ public class QHybridCoordinator extends AbstractBLEDeviceCoordinator {
         return 0;
     }
 
+    @Override
+    public boolean supportsAlarmTitle(GBDevice device) {
+        return isHybridHR();
+    }
+
     @Override
     public boolean supportsAlarmDescription(GBDevice device) {
         return isHybridHR();
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/withingssteelhr/WithingsSteelHRDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/withingssteelhr/WithingsSteelHRDeviceCoordinator.java
index fba30050a..bb6209b6e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/withingssteelhr/WithingsSteelHRDeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/withingssteelhr/WithingsSteelHRDeviceCoordinator.java
@@ -120,6 +120,11 @@ public class WithingsSteelHRDeviceCoordinator extends AbstractDeviceCoordinator
         return 3;
     }
 
+    @Override
+    public boolean supportsAlarmTitle(GBDevice device) {
+        return true;
+    }
+
     @Override
     public boolean supportsAlarmDescription(GBDevice device) {
         return true;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSettingsCustomizer.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSettingsCustomizer.java
index ef9bf3e70..83b63542d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSettingsCustomizer.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSettingsCustomizer.java
@@ -45,6 +45,11 @@ public class XiaomiSettingsCustomizer implements DeviceSpecificSettingsCustomize
             activityMonitoringPref.setVisible(false);
         }
 
+        final Preference hrAlertActivePref = handler.findPreference(DeviceSettingsPreferenceConst.PREF_HEARTRATE_ALERT_ACTIVE_HIGH_THRESHOLD);
+        if (hrAlertActivePref != null) {
+            hrAlertActivePref.setVisible(false);
+        }
+
         populateOrHideListPreference(HuamiConst.PREF_DISPLAY_ITEMS_SORTABLE, handler, prefs);
 
         hidePrefIfNoneVisible(handler, DeviceSettingsPreferenceConst.PREF_HEADER_DISPLAY, Arrays.asList(
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractSpo2Sample.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractSpo2Sample.java
index 9071f2c37..9bae4ebe6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractSpo2Sample.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractSpo2Sample.java
@@ -22,18 +22,15 @@ import nodomain.freeyourgadget.gadgetbridge.model.Spo2Sample;
 import nodomain.freeyourgadget.gadgetbridge.util.DateTimeUtils;
 
 public abstract class AbstractSpo2Sample extends AbstractTimeSample implements Spo2Sample {
-    public abstract int getTypeNum();
-    public abstract void setTypeNum(int num);
+    public int getTypeNum() {
+        return Spo2Sample.Type.UNKNOWN.getNum();
+    }
 
     @Override
     public Type getType() {
         return Type.fromNum(getTypeNum());
     }
 
-    public void setType(final Type type) {
-        setTypeNum(type.getNum());
-    }
-
     @NonNull
     @Override
     public String toString() {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractStressSample.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractStressSample.java
index dc1c6aaf6..e2df694b2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractStressSample.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/entities/AbstractStressSample.java
@@ -22,18 +22,15 @@ import nodomain.freeyourgadget.gadgetbridge.model.StressSample;
 import nodomain.freeyourgadget.gadgetbridge.util.DateTimeUtils;
 
 public abstract class AbstractStressSample extends AbstractTimeSample implements StressSample {
-    public abstract int getTypeNum();
-    public abstract void setTypeNum(int num);
+    public int getTypeNum() {
+        return Type.UNKNOWN.getNum();
+    }
 
     @Override
     public Type getType() {
         return Type.fromNum(getTypeNum());
     }
 
-    public void setType(final Type type) {
-        setTypeNum(type.getNum());
-    }
-
     @NonNull
     @Override
     public String toString() {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
index c2f5be716..c425a4f57 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
@@ -36,6 +36,7 @@ import nodomain.freeyourgadget.gadgetbridge.devices.casio.gb6900.CasioGB6900Devi
 import nodomain.freeyourgadget.gadgetbridge.devices.casio.gbx100.CasioGBX100DeviceCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.casio.gwb5600.CasioGMWB5000DeviceCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.casio.gwb5600.CasioGWB5600DeviceCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.cmfwatchpro.CmfWatchProCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.divoom.PixooCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.domyos.DomyosT540Coordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.femometer.FemometerVinca2DeviceCoordinator;
@@ -313,6 +314,7 @@ public enum DeviceType {
     NOTHING_EAR1(Ear1Coordinator.class),
     NOTHING_EAR2(Ear2Coordinator.class),
     NOTHING_EAR_STICK(EarStickCoordinator.class),
+    NOTHING_CMF_WATCH_PRO(CmfWatchProCoordinator.class),
     GALAXY_BUDS_PRO(GalaxyBudsProDeviceCoordinator.class),
     GALAXY_BUDS_LIVE(GalaxyBudsLiveDeviceCoordinator.class),
     GALAXY_BUDS(GalaxyBudsDeviceCoordinator.class),
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BleNamesResolver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BleNamesResolver.java
index 98f7164c6..e44e03e31 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BleNamesResolver.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BleNamesResolver.java
@@ -108,7 +108,9 @@ public class BleNamesResolver {
 		mServices.put("16187f00-0000-1000-8000-00807f9b34fb", "(Propr: Xiaomi Wear Service - Mi Smart Watch 4C/Redmi Band)");
 		mServices.put("1314f000-1000-9000-7000-301291e21220", "(Propr: Xiaomi Wear Service - Mi Watch/Mi Watch Color/Mi Watch Color Sport)");
 		mServices.put("7495fe00-a7f3-424b-92dd-4a006a3aef56", "(Propr: Xiaomi Wear Service - Mi Watch CN)");
-		
+		//mServices.put("0000fff0-0000-1000-8000-00805f9b34fb", "(Propr: Nothing CMF Command");
+		//mServices.put("02f00000-0000-0000-0000-00000000ffe0", "(Propr: Nothing CMF Data");
+
 		mCharacteristics.put("00002a43-0000-1000-8000-00805f9b34fb", "Alert AlertCategory ID");
 		mCharacteristics.put("00002a42-0000-1000-8000-00805f9b34fb", "Alert AlertCategory ID Bit Mask");
 		mCharacteristics.put("00002a06-0000-1000-8000-00805f9b34fb", "Alert Level");
@@ -193,6 +195,11 @@ public class BleNamesResolver {
 		
 		mCharacteristics.put("14702856-620a-3973-7c78-9cfff0876abd", "(Propr: HPLUS Control)");
 		mCharacteristics.put("14702853-620a-3973-7c78-9cfff0876abd", "(Propr: HPLUS Measurements)");
+		//mCharacteristics.put("0000fff1-0000-1000-8000-00805f9b34fb", "(Propr: Nothing CMF Command Read");
+		//mCharacteristics.put("0000fff2-0000-1000-8000-00805f9b34fb", "(Propr: Nothing CMF Command Write");
+		//mCharacteristics.put("02f00000-0000-0000-0000-00000000ffe1", "(Propr: Nothing CMF Data Write");
+		//mCharacteristics.put("02f00000-0000-0000-0000-00000000ffe2", "(Propr: Nothing CMF Data Read");
+
 		mValueFormats.put(Integer.valueOf(52), "32bit float");
 		mValueFormats.put(Integer.valueOf(50), "16bit float");
 		mValueFormats.put(Integer.valueOf(34), "16bit signed int");
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/cmfwatchpro/CmfActivitySync.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/cmfwatchpro/CmfActivitySync.java
new file mode 100644
index 000000000..577cddcec
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/cmfwatchpro/CmfActivitySync.java
@@ -0,0 +1,663 @@
+/*  Copyright (C) 2024 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.cmfwatchpro;
+
+import android.content.Context;
+import android.widget.Toast;
+
+import androidx.annotation.Nullable;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+
+import de.greenrobot.dao.query.QueryBuilder;
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.database.DBHandler;
+import nodomain.freeyourgadget.gadgetbridge.database.DBHelper;
+import nodomain.freeyourgadget.gadgetbridge.devices.cmfwatchpro.samples.CmfActivitySampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.devices.cmfwatchpro.samples.CmfHeartRateSampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.devices.cmfwatchpro.samples.CmfSleepSessionSampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.devices.cmfwatchpro.samples.CmfSleepStageSampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.devices.cmfwatchpro.samples.CmfSpo2SampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.devices.cmfwatchpro.samples.CmfStressSampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.devices.cmfwatchpro.samples.CmfWorkoutGpsSampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.devices.cmfwatchpro.workout.CmfWorkoutSummaryParser;
+import nodomain.freeyourgadget.gadgetbridge.entities.BaseActivitySummary;
+import nodomain.freeyourgadget.gadgetbridge.entities.BaseActivitySummaryDao;
+import nodomain.freeyourgadget.gadgetbridge.entities.CmfActivitySample;
+import nodomain.freeyourgadget.gadgetbridge.entities.CmfHeartRateSample;
+import nodomain.freeyourgadget.gadgetbridge.entities.CmfSleepSessionSample;
+import nodomain.freeyourgadget.gadgetbridge.entities.CmfSleepStageSample;
+import nodomain.freeyourgadget.gadgetbridge.entities.CmfSpo2Sample;
+import nodomain.freeyourgadget.gadgetbridge.entities.CmfStressSample;
+import nodomain.freeyourgadget.gadgetbridge.entities.CmfWorkoutGpsSample;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.entities.Device;
+import nodomain.freeyourgadget.gadgetbridge.entities.User;
+import nodomain.freeyourgadget.gadgetbridge.export.ActivityTrackExporter;
+import nodomain.freeyourgadget.gadgetbridge.export.GPXExporter;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.model.ActivityKind;
+import nodomain.freeyourgadget.gadgetbridge.model.ActivityPoint;
+import nodomain.freeyourgadget.gadgetbridge.model.ActivityTrack;
+import nodomain.freeyourgadget.gadgetbridge.model.GPSCoordinate;
+import nodomain.freeyourgadget.gadgetbridge.util.DateTimeUtils;
+import nodomain.freeyourgadget.gadgetbridge.util.FileUtils;
+import nodomain.freeyourgadget.gadgetbridge.util.GB;
+
+public class CmfActivitySync {
+    private static final Logger LOG = LoggerFactory.getLogger(CmfActivitySync.class);
+
+    private final CmfWatchProSupport mSupport;
+
+    private final List<BaseActivitySummary> activitiesWithGps = new ArrayList<>();
+
+    protected CmfActivitySync(final CmfWatchProSupport support) {
+        this.mSupport = support;
+    }
+
+    protected boolean onCommand(final CmfCommand cmd, final byte[] payload) {
+        switch (cmd) {
+            case ACTIVITY_FETCH_ACK_1:
+                handleActivityFetchAck1(payload);
+                return true;
+            case ACTIVITY_FETCH_ACK_2:
+                handleActivityFetchAck2(payload);
+                return true;
+            case ACTIVITY_DATA:
+                handleActivityData(payload);
+                return true;
+            case HEART_RATE_MANUAL_AUTO:
+            case HEART_RATE_WORKOUT:
+                handleHeartRate(payload);
+                return true;
+            case HEART_RATE_RESTING:
+                handleHeartRateResting(payload);
+                return true;
+            case SLEEP_DATA:
+                handleSleepData(payload);
+                return true;
+            case STRESS:
+                handleStress(payload);
+                return true;
+            case SPO2:
+                handleSpo2(payload);
+                return true;
+            case WORKOUT_SUMMARY:
+                handleWorkoutSummary(payload);
+                return true;
+            case WORKOUT_GPS:
+                handleWorkoutGps(payload);
+                return true;
+        }
+
+        return false;
+    }
+
+    private void handleActivityFetchAck1(final byte[] payload) {
+        switch (payload[0]) {
+            case 0x01:
+                LOG.debug("Got activity fetch ack 1, starting step 2");
+                GB.updateTransferNotification(getContext().getString(R.string.busy_task_fetch_activity_data), "", true, 0, getContext());
+                getDevice().setBusyTask(getContext().getString(R.string.busy_task_fetch_activity_data));
+                mSupport.sendCommand("fetch recorded data step 2", CmfCommand.ACTIVITY_FETCH_2, CmfWatchProSupport.A5);
+                break;
+            case 0x02:
+                LOG.debug("Got activity fetch finish");
+                // Process activities with GPS before unsetting device as busy
+                processActivitiesWithGps();
+                break;
+            default:
+                LOG.warn("Unknown activity fetch ack code {}", payload[0]);
+                return;
+        }
+
+        getDevice().sendDeviceUpdateIntent(getContext());
+    }
+
+    private static void handleActivityFetchAck2(final byte[] payload) {
+        final ByteBuffer buf = ByteBuffer.wrap(payload).order(ByteOrder.LITTLE_ENDIAN);
+
+        final int activityTs = buf.getInt();
+        final byte[] activityFlags = new byte[4]; // TODO what do they mean?
+        buf.order(ByteOrder.BIG_ENDIAN).get(activityFlags);
+        LOG.debug("Getting activity since {}, flags={}", activityTs, GB.hexdump(activityFlags));
+    }
+
+    private void handleActivityData(final byte[] payload) {
+        if (payload.length % 32 != 0) {
+            LOG.error("Activity data payload size {} not divisible by 32", payload.length);
+            return;
+        }
+
+        LOG.debug("Got {} activity samples", payload.length / 32);
+
+        final ByteBuffer buf = ByteBuffer.wrap(payload).order(ByteOrder.LITTLE_ENDIAN);
+
+        final List<CmfActivitySample> samples = new ArrayList<>();
+
+        while (buf.remaining() > 0) {
+            final CmfActivitySample sample = new CmfActivitySample();
+            sample.setTimestamp(buf.getInt());
+            sample.setSteps(buf.getInt());
+            sample.setDistance(buf.getInt());
+            sample.setCalories(buf.getInt());
+
+            final byte[] unk = new byte[16];
+            buf.get(unk);
+
+            samples.add(sample);
+        }
+
+        try (DBHandler handler = GBApplication.acquireDB()) {
+            final DaoSession session = handler.getDaoSession();
+
+            final Device device = DBHelper.getDevice(getDevice(), session);
+            final User user = DBHelper.getUser(session);
+
+            final CmfActivitySampleProvider sampleProvider = new CmfActivitySampleProvider(getDevice(), session);
+
+            for (final CmfActivitySample sample : samples) {
+                sample.setDevice(device);
+                sample.setUser(user);
+                sample.setProvider(sampleProvider);
+            }
+
+            LOG.debug("Will persist {} activity samples", samples.size());
+            sampleProvider.addGBActivitySamples(samples.toArray(new CmfActivitySample[0]));
+        } catch (final Exception e) {
+            GB.toast(getContext(), "Error saving activity samples", Toast.LENGTH_LONG, GB.ERROR, e);
+        }
+    }
+
+    private void handleHeartRate(final byte[] payload) {
+        if (payload.length % 8 != 0) {
+            LOG.error("Heart rate payload size {} not divisible by 8", payload.length);
+            return;
+        }
+
+        LOG.debug("Got {} heart rate samples", payload.length / 8);
+
+        final ByteBuffer buf = ByteBuffer.wrap(payload).order(ByteOrder.LITTLE_ENDIAN);
+
+        final List<CmfHeartRateSample> samples = new ArrayList<>();
+
+        while (buf.remaining() > 0) {
+            final CmfHeartRateSample sample = new CmfHeartRateSample();
+            sample.setTimestamp(buf.getInt() * 1000L);
+            sample.setHeartRate(buf.getInt());
+
+            samples.add(sample);
+        }
+
+        try (DBHandler handler = GBApplication.acquireDB()) {
+            final DaoSession session = handler.getDaoSession();
+
+            final Device device = DBHelper.getDevice(getDevice(), session);
+            final User user = DBHelper.getUser(session);
+
+            final CmfHeartRateSampleProvider sampleProvider = new CmfHeartRateSampleProvider(getDevice(), session);
+
+            for (final CmfHeartRateSample sample : samples) {
+                sample.setDevice(device);
+                sample.setUser(user);
+            }
+
+            LOG.debug("Will persist {} heart rate samples", samples.size());
+            sampleProvider.addSamples(samples);
+        } catch (final Exception e) {
+            GB.toast(getContext(), "Error saving heart rate samples", Toast.LENGTH_LONG, GB.ERROR, e);
+        }
+    }
+
+    private static void handleHeartRateResting(final byte[] payload) {
+        // TODO persist resting HR samples;
+        LOG.warn("Persisting resting HR samples is not implemented");
+    }
+
+    private void handleSleepData(final byte[] payload) {
+        final ByteBuffer buf = ByteBuffer.wrap(payload).order(ByteOrder.LITTLE_ENDIAN);
+
+        LOG.debug("Got sleep data samples");
+
+        final int sessionTimestamp = buf.getInt();
+        final int wakeupTime = buf.getInt();
+        final byte[] metadata = new byte[10];
+        buf.get(metadata);
+
+        final CmfSleepSessionSample sessionSample = new CmfSleepSessionSample();
+        sessionSample.setTimestamp(sessionTimestamp * 1000L);
+        sessionSample.setWakeupTime(wakeupTime * 1000L);
+        sessionSample.setMetadata(metadata);
+
+        final List<CmfSleepStageSample> stageSamples = new ArrayList<>();
+
+        while (buf.remaining() > 0) {
+            final CmfSleepStageSample sample = new CmfSleepStageSample();
+            sample.setTimestamp(buf.getInt() * 1000L);
+            sample.setDuration(buf.getShort());
+            sample.setStage(buf.getShort());
+            stageSamples.add(sample);
+        }
+
+        try (DBHandler handler = GBApplication.acquireDB()) {
+            final DaoSession session = handler.getDaoSession();
+
+            final Device device = DBHelper.getDevice(getDevice(), session);
+            final User user = DBHelper.getUser(session);
+
+            final CmfSleepSessionSampleProvider sampleProvider = new CmfSleepSessionSampleProvider(getDevice(), session);
+
+            sessionSample.setDevice(device);
+            sessionSample.setUser(user);
+
+            LOG.debug("Will persist 1 sleep session sample from {} to {}", sessionSample.getTimestamp(), sessionSample.getWakeupTime());
+            sampleProvider.addSample(sessionSample);
+        } catch (final Exception e) {
+            GB.toast(getContext(), "Error saving sleep session sample", Toast.LENGTH_LONG, GB.ERROR, e);
+        }
+
+        try (DBHandler handler = GBApplication.acquireDB()) {
+            final DaoSession session = handler.getDaoSession();
+
+            final Device device = DBHelper.getDevice(getDevice(), session);
+            final User user = DBHelper.getUser(session);
+
+            final CmfSleepStageSampleProvider sampleProvider = new CmfSleepStageSampleProvider(getDevice(), session);
+
+            for (final CmfSleepStageSample sample : stageSamples) {
+                sample.setDevice(device);
+                sample.setUser(user);
+            }
+
+            LOG.debug("Will persist {} sleep stage samples", stageSamples.size());
+            sampleProvider.addSamples(stageSamples);
+        } catch (final Exception e) {
+            GB.toast(getContext(), "Error saving sleep samples", Toast.LENGTH_LONG, GB.ERROR, e);
+        }
+    }
+
+    private void handleStress(final byte[] payload) {
+        if (payload.length % 8 != 0) {
+            LOG.error("Stress payload size {} not divisible by 8", payload.length);
+            return;
+        }
+
+        LOG.debug("Got {} stress samples", payload.length / 8);
+
+        final ByteBuffer buf = ByteBuffer.wrap(payload).order(ByteOrder.LITTLE_ENDIAN);
+
+        final List<CmfStressSample> samples = new ArrayList<>();
+
+        while (buf.remaining() > 0) {
+            final CmfStressSample sample = new CmfStressSample();
+            sample.setTimestamp(buf.getInt() * 1000L);
+            sample.setStress(buf.getInt());
+
+            samples.add(sample);
+        }
+
+        try (DBHandler handler = GBApplication.acquireDB()) {
+            final DaoSession session = handler.getDaoSession();
+
+            final Device device = DBHelper.getDevice(getDevice(), session);
+            final User user = DBHelper.getUser(session);
+
+            final CmfStressSampleProvider sampleProvider = new CmfStressSampleProvider(getDevice(), session);
+
+            for (final CmfStressSample sample : samples) {
+                sample.setDevice(device);
+                sample.setUser(user);
+            }
+
+            LOG.debug("Will persist {} stress samples", samples.size());
+            sampleProvider.addSamples(samples);
+        } catch (final Exception e) {
+            GB.toast(getContext(), "Error saving stress samples", Toast.LENGTH_LONG, GB.ERROR, e);
+        }
+    }
+
+    private void handleSpo2(final byte[] payload) {
+        if (payload.length % 8 != 0) {
+            LOG.error("Spo2 payload size {} not divisible by 8", payload.length);
+            return;
+        }
+
+        LOG.debug("Got {} spo2 samples", payload.length / 8);
+
+        final ByteBuffer buf = ByteBuffer.wrap(payload).order(ByteOrder.LITTLE_ENDIAN);
+
+        final List<CmfSpo2Sample> samples = new ArrayList<>();
+
+        while (buf.remaining() > 0) {
+            final CmfSpo2Sample sample = new CmfSpo2Sample();
+            sample.setTimestamp(buf.getInt() * 1000L);
+            sample.setSpo2(buf.getInt());
+
+            samples.add(sample);
+        }
+
+        try (DBHandler handler = GBApplication.acquireDB()) {
+            final DaoSession session = handler.getDaoSession();
+
+            final Device device = DBHelper.getDevice(getDevice(), session);
+            final User user = DBHelper.getUser(session);
+
+            final CmfSpo2SampleProvider sampleProvider = new CmfSpo2SampleProvider(getDevice(), session);
+
+            for (final CmfSpo2Sample sample : samples) {
+                sample.setDevice(device);
+                sample.setUser(user);
+            }
+
+            LOG.debug("Will persist {} spo2 samples", samples.size());
+            sampleProvider.addSamples(samples);
+        } catch (final Exception e) {
+            GB.toast(getContext(), "Error saving spo2 samples", Toast.LENGTH_LONG, GB.ERROR, e);
+        }
+    }
+
+    private void handleWorkoutSummary(final byte[] payload) {
+        if (payload.length % 32 != 0) {
+            LOG.error("Workout summary payload size {} not divisible by 32", payload.length);
+            return;
+        }
+
+        LOG.debug("Got {} workout summary samples", payload.length / 32);
+
+        final ByteBuffer buf = ByteBuffer.wrap(payload).order(ByteOrder.LITTLE_ENDIAN);
+
+        final CmfWorkoutSummaryParser summaryParser = new CmfWorkoutSummaryParser(getDevice());
+
+        while (buf.remaining() > 0) {
+            final byte[] summaryBytes = new byte[32];
+            buf.get(summaryBytes);
+
+            BaseActivitySummary summary = new BaseActivitySummary();
+            summary.setRawSummaryData(summaryBytes);
+            summary.setActivityKind(ActivityKind.TYPE_UNKNOWN);
+
+            try {
+                summary = summaryParser.parseBinaryData(summary);
+            } catch (final Exception e) {
+                LOG.error("Failed to parse workout summary", e);
+                GB.toast(getContext(), "Failed to parse workout summary", Toast.LENGTH_LONG, GB.ERROR, e);
+                return;
+            }
+
+            if (summary == null) {
+                LOG.error("Workout summary is null");
+                return;
+            }
+
+            summary.setSummaryData(null); // remove json before saving to database
+
+            try (DBHandler dbHandler = GBApplication.acquireDB()) {
+                final DaoSession session = dbHandler.getDaoSession();
+                final Device device = DBHelper.getDevice(getDevice(), session);
+                final User user = DBHelper.getUser(session);
+
+                summary.setDevice(device);
+                summary.setUser(user);
+
+                LOG.debug("Persisting workout summary for {}", summary.getStartTime());
+
+                session.getBaseActivitySummaryDao().insertOrReplace(summary);
+            } catch (final Exception e) {
+                GB.toast(getContext(), "Error saving activity summary", Toast.LENGTH_LONG, GB.ERROR, e);
+                return;
+            }
+
+            // Previous to last byte indicates if it has gps
+            if (summaryBytes[summaryBytes.length - 2] == 1) {
+                activitiesWithGps.add(summary);
+            }
+        }
+    }
+
+    private void handleWorkoutGps(final byte[] payload) {
+        if (payload.length % 12 != 0) {
+            LOG.error("Workout gps payload size {} not divisible by 12", payload.length);
+            return;
+        }
+
+        LOG.debug("Got {} workout gps samples", payload.length / 12);
+
+        final ByteBuffer buf = ByteBuffer.wrap(payload).order(ByteOrder.LITTLE_ENDIAN);
+
+        final List<CmfWorkoutGpsSample> samples = new ArrayList<>();
+
+        while (buf.remaining() > 0) {
+            final CmfWorkoutGpsSample sample = new CmfWorkoutGpsSample();
+            sample.setTimestamp(buf.getInt() * 1000L);
+            sample.setLongitude(buf.getInt());
+            sample.setLatitude(buf.getInt());
+
+            samples.add(sample);
+        }
+
+        try (DBHandler handler = GBApplication.acquireDB()) {
+            final DaoSession session = handler.getDaoSession();
+
+            final Device device = DBHelper.getDevice(getDevice(), session);
+            final User user = DBHelper.getUser(session);
+
+            final CmfWorkoutGpsSampleProvider sampleProvider = new CmfWorkoutGpsSampleProvider(getDevice(), session);
+
+            for (final CmfWorkoutGpsSample sample : samples) {
+                sample.setDevice(device);
+                sample.setUser(user);
+            }
+
+            LOG.debug("Will persist {} workout gps samples", samples.size());
+            sampleProvider.addSamples(samples);
+        } catch (final Exception e) {
+            GB.toast(getContext(), "Error saving workout gps samples", Toast.LENGTH_LONG, GB.ERROR, e);
+        }
+    }
+
+    private void processActivitiesWithGps() {
+        LOG.debug("There are {} activities with gps to process", activitiesWithGps.size());
+
+        for (final BaseActivitySummary summary : activitiesWithGps) {
+            processGps(summary);
+        }
+
+        activitiesWithGps.clear();
+
+        getDevice().unsetBusyTask();
+        GB.updateTransferNotification(null, "", false, 100, getContext());
+    }
+
+    private void processGps(final BaseActivitySummary summary) {
+        final ActivityTrack activityTrack = buildActivityTrack(summary);
+        if (activityTrack == null) {
+            return;
+        }
+
+        // Save the gpx file
+        final File gpxFile = exportGpx(summary, activityTrack);
+        if (gpxFile == null) {
+            return;
+        }
+
+        // Update the summary in the db with the gpx path
+        try (DBHandler dbHandler = GBApplication.acquireDB()) {
+            final DaoSession session = dbHandler.getDaoSession();
+            final Device device = DBHelper.getDevice(mSupport.getDevice(), session);
+            final User user = DBHelper.getUser(session);
+
+            final BaseActivitySummaryDao summaryDao = session.getBaseActivitySummaryDao();
+            final QueryBuilder<BaseActivitySummary> qb = summaryDao.queryBuilder();
+            qb.where(BaseActivitySummaryDao.Properties.StartTime.eq(summary.getStartTime()));
+            qb.where(BaseActivitySummaryDao.Properties.DeviceId.eq(device.getId()));
+            qb.where(BaseActivitySummaryDao.Properties.UserId.eq(user.getId()));
+            final List<BaseActivitySummary> summaries = qb.build().list();
+
+            if (summaries.isEmpty()) {
+                LOG.warn("Failed to find existing summary in db - this should never happen");
+                return;
+            }
+            if (summaries.size() > 1) {
+                LOG.warn("Found multiple summaries in db - this should never happen");
+            }
+
+            final BaseActivitySummary summaryToUpdate = summaries.get(0);
+            summaryToUpdate.setGpxTrack(gpxFile.getAbsolutePath());
+            session.getBaseActivitySummaryDao().insertOrReplace(summaryToUpdate);
+        } catch (final Exception e) {
+            LOG.error("Failed to update summary with gpx path", e);
+        }
+    }
+
+    @Nullable
+    private File exportGpx(final BaseActivitySummary summary, final ActivityTrack activityTrack) {
+        final GPXExporter exporter = new GPXExporter();
+        exporter.setCreator(GBApplication.app().getNameAndVersion());
+
+        final String gpxFileName = FileUtils.makeValidFileName("gadgetbridge-" + DateTimeUtils.formatIso8601(summary.getStartTime()) + ".gpx");
+        final File gpxTargetFile;
+        try {
+            gpxTargetFile = new File(FileUtils.getExternalFilesDir(), gpxFileName);
+        } catch (final IOException e) {
+            LOG.error("Failed to get external files dir", e);
+            return null;
+        }
+
+        try {
+            exporter.performExport(activityTrack, gpxTargetFile);
+        } catch (final ActivityTrackExporter.GPXTrackEmptyException e) {
+            LOG.warn("Gpx is empty");
+            return null;
+        } catch (IOException e) {
+            LOG.error("Failed to write gpx", e);
+            return null;
+        }
+
+        return gpxTargetFile;
+    }
+
+    @Nullable
+    private ActivityTrack buildActivityTrack(final BaseActivitySummary summary) {
+        final ActivityTrack track = new ActivityTrack();
+        track.setUser(summary.getUser());
+        track.setDevice(summary.getDevice());
+        track.setName(createActivityName(summary));
+
+        final List<CmfWorkoutGpsSample> gpsSamples;
+        final List<CmfHeartRateSample> hrSamples;
+        try (DBHandler handler = GBApplication.acquireDB()) {
+            final DaoSession session = handler.getDaoSession();
+
+            final CmfWorkoutGpsSampleProvider gpsSampleProvider = new CmfWorkoutGpsSampleProvider(getDevice(), session);
+            gpsSamples = gpsSampleProvider.getAllSamples(summary.getStartTime().getTime(), summary.getEndTime().getTime());
+
+            final CmfHeartRateSampleProvider hrSampleProvider = new CmfHeartRateSampleProvider(getDevice(), session);
+            hrSamples = new ArrayList<>(hrSampleProvider.getAllSamples(summary.getStartTime().getTime(), summary.getEndTime().getTime()));
+        } catch (final Exception e) {
+            LOG.error("Error while building activity track", e);
+            return null;
+        }
+
+        Collections.sort(hrSamples, (a, b) -> Long.compare(a.getTimestamp(), b.getTimestamp()));
+
+        for (final CmfWorkoutGpsSample gpsSample : gpsSamples) {
+            final ActivityPoint ap = new ActivityPoint(new Date(gpsSample.getTimestamp()));
+            final GPSCoordinate coordinate = new GPSCoordinate(
+                    gpsSample.getLongitude() / 10000000d,
+                    gpsSample.getLatitude() / 10000000d,
+                    -20000
+            );
+            ap.setLocation(coordinate);
+
+            final CmfHeartRateSample hrSample = findNearestSample(hrSamples, gpsSample.getTimestamp());
+            if (hrSample != null) {
+                ap.setHeartRate(hrSample.getHeartRate());
+            }
+
+            track.addTrackPoint(ap);
+        }
+
+        return track;
+    }
+
+    @Nullable
+    private CmfHeartRateSample findNearestSample(final List<CmfHeartRateSample> samples, final long timestamp) {
+        if (samples.isEmpty()) {
+            return null;
+        }
+
+        if (timestamp < samples.get(0).getTimestamp()) {
+            return samples.get(0);
+        }
+
+        if (timestamp > samples.get(samples.size() - 1).getTimestamp()) {
+            return samples.get(samples.size() - 1);
+        }
+
+        int start = 0;
+        int end = samples.size() - 1;
+
+        while (start <= end) {
+            final int mid = (start + end) / 2;
+
+            if (timestamp < samples.get(mid).getTimestamp()) {
+                end = mid - 1;
+            } else if (timestamp > samples.get(mid).getTimestamp()) {
+                start = mid + 1;
+            } else {
+                return samples.get(mid);
+            }
+        }
+
+        // FIXME return null if too far?
+
+        if (samples.get(start).getTimestamp() - timestamp < timestamp - samples.get(end).getTimestamp()) {
+            return samples.get(start);
+        }
+
+        return samples.get(end);
+    }
+
+    protected static String createActivityName(final BaseActivitySummary summary) {
+        String name = summary.getName();
+        String nameText = "";
+        Long id = summary.getId();
+        if (name != null) {
+            nameText = name + " - ";
+        }
+        return nameText + id;
+    }
+
+    private Context getContext() {
+        return mSupport.getContext();
+    }
+
+    private GBDevice getDevice() {
+        return mSupport.getDevice();
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/cmfwatchpro/CmfActivityType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/cmfwatchpro/CmfActivityType.java
new file mode 100644
index 000000000..56d5d0782
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/cmfwatchpro/CmfActivityType.java
@@ -0,0 +1,184 @@
+/*  Copyright (C) 2024 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.cmfwatchpro;
+
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.model.ActivityKind;
+
+public enum CmfActivityType {
+    // Core (non-removable in official app)
+    INDOOR_RUNNING(0x03, R.string.activity_type_indoor_running, ActivityKind.TYPE_RUNNING),
+    OUTDOOR_RUNNING(0x02, R.string.activity_type_outdoor_running, ActivityKind.TYPE_RUNNING),
+    // Fitness
+    OUTDOOR_WALKING(0x01, R.string.activity_type_outdoor_walking, ActivityKind.TYPE_WALKING),
+    INDOOR_WALKING(0x19, R.string.activity_type_indoor_walking, ActivityKind.TYPE_WALKING),
+    OUTDOOR_CYCLING(0x05, R.string.activity_type_outdoor_cycling, ActivityKind.TYPE_CYCLING),
+    INDOOR_CYCLING(0x72, R.string.activity_type_indoor_cycling, ActivityKind.TYPE_INDOOR_CYCLING),
+    MOUNTAIN_HIKE(0x04, R.string.activity_type_mountain_hike, ActivityKind.TYPE_HIKING),
+    HIKING(0x1A, R.string.activity_type_hiking, ActivityKind.TYPE_HIKING),
+    CROSS_TRAINER(0x18, R.string.activity_type_cross_trainer),
+    FREE_TRAINING(0x10, R.string.activity_type_free_training, ActivityKind.TYPE_STRENGTH_TRAINING),
+    STRENGTH_TRAINING(0x13, R.string.activity_type_strength_training, ActivityKind.TYPE_STRENGTH_TRAINING),
+    YOGA(0x0F, R.string.activity_type_yoga, ActivityKind.TYPE_YOGA),
+    BOXING(0x21, R.string.activity_type_boxing),
+    ROWER(0x0E, R.string.activity_type_rower, ActivityKind.TYPE_ROWING_MACHINE),
+    DYNAMIC_CYCLE(0x0D, R.string.activity_type_dynamic_cycle),
+    STAIR_STEPPER(0x73, R.string.activity_type_stair_stepper),
+    TREADMILL(0x26, R.string.activity_type_treadmill, ActivityKind.TYPE_TREADMILL),
+    HIIT(0x5C, R.string.activity_type_hiit),
+    FITNESS_EXERCISES(0x4E, R.string.activity_type_fitness_exercises),
+    JUMP_ROPING(0x06, R.string.activity_type_jump_roping, ActivityKind.TYPE_JUMP_ROPING),
+    PILATES(0x2C, R.string.activity_type_pilates),
+    CROSSFIT(0x74, R.string.activity_type_crossfit),
+    FUNCTIONAL_TRAINING(0x2E, R.string.activity_type_functional_training),
+    PHYSICAL_TRAINING(0x2F, R.string.activity_type_physical_training),
+    TAEKWONDO(0x25, R.string.activity_type_taekwondo),
+    CROSS_COUNTRY_RUNNING(0x1B, R.string.activity_type_cross_country_running),
+    KARATE(0x29, R.string.activity_type_karate),
+    FENCING(0x54, R.string.activity_type_fencing),
+    CORE_TRAINING(0x4B, R.string.activity_type_core_training),
+    KENDO(0x75, R.string.activity_type_kendo),
+    HORIZONTAL_BAR(0x56, R.string.activity_type_horizontal_bar),
+    PARALLEL_BAR(0x57, R.string.activity_type_parallel_bar),
+    COOLDOWN(0x92, R.string.activity_type_cooldown),
+    CROSS_TRAINING(0x2B, R.string.activity_type_cross_training),
+    SIT_UPS(0x11, R.string.activity_type_sit_ups),
+    FITNESS_GAMING(0x4D, R.string.activity_type_fitness_gaming),
+    AEROBIC_EXERCISE(0x94, R.string.activity_type_aerobic_exercise),
+    ROLLING(0x95, R.string.activity_type_rolling),
+    FLEXIBILITY(0x31, R.string.activity_type_flexibility),
+    GYMNASTICS(0x23, R.string.activity_type_gymnastics),
+    TRACK_AND_FIELD(0x27, R.string.activity_type_track_and_field),
+    PUSH_UPS(0x67, R.string.activity_type_push_ups),
+    BATTLE_ROPE(0x99, R.string.activity_type_battle_rope),
+    SMITH_MACHINE(0x9A, R.string.activity_type_smith_machine),
+    PULL_UPS(0x66, R.string.activity_type_pull_ups),
+    PLANK(0x68, R.string.activity_type_plank),
+    JAVELIN(0x9E, R.string.activity_type_javelin),
+    LONG_JUMP(0x6C, R.string.activity_type_long_jump),
+    HIGH_JUMP(0x6A, R.string.activity_type_high_jump),
+    TRAMPOLINE(0x5F, R.string.activity_type_trampoline),
+    DUMBBELL(0x9F, R.string.activity_type_dumbbell),
+    // Dance
+    BELLY_DANCE(0x76, R.string.activity_type_belly_dance),
+    JAZZ_DANCE(0x77, R.string.activity_type_jazz_dance),
+    LATIN_DANCE(0x33, R.string.activity_type_latin_dance),
+    BALLET(0x36, R.string.activity_type_ballet),
+    STREET_DANCE(0x34, R.string.activity_type_street_dance),
+    ZUMBA(0x9B, R.string.activity_type_zumba),
+    OTHER_DANCE(0x78, R.string.activity_type_other_dance),
+    // Leisure sports
+    ROLLER_SKATING(0x58, R.string.activity_type_roller_skating),
+    MARTIAL_ARTS(0x38, R.string.activity_type_martial_arts),
+    TAI_CHI(0x1F, R.string.activity_type_tai_chi),
+    HULA_HOOPING(0x59, R.string.activity_type_hula_hooping),
+    DISC_SPORTS(0x43, R.string.activity_type_disc_sports),
+    DARTS(0x5A, R.string.activity_type_darts),
+    ARCHERY(0x30, R.string.activity_type_archery),
+    HORSE_RIDING(0x1D, R.string.activity_type_horse_riding),
+    KITE_FLYING(0x70, R.string.activity_type_kite_flying),
+    SWING(0x71, R.string.activity_type_swing),
+    STAIRS(0x15, R.string.activity_type_stairs),
+    FISHING(0x42, R.string.activity_type_fishing),
+    HAND_CYCLING(0x96, R.string.activity_type_hand_cycling),
+    MIND_AND_BODY(0x97, R.string.activity_type_mind_and_body),
+    WRESTLING(0x53, R.string.activity_type_wrestling),
+    KABADDI(0x9C, R.string.activity_type_kabaddi),
+    KARTING(0xA0, R.string.activity_type_karting),
+    // Ball sports
+    BADMINTON(0x09, R.string.activity_type_badminton),
+    TABLE_TENNIS(0x0A, R.string.activity_type_table_tennis, ActivityKind.TYPE_PINGPONG),
+    TENNIS(0x0C, R.string.activity_type_tennis),
+    BILLIARDS(0x7C, R.string.activity_type_billiards),
+    BOWLING(0x3B, R.string.activity_type_bowling),
+    VOLLEYBALL(0x49, R.string.activity_type_volleyball),
+    SHUTTLECOCK(0x20, R.string.activity_type_shuttlecock),
+    HANDBALL(0x39, R.string.activity_type_handball),
+    BASEBALL(0x3A, R.string.activity_type_baseball),
+    SOFTBALL(0x55, R.string.activity_type_softball),
+    CRICKET(0x0B, R.string.activity_type_cricket),
+    RUGBY(0x44, R.string.activity_type_rugby),
+    HOCKEY(0x1E, R.string.activity_type_hockey),
+    SQUASH(0x3C, R.string.activity_type_squash),
+    DODGEBALL(0x81, R.string.activity_type_dodgeball),
+    SOCCER(0x07, R.string.activity_type_soccer, ActivityKind.TYPE_SOCCER),
+    BASKETBALL(0x08, R.string.activity_type_basketball, ActivityKind.TYPE_BASKETBALL),
+    AUSTRALIAN_FOOTBALL(0x37, R.string.activity_type_australian_football),
+    GOLF(0x45, R.string.activity_type_golf),
+    PICKLEBALL(0x5B, R.string.activity_type_pickleball),
+    LACROSS(0x98, R.string.activity_type_lacross),
+    SHOT(0x9D, R.string.activity_type_shot),
+    // Water sports
+    SAILING(0x82, R.string.activity_type_sailing),
+    SURFING(0x64, R.string.activity_type_surfing),
+    JET_SKIING(0x87, R.string.activity_type_jet_skiing),
+    // Snow sports
+    SKATING(0x4C, R.string.activity_type_skating),
+    ICE_HOCKEY(0x24, R.string.activity_type_ice_hockey),
+    CURLING(0x3D, R.string.activity_type_curling),
+    SNOWBOARDING(0x3E, R.string.activity_type_snowboarding),
+    CROSS_COUNTRY_SKIING(0x6E, R.string.activity_type_cross_country_skiing),
+    SNOW_SPORTS(0x48, R.string.activity_type_snow_sports),
+    SKIING(0x22, R.string.activity_type_skiing),
+    // Extreme sports
+    SKATEBOARDING(0x60, R.string.activity_type_skateboarding),
+    ROCK_CLIMBING(0x69, R.string.activity_type_rock_climbing),
+    HUNTING(0x93, R.string.activity_type_hunting),
+    ;
+
+    private final byte code;
+    @StringRes
+    private final int nameRes;
+    private final int activityKind;
+
+    CmfActivityType(final int code, final int nameRes) {
+        this(code, nameRes, ActivityKind.TYPE_UNKNOWN);
+    }
+
+    CmfActivityType(final int code, final int nameRes, final int activityKind) {
+        this.code = (byte) code;
+        this.nameRes = nameRes;
+        this.activityKind = activityKind;
+    }
+
+    public byte getCode() {
+        return code;
+    }
+
+    public int getActivityKind() {
+        return activityKind;
+    }
+
+    @StringRes
+    public int getNameRes() {
+        return nameRes;
+    }
+
+    @Nullable
+    public static CmfActivityType fromCode(final byte code) {
+        for (final CmfActivityType cmd : CmfActivityType.values()) {
+            if (cmd.getCode() == code) {
+                return cmd;
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/cmfwatchpro/CmfCharacteristic.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/cmfwatchpro/CmfCharacteristic.java
new file mode 100644
index 000000000..03762047b
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/cmfwatchpro/CmfCharacteristic.java
@@ -0,0 +1,310 @@
+/*  Copyright (C) 2024 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.cmfwatchpro;
+
+import android.bluetooth.BluetoothGattCharacteristic;
+
+import androidx.annotation.Nullable;
+
+import org.apache.commons.lang3.ArrayUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.security.GeneralSecurityException;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
+import java.util.UUID;
+import java.util.zip.CRC32;
+
+import nodomain.freeyourgadget.gadgetbridge.service.btle.BLETypeConversions;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
+import nodomain.freeyourgadget.gadgetbridge.util.CryptoUtils;
+import nodomain.freeyourgadget.gadgetbridge.util.GB;
+
+public class CmfCharacteristic {
+    private final Logger LOG = LoggerFactory.getLogger(CmfCharacteristic.class);
+
+    private static final byte[] AES_IV = new byte[]{0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x5a};
+    private static final byte PAYLOAD_HEADER = (byte) 0xf5;
+
+    private final BluetoothGattCharacteristic bluetoothGattCharacteristic;
+    private final UUID characteristicUUID;
+
+    private final Handler handler;
+
+    private byte[] sessionKey;
+
+    private int mtu = 247;
+
+    private final Map<CmfCommand, ChunkBuffer> chunkBuffers = new HashMap<>();
+
+    public CmfCharacteristic(final BluetoothGattCharacteristic bluetoothGattCharacteristic,
+                             final Handler handler) {
+        this.bluetoothGattCharacteristic = bluetoothGattCharacteristic;
+        this.characteristicUUID = bluetoothGattCharacteristic.getUuid();
+        this.handler = handler;
+    }
+
+    public UUID getCharacteristicUUID() {
+        return characteristicUUID;
+    }
+
+    public void setSessionKey(final byte[] sessionKey) {
+        this.sessionKey = sessionKey;
+    }
+
+    public void setMtu(final int mtu) {
+        this.mtu = mtu;
+    }
+
+    public void sendCommand(final TransactionBuilder builder, final CmfCommand cmd, final byte[] payload) {
+        final byte[][] chunks;
+
+        if (shouldEncrypt(cmd)) {
+            chunks = makeChunksEncrypted(payload);
+        } else {
+            chunks = makeChunksPlaintext(payload);
+        }
+
+        if (chunks == null) {
+            // Something went wrong chunking - error was already printed
+            return;
+        }
+
+        for (int i = 0; i < chunks.length; i++) {
+            final byte[] chunk = chunks[i];
+
+            final ByteBuffer buf = ByteBuffer.allocate(chunk.length + 11).order(ByteOrder.BIG_ENDIAN);
+            buf.put(PAYLOAD_HEADER);
+            buf.putShort((short) chunk.length);
+            buf.putShort((short) cmd.getCmd1());
+            buf.putShort((short) chunks.length);
+            buf.putShort((short) (i + 1));
+            buf.putShort((short) cmd.getCmd2());
+            buf.put(chunk);
+
+            builder.write(bluetoothGattCharacteristic, buf.array());
+        }
+    }
+
+    private byte[][] makeChunksPlaintext(final byte[] payload) {
+        final int chunkSize = mtu - 20;
+        final int numChunks = (int) Math.ceil(payload.length / (float) chunkSize);
+        final byte[][] chunks = new byte[numChunks][];
+
+        final CRC32 crc = new CRC32();
+
+        for (int i = 0; i < numChunks; i++) {
+            final int startIdx = i * chunkSize;
+            final int endIdx = Math.min(startIdx + chunkSize, payload.length);
+            final byte[] chunk = ArrayUtils.subarray(payload, startIdx, endIdx);
+
+            crc.reset();
+            crc.update(chunk, 0, chunk.length);
+
+            chunks[i] = ArrayUtils.addAll(
+                    chunk,
+                    BLETypeConversions.fromUint32((int) crc.getValue())
+            );
+        }
+
+        return chunks;
+    }
+
+    @Nullable
+    private byte[][] makeChunksEncrypted(final byte[] payload) {
+        if (payload.length == 0) {
+            return new byte[1][0];
+        }
+
+        // AES will output 16-byte blocks, exclude the protocol overhead (11 bytes)
+        final int maxEncryptedPayloadSize = ((mtu - 11) / 16) * 16;
+        final int maxPayloadSize = maxEncryptedPayloadSize - 4 - 1; // exclude 4 bytes for crc and 1 byte of aes padding
+        final int numChunks = (int) Math.ceil(payload.length / (float) (maxPayloadSize));
+        final byte[][] chunks = new byte[numChunks][];
+
+        if (numChunks != 1) {
+            LOG.debug("Splitting payload into {} chunks of {} bytes", numChunks, maxPayloadSize);
+        }
+
+        final CRC32 crc = new CRC32();
+
+        for (int i = 0; i < numChunks; i++) {
+            final int startIdx = i * maxPayloadSize;
+            final int endIdx = Math.min(startIdx + maxPayloadSize, payload.length);
+            final byte[] chunk = ArrayUtils.subarray(payload, startIdx, endIdx);
+
+            crc.reset();
+            crc.update(chunk, 0, chunk.length);
+
+            final byte[] payloadToEncrypt = ArrayUtils.addAll(
+                    chunk,
+                    BLETypeConversions.fromUint32((int) crc.getValue())
+            );
+
+            try {
+                chunks[i] = CryptoUtils.encryptAES_CBC_Pad(payloadToEncrypt, sessionKey, AES_IV);
+            } catch (final GeneralSecurityException e) {
+                LOG.error("Failed to encrypt chunk", e);
+                return null;
+            }
+        }
+
+        return chunks;
+    }
+
+    private boolean shouldEncrypt(final CmfCommand cmd) {
+        switch (cmd) {
+            case DATA_CHUNK_WRITE_AGPS:
+            case DATA_CHUNK_WRITE_WATCHFACE:
+                return false;
+        }
+
+        return true;
+    }
+
+    public void onCharacteristicChanged(final byte[] value) {
+        final ByteBuffer buf = ByteBuffer.wrap(value).order(ByteOrder.BIG_ENDIAN);
+
+        final byte header = buf.get();
+        if (header != PAYLOAD_HEADER) {
+            LOG.error("Unexpected first byte {}", String.format("0x%02x", header));
+            return;
+        }
+
+        final int encryptedPayloadLength = buf.getShort();
+        final int cmd1 = buf.getShort() & 0xFFFF;
+        final int chunkCount = buf.getShort();
+        final int chunkIndex = buf.getShort();
+        final int cmd2 = buf.getShort() & 0xFFFF;
+
+        final CmfCommand cmd = CmfCommand.fromCodes(cmd1, cmd2);
+
+        final byte[] payload;
+        if (encryptedPayloadLength > 0) {
+            final byte[] encryptedPayload = new byte[encryptedPayloadLength];
+            buf.get(encryptedPayload);
+
+            try {
+                final byte[] decryptedPayload = CryptoUtils.decryptAES_CBC_Pad(encryptedPayload, sessionKey, AES_IV);
+                payload = ArrayUtils.subarray(decryptedPayload, 0, decryptedPayload.length - 4);
+                final int expectedCrc = BLETypeConversions.toUint32(decryptedPayload, decryptedPayload.length - 4);
+                final CRC32 crc = new CRC32();
+                crc.update(payload, 0, payload.length);
+                final int actualCrc = (int) crc.getValue();
+                if (actualCrc != expectedCrc) {
+                    LOG.error("Payload CRC mismatch for {}: got {}, expected {}", cmd, String.format("%08X", actualCrc), String.format("%08X", expectedCrc));
+                    if (chunkCount > 1) {
+                        chunkBuffers.remove(cmd);
+                    }
+                    return;
+                }
+            } catch (final GeneralSecurityException e) {
+                LOG.error("Failed to decrypt payload for {}", cmd, e);
+                if (chunkCount > 1) {
+                    chunkBuffers.remove(cmd);
+                }
+                return;
+            }
+        } else {
+            payload = new byte[0];
+        }
+
+        LOG.debug(
+                "Got {}: {}{}",
+                chunkCount > 1 ? String.format(Locale.ROOT, "chunk %d/%d", chunkIndex, chunkCount) : "command",
+                cmd != null ? String.format("cmd=%s", cmd) : String.format("cmd1=0x%04x cmd2=0x%04x", cmd1, cmd2),
+                payload.length > 0 ? " payload=" + GB.hexdump(payload) : ""
+        );
+
+        if (cmd == null) {
+            // Just ignore unknown commands
+            LOG.warn("Unknown command cmd1={} cmd2={}", String.format("0x%04x", cmd1), String.format("0x%04x", cmd2));
+            return;
+        }
+
+        final byte[] fullPayload;
+        if (chunkCount == 1) {
+            // Single-chunk payload - just pass it through
+            fullPayload = payload;
+        } else {
+            final ChunkBuffer buffer;
+            if (chunkBuffers.containsKey(cmd)) {
+                buffer = Objects.requireNonNull(chunkBuffers.get(cmd));
+            } else {
+                buffer = new ChunkBuffer();
+            }
+
+            if (chunkIndex != buffer.expectedChunk) {
+                LOG.warn("Got unexpected chunk, expected {}", buffer.expectedChunk);
+
+                if (chunkIndex != 1) {
+                    // This chunk is not the first one and we got out of sync - ignore it and do not proceed
+                    return;
+                }
+
+                // Just discard whatever we had and start over
+                buffer.baos.reset();
+            }
+
+            try {
+                buffer.baos.write(payload);
+            } catch (final IOException e) {
+                LOG.error("Failed to write payload to chunk buffer", e);
+                return;
+            }
+
+            buffer.expectedChunk = chunkIndex + 1;
+
+            if (chunkIndex != chunkCount) {
+                // Chunk buffer not full yet
+                return;
+            }
+
+            LOG.debug("Got all {} chunks for {}", chunkCount, cmd);
+
+            fullPayload = buffer.baos.toByteArray().clone();
+            chunkBuffers.remove(cmd);
+        }
+
+        if (handler == null) {
+            LOG.error("Handler is null for {}", characteristicUUID);
+            return;
+        }
+
+        try {
+            handler.onCommand(cmd, fullPayload);
+        } catch (final Exception e) {
+            LOG.error("Exception while handling command", e);
+        }
+    }
+
+    public interface Handler {
+        void onCommand(CmfCommand cmd, byte[] payload);
+    }
+
+    private static class ChunkBuffer {
+        private int expectedChunk = 1;
+        private final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/cmfwatchpro/CmfCommand.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/cmfwatchpro/CmfCommand.java
new file mode 100644
index 000000000..6f46e3a88
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/cmfwatchpro/CmfCommand.java
@@ -0,0 +1,124 @@
+/*  Copyright (C) 2024 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.cmfwatchpro;
+
+import androidx.annotation.Nullable;
+
+public enum CmfCommand {
+    ACTIVITY_DATA(0x0056, 0x0001),
+    ACTIVITY_FETCH_1(0xffff, 0x8005),
+    ACTIVITY_FETCH_2(0xffff, 0x9057),
+    ACTIVITY_FETCH_ACK_1(0xffff, 0x0005),
+    ACTIVITY_FETCH_ACK_2(0xffff, 0xa057),
+    ALARMS_GET(0x0063, 0x0002),
+    ALARMS_SET(0x0063, 0x0001),
+    APP_NOTIFICATION(0x0065, 0x0001),
+    AUTH_NONCE_REPLY(0xffff, 0x004c),
+    AUTH_NONCE_REQUEST(0xffff, 0x804b),
+    AUTH_PAIR_REPLY(0xffff, 0x0048),
+    AUTH_PAIR_REQUEST(0xffff, 0x8047),
+    AUTH_PHONE_NAME(0xffff, 0x8049),
+    AUTH_WATCH_MAC(0xffff, 0x0049),
+    AUTHENTICATED_CONFIRM_REPLY(0xffff, 0x0004),
+    AUTHENTICATED_CONFIRM_REQUEST(0xffff, 0x804d),
+    BATTERY(0x005c, 0x0001),
+    CALL_REMINDER(0xffff, 0x9066),
+    CONTACTS_GET(0x00d5, 0x0002),
+    CONTACTS_SET(0x00d5, 0x0001),
+    DATA_CHUNK_REQUEST_AGPS(0xffff, 0xa05f),
+    DATA_CHUNK_REQUEST_WATCHFACE(0xffff, 0xa064),
+    DATA_CHUNK_WRITE_AGPS(0xffff, 0x905f),
+    DATA_CHUNK_WRITE_WATCHFACE(0xffff, 0x9064),
+    DATA_TRANSFER_AGPS_FINISH_ACK_1(0xffff, 0xa060),
+    DATA_TRANSFER_AGPS_FINISH_ACK_2(0xffff, 0x9060),
+    DATA_TRANSFER_AGPS_INIT_REPLY(0xffff, 0xa05e),
+    DATA_TRANSFER_AGPS_INIT_REQUEST(0xffff, 0x905e),
+    DATA_TRANSFER_WATCHFACE_FINISH_ACK_1(0xffff, 0xa065),
+    DATA_TRANSFER_WATCHFACE_FINISH_ACK_2(0xffff, 0x9065),
+    DATA_TRANSFER_WATCHFACE_INIT_1_REQUEST(0xffff, 0x8052),
+    DATA_TRANSFER_WATCHFACE_INIT_1_REPLY(0xffff, 0x0052),
+    DATA_TRANSFER_WATCHFACE_INIT_2_REPLY(0xffff, 0xa063),
+    DATA_TRANSFER_WATCHFACE_INIT_2_REQUEST(0xffff, 0x9063),
+    DO_NOT_DISTURB(0x0099, 0x0001),
+    FACTORY_RESET(0x009a, 0x0001),
+    FIND_PHONE(0x005b, 0x0001),
+    FIND_WATCH(0x005d, 0x0001),
+    FIRMWARE_VERSION_GET(0xffff, 0x8006),
+    FIRMWARE_VERSION_RET(0xffff, 0x0006),
+    GOALS_SET(0x005e, 0x0001),
+    GPS_COORDS(0xffff, 0x906a),
+    HEART_MONITORING_ALERTS(0xffff, 0x9059),
+    HEART_MONITORING_ENABLED_GET(0x009b, 0x0002),
+    HEART_MONITORING_ENABLED_SET(0x009b, 0x0001),
+    HEART_RATE_RESTING(0x00da, 0x0001),
+    HEART_RATE_MANUAL_AUTO(0x0053, 0x0001),
+    HEART_RATE_WORKOUT(0x00e0, 0x0001),
+    LANGUAGE_RET(0xffff, 0xa06b),
+    LANGUAGE_SET(0xffff, 0x9058),
+    MUSIC_BUTTON(0xffff, 0xa05d),
+    MUSIC_INFO_ACK(0xffff, 0xa05c),
+    MUSIC_INFO_SET(0xffff, 0x905c),
+    SERIAL_NUMBER_GET(0x00de, 0x0002),
+    SERIAL_NUMBER_RET(0x00de, 0x0001),
+    SLEEP_DATA(0x0058, 0x0001),
+    SPO2(0x0055, 0x0001),
+    SPORTS_SET(0x00dc, 0x0001),
+    STANDING_REMINDER_GET(0x0060, 0x0002),
+    STANDING_REMINDER_SET(0x0060, 0x0001),
+    STRESS(0x009d, 0x0001),
+    TIME_FORMAT(0x005f, 0x0001),
+    TIME(0xffff, 0x8004),
+    TRIGGER_SYNC(0x005c, 0x0002),
+    UNIT_LENGTH(0xffff, 0x9067),
+    UNIT_TEMPERATURE(0xffff, 0x9068),
+    WAKE_ON_WRIST_RAISE(0x0062, 0x0001),
+    WATCHFACE(0x009f, 0x0001),
+    WATER_REMINDER_GET(0x0061, 0x0002),
+    WATER_REMINDER_SET(0x0061, 0x0001),
+    WEATHER_SET_1(0xffff, 0x906b),
+    WEATHER_SET_2(0x0066, 0x0001),
+    WORKOUT_GPS(0xffff, 0xa05a),
+    WORKOUT_SUMMARY(0x0057, 0x0001),
+    ;
+
+    private final int cmd1;
+    private final int cmd2;
+
+    CmfCommand(final int cmd1, final int cmd2) {
+        this.cmd1 = cmd1;
+        this.cmd2 = cmd2;
+    }
+
+    public int getCmd1() {
+        return cmd1;
+    }
+
+    public int getCmd2() {
+        return cmd2;
+    }
+
+    @Nullable
+    public static CmfCommand fromCodes(final int cmd1, final int cmd2) {
+        for (final CmfCommand cmd : CmfCommand.values()) {
+            if (cmd.getCmd1() == cmd1 && cmd.getCmd2() == cmd2) {
+                return cmd;
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/cmfwatchpro/CmfDataUploader.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/cmfwatchpro/CmfDataUploader.java
new file mode 100644
index 000000000..9e4571193
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/cmfwatchpro/CmfDataUploader.java
@@ -0,0 +1,198 @@
+/*  Copyright (C) 2024 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.cmfwatchpro;
+
+import android.net.Uri;
+
+import org.apache.commons.lang3.ArrayUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.Random;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetProgressAction;
+
+public class CmfDataUploader implements CmfCharacteristic.Handler {
+    private static final Logger LOG = LoggerFactory.getLogger(CmfWatchProSupport.class);
+
+    private final CmfWatchProSupport mSupport;
+
+    private CmfFwHelper fwHelper;
+
+    public CmfDataUploader(final CmfWatchProSupport support) {
+        this.mSupport = support;
+    }
+
+    @Override
+    public void onCommand(final CmfCommand cmd, final byte[] payload) {
+        switch (cmd) {
+            case DATA_TRANSFER_WATCHFACE_INIT_1_REPLY:
+                if (payload[0] != 0x01) {
+                    LOG.warn("Got unexpected transfer init 1 reply {}", payload[0]);
+                    fwHelper = null;
+                    return;
+                }
+
+                final ByteBuffer buf = ByteBuffer.allocate(9).order(ByteOrder.BIG_ENDIAN);
+                buf.put((byte) (0xa5));
+                buf.putInt(fwHelper.getBytes().length);
+                buf.putInt(new Random().nextInt()); // FIXME watchface ID?
+
+                mSupport.sendData(
+                        "transfer watchface init 2 request",
+                        CmfCommand.DATA_TRANSFER_WATCHFACE_INIT_2_REQUEST,
+                        buf.array()
+                );
+                return;
+            case DATA_TRANSFER_AGPS_INIT_REPLY:
+            case DATA_TRANSFER_WATCHFACE_INIT_2_REPLY:
+                if (payload[0] != 0x01) {
+                    LOG.warn("Got unexpected transfer 2 init reply {}", payload[0]);
+                    fwHelper = null;
+                    return;
+                }
+
+                setDeviceBusy();
+                updateProgress(0, true);
+
+                return;
+            case DATA_TRANSFER_WATCHFACE_FINISH_ACK_1:
+                handleAck1(CmfCommand.DATA_TRANSFER_WATCHFACE_FINISH_ACK_2, payload);
+                return;
+            case DATA_TRANSFER_AGPS_FINISH_ACK_1:
+                handleAck1(CmfCommand.DATA_TRANSFER_AGPS_FINISH_ACK_2, payload);
+                return;
+            case DATA_CHUNK_REQUEST_AGPS:
+                if (fwHelper == null || !fwHelper.isAgps()) {
+                    LOG.warn("We are not sending AGPS - refusing request");
+                    return;
+                }
+                handleChunkRequest(CmfCommand.DATA_CHUNK_REQUEST_AGPS, payload);
+                return;
+            case DATA_CHUNK_REQUEST_WATCHFACE:
+                if (fwHelper == null || !fwHelper.isWatchface()) {
+                    LOG.warn("We are not sending a watchface - refusing request");
+                    return;
+                }
+                handleChunkRequest(CmfCommand.DATA_CHUNK_WRITE_WATCHFACE, payload);
+                return;
+        }
+
+        LOG.warn("Got unknown data command {}", cmd);
+    }
+
+    public void onInstallApp(final Uri uri) {
+        if (fwHelper != null) {
+            LOG.warn("Already installing {}", fwHelper.getUri());
+            return;
+        }
+
+        fwHelper = new CmfFwHelper(uri, mSupport.getContext());
+        if (!fwHelper.isValid()) {
+            LOG.warn("Uri {} is not valid", uri);
+            fwHelper = null;
+            return;
+        }
+
+        if (fwHelper.isWatchface()) {
+            mSupport.sendData(
+                    "transfer watchface init request",
+                    CmfCommand.DATA_TRANSFER_WATCHFACE_INIT_1_REQUEST,
+                    (byte) 0xa5
+            );
+
+            return;
+        }
+
+        LOG.warn("Unsupported fwHelper for {}", fwHelper.getUri());
+        fwHelper = null;
+    }
+
+    private void handleChunkRequest(final CmfCommand commandReply, final byte[] payload) {
+        final ByteBuffer buf = ByteBuffer.wrap(payload).order(ByteOrder.BIG_ENDIAN);
+        final int offset = buf.getInt();
+        final int length = buf.getInt();
+        final int progress = buf.get();
+
+        LOG.debug("Got chunk request: offset={}, length={}, progress={}", offset, length, progress);
+
+        final TransactionBuilder builder = mSupport.createTransactionBuilder("send chunk offset " + offset);
+        updateProgress(builder, progress, true);
+        mSupport.sendData(
+                "transfer watchface init request",
+                commandReply,
+                ArrayUtils.subarray(fwHelper.getBytes(), offset, offset + length)
+        );
+    }
+
+    private void handleAck1(final CmfCommand commandReply, final byte[] payload) {
+        if (payload[0] != 0x01) {
+            LOG.warn("Got unexpected transfer finish reply {}", payload[0]);
+            fwHelper = null;
+        }
+
+        LOG.debug("Got transfer finish ack 1");
+
+        unsetDeviceBusy();
+        updateProgress(100, false);
+        mSupport.sendData("transfer finish", commandReply, (byte) 0xa5);
+}
+
+    private void updateProgress(final int progressPercent, boolean ongoing) {
+        final TransactionBuilder builder = mSupport.createTransactionBuilder("update data upload progress to " + progressPercent);
+        updateProgress(builder, progressPercent, ongoing);
+        builder.queue(mSupport.getQueue());
+    }
+
+    private void updateProgress(final TransactionBuilder builder, final int progressPercent, boolean ongoing) {
+        final int uploadMessage;
+        if (fwHelper != null && fwHelper.isWatchface()) {
+            uploadMessage = R.string.uploading_watchface;
+        } else {
+            uploadMessage = R.string.updating_firmware;
+        }
+
+        builder.add(new SetProgressAction(
+                mSupport.getContext().getString(uploadMessage),
+                ongoing,
+                progressPercent,
+                mSupport.getContext()
+        ));
+    }
+
+    private void setDeviceBusy() {
+        final GBDevice device = mSupport.getDevice();
+        device.setBusyTask(mSupport.getContext().getString(R.string.updating_firmware));
+        device.sendDeviceUpdateIntent(mSupport.getContext());
+    }
+
+    private void unsetDeviceBusy() {
+        final GBDevice device = mSupport.getDevice();
+        if (device != null && device.isConnected()) {
+            if (device.isBusy()) {
+                device.unsetBusyTask();
+                device.sendDeviceUpdateIntent(mSupport.getContext());
+            }
+            device.sendDeviceUpdateIntent(mSupport.getContext());
+        }
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/cmfwatchpro/CmfFwHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/cmfwatchpro/CmfFwHelper.java
new file mode 100644
index 000000000..95c5ceb9a
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/cmfwatchpro/CmfFwHelper.java
@@ -0,0 +1,187 @@
+/*  Copyright (C) 2024 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.cmfwatchpro;
+
+import android.content.Context;
+import android.net.Uri;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import nodomain.freeyourgadget.gadgetbridge.util.ArrayUtils;
+import nodomain.freeyourgadget.gadgetbridge.util.FileUtils;
+import nodomain.freeyourgadget.gadgetbridge.util.StringUtils;
+import nodomain.freeyourgadget.gadgetbridge.util.UriHelper;
+
+public class CmfFwHelper {
+    private static final Logger LOG = LoggerFactory.getLogger(CmfFwHelper.class);
+
+    private static final byte[] HEADER_WATCHFACE = new byte[]{0x01, 0x00, 0x00, 0x02};
+    private static final byte[] HEADER_FIRMWARE = new byte[]{'A', 'O', 'T', 'A'};
+    private static final byte[] HEADER_AGPS = new byte[]{0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x31, 0x30, 0x30, 0x30, 0x30};
+
+    private final Uri uri;
+    private byte[] fw;
+    private boolean typeFirmware;
+    private boolean typeWatchface;
+    private boolean typeAgps;
+
+    private String name;
+    private String version;
+
+    public CmfFwHelper(final Uri uri, final Context context) {
+        this.uri = uri;
+
+        final UriHelper uriHelper;
+        try {
+            uriHelper = UriHelper.get(uri, context);
+        } catch (final IOException e) {
+            LOG.error("Failed to get uri helper for {}", uri, e);
+            return;
+        }
+
+        final int maxExpectedFileSize = 1024 * 1024 * 32; // 32MB
+
+        if (uriHelper.getFileSize() > maxExpectedFileSize) {
+            LOG.warn("File size is larger than the maximum expected file size of {}", maxExpectedFileSize);
+            return;
+        }
+
+        try (final InputStream in = new BufferedInputStream(uriHelper.openInputStream())) {
+            this.fw = FileUtils.readAll(in, maxExpectedFileSize);
+        } catch (final IOException e) {
+            LOG.error("Failed to read bytes from {}", uri, e);
+            return;
+        }
+
+        parseBytes();
+    }
+
+    public Uri getUri() {
+        return uri;
+    }
+
+    public boolean isValid() {
+        return isWatchface() || isFirmware() || isAgps();
+    }
+
+    public boolean isWatchface() {
+        return typeWatchface;
+    }
+
+    public boolean isFirmware() {
+        return typeFirmware;
+    }
+
+    public boolean isAgps() {
+        return typeAgps;
+    }
+
+    public String getDetails() {
+        return name != null ? name : (version != null ? version : "UNKNOWN");
+    }
+
+    public byte[] getBytes() {
+        return fw;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public void unsetFwBytes() {
+        this.fw = null;
+    }
+
+    private void parseBytes() {
+        if (parseAsWatchface()) {
+            assert name != null;
+            typeWatchface = true;
+        } else if (parseAsFirmware()) {
+            assert version != null;
+            typeFirmware = true;
+        } else if (parseAsAgps()) {
+            typeAgps = true;
+        }
+    }
+
+    private boolean parseAsWatchface() {
+        if (!ArrayUtils.equals(fw, HEADER_WATCHFACE, 4)) {
+            LOG.warn("File header not a watchface");
+            return false;
+        }
+
+        final String nameHeader = StringUtils.untilNullTerminator(fw, 8);
+        if (nameHeader == null) {
+            LOG.warn("watchface name not found in {}", uri);
+            return false;
+        }
+
+        // Confirm it's a watchface by finding the same name at the end
+        final String nameTrailer = StringUtils.untilNullTerminator(fw, fw.length - 28);
+        if (nameTrailer == null) {
+            LOG.warn("watchface name not found at the end of {}", uri);
+            return false;
+        }
+
+        if (!nameHeader.equals(nameTrailer)) {
+            LOG.warn("Names in header and trailer do not match");
+            return false;
+        }
+
+        name = nameHeader;
+
+        return true;
+    }
+
+    private boolean parseAsFirmware() {
+        if (!ArrayUtils.equals(fw, HEADER_FIRMWARE, 0)) {
+            LOG.warn("File header not a firmware");
+            return false;
+        }
+
+        // FIXME: This is not really the version, but build number?
+        final String versionHeader = StringUtils.untilNullTerminator(fw, 64);
+        if (versionHeader == null) {
+            LOG.warn("firmware version not found in {}", uri);
+            return false;
+        }
+
+        version = versionHeader;
+
+        return true;
+    }
+
+    private boolean parseAsAgps() {
+        if (!ArrayUtils.equals(fw, HEADER_AGPS, 0)) {
+            LOG.warn("File header not agps");
+            return false;
+        }
+
+        // TODO parse? and set something
+
+        return true;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/cmfwatchpro/CmfInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/cmfwatchpro/CmfInstallHandler.java
new file mode 100644
index 000000000..0c9c12475
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/cmfwatchpro/CmfInstallHandler.java
@@ -0,0 +1,90 @@
+/*  Copyright (C) 2024 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.cmfwatchpro;
+
+import android.content.Context;
+import android.net.Uri;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.activities.InstallActivity;
+import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.model.GenericItem;
+
+public class CmfInstallHandler implements InstallHandler {
+    protected final Uri mUri;
+    protected final Context mContext;
+    protected final CmfFwHelper helper;
+
+    public CmfInstallHandler(final Uri uri, final Context context) {
+        this.mUri = uri;
+        this.mContext = context;
+        this.helper = new CmfFwHelper(uri, context);
+    }
+
+    @Override
+    public boolean isValid() {
+        return helper.isValid();
+    }
+
+    @Override
+    public void validateInstallation(final InstallActivity installActivity, final GBDevice device) {
+        if (device.isBusy()) {
+            installActivity.setInfoText(device.getBusyTask());
+            installActivity.setInstallEnabled(false);
+            return;
+        }
+
+        if (!device.isInitialized()) {
+            installActivity.setInfoText(mContext.getString(R.string.fwapp_install_device_not_ready));
+            installActivity.setInstallEnabled(false);
+            return;
+        }
+
+        if (!helper.isValid()) {
+            installActivity.setInfoText(mContext.getString(R.string.fwapp_install_device_not_supported));
+            installActivity.setInstallEnabled(false);
+            return;
+        }
+
+        final GenericItem installItem = new GenericItem();
+        if (helper.isWatchface()) {
+            installItem.setIcon(R.drawable.ic_watchface);
+            installItem.setName(mContext.getString(R.string.kind_watchface));
+        } else if (helper.isFirmware()) {
+            installItem.setIcon(R.drawable.ic_firmware);
+            installItem.setName(mContext.getString(R.string.kind_firmware));
+        } else if (helper.isAgps()) {
+            installItem.setIcon(R.drawable.ic_firmware);
+            installItem.setName(mContext.getString(R.string.kind_agps_bundle));
+        } else {
+            installItem.setIcon(R.drawable.ic_device_unknown);
+            installItem.setName(mContext.getString(R.string.kind_invalid));
+        }
+
+        installItem.setDetails(helper.getDetails());
+
+        installActivity.setInfoText(mContext.getString(R.string.firmware_install_warning, "(unknown)"));
+        installActivity.setInstallItem(installItem);
+        installActivity.setInstallEnabled(true);
+    }
+
+    @Override
+    public void onStartInstall(final GBDevice device) {
+        helper.unsetFwBytes(); // free up memory
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/cmfwatchpro/CmfNotificationIcon.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/cmfwatchpro/CmfNotificationIcon.java
new file mode 100644
index 000000000..a03e97a76
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/cmfwatchpro/CmfNotificationIcon.java
@@ -0,0 +1,75 @@
+/*  Copyright (C) 2024 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.cmfwatchpro;
+
+import nodomain.freeyourgadget.gadgetbridge.model.NotificationSpec;
+
+public enum CmfNotificationIcon {
+    GENERIC_SMS(0),
+    WHATSAPP(8),
+    SNAPCHAT(9),
+    WHATSAPP_BUSINESS(10),
+    TRUECALLER(11), // blue phone
+    TELEGRAM(12),
+    FACEBOOK_MESSENGER(13),
+    IMO(14),
+    CALLAPP(15),
+    FACEBOOK(17),
+    INSTAGRAM(18),
+    TIKTOK(19),
+    LINE(20),
+    DISCORD(21),
+    GOOGLE_VOICE(22),
+    GMAIL(27),
+    OUTLOOK(29),
+    UNKNOWN(255),
+    ;
+
+    private final byte code;
+
+    CmfNotificationIcon(final int code) {
+        this.code = (byte) code;
+    }
+
+    public byte getCode() {
+        return code;
+    }
+
+    public static CmfNotificationIcon forNotification(final NotificationSpec notificationSpec) {
+        if (notificationSpec.type == null) {
+            return UNKNOWN;
+        }
+
+        try {
+            // If there's a matching enum, just return it
+            return CmfNotificationIcon.valueOf(notificationSpec.type.name());
+        } catch (final IllegalArgumentException ignored) {
+            // ignored
+        }
+
+        switch (notificationSpec.type.getGenericType()) {
+            case "generic_chat":
+                return GENERIC_SMS;
+            case "generic_email":
+                return GMAIL;
+            case "generic_phone":
+                return TRUECALLER;
+        }
+
+        return UNKNOWN;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/cmfwatchpro/CmfPreferences.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/cmfwatchpro/CmfPreferences.java
new file mode 100644
index 000000000..d241fd0a5
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/cmfwatchpro/CmfPreferences.java
@@ -0,0 +1,392 @@
+/*  Copyright (C) 2024 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.cmfwatchpro;
+
+import android.content.Context;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import nodomain.freeyourgadget.gadgetbridge.activities.SettingsActivity;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
+import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.model.ActivityUser;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
+import nodomain.freeyourgadget.gadgetbridge.util.GBPrefs;
+import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
+
+public class CmfPreferences {
+    private static final Logger LOG = LoggerFactory.getLogger(CmfPreferences.class);
+
+    private final CmfWatchProSupport mSupport;
+
+    protected CmfPreferences(final CmfWatchProSupport support) {
+        this.mSupport = support;
+    }
+
+    protected void onSetHeartRateMeasurementInterval(final int seconds) {
+        final boolean enabled = seconds == -1;
+        LOG.debug("Set HR smart monitoring = {}", enabled);
+
+        final byte[] cmd = new byte[]{0x01, (byte) (enabled ? 0x01 : 0x00)};
+        mSupport.sendCommand("set hr monitoring", CmfCommand.HEART_MONITORING_ENABLED_SET, cmd);
+    }
+
+    protected void onSendConfiguration(final String config) {
+        switch (config) {
+            case ActivityUser.PREF_USER_STEPS_GOAL:
+            case ActivityUser.PREF_USER_DISTANCE_METERS:
+            case ActivityUser.PREF_USER_CALORIES_BURNT:
+                setGoals();
+                return;
+            case SettingsActivity.PREF_MEASUREMENT_SYSTEM:
+                setMeasurementSystem();
+                return;
+            case DeviceSettingsPreferenceConst.PREF_LANGUAGE:
+                setLanguage();
+                return;
+            case DeviceSettingsPreferenceConst.PREF_TIMEFORMAT:
+                setTimeFormat();
+                return;
+            case DeviceSettingsPreferenceConst.PREF_LIFTWRIST_NOSHED:
+                setDisplayOnLift();
+                return;
+            case DeviceSettingsPreferenceConst.PREF_HEARTRATE_ALERT_LOW_THRESHOLD:
+            case DeviceSettingsPreferenceConst.PREF_HEARTRATE_ALERT_HIGH_THRESHOLD:
+            case DeviceSettingsPreferenceConst.PREF_HEARTRATE_ALERT_ACTIVE_HIGH_THRESHOLD:
+            case DeviceSettingsPreferenceConst.PREF_SPO2_LOW_ALERT_THRESHOLD:
+                setHeartAlerts();
+                return;
+            case DeviceSettingsPreferenceConst.PREF_SPO2_ALL_DAY_MONITORING:
+                setSpo2MonitoringInterval();
+                return;
+            case DeviceSettingsPreferenceConst.PREF_HEARTRATE_STRESS_MONITORING:
+                setStressMonitoringInterval();
+                return;
+            case DeviceSettingsPreferenceConst.PREF_INACTIVITY_ENABLE:
+            case DeviceSettingsPreferenceConst.PREF_INACTIVITY_THRESHOLD:
+            case DeviceSettingsPreferenceConst.PREF_INACTIVITY_START:
+            case DeviceSettingsPreferenceConst.PREF_INACTIVITY_END:
+            case DeviceSettingsPreferenceConst.PREF_INACTIVITY_DND:
+            case DeviceSettingsPreferenceConst.PREF_INACTIVITY_DND_START:
+            case DeviceSettingsPreferenceConst.PREF_INACTIVITY_DND_END:
+                setStandingReminder();
+            case DeviceSettingsPreferenceConst.PREF_HYDRATION_SWITCH:
+            case DeviceSettingsPreferenceConst.PREF_HYDRATION_PERIOD:
+            case DeviceSettingsPreferenceConst.PREF_HYDRATION_DND:
+            case DeviceSettingsPreferenceConst.PREF_HYDRATION_DND_START:
+            case DeviceSettingsPreferenceConst.PREF_HYDRATION_DND_END:
+                setHydrationReminder();
+                return;
+            case HuamiConst.PREF_WORKOUT_ACTIVITY_TYPES_SORTABLE:
+                setActivityTypes();
+                return;
+            // TODO call reminders
+        }
+
+        LOG.warn("Unknown config changed: {}", config);
+    }
+
+    private void setGoals() {
+        final ActivityUser activityUser = new ActivityUser();
+
+        if (activityUser.getStepsGoal() <= 0) {
+            LOG.warn("Invalid steps goal {}", activityUser.getStepsGoal());
+            return;
+        }
+
+        if (activityUser.getDistanceGoalMeters() <= 0) {
+            LOG.warn("Invalid distance goal {}", activityUser.getDistanceGoalMeters());
+            return;
+        }
+
+        if (activityUser.getCaloriesBurntGoal() <= 0) {
+            LOG.warn("Invalid calories goal {}", activityUser.getCaloriesBurntGoal());
+            return;
+        }
+
+        LOG.debug(
+                "Setting goals, steps={}, distance={}, calories={}",
+                activityUser.getStepsGoal(),
+                activityUser.getDistanceGoalMeters(),
+                activityUser.getCaloriesBurntGoal()
+        );
+
+        final ByteBuffer buf = ByteBuffer.allocate(10).order(ByteOrder.BIG_ENDIAN);
+
+        buf.put((byte) 0); // ?
+        buf.put((byte) 0); // ?
+        buf.putShort((short) activityUser.getStepsGoal());
+        buf.put((byte) 0); // ?
+        buf.put((byte) 0); // ?
+        buf.putShort((short) activityUser.getDistanceGoalMeters());
+        buf.putShort((short) activityUser.getCaloriesBurntGoal());
+
+        mSupport.sendCommand("set goals", CmfCommand.GOALS_SET, buf.array());
+    }
+
+    private void setMeasurementSystem() {
+        final Prefs prefs = mSupport.getDevicePrefs();
+        final String measurementSystem = prefs.getString(SettingsActivity.PREF_MEASUREMENT_SYSTEM, "metric");
+
+        LOG.debug("Setting measurement system to {}", measurementSystem);
+
+        final byte unitByte = (byte) ("metric".equals(measurementSystem) ? 0x00 : 0x01);
+
+        final byte[] cmd = new byte[]{0x01, unitByte};
+        final TransactionBuilder builder = mSupport.createTransactionBuilder("set measurement system");
+        mSupport.sendCommand(builder, CmfCommand.UNIT_LENGTH, cmd);
+        mSupport.sendCommand(builder, CmfCommand.UNIT_TEMPERATURE, cmd);
+        builder.queue(mSupport.getQueue());
+    }
+
+    private void setLanguage() {
+        String localeString = mSupport.getDevicePrefs().getString(
+                DeviceSettingsPreferenceConst.PREF_LANGUAGE, DeviceSettingsPreferenceConst.PREF_LANGUAGE_AUTO
+        );
+        if (DeviceSettingsPreferenceConst.PREF_LANGUAGE_AUTO.equals(localeString)) {
+            String language = Locale.getDefault().getLanguage();
+            String country = Locale.getDefault().getCountry();
+
+            if (nodomain.freeyourgadget.gadgetbridge.util.StringUtils.isNullOrEmpty(country)) {
+                // sometimes country is null, no idea why, guess it.
+                country = language;
+            }
+            localeString = (language + "_" + country).toLowerCase(Locale.ROOT);
+        }
+
+        String languageCommand = null;
+        if (LANGUAGES.containsKey(localeString)) {
+            languageCommand = localeString;
+        } else {
+            // Break down the language code and attempt to find it
+            final String[] languageParts = localeString.split("_");
+            for (int i = 0; i < languageParts.length; i++) {
+                if (LANGUAGES.containsKey(languageParts[0])) {
+                    languageCommand = languageParts[0];
+                    break;
+                }
+            }
+        }
+
+        if (languageCommand == null) {
+            LOG.warn("Unknown language {}", localeString);
+            return;
+        }
+
+        LOG.info("Set language: {} -> {}", localeString, languageCommand);
+
+        // FIXME watch ignores language?
+        mSupport.sendCommand("set language", CmfCommand.LANGUAGE_SET, languageCommand.getBytes());
+    }
+
+    private void setTimeFormat() {
+        final GBPrefs gbPrefs = new GBPrefs(mSupport.getDevicePrefs());
+        final String timeFormat = gbPrefs.getTimeFormat();
+
+        LOG.info("Setting time format to {}", timeFormat);
+
+        final byte timeFormatByte = (byte) (timeFormat.equals("24h") ? 0x00 : 0x01);
+
+        mSupport.sendCommand("set time format", CmfCommand.TIME_FORMAT, timeFormatByte);
+    }
+
+    private void setDisplayOnLift() {
+        final Prefs prefs = mSupport.getDevicePrefs();
+
+        boolean enabled = prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_LIFTWRIST_NOSHED, false);
+
+        mSupport.sendCommand("set display on lift", CmfCommand.WAKE_ON_WRIST_RAISE, (byte) (enabled ? 0x01 : 0x00));
+    }
+
+    private void setHeartAlerts() {
+        final Prefs prefs = mSupport.getDevicePrefs();
+
+        final int hrAlertActiveHigh = prefs.getInt(DeviceSettingsPreferenceConst.PREF_HEARTRATE_ALERT_ACTIVE_HIGH_THRESHOLD, 0);
+        final int hrAlertHigh = prefs.getInt(DeviceSettingsPreferenceConst.PREF_HEARTRATE_ALERT_HIGH_THRESHOLD, 0);
+        final int hrAlertLow = prefs.getInt(DeviceSettingsPreferenceConst.PREF_HEARTRATE_ALERT_LOW_THRESHOLD, 0);
+        final int spo2alert = prefs.getInt(DeviceSettingsPreferenceConst.PREF_SPO2_LOW_ALERT_THRESHOLD, 0);
+
+        final ByteBuffer buf;
+        if (hrAlertActiveHigh == 0 && hrAlertHigh == 0 && hrAlertLow == 0 && spo2alert == 0) {
+            buf = ByteBuffer.allocate(1).order(ByteOrder.BIG_ENDIAN);
+            buf.put((byte) 0x00);
+        } else {
+            buf = ByteBuffer.allocate(9).order(ByteOrder.BIG_ENDIAN);
+            buf.put((byte) 0x01);
+            buf.put((byte) hrAlertLow);
+            buf.put((byte) (hrAlertHigh != 0 ? hrAlertHigh : 255));
+            buf.put((byte) (hrAlertActiveHigh != 0 ? hrAlertActiveHigh : 255));
+            buf.put((byte) spo2alert);
+            buf.put((byte) 0x00); // ?
+            buf.put((byte) 0x00); // ?
+            buf.put((byte) 0x00); // ?
+            buf.put((byte) 0x00); // ?
+        }
+
+        mSupport.sendCommand("set heart monitoring alerts", CmfCommand.HEART_MONITORING_ALERTS, buf.array());
+    }
+
+    private void setSpo2MonitoringInterval() {
+        final Prefs prefs = mSupport.getDevicePrefs();
+        final boolean enabled = prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_SPO2_ALL_DAY_MONITORING, false);
+
+        LOG.debug("Set SpO2 monitoring = {}", enabled);
+
+        final byte[] cmd = new byte[]{0x02, (byte) (enabled ? 0x01 : 0x00)};
+        mSupport.sendCommand("set spo2 monitoring", CmfCommand.HEART_MONITORING_ENABLED_SET, cmd);
+    }
+
+    private void setStressMonitoringInterval() {
+        final Prefs prefs = mSupport.getDevicePrefs();
+        final boolean enabled = prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_HEARTRATE_STRESS_MONITORING, false);
+
+        LOG.debug("Set stress monitoring = {}", enabled);
+
+        final byte[] cmd = new byte[]{0x04, (byte) (enabled ? 0x01 : 0x00)};
+        mSupport.sendCommand("set stress monitoring", CmfCommand.HEART_MONITORING_ENABLED_SET, cmd);
+    }
+
+    private void setStandingReminder() {
+        final Prefs prefs = mSupport.getDevicePrefs();
+        final boolean enabled = prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_INACTIVITY_ENABLE, false);
+        final int threshold = prefs.getInt(DeviceSettingsPreferenceConst.PREF_INACTIVITY_THRESHOLD, 60);
+        final boolean dnd = prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_INACTIVITY_DND, false);
+        final Date dndStart = prefs.getTimePreference(DeviceSettingsPreferenceConst.PREF_INACTIVITY_DND_START, "12:00");
+        final Date dndEnd = prefs.getTimePreference(DeviceSettingsPreferenceConst.PREF_INACTIVITY_DND_END, "14:00");
+
+        final Calendar calendar = GregorianCalendar.getInstance();
+
+        if (threshold < 0 || threshold > 180) {
+            LOG.error("Invalid inactivity threshold: {}", threshold);
+            return;
+        }
+
+        final ByteBuffer buf = ByteBuffer.allocate(11).order(ByteOrder.BIG_ENDIAN);
+        buf.put((byte) (enabled ? 0x01 : 0x00));
+        buf.putShort((short) threshold);
+
+        if (enabled && dnd) {
+            calendar.setTime(dndStart);
+            buf.putInt((calendar.get(Calendar.HOUR_OF_DAY) * 3600 + calendar.get(Calendar.MINUTE) * 60));
+            calendar.setTime(dndEnd);
+            buf.putInt((calendar.get(Calendar.HOUR_OF_DAY) * 3600 + calendar.get(Calendar.MINUTE) * 60));
+        } else {
+            buf.putInt(0);
+            buf.putInt(0);
+        }
+
+        mSupport.sendCommand("set standing reminders", CmfCommand.STANDING_REMINDER_SET, buf.array());
+    }
+
+    private void setHydrationReminder() {
+        final Prefs prefs = mSupport.getDevicePrefs();
+        final boolean enabled = prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_HYDRATION_SWITCH, false);
+        final int threshold = prefs.getInt(DeviceSettingsPreferenceConst.PREF_HYDRATION_PERIOD, 60);
+        final boolean dnd = prefs.getBoolean(DeviceSettingsPreferenceConst.PREF_HYDRATION_DND, false);
+        final Date dndStart = prefs.getTimePreference(DeviceSettingsPreferenceConst.PREF_HYDRATION_DND_START, "12:00");
+        final Date dndEnd = prefs.getTimePreference(DeviceSettingsPreferenceConst.PREF_HYDRATION_DND_END, "14:00");
+
+        final Calendar calendar = GregorianCalendar.getInstance();
+
+        if (threshold < 0 || threshold > 180) {
+            LOG.error("Invalid hydration threshold: {}", threshold);
+            return;
+        }
+
+        final ByteBuffer buf = ByteBuffer.allocate(11).order(ByteOrder.BIG_ENDIAN);
+        buf.put((byte) (enabled ? 0x01 : 0x00));
+        buf.putShort((short) threshold);
+
+        if (enabled && dnd) {
+            calendar.setTime(dndStart);
+            buf.putInt((calendar.get(Calendar.HOUR_OF_DAY) * 3600 + calendar.get(Calendar.MINUTE) * 60));
+            calendar.setTime(dndEnd);
+            buf.putInt((calendar.get(Calendar.HOUR_OF_DAY) * 3600 + calendar.get(Calendar.MINUTE) * 60));
+        } else {
+            buf.putInt(0);
+            buf.putInt(0);
+        }
+
+        mSupport.sendCommand("set hydration reminders", CmfCommand.WATER_REMINDER_SET, buf.array());
+    }
+
+    private void setActivityTypes() {
+        final Prefs prefs = mSupport.getDevicePrefs();
+        List<String> activityTypes = new ArrayList<>(prefs.getList(HuamiConst.PREF_WORKOUT_ACTIVITY_TYPES_SORTABLE, Collections.emptyList()));
+
+        if (activityTypes.isEmpty()) {
+            activityTypes.add(CmfActivityType.OUTDOOR_RUNNING.name().toLowerCase(Locale.ROOT));
+            activityTypes.add(CmfActivityType.INDOOR_RUNNING.name().toLowerCase(Locale.ROOT));
+        }
+
+        if (activityTypes.size() > 36) {
+            LOG.warn("Truncating activity types list to 36");
+            activityTypes = activityTypes.subList(0, 36);
+        }
+
+        final ByteBuffer buf = ByteBuffer.allocate(activityTypes.size() + 1);
+        buf.put((byte) activityTypes.size());
+
+        for (final String activityType : activityTypes) {
+            buf.put(CmfActivityType.valueOf(activityType.toUpperCase(Locale.ROOT)).getCode());
+        }
+
+        mSupport.sendCommand("set activity types", CmfCommand.SPORTS_SET, buf.array());
+    }
+
+    protected boolean onCommand(final CmfCommand cmd, final byte[] payload) {
+        // TODO handle preference replies from watch
+        return false;
+    }
+
+    private Context getContext() {
+        return mSupport.getContext();
+    }
+
+    private GBDevice getDevice() {
+        return mSupport.getDevice();
+    }
+
+    private static final Map<String, String> LANGUAGES = new HashMap<String, String>() {{
+        put("ar", "ar_SA");
+        put("de", "de_DE");
+        put("en", "en_US");
+        put("es", "es_ES");
+        put("fr", "fr_FR");
+        put("hi", "hi_IN");
+        put("in", "id_ID");
+        put("it", "it_IT");
+        put("ja", "ja_JP");
+        put("ko", "ko_KO");
+        put("zh_cn", "zh_CN");
+        put("zh_hk", "zh_HK");
+    }};
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/cmfwatchpro/CmfWatchProSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/cmfwatchpro/CmfWatchProSupport.java
new file mode 100644
index 000000000..2325a48a7
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/cmfwatchpro/CmfWatchProSupport.java
@@ -0,0 +1,594 @@
+/*  Copyright (C) 2024 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.cmfwatchpro;
+
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothGatt;
+import android.bluetooth.BluetoothGattCharacteristic;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.media.AudioManager;
+import android.net.Uri;
+import android.os.Build;
+
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.charset.StandardCharsets;
+import java.security.GeneralSecurityException;
+import java.security.MessageDigest;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.TimeZone;
+import java.util.UUID;
+
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
+import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventBatteryInfo;
+import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventFindPhone;
+import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventMusicControl;
+import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventUpdateDeviceInfo;
+import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventVersionInfo;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.model.Alarm;
+import nodomain.freeyourgadget.gadgetbridge.model.BatteryState;
+import nodomain.freeyourgadget.gadgetbridge.model.CallSpec;
+import nodomain.freeyourgadget.gadgetbridge.model.CannedMessagesSpec;
+import nodomain.freeyourgadget.gadgetbridge.model.Contact;
+import nodomain.freeyourgadget.gadgetbridge.model.MusicSpec;
+import nodomain.freeyourgadget.gadgetbridge.model.MusicStateSpec;
+import nodomain.freeyourgadget.gadgetbridge.model.NotificationSpec;
+import nodomain.freeyourgadget.gadgetbridge.model.WeatherSpec;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.AbstractBTLEDeviceSupport;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.BLETypeConversions;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetDeviceStateAction;
+import nodomain.freeyourgadget.gadgetbridge.service.serial.GBDeviceProtocol;
+import nodomain.freeyourgadget.gadgetbridge.util.GB;
+import nodomain.freeyourgadget.gadgetbridge.util.MediaManager;
+import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
+
+public class CmfWatchProSupport extends AbstractBTLEDeviceSupport implements CmfCharacteristic.Handler {
+    private static final Logger LOG = LoggerFactory.getLogger(CmfWatchProSupport.class);
+
+    public static final UUID UUID_SERVICE_CMF_CMD = UUID.fromString("0000fff0-0000-1000-8000-00805f9b34fb");
+    public static final UUID UUID_CHARACTERISTIC_CMF_COMMAND_READ = UUID.fromString("0000fff1-0000-1000-8000-00805f9b34fb");
+    public static final UUID UUID_CHARACTERISTIC_CMF_COMMAND_WRITE = UUID.fromString("0000fff2-0000-1000-8000-00805f9b34fb");
+
+    public static final UUID UUID_SERVICE_CMF_DATA = UUID.fromString("02f00000-0000-0000-0000-00000000ffe0");
+    public static final UUID UUID_CHARACTERISTIC_CMF_DATA_WRITE = UUID.fromString("02f00000-0000-0000-0000-00000000ffe1");
+    public static final UUID UUID_CHARACTERISTIC_CMF_DATA_READ = UUID.fromString("02f00000-0000-0000-0000-00000000ffe2");
+
+    // An a5 byte is used a lot in single payloads, probably as a "proof of encryption"?
+    public static final byte A5 = (byte) 0xa5;
+
+    private CmfCharacteristic characteristicCommandRead;
+    private CmfCharacteristic characteristicCommandWrite;
+    private CmfCharacteristic characteristicDataRead;
+    private CmfCharacteristic characteristicDataWrite;
+
+    private final CmfActivitySync activitySync = new CmfActivitySync(this);
+    private final CmfPreferences preferences = new CmfPreferences(this);
+    private CmfDataUploader dataUploader;
+
+    protected MediaManager mediaManager = null;
+
+    public CmfWatchProSupport() {
+        super(LOG);
+        addSupportedService(UUID_SERVICE_CMF_CMD);
+        addSupportedService(UUID_SERVICE_CMF_DATA);
+    }
+
+    @Override
+    public boolean useAutoConnect() {
+        return true;
+    }
+
+    @Override
+    public boolean getImplicitCallbackModify() {
+        return false;
+    }
+
+    @Override
+    public boolean getSendWriteRequestResponse() {
+        return true;
+    }
+
+    @Override
+    protected TransactionBuilder initializeDevice(final TransactionBuilder builder) {
+        builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.INITIALIZING, getContext()));
+
+        final BluetoothGattCharacteristic btCharacteristicCommandRead = getCharacteristic(UUID_CHARACTERISTIC_CMF_COMMAND_READ);
+        if (btCharacteristicCommandRead == null) {
+            LOG.warn("Characteristic command read is null, will attempt to reconnect");
+            builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.WAITING_FOR_RECONNECT, getContext()));
+            return builder;
+        }
+
+        final BluetoothGattCharacteristic btCharacteristicCommandWrite = getCharacteristic(UUID_CHARACTERISTIC_CMF_COMMAND_WRITE);
+        if (btCharacteristicCommandWrite == null) {
+            LOG.warn("Characteristic command write is null, will attempt to reconnect");
+            builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.WAITING_FOR_RECONNECT, getContext()));
+            return builder;
+        }
+
+        final BluetoothGattCharacteristic btCharacteristicDataWrite = getCharacteristic(UUID_CHARACTERISTIC_CMF_DATA_WRITE);
+        if (btCharacteristicDataWrite == null) {
+            LOG.warn("Characteristic data write is null, will attempt to reconnect");
+            builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.WAITING_FOR_RECONNECT, getContext()));
+            return builder;
+        }
+
+        final BluetoothGattCharacteristic btCharacteristicDataRead = getCharacteristic(UUID_CHARACTERISTIC_CMF_DATA_READ);
+        if (btCharacteristicDataRead == null) {
+            LOG.warn("Characteristic data read is null, will attempt to reconnect");
+            builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.WAITING_FOR_RECONNECT, getContext()));
+            return builder;
+        }
+
+        dataUploader = new CmfDataUploader(this);
+
+        characteristicCommandRead = new CmfCharacteristic(btCharacteristicCommandRead, this);
+        characteristicCommandWrite = new CmfCharacteristic(btCharacteristicCommandWrite, null);
+        characteristicDataRead = new CmfCharacteristic(btCharacteristicDataRead, dataUploader);
+        characteristicDataWrite = new CmfCharacteristic(btCharacteristicDataWrite, null);
+
+        final byte[] secretKey = getSecretKey(getDevice());
+        characteristicCommandRead.setSessionKey(secretKey);
+        characteristicCommandWrite.setSessionKey(secretKey);
+        characteristicDataRead.setSessionKey(secretKey);
+        characteristicDataWrite.setSessionKey(secretKey);
+
+        builder.notify(btCharacteristicCommandWrite, true);
+        builder.notify(btCharacteristicCommandRead, true);
+        builder.notify(btCharacteristicDataWrite, true);
+        builder.notify(btCharacteristicDataRead, true);
+
+        builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.AUTHENTICATING, getContext()));
+
+        sendCommand(builder, CmfCommand.AUTH_PHONE_NAME, ArrayUtils.addAll(new byte[]{A5}, Build.MODEL.getBytes(StandardCharsets.UTF_8)));
+
+        return builder;
+    }
+
+    @Override
+    public void setContext(final GBDevice device, final BluetoothAdapter adapter, final Context context) {
+        super.setContext(device, adapter, context);
+
+        mediaManager = new MediaManager(context);
+    }
+
+    @Override
+    protected Prefs getDevicePrefs() {
+        return super.getDevicePrefs();
+    }
+
+    @Override
+    public boolean onCharacteristicChanged(final BluetoothGatt gatt,
+                                           final BluetoothGattCharacteristic characteristic) {
+        if (super.onCharacteristicChanged(gatt, characteristic)) {
+            return true;
+        }
+
+        final UUID characteristicUUID = characteristic.getUuid();
+        final byte[] value = characteristic.getValue();
+
+        if (characteristicUUID.equals(characteristicCommandRead.getCharacteristicUUID())) {
+            characteristicCommandRead.onCharacteristicChanged(value);
+            return true;
+        } else if (characteristicUUID.equals(characteristicDataRead.getCharacteristicUUID())) {
+            characteristicDataRead.onCharacteristicChanged(value);
+            return true;
+        }
+
+        LOG.warn("Unhandled characteristic changed: {} {}", characteristicUUID, GB.hexdump(value));
+        return false;
+    }
+
+    @Override
+    public void onMtuChanged(final BluetoothGatt gatt, final int mtu, final int status) {
+        super.onMtuChanged(gatt, mtu, status);
+
+        characteristicCommandRead.setMtu(mtu);
+        characteristicCommandWrite.setMtu(mtu);
+        characteristicDataRead.setMtu(mtu);
+        characteristicDataWrite.setMtu(mtu);
+    }
+
+    @Override
+    public void onCommand(final CmfCommand cmd, final byte[] payload) {
+        if (activitySync.onCommand(cmd, payload)) {
+            return;
+        }
+
+        if (preferences.onCommand(cmd, payload)) {
+            return;
+        }
+
+        switch (cmd) {
+            case AUTH_WATCH_MAC:
+                LOG.debug("Got auth watch mac, requesting nonce");
+                sendCommand("auth request nonce", CmfCommand.AUTH_NONCE_REQUEST, A5);
+                return;
+            case AUTH_NONCE_REPLY:
+                LOG.debug("Got auth nonce");
+
+                try {
+                    final MessageDigest sha256 = MessageDigest.getInstance("SHA-256");
+                    sha256.update(payload);
+                    sha256.update(getSecretKey(getDevice()));
+                    final byte[] digest = sha256.digest();
+                    final byte[] sessionKey = ArrayUtils.subarray(digest, 0, 16);
+                    LOG.debug("New session key: {}", GB.hexdump(sessionKey));
+                    characteristicCommandRead.setSessionKey(sessionKey);
+                    characteristicCommandWrite.setSessionKey(sessionKey);
+                    characteristicDataRead.setSessionKey(sessionKey);
+                    characteristicDataWrite.setSessionKey(sessionKey);
+                } catch (final GeneralSecurityException e) {
+                    LOG.error("Failed to compute session key from auth nonce", e);
+                    return;
+                }
+
+                sendCommand("auth confirm", CmfCommand.AUTHENTICATED_CONFIRM_REQUEST, A5);
+                return;
+            case AUTHENTICATED_CONFIRM_REPLY:
+                LOG.debug("Authentication confirmed, starting phase 2 initialization");
+
+                final TransactionBuilder phase2builder = createTransactionBuilder("phase 2 initialize");
+                setTime(phase2builder);
+                sendCommand(phase2builder, CmfCommand.FIRMWARE_VERSION_GET);
+                sendCommand(phase2builder, CmfCommand.SERIAL_NUMBER_GET);
+                //sendCommand(phase2builder, CmfCommand.STANDING_REMINDER_GET);
+                //sendCommand(phase2builder, CmfCommand.WATER_REMINDER_GET);
+                //sendCommand(phase2builder, CmfCommand.CONTACTS_GET);
+                //sendCommand(phase2builder, CmfCommand.ALARMS_GET);
+                // TODO premature to mark as initialized?
+                phase2builder.add(new SetDeviceStateAction(getDevice(), GBDevice.State.INITIALIZED, getContext()));
+                phase2builder.queue(getQueue());
+                return;
+            case BATTERY:
+                final int battery = payload[0] & 0xff;
+                final boolean charging = payload[1] == 0x01;
+                LOG.debug("Got battery: level={} charging={}", battery, charging);
+                final GBDeviceEventBatteryInfo eventBatteryInfo = new GBDeviceEventBatteryInfo();
+                eventBatteryInfo.level = battery;
+                eventBatteryInfo.state = charging ? BatteryState.BATTERY_CHARGING : BatteryState.BATTERY_NORMAL;
+                evaluateGBDeviceEvent(eventBatteryInfo);
+                return;
+            case FIRMWARE_VERSION_RET:
+                final String[] fwParts = new String[payload.length];
+                for (int i = 0; i < payload.length; i++) {
+                    fwParts[i] = String.valueOf(payload[i]);
+                }
+                final String fw = String.join(".", fwParts);
+                LOG.debug("Got firmware version: {}", fw);
+                final GBDeviceEventVersionInfo gbDeviceEventVersionInfo = new GBDeviceEventVersionInfo();
+                gbDeviceEventVersionInfo.fwVersion = fw;
+                gbDeviceEventVersionInfo.fwVersion2 = "N/A";
+                //gbDeviceEventVersionInfo.hwVersion = "?"; // TODO how?
+                evaluateGBDeviceEvent(gbDeviceEventVersionInfo);
+                return;
+            case SERIAL_NUMBER_RET:
+                if (payload.length != (payload[0] & 0xff) + 1) {
+                    LOG.warn("Unexpected serial number payload length: {}, expected {}", payload.length, (payload[0] & 0xff));
+                    return;
+                }
+                final String serialNumber = new String(ArrayUtils.subarray(payload, 1, payload.length - 2));
+                LOG.debug("Got serial number: {}", serialNumber);
+                final GBDeviceEventUpdateDeviceInfo gbDeviceEventUpdateDeviceInfo = new GBDeviceEventUpdateDeviceInfo("SERIAL: ", serialNumber);
+                evaluateGBDeviceEvent(gbDeviceEventUpdateDeviceInfo);
+                return;
+            case FIND_PHONE:
+                final GBDeviceEventFindPhone findPhoneEvent = new GBDeviceEventFindPhone();
+                if (payload[0] == 1) {
+                    findPhoneEvent.event = GBDeviceEventFindPhone.Event.START;
+                } else {
+                    findPhoneEvent.event = GBDeviceEventFindPhone.Event.STOP;
+                }
+                evaluateGBDeviceEvent(findPhoneEvent);
+                return;
+            case MUSIC_INFO_ACK:
+                LOG.debug("Got music info ack");
+                break;
+            case MUSIC_BUTTON:
+                final GBDeviceEventMusicControl deviceEventMusicControl = new GBDeviceEventMusicControl();
+                switch (BLETypeConversions.toUint16(payload)) {
+                    case 0x0003:
+                        deviceEventMusicControl.event = GBDeviceEventMusicControl.Event.VOLUMEDOWN;
+                        break;
+                    case 0x0103:
+                        deviceEventMusicControl.event = GBDeviceEventMusicControl.Event.VOLUMEUP;
+                        break;
+                    case 0x0001:
+                        deviceEventMusicControl.event = GBDeviceEventMusicControl.Event.PAUSE;
+                        break;
+                    case 0x0101:
+                        deviceEventMusicControl.event = GBDeviceEventMusicControl.Event.PLAY;
+                        break;
+                    case 0x0102:
+                        deviceEventMusicControl.event = GBDeviceEventMusicControl.Event.NEXT;
+                        break;
+                    case 0x0002:
+                        deviceEventMusicControl.event = GBDeviceEventMusicControl.Event.PREVIOUS;
+                        break;
+                    default:
+                        LOG.warn("Unexpected media button key {}", GB.hexdump(payload));
+                        return;
+                }
+                LOG.debug("Got media button {}", deviceEventMusicControl.event);
+                evaluateGBDeviceEvent(deviceEventMusicControl);
+                break;
+            default:
+                LOG.warn("Unhandled command: {}", cmd);
+        }
+    }
+
+    public void sendCommand(final String taskName, final CmfCommand cmd, final byte... payload) {
+        final TransactionBuilder builder = createTransactionBuilder(taskName);
+        sendCommand(builder, cmd, payload);
+        builder.queue(getQueue());
+    }
+
+    public void sendCommand(final TransactionBuilder builder, final CmfCommand cmd, final byte... payload) {
+        characteristicCommandWrite.sendCommand(builder, cmd, payload);
+    }
+
+    public void sendData(final String taskName, final CmfCommand cmd, final byte... payload) {
+        final TransactionBuilder builder = createTransactionBuilder(taskName);
+        characteristicDataWrite.sendCommand(builder, cmd, payload);
+        builder.queue(getQueue());
+    }
+
+    private static byte[] getSecretKey(final GBDevice device) {
+        final byte[] authKeyBytes = new byte[16];
+
+        final SharedPreferences sharedPrefs = GBApplication.getDeviceSpecificSharedPrefs(device.getAddress());
+
+        final String authKey = sharedPrefs.getString("authkey", "").trim();
+        if (StringUtils.isNotBlank(authKey)) {
+            final byte[] srcBytes;
+            // Allow both with and without 0x, to avoid user mistakes
+            if (authKey.length() == 34 && authKey.startsWith("0x")) {
+                srcBytes = GB.hexStringToByteArray(authKey.trim().substring(2));
+            } else {
+                srcBytes = GB.hexStringToByteArray(authKey.trim());
+            }
+            System.arraycopy(srcBytes, 0, authKeyBytes, 0, Math.min(srcBytes.length, 16));
+        }
+
+        return authKeyBytes;
+    }
+
+    @Override
+    public void onNotification(final NotificationSpec notificationSpec) {
+        if (!getDevicePrefs().getBoolean(DeviceSettingsPreferenceConst.PREF_SEND_APP_NOTIFICATIONS, true)) {
+            LOG.debug("App notifications disabled - ignoring");
+            return;
+        }
+
+        final String senderOrTitle = nodomain.freeyourgadget.gadgetbridge.util.StringUtils.getFirstOf(
+                notificationSpec.sender,
+                notificationSpec.title
+        );
+
+        final String body = nodomain.freeyourgadget.gadgetbridge.util.StringUtils.getFirstOf(notificationSpec.body, "");
+
+        final byte[] senderOrTitleBytes = nodomain.freeyourgadget.gadgetbridge.util.StringUtils.truncateToBytes(senderOrTitle, 20); // TODO confirm max
+        final byte[] bodyBytes = nodomain.freeyourgadget.gadgetbridge.util.StringUtils.truncateToBytes(body, 128); // TODO confirm max
+
+        final ByteBuffer buf = ByteBuffer.allocate(7 + senderOrTitleBytes.length + bodyBytes.length)
+                .order(ByteOrder.BIG_ENDIAN);
+
+        buf.put(CmfNotificationIcon.forNotification(notificationSpec).getCode());
+        buf.put((byte) 0x00); // ?
+        buf.putInt((int) (notificationSpec.when / 1000));
+        buf.put((byte) senderOrTitleBytes.length);
+        buf.put(senderOrTitleBytes);
+        buf.put(bodyBytes);
+
+        sendCommand("send notification", CmfCommand.APP_NOTIFICATION, buf.array());
+    }
+
+    @Override
+    public void onSetContacts(final ArrayList<? extends Contact> contacts) {
+        final ByteBuffer buf = ByteBuffer.allocate(57 * contacts.size()).order(ByteOrder.BIG_ENDIAN);
+
+        for (final Contact contact : contacts) {
+            final byte[] nameBytes = nodomain.freeyourgadget.gadgetbridge.util.StringUtils.truncateToBytes(contact.getName(), 32);
+            buf.put(nameBytes);
+            buf.put(new byte[32 - nameBytes.length]);
+
+            final byte[] numberBytes = nodomain.freeyourgadget.gadgetbridge.util.StringUtils.truncateToBytes(contact.getNumber(), 25);
+            buf.put(numberBytes);
+            buf.put(new byte[25 - numberBytes.length]);
+        }
+
+        sendCommand("set contacts", CmfCommand.CONTACTS_SET, ArrayUtils.subarray(buf.array(), 0, buf.position()));
+    }
+
+    @Override
+    public void onSetTime() {
+        final TransactionBuilder builder = createTransactionBuilder("set time");
+        setTime(builder);
+        builder.queue(getQueue());
+    }
+
+    private void setTime(final TransactionBuilder builder) {
+        final Calendar cal = Calendar.getInstance();
+        final ByteBuffer buf = ByteBuffer.allocate(8).order(ByteOrder.BIG_ENDIAN);
+        buf.putInt((int) (cal.getTimeInMillis() / 1000));
+        buf.putInt(TimeZone.getDefault().getOffset(cal.getTimeInMillis()));
+        sendCommand(builder, CmfCommand.TIME, buf.array());
+    }
+
+    @Override
+    public void onSetAlarms(final ArrayList<? extends Alarm> alarms) {
+        final ByteBuffer buf = ByteBuffer.allocate(40 * alarms.size()).order(ByteOrder.BIG_ENDIAN);
+
+        int i = 0;
+        for (final Alarm alarm : alarms) {
+            if (alarm.getUnused()) {
+                continue;
+            }
+
+            buf.putInt(alarm.getHour() * 3600 + alarm.getMinute() * 60);
+            buf.put((byte) i++);
+            buf.put((byte) (alarm.getEnabled() ? 0x01 : 0x00));
+            buf.put((byte) alarm.getRepetition());
+            buf.put((byte) 0xff); // ?
+            buf.put(new byte[24]); // ?
+
+            // alarm labels do not show up on watch, even in official app
+            final byte[] labelBytes = nodomain.freeyourgadget.gadgetbridge.util.StringUtils.truncateToBytes(alarm.getTitle(), 8);
+            buf.put(new byte[8 - labelBytes.length]);
+            buf.put(labelBytes);
+        }
+
+        sendCommand("set alarms", CmfCommand.ALARMS_SET, ArrayUtils.subarray(buf.array(), 0, buf.position()));
+    }
+
+    @Override
+    public void onSetCallState(final CallSpec callSpec) {
+        super.onSetCallState(callSpec); // TODO onSetCallState
+    }
+
+    @Override
+    public void onSetCannedMessages(final CannedMessagesSpec cannedMessagesSpec) {
+        super.onSetCannedMessages(cannedMessagesSpec); // TODO onSetCannedMessages
+    }
+
+    @Override
+    public void onSetMusicState(final MusicStateSpec stateSpec) {
+        if (mediaManager.onSetMusicState(stateSpec)) {
+            sendMusicStateToDevice();
+        }
+    }
+
+    @Override
+    public void onSetPhoneVolume(final float ignoredVolume) {
+        sendMusicStateToDevice();
+    }
+
+    @Override
+    public void onSetMusicInfo(final MusicSpec musicSpec) {
+        if (mediaManager.onSetMusicInfo(musicSpec)) {
+            sendMusicStateToDevice();
+        }
+    }
+
+    private void sendMusicStateToDevice() {
+        final MusicSpec musicSpec = mediaManager.getBufferMusicSpec();
+        final MusicStateSpec musicStateSpec = mediaManager.getBufferMusicStateSpec();
+
+        final byte stateByte;
+        if (musicSpec == null || musicStateSpec == null) {
+            stateByte = 0x00;
+        } else if (musicStateSpec.state == MusicStateSpec.STATE_PLAYING) {
+            stateByte = 0x01;
+        } else {
+            stateByte = 0x02;
+        }
+
+        final byte[] track;
+        final byte[] artist;
+
+        if (musicSpec != null) {
+            track = nodomain.freeyourgadget.gadgetbridge.util.StringUtils.truncateToBytes(musicSpec.track, 63);
+            artist = nodomain.freeyourgadget.gadgetbridge.util.StringUtils.truncateToBytes(musicSpec.artist, 63);
+        } else {
+            track = new byte[0];
+            artist = new byte[0];
+        }
+
+        final AudioManager audioManager = (AudioManager) getContext().getSystemService(Context.AUDIO_SERVICE);
+        final int volumeLevel = audioManager.getStreamVolume(AudioManager.STREAM_MUSIC);
+        final int volumeMax = audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC);
+
+        final ByteBuffer buf = ByteBuffer.allocate(131);
+        buf.put(stateByte);
+        buf.put((byte) volumeLevel);
+        buf.put((byte) volumeMax);
+        buf.put(track);
+        buf.put(new byte[64 - track.length]);
+        buf.put(artist);
+        buf.put(new byte[64 - artist.length]);
+
+        sendCommand("set music info", CmfCommand.MUSIC_INFO_SET, buf.array());
+    }
+
+    @Override
+    public void onInstallApp(final Uri uri) {
+        dataUploader.onInstallApp(uri);
+    }
+
+    @Override
+    public void onAppInfoReq() {
+        super.onAppInfoReq(); // TODO onAppInfoReq
+    }
+
+    @Override
+    public void onAppStart(final UUID uuid, final boolean start) {
+        super.onAppStart(uuid, start); // TODO onAppStart for watchfaces
+    }
+
+    @Override
+    public void onFetchRecordedData(final int dataTypes) {
+        sendCommand("fetch recorded data step 1", CmfCommand.ACTIVITY_FETCH_1, A5);
+    }
+
+    @Override
+    public void onReset(final int flags) {
+        if ((flags & GBDeviceProtocol.RESET_FLAGS_FACTORY_RESET) != 0) {
+            sendCommand("factory reset", CmfCommand.FACTORY_RESET, A5);
+        } else {
+            LOG.warn("Unknown reset flags: {}", String.format("0x%x", flags));
+        }
+    }
+
+    @Override
+    public void onSetHeartRateMeasurementInterval(final int seconds) {
+        preferences.onSetHeartRateMeasurementInterval(seconds);
+    }
+
+    @Override
+    public void onSendConfiguration(final String config) {
+        preferences.onSendConfiguration(config);
+    }
+
+    @Override
+    public void onFindDevice(final boolean start) {
+        if (!start) {
+            return;
+        }
+
+        sendCommand("find device", CmfCommand.FIND_WATCH);
+    }
+
+    @Override
+    public void onSendWeather(final WeatherSpec weatherSpec) {
+        // TODO onSendWeather
+    }
+
+    @Override
+    public void onTestNewFunction() {
+
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchSpo2NormalOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchSpo2NormalOperation.java
index f553034eb..43a201fea 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchSpo2NormalOperation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchSpo2NormalOperation.java
@@ -90,7 +90,7 @@ public class FetchSpo2NormalOperation extends AbstractRepeatingFetchOperation {
 
             final HuamiSpo2Sample sample = new HuamiSpo2Sample();
             sample.setTimestamp(timestamp.getTimeInMillis());
-            sample.setType(autoMeasurement ? Spo2Sample.Type.AUTOMATIC : Spo2Sample.Type.MANUAL);
+            sample.setTypeNum((autoMeasurement ? Spo2Sample.Type.AUTOMATIC : Spo2Sample.Type.MANUAL).getNum());
             sample.setSpo2(spo2);
             samples.add(sample);
         }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchStressAutoOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchStressAutoOperation.java
index ceabf1390..b6b43c6f8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchStressAutoOperation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchStressAutoOperation.java
@@ -77,7 +77,7 @@ public class FetchStressAutoOperation extends AbstractRepeatingFetchOperation {
 
             final HuamiStressSample sample = new HuamiStressSample();
             sample.setTimestamp(timestamp.getTimeInMillis());
-            sample.setType(StressSample.Type.AUTOMATIC);
+            sample.setTypeNum(StressSample.Type.AUTOMATIC.getNum());
             sample.setStress(stress);
             samples.add(sample);
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchStressManualOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchStressManualOperation.java
index 2bb0027f3..f13fe7027 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchStressManualOperation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/FetchStressManualOperation.java
@@ -85,7 +85,7 @@ public class FetchStressManualOperation extends AbstractRepeatingFetchOperation
 
             final HuamiStressSample sample = new HuamiStressSample();
             sample.setTimestamp(timestamp.getTimeInMillis());
-            sample.setType(StressSample.Type.MANUAL);
+            sample.setTypeNum(StressSample.Type.MANUAL.getNum());
             sample.setStress(stress);
             samples.add(sample);
         }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/parsers/StressPacketParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/parsers/StressPacketParser.java
index c7884f6ce..7d6c1a7f8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/parsers/StressPacketParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/sony/wena3/protocol/logic/parsers/StressPacketParser.java
@@ -60,7 +60,7 @@ public class StressPacketParser extends OneBytePerSamplePacketParser {
                     gbSample.setUserId(userId);
                     gbSample.setTimestamp(currentSampleDate.getTime());
                     gbSample.setStress(rawSample);
-                    gbSample.setType(StressSample.Type.AUTOMATIC);
+                    gbSample.setTypeNum(StressSample.Type.AUTOMATIC.getNum());
                     samples.add(gbSample);
                 } else {
                     LOG.debug("Discard stress value as out of range: " + rawSample);
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index e1042e8dd..f416de506 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -1201,6 +1201,237 @@
         <item>indoor_ice_skating</item>
     </string-array>
 
+    <string-array name="pref_workout_activity_types">
+        <item>@string/activity_type_indoor_running</item>
+        <item>@string/activity_type_outdoor_running</item>
+        <item>@string/activity_type_outdoor_walking</item>
+        <item>@string/activity_type_indoor_walking</item>
+        <item>@string/activity_type_outdoor_cycling</item>
+        <item>@string/activity_type_indoor_cycling</item>
+        <item>@string/activity_type_mountain_hike</item>
+        <item>@string/activity_type_hiking</item>
+        <item>@string/activity_type_cross_trainer</item>
+        <item>@string/activity_type_free_training</item>
+        <item>@string/activity_type_strength_training</item>
+        <item>@string/activity_type_yoga</item>
+        <item>@string/activity_type_boxing</item>
+        <item>@string/activity_type_rower</item>
+        <item>@string/activity_type_dynamic_cycle</item>
+        <item>@string/activity_type_stair_stepper</item>
+        <item>@string/activity_type_treadmill</item>
+        <item>@string/activity_type_hiit</item>
+        <item>@string/activity_type_fitness_exercises</item>
+        <item>@string/activity_type_jump_roping</item>
+        <item>@string/activity_type_pilates</item>
+        <item>@string/activity_type_crossfit</item>
+        <item>@string/activity_type_functional_training</item>
+        <item>@string/activity_type_physical_training</item>
+        <item>@string/activity_type_taekwondo</item>
+        <item>@string/activity_type_cross_country_running</item>
+        <item>@string/activity_type_karate</item>
+        <item>@string/activity_type_fencing</item>
+        <item>@string/activity_type_core_training</item>
+        <item>@string/activity_type_kendo</item>
+        <item>@string/activity_type_horizontal_bar</item>
+        <item>@string/activity_type_parallel_bar</item>
+        <item>@string/activity_type_cooldown</item>
+        <item>@string/activity_type_cross_training</item>
+        <item>@string/activity_type_sit_ups</item>
+        <item>@string/activity_type_fitness_gaming</item>
+        <item>@string/activity_type_aerobic_exercise</item>
+        <item>@string/activity_type_rolling</item>
+        <item>@string/activity_type_flexibility</item>
+        <item>@string/activity_type_gymnastics</item>
+        <item>@string/activity_type_track_and_field</item>
+        <item>@string/activity_type_push_ups</item>
+        <item>@string/activity_type_battle_rope</item>
+        <item>@string/activity_type_smith_machine</item>
+        <item>@string/activity_type_pull_ups</item>
+        <item>@string/activity_type_plank</item>
+        <item>@string/activity_type_javelin</item>
+        <item>@string/activity_type_long_jump</item>
+        <item>@string/activity_type_high_jump</item>
+        <item>@string/activity_type_trampoline</item>
+        <item>@string/activity_type_dumbbell</item>
+        <item>@string/activity_type_belly_dance</item>
+        <item>@string/activity_type_jazz_dance</item>
+        <item>@string/activity_type_latin_dance</item>
+        <item>@string/activity_type_ballet</item>
+        <item>@string/activity_type_street_dance</item>
+        <item>@string/activity_type_zumba</item>
+        <item>@string/activity_type_other_dance</item>
+        <item>@string/activity_type_roller_skating</item>
+        <item>@string/activity_type_martial_arts</item>
+        <item>@string/activity_type_tai_chi</item>
+        <item>@string/activity_type_hula_hooping</item>
+        <item>@string/activity_type_disc_sports</item>
+        <item>@string/activity_type_darts</item>
+        <item>@string/activity_type_archery</item>
+        <item>@string/activity_type_horse_riding</item>
+        <item>@string/activity_type_kite_flying</item>
+        <item>@string/activity_type_swing</item>
+        <item>@string/activity_type_stairs</item>
+        <item>@string/activity_type_fishing</item>
+        <item>@string/activity_type_hand_cycling</item>
+        <item>@string/activity_type_mind_and_body</item>
+        <item>@string/activity_type_wrestling</item>
+        <item>@string/activity_type_kabaddi</item>
+        <item>@string/activity_type_karting</item>
+        <item>@string/activity_type_badminton</item>
+        <item>@string/activity_type_table_tennis</item>
+        <item>@string/activity_type_tennis</item>
+        <item>@string/activity_type_billiards</item>
+        <item>@string/activity_type_bowling</item>
+        <item>@string/activity_type_volleyball</item>
+        <item>@string/activity_type_shuttlecock</item>
+        <item>@string/activity_type_handball</item>
+        <item>@string/activity_type_baseball</item>
+        <item>@string/activity_type_softball</item>
+        <item>@string/activity_type_cricket</item>
+        <item>@string/activity_type_rugby</item>
+        <item>@string/activity_type_hockey</item>
+        <item>@string/activity_type_squash</item>
+        <item>@string/activity_type_dodgeball</item>
+        <item>@string/activity_type_soccer</item>
+        <item>@string/activity_type_basketball</item>
+        <item>@string/activity_type_australian_football</item>
+        <item>@string/activity_type_golf</item>
+        <item>@string/activity_type_pickleball</item>
+        <item>@string/activity_type_lacross</item>
+        <item>@string/activity_type_shot</item>
+        <item>@string/activity_type_sailing</item>
+        <item>@string/activity_type_surfing</item>
+        <item>@string/activity_type_jet_skiing</item>
+        <item>@string/activity_type_skating</item>
+        <item>@string/activity_type_ice_hockey</item>
+        <item>@string/activity_type_curling</item>
+        <item>@string/activity_type_snowboarding</item>
+        <item>@string/activity_type_cross_country_skiing</item>
+        <item>@string/activity_type_snow_sports</item>
+        <item>@string/activity_type_skiing</item>
+        <item>@string/activity_type_skateboarding</item>
+        <item>@string/activity_type_rock_climbing</item>
+        <item>@string/activity_type_hunting</item>
+    </string-array>
+
+    <string-array name="pref_workout_activity_types_values">
+        <item>indoor_running</item>
+        <item>outdoor_running</item>
+        <item>outdoor_walking</item>
+        <item>indoor_walking</item>
+        <item>outdoor_cycling</item>
+        <item>indoor_cycling</item>
+        <item>mountain_hike</item>
+        <item>hiking</item>
+        <item>cross_trainer</item>
+        <item>free_training</item>
+        <item>strength_training</item>
+        <item>yoga</item>
+        <item>boxing</item>
+        <item>rower</item>
+        <item>dynamic_cycle</item>
+        <item>stair_stepper</item>
+        <item>treadmill</item>
+        <item>hiit</item>
+        <item>fitness_exercises</item>
+        <item>jump_roping</item>
+        <item>pilates</item>
+        <item>crossfit</item>
+        <item>functional_training</item>
+        <item>physical_training</item>
+        <item>taekwondo</item>
+        <item>cross_country_running</item>
+        <item>karate</item>
+        <item>fencing</item>
+        <item>core_training</item>
+        <item>kendo</item>
+        <item>horizontal_bar</item>
+        <item>parallel_bar</item>
+        <item>cooldown</item>
+        <item>cross_training</item>
+        <item>sit_ups</item>
+        <item>fitness_gaming</item>
+        <item>aerobic_exercise</item>
+        <item>rolling</item>
+        <item>flexibility</item>
+        <item>gymnastics</item>
+        <item>track_and_field</item>
+        <item>push_ups</item>
+        <item>battle_rope</item>
+        <item>smith_machine</item>
+        <item>pull_ups</item>
+        <item>plank</item>
+        <item>javelin</item>
+        <item>long_jump</item>
+        <item>high_jump</item>
+        <item>trampoline</item>
+        <item>dumbbell</item>
+        <item>belly_dance</item>
+        <item>jazz_dance</item>
+        <item>latin_dance</item>
+        <item>ballet</item>
+        <item>street_dance</item>
+        <item>zumba</item>
+        <item>other_dance</item>
+        <item>roller_skating</item>
+        <item>martial_arts</item>
+        <item>tai_chi</item>
+        <item>hula_hooping</item>
+        <item>disc_sports</item>
+        <item>darts</item>
+        <item>archery</item>
+        <item>horse_riding</item>
+        <item>kite_flying</item>
+        <item>swing</item>
+        <item>stairs</item>
+        <item>fishing</item>
+        <item>hand_cycling</item>
+        <item>mind_and_body</item>
+        <item>wrestling</item>
+        <item>kabaddi</item>
+        <item>karting</item>
+        <item>badminton</item>
+        <item>table_tennis</item>
+        <item>tennis</item>
+        <item>billiards</item>
+        <item>bowling</item>
+        <item>volleyball</item>
+        <item>shuttlecock</item>
+        <item>handball</item>
+        <item>baseball</item>
+        <item>softball</item>
+        <item>cricket</item>
+        <item>rugby</item>
+        <item>hockey</item>
+        <item>squash</item>
+        <item>dodgeball</item>
+        <item>soccer</item>
+        <item>basketball</item>
+        <item>australian_football</item>
+        <item>golf</item>
+        <item>pickleball</item>
+        <item>lacross</item>
+        <item>shot</item>
+        <item>sailing</item>
+        <item>surfing</item>
+        <item>jet_skiing</item>
+        <item>skating</item>
+        <item>ice_hockey</item>
+        <item>curling</item>
+        <item>snowboarding</item>
+        <item>cross_country_skiing</item>
+        <item>snow_sports</item>
+        <item>skiing</item>
+        <item>skateboarding</item>
+        <item>rock_climbing</item>
+        <item>hunting</item>
+    </string-array>
+
+    <string-array name="pref_workout_activity_types_default">
+        <item>indoor_run</item>
+        <item>outdoor_run</item>
+    </string-array>
+
     <string-array name="pref_withings_steel_activity_types">
         <item>@string/activity_type_outdoor_running</item>
         <item>@string/activity_type_hiking</item>
@@ -2389,6 +2620,26 @@
         <item>150</item>
     </string-array>
 
+    <string-array name="prefs_miband_heartrate_high_active_alert_threshold_with_off">
+        <item name="0">@string/off</item>
+        <item name="155">@string/heartrate_bpm_155</item>
+        <item name="165">@string/heartrate_bpm_165</item>
+        <item name="175">@string/heartrate_bpm_175</item>
+        <item name="185">@string/heartrate_bpm_185</item>
+        <item name="195">@string/heartrate_bpm_195</item>
+        <item name="205">@string/heartrate_bpm_205</item>
+    </string-array>
+
+    <string-array name="prefs_miband_heartrate_high_active_alert_threshold_with_off_values">
+        <item>0</item>
+        <item>155</item>
+        <item>165</item>
+        <item>175</item>
+        <item>185</item>
+        <item>195</item>
+        <item>205</item>
+    </string-array>
+
     <string-array name="prefs_miband_heartrate_low_alert_threshold">
         <item name="0">@string/off</item>
         <item name="40">@string/heartrate_bpm_40</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 078a7ed5a..c25a1f285 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -712,6 +712,12 @@
     <string name="heartrate_bpm_140">140 bpm</string>
     <string name="heartrate_bpm_145">145 bpm</string>
     <string name="heartrate_bpm_150">150 bpm</string>
+    <string name="heartrate_bpm_155">155 bpm</string>
+    <string name="heartrate_bpm_165">165 bpm</string>
+    <string name="heartrate_bpm_175">175 bpm</string>
+    <string name="heartrate_bpm_185">185 bpm</string>
+    <string name="heartrate_bpm_195">195 bpm</string>
+    <string name="heartrate_bpm_205">205 bpm</string>
     <string name="spo2_perc_80">80%</string>
     <string name="spo2_perc_85">85%</string>
     <string name="spo2_perc_90">90%</string>
@@ -785,6 +791,7 @@
     <string name="prefs_heartrate_alert_experimental_description">Vibrate the band when the heart rate is over a threshold, without any obvious physical activity in the last 10 minutes. This feature is experimental, and was not extensively tested.</string>
     <string name="prefs_heartrate_alert_threshold">Heart rate alert threshold</string>
     <string name="prefs_heartrate_alert_high_threshold">High heart rate alert threshold</string>
+    <string name="prefs_heartrate_alert_active_high_threshold">High activity heart rate alert threshold</string>
     <string name="prefs_heartrate_alert_low_threshold">Low heart rate alert threshold</string>
     <string name="prefs_stress_monitoring_title">Stress monitoring</string>
     <string name="prefs_stress_monitoring_description">Monitor stress level while resting</string>
@@ -970,6 +977,7 @@
     <string name="mi2_prefs_inactivity_warnings_summary">The band will vibrate when you have been inactive for a while</string>
     <string name="mi2_prefs_inactivity_warnings_threshold">Inactivity threshold (in minutes)</string>
     <string name="mi2_prefs_inactivity_warnings_dnd_summary">Disable inactivity warnings for a time interval</string>
+    <string name="hydration_dnd_summary">Disable hydration warnings for a time interval</string>
     <string name="mi2_prefs_heart_rate_monitoring">Heart Rate Monitoring</string>
     <string name="mi2_prefs_heart_rate_monitoring_summary">Configure heart rate monitoring</string>
     <string name="prefs_phone_silent_mode">Phone Silent Mode</string>
@@ -1237,7 +1245,83 @@
     <string name="activity_type_not_worn">Device not worn</string>
     <string name="activity_type_running">Running</string>
     <string name="activity_type_outdoor_running">Outdoor Running</string>
+    <string name="activity_type_indoor_running">Indoor Running</string>
+    <string name="activity_type_mountain_hike">Mountain Hike</string>
+    <string name="activity_type_cross_trainer">Cross trainer</string>
+    <string name="activity_type_free_training">Free training</string>
+    <string name="activity_type_rower">Rower</string>
+    <string name="activity_type_dynamic_cycle">Dynamic cycle</string>
+    <string name="activity_type_stair_stepper">Stair stepper</string>
+    <string name="activity_type_fitness_exercises">Fitness exercises</string>
+    <string name="activity_type_crossfit">Crossfit</string>
+    <string name="activity_type_functional_training">Functional training</string>
+    <string name="activity_type_physical_training">Physical training</string>
+    <string name="activity_type_taekwondo">Taekwondo</string>
+    <string name="activity_type_cross_country_running">Cross country running</string>
+    <string name="activity_type_karate">Karate</string>
+    <string name="activity_type_fencing">Fencing</string>
+    <string name="activity_type_kendo">Kendo</string>
+    <string name="activity_type_horizontal_bar">Horizontal bar</string>
+    <string name="activity_type_parallel_bar">Parallel bar</string>
+    <string name="activity_type_cooldown">Cooldown</string>
+    <string name="activity_type_cross_training">Cross training</string>
+    <string name="activity_type_sit_ups">Sit ups</string>
+    <string name="activity_type_fitness_gaming">Fitness gaming</string>
+    <string name="activity_type_aerobic_exercise">Aerobic exercise</string>
+    <string name="activity_type_rolling">Rolling</string>
+    <string name="activity_type_flexibility">Flexibility</string>
+    <string name="activity_type_track_and_field">Track and field</string>
+    <string name="activity_type_push_ups">Push ups</string>
+    <string name="activity_type_battle_rope">Battle rope</string>
+    <string name="activity_type_smith_machine">Smith machine</string>
+    <string name="activity_type_pull_ups">Pull ups</string>
+    <string name="activity_type_plank">Plank</string>
+    <string name="activity_type_javelin">Javelin</string>
+    <string name="activity_type_long_jump">Long jump</string>
+    <string name="activity_type_high_jump">High jump</string>
+    <string name="activity_type_trampoline">Trampoline</string>
+    <string name="activity_type_dumbbell">Dumbbell</string>
+    <string name="activity_type_belly_dance">Belly dance</string>
+    <string name="activity_type_jazz_dance">Jazz dance</string>
+    <string name="activity_type_latin_dance">Latin dance</string>
+    <string name="activity_type_ballet">Ballet</string>
+    <string name="activity_type_other_dance">Other dance</string>
+    <string name="activity_type_roller_skating">Roller skating</string>
+    <string name="activity_type_martial_arts">Martial arts</string>
+    <string name="activity_type_tai_chi">Tai chi</string>
+    <string name="activity_type_hula_hooping">Hula hooping</string>
+    <string name="activity_type_disc_sports">Disc sports</string>
+    <string name="activity_type_darts">Darts</string>
+    <string name="activity_type_archery">Archery</string>
+    <string name="activity_type_horse_riding">Horse riding</string>
+    <string name="activity_type_kite_flying">Kite Flying</string>
+    <string name="activity_type_swing">Swing</string>
+    <string name="activity_type_stairs">Stairs</string>
+    <string name="activity_type_fishing">Fishing</string>
+    <string name="activity_type_hand_cycling">Hand cycling</string>
+    <string name="activity_type_mind_and_body">Mind and body</string>
+    <string name="activity_type_kabaddi">Kabaddi</string>
+    <string name="activity_type_karting">Karting</string>
+    <string name="activity_type_billiards">Billiards</string>
+    <string name="activity_type_shuttlecock">Shuttlecock</string>
+    <string name="activity_type_softball">Softball</string>
+    <string name="activity_type_dodgeball">Dodgeball</string>
+    <string name="activity_type_australian_football">Australian football</string>
+    <string name="activity_type_pickleball">Pickleball</string>
+    <string name="activity_type_lacross">Lacross</string>
+    <string name="activity_type_shot">Shot</string>
+    <string name="activity_type_sailing">Sailing</string>
+    <string name="activity_type_jet_skiing">Jet skiing</string>
+    <string name="activity_type_skating">Skating</string>
+    <string name="activity_type_ice_hockey">Ice hockey</string>
+    <string name="activity_type_curling">Curling</string>
+    <string name="activity_type_cross_country_skiing">Cross country skiing</string>
+    <string name="activity_type_snow_sports">Snow sports</string>
+    <string name="activity_type_skateboarding">Skateboarding</string>
+    <string name="activity_type_rock_climbing">Rock climbing</string>
+    <string name="activity_type_hunting">Hunting</string>
     <string name="activity_type_walking">Walking</string>
+    <string name="activity_type_outdoor_walking">Outdoor Walking</string>
     <string name="activity_type_indoor_walking">Indoor Walking</string>
     <string name="activity_type_surfing">Surfing</string>
     <string name="activity_type_windsurfing">Windsurfing</string>
@@ -1991,6 +2075,7 @@
     <string name="devicetype_nothingear1">Nothing Ear (1)</string>
     <string name="devicetype_nothingear2">Nothing Ear (2)</string>
     <string name="devicetype_nothingearstick">Nothing Ear (Stick)</string>
+    <string name="devicetype_nothing_cmf_watch_pro">CMF Watch Pro</string>
     <string name="devicetype_galaxybuds">Galaxy Buds</string>
     <string name="devicetype_galaxybuds_live">Galaxy Buds Live</string>
     <string name="devicetype_galaxybuds_pro">Galaxy Buds Pro</string>
diff --git a/app/src/main/res/xml/devicesettings_heartrate_sleep_alert_activity_stress_spo2.xml b/app/src/main/res/xml/devicesettings_heartrate_sleep_alert_activity_stress_spo2.xml
index b2a84fc37..2cbe5135c 100644
--- a/app/src/main/res/xml/devicesettings_heartrate_sleep_alert_activity_stress_spo2.xml
+++ b/app/src/main/res/xml/devicesettings_heartrate_sleep_alert_activity_stress_spo2.xml
@@ -70,6 +70,15 @@
                 android:key="heartrate_alert_low_threshold"
                 android:summary="%s"
                 android:title="@string/prefs_heartrate_alert_low_threshold" />
+
+            <ListPreference
+                android:defaultValue="0"
+                android:entries="@array/prefs_miband_heartrate_high_active_alert_threshold_with_off"
+                android:entryValues="@array/prefs_miband_heartrate_high_active_alert_threshold_with_off_values"
+                android:icon="@drawable/ic_heartrate"
+                android:key="heartrate_alert_active_high_threshold"
+                android:summary="%s"
+                android:title="@string/prefs_heartrate_alert_active_high_threshold" />
         </PreferenceCategory>
 
         <!-- Stress Monitoring -->
diff --git a/app/src/main/res/xml/devicesettings_hydration_reminder_dnd.xml b/app/src/main/res/xml/devicesettings_hydration_reminder_dnd.xml
new file mode 100644
index 000000000..a0295022e
--- /dev/null
+++ b/app/src/main/res/xml/devicesettings_hydration_reminder_dnd.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <PreferenceScreen
+        android:icon="@drawable/ic_drink"
+        android:key="screen_hydration_reminder"
+        android:persistent="false"
+        android:summary="@string/lefun_prefs_hydration_reminder_summary"
+        android:title="@string/lefun_prefs_hydration_reminder_title">
+
+        <SwitchPreferenceCompat
+            android:defaultValue="false"
+            android:key="pref_hydration_switch"
+            android:title="@string/lefun_prefs_hydration_reminder_title" />
+        <EditTextPreference
+            android:defaultValue="60"
+            android:key="pref_hydration_period"
+            android:summary="@string/lefun_prefs_hydration_reminder_summary"
+            android:title="@string/lefun_prefs_hydration_reminder_interval_title"/>
+
+        <SwitchPreferenceCompat
+            android:defaultValue="false"
+            android:dependency="screen_hydration_reminder"
+            android:key="pref_hydration_dnd"
+            android:summary="@string/hydration_dnd_summary"
+            android:title="@string/mi2_prefs_do_not_disturb" />
+
+        <nodomain.freeyourgadget.gadgetbridge.util.XTimePreference
+            android:defaultValue="12:00"
+            android:dependency="pref_hydration_dnd"
+            android:key="pref_hydration_dnd_start"
+            android:title="@string/mi2_prefs_do_not_disturb_start" />
+
+        <nodomain.freeyourgadget.gadgetbridge.util.XTimePreference
+            android:defaultValue="14:00"
+            android:dependency="pref_hydration_dnd"
+            android:key="pref_hydration_dnd_end"
+            android:title="@string/mi2_prefs_do_not_disturb_end" />
+    </PreferenceScreen>
+</androidx.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml/devicesettings_workout_activity_types.xml b/app/src/main/res/xml/devicesettings_workout_activity_types.xml
new file mode 100644
index 000000000..5213d34e2
--- /dev/null
+++ b/app/src/main/res/xml/devicesettings_workout_activity_types.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <com.mobeta.android.dslv.DragSortListPreference
+        android:icon="@drawable/ic_activity_unknown_small"
+        android:defaultValue="@array/pref_workout_activity_types_default"
+        android:dialogTitle="@string/mi5_prefs_workout_activity_types"
+        android:entries="@array/pref_workout_activity_types"
+        android:entryValues="@array/pref_workout_activity_types_values"
+        android:key="workout_activity_types_sortable"
+        android:persistent="true"
+        android:summary="@string/mi5_prefs_workout_activity_types_summary"
+        android:title="@string/mi5_prefs_workout_activity_types" />
+</androidx.preference.PreferenceScreen>
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/devices/cmfwatchpro/CmfCommandTest.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/devices/cmfwatchpro/CmfCommandTest.java
new file mode 100644
index 000000000..678be855e
--- /dev/null
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/devices/cmfwatchpro/CmfCommandTest.java
@@ -0,0 +1,39 @@
+/*  Copyright (C) 2024 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.cmfwatchpro;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class CmfCommandTest {
+    @Test
+    public void commandEnumCheckNoOverlap() {
+        // Ensure that no 2 commands overlap in codes
+        final Map<String, Boolean> knownCodes = new HashMap<>();
+        for (final CmfCommand cmd : CmfCommand.values()) {
+            final Boolean existingCode = knownCodes.put(
+                    String.format("cmd1=0x%04x cmd2=0x%04x", cmd.getCmd1(), cmd.getCmd2()),
+                    true
+            );
+            assertNull("Commands with overlapping codes", existingCode);
+        }
+    }
+}

From 0e5545191d96303e192865ef5e8426e3a18bfcb9 Mon Sep 17 00:00:00 2001
From: Damien 'Psolyca' Gaignon <damien.gaignon@gmail.com>
Date: Sun, 21 Jan 2024 15:36:24 +0100
Subject: [PATCH 511/595] Add Honor Magic Watch 2

---
 .../devices/huawei/HuaweiConstants.java       |  1 +
 .../HonorMagicWatch2Coordinator.java          | 82 +++++++++++++++++++
 .../gadgetbridge/model/DeviceType.java        |  2 +
 app/src/main/res/values/strings.xml           |  1 +
 4 files changed, 86 insertions(+)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honormagicwatch2/HonorMagicWatch2Coordinator.java

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiConstants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiConstants.java
index d0a7f15d2..fa8e833d1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiConstants.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiConstants.java
@@ -48,6 +48,7 @@ public final class HuaweiConstants {
     public static final String HO_BAND5_NAME = "honor band 5-";
     public static final String HO_BAND6_NAME = "honor band 6-";
     public static final String HO_BAND7_NAME = "honor band 7-";
+    public static final String HO_MAGICWATCH2_NAME = "honor magicwatch 2-";
     public static final String HU_BAND3E_NAME = "huawei band 3e-";
     public static final String HU_BAND4E_NAME = "huawei band 4e-";
     public static final String HU_BAND6_NAME = "huawei band 6-";
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honormagicwatch2/HonorMagicWatch2Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honormagicwatch2/HonorMagicWatch2Coordinator.java
new file mode 100644
index 000000000..5ed66171b
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honormagicwatch2/HonorMagicWatch2Coordinator.java
@@ -0,0 +1,82 @@
+/*  Copyright (C) 2024 Vitaly Tomin, Gaignon Damien
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huawei.honormagicwatch2;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.regex.Pattern;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.devices.TimeSampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiBRCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiConstants;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiSpo2SampleProvider;
+import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
+import nodomain.freeyourgadget.gadgetbridge.model.Spo2Sample;
+
+public class HonorMagicWatch2Coordinator extends HuaweiBRCoordinator {
+    private static final Logger LOG = LoggerFactory.getLogger(HonorMagicWatch2Coordinator.class);
+
+    public HonorMagicWatch2Coordinator() {
+        super();
+    }
+
+    @Override
+    public String getManufacturer() {
+        return "Honor";
+    }
+
+    @Override
+    public DeviceType getDeviceType() {
+        return DeviceType.HONORMAGICWATCH2;
+    }
+
+    @Override
+    protected Pattern getSupportedDeviceName() {
+        return Pattern.compile(HuaweiConstants.HO_MAGICWATCH2_NAME + ".*", Pattern.CASE_INSENSITIVE);
+    }
+
+    @Override
+    public int getBondingStyle(){
+        return BONDING_STYLE_ASK;
+    }
+
+    @Override
+    public boolean supportsSpo2() {
+        return true;
+    }
+
+    @Override
+    public TimeSampleProvider<? extends Spo2Sample> getSpo2SampleProvider(GBDevice device, DaoSession session) {
+        return new HuaweiSpo2SampleProvider(device, session);
+    }
+
+    @Override
+    public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
+        return getHuaweiCoordinator().genericHuaweiSupportedDeviceSpecificSettings(new int[]{
+                R.xml.devicesettings_spo_automatic_enable,
+        });
+    }
+
+    @Override
+    public int getDeviceNameResource() {
+        return R.string.devicetype_honor_magicwatch2;
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
index c425a4f57..4f5c012ce 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
@@ -110,6 +110,7 @@ import nodomain.freeyourgadget.gadgetbridge.devices.huawei.honorband4.HonorBand4
 import nodomain.freeyourgadget.gadgetbridge.devices.huawei.honorband5.HonorBand5Coordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.huawei.honorband6.HonorBand6Coordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.huawei.honorband7.HonorBand7Coordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.honormagicwatch2.HonorMagicWatch2Coordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.huawei.huaweiband4pro.HuaweiBand4ProCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.huawei.huaweiband6.HuaweiBand6Coordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.huawei.huaweiband7.HuaweiBand7Coordinator;
@@ -344,6 +345,7 @@ public enum DeviceType {
     HUAWEIBAND7(HuaweiBand7Coordinator.class),
     HONORBAND6(HonorBand6Coordinator.class),
     HONORBAND7(HonorBand7Coordinator.class),
+    HONORMAGICWATCH2(HonorMagicWatch2Coordinator.class),
     HUAWEIWATCHGT3(HuaweiWatchGT3Coordinator.class),
     HUAWEIBAND8(HuaweiBand8Coordinator.class),
     VESC(VescCoordinator.class),
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c25a1f285..1f2d765f9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1524,6 +1524,7 @@
     <string name="devicetype_honor_band5">Honor Band 5</string>
     <string name="devicetype_honor_band6">Honor Band 6</string>
     <string name="devicetype_honor_band7">Honor Band 7</string>
+    <string name="devicetype_honor_magicwatch2">Honor MagicWatch 2</string>
     <string name="devicetype_huawei_band_aw70">Huawei Band (AW70)</string>
     <string name="devicetype_huawei_band6">Huawei Band 6</string>
     <string name="devicetype_huawei_band7">Huawei Band 7</string>

From 0ed9e5b1a807505d0de057abca2d9e3bfe8e6be1 Mon Sep 17 00:00:00 2001
From: Damien 'Psolyca' Gaignon <damien.gaignon@gmail.com>
Date: Sun, 21 Jan 2024 21:37:44 +0100
Subject: [PATCH 512/595] Fix normal mode connection

---
 .../devices/huawei/HuaweiSupportProvider.java    | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiSupportProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiSupportProvider.java
index 73b8c071b..8fa252ac6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiSupportProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiSupportProvider.java
@@ -400,12 +400,16 @@ public class HuaweiSupportProvider {
         try {
             createSecretKey();
             GetAuthRequest authReq = new GetAuthRequest(this, linkParamsReq);
-            GetBondParamsRequest bondParamsReq = new GetBondParamsRequest(this);
-            GetBondRequest bondReq = new GetBondRequest(this);
-            authReq.nextRequest(bondParamsReq);
-            bondParamsReq.nextRequest(bondReq);
-            bondParamsReq.setFinalizeReq(configureReq);
-            bondReq.setFinalizeReq(configureReq);
+            if (getHuaweiType() == HuaweiDeviceType.BLE) {
+                GetBondParamsRequest bondParamsReq = new GetBondParamsRequest(this);
+                GetBondRequest bondReq = new GetBondRequest(this);
+                authReq.nextRequest(bondParamsReq);
+                bondParamsReq.nextRequest(bondReq);
+                bondParamsReq.setFinalizeReq(configureReq);
+                bondReq.setFinalizeReq(configureReq);
+            } else {
+                authReq.setFinalizeReq(configureReq);
+            }
             authReq.doPerform();
         } catch (IOException e) {
             GB.toast(context, "init Normal Mode of Huawei device failed", Toast.LENGTH_SHORT, GB.ERROR, e);

From e974d00104004726d69cf444d7b8011688454e80 Mon Sep 17 00:00:00 2001
From: Damien 'Psolyca' Gaignon <damien.gaignon@gmail.com>
Date: Sun, 28 Jan 2024 11:31:13 +0100
Subject: [PATCH 513/595] Set transaction encryption to false

---
 .../huawei/honormagicwatch2/HonorMagicWatch2Coordinator.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honormagicwatch2/HonorMagicWatch2Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honormagicwatch2/HonorMagicWatch2Coordinator.java
index 5ed66171b..724e738e3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honormagicwatch2/HonorMagicWatch2Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honormagicwatch2/HonorMagicWatch2Coordinator.java
@@ -36,6 +36,7 @@ public class HonorMagicWatch2Coordinator extends HuaweiBRCoordinator {
 
     public HonorMagicWatch2Coordinator() {
         super();
+        getHuaweiCoordinator().setTransactionCrypted(false);
     }
 
     @Override

From a64317fe7a8dddd8e11f59d783963550355d862a Mon Sep 17 00:00:00 2001
From: Damien 'Psolyca' Gaignon <damien.gaignon@gmail.com>
Date: Sun, 28 Jan 2024 18:40:07 +0100
Subject: [PATCH 514/595] Add uncrypted transactions for GT2

---
 .../devices/huawei/huaweiwatchgt2/HuaweiWatchGT2Coordinator.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt2/HuaweiWatchGT2Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt2/HuaweiWatchGT2Coordinator.java
index 3540a54db..a76e0decb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt2/HuaweiWatchGT2Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt2/HuaweiWatchGT2Coordinator.java
@@ -37,6 +37,7 @@ public class HuaweiWatchGT2Coordinator extends HuaweiBRCoordinator {
 
     public HuaweiWatchGT2Coordinator() {
         super();
+        getHuaweiCoordinator().setTransactionCrypted(false);
     }
 
     @Override

From 2a41b77ffc9c3ee064dbb3261e6ece4a545c470e Mon Sep 17 00:00:00 2001
From: Damien 'Psolyca' Gaignon <damien.gaignon@gmail.com>
Date: Sun, 28 Jan 2024 19:02:34 +0100
Subject: [PATCH 515/595] Add uncrypted transactions for GT3

---
 .../devices/huawei/huaweiwatchgt3/HuaweiWatchGT3Coordinator.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt3/HuaweiWatchGT3Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt3/HuaweiWatchGT3Coordinator.java
index 0d5e13e5f..92cc4f182 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt3/HuaweiWatchGT3Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt3/HuaweiWatchGT3Coordinator.java
@@ -33,6 +33,7 @@ public class HuaweiWatchGT3Coordinator extends HuaweiBRCoordinator {
 
     public HuaweiWatchGT3Coordinator() {
         super();
+        getHuaweiCoordinator().setTransactionCrypted(false);
     }
 
     @Override

From b860ab116fce7651fdee72164401b6ca71ca75bd Mon Sep 17 00:00:00 2001
From: Damien 'Psolyca' Gaignon <damien.gaignon@gmail.com>
Date: Sun, 28 Jan 2024 19:02:49 +0100
Subject: [PATCH 516/595] Add uncrypted transactions for TalkBand 6

---
 .../huawei/huaweitalkbandb6/HuaweiTalkBandB6Coordinator.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweitalkbandb6/HuaweiTalkBandB6Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweitalkbandb6/HuaweiTalkBandB6Coordinator.java
index 3f3f4e1f3..47e7cddc2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweitalkbandb6/HuaweiTalkBandB6Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweitalkbandb6/HuaweiTalkBandB6Coordinator.java
@@ -31,6 +31,11 @@ import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
 public class HuaweiTalkBandB6Coordinator extends HuaweiBRCoordinator {
     private static final Logger LOG = LoggerFactory.getLogger(HuaweiTalkBandB6Coordinator.class);
 
+    public HuaweiTalkBandB6Coordinator() {
+        super();
+        getHuaweiCoordinator().setTransactionCrypted(false);
+    }
+
     @Override
     public DeviceType getDeviceType() {
         return DeviceType.HUAWEITALKBANDB6;

From a53d59f9072401681184c32eb63243c421f8844c Mon Sep 17 00:00:00 2001
From: Damien 'Psolyca' Gaignon <damien.gaignon@gmail.com>
Date: Sun, 28 Jan 2024 19:12:17 +0100
Subject: [PATCH 517/595] Add AW for bond request

---
 .../service/devices/huawei/HuaweiSupportProvider.java           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiSupportProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiSupportProvider.java
index 8fa252ac6..486698d14 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiSupportProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiSupportProvider.java
@@ -400,7 +400,7 @@ public class HuaweiSupportProvider {
         try {
             createSecretKey();
             GetAuthRequest authReq = new GetAuthRequest(this, linkParamsReq);
-            if (getHuaweiType() == HuaweiDeviceType.BLE) {
+            if (getHuaweiType() == HuaweiDeviceType.BLE || getHuaweiType() == HuaweiDeviceType.AW) {
                 GetBondParamsRequest bondParamsReq = new GetBondParamsRequest(this);
                 GetBondRequest bondReq = new GetBondRequest(this);
                 authReq.nextRequest(bondParamsReq);

From b0ff9eae88acccdbc332a8aa51aba019be616675 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sun, 28 Jan 2024 20:26:31 +0000
Subject: [PATCH 518/595] MusicManager: Fix NPE when music not playing

---
 .../gadgetbridge/util/MediaManager.java              | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/MediaManager.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/MediaManager.java
index 3527da011..af76060c9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/MediaManager.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/MediaManager.java
@@ -24,6 +24,8 @@ import android.media.session.MediaController;
 import android.media.session.MediaSessionManager;
 import android.media.session.PlaybackState;
 
+import androidx.annotation.Nullable;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -105,7 +107,12 @@ public class MediaManager {
         }
     }
 
+    @Nullable
     public static MusicSpec extractMusicSpec(final MediaMetadata d) {
+        if (d == null) {
+            return null;
+        }
+
         final MusicSpec musicSpec = new MusicSpec();
 
         try {
@@ -128,7 +135,12 @@ public class MediaManager {
         return musicSpec;
     }
 
+    @Nullable
     public static MusicStateSpec extractMusicStateSpec(final PlaybackState s) {
+        if (s == null) {
+            return null;
+        }
+
         final MusicStateSpec stateSpec = new MusicStateSpec();
 
         try {

From cf0e8be8163daa301e46a04ca8314c0e82609888 Mon Sep 17 00:00:00 2001
From: opcode <luigi@sciolla.net>
Date: Sat, 27 Jan 2024 09:10:28 +0100
Subject: [PATCH 519/595] Xiaomi: Further sleep parsing fix

---
 .../xiaomi/activity/impl/SleepDetailsParser.java  | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/SleepDetailsParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/SleepDetailsParser.java
index dbf9c949d..b577e1f37 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/SleepDetailsParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/SleepDetailsParser.java
@@ -85,7 +85,10 @@ public class SleepDetailsParser extends XiaomiActivityParser {
             final int count = buf.getShort();
 
             if (count > 0) {
-                final int firstRecordTime = buf.getInt();
+                // If version is less than 2 firstRecordTime is bedTime
+                if (fileId.getVersion() >= 2) {
+                    final int firstRecordTime = buf.getInt();
+                }
 
                 // Skip count samples - each sample is a u8
                 //   timestamp of each sample is firstRecordTime + (unit * index)
@@ -99,7 +102,10 @@ public class SleepDetailsParser extends XiaomiActivityParser {
             final int count = buf.getShort();
 
             if (count > 0) {
-                final int firstRecordTime = buf.getInt();
+                // If version is less than 2 firstRecordTime is bedTime
+                if (fileId.getVersion() >= 2) {
+                    final int firstRecordTime = buf.getInt();
+                }
 
                 // Skip count samples - each sample is a u8
                 //   timestamp of each sample is firstRecordTime + (unit * index)
@@ -113,7 +119,10 @@ public class SleepDetailsParser extends XiaomiActivityParser {
             final int count = buf.getShort();
 
             if (count > 0) {
-                final int firstRecordTime = buf.getInt();
+                // If version is less than 2 firstRecordTime is bedTime
+                if (fileId.getVersion() >= 2) {
+                    final int firstRecordTime = buf.getInt();
+                }
 
                 // Skip count samples - each sample is a float
                 //   timestamp of each sample is firstRecordTime + (unit * index)

From c472f0ab9af866aa195e1f2621d1462b153aeb48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Mon, 29 Jan 2024 18:13:09 +0000
Subject: [PATCH 520/595] Redmi Watch 2: Experimental support

---
 .../redmiwatch2/RedmiWatch2Coordinator.java   | 63 +++++++++++++++++++
 ...e.java => RedmiWatch2LiteCoordinator.java} |  2 +-
 .../gadgetbridge/model/DeviceType.java        |  6 +-
 app/src/main/res/values/strings.xml           |  1 +
 4 files changed, 69 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch2/RedmiWatch2Coordinator.java
 rename app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch2lite/{RedmiWatch2Lite.java => RedmiWatch2LiteCoordinator.java} (96%)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch2/RedmiWatch2Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch2/RedmiWatch2Coordinator.java
new file mode 100644
index 000000000..db8a14983
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch2/RedmiWatch2Coordinator.java
@@ -0,0 +1,63 @@
+/*  Copyright (C) 2024 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.redmiwatch2;
+
+import android.content.Context;
+import android.net.Uri;
+
+import androidx.annotation.Nullable;
+
+import java.util.regex.Pattern;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiInstallHandler;
+
+public class RedmiWatch2Coordinator extends XiaomiCoordinator {
+    @Override
+    public boolean isExperimental() {
+        return true;
+    }
+
+    @Override
+    protected Pattern getSupportedDeviceName() {
+        return Pattern.compile("^Redmi Watch 2 [A-Z0-9]{4}$");
+    }
+
+    @Nullable
+    @Override
+    public InstallHandler findInstallHandler(final Uri uri, final Context context) {
+        final XiaomiInstallHandler handler = new XiaomiInstallHandler(uri, context);
+        return handler.isValid() ? handler : null;
+    }
+
+    @Override
+    public int getDeviceNameResource() {
+        return R.string.devicetype_redmi_watch_2;
+    }
+
+    @Override
+    public int getDefaultIconResource() {
+        return R.drawable.ic_device_amazfit_bip;
+    }
+
+    @Override
+    public int getDisabledIconResource() {
+        return R.drawable.ic_device_amazfit_bip_disabled;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch2lite/RedmiWatch2Lite.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch2lite/RedmiWatch2LiteCoordinator.java
similarity index 96%
rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch2lite/RedmiWatch2Lite.java
rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch2lite/RedmiWatch2LiteCoordinator.java
index 9a018f8ea..5d67e8865 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch2lite/RedmiWatch2Lite.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/redmiwatch2lite/RedmiWatch2LiteCoordinator.java
@@ -28,7 +28,7 @@ import nodomain.freeyourgadget.gadgetbridge.devices.InstallHandler;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.XiaomiInstallHandler;
 
-public class RedmiWatch2Lite extends XiaomiCoordinator {
+public class RedmiWatch2LiteCoordinator extends XiaomiCoordinator {
     @Override
     public boolean isExperimental() {
         return true;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
index 4f5c012ce..41e91fb6e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
@@ -177,7 +177,8 @@ import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.miband8pro.MiBand8Pro
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.miwatchcolorsport.MiWatchColorSportCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.redmismartband2.RedmiSmartBand2Coordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.redmismartbandpro.RedmiSmartBandProCoordinator;
-import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.redmiwatch2lite.RedmiWatch2Lite;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.redmiwatch2.RedmiWatch2Coordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.redmiwatch2lite.RedmiWatch2LiteCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.watchs1.XiaomiWatchS1Coordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.watchs1active.XiaomiWatchS1ActiveCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.xiaomi.watchs1pro.XiaomiWatchS1ProCoordinator;
@@ -243,7 +244,8 @@ public enum DeviceType {
     MIWATCHCOLORSPORT(MiWatchColorSportCoordinator.class),
     REDMIWATCH3ACTIVE(RedmiWatch3ActiveCoordinator.class),
     REDMISMARTBAND2(RedmiSmartBand2Coordinator.class),
-    REDMIWATCH2LITE(RedmiWatch2Lite.class),
+    REDMIWATCH2(RedmiWatch2Coordinator.class),
+    REDMIWATCH2LITE(RedmiWatch2LiteCoordinator.class),
     REDMISMARTBANDPRO(RedmiSmartBandProCoordinator.class),
     XIAOMI_WATCH_S1_ACTIVE(XiaomiWatchS1ActiveCoordinator.class),
     XIAOMI_WATCH_S1_PRO(XiaomiWatchS1ProCoordinator.class),
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1f2d765f9..e147a5b3f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1539,6 +1539,7 @@
     <string name="devicetype_xiaomi_watch_lite">Xiaomi Watch Lite</string>
     <string name="devicetype_redmiwatch3active">Redmi Watch 3 Active</string>
     <string name="devicetype_redmi_smart_band_2">Redmi Smart Band 2</string>
+    <string name="devicetype_redmi_watch_2">Redmi Watch 2</string>
     <string name="devicetype_redmi_watch_2_lite">Redmi Watch 2 Lite</string>
     <string name="devicetype_redmi_smart_band_pro">Redmi Smart Band Pro</string>
     <string name="choose_auto_export_location">Choose export location</string>

From 61116c5fc8548adbf61fd0927844270e5bee2942 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Mon, 29 Jan 2024 18:50:40 +0000
Subject: [PATCH 521/595] Upgrade to gradlew 7.6, mockito-core 2.28.2

Fixes the unit tests after the AGP upgrade from 1a92bcf8a
---
 app/build.gradle                              |   2 +-
 .../devices/huawei/TestResponseManager.java   |  10 ++++++----
 gradle/wrapper/gradle-wrapper.jar             | Bin 59536 -> 61574 bytes
 gradle/wrapper/gradle-wrapper.properties      |   5 ++---
 gradlew                                       |  18 ++++++++++++++----
 gradlew.bat                                   |  15 +++++++++------
 6 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index c3389ed8f..b5afb38b2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -252,7 +252,7 @@ dependencies {
 //    testImplementation "ch.qos.logback:logback-core:1.1.3"
     implementation 'com.android.support.constraint:constraint-layout:2.0.4'
     testImplementation "junit:junit:4.13.2"
-    testImplementation "org.mockito:mockito-core:1.10.19"
+    testImplementation "org.mockito:mockito-core:2.28.2"
     testImplementation "org.robolectric:robolectric:4.8.2"
     testImplementation "org.hamcrest:hamcrest-library:1.3"
     testImplementation "com.google.code.gson:gson:2.8.9"
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/TestResponseManager.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/TestResponseManager.java
index f400dc8e6..dcc210b60 100644
--- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/TestResponseManager.java
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/TestResponseManager.java
@@ -250,8 +250,9 @@ public class TestResponseManager {
         when(request1.handleResponse((HuaweiPacket) any()))
                 .thenReturn(true);
         Request request2 = Mockito.mock(Request.class);
-        when(request2.handleResponse((HuaweiPacket) any()))
-                .thenReturn(false);
+        // FIXME: Removed due to UnnecessaryStubbingException after mockito-core update
+        //when(request2.handleResponse((HuaweiPacket) any()))
+        //        .thenReturn(false);
 
         List<Request> inputHandlers = Collections.synchronizedList(new ArrayList<Request>());
         inputHandlers.add(request1);
@@ -342,8 +343,9 @@ public class TestResponseManager {
         when(request1.handleResponse((HuaweiPacket) any()))
                 .thenReturn(true);
         Request request2 = Mockito.mock(Request.class);
-        when(request2.handleResponse((HuaweiPacket) any()))
-                .thenReturn(false);
+        // FIXME: Removed due to UnnecessaryStubbingException after mockito-core update
+        //when(request2.handleResponse((HuaweiPacket) any()))
+        //        .thenReturn(false);
 
         List<Request> inputHandlers = Collections.synchronizedList(new ArrayList<Request>());
         inputHandlers.add(request1);
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7454180f2ae8848c63b8b4dea2cb829da983f2fa..943f0cbfa754578e88a3dae77fce6e3dea56edbf 100644
GIT binary patch
delta 36900
zcmaI7V{m3&)UKP3ZQHh;j&0kvlMbHPwrx94Y}@X*V>{_2yT4s~SDp9Nsq=5uTw|_Z
z*SyDA;~q0%0W54Etby(aY}o0VClxFRhyhkI3lkf_7jK2&%Ygpl=wU>3Rs~ZgXSj(C
z9wu-Y1}5%m9g+euEqOU4N$)b6f%GhAiAKT7S{5tUZQ+O8qA*vXC@1j8=Hd@~>p~x-
z&X>HDXCKd|8s~KfK;O~X@9)nS-#H{9?;Af5&gdstgNg%}?GllZ=%ag+j&895S#>oj
zCkO*T+1@d%!}B4Af42&#LFvJYS1eKc>zxiny{a-5%Ej$3?^j5S_5)6c_G+!8pxufC
zd9P-(56q5kbw)>3XQ<zd>7K853PQh24-~p}L;HQuyEO+s)M^Gk)Y<pIU<E6Rl$$!i
zJZZR3#&&44?np3*MkSBdB#)C4r+`Fg{@cZXBGi}3&yuM4{qCp_r@kntTW5^?eku(9
ziak|YojYp`t^+oIUkz0Lqp=}aK`J33CZxWC0~FszSi`|$Si<BC!!&xBFW6q%^!mzI
z-rmB4?ANp)$LfeZKG5i{_f1~XTuCGezK=MMm+K4uO`n3ka?ie>#4fr1I*ySS6Z>g^
z3j2|yAwKXw?b#D4wNzK4zxeH;LuAJJct5s&k>(Qc2tH}2R3kpSJ)aaz!4*)5Vepww
zWc0`u&~Lj*^{+V~D(lFTr?Eemqm3a{8wwF}l_dQsAQURmW$Bm$^?R10r)Xd_(HUYG
zN)trq(ix@qb6alE>CCw@_H0*-r?5@|Fbx<6itm$^Qt~aj+h+Vd7l?ycraz%`lP%aB
ziO6K|F?9|uUnx$T5aqKdAs74ED7SPSfzocG)~*66q;Yb=gB{=6k{ub6ho3Y`=;SnB
z;W96mM@c5#(3(N~i_;u05{yUL8-BBVd|Z@8@(TO#gk&+1Ek#oDaZ?RNw{yG|z+^vm
zz_8?GT|RX|oO;EH*3wMsfQTe(p6)G9a)6&yM+tYvZwg;#pZsdueT#%;G9gwXq%a(|
zl*TBJYLyjOBS4he@<rlGkHhsu5}0aWCP1*^it~GxEja9g6JpmK^;A@J<k~`P@OK=I
zT=-z_bWQ3$sh0ECvbp;tmIfXpK=@%y8?uh9i6(>nGA-CofFCVpGz!${(Qa{d?g*Yt
zftsoLCHu-*AoZMC;gVx%qEKPVg@Ca2X(0LIQMr5^-B;1b)$5s^R@wa}C&FS9hr_0<
zR(PnkT$}=;M;g}bw|7HERCSm?{<0JLnk{!U8*bbod@i#tj?Jr}|IcqMfaed&D?MHW
zQQ>7BEPK-|c&@kx4femtLMpewFrq`MVIB%4e_8@IyFi9-$z0o48vnBWlh@E7Lz`C&
z{~7u$g;@syjzMCZR|Nm+Jx^T!cp)q9$P*jxSQZ3le#HSIj=wN~)myB;srp0eMln_T
z6?=}jUvU5_s4rEcO3k}*z#DQrR;TOvZGc03OR0)P5RI8M<#*B)8fYxxxX(I`Dks;X
z_q5<zC*V-}2ZK<hRlaP8b?1gm+qZHAbx1~eB&&qZt5^pmtr$=C5{DeBZR}5V!APZ$
ze77PMlq$-qkg|xktO`tysEQS_TxjYd12ni{5z00AW3hHQDk(!=fb|%v#I@4BVM*kO
z3fwLXZG9vKDRo1&z9OYOAG_K7IQStBZi+a!3?Nh?LxcJv8M$2UG{l@zBp5$p>?sAs
zMlaiDTP-1_XRMwL(q5h(W2yvr9HmtlnR);!9>U%TyViU)t#_5B#W0DnP!P#s!my-T
zqbgQRIf%MWo*YUK2vXE8RIy;gJ8p^LU$c6POWt88<QhYyRHW3->``5^mIqohk~I!a
zv-T{zI?eSLajm^r3>inooK|w$a_2H9J=;|sziKGRQ&FC5CWUF*#N<F6&-xkFt$HC|
z^0St!HrOKJd3;@Jv2yUqNCK03jG-?xMWbgA2R)jKE3KFS4gIn)-A^S~oEwCo`zDx=
z1Lqr-LiR?&_>6?n4rD-}S>Eg!tFkOpE7otS)$s3hyim=Ldy&-I$%Yra=M3xIOG{Jc
zr8d_wbB301%Zy*8ILfeRiG<z6{9Cz)n>feQUIh2N3|41xAR|uvQ%?AIGUkdX*Ymgh
z54d1)Igp9~)o7-h8AAH#6DzJ}UPh+srx=B^tGe~_(uwPoOov8sptn}$Rx@&$Ox^8H
z!MND`vATA1%mR>+iCrV=b!*TSrj2TDv?Fnmj$=uw{JX1c$tt@zIC9gt)3Inpb+Q~=
zh0Y@1o@R7|g+n0^b;v#5cc24{OYlnusF0tun^X?qHRYl#m%6UY?t<w8qi8C2>K9vA
zvtPnt7tgpi=qBIQ{v=D|p=4@{^E7)c3MLDCNMKPYec~o)VJ6zmZRE?UqXgYj7O~uG
z^YQwQfQr>T!u&NaBfm|PW%g%cDoE8%t<-Ma$wIkMS{3sTS+aWpx=g7(+XtaLt9nqB
zrLi<%uH29tuKZ6?`Ka5N0@G{F134GZ+6+RnA|Y+wCs~N*%N4CxyoB6?*{>AMy4w}`
z@CMj>CaC}<;Y&#-a6~6AB=v2>)b=&t&D7SK6Vc4p+Tfg{AO(<+v?R1IsPA~@FvGJw
z*d@a@6bydfT8{(k2N*D`FO@sUHbUIw4kQ(jrMPa2Mjc&~AK*xoe*c+VfsGx$cn<f@
zdP{`(J~>zHQb4bSL2wJvVg>oYR*?s}CgoHMPLwA`Km%5LJm4a&OZ3QL*-+4G0t%;_
zS|DOILXL@I?hGl*3JvMq)Uq;%_B{$ipS*Qkn~F!-P^6Afg;Qf!n-zi$tpUjh9TEgk
z$Em>`JJ(>S;8ZLM+$-RW<NzZl9NToR$rdB?4rjB<dKM$Xbh0lw9BS!-S<#9gSr5Qi
zkBDxB*#Rc}07m3(2AQtIf~D`lx9x9OjmWP@W;epM8*w>UzFrR!@<;W=Y3ASjLR1`U
zRnQ{ZU%JK?(2oo+c(5g;5Ez&I&5{C8{!I?aB34uFL`IQg#2z;=$Si?P0|qnfM1VdS
zb6@5YL(+>w;EPEyeuX)yIA~VlFjk5^LQ^)aZ$<1LmDozK0cxH1z>q2*h5eR(*B<C#
zL%5EtC4~6yMn-TAvU>8Pj6nS=K`)S3FLEV<TOv%4GwzpDuL7^cWc^`WVwEpo%woi0
z=8p+RaPP#YXB{<}&jV}I<Q?|-fnA)qE~aDSa<ZMy>-S*4c;F0<9nRRu$YqiDCFaTc
zU2LxT3wJJWeBb8}%B59!#)-W}_%?lSsy~vH3%oytE`j-^9*~SvMr-z3q=A7uy$?X&
zf*Ky)z&7X0jy`YDtCs@NJw0+j_3CeDw_I25HR6CPV2t!asKPJV^R_r+u&LUxP)wtR
zmFA-~HswLN)Ts=7{YPysG?DY))3+-L*En93o=+v+Kjw;_cUsONDZ!zzk{1O05Wm+3
z*2;}O&??lNOe-V{mDB}Gn<0_7H$ZCa5dWoq#}QCT(~h%=J=n@;@VXR52l^?vcj%GP
zh7{kjosPu`1x+iQVU?(TJ^?xlT@AS>a?&FMQRTyRO?(2jczyS@T%&!d8mzxqO0r<!
z|Efr6Xb=z(VUVp+MrWpfPi)EIo&tEwfvi)}sBo|<(QeUfsL?8_z$lpq8CF+S`;O*0
z&vO*;(^u=h<eo?+fG&3fgHjdoZxlKarj#IPEu|mFI@Hifdwr$)7a|)JTjIVD`GcDM
zV!<*df6MPOW1MFl0#{Yquu;ErrlxZodwKZSeEh$@?lFE6rIE9fYAA}<hfofa4=<dE
z3tc<IJ8ffSk-*>&;UjTNkbB)J1%*iB$McM0+stU%2(C}f0}_{G?dWaCGjmX7PnOq1
zdRr-MGfS#yqMH&mW5BiJE3#|^%`(niIKQ_BQ7xk`QFp50^I!yunb~0m24`10O=`w3
zc#^=Ae(B8CPKMDwLljERn*+I@7u8~<SH`oa_%0x%Aa`TRXhy{pW=}AhaNUlu`C-Bj
z9?Rkx6oFay04Z!-H~Wng1h!WDs?JfCfqA=nd(9Gdm<w@D7g2wPF_)&aScdGdDs!~s
zBnQhs=Ig@)40zhk&gNc^$8J-3QW&9WwBrgN&uy{L3Ed@JC&%^|s!sgI>-_2TPH`L#
z=1~{&_1Fg{r>4*vu5rRTtDZ3}td&uZ)(p*OD4xfn01zzS+v3c_N~GkBgN$cm$Y%H}
z1<fJmOR1xdw#u`vO_;ZN4e8?{bv?A<KQxI11k>sPj<qEb8kt5Opvu-5ju5pFEG5{G
zUzMX(krU6{ZFG1t)^e%newIwQlYS@kyc{rgWRq+>xf=IxdrC~^)&Pvq1^e`~xXM2!
zYU)LU02y$#S?v+CQ~GP{$|nR0d%`>hOlNwPU0Rr{E9ss;_>+ymGd10ASM{eJn+1RF
zT}SD!JV-q&r|%0BQcGcRzR&sW)3v$3{tI<h$6>N=O!JC~9!o8rOP6q=LW3BvlF$48
ziauC6R(9yToYA<PP)xE#sb;k$WIlR>82viRfL#)tA@_TW;@)DcknleX^H4y+0kpRm
zT&&(g50ZC+K(O0ZX6thiJEA8asDxF-J$*PytBYttTHI&)rXY!*0gdA9%@i#Sme5TY
z(K6#6E@I~B?eoIu!{?l}dgxBz!rLS{3Q4PhpCSpxt4z#Yux6?y7~I=Yc?6P%bOq~j
zI*D}tM^VMu{h6(>+IP|F8QYN`u{ziSK)DC*4*L>I4LoUwdEX_n{knkLwS`D-NRr>0
z&g8^|y3R$61{TgSK6)9&JZFhtApbp$KzF13WaC(QKwAZ|peA@Aol`&*>8RK(2|0%R
zyo9nL{gtv}osWeNwLf@YG!wb9H2WRcYhg_DT60dzQGW(y7h7|4U*<;c*4N*sE2sdR
zZRP^g;h(t0JLIuv)VNY6gZ<?61ggAcIII};1}8;2E+I3_TK8r%Rni9T_SFZxt7MFL
z9`4R-0LwfQ_a&4#K(w(J`)|LR=>)yUD)2d)p?eFznY8$~EZMYTiu%DF*7UeVQPV}h
zF*|ls`<kDwpzk4Hp3->|a+{u;cd>D@%~dRZBn~-Ac+m&Vg>P=3VY8+$<7Zi7p<~Nq
zR^M^jl=zI!T`8H(gK0H945KY=N1J#Up`sWvfY$>1SGEfqEyKIokPVbexYnI`OXJF$
zkMS3dBE8RnB1dK)tJbNSu5Y&$IYBy38luzK-TGMpQcEojhte7Xff-zI<AMETl;51P
z-@@)6wo2M*(%>50I<o}?(J}R~4y|{zMv`vNqM;Rp%k~nJ>2qM(i2F2)9DdagoKYlK
zz%x8sxFf>5@1bI<amkg$OIN)}4$)A!LhKh2F6CzUcb0>$-n*}N>o3o#^zP{$d7pf&
zf*4SNbn9QDXDCVn;wo6|E0$(wBv*pgxHCA(S3lXJ4HMQW)rU}U<B5g&@{6N;0tO67
zCELEr`0lwO!IK7A-~XWnom;ByZ5<g8V9<!NGvXhd*MX0vrve=XQ3#KLY6&hPdm)&x
z6n|htr5&nM^a;55(J=33|HG9;N!n6sQA#lSf#erS&4$wQfo93HepR8yI^^PXY>7?F
zxI}V}W~d>wx97Ozh+^glLBo{*j$o`=hK;idHhi4CG!_fG89V-Ew-^^hhMOWUdu-2<
zd(t0O>8BgZ1N<2Xi1G3>r1@d)nBD*K3PsmP{s{&G;tmG_!k=7FNuKO+fCm`SxKP>B
zK>mtj;Etn5J%mKvT;yE_zl8vk?q3f9hwea!Dt8yLUCgFO*BnS=YuY}-c!&0jb}J)D
zV(s~BTYfVyX<hC^4t2Rsyfh*AFJI&dbnW_YHg5`jznx)$xO$Nv(l3@<X{E4)uuE!$
zg;3z&=pmTktZ~;x&%lmVDFM1jL`QkYW<VUAx6_=Vh$gZ7Ate<gu(R>K<9y&hpVuS=
zc!!wNs<n^RHdH)mf5}v1SGMZ3R%P+=3@zVOYUsB&mGqcpg!N22*)HmSx+6$-FBPTd
zZki;l+VJrX;gGD`smXS_8#1U%q0X+bw>FjPgspRhCIw6}w^RvLX#?KnhpM(hB`U3x
zg*!~MI$JfAFWhsN7xRdV^%0aygs+rZ;dpWznc<hGgKBj=z9Q|H<>KOTAa`0Xq7m(z
zS_LwFYW$1KXsfgpFzlw7r#2KOQn(%ww?YQ$b<BnJ!v)?wI3)9>T(GWx*gx2Bsny3J
z!6UUPr8>TIGiK`%2m`PSS3Pd36m#OIl#SN?$h?mU25XXidM(*ZGBAelMO)H+;9Uw=
z8`vjt5)+09c$b2FAWm3{jId9*ui3~Ihbw`9e-2;@?!T%Dqin&WFbQJt4_m@V=j9P*
zbXi<gZcwnz5xJM_fsTS#G2t9Y@@X|r##T9OUd*xgWI|zOQ3A+j@TE1Rm<}k7%uKok
zS!R%V<yL*q8tXRj4QZ5=Q3*N1Am$P{<Djj8AAt?BBPL&c7~uvW9gLcJRcXHwPb-2u
zlKVV<nf*TdWp@CSfyWb2FEJoWt+B~6sFz$~djv8*-R70+86s>|lvH3x49-&)RB5c*
zheg*i@5p((w*%DOB8-%Yv2P#-IHB%v>`Y&_9BR4)7ngJze2&>4c~NOkQnJ)jt+X$L
z9`^6#2vV*K89hV$gu10|zu~;nKfa?ohox&sMS7NyTlMJCQAe^h{9nZwpoX?uy5xO?
zW@PBU$b1{UOpv~AtZ#<+*z+(g?Fjwseh8<Hc9G+iu>lsxs5iozi*#gI!;qXBt)G~j
z9v5n^MQKOT?2!Dj8;SOO0>6f3orwHJiOFK6`b<|b^4}5n{l-VQ?SoksHS=yv3$O(l
zK4aL#0Zq4{g#z$jo$*dAJfuB~zb-n^5(3@{JHT~GGc;Ky(^y99NCxW2rZg%U^gIg;
zJ%kB<Y64gSrGw}-R9o&zq=YK5QO#V@xe|uiIZA1$q;_}5U8L{>n@NxZn`e|BO6V4*
z39i>kJU<7SyAHVHI%uKdcv|~U@W=4e@t=p!S?jnBEq^yQ2E14shzIl<g$+KC$UFea
z-;dxAmJ#QmRSQAH^1C4yAS|7*it=ao$R@()tg*jDlD;ASD-^f(x2Uqo)hXJ5=1;8(
z-Aah6B4|>XKC?om(H84vN=o^2NtMBm7J~D=rmbm*NWjSVJeDEz-N5UmBk5`GjywWp
zZ6s1IpX<rC>kUutr~lnCT>!2PPR9DIkuVbt|MC<W8XvDdyE3OTi?X>CR|#D(rD%~B
zubEU^cc78hxs+x%Vg6$X@16i4ob@ek?PQijQzie<jMa<EFDw@GMSSZi^kV8~UX(*Y
z37?%e6<M9v9t~vmRi{WR{`E%?tbrRpM@x7V629>Zfi>E5NEg`76N6^2(v~ar1-yk2
z{{lAO$SjM{aof;NApyxnbEZnRO}8?!fT!U_<`21g+Y&qC_&99r6|*kDkDETgh-Blb
z?9T7UIB}thISUzkw0O~5y~+>wtL{7Fc;gSldH8639yf31)qi4|Wq~g>_I0dfs^OGe
z!K&|A^L|jeya>y7<>8(f3SXza9%^rl#3_31Neefn#Uk7*_^}IkM)e_&Fg~Ughu3}B
zG0}?Kod{eb?94;$6dD4YV>n9mC5+Hy8M_h+bQmvUNvJ>0P#9a~pPDU9l#NrDP39Z>
z7R3hA*IMVAod6Yl=s=BNyrblFv9ahxsA&Gst+0`2T@WSe<e&Pvh-`?Br>sGH1hRhw
z#t7Smp){oxPiCm!XedMT9Xls`K+YKLV>+PC>98;G(5Lw*eBS5`f9B8Y2br|#y@jcz
z`ddmVevy*mwN3@%YsE|Fsj!<st*;=WllHr<qF);aU!$$V-@P<qj6wlXW*rlDD9)S0
zx^VM!Ut#`>mu|5S)>5)wx;dbtMZ6Z1juCz$0kMS5-C{B5qnD{7ViiFNTv<&?w+5J7
zOvuImg^_o-ySHEQGAp-85!m8;Kjq_i-SzRFWcdAdj|VdIswTnUkggogN4`x{jEyG?
zQ*_r9na<4wW8fySLr;PuoDVKKN@|y=99HWqBR+2kiH1prFkUgL{}*5_>twEG!W=|`
z!(x}*NZ|P}Bf#p=-xK3y2>!x$6v(<A0p;y2H8|w^32i8(6E=1m5Hgne2m_-i<0bR6
z5mIl6wM&1CIT<yNWV{mw`Q467e#b%9I<A-xRGuI$*G^_rhqRPyL{&mHdu6viGZJxV
zxqi(~vK>pYq)(6dQWk)$<p!&gAJ#B+aM;gJo)<9;E<#G<tT(el!7sbq3%di4Y(-yl
z0q(2et|VK!F?k=yuvxI0;t{K+8om#7)7-Qtm!FZ}8uq$Nxk&x;lwnJj58Ppxb|^K*
zb%^fo-NgA-+fWY6XJIkA_5>ZWSp%-^30dq``oVSfEWcTXE)1aMtpTQ;FW3e5ff<co
zv5l*z+REFGKelEaeagboCFG~@Q|Ve%=gPfYl+ii4+t>MASm16(q#bJ}PAM2+l8m-{
z*nkDPH}ha-U3r{s>8XetSzpDN&nlc>|Er_gOMq?H8gtx5_)=$=rKn8D)UFKeitTF<
zrA6>w`_sOEN&t!qEx|Pjw>cpv6y3zP58py3u%=88_f1w?Dh6qHi_=ps1{zKT3c+AJ
z-CHtS&YwELV7i&XOXFt+doDFc=HdO@cjpeR_V#?~+=e|BdnS5C#8DCu@>*3!I9V9<
zW8$!NLpp)$6Dt$s16B6U0ukr;dz~cWFIBq~D_Il@v4E@wH%Sf#P50K?&Z<lsN^iVM
zj##RjPI=u&ZtG`M1B)jQS}%w$aE-RCs^3C;4s%JBqFKd=>#GHc^JwQ5QyPa<C_B{q
z>JatDTEbA97~OHLu)q6tU>srf)aJKx!w!`g-`+$hp=yl`47e};Vme<nDM%_qIGVPH
z2*5rc5C9-<Owxn=yc7rg<HTewd5>|`Otn|zcuTh4TQZ6IKVT7?o{08_qzzuC#0N+`
zUL{|(2B|=83J;W>uqDA61!wZ8=lN%B^2FGwkZO!2?1c;bDLELF1bQ^Y?Y+7uH}!W`
z^`^=K4S@v^Hf0N&e`kde(pQ;BIt`1ze5~`Nn*fETHo^-|6KuqPj<ZFk`Af5<+vk#3
z6a)bGQvv-tq%5JlWMLM<5U~-fYLmE=3NW~pN&7Vi?*isJZyvCA86NpUxvRQmBZr-b
z^agDvG*5eNnX@U~c{w&}3Ssl6(K%@o$^Q!G-rJf<oK-5k%*O=hm@aL~&>||YZ}sKX
zV?ZxRbyMRcdpZnDH1-C5U5;4JguMyzlQm)=l~l=@z2)laaTx@kKq5APotoUE)xH#J
z6)(ramD2fUHPdL793*l5S06`4Z3{&?tnR3xfYKS3B*A9}jW9$!H?R6_%7X{4+i!*D
z*)40tp!3LCaUi_0j<ql95p2+90g(_z3qVtHL>XN?z7Y6AEkZ^eIVyo1w;KO5iZg~7
zHCM5Jk&G}NQwK`~bXb=f#j!xIJJ#ETt7@1qhw9lR(hEuxbrv?Ct!{87z|%xN)YC*i
zx*N?__cB*&7kQ_BKkH|g0C{L*XHjv2;aHF<^+m0ch@q*5qw}L{NLOF~Wij{R7GRxv
zl5Ne^rT$D06;D(gWfiTsBRtZy(NY}48_YzA+&O?<D8lCMht4obOLROx9IfA(He6=|
z>{^mT^%=g%f;Ze*H{?}d8=k;bAO*Q1?nvfP#$3|aI1lz{jcLWDIa9v7R}*UUhVLB>
z?TDq)NCcJE9S%g0rVmhrf>=Nw6kt8m!lpu=;6aU-%{(-cj)pA`DiK5kE7&tX-cAxk
zV7ZG}Y!Ot|OEx!qA%%(cHP{?eqT&8(26rmJ5#`!FG&<iK12;PZZf^Wl5R<sJpe-cf
zk-YBh#%;LAM}Hp05pxg(_WgC-tj#aM!x87{0a@P}jX}Dc^>0ynY|*(Kz?poEylYbT
zipX*&ApQikP2)eD@Cw5>GKY=XH&1uQ<x3HF2zAHjj|%Ymib_)SQ2Fhlk`sN0;awNa
zn)>kIwKs&xAMXwn91ntk9#gnYz6e93PIWrmt>FDJ!k43qNZXPf<YZ4-mSUGs-1r{$
zR#=QISq5&GUj8#WK2@H_0EY`ooUE9N8W-mxxG2#%T9e)Pe597V7#feix4m${RTP_r
zyQ2I9qs0*WppO>6WzmzXnJHc=iBBr{8^QV3P3jBjzp1TS;KxA;C<w?S<p2G}>N~^(
z<fiH?E*YVZeOuz~tYYBMM%2rRZNN1JLPOgWy`mn9p}|vnJ@sd4F9}fCTON(#IX-rI
zkwl6dgc9{5ne!{^{t2K6HkbCCU2^q5X}!wt>+=W87)Xjkhvi+QF4Lx^aaWOq<XYKC
zNt%?Fqhb-A&tcegF+**K4rT&-OLY<eEa^XmI-<r{s$^X^G4RhlLN}|A)uvz6Rcu&z
zFSSihDHM~K)!In2J>m(0Y9CO0GFZR8z&yMefP`|0m~2!!3xZ8Lm2Rvv@2r^&{YhR@
zw^UuX9c)b@B%u83iCNC~IC#%5yDEAF)=sG2Ixi3%m!~JwM$*P5x2h-9J*IpQSa~@J
zrrr`+ovQAga*z#m7tsT{r|u?Zhxkhp{;cu*=@#(3`WZu}iQhp)>uS`C#CQB#V0r*V
zTe2;aKaHbKz)(xpB<;4XJks+e6S0l-xv_|GDdg@Di2SHte&&#+NZ(2^BxzTs#s&{h
zT+P^yaLR3Ngh&SYr_pGSlo1CA2wot^gmLX*Kry~2|D>4C=?)BOyuKoq!#CwNE>=xz
z@B8_S`HEpn&6xHL%`uv=rD%h>RB_zhRU&TJz}mn5F1e&^ASo;(3ppRY={cnp``a?A
zC0wiV5$%pZ!_*FuGrqYzT=2e770vS1j+=c<I}KS1R`xGncp`Ksws5Nnz#1#kks)vN
zMR>~|zjkE7i4Y4E(NTKXd-je8>=6q<+#B7yc*NLp6Yi7`s>jG~xBpI-ljN3WLT@-~
z1>TEAk)dHU%i@jw-oY^D2AAb<oH4Wl%|UdE66Naq(C63bQqCl`um)lo5=O!Zmp9l7
zeILPaXgu`%lP^4J!=}1HxX1WV_%PLtfGa495_FD#4L*isV5qWRs)9)iLR4wD9=5JQ
zunc5lS?IqohZ}$zSN(%|7&6&7ohrG%1~QrH2s3%M5QZ4&d;la*;nbTfO)0@Dw_p58
z)8j;gA&yZ<3?WYIm_3~QQpf=4@4-HhvYk&%>|%)}JjA7Bt{nKOF_Hp_!A9$XYm%X^
ztmK?aV&I-7@30n?X3rXfNuWHp0#VN~t=DRNoaeHi)w&{-K@k@5vgoq(MtF*-_fe2=
zYChH0%?FP}6|_HapKK0kzEY{&1ar1-#X(o*HA;tY509Qp>zLBfP;v#}!^mV5J)dZ^
z<awS%#Ol?VI3yf-a^K<{u?g;~lLm(N(=YX8p6Vydf3=w;QFQyk56z3+VE|@a5ggWB
zDHOFl{H*VJL^Gm0<$!cj49=GbV}isHMAFaxOr3i%@nsu|+2^aKy;qu2bUX~o9BcH}
zC7lX$QsM+K<nB46IdK60oJD7}A=*Fg+k-(-;sml<78!8UX2+qHQ5>>BgG%+gA^6~)
zZIvs|p~pM!mkV)(Wj^@{;btztU>>X7r>wpDwmCLZ-ovAvPh4@D&-`&>!9aQ4ozB$&
zp5iU5W6N}(oJL1>m258VY_<B5`;x17=SZgMwk%Jh?)UK*VLO2HLf?k!1Q%hHhU~Fp
z`Aigdupq~gI5P!JF^?G?x9A6R4oS6C1aqx4Sr?o|Lp?N(Y8N!%elBQMCC9v=k%fGn
zJ8V3?2s^j%iGTjLbS$#7L4U(sw^W;$c+4dhH4)+)DLT}Y$E_HmHz_be7TppUgOYCv
z<!7%p@EXIc`~+B->?OHJtQ4roUQ9xn<bNlO6d308Q~g-?*R8CShD?)8nejNqM0AJi
zy;k3>hBhaxRO?2T*pfCJ;?Y5nAyb%ZmWeQdtfRjFHZ{sZX3=>dcPZA7K6U&rrSMJ3
z23`Lst@<aqT>rcgM;A*bOBZ7^yX5>5bBMmNiu{;nn9^8K@J#x?!{n@TH!x&BoMx1Y
zpdS!C^i-FX$r+VWfUDF)D_ay~adG-ZLIz0`K#)}p3kzvR0rp=<Yo_DdUu)Y05=0|Z
zw}w*SsPeubM3dZI4A3poh0>Om7M8tl78YAV0KgX{bGW4+cEG<+t|p2oXOxm#xNQfN
z8f%1y6(O6G{7C}RnVfKJuiXZaj0W?HdU$68{-jOybhcswAmTI)jig>@#_t4FFbU=&
z)3D3#bDeYZ26=;Z?rb?le{I}drsj^85p*AB*D=t(sbAMU^rLueRZ8e8j2qQV1~Fi>
z8hYmusOb@gaqj3$`75=b|ETY1Q+Fq*KH$RLu8u@?^hVwkzBUu&NT}LcfTObO{CffG
zsFXYPCekhefLbLr_<RiGq98y(!bwWp?OeT$*njGHzn-b5w=DL}#3-U4#uvTj_lE!M
z)@dDL*38Q<eU$kMS~}eX_Wrp6SN|v_OJm*+WF}LA*Ap52i5V=y&zT?*mXR(4iP<pD
z?1K677I(OM+24;wj{}Tkfs`0nV=mjL5j_*>#$o*i+-Y*PU)i`#x}$R}_=G*KKA8Od
zg?&d1E5yBkIi!?6gDJR}d@@sZwG!db9)PIXWr=&{#YBo-o^KfC-w7L=Y$2_q5tA_s
zd_)K$q}9eV8#$HB4v)xO`cRrV5M0lbBS^BQ?N_Uyj}uJ$8D))4`RzrAKn8@Bl20*K
zK?_9(EL!7Tu@<%jia$Ut+x-QJbj1FEus=kWHhxabUvLKb<dcYJd{@-JRPmQ{k%6W!
zlO>dZYo9sf_2ZyUzTtQ`H9634fzfh{>IZs*n7#nJFjd~cRk}k{P;z%|sOnYp)rqs0
zMntK7EEh?ZW;Dj{ezME8Ko#w`;YZB7WQfu8Cl3?Ixic3l%&`v9SfHWm2pdd-N*w#6
z>pThQ1uF0rDpJ1vzbcK8Z)NAyf7p9L{2y_q0+dc+(u%0J1ZfqPj;s8HrXflA*Q%+?
zSWY;#r_OEyUMB4@+!+QYb20UJ1&W~+YkpIj`Znt-)9V}-KKM^_-T2*HO#8n*e~|@<
z*PKcjON29GAwVEB^Quix92bUpcgU|UHxv~9a~In6`L>OeU`GfbThFhw;fLI}TJzeF
z0G<rr9qaDYY$`8VgBvKl42KRX2rpLwBwc>!n|WK%ep~kHJws&s(en>DF<BQn{wpZL
zMko%o*KZ8X$I${~tl4q)sLx73pQa7AeW<kjzD|`;VOt3lj$E2$q~S(pg8jB>Z0)ld
zbX&L4=&DqT55oSDXVOUIOCNtJ?&o_+z|RdgGV~cu#bIU7P1)FXPox?Pt^Wzf#Uyju
zHJ-wt;Q{pYCwybEi&h!8>!GxjB3=MYmJsd7{?h#Zb#sZQCgbR3-)Ak*c5Jng=kai#
z@B_>mOjhgPQ7~?18moe?$->ieFbaQeT=5~Jd?z*=lLj*#XEpObnQ3^>$2tY5G-}a@
zEmSX?WSoC1&Qmzkw_{vO&V@N_n)R`16?m2h8z&f4!ZL=IT1Aj1)01Uq2tWZO5y$=s
zaORP;**KR8NS$#Cee%5<5+F>(+o;+NQrr(r-VaWFBjbZZN7<EXer#El+>6SSb_b1o
zc^0aIX`Kg^LWGJ>O)L_3w-hi3`3e%|1<O-snuS!<zeN2&LVqVGX2s*MNkQI&2gFI-
z9%Q)ZPShRbc2J$czXyuu$q=5pEv}mx8aH^Yu<5eT?p$+MhiHzMS<2=Y%q-l%gXQ*F
zCB@O0nelHhG)bg+LYQm9WySu$`ilk(r`gnW5*j?YBW_v(DtP4F)6k-`i2M!-v4phB
zB9+1ZM*Oc#*T9eBL;T|v2o3_m`oGPG`g$~gzT=`1y1xPqI-IL7Q2t~L**UmTc_(+k
zigaN(#7>sEYkdcfy++pC_P2+`cQV&+tAkLXej;;z$0<rYa;fBJ-$$M~?^*AyU4Z`=
zs8c{%EPE9vYlX$#umpl4!=+XQ8Y`2)nRq>P<*&mKBafg$S*@#Iivr!)FZxfykAAa&
zl+J;luT&!5ym{m^r_*pS9j1jMnop!C&aB@CGMetbC}E6!cJ5#tE)p{Eerq_dc}p;(
zrX=B=qAHr%w2o-7rgx<`E+s|9@rhVcgE~DvjDj#@ST0A8q{kD=UCuJ&zxFA}DVC+G
za|Tc}KzT+i3WcdDzc_ZvU9+aGyS#D$I1Z}`a7V_(Oe4LSTyu*)ut(@ewfH*g6qn0b
z5B!c7#hijdWXoSr@(n%%p}4>se!uezwv4nqN+dY#Aawu%=d-Rn+zkJ-QcHv4x~>H$
z;nl83-22HjF)2QMpNEM1ozq$th2#KRj5s^@lA)tHO0f36Asv{XHuEFwPv8h3aVTxQ
z%oEW6IvV#QJ0B;vgw^Hp1Px?Mz2A(2dQ^;}4MsY<8eV>fzO;Af@2_ABvNCN&Vi@_$
zRA;E+5L+M~+U^kL3Cv6VGRI-YP4;A4S&FiV_IwHwRVdRsZgQhV)RgM4Ma^G}ULm!>
z8q`CgL(VPvlGhnd4Y_Q(w#EU{=fE(mCcuyXqOz6x9k}xk6<a6}5TXB#O7tJXWRfNx
zm|8qTI4+0nQ><pwrb<xQqW9iwLsSruGn!<lF^uGbLX>3wR%n2?k=jbfx8KC{_QVW?
z2ys94)HvxzFg3~`E+&TzC@%OAsX|h=**G(r1*OP#MUZ>t$ZBnnJ56m_n+*g<fbzNR
zg^F!;n_z9PhT+zWudHURJ%;u>-@o>wMN)L+r|C7%OU{k&i7w!T&(lEg>(Lm5?YI)Z
z<xuhb&hqIsIu7v5w_snCz`?iRu>Mu*<aU?+ul|sb%N?cQYT+Ro0S|Z4zAC|xGdtFp
z6F=66QxH-hWszyPnKy;*7`3zY!77Uezrn(Cm!^OVdT3p-tV@qcMWXRJi(YKZtqh@g
zVxqysnpsMm^=km%l$AWJ8~OoQeT*@k>56HN&c15ADmoxo6=V1AoJDxTx;8r_dWba=
z34d+4zF0+J$*d`EgH=4aGD~iWMN?r-nPLgUypU3y7jqF-rKVVCMolJ?vXnQCHq3E?
zygp@tR;A8@wwqP-$|X$GqUu>re>O?GO0#leqeF|PxrbFUnRX?&+9UTQ^-bmx!a%#?
zH<q<Ztto)Pd&&ggQZa2FPNun)RUx_5K)XzhPjbxMrSAM+Fs^yQgL}u%v<nqFcLQx<
z<5N`a%BfJ7M9uS+BU*VzOl*$*1{{4<*kKb3Ic5uSNq%gYwXxy>r;DWVKXE_Vk>kZU
zv>7s5$dTD>2U*zg;YNegvp*xjy`Rq?-EF}S83Bmx;bgi)&qtF#*)1e44g-Oe6BOHb
zLCMn`&=S1x^%&^OkftmS_H!DNy0tXtDm$oL#m`o9$?ic5tK&QaR`dqD8&VydP=hmO
z4eNH1Vl)1SSv86{1;1>GZ7eRkgcGt^oM^b@+S81dqf)DFG?wjas_XRIoXwxA)TbD$
z&;YM#{~CaV6{j&!q8Q4}E87~4tjOhR`yD|jD7xz-`qG4CixswD1SJ!dNNr(YceB(S
zdTBg-bN&brgS8l(!5vd%3#(D9Rs}p}8tkD#7%)3&P(x)5m)j6WJgmsD;%%#t?U^$$
zt}rR)lG=wjUkB3_m9)G?t6Pgk^z+!P)&Q}&ZX<4NL*j8pdJ{Kbnpl=Rg^*{}#rC$9
zgeHxM@YlVRDsc-hGD6kMZ~@(KO!AY7e3CkQJJ^eBC4qsB&<n_O-R1n?)*7BzB%UMA
zrydmoC{9qnjW$X)99}$#X1Jvan^Pu=*ZDR!`arZaj2w=NBvq(ko(`{RCpOdUI6$Q_
zvRG1L8T>hMFE~sc=K_u%p7dodffBw1U*#b6=_ylpuw)MUa&2g24IPnQkKD+p8Kjt|
zBrA0e{WbCdZ9sUUwkn@$zfRSJdC;+_fgm}R!nrJph!|;r$;y6jNTv>VK%(mFIc71&
zbYEKGXaibyqWmY@Tk{fC;#Flu0igd4Olz3+NBQp<*MZDTvWGBG8r<sz@&eLe+!3ZY
z2%R%U!%oR6K3?p34^$M!7%51%xHz%w87o%HOJxc@$z{7ny#)LTSu_W4=CY$12d=IN
z)O0A3-0fxiutVji-f0IoRub1Ljv5Vd-a}eU0t&OiyMT4OeK*Qz*QB8m96%lkd#G!;
z6<XUyHrN)p>igCLOH%o>>M6OIYwohsAYg2z8B&M~f7N=iLOPie+-I#!D&YrLJ#*|r
zk`%QWr}mFM^d&^%W6E<n$8xgus8M;dqTAW5m{Q+G0Ma|TMVSnOqN$~9w972;2OdM4
z#j*#(dB7Zh;0N|Bokp7WDWE1X3%^JupRZIkvl1#RYg)_hyatC2d<hmxGLV#TL3_*M
zu{NhxBabH~6>Kt!Jense)RQoMqrAg_=q!e_ky9mt-vXrEWn`?scHMlBa@%fis_I33
zTO#Cq>!AB*P3)GH3GO0kE#&p6ALzGH1785t(r5xFj0@C83E@@HBtSSGZ|q#57SXzC
zBcVYI{w#qZOiY|a25^Fdny!G``ENdD%DlS3Zk}KXPO%lG*^rJ-*YoTz0!5gcbUBIU
zcxsp)g(jX$tR0mbI%5n51@)hFEWCS&4h<B2%W=dFX|I+)D=k?gnhnwFawau)qTVcr
zf(XE*m5nAVc2tg|UjT~7^+0PBc#i5Al=CO?j)4TcV@gp6jj-1wJFX+lw<eM<vvQJu
zmmNfVNewxUI7h1bb|HtGNZO|e=xgweR7OT!as2f$ION~eoko$Tih3_XSg&%=ozqDS
zle>~-C>z+e9XP2#<F$Fj{(LgAgk7cy;8dwe76&qhPQyp4^Z^1559~#+6SKjYk1ky5
z3s$P;MOgsdGmj6@cal1PV_Q7B>9L=w6n0&{JJOi_tKFjBOmkydTxF?{=r~Z<?G`my
z0K|XdLqzqzyogt49hT2aw6I<BFBgvd!RjZ#!hDPK3o1<q5_)JG^p{MQ2667}O>0SZ
zQ!+?)lb|XW*a39dgeKjifBjqg6C6^fO>>mhlO5^a!?k@%Fm%OcR)0o}*qm6<rqGsX
zi)~0eE9PTnUn8mXDJ{dZd%k6RSB1~~aiJLTOcCv~9Veqbt4aeO+?U!WvT{(Uu&*yQ
z29?%*&$i3b;zy4CXoozs|2i{YnnKtPz~k^<P8d7#$pY}#p*ltz?I81PhB-!s9RB#l
zfP8KR7gDLfzJBCrQyiW}54AwCJ!QkG!1O)6+%P1U>=$;a85F~$*LPd>M4+h=KK^p<
zUTLr~iZCJ`#!sTSSP?A25d9$@jEe9}IiHO>I(cU!JV|?&>({{a8~_Oyc02#bw!fyZ
z@HrqJOcWp<_mvL~UYdVG%AR6M@$eurF>ywq!qkU^T{D$%{9=rQK{Mr0e$Ev<4Z5_S
zNnwMk`o5QFbqF(j*<p?Iq*T;RhpW}*QxlX+H->?kTXXP`Tk>0tE2420%Wbv=sgM}=
zFD&<K>odG<``<v7h630!J3&g(o)V_zks1c%YBoUoNG%g}&8434g}Iw?qN;aJJJ0+|
z#r5`r*ZsSu(y5YHow^}no7+A2xn#m4IE)P>_Nk$!;UUlNa@pUE;@K9l8cg(6Zp^76
zHSY4thE?HEz;V#!D}=e137fguh3sSu$@cn(U(I~bzJ+UcXJ=Q1O00`zY_m-#grEj4
zEGB@j<Ilr&ZZ>zU304JM9hH$ewewKoi}a*G)7>aprL9L{@#&E63^!f5;GKKdIcz3u
zIX?;8Hm+myU<%}TY{&)aehJtE{bUL5REqCLEv$}$XOuvB|LmWM={@UM30}Tc@D;(g
zGwu3b=?d;_K`#|5(k3D+azz2#*`b*#(L%u7Pt3A#1qc<-_e7jCTL6jjvyRPZR?)zb
zWgFrXi*Z}<q$qn(`Oak%vbWc+nf*_kq1uC3ix-_;4tiXsc0+r>)op{VWcX)K(M?p|
z^}a9&&u8|iSNZT&G=-;Z1>0&GKleLMJk=huD4Vlz{zHe^OpLbVZE?7JHGRxRVhX@R
zX#DjtFQ~S{-S678C8X4#M?IY@6Nj@YeQh)P53f_5{5@XcsQhQG$hZ}!=|IIsPG@-~
z_{~ws>hNg`<7R&15+VS9kG-XsFaWQ-qAI<I-W@M|Pgdg_^UI5+{k^@4(=n%0^xhBK
z+DrH3!K0VqC#O#iqacW;Gt)K#)E>YaR{NtS)$_Kp8Ny;9bOV?yFjO|C|BAb1>)p63
z4?AKjs4JeWs^@~NgVY^gp5av^K1B~{YF7jfwz3uM!~O04tZ#R7eB-b!IWW%tVX4NF
zZl~8XZhad1Tj?)(6C#PG6UgWf`0A^X+pq%_o&XegitvOnypX9A-jKwgoqIsk`7vDH
zPz9}L=G;#3Lf5f!K3`t}l&J?<J(eln@}jf*jtf(`p8&TxmjX%Yocw{R4|DJ2;lra5
zC`=vcfLL_F_Q`DaZm@JJVRlmhy1#h!8#~diUb?oe;$e|%hgDPSDSPzlu|h&p?cA00
zg8XJYjgQjL^U9Ln!P^FM#dH9LZ^870ipk>TXKzH~Uzk?{5_k9H9xWw9crd@!v&1VY
zsOuRn#7S^4j<H?}#8A>73)ET<tGfjqktRLJc2DH1WR;zoaT)7fHUFR=Q75Zkj@a3Z
zaFwR_$;_EmQfZyjq#e8Sxt4qk$9Fa+G)Z*=Bi|h4@Z=c9OLQ5tmDd1%z7pC<v($du
zQOFpIAIg&_q1fTk%%PD=vFhAJSPvbzKWdC!^nw`KjrdksF;-cwR}Y2l`jdg^-(j&{
z2<iKpCB8_puTWV|pfjxSWijH>azCqI7bwNo$t{cZ&ry=x*Xgs76A|6USJp|n$Y_yB
zDC2KGY3x!h=P8)>V7&ntYvVVK`hxw4Z_sN~<v`)M!?GIsva+a8N#-OMZzmzby$1!k
zL9T}M9w?SU+$HKv<2e<~Y=uLI<U4s^xX$5*gchGf(MsG}ZKjtQ>Bp#BR6^2R37pGT
z1Dj`(PM$x)t^Bc$%_kZgDbs?_&wIue+uUzpy}>uET;=1A)F*)A>Ata~GY4hAc!A?U
z?{U63R0JMe536-g^k(*$`+N?+OJ(#XPk0Vrn^Rty$T*_`6p2GBZiWkJ{>w7+4g|H2
z4M328<GvN9B)W>#NL_h?{$DR4^iA=7M|n{ahQctX<$tp*M$UZN+xz_oI{cx8*`dJ7
zuF=LPSVu%73wwaH{>HwHrblU4zy99llp3ScT+Mw7rR)7PJ^rA!wpR1f3=q)%h-?9K
zK52(MxZVT~sZMJ~do{4JL-m{KI{J9x5!DKd$(}V4$Q5i);pa(WYKq|3lh&(wpC>*+
zMJlvE1NX)k5PT%eqpH=J7er0}#EO<D!Nj5PK2PW!Mh37sp>fJJqW;C+V(X<bWGoo^
z=M`HuzG}fwk~uHBSFw^I*-U8e3VP_?gUNy`1-~EvzyagV%K>cP_4kkIdOF!3{~9L+
z48Ix^+H}>9X`82&#cyS?k1$qbwT4ZbD>dvelVc$YL!v08DP<?ja7cukJC0smQ1vvb
z4M4ZtLj?gCbx_P3C+?u-qTJ!roh+4(okn|)k>S3-|GFX_@L!9d*r0D=CD`8m24nd4
zMFjft2!0|nj%z%!`PTgn`g{CLS1g*#*(w8|sFV~Bqc{^=k(H{#0Ah@*<BRE+W;Yh4
z)nEfl$Xd-xo5o4>tQgwCd0N@ON!OYy9LF`#s=)zI0>F&P85;TXwk#VAWS+GnLle5w
zSz<>g3hqrf#qGfiyY=*_G1~|k*h-g(AA+NbC~N@AVhf6A6qXmVY2Temx2|X$S0UFw
z%*D3^qpS5e`ZtH#e-p_hv3bYtz!vUA56&MBhN4*snI=g8YNZ{TYX{~dPZ=Z<yjE@p
zYaRpKyBQt#PVQy@4n{rcV=H{gMy`knT)#8>_gk$3Z?0ZR{D-aliB#|SEnR`T;N3<G
zwI%2~DWgMv@Ng^~*Df>$!}02ZQ(F`K#y94FLke@r>i04JrfBacpWL!tC&p$j#%e~c
zG0Oa<zw=^xxNa2t+DPioOFB9k=Jp9UbeabIxs!_;!)vLSY{O&u3tok~@qB}8p$qdu
zxdcCaVm=S0U{%rb?x-y$$&#P(3%ndvINrEBw7$4WabD`$U-rjrbZY<fkuj#A>(wM#
zM(Mn!CQ&`w@usAmfZg29h)&o{r_NeX64w5N5WxG6q(-s6n3+LYQoV!fQdogT)Mf~f
zrQ*(MSoLcIu2Zpl1bcHm-1-=no;nuG(Rr?&=9Dia+wfu8KmGNY@a~FBD`eM%#b5IC
zn=aI`v<7i^08qgeb@EmZ1l73Fe^)VHH>vwnl#LfZYM}d!X*vZ=X-Kmm)|p~g8rR~7
zTHpjqRDXxKte4N;M7->5uZ?~X`;`Oeoq;87kGDaWGMa(5g9dgC3{EpOF1o}w3Ms0+
z270RrL{cUBU0=kwNClDNSwY!<j=DDh{z5t_tvWvQZB)W&mx|3xBh80p25OuY=WigK
zD``5+8U879^s+x9r;?`BvxbXaYR;**n*1rEefJcxV}%~v-r(R~kgPlUnkWJ9csjS9
zdLtbdw=h?pA>Lm!3n$dY&svjk#S0d>tPZn?&G%Bdtl_HV)BD3T&C$JTZ)yChEr+){
zP!q~(%s;6J22$ep1;aq;vT%}A@4H_e%j*18G#k|8R4HfuOLp~*H8ydsM!zd^J6-{I
z0L19#cSH6Ztna?VS=NwT9B)9MqJAc(Hd_EwUk?-sA$*+!uqnSk<?jp>ia#g=*o}g>
z+r%Me7rkks(=8I_1ku94GwiBA%18pKMzhP#Af0}Seaw|!n{!*P9TQbotzCQLm5EQN
z>{zN@{lSM;n`U!Q*p-J1;p{V<UA?(aE*%`-`Zf9IlU<(`$#J&VL^9}uVzbuRCSoEe
zHYW1_(~vS}a(A<~V*&$7zy;v^f4s1Ea5HytF#ey2|2D+ByD+T${|#<q|FgI#|Nl1X
zSUaiOSvxVB+8MjLhN{VWE=iz&Q8tl{Xm~-Z3>H`75=x^d=n#jJ1K1%%tgPj|GD0Xz
zq9fV3Ma?HtM@!DivcDo<k=%xg+>Bi|RXcCu&(8=pz_F%<qcc0=J9a&ZiUD7rhZF%1
zuXO?ZL7;JmXlVI5+>Qq#Kd@NT0|MtB&yqr?e&x3@7k^qX=q=oz=wvkChK5$_^jhq9
zhI+$s(bJ<lp&26X0qC|D%jy|?O^b%-0pb!WGc4GLXjAYVZ(gFzmrN5<^qe*qq~85&
zqKn+6z`-H&JShgx6rNTZ)vyJX9JOGZK`s##_7r$99GXNies~S@9{kC7`k}xSAxv^c
zG1?7-BaTjgi|)q|p=06kVjCrm$e5~TG{<Uas>#2(25kdPfP>T<$A@3xOU9Xu;*O>W
zPlGz<+y;?kBjzc;6Cx`rv_6DV)$7dgS>VSX3u8DBYT4<K->@c~$tokVRZKT>AAJcn
zM`3)eO!3jw64$ia2bI*ky%;JvZAew%gfzr@2z=cx-FW{@F2|Z2yJ)(40FvA_tyb$4
zHp-iN;@m7h0Wd7=&Re6T*H*wT&g*@8FgUyIHK5&0SUQ1)UCLemXi3}48~TLSgCCyk
zrp@aYZmn?H^Jl<7jH)47mR8%{zw5cawx$r(oP>dTGqsxPPP=R8-^vbHS!I{bIm<wk
zjO&Fk$x<%YO92Q0T`4x(Nw-1`&8_7ewL3B8sb$Jwz*AN8^3iqnLpDE6G!ZUoRfHWl
zJ&L{CwVUd$LTUvIdbP-o{6VJ_yT}%aEWZyjJGh_hanHgfEAoC(l<Zxa)F1Cnj;kF(
zf&1aH$B2h{LqfSZ^jb1<h!(cmCxZZia#13|qE;bQ#G%p^2R@|;<xMCj)N<bR|Haig
zHfO>H+d8&wJ9%Q;wmq?JKe27wwv&l7u{E(hv31^a>U`O|>aMzfL3gd{Uh8TtBa3!a
zM{Iu}AI>-WSaizNSJ-FtewydP57^1>j^mNBnaaxoQn&p9y9&-_w4i7<TWf-O{}sgG
z{2x!F04mkL)|0k_HYSU%P`WhiEEhbZS5B$7*Hi>^xOT?7NKl?lKxm79T1T;#zGve!
z^z&y}PFN96@n!`suxGzHHb%{=V`PLBTAb6YsDu-M5z|b*X1U-HtKvIeCp^%4PTA_v
zr^@B{_qoGaW6!xov5Prol9ez6kdqH&(Vd~>o$?gruojX(F}osv#OuA9XCm{BA{HQ6
z7I#HXLktMs2!{a#?(wMAlBNdNxg}5ft0q4}Erg)PFo+~m7-_8kEk4%&n`n!qprR3_
zRKc<U5pxuz#YBtd!E|k4QVTUP7FXMa+1XQNX(BcAD7zHe4LqD%g1!;`Z>yO67pN<k
z`rZB;!N`A<vwhiqJ{7Zh@V}r1xWRD~rc88ky==Mm-}IbbZClO({lNABensR_FS_&L
zEXHGD6X#~L5zZpx61~JCa2X?$=7d_zsDl*1a`qz*ze4h8WU-8N5+Po=OstdYa9qSS
z_G#8oyAIuBA~CInr|OMrOHI3cgO}+Qjeq7bi&>^HTAedB<#V{RM6J$?2A+0nwfZkx
z)#H~>#TqYN<YEa8K7KPU_)pscTlB8umPU|6LXJG?z@&YfcNnk+2%g3Plw2qJk+wFV
z70;)xsd<*~!%4FOeN?d?=QZR~%gE1($$W#3dw9M~z?9wkw{aG3Y_Qm2sQv0?E*K-h
z=;b5OtfWLnBfCG@@jdQce8#Q1cW6GHaffqlx_0>MDy~b^!AI9>aavY_!YH!u%px+~
zAR_r);-C5#UfvaZNPmjHSuC39+iWbb>#uq)ntooMYNm#v%L5gx`qHNM^>O%V(&=$_
z)SkW9)C`tI#lQ5oYR4|5rnABn0GHiGa>kIEA)V)lr~lGU5$<kDXG>|u7S!kwV34&t
z#Znst?`+H+{F>XL5Ihe`v2bcY2LZjt7?Bt^Q*1(5Xcp&jtGCX0X8@7GN*e>1pKz{?
zTsY$-TL0JWaic5zP><ekjTR+?-OprCZHxUD*TLpBm-I!bTCw=$)*{34fi-V-kG_>F
zBpD0yg8$LFD8i<v8-aXAGTCa`&@c+Pv8R}I3iZsxIJI5O;=(jf|CWEOUUj!B-!o|G
zsB*j%_7${=PebFa%zBWS&y4}BFcoTh%Ra4_i%7)Ube+yDrcK3ss6Q(b6?sf-Hc{E=
zj^}23T(r-GxC;voJ;Uk#Mk}_qLWt}yVv+uK$ffX&{st^{i<+{wz^3DF36rq3f>M^)
zk-SPvJ|)^m$UbXDe<1>130Xcxq=9HeXVixa5li>o3bOiCmS8->t{1==s+|s)1#Fxf
z`>r33c=P^<d-z9rM_(s&x{VKHl(JD_vPbY%iT!U}XBLFy2bLjH7|m!icR0L_-)GG~
zIgQ_>?sE%sIN{nLrVKP2=8<eg*Uk9j_|kG7hd3mT!n07v{iNA7%E@<}y5*-eGH*I5
zE`s%zKJT0hXlvJhE3<*B#Cr%V@a4;nPO46dReJML9=$&-WS|Tds&sh=Vy*EtLZscx
zRSsm&k4X^3qd2kUv1=$$+Bht$!4Bo7p%ToKx-y~|JXpgRF><u0k@~TJEM+RA3HsI~
zZ_63v1GEecqfK0>#A#L4aVF0&5hX+277!PfIi#w^-B=A(-v7xyZMmjc^*yX$#oLqK
zZ9ANck>T6&l`fxVTgmj2FMyTGi}%N@9p_{)5@W~|eKY+}O(1Eb@~8MeO%U*3OJV<i
zErlNmA87BYCV>&~O!Y|BfsbcWre3Qam04<^Ox8b7rmU*W?BC?5tQ&Maqv&(z<JjBP
z^oab1OQ@h?K_GOF01U*1Rvt(G1{HdZ+P|{@E3>E=o#*zFyM3A~aLQx(BIxtIGzX$s
zVzx&kS;C&nIUnJf=0g?za@(IQ$b3sWi-$AZ35<7zDuzQDl|s$cdI)pS9|?_@L&YG=
zTz1|NMy|(^-ZMSEMkmyA*Ec=8U#qiWonuyZ>vO5Uib@8!;^$YYmuBR+aS?1{mN|pv
zw-8JT%`s<QM9MR<gu*+>us&h{q!ics^;33&wOgzyRooPenPBHseN0(uMGO0M=K4B#
zfGQ7bWrup@w+0D8zuXDVG3`|9WQUIU2=lfs0}uW&$pO=+x%3;BTP?egh9}g!y|nxQ
zF7c19A0dClYKuSr+0{^h;p=f9Z}r~jC}s(xg1yzB|3z2;`K_IX0kqq}KEYNiMmwrL
zR11gCd%Misw-RpfU}^|g2}g%6#Etdt0G?#sN0(*BU)z~$KoK<TbC0t;(pUXq3Bx69
zAt*48Hzk7S#o|eKG8jjUH{UWlvz_}?ooSX^Jk%bfBTU~`$UAg3_lh~>{Kq`9iHM72
zx#<OY>?+K`4Y8`;N;NJ+f!qAkK#UXrFMqzBWj;wJTv=9yxWXYj<=2W?S}YbPJurHi
zQ($FF9S}jGm#Ch5G_{9=G&4K1rES6e)EtmgOi_(}8r`}~fLVtU&2@>eeNlYH>3oCK
z-!_xrX%uzAB(J7fGqJ$WVfFl<r+L$VrsIlW8~JI7CREHpQq?zM2VbG&X?go$JFh&t
zjk~N`MO9qCWjL#?XYo;wfHOT39JmXpg?Ai!7@-o7uX>aX$_^-S(u6ywL|Ek8l5*sT
z8D9aA(LyK~&|Ms@$?%C~OSUB8zJuyoz!y2nEHMk4VjBmJdxc06{ee>417r_Zx8M_f
zQv&2&0cujOd<5@MSTY9gXQR_E^F$=~C=15`95Ht{YHmdLk$@3n#NUOMK$};s*lX~Z
zj-hg?05PqDKaXM*=@C*FUgq$9FSP4gH_)(EMoJ6Vkgs{7exk&Q6_1EM;VrM=HLvKN
zx7hNZad6+T$rH*0HD{xnW|(A;fL<{)@*L+<Y1PnWysGl^ADGrtX7@+CpKtJl5N-k+
zW@Z^E(oro7D|oyA++Q82LWmWzc;z;Y!gwN_m7<J|(}xN)H>A~DI2+a&j9;VV7>2~<
zOwYgnm%NW?RDa+8Z;c&Dn}UQ!4V=-1_4~gI?EYyNM=CB-ToUF;W;(fN7&0R;6*M#$
zvq5<<DD_?nu89FNs@W}L=Q?-?jhdC!y84yH)iNt{Fv(HI;<mbjMFqW&=l->4o!#$u
zL;H83)18fEmc^I%kG9Y0u2a8LzSGT&l-IvE1-?m<>GyN@RiOc=MG0pwK%(g}7UrlR
z%-M&;96}<W=sd_P6HicqiD(@4um^Z)(}aj%eG&^@P=UcPIBeKRaL;>o7L1r8apQ&v
zS?_M`X_R4kkwW!jor7h&G=I3cyLo=WiDB0_Gi1V3Z<9=>`A-w>Q89bJ>Y)nS-T|=~
z@1h8-J2K?H;h0g6ESyOVVEyg9o<40j9gBKQkt9MJkx!1&%PpEAT{s(tVflR)k?!o2
z0mU~aI_52$;dv3)8$;S9zy4g!NYM&dv+h1r*xa)+IiI?ql;2upk;*aEok5LD%PUqS
zz8;1l^|}F5xF(Ao%CIC$YgCZ|0wJ6yU9ZfstHAOwKs1ms4V(xMc;b-etG-ivj|D2A
zWYxMR_SLI#Y)|w~S<r9~3HOUecvGWa+T5Th17l}@U+|yS28t&F4S(fr;-pBLXLYaK
zapL4~@OWb(k&3tYag0WMHG$fOI#2z*gR@h@kT2%WcxhYsuw*N3>9~nxto669sc=HX
zbX$_ZzOwkuE=C*zP%=)t7J$QsNW$t3`nShXVT*uu$f8k+iyTDp@_c=Lp{vaF<K(1X
z*wzwy{;$VH&(q&TBBENv%mpK_#{8;ATD15qpY^TUh=cIS3}%4#=2mlgMV+s&l<Q0S
zY<=8jkKSeupKo_ZM@M^G8&r1AfAf5(%+3{&*3QhT!lsHcU|E-~Z=t&_o3QzadTUjU
ztAUm)Nn@Y2z^fAsJzJMp(xAxTt&DxrnbEb8`VBH}n{V;^pGed?`;;6bnZa%`Vonsq
zOnc7aCL@Yzb$(Wv+Y9{{zubH$S7$roli_vHVqA>Bc^0&k4p3rk*Y7Zi_uzwrjSgca
zMtjp&+ZrhxKyKW{K)&dq@Gfe!?G-`-PBLfo;s&_z5DRcM(+!N~f<I5kIa#?1NdaQF
zL<snVcl(5rt$Mqttf5il{ytVMM2OLCh;G?pBGNwh>XTq|3O~PQbs=qA-pTg2l^u+d
z%ds=eY1sNyehE&1F?Kp*1nt?h_p`OIU`aFI@{{AP0W(he39BQ}N&Fxr(_Nn9C@|Fv
zF2CjVJpZj*KW06pkPfYefvVkXhPmEzhB0ZpvW78P+6b`(DXmx4XD$i@<tcJuMqxEk
z+x;Ks{tUp{$TWH%7pN(*!VrB-X{8>yG6uVoa7U_hH3k2Py`({xw)s6nAe(f(@W-J|
zz@YAV6gVhtFUM>qy-n`}{EY%a%Z!g{Uc4KbHQ4Cysq(A?;rg&6Xew@Z;N+ZaVY|*=
zY%CB8ewT@Az-G0c2It&IF33z$Exgk%iGnm9(StB(7KF?4q@06F#2&%w!1|s-vJ<$R
z#XzNy)JYP=0BaD~u#sigQN$gNdTInmz#5sK4BSByfA_#G&)Zj<2A?Bk3$T_QnC;|2
z<0|qNBOdcGWX_efUbjcIbf9DLA2^E&r#fq>Gu)@g=vUoWqV-D~(xUfMfaCeY?ig%5
zNlo{2#2{?+Ykm2};*J1&Ep^Bz&WB;0YXN=I6)&JUITYUOUDcL5p;6b?izK++B7%r5
z9mr&h^fGbKR>>e`KebYXfs9w~PV?6xQw%lJOA*R&83!gvx2_G^Zzl1NjQ*&uWXlIJ
zA5d%t%)`R6RVN`l7|hlJO0zti;vgD9yyKBh-oiXL(LgU}D{!LToK9roJSM_z=}gA@
zV0mkG5=+m9kztd>9U`MRFOYqw_R@@-88|~T<sBk5z=^*fuz-Z64d0VNC*xRV^iO*F
zqWhk_Nq#TeYB$kp^!*)$5k5UPfLBdn_A~v0l1l5bw~zZ6R{UT=P;7*++5)Xda?i$%
z+Fx=13-8zXn(ZUAK=Fcrn=-=O`j+lm-I}Rbr>Y&n;wx0Y%6<;}H~Vhw9l)<<3|O$g
znOS~HbBeb++hP5w^R9fzH*%%;O@OyRJ2HQ!`5r6TvCxLMt;lTth4BYout)}a_|rR1
zP|nlJjcdDbp~VeGki#sSoP(U~1<uvR4|_Lmi=wcJ9p^ni`u^zT7fO%RzAs0A!tcVn
zug}0SWKq6HusEAXvG=4g<hx<%AK(PRG7VeRLP1tlA{-l=+ev!oFPzBVm3JkdnUXh)
zzIb2Zf}wGc!z+tS9N%cf^RH8%m~p@9!pGlW;|h){*uU|J)nBdS3icapKN)tj*|Vf0
z@~R3=?<vC`Zx&3y3#FGAUL&m^*I+IpFchu$CnGonhvrz4hD`B<=A2@&LxCQrK+$T+
zBgNS4F)wBc({2hGT;U&KcGj!4R|!G7@C=l&Z%{(s^M;3<)x2-krU%5Mg?;U=z3ZGm
zVp%NpcO9Xp{(1;Z@R$VXEm|YDbWpjkNWIR{1aYMq7VYpH@S$v+6&=#ypB5uR#Zso>
zzvfGSEi^1h$ayZla(pu`eFFiu-MqSdt8cz0qRmg++c}@ChaW9!{X)T1I}H&<kC_V*
zP=f`t7s1la)$h)Kek=Nv|0eDyLi`sApNscXo*3lE6h9iQTqTrGhEpl>3h$C+b&J+B
z&<UVo_bCXdzk7N8!23PxNb&|>WGhay#y)vpbmts^9+1um2a^f=rUg9gc(vaIvdu9{
z=g~Ari+YZ*_9#%du+x0Tj|uG&ivk6<0W0(z->5&_@J!xrKJh+-N7(ay9KI1^9DKq1
z-`Q>5RXJWR>^gJg=ceSH1FhP&;-(b&yx3;%21tElpT5B-^B5lRW1stx=Lw@yl4K-H
zH_&#(_w~Tx6OXfPTcCLo9$$?1c^Nx?=R`f{P#LiJu7|AN{H=1s9vgkea6`f*yNy6m
zELFO8tlEHRx_O|Rftnf+yTTazHib2IaSS}hRg2p_EFj}MmiDQ$RqH#OP&*!>JX=+E
zhHHTXEmdmJGX}fFret#wSWMoxwfs%78tQ;lJ+%#EPSxrJ1@y5{w3>3s`&VRTmheQ7
zm(`N@=UL#bJ3J63M84cI!+dq8*0Pa~cm)*vOH>96OZZ8rI+@#sxvX%J;j#2UyoI-P
zoHw?w+>h2y0-i8E=E{R&#ky<oQW9LSKD(+>4YXy`dpz<iTPs~bkQX=k;X4l4ER}I)
zLKq?nALG)P0!(?`Q1cX5vuD&MgDn@Z9%8!ZXBlqofge$jyvz)vzDfL7C<WS@+s<tr
z^~g3Q&|4#f6IRnX9r-wjp?F_L`e}MUJev`2-e);th`Pm)d;aN4wUzZ0doP;LczD2V
z7}6f{PwvO%ECu+Y5q$XUU$tA$Gj-(JF1=IxQn4p750ujUoS9UXejb+VWpx4&49NGR
z?=RPN^3nZDt8ccCGttS#Y<8(Zc~Uv!@0xuE!qbs4;Mgj7GQ&LRBa=w0yh(M^Iml=p
zfLzG&ud;`3j$AKM_p)%>p?LN@i=(bZ>Ps)txu1NjX9j_ZqK;J7FkwVRy|k|*99~?Y
z`*dy80oA`CJ_$tFQGtxLJfj|?%k{~!rK(wP%(jJ&e^AP#2mSmhEOc8GXcC^~u~)IG
z&bB&9qn$v@0V@7Z+WqyCihnp<KY1U2Jmj6OCB4py)**;xsvT-ZYikjQ=CdY~2YjX;
zTB0KyS+l?7!;(XP*4F@^5QkK-Fr!oj>!(NDz!v+(tZ6+efxni(EuvIZgq!%Q;IG-q
zqF8&i9!)wS_%M!tY{yK|t}-+MVeB2X)^xwo4U+<fd!We{jJI<KG?4a%R`)N@G3bg&
zSPVpn?iV=R04E<&Gzs;??>^n6ZT(3n^9s0^N~Zp<WA9k^(Q9-khIdA3yPMZcJGu8U
zKy1!iA*Q>VA-p-|=@^inh<~GA#G0Fb6cqg`G}K)*o{T5?<l|Lb1OdqYpe4}1irJj(
zaJLh5!on1h=R@uryq75O87za7_<7K4xhaYw>_kIK6JI}m$v_ol&8oO4P_zX{TbEI^
zP4gy_X(a!@XOe=(Mp}U0!7ra+gbWnl2qGN(SI*+{5}&-NnMCpgbIjJJMM#>k=g30^
zDbJL&s-oi`3YUeZ9y-BZu65hbFPz;5@(6>;XEhacr$vW+pjdI#rGBriL|0cF)|$<!
z3hq9?kqi{7WGa<-l<<*v>5S?ZhrZRY7Vy{kdqRI7&X0dtGtm6}Z)oRm-4;l8Ds`lB
z1{;=7P~qZ2_n6wIDqX_QLr64UbcGnv7W5MkBQOQpPgUnUuZmy*Y1;{C(bD+H71WwI
zFxkY4N6=#*ys|B0K*aJ<Y=H+($?*h|AA_Wqz%aSV$Z+8QDE>KZ-tf_Feu|x0wGE^{
za6HB=IjXDV7hj^UMqY@8D*!&A%+%g?A)#u;s#rUkuh7i!inq{PbR#Dr|8ZT+Wh(ZI
z1r+upwLB#jrdiBGjm$~v%G;|eT(?4SqN&z(RF;+MW+&TN%T|}sR;8Dh>e|RrS`1xo
z;obvgl5Z|wz0;94M2z-Y2WT6-(${?#QL}TPndp;hQjRZh6!1&D`+%7IvJc29LIBMq
zvwi(+IZ(P1qKSTq#x08<=kru=S9oc!%gVY%A{T9{D%p8jSYCIzFy$TV^U4-RLFD+w
zn77r`QwzNhX2Pbr7lOF`qlaW1HJk_R<PiejBG|i#UDwW#OZ~J6Yms2A)vj?Xl^Yzu
zKgj)N6}p?-E_8L3Q($f7BPpo*ke`No^xS#fGc9cO9ZwO`uV9;$lqLUJ2tbu<TI#}s
zO&*=5T!!zx7RFHn&109JP4MiQL4LstiGfpQI_254Z>3Xg`iqZN?BZle86?}o%OyRW
zEc|gt<9{tSk0Td&`c-N?)$%jzYaJhoOAjaF;6Z6r1}Rm!15{WMTw!4o5~)Fo-HoU_
z-&ujRx$TNix^SgDySgxKt>YCrB`EyID}h2#B6*Zab@La310Ghd_ma8AO#8-ulwSnj
zZ<5BIUzZE;5*FP#&vkvaG!H~2tU$Jkd%gFw`T!S{2mp9?Vh1R?kv;~X`YAwb63>)?
znkAD~i^l250{N2CJV<@SZeNTq!pqthV6F>e_QO<+My<HA+$cv?Y@df(UPzIc%Bas-
zy)KU*?cXuZZYl~2S^E+uA3Fx#A?X&O-8lTE*8)?%^hMU30S0qZXOf08Tz7QcS#y%+
zXhd#Y{1PK8F_AcssfTVDJerWl@aOoEnSM@a<&GvNKv1EcGrdA>koxd5^JzHJaZeQZ
zhJkUxQe7WRdWlz!MRJxF0W`KL@`p~)x5J(z5M;XocV_|rgnnd1%sW+|yq!Q`G&7GP
z<ROVhrE-+0JshFdnL^l(>Y07mPEwX@<a(4eu@sGb*eKd%>!LGr!_kNsDN#hMPL7#l
zlc=pE5aWH28%^Dr5#obbnK@SMPeMr&YC`p^e?y)lV?@3LQVmf_yWw)b$Jl&Of#Rp#
z&|KH+IbPYoU^~mj`IAFEK^Z{Gyzpb8*3I%bzXzl%M=>mC%Q2%)jr6JJ(KPB8q85*d
zB`H_bk5V~4&VPE&gUAO>5~Zr82#kI9vNGHonE(8&8C(Hj-<QFTi?WG=qOtRklH?W?
zS#Y7!Js(X-5#c77ORe?-Uid_^{DH#l9cob&`L1H8RWe`hn-;E)XDeOS1oci!K!IGL
zwK!+ygY74#^ScC0+e1>eU@GWQ@M~+4I^wF?8-BT6Km@x@%lir9`u3T}u<#oKmr!E|
z2--yCX0m;Giv$T$>#E8290L1S=M=3CD`(J9s?1X>SX6lZ4GocaWFnHAC)t1T^hkf*
zUD3KeM&diP@80N9p%T&fLe$oqvOhhZt`JxBO+^LSf?Q@z_`9Vr$Q6~<0L2-m>O(g4
zOan%-sNta~Xk*}&{@r#<S*&7V*XRTSXvT>)usawmHs1u<1GjQ|b56{BDO&snX)z?_
zAankXRi*W~FHQC%{R2T17EVv=NN_~B7>6qS8-oRfDB^`%jRb@OLn=Vxce}tFY;7n@
zj#*voq%N#N>y$Y|*HtC2<U^8_QnLUIM?+U9qliV@u?Y0O<6Q_XadUP@MpAV=aInBo
zMAkn|98Km!QB5|V>U<Yr%lvV!`7Jks;z?xEQ`udp7^>!S=)^IxgQ0-7$v2yiqNXRM
zwteC_-%jMY93pATf5JRZt)5Ay&cMar+UEM%P_tH6YH%!8xM83G_bjXj(q~&xt5EB%
z3%t+9ys%^4AWWnRiJ*K6xjY*LNS|#O;pS)*K=AB^uJVW_JHF`#iYDK!(>=WUhh6%c
zX>sTwaqCCJrW6nIY`0WWbIIb}bAzF+1oH!VTEEkh=Zo6npGn$x%=adz9iX3#tW4ZG
zd<(6Uxn#z9!I5&G|DBlUn~4sC6q09u=rux4?hdLGj!_7Cw<f4)(3Z#@{PYL3#gJkG
zE(MS00u}&OYiRHv{4zNOk(Umr<?V-|MflTy#WH0EW=&IsZ-r0WE=Qsx+J%M$4?AiF
z!wxE1C_&XTY>~W?<?fL#EKu2Qqvv>;w)!zdM>lGL9?iJ}t$XPovsz-)cS-!LHv0ZC
zb4AsYLrHn^FyZ^K^RfN==H_K5|Kmms8C*LII4c6rK%~mwn+cs0!Hx`!kJU7zAV@+T
zY78x5H8b;aj{WU`xKGLdJJr*0Y<S9>dv@5KHQ6gH)}c2!V)JwlsW<w!A>fdsGezcK
zvNM+<{?KLS;}dCbka?fVSkA4*j<+1;zd^mMTl-!=UrG}%Dar#cYGiWKt*OnI2`}s&
zKuJNJ^nn0>uh!6qs230jLkzPYLh2_ii7q$|O>AsUP2s0Lrn|+I5<#4D>kLax=_gwF
z9%;kCQJZOVwWh{(5l+S2;i@c9Ea^@^d5H*?CXc?hq}byCKRwrA*C%v%mfkhaNtGo(
z6ZP->A4&OCCWA#*#FO}#W|pFnPK7yjF|1x3zOLK4rW)-`{Id_xRgaYRE<$eQ5uvhX
zwf1^~0@8-xJluw=SU}u}Dw6aJ;q1JO9ug~KY0<cxaD_S3p~T^0)*^_Hj13hFx@e2;
z=8}?+WBbC~7xL3yGq+f<L5-`eUcUKPi)YPOZbY`C;*{aas(0SzV@n2@Y=m{PmzY8Y
zhpr(<2(?_!gtZV*rkFuPDm{%#YeAs79TdPxv7b_ZRh1V*0buG$Obwk-WaWq=|CPH>
zc4j+Rx)`6g89&yl&N%L(+7`jSN#4N90mygg2v-<ZJsjyQXiV2cw!JRXRwJNasUloJ
z7$WESbuCljO8!@-m7=qq+ihI+?RF(&-hlyW+~T0_!g(3EK99t4+${Z?8mfjyL}E*=
zpd`l)aPk(+bddCXMz&#D6{wI>%B)UllG#o_hk%4qb{}DFugg+wjSK#BF}Y6uqK(T}
z?kzHTS{^k4!@fD4X<P;?%g1gx5H0uG8Vt=+ZG`Wj-iVrmVRy3c-6=ANWv4M8?g6=(
zM5z;2jS&kp&KMX{jdYkflhkj)j6IAEj&Mr9|7(Uw`-;%eao7S!G!_~>cX#W(^8wah
zxhMD99Ne&1gVtZZcgbC`hyPk0Duv+(pFsD@Nk!o&HRyRK5G1T7+eQevJC6LPk{?9c
zQ-J=nD3qA?mBsZ7LMZK)4N_>F2_tu$3G)*!f%X;15m2(%QTyX5jbibaL(DZZ?^X)6
z<I0rc%=y!Bh#2D&Rf*;m{kwLL>6IQe1C)xidS(*m&S%Nxg6*Wvr#c_5a;M1(O#!UP
zK|w*!f?nnepYPN2Q*1CL6QwdI+R$^%?Xi@THq}&u@#=_#DZffv#+TLtqCOXu9c<0O
zB<cj1l5cCU+#WL(ls&sF8BwBg*nH)esviSatnTSt7Wy}{t}0%y2Ml1&XTL$jQz!IB
zwnb5cmfa#}-q6RJXtiBN)wW2N+l{E*E@NNHqFR2fxH&nPiz60)Y!9oCPP_Ij_u*NV
z?=S~G!;$f>sjTGdF-y+Z@mK*MKeXymw+sY=m5iC_W;0f&xoJ>Z_(Nj$u*A&fs%=i&
zXib;4XQuQ`Jk*=)+;=g|>19uWnY|Fm@!=U93(mB|GesI4Wr=-T+cXbcT<ScO>)0}e
zk9@N7!pP7X;)b3=9w&;zB8_zwDYIgysR+6MlJV2JZgTIABOgT$H7|24>D8+#;3xzh
zyKY%iqA_a64CM6~S%7)I77x*&ho@z-+9T$)J3p7ZAAvXTlleQ)85O-Aovu)#(nBFp
zlZv+~J@s!EXPC?AV2Qe2x8xWM@qgW+EK=kDvM;^m-$jX%#8X}}_^WbZAFz~n4^?Xl
zj%R5)@O^*Xqwo3nF0=1jxhKO#Xm|<SNY7y$Ocx#bB|9}mZ)FUL|9xZGN*_(|SEP9v
z0#o}~Jtf;7<1PNSK9|uxvqM?wx0|lWGpV-0j1p<!$xK%kk@!D(M>5ZH%Ot*~o~Quw
z_cI`0zS0)qV;eDMqE&yp@f(f!aI}g#JA3@l8p?CR&@Kv6EZIB?Qasr@Gt@Z{w77Nv
z-U<OtNO}q0y0%OpIZ)9J^dGiuF*KwQ>{;yNYdDIL049ee>V>Tr3Z~994}6y+LfVe(
zL~*qRBcjeUeu*d3^?P%t9mHjZr3zcH#b1=(bHZuj@nb&CSkplmQTCO5-ncOKUr7>~
zXO}(#MI0}p_XUBw9Z{>_&I}hoUH;%ATm@}@Ytb5^tGOt&!%kKyT~|z0b_-_?RCARZ
zLcxg9h%d{=k%-3K6b}W*odahEdv~P*`guGU=-EBpAXK}9hD!(mCb7CfG)h!eG^FI5
zd=4Io{XOpVr+hC9GHRYg2{EiG9pbO0{pc-`u!{CO2&6VBS#c?uQcF@Ge1pz8z`x7f
zHE9T}UBeEQwl^S|gy7HSeu)=DMQEd|gKT=|>Z0d0x2Brl>e0Q*+NDE2Z%mv2r~4?*
zs)BH22pO&FW692q$)y8BkuyA5=q{G1BlUhq1an)0@}`oN?EEaV#~%0orHAOc%vR{q
z*;tAA6OP9cdMCD$ae+24Qm~2WV^os>Wz#8!J5r1cHjce&Nb+|lF^e;j^Bs&p-JGc~
zKav4|l*k<uLX@SEI)qWzs~|!aJ0lsO2X=-U_Q|($@sk3`^Sr2)SV~Be_W^SldaF+;
zK7xK$q84QAOuVuIdLY2~Z*WFEPmrJT!U-NJIrTyNS{7+fVx$a+(&y<BSzNTJ$aVz3
zPEATt^kF?+*DazSNKWziYXA(E1@^9Dfs>}_e7EyWNLxyMK5|AW7)i^q2!*m2O?(+3
zqby+A^sT-jtH~dn3!P$OMc{Pqj?n#pg7Crsn{p4bJZ}i!``h8~b<pSkVxa`#3O)L!
z6o^Uyw?*rAUp304_2Bg2vQb8HWFn~~m~685wi^-5jjbmfYQD)GJLkoV7e?fmK2^rp
zS~iho5!n^yrZ@6lcy2bbw*MnVe1a(tnu0rHm}e>}(@ZpyEJ+ZW^DyE{7Z#gl4O)5m
zjbk$DMFbl+chBv*PFd^V$J6J}hZ+3qBvi5k!tI_S>L$TzcJ^*G+St!ob6TYl)tfN?
z;`rk9+<p=;Ca!Fy?RC%i=)c8Xy|-KmvzfBh4uZW58Bd50wG2z$B8j`Ox~wClW7Tla
zK5##E((`hBYp>C7v-`K&b^3?Dx02XH;WA*noz_@;rr@7b?!{e&;*zzHX(n!PtW~ul
z&|=dUNrRvwc>mRXpQk5&-8k|D{su?2jk5!p^G#(vbx?!4tIQ><DD^k9elr>Il)tb9
znC3VL0&yIpl}_;L7*w91$b^Glb%SBKJYJjTcuN?=rjSt#n#loPeNN^GB|4QV6#|9A
z))*lnJ%TH?o7n-B!{luw>GsRBh3~I*pndrHkLfbiN>UjYod}a51nzmD1+I0(7{u`r
zlA9>4UXUc)z-!bi7JWd-w@wwKTI>{`9hR1r15}NZ1`EQ*5she490`UZDi{~)hLQAo
zF@x+OMp^;QY=JO+x+2Qg;;>mIgf=Xmo^UY0Bv}V83(+id3?Mv1kz18z$0;fV^tm_A
z!e*cJtvb-M`dwsOP$-dbF6uU5Yd&C02k~DDA0g?;H9dbopc?PCHW8bAv+1xXzXd!O
z=bs!>6tU4sZ00nAP~*Y@frV6L2{yXW)wS2JPr{^!5n9UpOZ(@-%sgtOXPyQVQ0umj
z#|bhR`~OAdK?1RqGv8gu00994KtM=RP<aVcVk9ttV4&eMDzIjhS5pv0q!6&-fuUtV
z-Mth{6Mq<-PY@{<|3<I&wbiu&R=3;Tn(8VkjH<2LI`wQl>(+H`^)6R6>^1s-x*RQ7
zWr)DO1*QM_-!NK!6}Zmzcz=fY-cT3weAX9u+-qCImEls)cv({&mB31~sTfkfRfSU9
z@{dXYKVzUjk4~#tJ(Jl*gbJoBq+P2EDx8xF>QB!Xr{_D@l}x+DS2Jw%PYzv#wr4Q$
z<{p>C>mQc{_~j%mrj`i2vup17g&@6~3r-)vgjQ}vy$vX4OsqwR&q%c1yrRY`CLUFV
z{F5^#_Qw760bedcYqxO3Ym?KmN#AZdos&wy!>-x!nld4=Lmwf)5eFXEt2N8Iu~QxU
zWhsx^S#3sLoZt=#IX=fu>74~JaBEzFwQ*Ew%DaZW;C2b#FMZ6?)-Rqv|FVK@{dUR5
zVYPEq$u{iW#^I@nmdSoGl-=QFN%G%3_toixR}MR>kbQbmWkLJB8S!{&f*kt2D|G?z
z<}kD%#qQWOx+6xG&u@#;zXQfCXpHY`nN;(7PYJ1{<4tW*zw)l)3*&h1^^I(YQps}i
zB8H=1{BZ7_mKGn)uj;B>p1prd=_Znix70hLVg6M%uEAvS(nMw|Qrw1jI^F()!-C3&
zOp?`_DhrI>MoZJNcGqb(x_b=q@-iLhxTW0DzMt#9g0IPfxm;jr$3;gjS=-mVARB6W
ztsy^bdmzeWVb4lNyELxF=1qS0?7=q3UL}}s)nKQDQ-|8(A~ke&#g3l#WP`@%Uw22?
zB)w&2o_*2U=pf-^*y)C+Da9ck%PAFlPpgQ(dR#wP9%Z2=N0El$$fXrdZs87;i^-C&
zXE6y+u3L-}y;k80%=MJv#%fPz%`^BU_3`hd8prA}Lr>|U+Oc7ct3@844p(p8khf!I
zrX`B(z)4b&BxATa7wK3*4L_ygb7}WSJpTf~E;UYL?w5|XuB(L1cpyi#hi$6C4#SO`
zYEZT>4d2N&MRgWadgfOhb;<xmN;DglLUYva`&m$p@r+XvvNVs!p4_!nGkZ##hBMiK
zBBpec?7U>v4S%whUtMwPiTS75Z!$IWInA)SZHK%ixRWree_0x^?4tck^;}2eX5ll}
zQ$3s;24vdFNEq!91S!!HNtcb#`rsV65H_yl+SsCNpV%AB9$hf^FcSg89XBzCduf8r
zq7_K2+e^`mYkFJ|=V7htVLEbT;9K?W!9s=@*1EMVC&8$fB4t}SJcmER&6$rwdI6wI
zp`@w+t>nlOd_al$CSHl!zWkvr`**OUFZ(yyQs=b=+16^F?cmcLccS|kNnHfpbz}y+
zV#V<ZRV1?@HUj;$nH-R8%lcz|8&6SqQ-#xiT8i#+coHEX=ds!gBOITL*{GY3O$42w
z)p<g=DMQoxvn+sPX}@MfHrn+R8(HHjGn%})t@4_kd(f&$RZ?7pQV3UxQdb@mWq7(?
zv1OE1ZzYz=#1yR>D(^0}rdw)0xQx65Nxyo*)MydMApuvD4itFO5-(yK$pMmDYQ5qC
z>YI+^l$RA5o+1+kGO}l6qs*?<$W6-U5He|J;D}e}!K$EJcbA$rT4U13njeXmUWV04
zE*(&~v=J+wZ#wNB)meIcT;()U9*UkehG0O#b`t2MofG%By7p%!z8goIN;Qw!=U?(Z
zXQIu)LM5u$=Q&UtL#ebx@zB<I(aFV?JKPkZyE|I0UAWGxc@SmqxFZ`?ZP9*cP*A&)
zQtiSkDAnts%}qEj6xJwV<06$>Kd?u#VPLds9n#p!FWEHr*k{0WtXAA}6?Sr9T{ntB
zlb-DYLh__hEgQ+wY$<F+A$;d=uCq+CC<g-xet}pAXF4!CdxPOd6|Fmrn^Qk=BKt4`
zE?Kd`HCF~e%a?tImj7$@l~=fra%Uqi<vi2kS&xbfoR{8A4Aa7smbshk0PJ^>KAZh&
zt&aS4yp;Kg{@0JZhqpmXX%=86H-Ppe3S$=9LlRDkaf6p$%&H$n*X1D8<+2f>4syKQ
zecCRqs12xWrI8C$2l&dto;YDkFnx%!xah6#`qIaO&!|S16m{T6l1s@JxC~txbpV#|
zk}fu78*-_opFd&<)Ghrw*T^F(gm!-i?<-v*^%1X_TP))>kk2?<miut;j{XfcMy>ud
zS>ABr25C^WWbW2A_G`(T>sQ0W+8b1yW9omVy?$Vp<HDO}KP1OlM4^8>N{_<n<{Q2;
zsg@W;)R@K!CQYu}Hx&>*i_DXgI#L9*`=02#eRg;M=HgS}J9^gh_9dw?cM2yCSonba
zrkM9~Z@{}d^CI1%bV}4Oa%$+4biTEe);qYRO3qzE!$ZD~$CWauy#-f%&=%{&U^UX+
z!~hIB<YDA-vS{S=*MzR~YDA<KnZFupB05K!ovpvjkD@F4)!8<4YOH<w<tKdV+og0$
zd}knUNvILYenX)>60(p$6*T*D_k~Bi{0173X#Ld0fwhJUOPakRaMlQ)3Y<nhcf;SV
ze;EEm&qE$8-D;AVEO&~TJQ(!KSz0y90R^76=j&t8M{|H~#oHE3dNvNPJ3!?quwk{v
zT2)}64iXyIm|CdF`x{Uci_{D^&Swtd#_uAr1?NR^bLwu3oGk!)?IJZxNqN}>kVBx#
zg5knbl=(<kL#Fi1<>sY@Tiu8tx-ohlpN;g$h{F79#p!7C8)Le%inW<LgprE-;en7b
z$r4TSqKLBYbZXB|s~LcEUbfO+FxEjE4F;sF`8U*l&?gn4{?!T-O>P^DOB~p4DHV-J
z%iRm{p|f<1+6U9e;@N};bY3A^C8fb2H*J%lU4r<sLv0xTIJyHX%ykeq%YHh30O10+
zEY;f3+k^WztqG!f{=%E(XYH&IHgF)pwH_f03@M^RpyGk)HAD1FYw^=3P<3Nc<#abv
zV#`D+s(IHU9kCX~JwP#C;p>)6`S8^JoA7txgYiV(VZ=#hE3B;TL6vk(G(qY_<e+>W
z!POO0YKZ-vI1SC)sYD#G;emLBMVFt4Ej(J~FvIPe{CDkLfm=Y>Pwm66S71Ztj`3Os
z@9#<A(i=wrA!VH@ZrPIFXZWmRH2LnqZ%YRLQjf(q;^dy6s)ygN=6OGWfBF3DxVF$3
zA?Pkk&i_(h_k|A9JKTLTzH1)%J`D=*&LTjTVh?L0lmjfwDJxYRXL;@t-eYglrkV}S
zvmZ%`7rVSB0Q9aj_Gi)~p1}2jByuQCj>@NqkqMB9WAzSs(>z(#CrZ*|UuT27M@1;t
zZUYh8EeBojHewBZ)>j|%p+X5BY%J3l!Ume)@n*gy9%`4o$E1H2a8OZo{WZ-OPrsI5
zn;3l+TqmR$*P(Q;JJVe2Df%Se<r@Cp<tXffRWJ-hA`90vLk+=pLIL%0Hq5~>2%sR-
zpqj9(xHtFlijQ#C#2pH2HE!G7y`#4H%Xsw=<!qP{))OCE#Sdg+z4Vq)_Zb<JY^xT)
zTgtj62`xsoo_47)vDSD@{>0o=d(?;->v=_AAEo%HI?v2MZNOLFm)M@RZds19xmfL+
z*|#nYtu=Hg<RM(Z+W=vj>cjw7Gy&}%1%S2>>v$8wAJ2R~+<uT%_rVk~hV-WvwRNV1
zaX@I`LKhUIPKh}M!`*;1?Z-u&I>M-kNn21-)ocgfmrC-ArQ-Xh%l!S}+Nf=QLbte!
zep3kGSahTxx~WCY-IbL{MyGt_qY%(_XX3GeEA)%;x8`3hU0@05AgN7g3Oy?a<CS$Q
zm`VlF$2Tg2q(~+nIaWfEWZe2<EWJmkm&!sShFnZ%SNz3q^F<FFWB4a%Byh|eo-98<
z#b7)ye7?cAWYO2S^8(r3^odHP;&wxWC;$&B1#*{m3Pu-|D}0t(&%U}^l(82ts`(By
z5&W}N+LpgL9FXdX!&g5jyQ>+V;Hg`*-ss>O+;-AIeMN=up-v9_UVbSd##|#j*<W;O
zkjyh0AHM}SJ(*Rhx=}0G4{p7k_?fYv)H9Y8!Ss+sg$uA0QHV&g5)aLkUZum^Le-$a
zuo&b|R4n9Pvj%5ck@Ucs;J6Fb!DlJCMbbu$$uiJ<2f8=rG<%DOtX$zwY`N+$Xd%Vo
zqS7Mble?I6(OI`<Wr;5A9LG7dIQ|9yY9w$8(af@~1jTlj8vbnwJxi6MSe~aYDozA9
zUvbVh;)c3&Z-tHdXB09Y{s>F#DP!Td`gd@>xDb?WLvhVQ0Fq+?C?warby;8PufI~?
z<-x`!=fDNS#g~QK#b*D~wDcQtN9$2Rye2K@SN^|IM-qJaeDu}~GeHQh)^sx^YSw}V
zA^$P=sr-ZbrAzb0sWg?yH1d7Wy7Y0r&<tWwlPrYZWW;{A)<#Iyi?CG}JrdysMJ$kd
z4s44-k|wyBiW<fuBYS;V*{N9%;NPZZXgsPKBLm}n1IKoGq-Q1OomptKL{=%;qZCWj
ztg@0_(`Eqlr>gI)2GCJvUs`81g$EIuze3XV*Y#w3&Y`S0VSRR_xr|q6*|QwRQZgI{
z9k@Jpq6J>dJD&D?SWbqg-67GR)r=H~73}CP%VZGiA^$CuoJsX3R?O#lvMJQVc==e}
zg8@B@KFY}*)1dk5MQM1<=aMq$eXK5s7R3y`VZ4yjU*=^<J&7T6e9n&&$J++<&Ja6q
ze#cqFm6L;d7J2>)`#4Wc#G3axQ-1-lGwk7V)I^lqBYBxsT0Kx2?zkRV8*_ar!tkJt
z=|F*IsI*-eOxopCqFj4awt>@kgXY2S9RTy((EO7v<|`_58AtjJm`_I6+hS}M8iGyn
z_x{c}*|HIA!gjiYJ7I&`Xc=AMJrz_UQUMCj9}(ZFV$nfn92bZ(o6+ZX!;3inf}!|B
zw;Xg|HrIE>_rr^k*9sr|x<w>^slE$-fv|GTpFfHzJBNIzcBecC?-;DJCA5;0Tmo0D
zDkKj%y8mPQYnS+kI@VXwb6ni{3zyv0t0eB0oa3$Z$_+zzHe)BYf*-?J`G|k3dd)8>
zI|o`Y-!iusuKN?Gv3E`4zo?xD(Dk6R9skkdGOaebO}zw}nI;!jpYJW8BOWZ)3Bj5e
zx#CMhIEXn<O?cKl`!cukBZLH<QUwY(NB1MuITp4B9&~~1bIAUpG+wo^hbynmM;d7N
zE_7ksmh*4iIB)z+V7@H>U~ZtFn%w%zMBj{~So6hLKHD34vBImBB6|rr=k_Ov9TDKb
zjHv8x?aep|-NHo6bZw~E7&z;lfqdX7)6_9d!3T%O%i+h2Qy8eO#Jzu97y_0DR%Boi
zZskbi)tz4_p5?G3RN}xVz)_VC7q~7k757;4Jkcm*1b>l{oR8B5A(n(aqU2MYFPpVB
z6h&y5q*B8!@;^PIV@`WkEl>P_59)go7fUVT5s5G*^>im-k*|s-$5wkRp}EQ76+Ugj
zIq!eLU!gEOZb?$hz0Nd=-2hv+OEaKb!CToAt`hn51=q`<g?|h)acL3aGeNkf!|$+{
zME<xD51sGV%2_U1K?WewpDvU<;$Q@t=}2h(2jdu4bapUYEqng+g@YP4^~W8eN^UB2
zSR{^U9C=t=4RWXc3Ia>0DETbq)jvAF-4q1sk#2!_$hgUltLx=?;T2fk9Gvi^`h@3j
zR&uPc^HEtoq0tCt$W$3NxBs3N*XP!q*QZ75Oa8EYU7qIO+Fg|}YnA-+Zm7E?he&Gn
z(AN0GyFR}uX2}`m7h&ZmOt0-I_21pyb+NddB+Stfe7xs*vz#j`{sX^tCE}YRD%^E4
zBDjOl`FAUNnt<ZHS|T8?o>63d#O!&I>x*cPXld<~b;(78#6_cVXV_SgKgMbR!m}^f
z>2Zqo9XrXZ8r%X~<Jnx}e|Fj_CM*0ew2GUCrXOaSFRb%_JYL7ll>!OMUxcEMkb4&r
zAnz}M7jly&d4ZP}*|0Wqm5KCVeU^iDA?5RPpo+xYb<o$pzyLr}-jD#ucOvEIMaO|b
z#BSdFd^IB=O-xXPI&%q><h!q7P#;Rwou^LYTJoGHgr7ey@nMBz$uVAE;erjKb?8n>
z6%IN{rz>_6!{12CoCs)<XXfQ5wgX(RluSG|qpOOOp31Ta-ODMsX(F2*a$m5Im1H52
z6Rp(e!z+Mwmpkz6%NMiM`+hBheIL58hN8Ke6;sA_zO8{)NSw01Ol{J6HBZ0VNlVZi
zDR52BfrqPsI^i;2PCv30yUA~dFr<01#^{l&(Kk+V;S#2uOPRk9mbzD><+eX?XBJ8i
zR`WZ_Fx(qnx%dyy(NMo?<!v-tAD!(z-FpjbSEeU-*AB1(Ebe<qZ3i-m|E)%~8_Emi
zCV-)<JAwD;5t(a`K}adlH?VyI)nrmFw8%pp?eMkS1vYv;AX=<1QOl4wNr{4L7W$p|
zrUXKidIRJ3IeA5{Dp9lgBH|jfF2h6G&h5HrpR~XS?iJ}D&%K7zRXQu#FCwrv>28O;
z-Z+y)dMKc{Y(WBe0QS2<<+6vl>x$12LGh3Av;PrYZn-p;M6MM4hQ!pmLfci5##IU6
zs)BR1Xu&DENU7-N0JSwmYN5iL{aO^r^Ip>_oaH0nWGEizG-=y7Cz?v!P{V5jfANQF
z4-avR%xP{HbGBg?@5|<0>Rq}g`@701KjGl;*CWuelQ!k)D(`1d(OH4R8inw#Y+>_e
zi7c*o;0cv^4iPe|)so#OLYe%rSM2Slj9-JoEFm(^=!Nl%%U^sek|oG`!HP?^E1Y%R
z!(|EVWzAaLJB)6RaozREJ<ypBO-bvArNTy)k%CF7aDkw3f*<#I93y*7%@ygcxOPmU
z@f(PoIwk?Lz_mi^fUUrY7v%cpuOYo%<~HZ66rJaPqeA)uFEA-ZJmBhKw_=i!OQdU!
z8*l#$SaqerAe#mw;tLC9hssWX+P=WiN#s64L)^2TN2L>Gc*39Tlm~n943<N}>AQZ}
zxZ&%U!!a<kLm+EO(oj8->$wR#p0hG)dkF;NeG9AwCww8KmbS#%b09Y%L|}A!8ti-}
zaK3ggH3Jg7HK+O&nyt|aYOmF+`N0s&Y~xbzzzLFjnPtxjQ=jm(yg5<B<q(A4(u|ac
zu&if2tHg?UM>^D=vb+kTl=j>XHlh<F1f)qE?LP4%R+xPM{10kmiu4v*i?Z%I3L<t;
zh7Q($!8qmrTmyjrf^k?Wd)s)xxKsnRC1H&4IZ^AsXlI^p7^oP33&lm0L1X5z>NK5n
z2XGxTQ^(Nk(5Yn1$99jxX4jp^;DLcclXrG#h1(96y*!pJr@c3V8%vLKyT5*e8bLmb
zqJ&d}@gokjki-s!gXDm&7f+qCn^~`8?Lp4)v0p7FqLVNQ2L);`F>Edas{wj!ZeS&4
zuE#B8m(>8`w3r+Svb-mQQB~NHt^DxfwPU!|N8ZgB#iltJ3ce0H%gM>VK4mKuBz_Bw
z`qbSnzEXE1a>Ji)l^hx+=IA66VBY|RwJV08LAR64Kqkv&Wei5^?(SV1O^pZTDoz5D
zLv?Ec`f|yFK7|7RavcaDE9G$Ql)G9Lhx*&1IwPaHTENXoZV_<#0-#nD_=>dOZFAaF
zPo6y6h>h01UT)Rh6VW_|OaJ1JuH~`qiQVBfGvVgQH21epcy)N2(9(ymoY~<C5T^XJ
zZzD-s^DtP~d15%~A8BG<kVP7gSb@{#L*MU~)Gu3U(mJi?u2cd9&)HKj&oT^xNnw^S
zN@tVtd5t%(QpoL!dhpTNnaF^nmP!+SJ6ajs42EHeM9(~uj_Ee1kAn(Isv&&$Z4;Lk
z)(^!%G*#ytT{wx8>oca|Kpis{4TTYxkX}3){rPMoy_j)Au0Fk}LiD`tK{%8G41l<g
ztbmkxx(rRpFjWA1`A^J81_+=;8{iJv1vQ)tjQZ)nAjn3cHuq9YzByrLdG~5VRNYt>
z!}o9ErvR}jd*hiP#QCVAKQO!%PM&!FmW^cH`A+y2Ea;{A53?yOOMep|!ABg|!UHT_
z%f<NJ0QpknTDhbDK>q>&Z6dvcusl7km06wysty^a|6TcdtUeojF$w}dFcrb-B#B8p
z33}B=f#s0%7e1>!8^mRd90+D`6`>IP@2@SiXhW7B0@pbRj%_5l)KC2IOGL#o1Lw%`
z7fvSn1I{QN2sz;*lKw^lie-k)(IrSii!6Q;455=K!1zZ@P&yIPJ1(2cUwDi^QHp!O
zFmb;D;SZM}wizbTOQ5{F{|KWrE=QUm$s=+IQSXV>>i?`G5s(h;T<=X-5Rh6-5D=RG
zUq8?(3Jxg$aaA#nF@F@Ab2boCj5sM!V7g6G%{@t@RZvilVaz$ST433YauhjJ%*<L^
zW@lZj>P9tfk<VoS&+T=~SbBD(Mdh-{(RF<{AN@BU<!v|qY*(`mP;x)(Z}BhvyFI%v
z*C{{VkIo?UcaFGBNq37VhUJBDOc~A%!6ZmDiMMdT9q+POt*~1g+y)gVY{QyDENIN>
zK~UTVHD+vRo2UoD@7{c&h}XTZPj7IwU7VpDFF&@M-Y`o?#C>~y!GVH~h+8D0-H9V;
zZx8NJ&%0L?;11!CuNVLSY3t16q3RkqJ|?nOV;e?SmN7JzELqA{$U2m*tn(=QzLYGX
zX+(N5QC-=xuaPZ-NGODalET;-G+EL-l~Ufk*F0@{-}Cv*=PdVowtLV0W9~io_iN3L
z(+iVNTydGm*NiyQ@m23L>`pLAEm6ic7JK4cx`$NQ>LbJ+w~GY#)M-7XJ=CB}PgvbF
zD^Bh>s<hU|5i*VD`eMN%(uQRb>GV?l%+8YiP)aY%Qupb+t9Q<!hM+)E%IJR0;YmpN
zeR6b&a!5f!Z0sz#&cWxICxyP6<cFfrYk3w_(<l$h-Io3Ai*j(bw%e<M^hyUVnjc*n
zRj7KU=V)$V>NieMc<@i@oj9wD<2>^#MyorDx1al}A;YbeWKy5iM_g|DkJ`>%5{()W
ztgM<67>~4r<JCK~<Z~%^p-m-etIadob|;)>Mx0%{Y9QGQh0$;`K*ejnhC2xoxOTIr
zE>n|L)B8t1+1e-c)dqxim_-+#^r}1M{>Ge|>UBNi*2kJA0;P)PWB*km_{h^o**ou^
zsm$8<ToKOct7K?QZonIySizbm&;~E4w%)(g*i(~CDYDyMIc`=rdK33eOv~|MGl$-y
zWnJ>btMa+AGb)RuvQw2QRW-Ue!jRmkq)wiTSytqmv0H;@Dp=vGF**qW8i#mqK`+t<
zWTVK}i!*j(6$o89ZbtQ@_j|any;@#<^i6_QA^=$yjJ3vGv9uPIr&_t@75e1EUjQ{q
z!J;nS`B7OlY$&_#Ap9-a5gh|5azpg8Z{<z87b^QY-R|^8y??|j^tflS>^q*B{tYRd
zD?aRkDFrotu<`BswHuCcX(V~Se6Nv$?BvD4;eEZ;&?}C1Y>pk()h|Dh%d$046jP&}
zd6@mZLFBt<7RcsO^9w*-`Md;0Gj8nl_KV)sYMSp{^4gm__xT$u4PBC6X}|6h@Uj*e
z;7B8zl~Y);4YI~wM_YXQa6LPn4vOJg3J>E?Cgp?}vAuN<SJE~#Hna<{54m^!8L!V1
zl!-|}y%pj1d+BaBmiTK`vjhQT8m-)wy`ST}N5dGtV(&*?ehqp!&$7)I)30!Xza?Ei
z@^7K@Pv*br4ysCibQU%-s#n)HnYylMDOvsD#rlh`+s04JybM1yS=-CpE;6xgLXUM=
zN1~igc{vsK1!ol&&ZN<7`mgTcZ=zW#KDzHMXhByYL}td2&Mk!HCl4Ku+%{<)B;#*G
zmrJ(p=r5-5N;mfclc$`)l+^U+wCy;4$>WhjkA^E}B6^A@yk{->SjMlviz<R_f~H^_
z*Vqp^>uS|jYZcY{TyXS6c6|_`N|D0iu4K=6SU=P*Pu6_!MAp?HR-mCpfA#Z$F(s+k
zHk&Fb0-?e=BZ|(6T*s}OJgy91-Ayu2*)6yD5QQY%y3!alN^w0sDmUIeG4_wL8Itb6
z-_o{ne4V%-6VHtzSktA}?K+&S*ZB!nbZE~}$D!lvoE{RsG(~itw0Hzpgm^V>@^yis
zc5(4lMLm(Lf_6@geUdzGed3iNB~f+`ql-ZV%lu=Z@@HrdW8B^b`M2@}RI*M-cXuZT
z{=H&mHyC>R>j}d(2egu=eDX_XZ<=$~OW%!-ndO0_{GZjTBwHZ6t@(MG%F;`oYxpOQ
zSNR2mim^8%U)or^Oe8k&MDw0gtt2<*MBlSLaHKmMEO=fbY|zJDJln(>H*=wp&!hiv
z5+SSFgy*l~B)_g_Ma+4|s|HJNc1J2|#VmRo>q=|ozGt!S9D;n`tLp|_;^mWH@K%>}
zWu4|xH)Ayley*yIQL%33T<e>+mmE40HHqorHuW$KX>UC<IWn87Odp-WV@@weib#=t
z-z_$szo+@;=Dpane$4^tc9**I-bHjC$OH+^4MXN5ICsCOjMx}jZEA6aOLjiTjr!DY
zdwO#ZUE;8>LS@#B=-!bIe*OiO^)b>u;A5FUzxo?HC!@vPnv0m4=6-T>(jY$TEZ?c-
zaL+ySPYp@I!u__#2rHI?qJ28{e!4q)FC?Rk^!DEtx)OV*m^)P`&{Ifd;94R_z2Aqk
z1i=(%ji}?V5m}fVA4O|sAWqiv?_oaOPcDzRyyIF;rWAWnr3r;c4`&*TL*E6-q*%zg
zz8qj{XGarHl)dXRsdryOJg}765&TI*w-69!d)`+vth~S;wvWjv5ZH0IJt)S7PW2>#
zs&Vg5Y6ijIJ9l1Ix>|%)j`s@F-eqO0K)9NWl?`4+9*ih=4!BDW%_WC&hwoL2jnC}G
z^vz?U@Ags}Us4)Pm*mc_=JicfdtLLGiMv~6Snu9IO+V1+zNUO4BQnPK%9I!&1_~GZ
z>THXu6y+SH?fPia({^+A%g&km=`+n7DK08=gDQL^mDG0orA~FAy*4IDE4Qq(jZmNP
z?P365ABnrW&9j3{2c{RS1Ut?!DY~%YoIBF2FplG-(qguP^l0gPlcJVYWl7Hz5v31v
z*BoN(^j&rztZj<dj9TN(IF^L#e10HS#?u2c_mZzdQ%F8mT~>V1__D*^b_Z;J076Jr
z!?xlt9mg1D17rC?N#-|P$z87Gql7!K<pl0eVHV)6_B}^DTc;DSjvtwmZ0lWwYyz?$
zm5M3iwXXU|@2^O)rs<*ijj+^xA;$yvSM;N;rtf9Qyw?`5#>9J6xnI_-s?*3yZB_q*
zj}SE3mH1TO+{gHYmBriGr0N_yx!Ce7*BET(El)=y7a1aX4|ndUv)cRc4kF=HLAXL7
zS?!1!AfAv&!UK7xW)|bdU;3$?<<D*^SDzJ=5+1S{{B*f<o7m7c9@E*e_sehBM6)Y3
zeZzLL#>WNZas@@+6uTG=e2qc>=e`PYj*jdmEs9{p4>F}mh<IRE%!tF&8PfCKg5kru
zCW0(WNEC0!o~1%EM@ds6fF$fy7u5+qcj*51vNL2ANc4kAde&sO>@nn}D?EB(S+oig
zq?=b0d#zNsAV%bc|1pFIn!dEAe1|7Bv_4ghNA3O4<C$`)Dxy#qyRW7tQ{)}i`U*Bj
z8|Di1ltBH%ulOlePkugqlR_Q-@K@=FaZ}3P_HaYqVs29aAIVmG_ki#5Zi^CYVVsdM
zB3+lG57VRYR$}M@f-_LS?ala+mQLQBy1adU`uGt?ba;qV<}6IEJ>FAZwAx1JBPzyi
zjK2(1(HMVfA^*#iRe2uHpW{CM^xlVNb4yy5(<u>Jxju3WFBTTWryoaeWNpB~+zEhe
zI*4KdF42ZUr8r=)zXV_~X-ItRM<^f)Gl4;}yTPduF<`V~UywX>WIyyn{~(~afJov5
zBPWi**Ezx7iQ{m6E>L1p10Ku;o|?qNH+Di13ZzUPg;(){xg`MjfFJ-mPD#TJ_!(Ir
z8aKExxf8q`jo|vxY5}nb$vF6RN)^5YKuI*XahVmwPa~LVpS@bZplKw0NSIMxHZ2Wo
zy0qs(ZUT~!P|D`;euM&Igct)#xXJ^@jUj+7_SiotC@vuSOEAEY85w|KjSIE50;xF}
zY=Iu{Wk6FiDgeXabW^L18wS(b0tL%}iqvDk7Mr*&K%Nq#l@_WD^QQe4_?C)<=cqts
zSjc-z68O{X=ttcGV&MTWXx8{&lcVNYB)nFGQE6jV3}DzCL1V6C`ST1^YeA3-WA?xN
zWd0m;*<lEh2Ycp3Sr{fBAbpM>o}mX7qQS~aZZMFFVBWNB0L|x-aJoLDJbr#3@XMXy
zU)8!_W0f(6AaU^1yaK$>0VF;X2XU_z;G-^3avya05n$tMA^3(nIP}^bKHv!+qG>T!
z!QnwJ@l8R!e**%xtW)Iuo8QxSdA-e*%aGUmg$@26?5EhCIgSa=w+&k0Y|sM(m=5eu
zvAyrzLCav5&;R!JvzaZ@dz)tzlwtaP(f0d;#32XxP#_dxLDpdfxK0Rk`|yK-6gKe0
zupqESBkV_~P+UNi2>l6`uuFoy!w6uD`p*`)HsU9&xf2D-QxL!}eGwQ;YztgM_zoX{
zKfdv^UIRN464;i8*Mf{90!9?n9+8GWNQbiWVA==*`ZDA9sa?oqa9Rg<f#;#_etxn6
zNt%dn>CQWg0XFHff%59CjAh5zR|&066m+{l``Lbm0wQbicUTBq8bttGcD?<?HcwA)
z2?LZHQ-f2R8Oew-Re0hfMsgP(11^tA!_TyR&+fS4w4HHz1l@n1Lt{7NxQ4qhm_3dF
xwmd}I(%aK#prStjz8*&dTmC6;fn*0DNE&I5V}Yi%X-lRCL-WF5X5*W={{k$(urUAt

delta 35022
zcmY(JV?(A5xV4*X+qN;;wr$(ym2KO$J=w-o6Q;UzlQFqwKl}ak?%!}~oyS^{Ac*8;
zh-QXwZF^4Yut>h``a_(MU|_#sz`#V)mi$T5NH3^>3e7!r0!_>>r|)?YmKbU>w3vD#
z+xXyAnhfx^_WGpw_;OU35_JnyJxJTkechWP|00E6er64vrLE!^^HGR-RtB!-d{KP)
zE#nm|yGjW@qX&7w^AM#?_i#V&xDVX)onHQ?0f0}~A%>SJ32<l5QmoOHc$qY=>3qi_
zUW`-V&I%*7n^c=Qw>x~9I^J|gWMN33y3~i?&6N0$Ie8MCEi*wjr_1;druf($Jr;<=
z16yD)wdSS&GJ39dF)J&gh>q4ev!sNPP!$wn!qc%a!REZ?DPT14#~;gBqYkPMA67ep
z*yw3I_G+zm+dteG-Dzm(J{(y0y4n{QJ^l%NgDga7b<QLc_>&Q1?>_7`p0TwOdTad>
zD$c+J)ihS1d%b-R1hNq_ZfQndv$=+C<eLo6A!_Ybxc&sK)fNZ4!`$(Gk!+sXq#pM+
z;ocT&5g8siNv7lJsYm1mL|7Z3Su`r1wqanXr47$o<^+>HwdaxP-5bc^V}|R)VV?sQ
zG`MpON9^Y5sB&G@uWp8}YHprga>ERzXU9BnKh^Ve94m5f(oQ#Xr}q_owr7v3CY-az
z+)VtLTWqS*nAQmYq*{+?7}0yH??dfumg4P|baz-_|G*zVa+qfC&9GJh*E<{0L~!JB
zC?O)kPApy>p+iKk6NR|Z$(C9kfy)Ql&w6~<hT<dav$<Gl1aDSau0``e(R!X|XB?|s
z+|5~Io$BNZ1U`!+@7+!y2m|h0GVv!sqd?+jUy*4ClZvn4>(s^>nu&_xXUom17|NQJ
zC!W#<fozGY|EuJkt711*%GLI9ceU5-#FUU^6Yfi=e#wMBNJ&xQckxWseIEe9&8?zh
z)?_ip#?{NB^zLNG5jW6POQ@#jFv&J;scs|x(Ro=CVDyySX`#N!hr+}0xa61(b{7$e
zy~*bB*)dgF!bbTXIl=nc=aPQO_SPkGfu9ib$fwf_AeB50;kUPUM&3eTttoaQ@onDF
zJ;87uNRQoOkbNrn6c@!xvjB;87vD=<a&l#lQ0Hs7FMNt9#EebKtM0C=c+$Vnx4c<b
z1sy@2XBIcR;_2ApOesw!bF$A}(X%B*`6$b%Ar=*MT9YQppApRO#&8$hYR~*+pCR8q
zVoX0OepSS9lsL8#49m;Vc~P8EILpkxtqpw3y;wrO)6%Ovty6lHEdbn@ohtkMH<od^
z3&zO=YxYKE&9IgJ6oIOb@_%xhpkKYjMA^WbG8g<j$Gj=?mG}p}{E8e%)G~>J`GShp
z{)gR21Y#3FrI5xcJFz4~Y=Mo`#nr7e&&QLS!6V0^xW_}UrI5erSoP7xqV8g1sghvh
zN-O20s{OXLL<OORajslSP}*ppt1*2h(O>^}_k7@xYAN6%4T*3|WEN+;B5BHDZl~&}
z^&cC!{>r83p4b2)mRfEWLm}E^u?J%nc?d{&FfdqHu>Up+SYc?xc1hZlzbNqAU0o9M
z-<9H-q7yggm|Trc4LY0bHl^f8v1D<1vB{h1U~xP6c3#2b!QWjUck^@MBM!dY(m5WX
zb3~Lmo?t$q7wwmQjM2^Q_O$W>O#bt0-o8Qir~EzMzUSqKq9AA&d@2ZOHv9@udx%hf
z-A@kH{;21S$B+;d*YzRX2~QxO164DaRw#DAKbOVhkeu4XAhsBFxIA$d+RtTN1e}Dy
zx#+CB_7Gn@YtTtE%{MZn^diIEQaRlrXZu#7g8au$c^~LkBW(i4ZT_*&mv7{-hO~uW
z44Hw8d}>LR4X<18({b)2_E@eWLrkeXyuYkZ<_bZaDHizEyx;YY`4}K~keO(YJ>td>
z@uT)orpYAEP7|Ga@BHk@2nN#|(0yyO7y$WIR0_^|;wn|HjQ1Vbr?{6FZIeh4n_(S$
zTkBJy{rWXRcX|@I=r#ixi#p}4xM39y{W4x#{$l<xz&e<Xo<XWjRK#v@HfKDEC=KD)
z;qS{8&z{c%Hg7W5#|12=Ycq~}I9M~(vG4mJP4Xs|7|Ti~(#@S^AHN{F6F%rHwM?~y
zU+_7(FdkBi8~dMR*<~805>LWwoi|@P{UI!37}Y22a*ZO}b((VF*`8paErO^WCTp%N
z<>FN$pHBV+K8IX9p2Is6LJ}3&!_{Kncsy70KWeG#EZUoORe|!(^O}=NJ6_7o(DDOH
zW9Ug28!xAm3HH&NtiRisRH{FCw96|_s%;`v`gN_(v~VoDV*I^t8ytiBA>=gx)7(})
z#l({u(KeWVjO}at0n5{~plTc`GD0_w)GhzVT^sy{s_Vj=YfjDjaXQU}RPuvdqJ{e3
z8I^kn%`FmyFMyM&p$|qO&G&Otxe9IgpO5e1ZE7+srpdb?A-_6Zfkr1ZSu&eHYN|AY
zN?Uj<oVf{eODIe1`mllWxsl)S`(PmiCI~q1MZUX$J1-Mz75u)vWwABQwa?)j*#j+c
zH_QB~6=$&;h<XA`iHc@+9>%RL;~%!Irg)-2wts;VR0l=}%^XN{`mw$X-V^kqOIMPR
zw+INRO)}`8{ZJkr@DrAif%1<XpdGrwJivGh7N~Gu;>aH-(HSr54jVK%aMrk0PF9En
zH<D!8rLIFQaRw2k;%>%MNT!mPugh>L{*x{ijH)TKet#zMAshp#goVhm!_p0~i|d=b
zKX7*^*a-1xuCQu`L9M{HiekBiSQ0yn`J$*EPfRJ5xty~Qm)yRw2Dbcz`oGhg<f1%B
zhYki-O`SFj&;aAQa6bBL8A6kKyKRqz+j0jIvasN-JVvsxaKB8ViC`G+QgysSF~odY
z3LU9hDa)%E)2Y%c{dM5m87n+W!Yh`R(0PYNikaa2&mBCT&f5#<IOYbtY%ac@2WWI#
zBV<qWZt?=|0-p>0uX|1lABx<sJB<I$yR)D#(|@VbtpUq`&zbP~pupK@mrYR3(m$Um
zNfMtk*SCzUAjQGE6?4vzNLkaT)GT=ci)Qi1d?UUYX2f%dDYGsc%;jqMEI%7$|FI#2
z;rbc_>Tc^AgGQH#C~UWis6c^j@uoY%<vA<|&C;CH66C_BW@8W(vEB%RpvO0s`z8H=
z#B3wRT)<ru+2;&NNE!4n{tUj%h&Hdb%=oaB*S|Bm)-T4%1;0^ia9Xlva6^9A6k7b>
z5%W9q98fvVAT}DuiIJ>>vg{baVd$R_*It34ZyL{HL7T6j=Z<L-m$B1&VJ|s9F11CQ
z$13en<GheqrO*8yvB9v@cn^)@2(l`9*QEFM0cb}=Gq`K}Wsj9auh6Zoo|Zg!%I>XD
zKGVCZcj{bZlHWA0wSDWvXs~uqKy|(%$5&z#$PrDdK2<Xtwf*wP7aHrDyG$O0n0-;2
z-!+KUe07e|GAQV8RDGLta5a52K)7kx@#FCp`Wng=@tCVU7YSs7L|hw_&y%IDg8jUB
z0ErTQjfOR)CBBKpeTc{Yes4Rk+1T7vvD1Vo<IT<P&);ng{u}F0yDH691P%rMkAZ&X
z8c9gpk#iQ5-*@IT*0GZ+6a=lD*2-*cu&wVqpPYX!?e;NX?(8m%iNdIIvCVJoY`beZ
z`_s19H9)iyjhHVrHdOWX{b)epzx;#X1#~<=K41NT_ws@kzslAn896w{Qux|^^1O&+
zXYDDw1DU!eMikr~xg5Hvp-3l8e98)@u%;#yxS{9L<9c6|L8rm|XpmyZiW$|zim`pF
zW}!YEor9UistG$wGJ}q{lED43)2g`@FG0}v2$?M>o&w5ts!UVaKN#7Ztt9Z`11g}{
zcd{hS(ApwuI{YHb3KQC~^mFnZ@0!Up62{`MAJ3d9HmhzD@kf^LL<M^_m8HghQS;5G
zz#@AsD0GIzK0qI~1U8G=<jQ7hpBDJJmHLizs`r469*G8QH{9%qB~qm#3MrE-2WYyU
zv*Pzdy&xopniDBlB&{1L1P!SB0bVz3(DNtfn4t95<QkOgaXvalQ259O10t?x!S9g8
zt#|Ilv&TKCR_nGy%qG|&f%|{eL%Mph)jhDNgt3SeE0rf)c(;jm!{w2Vzmr29gvSxv
zS_ZjoW)sE;xFt#>)2q)w%}XS*^~qS%%ns#qGIN=NbuLV#TR|pEGSRY(K;zUkUVM%e
zd!=*>X#socMI;hG0N&8IDlSeAmvLz`KGE`M(?pj3nCq&Z<b~g2>Q1SginfsILm|eS
zH@kIU+X7XJ-5G53@UV6*F_ZZ1hYCDC`*%TSH$F^~9sBIS6jh4C@9r~Uiy^MeGcH4g
z?Kv`eto<cPX1$c?vrzO_Kv>I%EL8;x-skig=DTO<ekJC2EG341WzZ))$rPJ(Hny_s
zTx`vRa8)oWA1=pV2q?a)h-`YFCQW5Y=qhqkN!3YZ?$qF5YgTS(pYV;)7BWnJ$F4&5
z^?Iiyq#29e`d*nvCM|A;NTgN0^h@@+6dr?q(j*pJM9CKYGA@`PU_N<H*JvD{8lkSW
zAj8B;w6B|Hvyr9@ZJ3KYiD6GH)zy)>OurPqz}J`I$goshX~=SFDnq6`?7Z3u|C3if
z-*`tqVlp!`ZkoQHn$!ajh*^DsADebD$yGPh2$f#y#BXWtF865&F`QwbsdD4=7O=$n
zT=AhV>SpHUA$I}?!opy)s2EuKlWR(B{ASlW&pm68z_fhD?mXO<Q124;l8>EG`|*EE
z8mqiOCkRh)+dW$P$&~q@%j&Djt3?&!hj6mpwNG&0&BO1N-jNMx9wt3F;sc>59P`X-
zMVw!hB<nBgkA)LO*gqC;t-0O^1C7ckJY>qY&r#{O5n=Rzd$eb<>an8LGvr?NvZ^y%
z6U#A93?#Ue|GpZ|F98zK1+<?(De=7WZCB5=6<Zds;P*=I3IehwjQ9Jv24JMC5Q$dL
zq8<|`p6_u|*4uh2G_7PP@{2-}5AHdfztWTcQ7!LO-F<!pOARUm#mg*bf-g$61}t}#
zcVQov24vR2lHp<03j@9|V{X&^2Im(aAbu$Qk_Rtbd#4(ta5(weS>GjremNb1@6@cz
z7V_ywkBWBAo1>I1)h&AV6h5MC_rVk-cUbkht>BYOwEBV<BzAZMyIu5-28Vyg$EBsW
zno=EqG;_H?3LTkxw;VjNcWf=`P8dVWT0Uw9stg8fr!oInB)i;)=^nC$v|*I;(kXrB
zpC!bd_;Tvpfje-EvrBp9{cOS+hx0#HT-YV`gw4Ja5mT;=5B`-FBqcmarE(yDi1UiM
z3Ua*g>kIp>4fUpez)BPtm<Pe$0R!*uPnyVYBa$?{KxdB19WrF`hMi|IYYi3$t}W{g
zGcp7OvbXXx`QU@+l|iHT>14(Z#fEq|jjBK#7&zc4OF1<&#B8gHm3f~};t!6o*nbFq
z3B@xY|0V_RD$!hrO8|zNz<km+Nzgc{mhA#^7k>pW823?jnPp~tz8_>(T?O9T2ahz_
zec%rwzyE!9tR9p&<bIh4AGloEl!S*+7f}IFI0<nRzF#JejUZiks&l)VJGD7Iqieyz
zvNEmdxk8|G|1Ee`VKCd!FagF0bB3K$G)S?zA!<Cx(I&rxz-(YrOdtrlyoRrZ7&r+o
zm)h?YHOXAt47DH!_EugT(au_xI4|4kBCV1x?NpqQq-p5n1lCNj=urHiEDYBZBIE(}
z1bOw4KNU4ruYjbH_94kVzl^pdyR1v#^@{I;f~*@=qa`hqC6p~mRS_W!2>hZzsOlF1
z1;Kz9-<+FbPv@}5xU;}3FJtCpVG#x&Lh&khYWz)?k-B@_E&+TC4M`La=?JOu`Rm%N
zWamCs)eN`k)X;cwYcN9j3Anl}F&B`^p`!WCf8FIki?6h*HvytD0Nr8Ike3=J;yH0A
zV+P5P8*ixF?qoy>YJQ-LAN{~DK=$ur#VVcTvGbd-zd_7Jt+|elsV<sltW(hVoOV$T
zbyj^kffBjx%uR{_-DtZreso?xzuC8<bTUvejcB`we#+mmBmWt}UT#8JaC(55gPAS+
za9W5CQmArp|0AtEG%7AT4=Q{7et6I%b}sZe73K7tt5NxI(;DJ&|LEqs&|4OBhK|#0
zn>|mkHc`5t%(NembP<$4=Gb1pKp5sg^O!rh**7qbcT&jeu;haDMQQE7iCS#+w6MCo
znvrj`4uwQG2YaQluyN&~X;}bvxNl1qvXbgMzX+CEYX(pFTdGn=f=F(%kpGOi*`XBK
zc873Gx75)Ar>HH*zo-dBMAQTdDZ{X3A31^gaSO!Ki^V@NR(plHRkt{Br8OU19Oh(M
zbQK+PpsuC;XfnHm&>(36OT8cS)qs~W&NXI_mHZZ}=6c+9WVw(4{T?72(>Ai}A$JRO
zDcD>=fBm(wgNJSH+;pO2NE^Jh7-*qv*$nj(^}JQKZX?NOO$Cc)aypmxVd)EDb$DtC
zuuS3NuWXpkV!wJ7{5N`H5-;Om9KiD7ZHs1pnT^Na1IdWE?zfaaIK}8Cb~jrrx#q|L
zQYtpP=ej12rIGe@j|H?Ok^hxMJ5@eZCnB2lh6o&0>7Sv#b)l=m1?FQfIX=ehys%Cb
z%@F|bhsvi3!eMvT2opkg8j^c7Ms@f8eV^lD>Ops2(Eom?{v%#l8q6Aqev&V~B<1G4
zV`{27?tR11a0?|gKMIgy--}ugV_BBujMG~EJX_Pbd;}Au{Ril2Fn3vRV!)?Q6{-w}
zbokVSg(mz8Y0>HN%{PEBKf11;PIgPxsBG*_)0jaWfF?p&l|Q;_Y!H^kKLqJTE-+Sd
z_)HK{&Ep6ArOptwU!9HRY?&vYr{`*=yu7dJshy+i$z`oj+m$-mW$M8+zpLp<8J9Gb
z!Z4lLKY9je{sD@eWgY~`snUNL>_KL6d83>Vj~fv10*XQriS&=ZAR9=l#FF$WBKkGR
z`%>T->GNH5Fkb%2&*=*Ji23cy&a(0(APAAx*5Q@K=58Ho=&A$x0bD_+uDOPX-b6Hw
zcvZX*9iHZ#&petTj)g8s;>2$OGE{aUaE--kz35JQ(tvw47OidBaeJX%jUj&V_!h-!
zXK()YA4(-Ti<@YVyfZi$K1=1|Nvip>%@6NkTIP4gy^%%r$Mytj2z$uI*j($Fzz5~j
zLCD6s^fD+nkKCC_TaXA+;c%SN5^owz4i)!xv1EHnZH+p;qht4o)|=}2d8(w5%An$;
z!^7V+aiEd0X?E!Vv7oO(3YVT0&P3h?<+2^`lZlrHGxP=TEfMM9W~EKX*T89_9p+QP
zi(`^lNA;t{5zE^>t?mi3AgkmdZ|Bfsc!-AyZ)ie((nhyyub||=OOdNL=pJ7SYQ|EG
z-Gj@b#{+M0^OcPJbLAYims2u9t!>FA*z~=|4DbNqE1&B*pKq}b&Nf-u91rELq(<4E
z!s%s{#9ddly6Oq;_xZ%H=hxmZFbUQ-{ng5tcGlJ0B-G>A^IH@zH=S{RDTJ{JDaW&)
z-4CzTTdM7+IalL;(k613=lJR2aUiOo`IgJ!k+bKSt1-wRp0!a_S@?$7L0FMUE$P6c
z1Za~xY`p4m{G?v!+TBPriv0eP!PfgnL*3VvEEe^EMffiwqfp##<#UL7Ko9y;V3GA~
z6I3t^s?SIPRXfsIFTTOHE!&lZ$Tj#$W0__-MYcD@Mi}fB>tAq32+sH%G!=4ANaLLL
zET>Z1Rx844r6FtCF<p2eu5<r(lJ`BC8zA&>@yzNC4)x33V)^-;^poN@n4;5>qz6Wk
zH1`8L-x!w%1NV|+Kl-MY$%&AOITrdB?mFEsUPT(%SA;$T`Nfbb%-k^>LP3<rP5H%D
zgy?@{HqYdKmOPVqd=W<{V@^0rvrE!wGBakVf&^h_y10xWg!A`D2saU!&W+ygLcmBA
zvnLrgOXQ$Vq#QQhdx}3~eg?Bvy;{6v1Jlp2gd5XOy`;+m93F!oZ5adXpMn8n4|8>H
z@V%U>P<lFCev3)!C7sq;Y_piNGAW!Urg`(f5U6=b<X2PwBgta=Aa7gi>^u|el)68Y
zHRfPclv6g}53DhQBoxm_l%H|`5&{>5RZI{AyIXAV1*s)OB6zz7$&OAi$H?VN{1su6
zPr@WsK{-K`uNUXf`=|^z-7%g}b@F330#|bnnE9k?7V=0>XBUmaVXfyEO%Y0XTW?^t
z?4+G!q<;dmt;?*z*wod9rM4S>iSlL71;;^=s^IR>E)ZYtM`%5OC4q@}^8$a)EdDx9
zQ#EE99N3izLyE{XzoEZT<V-~DvaUBxAuKLTZ@P13?^clLKOND2$I1Y~&UI3VZ+NV|
zdRd+6?J-Xxco;@LUi0lau@QTi3GClSh?9Qjy})~rij2%P2&&qPkToAty&zavg2jzA
zDxG4h-(k>_LePFIFo^G)rUQO+(X&&3Xp*n~#pW5rDe*%X$V{*^!4s3IYyJvIFM!qv
zl}{<`8bba7n}-Iuz{K;XL1t^jXk!TcVfb$HktTU5c<5dIF~4|D8vVuH#|83xr%hMs
z?g!K-mER8;P9UOiXeuSYAxWn1ATmaNOZlv+q^#M6DMP`;KPsFJ{0yifhkjB36I>vK
zgOnXlEh0PBk-^ST=V?>an#`_GY?jC(oM;=p?p^g@zCRNq5UqA|#8SkQ`>7Ah2i<Q7
zFh-GGAU_JItsxAp#>v!F1;=MSG_PjzE9Z@Ihk0{-CiM3(Nu|DR6MCsw1By)R$53g5
z#m^3N8fF;Z*7_=Hr-Ay~0=H~>f#@9mXu`@iaSds<-7JE>BOk!&@`<Qgg-V4Lgn$J5
zwOR6Qh>3ImsZR_dc8>^O#a<i&>za>KF7OPJNFbBpU5oQa=xTw~Kg5qa`qDG5KVr;V
zvd%Jb9y*iFOlpZgKfPB*<5G718R?Z1^ZpIAO_{Z2_zdgE^i*AjF25CL9Z}K~{}*1^
zCsqMe0xd+_(M{1ZzNNAeJE`5AH)e;WKn6k9(%|&do@&8Z!h$Rb##hJ^Z*>6ow|j)U
zA9#dDd~zs#@&LmBlBTqe3;edj)H--16}R4;Iyf*eCTuV;`u}_=>@=ls_<#@QB-R&9
zL3`C&sat6bd66W447mcE&Il?Q9AyBh2)e{RSX_H5^0m|WE-{tTfk#!UR4h>y4vj0k
zQhr)9_?VKn-_6?jkF*1xSL<hw-d57US0T=>hm(1RfBp}<h)F_sOO{~v<K$3_8ZA(Z
zY9$AoZa#^Gg?0PB^m3Fvkieq0OI9e(%bl385hWap)*X8P&m{Mteud##O%2%z`hGFy
z0k!cu7o*`i%{kZUCe=H=ex=wS`pC~ypuhCj;{=%f%Sqg?cUD;7&Z@UsSe`z4v3mW6
z!~7bI8Q|CB{8&4ulYJWDw@z3$!=LvTKiqtZ2zPHLVLrNxOEFQVUI7@*09cgT7gjZT
zDYnW3a$+^s#(fI<@1WFJewWQ82Dee^PamCOiu(t1x4T1np%CRvkorq|=%UPmbcIZ+
zaNOcF=z)G9n5FgweV~4yf!^z&4&2@Q(%u%Ki{$*uY0ta7%wGFFrBP6@z_1Sr9CY|b
z_k*o=G77)XkpZ2=4#3Xdw41=_B<^~?SS}|+W&E|fzPq}D=j1#)Rio5)d3EJ*Gp&Mi
zqJr=}!y$2u;t4yXROK`1n{gelh$9wAX6IKyJP}7d@u$wuWU1UwKaW8t$s+;9$Ia1{
z@S)abTO=-I-8Ye+HUf_46cmwb-J?0gF4ldIGWklcW*=DD7yzHfS!<bLS0ruImbtEo
zqWo@+KKL=S^q9jAaSXlz6G@8#^A;Kf869}6Wv-Wgcs~_IZwBj&YL=rlz`63vZo<qj
zK!mSv5>!&W62uV{8+sIp^h(gXNbNw;NmE8IFLE*VeMV&tjeq3Dx7y<o(c+52-;!LJ
zk<9H=ek;Z15TG=CJD>Se(L!VuACxIEUqWVk3Eo5-ULbj0C!@Z#i2M1Uf$<NW<qM+6
z0R8ES<1_LiF|>(|=WR$t2vLIm$kD|q+s&H&prb@UFUX*7CDW3j4iT&QwM;?T)`FVr
zAoBOGzNR$$P+F!LGOwb9?YEqG^CLJb%N?gSu38#&M_^*#ivy3uri&3KI_G!iE?|}=
zbU-;6+JsP#q)4<2uHL0&zxvm##w$;@ZqMZ*KxtT1p9zbdL_nfFr|M8uon)yQ<u`sI
zxV|`eW@MR(6l4`2G5$b^Gy1=e)oF`dB`6cxDZTU72069;TGNx}NN3PC{6HC~?}gY`
z2_CaZ0gyt}H~Ia~^@}rrM0n{|{6l6qiR%M0i7k#gtxa4Rks}&ED7J|1r6<yOKMSAS
zCpQu;|ECL~vi2<l(%^(M<cWXx8r_8(=ZyL_bAIKtJ!SFWyrfGgkmQ8YMTssIuWK$l
zus02Q2A>to?rO22a!{f)QsCJr5#CP%*YhG?2B^GG|4jGNjDN`v7jb<+0c*G1csqlK
zwUNL+{l(bT9D;p}i0(oraA54VH;5(B2om-Y8wR-eC^6Z@F(gN-qRkZ3U1Fg&cts`b
z*lC`q4!tO?EU@W}U$|818*Y(Sd=#ro6-?yoh?DZXT!xC%*dkefu`K?Ey@N;2)nZKm
zWRszUd2Di8OoaVc*#u1?vse@vjSJGE3?~x_K0B#7+0<(pv?U^_=_NDB!E>vj)oY&K
zU<@$YTr|<zxY(rUETv+7W2=|P0%Q$HAHvA(8hvRi79#2s()e17ms>;9pg8fll%FS*
z$9!@7sPV^BRX#m>)njt7dzagyjHD$1?aH5u<D-~(>ljSyD(qHcS2YT=QyB^FtnBIS
z+4=Gab_OLJtsgl24Zgj*K2Hnvj!Ld3CB*EPmtJhnrG}VZ>Quikp*j`I=&fZ<p==u$
z^AP6l)hJj<W&0$x;zekUA=#?)dXZLPh@&B13znE5FA((3+TZ*dM|}k=S#fs(oK6BU
zb*`7u4b4MMBO1T-Q#&O#PfXg#LyQofqYQ~c`W^V|o)gVrBEdL8!+DtUVR4I~)juXe
zlE(=RxiNY^88egZtn>Mh8%)GX+z@gc?v?uzt*1tXSgn`q$APMC@hR2J&L~=;A9-S{
zu^m}+$E(|N8uZjPO2?jtRjc2DxbJn+dFMiif2iY?S<AJ?gtoI6R|Qn3nx;V`6h&;;
zOff9Q;5BJ=>D)JZ_Vr=um<tAs92-hq=}~#^^8VS!bKeWlizew<N*-E=|KN4bt=?mw
z7gLOG{1$fL>GD0aP)kBD-rW3f^0sdjmVw3&&0ZM#eGu|RmLzDDl6TbtXzLw3HSusL
zciNsdFQ=E1jh=(|Ff00G&nqm4h|wo>&OesTO>4-`+=xM~Wp+0sD0)yT$H7fnvAm^c
z2&}ecDki1fAmA4U#rPX;dmRbPj8yuP^N!3aotb<F?ZCbk(FCJ#!J6Yhdbxjxu*~<i
zoab72wwPz&*~{Z<3NP9N`n%jO$tqF?LkGu^%Chf*M^|QB#>k*sipoyd_rVJ1_S7Ch
zq&?lb`Bkcx<$~;yrMIzcFJ7*+yMl?S1FE!&1Ng@9Ul3da2lBL64Djim&#&Nm-tZji
zv_+KKGHw-=B)HO8-q5+R_OZvifAEdP;oEZMCRqDqYgA>J@Fod?);UE}BX}+@gPgsi
z(^y~)7klb_q;e(0T<2%`dNtBv^;I1mQPe(eHyJA7c*0@z1;qm`c9PjNPo~;>D`uv$
z-vGw9#926x=z;YzLIzeGh8EbmX5zZ#5H83^YO|Kan*t<O7mfuJjB5#u>k+Gb^Xvt4
z24bnYu-)i5RAdm~MH7(qYQ(1?A@7PN{lXQ7Ph4I;N?Tg^UUG=r^K?M@#wPMJ$<4_m
z8I7&m9d=Zux-P?edKB@Pcgus2hW1LpF^+s9dW=XAoO<vTR~Cj(Ojq*5P(ed1kOAUv
znGNnJeCQdfmIWI1Fs*mzr3lvVM)9gcl_jjhZ17Wt10G6XFp&?r=AJBDtB<U}*b?zb
z?s+ewpAo^@Qa2|InU*{SZ8`NMkKw93Tk}Jo$Of@q7F4NPKabNzBfql~&m*L^dO%DO
z%<-~~p`xynHS&h}z1-!&@!8bMhcNF=EB+vpL1P)yM#=O+Fq<YOL_aXAxuU7M#2-;#
z`mUTIy!IF%?}Rget(vzZkbH-dc7sy4p>P`aBHxf}FL#{9C0}ZVCoTd@Qscs~AwyA%
zj&Wsh+!?kwBXwGNf{ttoeNW{X*X8mqw2FmmwEy6nZHiFf@%~%$Q5Wi56q=A!rZG%3
ztP~-q`HHQ`zjJB<p|XuiD{uP#JNsCNk%nLGEZK@LsYHE5CmqWp%npXFNVG7#ZGBoo
z+ZOGmUiDa<yTM9bPw|z<OU(~TGvT1~<4mG$ETd{1PGA(&`;Z0{yu$H1U><1wmjj4Q
z3n`=rbbJFay|Mm%wN5goeOplx!?DTJb8u$?(T9(UiLp7Nlahr)mKR(i=aIE>TwF4S
z_^CKHNdLIV@GH`htoY?1wmk7JV*kT=S*t->@Pgz?T{6(wihJ`nBOP1O;@5)r=kEK!
z^Sk20=V?jQxB3y`6H^FAr_`PPWP-drOzy;Z0K1%uFa>QSI=qbCqTJUlUb-vlmi*dy
zj)4VqQn5pLdV-7x*RLSOZL~07@Zf@DG+fqa*^l02ma0ALgLDlC>QH#=MKxM%-6cIt
z@WE*6?;(6XU{ZL|DjaAaRPFyk$krd0w~Tsyc<epngR{$Ip4=d_FSygMJ@PK*1Hh61
zu%Ixq02wI^p*aE)Q(GF!0F4R09hOx%VQSDJx{};WxX3u#nvSWC>Kg7+8uxi5b#w7y
zv!6u5nO68I0n|(mb!Aol_utq$>3N%PCR@u)Z5!V!vlZrJ9=*CSRxK5<JLbgw1RU!W
zXjHaMH}7P2w9F&1@mkg_)Y>QljrMW@Ww{TK8JD2=pW2QKzZJL;Ipv&^+&dW*v}{*1
zSUzz-yK%XY<BIn7JUVGE#LDgRyxum+{l?r)ScC!<yG;HIDiXWOwGMx%j|Q#y{()w3
z?v6$eGnKaI>M+8n8D!*HqqTM4Lc_-gI;eE7Rm!`_Tsd3LA9k5(^){8_@3QECWKC&h
zCr@|mbxH@a?XoFck%y&nlL4g-@8)YcrGgjwG#%lq86u8o*|@sgwzrco{#xoL?kwCI
z@w!7&z(9>{i$)%o8Ga@{#l*J}JvqVh4lHv;*LsU6F9{CVB##$(Wxgwd6y#E>Va<p}
z{>-_arru~T^%DM0)SC}t=>%lJyH+;qKTSZHpLz?X%Wvr?H)0zy>%QPY(d&NOjBWY*
z!SAuVhR-(dr(=O^vNf2cG^gWs?zx2CbWD9?xS(57MrT>>X}N(zZg#v#+wXXMt=Qt9
zHN4_l3L{lm0?}+x+pcM$iofbj5V#jd6W}||@<O%R>3)SEPS0ppm=N{>keQg`9{PIR
zX1NU};MSM|;cb{3)b={V);<FeMVhy))K~$Dd5aHQIJc5e#v@r+0Z_&nw_H%hle|!S
zL)=sXrTh9m8pB;|bRd5Cfw&tu$lTQ0E7}*KAQ7o!Fp=ImT@VV@|0=Yc3!0aj@c(2P
zZ&1m;Kv2!TwvWQ_;S10ay4U=*N3N7@yNWn(>NP^*yVIJKQcQEp4>zcN3-h5moc59y
zDtyQyVE~>TUaiI8I997TTcecMbun!xS8O*~s>BHw-pj>hnZrc+w<%zM5Of1yI8r{e
zVteCRr6{dzqb|0o?GavZd34-H#bC=a5kHjC7Am#>Ca<t;umrSK#Lak_@~JH67}<Dp
z(i>zJJfzyI7G`A{8PJt{x3jN3JZT(?OwH)DNXS<$3g9xJJe}mS&YG!ux)&++&B|Sh
zZF711Zn8<8kus5sZs|RthJ7-I>&ECTyT6sIW;xg$lyy<lNw{R-UgHGyH{JSFtkwO(
zWQKhuu~XhNatdIx<E*VXE7g<L)(lwCRspe{sN}TS<>@+(I@lrbzH;*JYR>8NWmfpc
zndd}Z7MjyZm(}f5ZF+q{wZti%EWL7arC9&9TkrQ>$VDJ)sSZaLQ%kjm2Kl<um8%4Y
zu`$zP&RJ6ZRNm7@-_!ijsnq4F2!bf-d~r<YU(dDnv;od>y>;%o5!S(7tXZ-*hlmEM
zS!2UZ$Ey_eXDc0Z`)sdxqa6BW3i7;kXuosy_fDBd41q|)X`ku#o^>8u8RcdJq8t6a
z+TyaUg^0!8G(dH=(|e0p5~V4TKQ*$v((Us0Jo@s#aW{WUaAz|q_IPF1B>Lg^A8DTP
zUzrcz@B=z6pQ(POCcVhh`SL;$=nPN%d&j$qErsw*W#m$V(-JZ)Klvj$K+(@oB~JjN
z(pb$>LYNYQWT1bcgH#!$+FlKtx;j@pdU|AZ^Y`Ok<}OVN;=c_zaH?7cn;}&N3=KbV
zB@9P#Xa3+%?$;r_PwqD%z)YZ4Bfw0e))PcMf&r?TAS=7DF_ii-rk`5N__87}y<pyB
zxo4uo%HUfRf&=<!CW4mty5VmZ#1gvD4+~<~B+@<H>g?IZJ;Aw%*omusSz3X32H#`<
z{>9TsEX~1&Wbq@2qjvGN9)-kCB9|~+t69|%`^3Tvj|s9ZqG`VulKH~8egD3?BOGFB
zI15O#3Dm*ORw>xrMSbe3nt^Lu$ucyNhfW|iQkNpu{+PGd3HSv-FW!+|K9?JAXSMl&
zGwAL7K80_G90}p*Rx-iN^Y!>qd}>)urBhxWnI0bIp|F@+U+Url-VsRi#h;TwI91FX
z=C>{_yyY<El<sRspuFFiDUxyq8}rC$0Rl1@e$=q=J2I<ePj<#Kkw?^3!H$IF6A9f*
z3qpmXoJLyI*fS;6Q8z~(v~(^O<nzUOehT!O5ppYtMTe1-r9QIVc(ZwOH@g0dQVm-R
zzu^k6>NqPwc@N|ypzNQ7+oK4-KMcR&hx<(fw^s%CI|+S&gknxmwmJy^$_&m4`vP!{
z`xS}YLS%SA>J<n1lv?RzS|+`dBzQpRH%{@3W}(bjAmrN}=2IMS5ZoQCZ>T^Ls_>R&
z%Kd~Is;s8;H`Pmcx^dD7A4+y5=rP6do0KQ^JJ*5h<7(qjba$4Uz3?3|&htK)?&aue
zDLTuLXsR1AQsWVrEd*xi^OF;Way8Jtg7^ylBnvBh76grOvM1xkD>kwZ#h8hjf$9(4
z5JkoLi2(DJ0IMoW@m&~>PopJch55RIh};Q3)Qu<XZ<U-?(*c@=GAmW&7Fm|jq-hsP
zB<PyTq%=(`qrLOnt}%DRlgJmz|IIIjS=(d;fP;bIL4$#%kyQx+4hZWgn3%B|bWof3
zC2*?oDPuNjkKn72H<jBZjEqd1j%&aX5>BoRXRgnAgz$`ymDjs0l4EXRP8<J?`)(UY
zAMo|{0%by!ggBOxWy&jRDj5mGZn&nJe3%;ox$fz}imREVZE)8bM2@RAPVrT!uk_mw
z)P2Ba$g`ig{Wu0R-Ub>~V4a&p%-U<(H-UIN=o?l>H4#tha`*Nd``l?S%`?`+yAIv<
zaD+y^u1o!Dbe?OqOh(@J?^e}8x@1(_ie-FTN<YLTsbiHC`<)8YBc3y}43BG_+`GmE
zrB6VTpXHW%&v~7SaHCp{U8AbClSMpSRd?y8B`EC0HRwQ&BO#xLYdU=7VOIDlAy4TD
z>O9jAbD3+d?!f+8<<UySM!xArEO<nQo)S<h)~n7L*gBPoJ*3FLWt))ils5hrDmQTW
z&K(tRcGffHE!xh0oynH`Fb<kx3OhsTF_?|ntSOwPCOcz}JIgK8%{=847~HP%kx__g
zM9$7L(j$NqtHM8$vhOwFh(A=}{O-tQ<Y74F<@q_OX=%KRG2}L>Idi}L_YObnei1w_
z%6Vp(8SI*>cT2f*=tNw^nod!}pxrxwnN~)jcE?OXi;oCds^ZgBf9M3g66ysV6E3qj
zD&)!q&x@J6%QPdZIT(>~gdnbFfBUI0l9M}aMezuf(U4^NDwXwT%>fZl1iepidXMqU
z5`Fzvef`wpw~U|W(ec9OY3A8wwci%uec4)x_%AMae~-tQ8o9{?;2_|PSycWDLBh6n
zbq?m?%YO;-pX5Kdi8i2CqQ5iqZ|fVsWOr>|<i*Njt??=n(uFKZc!T->I}$|{%&36z
zumlqfOq>Y}jP(D3&aWB*fSe35j{<#4?pKybi!3ZUVhDOBwBBDTUs)-uhk1guB}sj(
ztj_iIl~_ZEhK$ZqtPDs+$%Zw(u5~A`wXMKaCu1Cay*J_Kc?Ife@u9s*mYw(AAE$->
zng4j7`}vhWpNGvQ+Oz-Rm;W%JoY!4ZNU7Axt%<OaE6<^BDk05y06Y?`eWC{+WRgP#
z)K9ErIryin-F0%^Lj|H1kygGHGAPzeJcM#aoFW9~OdNk}gkAYzP~)nZT<Pwae0>PT
zu12AZaBQ105f_GeaxQ8#A|Lj1X!gjnhm)aPmp3u-t`=;=u3xWm1M-~cgBs6(VE>^U
za8JJI78*igZ&NCF1~5ndiqeA~Ao@k$s1vxMZJ~^dUEPzlO!*O=QY$5M=SQsL7z5>l
zyJlqSCbl_uiT8=V?b1OwBdG~?$+j`b2%r4MA5=W-nmvpV?G0vuUy&NnF{hBpi+GoE
zLUD=e_mFE-Gv|=m?vX#dCVh61$dwOmSC@K%wB=StanX3o1~?hQ2u~$~(?kc-8^n}a
znCL4Y0&*UIkgF6;e2V@-t9!cLb$#RxisHQa`C=#<duL_4%M_kv9}qEd1D8tGo^|hU
zIh;{?sVVx_*Igo=JNU4Mf3y06PyK_gur<M^y=3z8SDDda<r*rN8Xd<trrt*PfRq12
zXWTkhhtu|!1~3??zj~4x*ZI?Ndr0GFK#XgSDhAiVZ?1+;tQhYmEBw7=)F4;?C^W^q
zZv&arB#Iv1dDyG*C*f;`tB!aDs%@1U?5VP=wYFMmI(TOaj}v8ZWofpZ1g5LKbN!d8
zoR@`s(YW?W@Ta^^2%Sf(Cd(deO%%CGlFS?%(xq00(m+&>oFn@|WNO1ig7~2<PH+LB
zNJ-qX!EUJY#OL>8fVv91F90U3i)`7JUGYECJD=%M|GT{tFB=nuk}v)Yc{Fy)-)hPJ
zSz^B@r;(q3Ao6h-d6v_`-H_6fqrq*>q-u4v#4zQ$-SSt8M1W_{;iF8clmmI=*;J7=
zy|AO!5>Sn?t)KGL-tXL1s(?ZG<ht6pInV(|IsQu7AUJVgIjg_QRynPz8fds%KCxli
z?fb~Ox}vV<d!4QMOE;}xL$W?!Wt8v2?!hpnyni%vC?+S}k}jbsN}qKzC2^$R7krV9
zV7g+5$uAi$Ixo24$wND9sMW+<Fs*9xa?}TM0Ju^kz#c=TY$JrGYol<Ky!^^l6rm~Z
zVP0{pbhy3ufJ2OR@B2QUW=p`IBc)K<@PlNR+aat5^^yoKyD}lA)<~8-(WxULQ7|vQ
zd?aV$ztVr=|1P<M$*wfA(o1Rl3P5mDqztY{kg^rjveoXlaN*+?<`xZ44PdS3P$$x&
z1kPW6ZR52RUr|O0pOkUUqgh54kNSy|LysyF;jw;BJ1m7uGZ}EGU3S!Q4Vdc8E4<LR
zs2%KBTAE|=R~$q;FrDxqDY5chwxemP&?!)@Xhqe4o8@n2aq>H~sn0`}B2$;x{UTC+
zt$l}NA}#3lr>v1uHcMNV@!n}(#r|&W1Hc=Z*MBQ6SLka&`PDWatgpa;En7hejv7|h
zBf1Pee9*qr4ME@LUT5pUH_d73O}*lU++=t07mmT|S10+cRLaK?&1RxRq4gY-me`70
zARoFXk8A3AeG4SJc_M7od{4Du!NZ{5GUjBa79U*MX<EE@@XzGv@pzsCWf;|w89<_7
zf+Sp)qNX5)Cz0*!4;{lER0nzuws^4iFIy=^*{;mEK#}T-l|Mcq={^V^k0L~~kj;x*
zSD7>d!F^JL;c=^XKhSIfI_>k1{fDe49P5NnAuUZ98$_|~)A3~OZ$+4;WtuH=92N+&
z=4k85L+euotP<`#=H@EAlF(<jZGoBB(yRH(nbej(YqvjU-dgtb%G6C`M+x`<?8~(b
z<@>`5!D^_f`%#skcLZU;$U1R^h_c2dF=x8)39~_Wa?SSNfH~sIe?@qW#m*(1apk%K
zjN@u4BcJIDa-d%M#_kz*J?j6AdET;*1BO}q*Bajfc1cU$22`Up>k<2nTi_t0^@XXb
z<warDU34!MWT-XGT(^h|_sYh@JZiT*!l8vz7uN7c#|4~Dzmo-(y`Zqf+Vc(RQ>!ZK
z9IYToj^*N!N3dj7)1yP_rh>r}zgV=O@f5}Ukb~aSa#@kjP=4dQJ*jc|g@W(qH0jR=
z+koyN#JyYG0?DcJ*@x^GBmlp-A^J{k`b1aYe5@=U5rC9JsmJ|OvrKR0l_P+FUGmGp
z2sI4C<9PA@iVsM<S$ZV}bWRr^aFUyM>~RtXs~-viWKR2DoC*fVo@Ly1PW@l43U119
za+rmTrwJCCSVkV?)gML+;5e`nX)al347Q`kMy2{mEU*`j!jFca0MNwTH=<4q5Oevz
z=FO-!fh`iF^s)=%;1vs<?)j@M6P?rd*XRWZf$9g<fxPo88Z7cQZ+Lymkrr<1kOh?6
zFnpBr56hrv+rt_z><zq3*7<W{FI}jG$rsZCA@Q#B4_M*a2W=Cz>rJu_wQ_OGJD1W~
zN89e%V0ZpSx`eC=U>nRyJ2!io<eH6{WAv&L4`o}5kuF2Lo7?P}kv5@D8J+>V(;tx_
z0k81pZJ1R!za3r2<~gcFdhqgCq@53987jvYmy^*_ohLPPD^mxB`6ivpbTrf^M*!BN
z=8AoG)KH5Y`u&#{A620XeK%C84$mMxa#?j9QdXth;bu5KkojM1Cm)p0!p}Z#*>Dg4
zEBrzug2zhibn?XtQ*!iWD>rdFB|C?~i1KV8R?Up(eO)(mnT1a0bn;xXplHA8{G(hT
zkO;ZFNJas2o8nG^5FxBeg)hJU5<lenvMRi(j3!g0;7GT{A!k9EVtwcsub}Ao)Z;4>
zEU4C>cM8)D;O#HqEf}0$L@0BXeYirCJD!m&7^J|yixs4r8OWm|(0w}p5G2d{e9I`B
zU^)8;{0dnRPT$dG|2}D<pt77SBh9aQRQz2E(JJoH#jTqU*_*0<tNEyi#P-9y03c6X
zMz4W#O^?AJ{l;>q%oU`2T6DMQ`2|%rvFcY)s&;A&+%<WAA^pSlthdLjSgrfuF928)
zKOhEEJ8rYLWKXrJ{(h?N2)MUnd{3eUuR5**ebBZ1D;gsL*3U^El?(ojc!NdID1RwD
zD7PVtH53$Nnn)G&yvz;mw+U%C&iJO;PFw_VogPvS=Fc6rH%!Vs^6kZANNI7<UQUip
z!b%?lnjH%2J94UjH%UAEbk)-youJ+O<V4|i9JeSsiZrx@-k2@7XiNLIW9Td!pV2_-
zn+4~k96kJg;y7%QWn)?-s=R+Aoh?I)XMax{{EbBDNYUbVJl<iD8BBStuXFztQSTl)
zhi5&oUu?7ub^&ih>k?P$0fU+p6|E5MhrnkB+<M$;g~tn$acD0v1Fjlbvg|88T34GZ
zo<@Qpc#WkwQ%0f(IWW+6TitrXas}AsYx!4Qz05{$*Hm3~(-<N@UJCzo`eSxlDz_8_
z2rtsw<H{HHIo9&^csU(?<4?&Dk1NMFmnA6b{bKecuV$%YoAXNQXs&zd$qh{TdFkv1
zU|l>8-t^Z@8R=|5C?~e)EG#;i8W+j@g8fF(0~euF=cv=^V^W&#KQG0XSUR+2V`9<y
zuDRfne)OoD|5`~X8T8isGB2;1B$LSC-cqp>#FIs=<W+00OjT;To$f=@K`CrBCq#3I
zGo!fSclu?=PRb*dAY*6P*%=|2phWry*ikqBZWbqtS~(m|b5N~VmdL3-Yv81-!C5}G
zLhdwB7TJ{EZbV^Lc0FWTY{tQomUTo`oub{ey2C<aG1wMa#jb76j-OoZsP$}YzW_UJ
z?zBuP=`>@+d$Q)hv!-E&TO=#7`J6Ht%F(OG+}j$F`W7qLATqzZ7@_2+NT$sK#QX;(
zEre^&v(sKXE#Q4BeXBZ-|1i>=hG&LJGNX2NodosF<moiD>bjTW*#1ub$ofrDG~tPY
zgl6;Pc+Ce_nfG(ea%MRB!qBLiaZjJZd71hNw?+|e)*(KZtsAO^mD%ZOGiPJ@Ynlob
z>BQ}t=(9y|Vcy3ESJ#|*(C*$7Aab4bVuyYAbM4ReK)$MQBfnRT-c`)PSjF;TD1KH+
z+2P&qkzpp)7))wZ{p|1{dTSH$7yN;8^?v6C#pAQQ*nnF;5=#c(iItG2pp2Xv6h5J?
zK}^<A`Um!vp*CqLeAF%qrMN&TsNKDpT|xcKV2U-%N}aCoWEm;D#>Hm^fH{{U|4Yf<
z;)h-X|1)jsc=#;pY!nyGHc>5^^U<CG#^!*UGfj{Fx(d!G+u#Dp7pA&;o#wZ0M^Jnc
z%4?L3oWA4~$-Sng7K+*(m||eK+%+DRHLpiK*eU&#o+5|MH%jB`qn-WB%rtkV-x4Gt
z5<+^C@8@Ov=;alUY`-?bfDSAVjzGfP`QXB$V&zaf<oR-C(6n-wSqBb-a01s0q4y)`
zofUg%?yJ;Rny%e8y0S|Xc_kiu(e36)_VHMxq3M^t3&VUp@+-8>iJNoFvpUU}2G+fA
zY{^l57)_9>phz1^s?kMORPsMi?Ki%@b$$s@rzl_5`l;?U%TrW8FzHklk#;UIrGIIB
ze_h5|rG;P%;nDcK%E^3`*X|O0a*g<EQSEW686@O$z`N<RD~Rew-cbHPy6>w|<(I_1
zjZ81K4b{;riuTQeIVA3RX%n;J6*G+NP{(>1U(Pf`GU1F{C0DOH%S(-<LtU8a+ftAp
z4A?94P$LTUfLKmHfI!Uzt{^1eHOfPF`$72on>zJf0BYpA4GvS;qPdnqm+)!s=OYv@
zzG*}X%SwUVQ=mumb?6+EhtO{%W~0l2%mIn#;G$qpI$N5d^`>Q`1Ub%L?Xq{BviBIH
zvds%FKJ*tB#fd&CQz4}XPCK83i6oa}FeIyDUvPmyasWyIIJ2(_3O?Z=DyEaP+>NU4
zpI2Y=OQ%m%I~L5Y5j*L@QeP{p5<poB1qYXanwPFQu_x8ziIt(o{#|B)YCKma)~+pn
z6S(w(54qzBcJQ|yzwLCiG|x0C4o!@kHZUWcH_wwUyVZ{mej7V@cKp9ED{Ni?$}EcM
zy1em3e<LFU;ErOd<iMRGFiBUx+;To?%UsVr!iXXcGs&oID(|Wx{ue_-Ta`;D&i=<5
zda1lqiKNKIN`d4oXN8HSeI5?Ptp0YuT7#oV1FgXYK`E9a*&b;_z>5nqkht*P@_W*T
zFw_Yik*HK3(=M~v7;f$-1O<0>^4~*2nIth`l4|WGK>L>Ryo$^^3ffPhLdG}Mg-J!(
zSkp96hf4K}8~4Qig-0;OJs>0&lpx*?ud2;pYy0<`UYL_2Lc5U~(}F<f4%~#<o}))1
z<bfFt?4C#PV{P&iSOXI&&5Kbz{?!iu@IO?<ARNped6nOW;=n+fs13x61Yjfe?l{X9
zSkU;iK-S8}nJg{Xv|Fsx9FIV7#=%KwzI#DR6e~HrcIqi)YIY`4yg7a#5rBv>k6rBV
zhA}gqs#G-b&-zUF^jGk=Pr1iQ7l(ZB;Qpwn>hgxxv-vQMt{DBu>Vf%xs9f#7vFpPZ
zk_orG27?2h$qU~1FVIJ>N5z#8?LpDsJCT;50LS}X0hv7LnhI>+Kn{l=P~RU>mh`vm
zAe2>PWf->pjLFe1@rg9>r;v<~ZR;VgC`4T$3mla5$T<`J4_Dt5omtc^n~rVUwr$(C
z)3Kc|wr$(CZL_0}(XpMIbH*L#-v7L>v7hE%HCN4=Rr%~#>ty)Q2i5bTmK>bDHK&&#
zE(QIF+dz7(f*1s$>?4r%)>d8T_QJ@HhV4<Mg}#WZ_<^7JgA<;xsBu7namsXt>IeYM
zOVDU~aP_BtoV2C2hOex@53IlsSTBcJf1hamKX7Mb?EmU|;P-!`tNTfKvO=|A4O>0n
z9+SRE3w`st{VUMQ@5J?{FQ|F2RrGGy1$)qY!}oFKvoy%RHn9=leFy#&4ESuo1;<x0
ziU~x=d@BI<W>S1C!d=IqLgWna1<?W!9MlOFdByluFNniIg~Tq|L_;BVzlxHIZVELz
z`(WAtgc-~u!|}VNWaSu`W0l`~mYD=|W>UnCfn3qH<oU0O<_dmxFsK|2{7-koJOM!M
z-;!7+l|w{Dq4FrFWN1yqPX6(^Wf7oYckj~XYekH~hh1nX)YIts|8@?wc&Y%<V|!d^
z(D7<b=pYF}hbcvm=y#s*dPhQ#y`YOFL&P&mx1Y$g-zqjA%*OvLZbs%3%mD#KS7zF>
zeN$qFRONo5TnwPuRk2hEtJ5Gy3@N}gPJWs~eae1_V53PV0<1zs2KUu#{l$WQ43o)_
zVGSLki!mb0BqKt_U=p8Xz$X9*%eZVtB+p1@2Mp&xazB4*(JpFFDZ##9(!}Vw1cfq4
zlIok`9YWG@i7`%6DVS&RfOz_(^m9JRgPhZII4cAKUPlzS%Oq(MLWBaK#)dTd;SPHt
z_9&Ybj6st3`D>8j=c7bTn0)aEYV+@4(kBel^S(h@fJnuoyXgrazY*|)!HEY^_pJ<k
zwk*6G_mwlwp62{ZZvy{M*w^Q&!1#`?kveqzSF9g`w_f=E9l`_j2OpBqJ@u!O(dlS*
zh5hjCESEdUr<PDJBE^vbVHiakP)^EsSjv9<O7UkHIq@><+oq#-vC;*ov@jjQC3BDw
zoOHe^=N&fMR}{4BOgw;xqSd4bFfYJz5{z2{JhnK&sSHAwQhzYrdbAU_6kPdRZSIkP
z_ZHfp181Ym{iRxkjN0wSIiCEUGjjq(F-EqygO}=BmSN^hJMzyFeTg;I#akrzQV#Yc
zh-B(~pPHVlrj?$9?(e+!I29%Y7(OZ>gAWQ47ZUXeq(U{-{R;p*tj4Tg%Lpu)@H$bz
zCN2^y=NwZTIsI_t)&v(-Kdc7#&vm0;?vn`E*7^q@FoYe&cj2maA<#3z|73x_W{#X_
zfM$JFl@ok0XLaP>3``IMV&~HxHXE-%q<fz32~$lH57$5aB7ckPc68{&2IiCv{P!@K
z?pLYo1~QN+X_DZHj_%2A?G>%V?(yUH>jbYmFb(f7O&2Ecu6zCnrg9)la6X06HGjjM
zAcmlx2l-`NmGM`1|C9Vinvegc+>;Eiu#=X&QIfK*V4Dd0IuM~N`6>|Vf2el>h@@)=
zti&5^KunUY0*Vmgm_@<Ep95)`JWwBCG%JL?VrXb$C`mP0G!Zc5-FUj}Bgu}$t}1dr
zYB^H!-W!mYf@l_Zm}Il8baIv^mixTV%d5w^U4y<~`M^`$KeNZbM!?63hJs>25>Otp
zd%PK7%nIYYWKHD*iQsdXm=Li99`Z#foVIBL0L9C2z;UWI#Ol*3_$tfxBiq#`Y@?Dw
zRF_;;EL$7ZbI-{DQIN2ErQbNsJ<Q`Q6Ub$iGqPME<#`MPPc2F{<0(UmJLa%{GeUiC
zEm!Slt@BoW4?_0>^t0Xd{VM!3u6C3uEvJhQ_>uOewYFRwL9@-js4)e3o4G$RA5pFE
zfC(!%UU}N^EW1AgZzV|<(q^w0Rt9$1^m<oBtJ$p7+}d9@TSwNDua(EbXTR%yySQlF
zMN{$+Kf39?gzq*L7o8t$IG_4G6IY53iHXskU&glC_qm*2NvL7)%9JtXL#|;))8L03
zSHJc8M$et>t@QoT)~i!{ZvD4X)3cUk52yk+HB28!7w+79`(@vPSv<@9kn##{YP9ap
zn*p3bB#9GWM5Xfmszx|ALSn-nd+`ZGep8n?_^pBaW=SmW8;t%|eZ#ePKZqfm2P}Rf
z!4p`eH_h_EF_YInZSzevJZ<xV+RP{)?0Dx*Ng$>Z{HxhB+^F~<{^w1|7%Cu`4{$)#
z4Z}Ib5^ozONB63POBWFQcH^g|2gTSAaK5$0#Mno>xGJ)9enWkLLFJp4&p(#uEWmV)
zfI?m9nIA=2cSIv450a%8x*Fs|lavLgDjL1`C5#|~qd+ahie)Me<zxU?I6>%KUhx1l
z0Ub|8Hl7d5Tn9>3Ap~v~FSbnks0cIx72k+VN)*Ja5t#lvJ{Yz!GP4Dr(DN5_4XD&4
zp&HpZ2%Drb_=ez27Cs@^FJ_eA=HI{mfA(GoNaCX$0qsYnjQd02Q~noupLhe2WV(b1
zcm|-HV14J(y&fKDGK1T|B8~dT+rWZC(iE?!@2`rq*n|_+aLHJ_3$9X?q5MV7Tv&7|
zrm@Y8zjB$+NJqE9<|sh<<8s~eZgIHu<hjFBoWx1_DRk|X`}}@!!q;<mjbQ*@5B8mS
z8y+no;vp-9wnKej3mwQ=COEkHdgzD+xQ5)zVcseE3%gU3kFG$O9_GxvQ)EaqyMlb;
z?dd^)aD5U*@OMwD)Q>S3;r0VH&nI0&A?yZr?!?oBJvi>>Lx~&^twDgWhr$a;3{wcX
z!JW%H-eY0r#~D1)41k&b@&t1~fT`Zc@O&iG_vH$%tACqg8G>Oh_4Lb~P#A9qlpFH&
zP9D}#Ngf~v>8mpaX@P0nJR<5R&)4_yaB<FWGqJ93?{YA+&a)(9o+`M&!NSWxKI5**
z|Gvbc<Jrk=rX%6$)fxPdXUS@7srHqeLUn<PF$2PTPt?N?b}}~J{VRmv=!wPT>99MV
zYP%_sDAI$RigzX-O$zZ2(MgR2;7f+)B(uoi+HQp7V=$^H@)}@gzKq!Cs_4rfcI_XJ
z|AN7lAF?^&b6hT-zDQ@HHxh}nifN0}(dI5{%WG`L-L@9En9d0-Gqh?oGCxz^PPa<P
zKJc2{vDakHTulzHS#Y}9By!7HRRQZ1Hw=(xk;|mJU~2R-Fmh6D18-3Rtg>yHlr~Qj
z%`kgh<2P>C>fTYE?E#Zh!{+2Qw=75K)1B;8ZJ3zCdDjI$qG`W%*$ojvA?sB=lZvgK
zCFeTxA=XpCI{8fHWVEwdoN>)8KI3>wS1$ku!D@vDi!H##`d8bvA;7sf3*MOzNT&#^
z6;g_U-7z1Ji^{Am0x$ju^_X3VOn#pQQ_u;Ery^^ukw>}3FKln<4!Fg-PrZajr<r!k
zUJ<O>)_E1<<RpXX3-i8xn?_W_AjJQu93<@N=>>}I=v!q+(^ic#+0V+3yx3Z0nrya_
z9ic5(Ikj|7NP?0XaV4ST+E6HsCdv`M=q3j>e)^RmxA|<+tdj)5`<9`iZFSU6^%l5*
zuUeaN*&D0)#-8)Fe8S>ey88ImsV>ho<XJd_>i8l7tzto01!b%xWUi?smIhTFWrN(*
z72BPsG2KQLsTev>OM7u4F?%B<)XaC6+c>m+gLJt14bLXKdsoBql`8Ch7U`e5&WtBI
z{7_XNoZW&^y+%(!etb)eRFCFwWNp11VzQfYOez$uKK4HTM0Tqzw##t8%t{NA6gj9W
zKr&BC<n_Kc?Iku_9#1tsTHVk;HQat{HC)j)=onYNz#{6}gLhKWOR5!ky1J^DU;0W3
zV^U}Wrc!3OP&2uTw<O0eOep_)h7W_q8I&3sEA}biN3GBR0%q)wL?mg&l&7)5c}$Nd
zW}px+7_u*9DCa(%WS;d)w5E%LGFyejWj?sSGm-`ia5hx>lpUjOKiNRO!TZ#1dGtT=
zB`TCkrZO!<(Z~t%LVQWIwqm8~$~fG4edEMFghmK%DbN7NvY2B^SOBG4jSsoeU9}I8
z@8tTrx#)0!Xk0e)MZ`Fi?_`7re_2^HlZb*ubafpShf`3ZQHVytq3Y_Yy!VIl$x_mk
z4=1NlMp^cA)$r!Ekfy3uHS+39uf5rJpqII8@)&kPvu8s|XKlfWi*nPacSu_ocf{qc
z+xaIq-h_5~osS{9#FPQ&ab=Z9DCd27WKnP7`JEqNIt4Mih~u8SY>LJssztE)gH8&1
zo7?yh*HL<>%aIbkUB;2UVY6-5xHtskHxzkB=KL#I`rI|7FOR8h83?)nmh`T}qu5h%
zQWjOGpb_k!((<5@6aw=PODD3#6s27RkYmVFX7bHtkAD_PHnK>4bo@4=f40un2ISaZ
zT*dnU7O4-Dn}eO`yK#}wA`O{eMAJn8;TFq&{Vj>EwfS1;EX%&RCIj(z_&GnYOCG*=
zwdURH4UVPWsV0Lc#x`s1unv=`3@^@^dnq>ruZX5Nx190<w0TAdD-U?Jp$3OXT3}~L
z__;!J^t)#Ne`O0sx?!L(mCjK1i1RI&l)$k75%lKOby(p!<5%3@VMEe?$)<5?W6A0S
zb4EU@Xld2yi?qiz1z8YDqB%3?j}unTGZRp|l~Lp#47r6%-p_>n<x5SPGzI%%pgb1L
zXk%OS#W~UYqB}XQobeS#b?OYIE|8VXl>~xHjIs1bmta%p3XQ;HW;dWus-?1PTxQh)
zTo&#LVZ<z&m$>XaVb-7~QO>QaTsjo9s|JE5c@9J1V{ndcBAc|v8VreFNW38yh^~0^
z0b;Cn#MZ0x-y<`c!rvJ<rwC@Co0O%S5l#prz7SVq^0LMl_#<|meQAhKe|fJ)U{Jq<
z9gO^+WE>&GLS)L$Mi~j!FC?X^IYlY~!7^!u=K`S0asx?9WJ`VOnME#>b-Xb@JrQG-
zr5(}9i1&C=%^H_Ir3HO~9k{JaV}g?f_~p{Avg8mkb53wO!3WfW>>Wz1=%~{p^gcbW
zKS!c|wH)MPm1XM06~_X-U>V7<Z*}<u$UZDF=-y2!mQ61_8Tt-u6kXVf!*e}A(=KPE
zb#nTg4DC%(0y>%5x}_>GOUo5M0~&DJ&YVY1tkdWOzZo_G^87HWV^JUE$HO3acF-XQ
z+MH^-f^k$^xO}KuQ=&*qC}otWrr=C6BX_8~N<!?Sb7sz2$H^Go3|b`VDWW<@wEr?L
z=^Xx$S=edvP{aVy2H!S6y&3|@R^3w58XM!qhwQ+QXZ$tPvwO9JaQ8Vmb&xwXuzz&G
zx%Wmb0uILYR1^EK-34rW3qBdmhY=+yFDM@$$D%3QF&(axqcfrlhhnQN2}J^<Vk(Qt
z#VhHKro2fU1{Mh)j-12as|)hfzJVP%QUZi#Qv%1OfF2r&EJ7JhKPd^I&?^QBR=p%_
zc_Z4$CESS~u2N~PL{2Z$n?A9`Ky4Alk_~C{)W|1tfMbITI9s)bY?ZI$jr*gSjqIgO
zP3FjA6u^iotK{wx?&BCr%Ncd#k)C*lR48zKYa*kRmRd+pS4-cWNeudALb4-k@hia;
zy3#;Qb2P({&M}A1i$#dnYPu~`l%$K}l)Z5eXzeSeRevvSj1S+A`h4;5oOq8e@O$qY
z_&<B8WwR(4f*+4Cyrd!+KG;KQ>KU4eX}OjoV4!&HCUn?2Bv4W`bMK@xJVgK%Up<|o
zBI0#8S^-@%7*f5za7q*^w2;)zZmZru;SI7)F(0tJL5+UVAZg=|vfGSk$631oW1Ut^
z<nQdM>1_L6E*=(dzpt-5w0=T$QdW{hNfA|H7-D2&%m-u0XU<TrE0~#b&{(Ee2;2kY
z?(}5BJ)$v^SSs+iS7|!XLRi4I)b_ZTQ)u=KO@gd`4CzA+oz@h&nw(Z@OrY`bgqQA$
zs&k@I>)OVLJ&a5?T|?A!4O2Ucm%5Q9Qea6=O|vm?(voLlGudNwwm}k{+C`LbTmF=T
z<ByR6CQGFfqlWvUm?ZdacPW)PF#`rPv{nqK6RhfB0cTH!$rQAP3O)czB&oJ0v(c!u
zRZeY<6B)MV>5rS3bW*+k13AaxniDC5b;o$6Rk=33KK+@qxqhe|?zt%m1$`}STyM7B
z21-TZyt3Ga)$UF!(yzp{>Eps~TVLqdG1#n=M6lV0(P~-8o`^^y@=&2rLAn#nVm05f
zaY~j-$-G$RtY3~A{LO&9Km@;LC*E5l@FrYm{^<iMk+h{1#%L~N&sy8xZ?)<~1l&~>
zKJAg#f$PL%jYUBr)Hir5sGn@)={bU`+9f(d)>5!kp?iSJ25sX;KKaYZP$%Zn-;o1N
z7;s0u&geOrpsh$p8QBw*A;N~N(pucAB1R7zW}POLuaIgf<@Ep*VCs`>W9Elsw`f%_
zk%{y$3mGxospU5L;HOsQI<7D$T3hZG^lM=`-#YbXg4t(pVt@h&J$w7NE7M+6eqof~
zDc!?A3%@=~jpoWA85f3mg#<U}=DMN{3|QY_8cgWxqAR{jJ<GBNt<!bd^9|f?8+<&{
ze}s4&2gtQRtC4^=_zBF~Bo3TMydJ_WRs~Rj{zs^*8;j+x8@Sw(uWL&lAOnPiQljyv
zg?4u!t52YvN5%Bk-Y*fcrCc%fc}o;S8>AW=s7u-qAf1MCP+JNKRdNTIZBe0WyQN97
zUtvi7c!Os|Rv_yPpq#vZ0UJ7`S;RH{d+HAtoL+JM#w^-owJ!-YvHZXmtJIbw4C+Kq
z6jyD#gP8qhnPn5UEPPGeQcgj~S$0tFV8ML>^23b4x4n@>@VD!cNUpccQAU3*2Z3j#
z+8+KxiX;S7f+bp%6hkBjXf7w@*8mNmaqy2M9u>VIB1Myn7xyq~Y_{O)xyraKctQH0
z?~NBFTNp<88^%1VKj*ZV2x5|XF*`l`Wp3_n_kO?DMgU~)xal9O1Y#BKn#5XLWJwqy
z1)@^#BKt4hXk4}1D<|sr1QPp@;zSZ#6}jh1OHJfIO@$7d^_3D|Kpt4=GM)tImtJT>
zgU9nNvxw6~6*6xbEY0SloDTm%7QL2yayPX5l<v>wXp9tK%8JqSy63_6^)TkzL%3o}
zc-?8@C?-^{(v{JP)I2^IH}<Nm`rh@+Z%O~L;~`5t^s8Z!<||c)9)rz#B`vm`F4~@v
zw7t6G@DDnc7cY_!;56Or)OvEJy!liG4hL@>&v*o5VO0I(I^@-Yw_!g*V8!%n(y&3r
z_V%_g!9~|ZlYbCz%)}y)f8MQhMNp5!Cz%d*w6cwk=1D~2aYQg{F1eC13byfgd#)G<
zEZz@&Y;tD3-*U4P0k6T~v7Q*oRCZvF-o`k`=vfVJn$9^3*kGB)?_)c?j}cG{U1-JO
zyXb{>^n)efW_trzrdtwxS$Enxp4}g<oCo0<+%dbiU5e=YGebY<mY%_tNC-ZnO6kq3
z<|UMbHA@s*v0BKsLd?+m2^puU!u7B|5exC;6-Cty8RCp5*yf+b^2!4T6xT=lmCX|f
zpIEBvYww!?qEd)))}tUrteIFFv*9s=I5C*<m*68~x7<nBqK+*{RYUdi;DKm<)z7=w
z{&FT#lsb`Gl<f7FA@X9X-cVfL*C?L$tt?PqM_-(dDE{3%E}oRF5n=%E`8**pqL4Ad
zSHBH{RV&6U+rmi&3pQ3-OoIu}j1A?cUy=nZ+ewi_JIa5@Epoq6{PxV^m~b2je7N)g
zVQCCJYX6^r5gjFm@{trkDh+VjR7L!XtvPIOT;wj5!Xf+%UMA%e;cT6?ZY7hbAAy6h
z1)lAcgtk)NP!dbK)C(Nfuao?vRbrn13fjZ-K*fBLv@>3lKV;0=o9npPXnMaa<E#3-
z&ol4?VGIjnmN&Ttg_B_ptshTFA~MnvM^77S53Ir^h@62Qt5obF7XggA#^Mld9k!Dl
zu=6J}`Mbt;M^mzMLgTt)z2(?Pd-;SK(b{jM$d0JDRe6b5VP~*asjJLfb{n0$t98|G
zaxLn!%MNu6Iyf&He7eGEbZ-}?W&JUYU#+&y*-J*WVf}5k-CLGgMH+ETCs$)v*-G>z
zS3vrg8MfvefljB-XdU2Mwob`m%S_oOr_#1o`Mak!=}#fUxQB)as+A^>;-#>>1uZN{
zs+NoDCKaz6?9|~)u+hAZckk&uk&aH%tHgQR@6yW56xoFaxTeH^$+E8^*Y$Fkft7kl
z%dYE1_7)v)qKR!c@RmB3o914w-S!^!A(g^QV@ex`XOM%CEv*1&3EvAp-B{wGS)2))
zZ$$I$Eg0S$q@ileW6b@YEtB{t^`TWt3sGTs_fuJzE41v9@Ia&Nz4ozqe)O{aJ72J@
zm*fK$Fftpa;g1*98=yQE+E=em`>XU-lqMPTT)qp*0j_8$RRbnc1owJl4Q#e;ms)|9
z2Xp*v>&$32XHtM3Sx<VJe?!FW+c2xhA)yw`kwoXQgHMg1n3l&fCjDz@v!A5k&^AJ_
z9yL0~w~pf}Sp138QN-_mm;UfP={#T7WfI4EwG!m9WyAG5Dq`o4N)wf(XOCV#%@6*X
z55l$Q<o$|6^zYEf07_U};L6`<+eVzb&`VRv8tyt`5RiaW(7;=LL>ouMyghcezJH^W
zIFx)fU|kyWBy}VOPVyC6DiNtA^qd5^Gs}Kw_~%X<FYiNn%};&)fR69Jav8iaYU5=d
zIHjo(VkD(*D>PBTWhcgNxh|b%gvDyoL;<3B$x=6@kASCN-9KVH$I;`3F?2+8j2rri
z(6i_VCTT$HUTt}5V)PzJw!QWz46ZM0m3O@K1nQ>PuK2zLXl{|fBZ~(R1Ja~4$>MeT
z<1j_9gbRWbmDHv~;6sXqHzuW+f^^@$Dpfi?zl1495W^E9U5P}ohPFMQGYGQcE=ii9
z3@A&KQtA+<j(DV=c&uJYtHVl2@85twVYSA<NuU6&>QYNI!E`@msN(Ts%37irtKZTr
zcJTpy2?z0<!eu0cz!q5r=#m<R8C_cqAXjf8M(iit@*dRhv0N?v7P@1&_w?SzE&ec9
zYaOS5+Jm31^u@w^4O0hU2<7kFN#71>6PMxVAXO3&Mf1AB7r-nWAqw+m_f4q$87#k)
z6Tfl)mrG?cb(OZ<57m7A<6|wJWQ2y7gn$o`q<!$?W38h1Lph`JxxY6kwkc1AMG}Xr
zSqh<hFqH<E%gJUg#}x-Z7vP=$bxWJJivWy#_eU|LzZm*F5n$aO%wB;9iCOQ9oXl=<
zJ#Tr-TL=KYZ;<-Q*<tFHs0^oRxwhD*_;6&%du)o#O-4qkiTX->&}>ndr&jcYTajGI
zj0#HtKCeFWyGdRW7oOQvZGo{jZXxQ&+2l<NG-$}jIK;_v0?B^m#IB^93F>}zNDl}h
z=t}ue@=MPpb{@pAWEi|wV4WvV&8J?AmmZU5HU=+xOOGY<1<NT&$*zIh5emGci%$Op
zaiP{w{O081ANOQiCfEjyih%(`r&z$*diITg#@au-6o_l6n+d1ge&p~f3n!gD>pbx}
z<^0(d?6zBR10*GO%Q5$>S+2rI2J^wUt>>@A*qFCEfJ}2ls=3dj_0{^nwx!g~K>=6e
zWs{OwSijrMBXLn3CI+x|A^tf)mF!mF${J6CzrURVzBimNA_xbU#eUqPinfVmORr4<
z6qZjPf-*~ajJ^X|Obn(UuyUH1Vsm!uA0dut0B0@DQ3`%8A15y4G2KhPYWMC2#X~mx
z#0Ri6&uda3+5G8*=n$(0bC*;TPqRnRjLVL;@fo}<->3AZjPwc{#0NA_Zn1#gfdT?1
zYq|<qtr<IP7RNH?+Pm3(EL`0o*W(NuIdbl!{Y8^20LkUI|1~piR7;A&c+K54=<7jW
zI3@X|v?0W?a$*>6&GN6#^?(de2X<@tA7p;Uq8)zO)QmpB(~UT3Tfd@q&lr&dVTkzz
z{ZB;lxlo>+|5+^{M*;%k`=7#_J-|(xqrn4IH;dJv)6m0C#KRY}xSB5p;#_rwM@lL=
zh&W>KDp&vY+CumaJ$d2q;5_ePNh-Dlwt78Gd*0b{e|{tbeB3{_0cqccM0;(K75#FT
zX_pYEVoyd9Juo9-aMVZcK8@~_5@rtk1r-`CwoY3Ftn-o_X;=?TPAiU`s1)V>x|9m|
zJ6S&J07}AayiRR`b9IpQZnhN-fq6RsiEljq1icj)=IJRqSmg7GX&|5<KvAzZm?Zm_
z99%}mOOmfCQfrjaQ)`<p1vQ6cdI<{Y>y}w+=U&V@wtyFqN<SsvN@`1&u&A?7Ra7#B
zjk`Q8nr3v)Vbxl+8AY*ZK!x~321yIxhO1BzSx39Ytp|#rAZ7}Pmz>1aaCU{7LusiK
zW&i=rjQYp@D^Cq?RoSYwvC+DTy}G4Xk7Q-hjFWyl<r!N_#d(RHNuT$~tK>UpaoSYI
z&>g2q$0|K^liVTSFI1oAs$xGjBjXm%7q|ePMrbu>gp%)UAg0r|s+CDBzLFk5Q(N-J
zy7~7S2-67y)=BLVdkLG#w}#yF`)(f^m7HvDB6Y)#VkxNe3|dzw?|LURBb2?+>{ack
z2_;=D{FZL}kD}qWO>BsH7vGzDnktf}wtz`SQ&OjQ(D5NHRgHc75KAm&m@>C_#k369
zr0x{n{AG(!1*M2SCrh5^SrP`|l8}b9o6smM7z51j{rg1M@xn}BKh;KWa*A1B+f!?H
z3c7a4%7HNKS=)-I*1+Duu<G6+lM4@3HzK9`0yRCW>dI|%wbe1=enkeFe#8vA&{BOq
zumn1_KyAQDxA3ocHBxwvc8)A^^&jlDpmKVI+AL+4x;H)L8lC;+3Md(XyXumYn#N{f
zRc3{GVq1o`3ccr=-B$IOR8!h5bXA+oK-D^3edD(3;{cJnPO2>40<P<LYiLYxt|Et4
zE4Dz$sX0^~)q0Q;nBJ*sJ%%-EcPtz74q|(8d0Q9USb^@{eTXc)_CR-_!>T8N<7LCF
zs1n%wZE0{DYIlq~YIhW18yfyEAK0}s>7ULes<nLVsYbVDr0vzRnGZsK#Tz1>ZzTTQ
zL)SiCRG&fkZ`3@g7hOR*bzW%rz54zVi**z*?J}*Ir0`=@f3}%&I!M;p;!?2RWown?
za3_`3ODncBEjHLMBQV<ecGxvD*SO0LR&XlS5NzjtX&C9G|GG*6=%{dMz#zu@1wXSX
zmCg(o2wtt6<$H=gSjcKJWR-FjV@q_^g>XxSlInzu<opC`tXb;X-KEkL`?CHwtLIl1
zs~$9M-ddj7eKVR=WrVBrGg+$Bi3;%}Gf2MHajOj8jxPU$sJY5+Bj3sdDFm#s_Bb<T
z%D2F012tcfFPM4&IZl<Va|U8lc*4xyxzupR7CHE$|M87?plIffo13qQpLYEcO2k%?
z5K%*wEe&7u>|fR_mI&{<S<oi(U*W^65H))?C3IYR>&##0LDGGk*r#K%Sd|{b3l))N
z*=<Yt_imZ4JMzwmstPXj189&-(g#U|8c3!TpD$EJJ?zwg*g{e-*pg2PB<{dQ%L~ZC
zg;A3DLOBV<h*=85SED!yoEjLSU&aiR!}zL^YfK8=0oV-)7~!9q#5=<)!A*lF(bf)h
ze{(cd_Hs1WkgtdTq<T@Ta)>_TwbRdE(IpOQ@+~lpdpG>Wq<*VPp65tkF~I&r-rK2T
ze5ag!qh}8VOin*$e^_&;jf^U(1-cGfUJ>nUo@*(I?D%_NBytL7_Qh#CBHHeYxJ1VB
z!c_X6X~B5aL$4*-Rh{7qPk_Ok`G9bP*m8LM0g;i+WeshTV9FzlOLAt6)EZOVp3~<)
znKvafZ+hK#R*e!-9Kpyn9I-%!)W6(=PVs+mfhukREY3<M2>zkiSP#aM4|Iwq{zWo?
z0G6k3dANx<AYX4Up~NAiwwrK*?m`*`131zWSGMl-X#{)7#UAq9F%mfy90fbE2yCo(
zP#m53cWQ@A(Is`k%dJa!!-xJjoH^>SFaY?z+n~iS%bwiJ$r`A-Gzx)ix%%4&SZv@u
zSypcZ;O=uCN7^Hz?5d~&`uX-HqQmp*Wj>;nZee;7{e~QGdHj$8e>EHj?=_Nr8l&!7
zv-Wi(4-Px<Csk+XPy!G(>p`p?RpP;55My%=Db{8vl<4<T`;?rKBi%XskX0?)!1w-$
z%2I6*N|?mR-HS*N!7D(m)8qo%@~g8SnQo!$pvFY^=3AOp!$gXYUg|I0R1mnwM<Z81
zzwAVi&%qfD|IJUh(wO&i4F9fln3vz}neJs4mbxN@`{EcLXd-$Q_)n}O9quhG`DwBq
ze(;X>f3S}05C@QxVym#Eh&uM|j<darhD9A7Co8%E(g>G8R1P&8hDniW$T*;Zu{xc3
zg>KJNcpGE?u=FB~95RgI2PBYuyVW}VO9p%@@hW@M+3%#`GOw@C4<vmgF&5N`J8_&s
ziki|@TLPM6Wg|K<(lPlU-E2OaZq7**w+%DY;N?z+UJsyB>$Sy#6<sEr-uT;jjZH7K
zBa;MYB=pdAlh*E!dc!$umhQ53DkDhW1W7zuq|+L5s(W5R;w419j!C#$4)+mDF|3C6
z44g{uJ`Q_Mb}d)dmj1z_vX=+u{f>6>)wuJNE8PNQ{8S^7ddoadRBf)RbmxSCU3#$;
zL%W1hV++9DCkw-t9(zPhA#qdLE{AB+OytP@kbEeg1fFoUi?CDh{h!|?5>4znLJBwI
zF2uIeHQuqIe=`ZUEPe#{O72X}2-Db2X<fwg6V<y8(yO9!8uQShqb}xyS{WI~%vkE5
z#03&|mP#z}(0KK<O>mcNX2v)s5HwoM_HY^SD?<QptXSylS8BM?8|kN6I-e&97P(hj
zkkL8j5EOP!{njVg;-{7UMk%z)WUhyfOCMTIDHU(1EQ5vV>19gsGd7>pZ){Sl@N%ey
z2}Uag$*6e%_1qKU1co1Rr^xT%X`y4KyRAVWZ-gAF?1H9+eq0NwKn5z>qFt`&koghB
zACn50u5e%Ld)7{b*6o3XKe%uwjsqw2slnM6sCmr&hF=hcU6_=z*TV09kk1oiX23)2
zc8tSRQWR9ecV^LHf4z+YrNByY55fxac${Qg3ntuRv2@{-&<qfik`MlUUoNHaya$55
zpC3f`GxnDVskEaD<0qQ2TCU@-&lZ?w;-QJTvD+-#cPG{!gc>X)UuTqL20#s4a*|;(
zJ%Z5~fu6ss4Wcblpc3Z1{4f4X6;y`5@~5JQe=7R_b#J?DWQ4_z`|YI3?7EX=#Z+?J
zGJgcAdK{?G#Lx-|!NjQTamJEJ+35hoJ)Fqn74wYL?rW-E(G}w+x*@SpU`f=dvNV+C
z;U?-rN&~K;!F#M(TeT^)o2KKbxJnGmV0CQMfeZD}3LOqJf6fV}kwuohtvWg~@K51&
z-}B>7&8Awrd0-Ll2W|{sZ=pp@S1ObmrOwtZ*{VuCMyufNV3To!IH+|s7oPw*NE!4Z
zZxgK+Tu+nm7`@sX2lyi`uAA&5zk|AJrP@RKX`OpAPW4pezFL1Ll6CvS4k`9NMD`tr
zfVce%X{4a->Sg`PCYl!0Bi}+RPUU<GH6cJGjV1N&!_adWl~}qci)naFw|_@do|2cr
zJkBJGaalXFswgLlNDf^}Uz!KRsbJd~YYudW>S!v~mm5J%!8!+IRCnLVHkd=L(X>_i
zr5n|!=~Ql;r*q?<`1O<rXqQoOSw0;rtgD1h04iz%yI@TQoO82m=NzY<5IVD=uzk+4
z>sIi)Z$ayB#HT){Ow~FoI+rW<wispCW@cvQ>G1hRdy-MQ9u2Op9jyUPJ0)&TwKk0O
zi3M{d;slF`;72|n70KBicfm*nMA$$>SdG%bkV~116mA19PiREGP8fR%Ut058kxjI!
z?17|HM&UkIkqcPbb0C*F%aBMXV6gAgQKmAgs(CMg<6$Dblp_Ooc)SZDxs>$#$Rk+v
zBnS5w`E@bW=XprvmHYth4Gz&=q8<n{6>VnWjIkY(j<A<f`$~dMdm1*iiT+YVlO?>)
z5s~e}I`5PxXyKwbRBC<54Yx%SPKhdcE7DU>cI3kJSQ@0)?*%5YaLyVQQl}!lsP+Fv
zdZm;7o$mT6(#oGA<@lMF*gIJ;SU4G(+9cVcA^rC|cb5%3>6}vn?0dA_Af}0(D+U<u
z&|D<F>=zJF5eN_v=l|T*|8?+<M+gMk7q^L@H}Dr+;pnqi)z7zE!GM5R{^OY7F?iA^
zA0psr(lJ>ZR8$Ems##)6X*iD%+gdgnlAIF!Tc<Y7$)m^m3ce_AALWIC6gYyM-~YPU
z(M<=@CP_GH_G)_8=YD4T>htaXlfs{i_e@McHfOjwmNinCu7t7Z0Gk%BiJKKQgc61+
zZP0d)r*5w{)EgEGe-*QFYV(7njrVG;x&^@L^7#i?L}5OByT5Fv@L$(0@{nrpcHOqJ
zriCJn(25bJrkk&YSy}H{u>DKvNw{plOphymr?5TNipNw8X0%#HJ(S2f%&z-j<XF*o
zfr>R3q_sNTq1s%7&0Gt$P|xgVrQ~g9SOUti{HV&WvrH5L=c3Rtfw~*+qmFb27ivH=
zfbRGyOrx9V%(8thJ~HUIAru0ZVNTWE-Op?T=V+-K(TwOA)5#*j<n*BRQdFsyS3qVj
z<%6qhp~1nIZXL?@q=P1uaVwOOL>N|Aa8wXINSK$E(I1wHAqAG!Fu~{$uvNxWtKljP
z5?62fmwOZwlgnTrJ#-AV#QD~I`~xs#u)XDW@sfNtZe8e&a8`RF_WnqDY=qn6d_Wgk
z0G~wHT}Cs912<NOye$uJTdF>@ym)IT$|yg_Ag7>F;HJ!Am4-%F%0^`ylpiJi2iyuu
z8)907bo$J<+}x4CMj;e_f)UN|!7DvbKUFZZ0+amRg9VnP9d<lNa_CT=R2g8Yuw+>h
zQ4CL;xtnjE1abNr*g!DP4xfPhn_&Zs4r0E~_~A7FdU=3;go3mTKVXD)V#sp8)kC+W
z58UjoMx210{7Nj!U#!YOHWPx;Ew0L%7>go4QLZ?;{6n0^Bjv6Vcq5x0UwDHDFLsxC
z%cc{TLv%>AiU`|oGBjKdK8Z`xRJlE*g56y8%ueEz#2f`#TS$KrSp3Kb75foSH&C9X
zz<~S_<3Ae}3n9nG<fJ}96+nm?3|axTwqW(VvMCi|a5ADKN+P+M>~F~j_GCFNUAKv=
z)R(&ciL5mJZo$Hcg(^T2Q}0GCC3?;6yr;l%)^qQ(t9hS~_cu~MvAWBHiFg=22At<l
z*{V)Y93_N$cF3(R*XI`u$LqG~@%-pt?n3myTlOz?U`5zATXI`t0Z+8w9qZ1NEV}pD
zgBxhQbO)Rjp%8BU@f%$5wsSRMy_f7XI|~grVyCaL;w!Fnef!~r^^k4q_aCJj4<o%M
z8E|9lP~N0lz8e=AHy~4UdIlBK`D}&ZnX`x1Vf&)#u?|`05L#EWsFg0GQI#pA@AUmg
zPs9<3xE_9zoKJTW0KpAaKGYZug<(hD%al<b?=W=|T6YU*HMl6G_LKUO#^mfieZ%oj
zn9PDcI}Sah)?)a70OKWS+p!O-9k1sL998K$Z@NAs+fAotS&c4F&vE~N<Nz{SYme#r
zjU*E>Q1ul!T8?^=_u=ziBoscx#)IMjB~#4BzI$`c&p8+uK#8UVZD_*3W#jboPlb6h
zN7^<le9^g3yFaFNESmZ5WkE*%`W4XhAtjda#7VRyS?N7M015ap#2TrLL+Hgr96TU9
z!(iH^yWubakpkX&HQuno-hk5HkV>2BPwblV4VBZPb1dZU9KNJ0D&*hqAj=pRz!Ag+
zNw(C5qA_D<fTmx${e%j{Q*5&L{D&Q}$OQe!3Sz;jJaQ(&i(Mg`NE38hL~$q`WYK%{
zE7Qbb-iH;30rC_va!+XB|Ej&bqDHae#<a+~h1uD3K0s|_{Z3A;zr~VN!-Ta*lN=M+
z8hO!^^%yKmLD~=V`h8^=dIKSl_`|{yaz^DEO_HxAh<*(n%1L^3#+6d#hc{gRXO$Yt
z`Kf^>)rklIcI_7xQNQG=P+^??H<!84kT@`LR(i0a$&uw`$ISybhIZ)Z>*<eHx7@_P
zDGYoTh9SOzz9|nn=(4s6g)*B@B>L`iuCq74zV7ca{6U&+O_iDwMCjti*v~zTjmCt7
z;=T8z7`&v$Su@8#n{c9a2Y=5cUG2S^{;fnX{_9){ScC~36hNO`x@ENzFVmN#?8cyW
zQ4>H$qKLXKc2QfyFgm@Pa$`_5v8Wy%ch4!f=Gr!7Msh0VA$5IJ^$b(Y3}*mIBSFLS
zjqVmiUd8EQxs~GVjW;PHpi+qCnL!cWfngxTDj3y1f{m?59!JdzAuq^&(QwI|wqh>3
z+;=nwv}=hF#fJrSBffj>@XB0M#Z!&ra5dJ;tXt6@d#)}>*!uWMmwzK<8a@X(v$^bg
zy)AQ?GuraWA)()aR^3wDT(#+-Yl~eJ*cj#2w@usd{^`5Kg`3?n66MtNyA1xbzgNpD
z6B}re9&YJT*|&2}4Bj-^rw;$tXn2a|?+`=+2%~G5x%%?Ijllz97jWj5B12tgAO~u#
z@}H1ajE$hSK}m$yz{>1YoA3#HeZ-#8mTgK9M9y6A3SmP;sXdUF^})!>rr7FIU5hm7
zt)tnLrYZ_<ET+0vfXQoOD>a!xO;h%2O!I2=@DFp;VjC40lxxizzsa(#PG{G!Ibh!;
zqJv{N`rq0JhZ#+{?H^>e{z+vN_#b3u6xV=C!7+g0u-iIiXo?rF0ER;>;)6i{323sR
z`e7me??G??y@`#HvvZD?m7(rP!k2Vr28WkdtJy{)pP|hj$iGyk*7_qAejqFv_SA+1
zglSE$L~;DN@C>9@PT}@Jq*%mQLlocu!!Xdm4pW$b4Y~F~<nb%y^_fPajUYaMI3gRM
zu`$2TovelFQ>=&&MRx^vHCHv)m9-UxIy~<uM1L*7ohm-}ZNu*`4Yt0u2J}43mmqis
z{)JnruX5)%7P#-SJ%!g7IR3SQ0~kEd7v&)%Jd)cJAKZZjpNlc372LI8RE?+?GKn$F
ziIw3ZlWvdCeU(18l@~Oz+*rNBcQS(+%u1{RbMZGbRM!OHzUb9r#W5G3!5p(_aue6&
zzbJhG)P^+2N~}6g@^bQg(Cp&F-0I8-X@#ikWFKCJr1if)X;!Ywk`3f#=jk*mtQnOP
zta$fkow3?na!RxF#iC=zUP98Y%M~fuR7=IWV@_l@wi$<M&|YHHE7B<jl`HftYR;YX
zO^2{-nKcvHKGmt%ec2Tgx@_5Ht<{fHJ|)ip;67T_J`AfyO$ipTDP-Iu$#W0T$!c?~
zx(VezS`|0CwFWiy@&zqFE*;MkT)lI%68e)#>ONLQl-w}Z^G5B}mm}VmcJ(Ck040Km
z^ais%LteX4umg2>GT{YD6=L+rW`?M%Q|Qsa2us-{*T9LXK*uJ2WDb&BMPiqT3^`H&
zWqrre>nw&Wr$8eg@-|ij#u})JBg<+sB)P2Is`Hq$LVc?c;~%p(U?C+DO8k@6r{8+j
z+uDV6uC`Dt=5wQLR_M_!=CjZv`w^vAw#(KMjEmC0WM*0|r>8U5Oid<#x$*=tv6$@2
z1%5<F%xp1k>jW}YtyNbUY`3>G)EbTas9|0It=4F6QbJar!|EefU&#j#t}r!iZ>jZ=
zr{}9Dyap;M>1>qnNnsT&mg5BK6;D`0w@3s=Tw&7bCUkW6e__Fk|EaS5b*~|2a=CKZ
zU}(KwZ3h)riMOd9LR?yN@gbJX#f=Fs;m#iHmQfSi1v>f0wCXeJ>1a01iiXDo__uba
z$lFe5vl!6}Rv<~)AQ`WtJn8&E8`YXA4Y*of?=i{3(kX)k3#lrk8@PEhq%HR2Ny-(K
z2v02Y3F&NYs;F+0i2=1pwZXQrw`v8As$r9ZCp&C|{V3+5Hx8GgacfDRnBO2y*GUvt
zo4Z$zM6l->QeMBUHhhW~m&ZW`oFwnFkkmxm;>+>{5oSiS9w}lxl9A5a6fRBRxIWFo
zQA3$*%Nn7&n9*E25!->EqZcK)s)=N!S*^EE`=6dkgNI~|=?UwC-9SQHZ_J|BYqE7H
z*8g6=7~&qD0HG2NcL1i;$H0<Iw;~Gy?Fgx}gVLV)u*R{2?TWzKPRyAA807HFx0V$K
zLSw)qBh7(kld}kgvM^hq!$K&tUM!eaMZ#()a|+<woOpsSDiqgNMg6j+K-wD&Hy1ov
zx2#@?CUYLmRhx7jnP&e7naBcWHCY2alG59;IfGv~Og7-a!SR@xAS(N*Z}cpd5zjS~
zsjj<l6&xw10hi&>P3Wcx;LM@guRi?26LU(rqi&<OVBf3Qzw`skHUgdEcg?gx@`CKU
zGq4;V?nk*S4?TN>WfNkVplloB-B;0}m<}+~i=cE-p+n|TXh3#Mm%z&Ug}vODE}%L+
zHA%v#J6ch<%NeHE11u3)70N?xHC;7wc(cJmICL%Q%Wk&kfpgt}00>ZeN|ju#3%dku
z+)^b2o)VRe3J4wTX%C-2*%>TgOERJ20m}LdTwUhy4zp_67O-K?idqS%ObQV<41`&}
zS^wk~t~6n+NkYaCz@;jconW^jbzryrap1P9#dilTMau)|W}!xT+GEJ+LYpJ4{(847
zDDt9Sz$XqgGZo7L{&WPnl!vzI&cv_9Si6?B^RR8$Nou-bA}5p+={YeWk-gu*MnDZQ
zmNhQM2fM&fhix(S+^FK{39r{wZ@KIZ(jA3fB)1cF6_3Ts95IW~r_n&-kwqPpz>f@8
zGK=&QX;2s1V>_kj%6T-et~6?o*tUnLMYCvhlvGAL=7H-1CeCfdXwhS^oMM!{KK?dC
zhUln`LSA;N*RmYyIQ0;5P)cl3YG67g`E15#9sL%u8@LSJqHe>w!y}`9-vS?LBx;*-
z*V63hFOH1CV4ii=n`ZT_4O|M-LWkp}NVdLKoXH8@B6FvRaj9o%+_rHAj??0j-P?%6
z6zQdSHceLsU_|{y%rLW%Qb)pd2LTvO+jJTHiM$W>MS2;YEuHcLIF2AfxAI1EfvrXG
z759!a@bmB|!ntvN!M*-$(TxY)AwFl=;Vr~rirwxTj~I>*QICvvnB<UqqkZzLgIbXx
zHdOOrnnP{$1i2emcAHt5Wa;yoc=?DsQtIQvj!hc^tQ8z-uK$E@XqPm<G&tRpgno#Y
z2wyfDk|N8YLg?s36<Ku)-H9i%(6P($B1Mx$x`!g;jj&K#sA9dK*RCCwh4NCzS>3Uu
zz$*=u8cEZ}iVyOQ&@D(3V@4`2)W#YH9}f%DjnLuoHlT-UX5UskHFnmpRQ56(UJk7t
zI{qZ#(uk3#+UWbd9@kEt4<>t$lrEP${Y!0B7RimLI9nz%i6DDUB#H?2;h)1%9*)po
z9Exy%c5gLYT?6F6LIf+^i085J(&9as64>!u2yB6&8Ju`B<JQmlJf!8N?~px0L--GP
z6>6UF6Bo&wGF_-Ana67(axgbJ{ET9OESa1Ez60$&?0iMij*+#C10&6I)I}3q1;r1d
zu9|;A)$%L<jdclRbu{{7noZ6lG!+nJmFaY$!LJ6I$x|NPJ7OJ^%?b0RaR=UtJ8KNS
z)ed+~p)~kK(^0w7Xv4UHdbd`jInXBfB%`IYCkNrIcz^9*8FJ=|#q&ZTFC#e38`$*%
zMmO6^L~=~@yS;U`B323$z1EQ3f}u}XQP?}vZ_;>m^!lu$UD#FRTYK%NaYuQ$|Dgo_
zfLdnPa?l@<r1KTW)vl~koxdg}1%?%y3qIRD_c@!Cezjh1Z-MHe$Q-(6dHIk<m;mBT
zuaDIBO8&-e+4@{8MT0i$g8B-FNeuR%X>SBPjqI8Khh;GnwiLc$fLI2rNys8Yo1V~=
zm0iOL`g%uq1{UvSgQfdgX#AftM!tV5X~1X}ETQthDTtc{Nj(2)S@YYeW55Hz8X5Uq
zu;aa~;$|fc-n&BX)|^;&kYUIK{9G$2zH~8?!p=Z<-I~UP4--J5;DnA~>moS-o!j=l
zw)K`DTYf#CaD!t%A<Iu1!2w~;Z%_!o#?K6}$vere1Zh1t2e)ry4@VM?cz67VVC7CW
zc(1L`GO?O!|Bj)o)-*EONhoWt<lYMLg6S~*Q{o}C#FFVDA1uSNVq)<zZQ@v$z1Jh<
zAU%qaPAdJ{5E{2+J19us$n@d^RDfO|2d)mDHs|&kBrMVA-8)iqH=z4tP*hZ=72!UL
zhyEqE{;>VJ?XZclSMwbJeQZ3qMk?OJ$-H!bwMKH{+IQOc<uUoTXUh+?%QEgcxZfRA
zGmD=Nf^fVq9}Am>@4jdEq;cEfi$IlJ9ddzYtFQGcWZ83btpIhaB}+pK_;p}IEa8uR
zIf`GqJJk^O`TRP@!HZTjzr|r`%s=Asmaw*k(9>~Yb@)JJ-~crGE86mOZ2Y(pn#*4)
z=E#@wFU%my&4W?1VOw{tct~L1V7j)wS^s8KL)TG*e_MSy#(`T=KEXj2+P~mYUnhbx
zkRDDe4tZj;ewqCwZ>EM-0LIPZJ}R=Ve4rG%kXpY^eLY5!wGX=)5>+Hx4f;Ir$5F@l
zK3|HgMUqwIh)bo|zgzBNRGgbPWtXJ9;blHb;zw5HYau^@(tApI?*LlT%15dukY4`j
z@q(^VDlL8s2^pU5qw(4mTIrdB?#f02GE`M<&DAI;G2NXg=oN)(z$3&*Px)5Npud0>
zz1o1>@6O5vog|IqGF|mg!sA8iFJ(8hwet*OSBc_WWUUns+uRGDuYG>nQu@T&+NNHF
zrLaXAq_fq88JjJ48*?)T`MPy`vGB+;3Z;Q3URgtASuvFJdUzT~{>?{7W02MZ;D>xH
z4P%leLlhHR7W`3k0B;P;?b>>z!2xl%%;a-DTwW2_*a9_);iO0N1eIl)v5O=X_mQkk
z8hNl8ikl=w;bI7V2QbEzT=<0k@R8D&A2`nu*TeW!yXwv`$DxQW6`-H(4y!gv;J}M3
z6vx>qJ(c>2V8rtLXb8bUV6%%6>qi!f%NMP*nk_y9>z&dGSa-p8&kBUNMRbWUVe%7=
z<^A0<qy6Z-%WI(;sX=u{<m7XD^JcYCwm!v0aDJ$DaWG!hNR{D>dpR1H;fQib!W)>!
z$Wb=={zAnzGh#B~(pK&_x^R%K<sWE5xfWlx_Z#j#&M-EVX{5;_S|AWPHnuRgCR9(N
ze8Gs8d)o2?fLwNr8yYv%OxqT44i%d>tOAcavllH4T{C?T>ooObQ7~Vl`qj#cx`@jX
zOjAp28XwL>xi61_q`}0V+aMO6_TwY9S$%U1WX_h%p^jg9d${Tm)h(6_kufQ@qt((I
zX)2$a5X3({I}mE!6aBuc_Fxp7->?Wy6kX@SST0TkP!VI8-E#j3Y7EfK9aI7S+@m;_
z+pm~0H5h8=j63NLIO$EWD1FG0o1rL}=bE{HS(AZ%pyX50?8JhgqkUvSdAp&dlg};S
zTbjdi4OQ9WnpJ$TI$gfW4n5g`-o6DZ#Zzi}M=&AIfZqe#B<q-S;2Es{s3dUCnnEzd
zcWg@qc<}aR+;sc}LT6Vm_3uE4I*sz9Exk@%_M)b9Uq=4G4g2}8VkLZ9)49pasYWyr
zrOP!_Q5&;`)e(_db)@wP=MozAV{mQO(B4$N@%xkgcj2<%9MD59hYkad3J0dfp20st
zEC`0VwnC_vX&M+vb`yIbwD+XtJ%Bxb^&p%8j;Vi=EFfKns+HMkE`6x6X)nnu5{h!v
z57qkBeG%c<^hd*tt#GFoQ;fB0y63~#(7Re*C(uGpJafnX9P75slUkmSaAUL95nIi@
zvX+EfcJw*~*(P%Yb#EL<He<!@PIGqujZlTvpBz^{O&;@rVqB8JB5SHAuujhtI<^P~
zoV6rjIdM22`i*WAjc(Xu8GJ{d-2BQN8_VXJHslJ;i;6WslrcyK?j~)zZKNHbX@sql
z=JBKAxy{@PT{|M{CaT+)^UU#ZFH2b`q4MUsB%5>`lL%j&V}@{7?#esBh~7b9gkx}G
zi}TJ2Orz~&E8dvGy>TQM5|)hV(hW}oL<D6*ubS#RJjis9D$XWh+;Vv2Xd%Xz-O}8h
z7^iMUacFXTmfzlcBx#+rG>RW()lAf>WPZ>w&Ft)5b6QND{-3VSJsPS!4&eILoa8y>
zF^rq?+#14qbZA2ADAAf^IW3_{LsA(@Lzd}wiX4wxztrw}ZSCx8dXP{#r@BOmN>tl(
zjWJ9zCMIpt1N)mB+Pn9k-}n2Q&-Z)popbN~<NNsiI4z@T`+|8-bWKvR+Q7Zn{@_*=
zZYH>4c*<4qQA*Qwdpx=`=ar`MyjA)=TP<G(t*cS(SvQ!ttflCt7RI|LjJC0N5ga_!
z+#8W@l4ST?p)j}@T$+AM(wxEb{?*jk%xrm1YZP9|m!G-lwZp%%$f;9YwEbGS(kGJE
z822_)E18iH^!wkwpYn;u(K^0H;~7Ku_6%={tTZ9GL!jwM$d`<9nyLlau|(rM$)$id
zjx`fwhNU4Fn4i}?NG*&MiqfB~tSZbsn`M7D%>Vj(d-n08Z;$`OZaF0^yEZ&JD<ywR
zO=gS-xVIaWTp9^baJ!r*{D17q5hkfTo2r9L-M^QtPuv!?E3f=E+70&U4?(@ZgbdWK
z=o~o4!83O3bhvtZt!KhRpIQ2w&2pS+j!RnJJyyQ^hRaH*eRnGT$f}3JpT0{vpC!1N
zH+DKM^snI=2bnDUrvbz=+mJt3G)4Ez#eQ4vr-iy5i%%soeLYncw`5il+XdC@Cp<mh
z&x!wy(~;>d+g%Zn=l$&+uh@K{Pw$6<)HL^Gt>_MJCo8fd|H80eCo5~i<yMQn(7M7{
z@$iz=tZmKG%MSTgr(^a9dI@vIQT1ttzM-xz*5$^dZ-z$o`(i3$D)j>E+~0ScyWCJ*
z!+v&WM_=34an9!x+DU;UjW<d@5D|joT;<){pUNH?#AVllSz7G0suBhsyI^@8hr69S
zx^VAuT9PVUynoH`6&r`<jh4lq+but625HBynakmdH#Wy^VwCY2)kjuTmEHGh^J=(W
zBy->raLi%E)4b$r$(3B9xtb^*Gg1;hEmqH>TE>f%mBYQN8g`;?e<e>izdzJqapW8M
zn0Iws_;WqzB4Jj?b(+qAo&8K$EMY)B#cE(R6LzE-A<+;D6;2>e6ILnQu+*CHdRJ6^
z`4q*gd{CBZ>JZ`lIfyrh3kTe=(gWvToJ1L^3<SAO5oi?QGxcENz-sL4ZsQsn78GD)
zF7h%Tss@}uq&4g=aDf6T9rBb+5NHE&WfTapCod~-2FhD0tue}OQWQ_7j*}n*wo2&G
z;x!ZKc#u;YUN69=H!MIQHA{-!$QNi_JR6E%n_&N4SQstjI(>-n+?Av^HRxS#0CfiG
z7-h-VX;gjV!M>BQE({xF0p~DMEgD=3B%4UFzQG3S4za+E$VpWfh7UObtr${Ow$6vd
z5FPuv)&kl<i*f>Hyc#S}u`o*OI)yRX^@W)|+c$+5oxCRj@}&%Hx;+cARurBufTy)>
zpjj6Sv<sk#jvW#)nBS!bOjBTK7aRDcz@s`YP*2JN5BDL_6uRnLBb5%bq)c#72)h?y
zkdXQSCQgdx-5y}y0aBD0>p-T84nJaaovD+G@cP5(M=RLg&A`+>VFBnNB2X7Tdx}7#
z2tS)mLPumYXeYD5)ZHzoPzco)J#8)&kdrqFT4H2N0rHltjfz?*(8{AEq>|au$ns*i
zu*V4ed<;$cL17Oaqm+J9EZ3eOE!%qRX=Kd|oIsX)O36u&UOS9Zc0jRAItd%x7ejHc
zE%yJk?-VD(Q$z^zAg_Uv=A9zYD8dhy!w&W`Nc7TaWRe$_$&J7vG3j2N+m*|WX=I+P
z;H443&rQzTVq{hV{b^UwyX;Ky$gd=C;Ki!BYOfe2KurOgsz}gjwK)k=0@M_6yas`m
zFtN`GY;1;#@I~-W9}DpABheC?zFG>hAHbkjF(Bd*L>*Sf>jP*g1+M;bxN7*L*VE~-
GTKgBj+ffbx

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b7edb58a8..070cb702f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Sun Oct 08 20:08:12 CEST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 1b6c78733..65dcd68d6 100755
--- a/gradlew
+++ b/gradlew
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -205,6 +209,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.
diff --git a/gradlew.bat b/gradlew.bat
index ac1b06f93..6689b85be 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

From 2b5a49641a6253a1841a53ee0b6ee28ed0c26ab8 Mon Sep 17 00:00:00 2001
From: Damien 'Psolyca' Gaignon <damien.gaignon@gmail.com>
Date: Mon, 29 Jan 2024 21:21:20 +0100
Subject: [PATCH 522/595] [Huawei] Fix clientNonce for HiChainLite

---
 .../devices/huawei/requests/GetAuthRequest.java        | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetAuthRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetAuthRequest.java
index 091e2ee72..8d1a4a274 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetAuthRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetAuthRequest.java
@@ -67,16 +67,14 @@ public class GetAuthRequest extends Request {
 
         try {
             if (isHiChainLite) {
-                nonce = clientNonce;
                 key = paramsProvider.getPinCode();
                 if (authVersion == 0x02)
                     key = paramsProvider.getSecretKey();
-            } else { // normal mode
-                nonce = ByteBuffer.allocate(18)
-                        .putShort(authVersion)
-                        .put(clientNonce)
-                        .array();
             }
+            nonce = ByteBuffer.allocate(18)
+                    .putShort(authVersion)
+                    .put(clientNonce)
+                    .array();
             byte[] challenge = huaweiCrypto.digestChallenge(key, doubleNonce);
             if (challenge == null)
                 throw new RequestCreationException("Challenge null");

From f759072a7cca9e7b3345d50fe0da312cd493a2cd Mon Sep 17 00:00:00 2001
From: Damien 'Psolyca' Gaignon <damien.gaignon@gmail.com>
Date: Mon, 29 Jan 2024 21:34:08 +0100
Subject: [PATCH 523/595] [Huawei] Add PBKDF2 crypto

---
 .../freeyourgadget/gadgetbridge/util/CryptoUtils.java | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/CryptoUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/CryptoUtils.java
index 53ecf926e..7dde79c70 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/CryptoUtils.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/CryptoUtils.java
@@ -19,11 +19,13 @@ package nodomain.freeyourgadget.gadgetbridge.util;
 import android.annotation.SuppressLint;
 
 import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
 import java.security.InvalidAlgorithmParameterException;
 import java.security.InvalidKeyException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.spec.AlgorithmParameterSpec;
+import java.security.spec.InvalidKeySpecException;
 
 import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;
@@ -31,8 +33,10 @@ import javax.crypto.IllegalBlockSizeException;
 import javax.crypto.Mac;
 import javax.crypto.NoSuchPaddingException;
 import javax.crypto.SecretKey;
+import javax.crypto.SecretKeyFactory;
 import javax.crypto.spec.GCMParameterSpec;
 import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.PBEKeySpec;
 import javax.crypto.spec.SecretKeySpec;
 
 public class CryptoUtils {
@@ -127,7 +131,12 @@ public class CryptoUtils {
         generatedBytes.rewind();
         generatedBytes.get(result, 0, outputLength);
         return result;
+    }
 
-
+    public static byte[] pbkdf2Sha256(byte[] key, byte[] iv, int count, int length) throws InvalidKeySpecException, NoSuchAlgorithmException  {
+        SecretKeyFactory secretKeyFactory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256");
+        String keyStr = new String(key, StandardCharsets.UTF_8);
+        PBEKeySpec keySpec = new PBEKeySpec(keyStr.toCharArray(), iv, count, length);
+        return secretKeyFactory.generateSecret(keySpec).getEncoded();
     }
 }

From 86461ada1a02ee4bb9d973cd69ca3575b6eb78a5 Mon Sep 17 00:00:00 2001
From: Damien 'Psolyca' Gaignon <damien.gaignon@gmail.com>
Date: Mon, 29 Jan 2024 21:51:45 +0100
Subject: [PATCH 524/595] [Huawei] Add new Crypto and authMode

---
 .../devices/huawei/HuaweiCrypto.java          | 30 +++++++++++--------
 .../devices/huawei/HuaweiPacket.java          |  9 ++++++
 .../devices/huawei/packets/DeviceConfig.java  |  7 ++---
 .../devices/huawei/HuaweiSupportProvider.java |  2 +-
 .../huawei/requests/GetAuthRequest.java       | 23 +++++++-------
 .../huawei/requests/GetLinkParamsRequest.java |  2 ++
 6 files changed, 42 insertions(+), 31 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCrypto.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCrypto.java
index 0be828c01..08ef0a60f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCrypto.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCrypto.java
@@ -24,6 +24,7 @@ import java.security.InvalidAlgorithmParameterException;
 import java.security.NoSuchAlgorithmException;
 import java.security.InvalidKeyException;
 import java.security.SecureRandom;
+import java.security.spec.InvalidKeySpecException;
 import java.util.Arrays;
 
 import javax.crypto.BadPaddingException;
@@ -78,15 +79,17 @@ public class HuaweiCrypto {
     public static final long ENCRYPTION_COUNTER_MAX = 0xFFFFFFFF;
 
     protected int authVersion;
-    protected boolean isHiChainLite = false;
+    protected int authMode;
+    protected byte authAlgo;
 
     public HuaweiCrypto(int authVersion) {
         this.authVersion = authVersion;
     }
 
-    public HuaweiCrypto(int authVersion, boolean isHiChainLite) {
+    public HuaweiCrypto(int authVersion, byte authAlgo, int authMode) {
         this(authVersion);
-        this.isHiChainLite = isHiChainLite;
+        this.authMode = authMode;
+        this.authAlgo = authAlgo;
     }
 
     public static byte[] generateNonce() {
@@ -115,26 +118,27 @@ public class HuaweiCrypto {
         return CryptoUtils.calcHmacSha256(digestStep1, nonce);
     }
 
-    public byte[] computeDigestHiChainLite(byte[] message, byte[] key, byte[] nonce) throws NoSuchAlgorithmException, InvalidKeyException {
+    public byte[] computeDigestHiChainLite(byte[] message, byte[] key, byte[] nonce) throws NoSuchAlgorithmException, InvalidKeyException, InvalidKeySpecException {
+        byte[] digestStep1;
         byte[] hashKey = CryptoUtils.digest(key);
         byte[] digestSecret = getDigestSecret();
         for (int i = 0; i < digestSecret.length; i++) {
             digestSecret[i] = (byte) (((0xFF & hashKey[i]) ^ (digestSecret[i] & 0xFF)) & 0xFF);
         }
-        // 2 possibilities:
-        // - type 1 : Pbk (SDK_INT>= 0x17) fallback to MacSha
-        // - type 2 : MacSha
-        // We force type 2 to avoid a new calculation
         byte[] msgToDigest = ByteBuffer.allocate(18)
                 .put(digestSecret)
                 .put(message)
                 .array();
-        byte[] digestStep1 = CryptoUtils.calcHmacSha256(msgToDigest, nonce) ;
+        if (authAlgo == 0x01) {
+            digestStep1 = CryptoUtils.pbkdf2Sha256(msgToDigest, nonce, 0x3e8, 0x100);
+        } else {
+            digestStep1 = CryptoUtils.calcHmacSha256(msgToDigest, nonce);
+        }
         return CryptoUtils.calcHmacSha256(digestStep1, nonce);
     }
 
-    public byte[] digestChallenge(byte[] secretKey, byte[] nonce) throws NoSuchAlgorithmException, InvalidKeyException {
-        if (isHiChainLite) {
+    public byte[] digestChallenge(byte[] secretKey, byte[] nonce) throws NoSuchAlgorithmException, InvalidKeyException, InvalidKeySpecException {
+        if (authMode == 0x02) {
             if (secretKey == null)
                 return null;
             if (authVersion == 0x02) {
@@ -149,8 +153,8 @@ public class HuaweiCrypto {
         return computeDigest(MESSAGE_CHALLENGE, nonce);
     }
 
-    public byte[] digestResponse(byte[] secretKey, byte[] nonce) throws NoSuchAlgorithmException, InvalidKeyException {
-        if (isHiChainLite) {
+    public byte[] digestResponse(byte[] secretKey, byte[] nonce) throws NoSuchAlgorithmException, InvalidKeyException, InvalidKeySpecException {
+        if (authMode == 0x02) {
             if (secretKey == null)
                 return null;
             if (authVersion == 0x02) {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiPacket.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiPacket.java
index 6df377190..a16c913d1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiPacket.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiPacket.java
@@ -55,6 +55,7 @@ public class HuaweiPacket {
         protected byte[] pinCode = null;
 
         protected byte interval;
+        protected byte authAlgo;
 
         public void setAuthVersion(byte authVersion) {
             this.authVersion = authVersion;
@@ -134,6 +135,14 @@ public class HuaweiPacket {
         public void setEncryptionCounter(long counter) {
             this.encryptionCounter = counter;
         }
+
+        public void setAuthAlgo(byte authAlgo) {
+            this.authAlgo = authAlgo;
+        }
+
+        public byte getAuthAlgo () {
+            return this.authAlgo;
+        }
     }
 
     public static abstract class ParseException extends Exception {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DeviceConfig.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DeviceConfig.java
index fb88dda3e..cba02d042 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DeviceConfig.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DeviceConfig.java
@@ -625,8 +625,7 @@ public class DeviceConfig {
             public Request(
                     ParamsProvider paramsProvider,
                     byte[] challenge,
-                    byte[] nonce,
-                    boolean isHiChainLite
+                    byte[] nonce
             ) {
                 super(paramsProvider);
 
@@ -636,8 +635,8 @@ public class DeviceConfig {
                 this.tlv = new HuaweiTLV()
                         .put(0x01, challenge)
                         .put(0x02, nonce);
-                if (isHiChainLite)
-                    this.tlv.put(0x03, (byte)0x02); // Force type 2
+                if (paramsProvider.getAuthMode() == 0x02)
+                    this.tlv.put(0x03, paramsProvider.getAuthAlgo());
                 this.isEncrypted = false;
                 this.complete = true;
             }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiSupportProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiSupportProvider.java
index 486698d14..eed8a0a7d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiSupportProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiSupportProvider.java
@@ -376,7 +376,7 @@ public class HuaweiSupportProvider {
     protected void initializeDeviceHiChainLiteMode(Request linkParamsReq) {
         try {
             createSecretKey();
-            GetAuthRequest authReq = new GetAuthRequest(this, linkParamsReq, true);
+            GetAuthRequest authReq = new GetAuthRequest(this, linkParamsReq);
             GetBondParamsRequest bondParamsReq = new GetBondParamsRequest(this);
             GetBondRequest bondReq = new GetBondRequest(this);
             authReq.nextRequest(bondParamsReq);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetAuthRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetAuthRequest.java
index 8d1a4a274..e4a98141a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetAuthRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetAuthRequest.java
@@ -22,6 +22,7 @@ import org.slf4j.LoggerFactory;
 import java.nio.ByteBuffer;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
+import java.security.spec.InvalidKeySpecException;
 import java.util.Arrays;
 import java.util.List;
 
@@ -36,9 +37,10 @@ public class GetAuthRequest extends Request {
 
     protected final byte[] clientNonce;
     protected short authVersion;
-    protected boolean isHiChainLite = false;
+    protected byte authAlgo;
     protected byte[] doubleNonce;
     protected byte[] key = null;
+    protected byte authMode;
 
     public GetAuthRequest(HuaweiSupportProvider support,
             Request linkParamsReq) {
@@ -51,22 +53,17 @@ public class GetAuthRequest extends Request {
                 .put(clientNonce)
                 .array();
         this.authVersion = paramsProvider.getAuthVersion();
-    }
-
-    public GetAuthRequest(HuaweiSupportProvider support,
-                          Request linkParamsReq,
-                          boolean isHiChainLite) {
-        this(support, linkParamsReq);
-        this.isHiChainLite = isHiChainLite;
+        this.authAlgo = paramsProvider.getAuthAlgo();
+        this.authMode = paramsProvider.getAuthMode();
     }
 
     @Override
     protected List<byte[]> createRequest() throws RequestCreationException {
-        huaweiCrypto = new HuaweiCrypto(authVersion, isHiChainLite);
+        huaweiCrypto = new HuaweiCrypto(authVersion, authAlgo, authMode);
         byte[] nonce;
 
         try {
-            if (isHiChainLite) {
+            if (authMode == 0x02) {
                 key = paramsProvider.getPinCode();
                 if (authVersion == 0x02)
                     key = paramsProvider.getSecretKey();
@@ -78,10 +75,10 @@ public class GetAuthRequest extends Request {
             byte[] challenge = huaweiCrypto.digestChallenge(key, doubleNonce);
             if (challenge == null)
                 throw new RequestCreationException("Challenge null");
-            return new DeviceConfig.Auth.Request(paramsProvider, challenge, nonce, isHiChainLite).serialize();
+            return new DeviceConfig.Auth.Request(paramsProvider, challenge, nonce).serialize();
         } catch (HuaweiPacket.CryptoException e) {
             throw new RequestCreationException(e);
-        } catch (NoSuchAlgorithmException | InvalidKeyException e) {
+        } catch (NoSuchAlgorithmException | InvalidKeyException | InvalidKeySpecException e) {
             throw new RequestCreationException("Digest exception", e);
         }
     }
@@ -105,7 +102,7 @@ public class GetAuthRequest extends Request {
                         + StringUtils.bytesToHex(expectedAnswer)
                 );
             }
-        } catch (NoSuchAlgorithmException | InvalidKeyException e) {
+        } catch (NoSuchAlgorithmException | InvalidKeyException | InvalidKeySpecException e) {
             throw new ResponseParseException("Challenge response digest exception");
         }
     }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetLinkParamsRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetLinkParamsRequest.java
index 9c7ff95ba..8c135eb86 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetLinkParamsRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetLinkParamsRequest.java
@@ -82,5 +82,7 @@ public class GetLinkParamsRequest extends Request {
         paramsProvider.setAuthVersion(((LinkParams.Response) receivedPacket).authVersion);
 
         this.bondState = ((LinkParams.Response) receivedPacket).bondState;
+
+        paramsProvider.setAuthAlgo(((LinkParams.Response) receivedPacket).authAlgo);
     }
 }

From 773132c4e153e297bea41a6dfbdb823efe486a92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Mon, 29 Jan 2024 23:30:26 +0000
Subject: [PATCH 525/595] 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<? extends DeviceSupport> 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<? extends DeviceSupport> 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 <https://www.gnu.org/licenses/>. */
-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 <https://www.gnu.org/licenses/>. */
-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 <https://www.gnu.org/licenses/>. */
-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<HuamiVibrationPatternNotificationType> vibrationPatternNotificationTypes) {
+    public ZeppOsSettingsCustomizer(final GBDevice device, final List<HuamiVibrationPatternNotificationType> vibrationPatternNotificationTypes) {
         super(device, vibrationPatternNotificationTypes);
     }
 
@@ -438,18 +440,18 @@ public class Huami2021SettingsCustomizer extends HuamiSettingsCustomizer {
         DeviceSettingsUtils.enforceMinMax((EditTextPreference) pref, minValue, maxValue);
     }
 
-    public static final Creator<Huami2021SettingsCustomizer> CREATOR = new Creator<Huami2021SettingsCustomizer>() {
+    public static final Creator<ZeppOsSettingsCustomizer> CREATOR = new Creator<ZeppOsSettingsCustomizer>() {
         @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<HuamiVibrationPatternNotificationType> 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<HuamiSupport> {
@@ -30,7 +31,7 @@ public abstract class AbstractHuamiOperation extends AbstractMiBandOperation<Hua
         // TODO: check which notifications we should disable and re-enable here
 //        builder.notify(getCharacteristic(MiBandService.UUID_CHARACTERISTIC_REALTIME_STEPS), enable)
 //                .notify(getCharacteristic(MiBandService.UUID_CHARACTERISTIC_SENSOR_DATA), enable);
-        if (getSupport() instanceof Huami2021Support) {
+        if (getSupport() instanceof ZeppOsSupport) {
             // Disable 2021 chunked reads, otherwise firmware upgrades and activity sync get interrupted
             builder.notify(getCharacteristic(HuamiService.UUID_CHARACTERISTIC_CHUNKEDTRANSFER_2021_READ), enable);
         }
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 a657e3f89..5729c9995 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
@@ -96,7 +96,7 @@ import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.ActivateDisplayOnLift;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.ActivateDisplayOnLiftSensitivity;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.DisconnectNotificationSetting;
-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;
@@ -1691,7 +1691,7 @@ public abstract class HuamiSupport extends AbstractBTLEDeviceSupport implements
             this.fetchOperationQueue.add(new FetchSpo2NormalOperation(this));
         }
 
-        if (Huami2021Coordinator.experimentalFeatures(getDevice())) {
+        if (ZeppOsCoordinator.experimentalFeatures(getDevice())) {
             if ((dataTypes & RecordedDataTypes.TYPE_HEART_RATE) != 0 && coordinator.supportsHeartRateStats()) {
                 this.fetchOperationQueue.add(new FetchHeartRateManualOperation(this));
                 this.fetchOperationQueue.add(new FetchHeartRateMaxOperation(this));
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitactive/AmazfitActiveFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitactive/AmazfitActiveFirmwareInfo.java
index ee353fc2e..9a5d24492 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitactive/AmazfitActiveFirmwareInfo.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitactive/AmazfitActiveFirmwareInfo.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 AmazfitActiveFirmwareInfo extends Huami2021FirmwareInfo {
+public class AmazfitActiveFirmwareInfo extends ZeppOsFirmwareInfo {
     private static final Map<Integer, String> crcToVersion = new HashMap<Integer, String>() {{
         // 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<Integer, String> crcToVersion = new HashMap<Integer, String>() {{
         // 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<Integer, String> crcToVersion = new HashMap<Integer, String>() {{
         // 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<Integer, String> crcToVersion = new HashMap<Integer, String>() {{
     }};
 
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<Integer, String> crcToVersion = new HashMap<Integer, String>() {{
         // 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<Integer, String> crcToVersion = new HashMap<Integer, String>() {{
         // 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<Integer, String> crcToVersion = new HashMap<Integer, String>() {{
         // 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<Integer, String> crcToVersion = new HashMap<Integer, String>() {{
         // 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<Integer, String> crcToVersion = new HashMap<Integer, String>() {{
         // 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<Integer, String> crcToVersion = new HashMap<Integer, String>() {{
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<Integer, String> crcToVersion = new HashMap<Integer, String>() {{
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<Integer, String> crcToVersion = new HashMap<Integer, String>() {{
         // 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<Integer, String> crcToVersion = new HashMap<Integer, String>() {{
         // 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<Integer, String> crcToVersion = new HashMap<Integer, String>() {{
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<Integer, String> crcToVersion = new HashMap<Integer, String>() {{
         // 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<Integer, String> crcToVersion = new HashMap<Integer, String>() {{
         // 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<Integer, String> crcToVersion = new HashMap<Integer, String>() {{
         // 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<Integer, String> crcToVersion = new HashMap<Integer, String>() {{
         // 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 <https://www.gnu.org/licenses/>. */
 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<Integer, String> crcToVersion = new HashMap<Integer, String>() {{
         // 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 <https://www.gnu.org/licenses/>. */
-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 <https://www.gnu.org/licenses/>. */
-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 <https://www.gnu.org/licenses/>. */
-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 <https://www.gnu.org/licenses/>. */
 
-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<? extends Huami2021FirmwareInfo> constructor = this.getClass().getConstructor(byte[].class);
+            final Constructor<? extends ZeppOsFirmwareInfo> 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 <https://www.gnu.org/licenses/>. */
-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<String, String> displayItemNameLookup = new HashMap<String, String>() {{
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 <https://www.gnu.org/licenses/>. */
-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 <https://www.gnu.org/licenses/>. */
-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<String, String> 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<Huami2021Support>
+public class ZeppOsAgpsUpdateOperation extends AbstractBTLEOperation<ZeppOsSupport>
         implements ZeppOsFileTransferService.Callback, ZeppOsAgpsService.Callback {
     private static final Logger LOG = LoggerFactory.getLogger(ZeppOsAgpsUpdateOperation.class);
 
@@ -54,7 +54,7 @@ public class ZeppOsAgpsUpdateOperation extends AbstractBTLEOperation<Huami2021Su
     private final ZeppOsFileTransferService fileTransferService;
     private final ZeppOsConfigService configService;
 
-    public ZeppOsAgpsUpdateOperation(final Huami2021Support support,
+    public ZeppOsAgpsUpdateOperation(final ZeppOsSupport support,
                                      final ZeppOsAgpsFile file,
                                      final ZeppOsAgpsService agpsService,
                                      final ZeppOsFileTransferService fileTransferService,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/operations/ZeppOsGpxRouteUploadOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/operations/ZeppOsGpxRouteUploadOperation.java
index 97a24f68e..36201ee42 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/operations/ZeppOsGpxRouteUploadOperation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/operations/ZeppOsGpxRouteUploadOperation.java
@@ -25,12 +25,12 @@ 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.ZeppOsFileTransferService;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.miband.operations.OperationStatus;
 import nodomain.freeyourgadget.gadgetbridge.util.GB;
 
-public class ZeppOsGpxRouteUploadOperation extends AbstractBTLEOperation<Huami2021Support>
+public class ZeppOsGpxRouteUploadOperation extends AbstractBTLEOperation<ZeppOsSupport>
         implements ZeppOsFileTransferService.Callback {
     private static final Logger LOG = LoggerFactory.getLogger(ZeppOsGpxRouteUploadOperation.class);
 
@@ -39,7 +39,7 @@ public class ZeppOsGpxRouteUploadOperation extends AbstractBTLEOperation<Huami20
 
     private final ZeppOsFileTransferService fileTransferService;
 
-    public ZeppOsGpxRouteUploadOperation(final Huami2021Support support,
+    public ZeppOsGpxRouteUploadOperation(final ZeppOsSupport support,
                                          final ZeppOsGpxRouteFile file,
                                          final ZeppOsFileTransferService fileTransferService) {
         super(support);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAgpsService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAgpsService.java
index 86aa27b5c..75e242277 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAgpsService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAgpsService.java
@@ -25,7 +25,7 @@ import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
 import nodomain.freeyourgadget.gadgetbridge.service.btle.BLETypeConversions;
-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 ZeppOsAgpsService extends AbstractZeppOsService {
@@ -41,7 +41,7 @@ public class ZeppOsAgpsService extends AbstractZeppOsService {
 
     private Callback mCallback = null;
 
-    public ZeppOsAgpsService(final Huami2021Support support) {
+    public ZeppOsAgpsService(final ZeppOsSupport support) {
         super(support, false);
     }
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAlarmsService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAlarmsService.java
index fca35ec6b..a667fab7d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAlarmsService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAlarmsService.java
@@ -33,10 +33,9 @@ import nodomain.freeyourgadget.gadgetbridge.devices.DeviceCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.model.Alarm;
 import nodomain.freeyourgadget.gadgetbridge.model.DeviceService;
 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.AlarmUtils;
-import nodomain.freeyourgadget.gadgetbridge.util.DeviceHelper;
 
 public class ZeppOsAlarmsService extends AbstractZeppOsService {
     private static final Logger LOG = LoggerFactory.getLogger(ZeppOsAlarmsService.class);
@@ -65,7 +64,7 @@ public class ZeppOsAlarmsService extends AbstractZeppOsService {
     public static final int FLAG_UNKNOWN_2 = 0x02;
     public static final int FLAG_ENABLED = 0x04;
 
-    public ZeppOsAlarmsService(final Huami2021Support support) {
+    public ZeppOsAlarmsService(final ZeppOsSupport support) {
         super(support, false);
     }
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAlexaService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAlexaService.java
index 9d674a87d..4c30a9a73 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAlexaService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAlexaService.java
@@ -17,7 +17,6 @@
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services;
 
 import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_VOICE_SERVICE_LANGUAGE;
-import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_WATCHFACE;
 
 import android.os.Handler;
 import android.text.TextUtils;
@@ -37,11 +36,11 @@ import java.util.List;
 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.devices.huami.zeppos.ZeppOsCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.model.WeatherSpec;
 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.GB;
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
@@ -82,7 +81,7 @@ public class ZeppOsAlexaService extends AbstractZeppOsService {
 
     final ByteArrayOutputStream voiceBuffer = new ByteArrayOutputStream();
 
-    public ZeppOsAlexaService(final Huami2021Support support) {
+    public ZeppOsAlexaService(final ZeppOsSupport support) {
         super(support, true);
     }
 
@@ -148,7 +147,7 @@ public class ZeppOsAlexaService extends AbstractZeppOsService {
 
     @Override
     public void initialize(final TransactionBuilder builder) {
-        if (Huami2021Coordinator.experimentalFeatures(getSupport().getDevice())) {
+        if (ZeppOsCoordinator.experimentalFeatures(getSupport().getDevice())) {
             requestCapabilities(builder);
             requestLanguages(builder);
         }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAppsService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAppsService.java
index c81c68431..96ee65a7f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAppsService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAppsService.java
@@ -27,11 +27,9 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
-import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventAppInfo;
 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;
 
 public class ZeppOsAppsService extends AbstractZeppOsService {
@@ -54,7 +52,7 @@ public class ZeppOsAppsService extends AbstractZeppOsService {
 
     private final List<GBDeviceApp> 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<ConfigGroup, Byte> 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<String, String> 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<GBDeviceApp> 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 <http://www.gnu.org/licenses/>. */
-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);

From 4b38a67a58d6738569082d61efbc5075172b8467 Mon Sep 17 00:00:00 2001
From: "Martin.JM" <martin.jm@noreply.codeberg.org>
Date: Fri, 19 Jan 2024 21:37:25 +0100
Subject: [PATCH 526/595] Fix Huawei exceptions related to early packets

Also adds more robust tag checks for Huawei packets
---
 .../devices/huawei/HuaweiPacket.java          |  5 +
 .../devices/huawei/HuaweiTLV.java             | 50 +++-------
 .../devices/huawei/packets/Alarms.java        | 33 +------
 .../devices/huawei/packets/Calls.java         | 14 +--
 .../devices/huawei/packets/DeviceConfig.java  | 98 ++++---------------
 .../devices/huawei/packets/FindPhone.java     |  5 +-
 .../devices/huawei/packets/FitnessData.java   | 13 +--
 .../devices/huawei/packets/MusicControl.java  |  6 +-
 .../devices/huawei/packets/Notifications.java |  8 +-
 .../devices/huawei/packets/Workout.java       | 60 +-----------
 .../devices/huawei/AsynchronousResponse.java  |  4 +
 11 files changed, 64 insertions(+), 232 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiPacket.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiPacket.java
index a16c913d1..e7f7efaf6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiPacket.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiPacket.java
@@ -44,6 +44,7 @@ public class HuaweiPacket {
     private static final Logger LOG = LoggerFactory.getLogger(HuaweiPacket.class);
 
     public static class ParamsProvider {
+
         protected byte authVersion;
         protected byte authMode;
         protected byte[] secretKey;
@@ -226,6 +227,8 @@ public class HuaweiPacket {
     }
 
     public boolean attemptDecrypt() throws ParseException {
+        if (paramsProvider.getSecretKey() == null)
+            return false;
         if (this.tlv == null)
             return false;
         if (this.tlv.contains(0x7C) && this.tlv.getBoolean(0x7C)) {
@@ -495,6 +498,8 @@ public class HuaweiPacket {
     }
 
     public HuaweiPacket parseOutgoing(byte[] data) throws ParseException {
+        this.isEncrypted = false; // Will be changed if decrypt has been performed
+
         parseData(data);
         if (!this.complete)
             return this;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiTLV.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiTLV.java
index 5cb2222df..51568de32 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiTLV.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiTLV.java
@@ -207,57 +207,35 @@ public class HuaweiTLV {
         return this.valueMap;
     }
 
-    public byte[] getBytes(int tag) {
+    public byte[] getBytes(int tag) throws HuaweiPacket.MissingTagException {
         for (TLV item : valueMap)
             if (item.getTag() == (byte) tag)
                 return item.getValue();
-        return null;
+        throw new HuaweiPacket.MissingTagException(tag);
     }
 
-    public Byte getByte(int tag) {
-        byte[] bytes = getBytes(tag);
-        if (bytes == null) {
-            return null;
-        }
-        return bytes[0];
+    public Byte getByte(int tag) throws HuaweiPacket.MissingTagException {
+        return getBytes(tag)[0];
     }
 
-    public Boolean getBoolean(int tag) {
-        byte[] bytes = getBytes(tag);
-        if (bytes == null) {
-            return null;
-        }
-        return bytes[0] == 1;
+    public Boolean getBoolean(int tag) throws HuaweiPacket.MissingTagException {
+        return getBytes(tag)[0] == 1;
     }
 
-    public Integer getInteger(int tag) {
-        byte[] bytes = getBytes(tag);
-        if (bytes == null) {
-            return null;
-        }
-        return ByteBuffer.wrap(bytes).getInt();
+    public Integer getInteger(int tag) throws HuaweiPacket.MissingTagException {
+        return ByteBuffer.wrap(getBytes(tag)).getInt();
     }
 
-    public Short getShort(int tag) {
-        byte[] bytes = getBytes(tag);
-        if (bytes == null)
-            return null;
-        return ByteBuffer.wrap(bytes).getShort();
+    public Short getShort(int tag) throws HuaweiPacket.MissingTagException {
+        return ByteBuffer.wrap(getBytes(tag)).getShort();
     }
 
-    public String getString(int tag) {
-        byte[] bytes = getBytes(tag);
-        if (bytes == null) {
-            return null;
-        }
-        return new String(bytes, StandardCharsets.UTF_8);
+    public String getString(int tag) throws HuaweiPacket.MissingTagException {
+        return new String(getBytes(tag), StandardCharsets.UTF_8);
     }
 
-    public HuaweiTLV getObject(int tag) {
+    public HuaweiTLV getObject(int tag) throws HuaweiPacket.MissingTagException {
         byte[] bytes = getBytes(tag);
-        if (bytes == null) {
-            return null;
-        }
         return new HuaweiTLV().parse(bytes, 0, bytes.length);
     }
 
@@ -320,7 +298,7 @@ public class HuaweiTLV {
                 .put(CryptoTags.cipherText, encryptedTLV);
     }
 
-    public void decrypt(ParamsProvider paramsProvider) throws CryptoException {
+    public void decrypt(ParamsProvider paramsProvider) throws CryptoException, HuaweiPacket.MissingTagException {
         byte[] key = paramsProvider.getSecretKey();
         byte[] decryptedTLV = HuaweiCrypto.decrypt(paramsProvider.getAuthMode(), getBytes(CryptoTags.cipherText), key, getBytes(CryptoTags.initVector));
         this.valueMap = new ArrayList<>();
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Alarms.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Alarms.java
index b77fabe37..4f242b778 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Alarms.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Alarms.java
@@ -20,6 +20,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket.ParseException;
 import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiTLV;
 
 // TODO: complete responses
@@ -34,18 +35,7 @@ public class Alarms {
         public byte repeat;
         public String name;
 
-        public EventAlarm(HuaweiTLV tlv) throws HuaweiPacket.MissingTagException {
-            if (!tlv.contains(0x03))
-                throw new HuaweiPacket.MissingTagException(0x03);
-            if (!tlv.contains(0x04))
-                throw new HuaweiPacket.MissingTagException(0x04);
-            if (!tlv.contains(0x05))
-                throw new HuaweiPacket.MissingTagException(0x05);
-            if (!tlv.contains(0x06))
-                throw new HuaweiPacket.MissingTagException(0x06);
-            if (!tlv.contains(0x07))
-                throw new HuaweiPacket.MissingTagException(0x07);
-
+        public EventAlarm(HuaweiTLV tlv) throws ParseException {
             this.index = tlv.getByte(0x03);
             this.status = tlv.getBoolean(0x04);
             this.startHour = (byte) ((tlv.getShort(0x05) >> 8) & 0xFF);
@@ -93,18 +83,7 @@ public class Alarms {
         public byte repeat;
         public byte aheadTime;
 
-        public SmartAlarm(HuaweiTLV tlv) throws HuaweiPacket.MissingTagException {
-            if (!tlv.contains(0x03))
-                throw new HuaweiPacket.MissingTagException(0x03);
-            if (!tlv.contains(0x04))
-                throw new HuaweiPacket.MissingTagException(0x04);
-            if (!tlv.contains(0x05))
-                throw new HuaweiPacket.MissingTagException(0x05);
-            if (!tlv.contains(0x06))
-                throw new HuaweiPacket.MissingTagException(0x06);
-            if (!tlv.contains(0x07))
-                throw new HuaweiPacket.MissingTagException(0x07);
-
+        public SmartAlarm(HuaweiTLV tlv) throws ParseException {
             this.index = tlv.getByte(0x03);
             this.status = tlv.getBoolean(0x04);
             this.startHour = (byte) ((tlv.getShort(0x05) >> 8) & 0xFF);
@@ -224,9 +203,6 @@ public class Alarms {
 
             @Override
             public void parseTlv() throws ParseException {
-                if (!this.tlv.contains(0x81))
-                    throw new MissingTagException(0x81);
-
                 eventAlarms = new ArrayList<>();
 
                 HuaweiTLV tlv = this.tlv.getObject(0x81);
@@ -262,9 +238,6 @@ public class Alarms {
 
             @Override
             public void parseTlv() throws ParseException {
-                if (!this.tlv.contains(0x81))
-                    throw new MissingTagException(0x81);
-
                 HuaweiTLV tlv = this.tlv.getObject(0x81);
                 if (tlv.contains(0x82)) {
                     this.smartAlarm = new SmartAlarm(tlv.getObject(0x82));
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Calls.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Calls.java
index c0e5f9c90..bfaf160c0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Calls.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Calls.java
@@ -49,16 +49,12 @@ public class Calls {
 
         @Override
         public void parseTlv() throws MissingTagException {
-            if (this.tlv.contains(0x01)) {
-                if (this.tlv.getByte(0x01) == 0x01) {
-                    this.action = Action.CALL_REJECT;
-                } else if (this.tlv.getByte(0x01) == 0x02) {
-                    this.action = Action.CALL_ACCEPT;
-                }
-                // TODO: find more values, if there are any
-            } else {
-                throw new MissingTagException(0x01);
+            if (this.tlv.getByte(0x01) == 0x01) {
+                this.action = Action.CALL_REJECT;
+            } else if (this.tlv.getByte(0x01) == 0x02) {
+                this.action = Action.CALL_ACCEPT;
             }
+            // TODO: find more values, if there are any
         }
     }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DeviceConfig.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DeviceConfig.java
index cba02d042..91281404a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DeviceConfig.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DeviceConfig.java
@@ -100,11 +100,8 @@ public class DeviceConfig {
                 if (this.tlv.contains(0x04))
                     this.interval = this.tlv.getShort(0x04);
 
-                if (this.tlv.contains(0x05)) {
-                    System.arraycopy(this.tlv.getBytes(0x05), 2, this.serverNonce, 0, 16);
-                    this.authVersion = (byte)this.tlv.getBytes(0x05)[1];
-                } else
-                    throw new MissingTagException(0x05);
+                System.arraycopy(this.tlv.getBytes(0x05), 2, this.serverNonce, 0, 16);
+                this.authVersion = (byte)this.tlv.getBytes(0x05)[1];
 
                 if (this.tlv.contains(0x07))
                     this.authMode = this.tlv.getByte(0x07);
@@ -152,11 +149,7 @@ public class DeviceConfig {
 
             @Override
             public void parseTlv() throws ParseException {
-                if (this.tlv.contains(0x02)) {
-                    this.supportedServices = this.tlv.getBytes(0x02);
-                } else {
-                    throw new MissingTagException(0x02);
-                }
+                this.supportedServices = this.tlv.getBytes(0x02);
             }
         }
 
@@ -175,10 +168,7 @@ public class DeviceConfig {
 
             @Override
             public void parseTlv() throws ParseException {
-                if (this.tlv.contains(0x01))
-                    this.allSupportedServices = this.tlv.getBytes(0x01);
-                else
-                    throw new MissingTagException(0x01);
+                this.allSupportedServices = this.tlv.getBytes(0x01);
             }
         }
     }
@@ -320,13 +310,6 @@ public class DeviceConfig {
                 CommandsList commandsList = null;
                 HuaweiTLV containerTLV = this.tlv.getObject(0x81);
 
-                if (!containerTLV.contains(0x02)) {
-                    throw new MissingTagException(0x02);
-                }
-                if (!containerTLV.contains(0x04)) {
-                    throw new MissingTagException(0x04);
-                }
-
                 for (HuaweiTLV.TLV tlv : containerTLV.get()) {
                     if ((int) tlv.getTag() == 0x02) {
                         commandsList = new CommandsList();
@@ -465,10 +448,6 @@ public class DeviceConfig {
 
             @Override
             public void parseTlv() throws ParseException {
-                if (!this.tlv.contains(0x07))
-                    throw new MissingTagException(0x07);
-                if (!this.tlv.contains(0x0A))
-                    throw new MissingTagException(0x0A);
                 if (this.tlv.contains(0x03))
                     this.hardwareVersion = this.tlv.getString(0x03);
                 this.softwareVersion = this.tlv.getString(0x07);
@@ -521,20 +500,9 @@ public class DeviceConfig {
 
             @Override
             public void parseTlv() throws ParseException {
-                if (this.tlv.contains(0x05))
-                    this.clientSerial = this.tlv.getBytes(0x05);
-                else
-                    throw new MissingTagException(0x05);
-
-                if (this.tlv.contains(0x06))
-                    this.bondingKey = this.tlv.getBytes(0x06);
-                else
-                    throw new MissingTagException(0x06);
-
-                if (this.tlv.contains(0x07))
-                    this.iv = this.tlv.getBytes(0x07);
-                else
-                    throw new MissingTagException(0x07);
+                this.clientSerial = this.tlv.getBytes(0x05);
+                this.bondingKey = this.tlv.getBytes(0x06);
+                this.iv = this.tlv.getBytes(0x07);
             }
         }
     }
@@ -579,7 +547,7 @@ public class DeviceConfig {
             }
 
             @Override
-            public void parseTlv() {
+            public void parseTlv() throws ParseException {
                 this.status = this.tlv.getByte(0x01);
                 this.encryptionCounter = this.tlv.getInteger(0x09) & 0xFFFFFFFFL;
             }
@@ -655,7 +623,7 @@ public class DeviceConfig {
             }
 
             @Override
-            public void parseTlv() {
+            public void parseTlv() throws ParseException {
                 this.challengeResponse = this.tlv.getBytes(0x01);
             }
         }
@@ -690,10 +658,7 @@ public class DeviceConfig {
 
             @Override
             public void parseTlv() throws ParseException {
-                if (this.tlv.contains(0x01))
-                    this.level = this.tlv.getByte(0x01);
-                else
-                    throw new MissingTagException(0x01);
+                this.level = this.tlv.getByte(0x01);
             }
         }
         // TODO: implement parsing this request for the log parser support
@@ -876,7 +841,7 @@ public class DeviceConfig {
             }
 
             @Override
-            public void parseTlv() {
+            public void parseTlv() throws ParseException {
                 // AW70 doesn't seem to have this
                 if (this.tlv.contains(0x01))
                     this.status = this.tlv.getByte(0x01);
@@ -944,7 +909,7 @@ public class DeviceConfig {
             }
 
             @Override
-            public void parseTlv() {
+            public void parseTlv() throws ParseException {
                 this.dndLiftWristType = (int) this.tlv.getShort(0x01);
             }
         }
@@ -1192,7 +1157,7 @@ public class DeviceConfig {
             public static class Step4Data {
                 public String data;
 
-                public Step4Data(HuaweiTLV tlv) {
+                public Step4Data(HuaweiTLV tlv) throws ParseException {
                     if (tlv.contains(0x01))
                         this.data = tlv.getString(0x01);
                 }
@@ -1231,11 +1196,6 @@ public class DeviceConfig {
 
             @Override
             public void parseTlv() throws ParseException {
-                if (!this.tlv.contains(0x01))
-                    throw new MissingTagException(0x01);
-                if (!this.tlv.contains(0x04))
-                    throw new MissingTagException(0x04);
-
                 this.type = this.tlv.getByte(0x04);
 
                 if (this.type == 0x00) {
@@ -1377,11 +1337,6 @@ public class DeviceConfig {
 
             @Override
             public void parseTlv() throws ParseException {
-                if (!this.tlv.contains(0x01))
-                    throw new MissingTagException(0x01);
-                if (!this.tlv.contains(0x02))
-                    throw new MissingTagException(0x02);
-
                 try {
                     value = new JSONObject(this.tlv.getString(0x01));
                     payload = value.getJSONObject("payload");
@@ -1440,16 +1395,9 @@ public class DeviceConfig {
 
             @Override
             public void parseTlv() throws ParseException {
-                byte[] message;
-                byte[] iv;
-                if (this.tlv.contains(0x01))
-                    message = this.tlv.getBytes(0x01);
-                else
-                    throw new MissingTagException(0x01);
-                if (this.tlv.contains(0x02))
-                    iv = this.tlv.getBytes(0x02);
-                else
-                    throw new MissingTagException(0x02);
+                byte[] message = this.tlv.getBytes(0x01);
+                byte[] iv = this.tlv.getBytes(0x02);
+
                 HuaweiCrypto huaweiCrypto = new HuaweiCrypto(paramsProvider.getAuthVersion());
                 try {
                     pinCode = huaweiCrypto.decryptPinCode(message, iv);
@@ -1498,7 +1446,6 @@ public class DeviceConfig {
                 // Tag 4 to 6 are HMS related
             }
         }
-
     }
 
     public static class TimeZoneIdRequest extends HuaweiPacket {
@@ -1628,10 +1575,7 @@ public class DeviceConfig {
 
             @Override
             public void parseTlv() throws ParseException {
-                if (this.tlv.contains(0x01)) {
-                   this.expandCapabilities = this.tlv.getBytes(0x01);
-                } else
-                    throw new MissingTagException(0x01);
+               this.expandCapabilities = this.tlv.getBytes(0x01);
             }
         }
 
@@ -1666,7 +1610,6 @@ public class DeviceConfig {
             public void parseTlv() throws ParseException {
             }
         }
-
     }
 
     public static class SetUpDeviceStatusRequest extends HuaweiPacket {
@@ -1703,11 +1646,4 @@ public class DeviceConfig {
         public static final int hours12 = 0x01;
         public static final int hours24 = 0x02;
     }
-
-    public static class HiChainStep {
-        public static final int one = 0x01;
-        public static final int two = 0x02;
-        public static final int three = 0x03;
-        public static final int four = 0x04;
-    }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/FindPhone.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/FindPhone.java
index 1f20b943a..826be51ba 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/FindPhone.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/FindPhone.java
@@ -37,10 +37,9 @@ public class FindPhone {
         }
 
         @Override
-        public void parseTlv() {
-            if (this.tlv.contains(0x01)) {
+        public void parseTlv() throws ParseException {
+            if (this.tlv.contains(0x01))
                 this.start = this.tlv.getBoolean(0x01);
-            }
             // No missing tag exception so it will stop by default
         }
     }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/FitnessData.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/FitnessData.java
index bee7ea8b4..c98782ff2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/FitnessData.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/FitnessData.java
@@ -104,7 +104,7 @@ public class FitnessData {
             }
 
             @Override
-            public void parseTlv() {
+            public void parseTlv() throws ParseException {
                 this.count = this.tlv.getObject(0x81).getShort(0x02);
                 this.complete = true;
             }
@@ -156,7 +156,7 @@ public class FitnessData {
             }
 
             @Override
-            public void parseTlv() {
+            public void parseTlv() throws ParseException {
                 HuaweiTLV container = this.tlv.getObject(0x81);
                 List<HuaweiTLV> subContainers = container.getObjects(0x83);
 
@@ -256,11 +256,6 @@ public class FitnessData {
                 HuaweiTLV container = this.tlv.getObject(0x81);
                 List<HuaweiTLV> subContainers = container.getObjects(0x84);
 
-                if (!container.contains(0x02))
-                    throw new MissingTagException(0x02);
-                if (!container.contains(0x03))
-                    throw new MissingTagException(0x03);
-
                 this.number = container.getShort(0x02);
                 this.timestamp = container.getInteger(0x03);
                 this.containers = new ArrayList<>();
@@ -394,7 +389,7 @@ public class FitnessData {
             }
 
             @Override
-            public void parseTlv() {
+            public void parseTlv() throws ParseException {
                 HuaweiTLV container = this.tlv.getObject(0x81);
                 List<HuaweiTLV> containers = container.getObjects(0x83);
 
@@ -555,6 +550,8 @@ public class FitnessData {
     }
 
     public static class Type {
+        // TODO: enum?
+
         public static final byte  goal = 0x01;
         public static final byte  motion = 0x00;
         public static final byte  data = 0x01;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/MusicControl.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/MusicControl.java
index 06d4e753b..b6184805d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/MusicControl.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/MusicControl.java
@@ -51,7 +51,7 @@ public class MusicControl {
         }
 
         @Override
-        public void parseTlv() {
+        public void parseTlv() throws ParseException {
             if (this.tlv.contains(0x7F) && this.tlv.getBytes(0x7F).length == 4)
                 this.status = this.tlv.getInteger(0x7F);
         }
@@ -96,7 +96,7 @@ public class MusicControl {
             }
 
             @Override
-            public void parseTlv() {
+            public void parseTlv() throws ParseException {
                 if (this.tlv.contains(0x7F)) {
                     if (this.tlv.getInteger(0x7F) == successValue) {
                         this.ok = true;
@@ -144,7 +144,7 @@ public class MusicControl {
             }
 
             @Override
-            public void parseTlv() {
+            public void parseTlv() throws ParseException {
                 if (this.tlv.contains(0x01)) {
                     this.buttonPresent = true;
                     this.rawButton = this.tlv.getByte(0x01);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Notifications.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Notifications.java
index 9974a3b7d..4c30eaa60 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Notifications.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Notifications.java
@@ -132,10 +132,12 @@ public class Notifications {
 
             private void putByteBuffer(ByteBuffer bBuffer, byte position, byte[] value) {
                 ByteBuffer bValue = ByteBuffer.wrap(value);
-                if (bValue.capacity() == 2)
+                if (bValue.capacity() == 2) {
                     bBuffer.putShort(position, bValue.getShort());
-                bBuffer.put(position, (byte)0x00);
-                bBuffer.put(bValue.get());
+                } else {
+                    bBuffer.put(position, (byte) 0x00);
+                    bBuffer.put(position + 1, bValue.get());
+                }
             }
 
             @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Workout.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Workout.java
index 107657b39..50af32bee 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Workout.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/Workout.java
@@ -69,32 +69,16 @@ public class Workout {
 
             @Override
             public void parseTlv() throws ParseException {
-                if (!this.tlv.contains(0x81))
-                    throw new MissingTagException(0x81);
-
                 HuaweiTLV container = this.tlv.getObject(0x81);
 
-                if (!container.contains(0x02))
-                    throw new MissingTagException(0x02);
-
                 this.count = container.getShort(0x02);
                 this.workoutNumbers = new ArrayList<>();
 
                 if (this.count == 0)
                     return;
 
-                if (!container.contains(0x85))
-                    throw new MissingTagException(0x85);
-
                 List<HuaweiTLV> subContainers = container.getObjects(0x85);
                 for (HuaweiTLV subContainerTlv : subContainers) {
-                    if (!subContainerTlv.contains(0x06))
-                        throw new MissingTagException(0x06);
-                    if (!subContainerTlv.contains(0x07))
-                        throw new MissingTagException(0x07);
-                    if (!subContainerTlv.contains(0x08))
-                        throw new MissingTagException(0x08);
-
                     WorkoutNumbers workoutNumber = new WorkoutNumbers();
                     workoutNumber.rawData = subContainerTlv.serialize();
                     workoutNumber.workoutNumber = subContainerTlv.getShort(0x06);
@@ -150,18 +134,8 @@ public class Workout {
 
             @Override
             public void parseTlv() throws ParseException {
-                if (!this.tlv.contains(0x81))
-                    throw new MissingTagException(0x81);
-
                 HuaweiTLV container = this.tlv.getObject(0x81);
 
-                if (!container.contains(0x02))
-                    throw new MissingTagException(0x02);
-                if (!container.contains(0x04))
-                    throw new MissingTagException(0x04);
-                if (!container.contains(0x05))
-                    throw new MissingTagException(0x05);
-
                 this.rawData = container.serialize();
                 this.number = container.getShort(0x02);
                 if (container.contains(0x03))
@@ -319,24 +293,12 @@ public class Workout {
 
             @Override
             public void parseTlv() throws ParseException {
-                if (!this.tlv.contains(0x81))
-                    throw new MissingTagException(0x81);
-
                 HuaweiTLV container = this.tlv.getObject(0x81);
 
-                if (!container.contains(0x02))
-                    throw new MissingTagException(0x02);
-                if (!container.contains(0x03))
-                    throw new MissingTagException(0x03);
-                if (!container.contains(0x04))
-                    throw new MissingTagException(0x04);
-                if (!container.contains(0x05))
-                    throw new MissingTagException(0x05); // TODO: not sure if 5 can also be omitted
-
                 this.workoutNumber = container.getShort(0x02);
                 this.dataNumber = container.getShort(0x03);
                 this.rawHeader = container.getBytes(0x04);
-                this.rawData = container.getBytes(0x05);
+                this.rawData = container.getBytes(0x05); // TODO: not sure if 5 can also be omitted
 
                 if (container.contains(0x09))
                     innerBitmap = container.getShort(0x09);
@@ -515,31 +477,13 @@ public class Workout {
 
             @Override
             public void parseTlv() throws ParseException {
-                if (!this.tlv.contains(0x81))
-                    throw new MissingTagException(0x81);
-
                 HuaweiTLV container = this.tlv.getObject(0x81);
 
-                if (!container.contains(0x02))
-                    throw new MissingTagException(0x02);
-                if (!container.contains(0x08))
-                    throw new MissingTagException(0x08);
-                // TODO: not sure what happens with an empty workout here...
-                if (!container.contains(0x83))
-                    throw new MissingTagException(0x83);
-
                 this.workoutNumber = container.getShort(0x02);
                 this.paceNumber = container.getShort(0x08);
 
                 this.blocks = new ArrayList<>();
                 for (HuaweiTLV blockTlv : container.getObjects(0x83)) {
-                    if (!blockTlv.contains(0x04))
-                        throw new MissingTagException(0x04);
-                    if (!blockTlv.contains(0x05))
-                        throw new MissingTagException(0x05);
-                    if (!blockTlv.contains(0x06))
-                        throw new MissingTagException(0x06);
-
                     Block block = new Block();
                     block.distance = blockTlv.getShort(0x04);
                     block.type = blockTlv.getByte(0x05);
@@ -569,6 +513,4 @@ public class Workout {
         }
 
     }
-
-
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/AsynchronousResponse.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/AsynchronousResponse.java
index 93723f3a6..64d15b647 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/AsynchronousResponse.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/AsynchronousResponse.java
@@ -78,6 +78,10 @@ public class AsynchronousResponse {
     }
 
     public void handleResponse(HuaweiPacket response) {
+        // Ignore messages if the key isn't set yet
+        if (support.getParamsProvider().getSecretKey() == null)
+            return;
+
         try {
             response.parseTlv();
         } catch (HuaweiPacket.ParseException e) {

From 34fd18885ae60221dc1c561e2ef95f71546f4b06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Thu, 1 Feb 2024 13:36:48 +0000
Subject: [PATCH 527/595] Zepp OS: Refactor firmware uploads

Zepp OS 3 firmware upgrades are big (200MB+). Gadgetbridge was crashing,
since the entire firmware file would be pulled into memory.

This commit unifies all the logic for Zepp OS firmware handling.

However, since the needed refactor was big, this commit duplicates some
of the code from Huami classes, namely:
- ZeppOsFirmwareUpdateOperation clones UpdateFirmwareOperation2020
- ZeppOsFwInstallHandler clones AbstractMiBandFWInstallHandler

This avoids changes to older device logic and introducing regressions.

Lost functionality:
- Repackaging firmwares as UIHH (does not seem to be needed, and was not
  used anyway). Code can be recovered from this commit if needed in the
  future
- Whitelisted firmwares by checksum (we do not have a lot of them at
  this point anyway)

Other misc changes:
- Rename ZipFile to GBZipFile not to clash with the java class

Tested by updating the Amazfit GTR 4 to Zepp OS 3.
---
 .../devices/huami/HuamiFWHelper.java          |  38 +-
 .../AmazfitActiveCoordinator.java             |  27 +-
 .../amazfitactive/AmazfitActiveFWHelper.java  |  44 --
 .../AmazfitActiveFWInstallHandler.java        |  50 --
 .../AmazfitActiveEdgeCoordinator.java         |  28 +-
 .../AmazfitActiveEdgeFWHelper.java            |  44 --
 .../AmazfitActiveEdgeFWInstallHandler.java    |  50 --
 .../AmazfitBalanceCoordinator.java            |  27 +-
 .../AmazfitBalanceFWHelper.java               |  44 --
 .../AmazfitBalanceFWInstallHandler.java       |  50 --
 .../amazfitband7/AmazfitBand7Coordinator.java |  37 +-
 .../amazfitband7/AmazfitBand7FWHelper.java    |  44 --
 .../AmazfitBand7FWInstallHandler.java         |  49 --
 .../amazfitbip5/AmazfitBip5Coordinator.java   |  35 +-
 .../amazfitbip5/AmazfitBip5FWHelper.java      |  44 --
 .../AmazfitBip5FWInstallHandler.java          |  50 --
 .../AmazfitCheetahProCoordinator.java         |  37 +-
 .../AmazfitCheetahProFWHelper.java            |  45 --
 .../AmazfitCheetahProFWInstallHandler.java    |  49 --
 .../AmazfitCheetahRoundCoordinator.java       |  33 +-
 .../AmazfitCheetahRoundFWHelper.java          |  44 --
 .../AmazfitCheetahRoundFWInstallHandler.java  |  50 --
 .../AmazfitCheetahSquareCoordinator.java      |  35 +-
 .../AmazfitCheetahSquareFWHelper.java         |  44 --
 .../AmazfitCheetahSquareFWInstallHandler.java |  50 --
 .../AmazfitFalconCoordinator.java             |  33 +-
 .../amazfitfalcon/AmazfitFalconFWHelper.java  |  44 --
 .../AmazfitFalconFWInstallHandler.java        |  50 --
 .../amazfitgtr3/AmazfitGTR3Coordinator.java   |  42 +-
 .../amazfitgtr3/AmazfitGTR3FWHelper.java      |  44 --
 .../AmazfitGTR3FWInstallHandler.java          |  49 --
 .../AmazfitGTR3ProCoordinator.java            |  37 +-
 .../AmazfitGTR3ProFWHelper.java               |  44 --
 .../AmazfitGTR3ProFWInstallHandler.java       |  49 --
 .../amazfitgtr4/AmazfitGTR4Coordinator.java   |  40 +-
 .../amazfitgtr4/AmazfitGTR4FWHelper.java      |  44 --
 .../AmazfitGTR4FWInstallHandler.java          |  49 --
 .../AmazfitGTRMiniCoordinator.java            |  33 +-
 .../AmazfitGTRMiniFWHelper.java               |  44 --
 .../AmazfitGTRMiniFWInstallHandler.java       |  50 --
 .../amazfitgts3/AmazfitGTS3Coordinator.java   |  39 +-
 .../amazfitgts3/AmazfitGTS3FWHelper.java      |  44 --
 .../AmazfitGTS3FWInstallHandler.java          |  49 --
 .../amazfitgts4/AmazfitGTS4Coordinator.java   |  50 +-
 .../amazfitgts4/AmazfitGTS4FWHelper.java      |  44 --
 .../AmazfitGTS4FWInstallHandler.java          |  49 --
 .../AmazfitGTS4MiniCoordinator.java           |  38 +-
 .../AmazfitGTS4MiniFWHelper.java              |  44 --
 .../AmazfitGTS4MiniFWInstallHandler.java      |  49 --
 .../amazfittrex2/AmazfitTRex2Coordinator.java |  37 +-
 .../amazfittrex2/AmazfitTRex2FWHelper.java    |  44 --
 .../AmazfitTRex2FWInstallHandler.java         |  49 --
 .../AmazfitTRexUltraCoordinator.java          |  33 +-
 .../AmazfitTRexUltraFWHelper.java             |  44 --
 .../AmazfitTRexUltraFWInstallHandler.java     |  50 --
 .../huami/miband7/MiBand7Coordinator.java     |  48 +-
 .../huami/miband7/MiBand7FWHelper.java        |  44 --
 .../miband7/MiBand7FWInstallHandler.java      |  49 --
 .../huami/zeppos/ZeppOsCoordinator.java       |  29 +-
 .../devices/huami/zeppos/ZeppOsFwHelper.java  | 453 +++++++++++++++++
 .../pinetime/PineTimeInstallHandler.java      |   6 +-
 .../devices/huami/AbstractHuamiOperation.java |   6 -
 .../devices/huami/HuamiFirmwareType.java      |  46 +-
 .../AmazfitActiveFirmwareInfo.java            |  58 ---
 .../amazfitactive/AmazfitActiveSupport.java   |  33 --
 .../AmazfitActiveEdgeFirmwareInfo.java        |  58 ---
 .../AmazfitActiveEdgeSupport.java             |  33 --
 .../AmazfitBalanceFirmwareInfo.java           |  58 ---
 .../amazfitbalance/AmazfitBalanceSupport.java |  33 --
 .../AmazfitBand7FirmwareInfo.java             |  57 ---
 .../amazfitband7/AmazfitBand7Support.java     |  33 --
 .../amazfitbip5/AmazfitBip5FirmwareInfo.java  |  58 ---
 .../huami/amazfitbip5/AmazfitBip5Support.java |  33 --
 .../AmazfitCheetahProFirmwareInfo.java        |  58 ---
 .../AmazfitCheetahProSupport.java             |  33 --
 .../AmazfitCheetahRoundFirmwareInfo.java      |  58 ---
 .../AmazfitCheetahRoundSupport.java           |  33 --
 .../AmazfitCheetahSquareFirmwareInfo.java     |  58 ---
 .../AmazfitCheetahSquareSupport.java          |  33 --
 .../AmazfitFalconFirmwareInfo.java            |  58 ---
 .../amazfitfalcon/AmazfitFalconSupport.java   |  33 --
 .../amazfitgtr3/AmazfitGTR3FirmwareInfo.java  |  63 ---
 .../huami/amazfitgtr3/AmazfitGTR3Support.java |  38 --
 .../AmazfitGTR3ProFirmwareInfo.java           |  63 ---
 .../amazfitgtr3pro/AmazfitGTR3ProSupport.java |  38 --
 .../amazfitgtr4/AmazfitGTR4FirmwareInfo.java  |  61 ---
 .../huami/amazfitgtr4/AmazfitGTR4Support.java |  33 --
 .../AmazfitGTRMiniFirmwareInfo.java           |  58 ---
 .../amazfitgtrmini/AmazfitGTRMiniSupport.java |  33 --
 .../amazfitgts3/AmazfitGTS3FirmwareInfo.java  |  63 ---
 .../huami/amazfitgts3/AmazfitGTS3Support.java |  38 --
 .../amazfitgts4/AmazfitGTS4FirmwareInfo.java  |  58 ---
 .../huami/amazfitgts4/AmazfitGTS4Support.java |  33 --
 .../AmazfitGTS4MiniFirmwareInfo.java          |  58 ---
 .../AmazfitGTS4MiniSupport.java               |  33 --
 .../AmazfitTRex2FirmwareInfo.java             |  58 ---
 .../amazfittrex2/AmazfitTRex2Support.java     |  33 --
 .../AmazfitTRexUltraFirmwareInfo.java         |  58 ---
 .../AmazfitTRexUltraSupport.java              |  33 --
 .../huami/miband7/MiBand7FirmwareInfo.java    |  62 ---
 .../devices/huami/miband7/MiBand7Support.java |  33 --
 .../operations/UpdateFirmwareOperation.java   |   4 +-
 .../UpdateFirmwareOperation2021.java          | 124 -----
 .../AbstractZeppOsFwInstallHandler.java       | 115 -----
 .../huami/zeppos/ZeppOsFirmwareInfo.java      | 471 ------------------
 .../huami/zeppos/ZeppOsFwInstallHandler.java  | 177 +++++++
 .../devices/huami/zeppos/ZeppOsSupport.java   |  32 +-
 .../zeppos/operations/ZeppOsAgpsFile.java     |   8 +-
 .../ZeppOsFirmwareUpdateOperation.java        | 376 ++++++++++++++
 .../util/{ZipFile.java => GBZipFile.java}     |  12 +-
 .../{ZipFileTest.java => GBZipFileTest.java}  |  18 +-
 111 files changed, 1359 insertions(+), 4787 deletions(-)
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitactive/AmazfitActiveFWHelper.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitactive/AmazfitActiveFWInstallHandler.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitactiveedge/AmazfitActiveEdgeFWHelper.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitactiveedge/AmazfitActiveEdgeFWInstallHandler.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbalance/AmazfitBalanceFWHelper.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbalance/AmazfitBalanceFWInstallHandler.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband7/AmazfitBand7FWHelper.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband7/AmazfitBand7FWInstallHandler.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip5/AmazfitBip5FWHelper.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip5/AmazfitBip5FWInstallHandler.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahpro/AmazfitCheetahProFWHelper.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahpro/AmazfitCheetahProFWInstallHandler.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahround/AmazfitCheetahRoundFWHelper.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahround/AmazfitCheetahRoundFWInstallHandler.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahsquare/AmazfitCheetahSquareFWHelper.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahsquare/AmazfitCheetahSquareFWInstallHandler.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitfalcon/AmazfitFalconFWHelper.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitfalcon/AmazfitFalconFWInstallHandler.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3/AmazfitGTR3FWHelper.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3/AmazfitGTR3FWInstallHandler.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3pro/AmazfitGTR3ProFWHelper.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3pro/AmazfitGTR3ProFWInstallHandler.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr4/AmazfitGTR4FWHelper.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr4/AmazfitGTR4FWInstallHandler.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtrmini/AmazfitGTRMiniFWHelper.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtrmini/AmazfitGTRMiniFWInstallHandler.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts3/AmazfitGTS3FWHelper.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts3/AmazfitGTS3FWInstallHandler.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4/AmazfitGTS4FWHelper.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4/AmazfitGTS4FWInstallHandler.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4mini/AmazfitGTS4MiniFWHelper.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4mini/AmazfitGTS4MiniFWInstallHandler.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrex2/AmazfitTRex2FWHelper.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrex2/AmazfitTRex2FWInstallHandler.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrexultra/AmazfitTRexUltraFWHelper.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrexultra/AmazfitTRexUltraFWInstallHandler.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband7/MiBand7FWHelper.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband7/MiBand7FWInstallHandler.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/ZeppOsFwHelper.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitactive/AmazfitActiveFirmwareInfo.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitactive/AmazfitActiveSupport.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitactiveedge/AmazfitActiveEdgeFirmwareInfo.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitactiveedge/AmazfitActiveEdgeSupport.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbalance/AmazfitBalanceFirmwareInfo.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbalance/AmazfitBalanceSupport.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitband7/AmazfitBand7FirmwareInfo.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitband7/AmazfitBand7Support.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip5/AmazfitBip5FirmwareInfo.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip5/AmazfitBip5Support.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcheetahpro/AmazfitCheetahProFirmwareInfo.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcheetahpro/AmazfitCheetahProSupport.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcheetahround/AmazfitCheetahRoundFirmwareInfo.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcheetahround/AmazfitCheetahRoundSupport.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcheetahsquare/AmazfitCheetahSquareFirmwareInfo.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcheetahsquare/AmazfitCheetahSquareSupport.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitfalcon/AmazfitFalconFirmwareInfo.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitfalcon/AmazfitFalconSupport.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr3/AmazfitGTR3FirmwareInfo.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr3/AmazfitGTR3Support.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr3pro/AmazfitGTR3ProFirmwareInfo.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr3pro/AmazfitGTR3ProSupport.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr4/AmazfitGTR4FirmwareInfo.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr4/AmazfitGTR4Support.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtrmini/AmazfitGTRMiniFirmwareInfo.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtrmini/AmazfitGTRMiniSupport.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts3/AmazfitGTS3FirmwareInfo.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts3/AmazfitGTS3Support.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts4/AmazfitGTS4FirmwareInfo.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts4/AmazfitGTS4Support.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts4mini/AmazfitGTS4MiniFirmwareInfo.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts4mini/AmazfitGTS4MiniSupport.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfittrex2/AmazfitTRex2FirmwareInfo.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfittrex2/AmazfitTRex2Support.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfittrexultra/AmazfitTRexUltraFirmwareInfo.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfittrexultra/AmazfitTRexUltraSupport.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband7/MiBand7FirmwareInfo.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband7/MiBand7Support.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/UpdateFirmwareOperation2021.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/AbstractZeppOsFwInstallHandler.java
 delete mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsFirmwareInfo.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsFwInstallHandler.java
 create mode 100644 app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/operations/ZeppOsFirmwareUpdateOperation.java
 rename app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/{ZipFile.java => GBZipFile.java} (93%)
 rename app/src/test/java/nodomain/freeyourgadget/gadgetbridge/test/{ZipFileTest.java => GBZipFileTest.java} (93%)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiFWHelper.java
index b016d35dc..56db6d512 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiFWHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/HuamiFWHelper.java
@@ -25,7 +25,6 @@ import java.io.IOException;
 
 import androidx.annotation.NonNull;
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
-import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.miband.AbstractMiBandFWHelper;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.AbstractHuamiFirmwareInfo;
@@ -46,42 +45,7 @@ public abstract class HuamiFWHelper extends AbstractMiBandFWHelper {
     @NonNull
     @Override
     public String getFirmwareKind() {
-        int resId = R.string.kind_invalid;
-        switch (getFirmwareInfo().getFirmwareType()) {
-            case FONT:
-            case FONT_LATIN:
-                resId = R.string.kind_font;
-                break;
-            case GPS:
-                resId = R.string.kind_gps;
-                break;
-            case GPS_ALMANAC:
-                resId = R.string.kind_gps_almanac;
-                break;
-            case GPS_CEP:
-                resId = R.string.kind_gps_cep;
-                break;
-            case AGPS_UIHH:
-                resId = R.string.kind_agps_bundle;
-                break;
-            case RES:
-            case RES_COMPRESSED:
-                resId = R.string.kind_resources;
-                break;
-            case FIRMWARE:
-            case FIRMWARE_UIHH_2021_ZIP_WITH_CHANGELOG:
-                resId = R.string.kind_firmware;
-                break;
-            case WATCHFACE:
-                resId = R.string.kind_watchface;
-                break;
-            case APP:
-                resId = R.string.kind_app;
-                break;
-            case INVALID:
-                // fall through
-        }
-        return GBApplication.getContext().getString(resId);
+        return GBApplication.getContext().getString(getFirmwareInfo().getFirmwareType().getNameResId());
     }
 
     @Override
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 0343cc397..ec2c4a32e 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
@@ -16,25 +16,25 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitactive;
 
-import android.content.Context;
-import android.net.Uri;
-
-import androidx.annotation.NonNull;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
-import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
+import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator;
 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.zeppos.AbstractZeppOsFwInstallHandler;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitactive.AmazfitActiveSupport;
 
 public class AmazfitActiveCoordinator extends ZeppOsCoordinator {
-    @NonNull
     @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
-        return AmazfitActiveSupport.class;
+    public String getDeviceBluetoothName() {
+        return HuamiConst.AMAZFIT_ACTIVE_NAME;
+    }
+
+    @Override
+    public Set<Integer> getDeviceSources() {
+        return new HashSet<>(Arrays.asList(8323328));
     }
 
     @Override
@@ -48,11 +48,6 @@ public class AmazfitActiveCoordinator extends ZeppOsCoordinator {
         return name.startsWith(HuamiConst.AMAZFIT_ACTIVE_NAME) && !name.contains("Edge");
     }
 
-    @Override
-    public AbstractZeppOsFwInstallHandler createFwInstallHandler(final Uri uri, final Context context) {
-        return new AmazfitActiveFWInstallHandler(uri, context);
-    }
-
     @Override
     public boolean supportsContinuousFindDevice() {
         return true;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitactive/AmazfitActiveFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitactive/AmazfitActiveFWHelper.java
deleted file mode 100644
index 3ea7e80cf..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitactive/AmazfitActiveFWHelper.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*  Copyright (C) 2023-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitactive;
-
-import android.content.Context;
-import android.net.Uri;
-
-import java.io.IOException;
-
-import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitactive.AmazfitActiveFirmwareInfo;
-
-public class AmazfitActiveFWHelper extends HuamiFWHelper {
-    public AmazfitActiveFWHelper(final Uri uri, final Context context) throws IOException {
-        super(uri, context);
-    }
-
-    @Override
-    public long getMaxExpectedFileSize() {
-        return 1024 * 1024 * 128; // 128.0MB
-    }
-
-    @Override
-    protected void determineFirmwareInfo(final byte[] wholeFirmwareBytes) {
-        firmwareInfo = new AmazfitActiveFirmwareInfo(wholeFirmwareBytes);
-        if (!firmwareInfo.isHeaderValid()) {
-            throw new IllegalArgumentException("Not a Amazfit Active firmware");
-        }
-    }
-}
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
deleted file mode 100644
index d2b06955f..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitactive/AmazfitActiveFWInstallHandler.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*  Copyright (C) 2023-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitactive;
-
-import android.content.Context;
-import android.net.Uri;
-
-import java.io.IOException;
-
-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.zeppos.AbstractZeppOsFwInstallHandler;
-
-class AmazfitActiveFWInstallHandler extends AbstractZeppOsFwInstallHandler {
-    AmazfitActiveFWInstallHandler(final Uri uri, final Context context) {
-        super(uri, context);
-    }
-
-    @Override
-    protected String getFwUpgradeNotice() {
-        final String deviceName = mContext.getString(R.string.devicetype_amazfit_active);
-        return mContext.getString(R.string.fw_upgrade_notice_zepp_os, helper.getHumanFirmwareVersion(), deviceName);
-    }
-
-    @Override
-    protected HuamiFWHelper createHelper(final Uri uri, final Context context) throws IOException {
-        return new AmazfitActiveFWHelper(uri, context);
-    }
-
-    @Override
-    protected boolean isSupportedDeviceType(final GBDevice device) {
-        return device.getType() == DeviceType.AMAZFITACTIVE;
-    }
-}
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 75fdab83e..b362b0aa2 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
@@ -16,20 +16,15 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitactiveedge;
 
-import android.content.Context;
-import android.net.Uri;
-
-import androidx.annotation.NonNull;
-
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
-import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
+import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitactiveedge.AmazfitActiveEdgeSupport;
 
 public class AmazfitActiveEdgeCoordinator extends ZeppOsCoordinator {
     @Override
@@ -37,10 +32,14 @@ public class AmazfitActiveEdgeCoordinator extends ZeppOsCoordinator {
         return true;
     }
 
-    @NonNull
     @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
-        return AmazfitActiveEdgeSupport.class;
+    public String getDeviceBluetoothName() {
+        return HuamiConst.AMAZFIT_ACTIVE_EDGE_NAME;
+    }
+
+    @Override
+    public Set<Integer> getDeviceSources() {
+        return new HashSet<>(Arrays.asList(8388864, 8388865));
     }
 
     @Override
@@ -53,11 +52,6 @@ public class AmazfitActiveEdgeCoordinator extends ZeppOsCoordinator {
         return Pattern.compile(HuamiConst.AMAZFIT_ACTIVE_EDGE_NAME + ".*");
     }
 
-    @Override
-    public AbstractZeppOsFwInstallHandler createFwInstallHandler(final Uri uri, final Context context) {
-        return new AmazfitActiveEdgeFWInstallHandler(uri, context);
-    }
-
     @Override
     public boolean supportsContinuousFindDevice() {
         return true;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitactiveedge/AmazfitActiveEdgeFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitactiveedge/AmazfitActiveEdgeFWHelper.java
deleted file mode 100644
index ebadfcc7f..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitactiveedge/AmazfitActiveEdgeFWHelper.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*  Copyright (C) 2023-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitactiveedge;
-
-import android.content.Context;
-import android.net.Uri;
-
-import java.io.IOException;
-
-import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitactiveedge.AmazfitActiveEdgeFirmwareInfo;
-
-public class AmazfitActiveEdgeFWHelper extends HuamiFWHelper {
-    public AmazfitActiveEdgeFWHelper(final Uri uri, final Context context) throws IOException {
-        super(uri, context);
-    }
-
-    @Override
-    public long getMaxExpectedFileSize() {
-        return 1024 * 1024 * 128; // 128.0MB
-    }
-
-    @Override
-    protected void determineFirmwareInfo(final byte[] wholeFirmwareBytes) {
-        firmwareInfo = new AmazfitActiveEdgeFirmwareInfo(wholeFirmwareBytes);
-        if (!firmwareInfo.isHeaderValid()) {
-            throw new IllegalArgumentException("Not a Amazfit Active Edge firmware");
-        }
-    }
-}
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
deleted file mode 100644
index dd8b61f4f..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitactiveedge/AmazfitActiveEdgeFWInstallHandler.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*  Copyright (C) 2023-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitactiveedge;
-
-import android.content.Context;
-import android.net.Uri;
-
-import java.io.IOException;
-
-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.zeppos.AbstractZeppOsFwInstallHandler;
-
-class AmazfitActiveEdgeFWInstallHandler extends AbstractZeppOsFwInstallHandler {
-    AmazfitActiveEdgeFWInstallHandler(final Uri uri, final Context context) {
-        super(uri, context);
-    }
-
-    @Override
-    protected String getFwUpgradeNotice() {
-        final String deviceName = mContext.getString(R.string.devicetype_amazfit_active_edge);
-        return mContext.getString(R.string.fw_upgrade_notice_zepp_os, helper.getHumanFirmwareVersion(), deviceName);
-    }
-
-    @Override
-    protected HuamiFWHelper createHelper(final Uri uri, final Context context) throws IOException {
-        return new AmazfitActiveEdgeFWHelper(uri, context);
-    }
-
-    @Override
-    protected boolean isSupportedDeviceType(final GBDevice device) {
-        return device.getType() == DeviceType.AMAZFITACTIVEEDGE;
-    }
-}
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 9c6796605..1a593c12b 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
@@ -16,26 +16,25 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitbalance;
 
-import android.content.Context;
-import android.net.Uri;
-
-import androidx.annotation.NonNull;
-
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
-import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
+import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitbalance.AmazfitBalanceSupport;
 
 public class AmazfitBalanceCoordinator extends ZeppOsCoordinator {
-    @NonNull
     @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
-        return AmazfitBalanceSupport.class;
+    public String getDeviceBluetoothName() {
+        return HuamiConst.AMAZFIT_BALANCE_NAME;
+    }
+
+    @Override
+    public Set<Integer> getDeviceSources() {
+        return new HashSet<>(Arrays.asList(8519936, 8519937, 8519939));
     }
 
     @Override
@@ -48,10 +47,6 @@ public class AmazfitBalanceCoordinator extends ZeppOsCoordinator {
         return Pattern.compile(HuamiConst.AMAZFIT_BALANCE_NAME + ".*");
     }
 
-    @Override
-    public AbstractZeppOsFwInstallHandler createFwInstallHandler(final Uri uri, final Context context) {
-        return new AmazfitBalanceFWInstallHandler(uri, context);
-    }
 
     @Override
     public boolean supportsContinuousFindDevice() {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbalance/AmazfitBalanceFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbalance/AmazfitBalanceFWHelper.java
deleted file mode 100644
index 7c0366d0f..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbalance/AmazfitBalanceFWHelper.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*  Copyright (C) 2023-2024 Maxime Reyrolle
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitbalance;
-
-import android.content.Context;
-import android.net.Uri;
-
-import java.io.IOException;
-
-import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitbalance.AmazfitBalanceFirmwareInfo;
-
-public class AmazfitBalanceFWHelper extends HuamiFWHelper {
-    public AmazfitBalanceFWHelper(final Uri uri, final Context context) throws IOException {
-        super(uri, context);
-    }
-
-    @Override
-    public long getMaxExpectedFileSize() {
-        return 1024 * 1024 * 128; // 128.0MB
-    }
-
-    @Override
-    protected void determineFirmwareInfo(final byte[] wholeFirmwareBytes) {
-        firmwareInfo = new AmazfitBalanceFirmwareInfo(wholeFirmwareBytes);
-        if (!firmwareInfo.isHeaderValid()) {
-            throw new IllegalArgumentException("Not a Amazfit Balance firmware");
-        }
-    }
-}
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
deleted file mode 100644
index e7d90a0fa..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbalance/AmazfitBalanceFWInstallHandler.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*  Copyright (C) 2023-2024 Maxime Reyrolle
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitbalance;
-
-import android.content.Context;
-import android.net.Uri;
-
-import java.io.IOException;
-
-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.zeppos.AbstractZeppOsFwInstallHandler;
-
-class AmazfitBalanceFWInstallHandler extends AbstractZeppOsFwInstallHandler {
-    AmazfitBalanceFWInstallHandler(final Uri uri, final Context context) {
-        super(uri, context);
-    }
-
-    @Override
-    protected String getFwUpgradeNotice() {
-        final String deviceName = mContext.getString(R.string.devicetype_amazfit_balance);
-        return mContext.getString(R.string.fw_upgrade_notice_zepp_os, helper.getHumanFirmwareVersion(), deviceName);
-    }
-
-    @Override
-    protected HuamiFWHelper createHelper(final Uri uri, final Context context) throws IOException {
-        return new AmazfitBalanceFWHelper(uri, context);
-    }
-
-    @Override
-    protected boolean isSupportedDeviceType(final GBDevice device) {
-        return device.getType() == DeviceType.AMAZFITBALANCE;
-    }
-}
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 b4a86ff86..069c70ae5 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
@@ -16,41 +16,31 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitband7;
 
-import android.content.Context;
-import android.net.Uri;
-
-import androidx.annotation.NonNull;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
-import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
+import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitband7.AmazfitBand7Support;
 
 public class AmazfitBand7Coordinator extends ZeppOsCoordinator {
-    private static final Logger LOG = LoggerFactory.getLogger(AmazfitBand7Coordinator.class);
+    @Override
+    public String getDeviceBluetoothName() {
+        return HuamiConst.AMAZFIT_BAND7_NAME;
+    }
+
+    @Override
+    public Set<Integer> getDeviceSources() {
+        return new HashSet<>(Arrays.asList(252, 253, 254));
+    }
 
     @Override
     protected Pattern getSupportedDeviceName() {
         return Pattern.compile(HuamiConst.AMAZFIT_BAND7_NAME + ".*", Pattern.CASE_INSENSITIVE);
     }
-    @NonNull
-    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
-        return AmazfitBand7Support.class;
-    }
-
-    @Override
-    public AbstractZeppOsFwInstallHandler createFwInstallHandler(final Uri uri, final Context context) {
-        return new AmazfitBand7FWInstallHandler(uri, context);
-    }
 
     @Override
     public boolean supportsAgpsUpdates() {
@@ -68,7 +58,6 @@ public class AmazfitBand7Coordinator extends ZeppOsCoordinator {
         return R.string.devicetype_amazfit_band7;
     }
 
-
     @Override
     public int getDefaultIconResource() {
         return R.drawable.ic_device_default;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband7/AmazfitBand7FWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband7/AmazfitBand7FWHelper.java
deleted file mode 100644
index 854c65130..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband7/AmazfitBand7FWHelper.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*  Copyright (C) 2022-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitband7;
-
-import android.content.Context;
-import android.net.Uri;
-
-import java.io.IOException;
-
-import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitband7.AmazfitBand7FirmwareInfo;
-
-public class AmazfitBand7FWHelper extends HuamiFWHelper {
-    public AmazfitBand7FWHelper(final Uri uri, final Context context) throws IOException {
-        super(uri, context);
-    }
-
-    @Override
-    public long getMaxExpectedFileSize() {
-        return 1024 * 1024 * 32; // 32.0MB
-    }
-
-    @Override
-    protected void determineFirmwareInfo(final byte[] wholeFirmwareBytes) {
-        firmwareInfo = new AmazfitBand7FirmwareInfo(wholeFirmwareBytes);
-        if (!firmwareInfo.isHeaderValid()) {
-            throw new IllegalArgumentException("Not an Amazfit Band 7 firmware");
-        }
-    }
-}
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
deleted file mode 100644
index c13b5eb56..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband7/AmazfitBand7FWInstallHandler.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*  Copyright (C) 2022-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitband7;
-
-import android.content.Context;
-import android.net.Uri;
-
-import java.io.IOException;
-
-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.zeppos.AbstractZeppOsFwInstallHandler;
-
-class AmazfitBand7FWInstallHandler extends AbstractZeppOsFwInstallHandler {
-    AmazfitBand7FWInstallHandler(final Uri uri, final Context context) {
-        super(uri, context);
-    }
-
-    @Override
-    protected String getFwUpgradeNotice() {
-        return mContext.getString(R.string.fw_upgrade_notice_amazfit_band7, helper.getHumanFirmwareVersion());
-    }
-
-    @Override
-    protected HuamiFWHelper createHelper(final Uri uri, final Context context) throws IOException {
-        return new AmazfitBand7FWHelper(uri, context);
-    }
-
-    @Override
-    protected boolean isSupportedDeviceType(final GBDevice device) {
-        return device.getType() == DeviceType.AMAZFITBAND7;
-    }
-}
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 ae5353c4c..e0dbbcc7d 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
@@ -16,31 +16,25 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitbip5;
 
-import android.content.Context;
-import android.net.Uri;
-
-import androidx.annotation.NonNull;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
-import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
+import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitbip5.AmazfitBip5Support;
 
 public class AmazfitBip5Coordinator extends ZeppOsCoordinator {
-    private static final Logger LOG = LoggerFactory.getLogger(AmazfitBip5Coordinator.class);
-
-    @NonNull
     @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
-        return AmazfitBip5Support.class;
+    public String getDeviceBluetoothName() {
+        return HuamiConst.AMAZFIT_BIP5_NAME;
+    }
+
+    @Override
+    public Set<Integer> getDeviceSources() {
+        return new HashSet<>(Arrays.asList(8454400, 8454401));
     }
 
     @Override
@@ -48,11 +42,6 @@ public class AmazfitBip5Coordinator extends ZeppOsCoordinator {
         return Pattern.compile(HuamiConst.AMAZFIT_BIP5_NAME + ".*");
     }
 
-    @Override
-    public AbstractZeppOsFwInstallHandler createFwInstallHandler(final Uri uri, final Context context) {
-        return new AmazfitBip5FWInstallHandler(uri, context);
-    }
-
     @Override
     public boolean supportsContinuousFindDevice() {
         return true;
@@ -88,13 +77,11 @@ public class AmazfitBip5Coordinator extends ZeppOsCoordinator {
         return true;
     }
 
-
     @Override
     public int getDeviceNameResource() {
         return R.string.devicetype_amazfit_bip5;
     }
 
-
     @Override
     public int getDefaultIconResource() {
         return R.drawable.ic_device_amazfit_bip;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip5/AmazfitBip5FWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip5/AmazfitBip5FWHelper.java
deleted file mode 100644
index e28fa4959..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip5/AmazfitBip5FWHelper.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*  Copyright (C) 2023-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitbip5;
-
-import android.content.Context;
-import android.net.Uri;
-
-import java.io.IOException;
-
-import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitbip5.AmazfitBip5FirmwareInfo;
-
-public class AmazfitBip5FWHelper extends HuamiFWHelper {
-    public AmazfitBip5FWHelper(final Uri uri, final Context context) throws IOException {
-        super(uri, context);
-    }
-
-    @Override
-    public long getMaxExpectedFileSize() {
-        return 1024 * 1024 * 128; // 128.0MB
-    }
-
-    @Override
-    protected void determineFirmwareInfo(final byte[] wholeFirmwareBytes) {
-        firmwareInfo = new AmazfitBip5FirmwareInfo(wholeFirmwareBytes);
-        if (!firmwareInfo.isHeaderValid()) {
-            throw new IllegalArgumentException("Not a Amazfit Bip 5 firmware");
-        }
-    }
-}
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
deleted file mode 100644
index f84a647c8..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip5/AmazfitBip5FWInstallHandler.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*  Copyright (C) 2023-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitbip5;
-
-import android.content.Context;
-import android.net.Uri;
-
-import java.io.IOException;
-
-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.zeppos.AbstractZeppOsFwInstallHandler;
-
-class AmazfitBip5FWInstallHandler extends AbstractZeppOsFwInstallHandler {
-    AmazfitBip5FWInstallHandler(final Uri uri, final Context context) {
-        super(uri, context);
-    }
-
-    @Override
-    protected String getFwUpgradeNotice() {
-        final String deviceName = mContext.getString(R.string.devicetype_amazfit_bip5);
-        return mContext.getString(R.string.fw_upgrade_notice_zepp_os, helper.getHumanFirmwareVersion(), deviceName);
-    }
-
-    @Override
-    protected HuamiFWHelper createHelper(final Uri uri, final Context context) throws IOException {
-        return new AmazfitBip5FWHelper(uri, context);
-    }
-
-    @Override
-    protected boolean isSupportedDeviceType(final GBDevice device) {
-        return device.getType() == DeviceType.AMAZFITBIP5;
-    }
-}
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 5cabda521..1baa0da64 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
@@ -16,48 +16,37 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitcheetahpro;
 
-import android.content.Context;
-import android.net.Uri;
-
-import androidx.annotation.NonNull;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
-import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
+import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitcheetahpro.AmazfitCheetahProSupport;
 
 public class AmazfitCheetahProCoordinator extends ZeppOsCoordinator {
-    private static final Logger LOG = LoggerFactory.getLogger(AmazfitCheetahProCoordinator.class);
+    @Override
+    public String getDeviceBluetoothName() {
+        return HuamiConst.AMAZFIT_CHEETAH_PRO_NAME;
+    }
+
+    @Override
+    public Set<Integer> getDeviceSources() {
+        return new HashSet<>(Arrays.asList(8126720, 8126721));
+    }
 
     @Override
     protected Pattern getSupportedDeviceName() {
         return Pattern.compile(HuamiConst.AMAZFIT_CHEETAH_PRO_NAME + ".*");
     }
 
-    @NonNull
-    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
-        return AmazfitCheetahProSupport.class;
-    }
-
     @Override
     public int getDeviceNameResource() {
         return R.string.devicetype_amazfit_cheetah_pro;
     }
 
-    @Override
-    public AbstractZeppOsFwInstallHandler createFwInstallHandler(final Uri uri, final Context context) {
-        return new AmazfitCheetahProFWInstallHandler(uri, context);
-    }
-
     @Override
     public boolean supportsContinuousFindDevice() {
         return true;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahpro/AmazfitCheetahProFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahpro/AmazfitCheetahProFWHelper.java
deleted file mode 100644
index 49f003ad3..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahpro/AmazfitCheetahProFWHelper.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*  Copyright (C) 2023-2024 Raghd Hamzeh
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitcheetahpro;
-
-import android.content.Context;
-import android.net.Uri;
-
-import java.io.IOException;
-
-import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper;
-import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitcheetahpro.AmazfitCheetahProFirmwareInfo;
-
-public class AmazfitCheetahProFWHelper extends HuamiFWHelper {
-    public AmazfitCheetahProFWHelper(final Uri uri, final Context context) throws IOException {
-        super(uri, context);
-    }
-
-    @Override
-    public long getMaxExpectedFileSize() {
-        return 1024 * 1024 * 128; // 128.0MB
-    }
-
-    @Override
-    protected void determineFirmwareInfo(final byte[] wholeFirmwareBytes) {
-        firmwareInfo = new AmazfitCheetahProFirmwareInfo(wholeFirmwareBytes);
-        if (!firmwareInfo.isHeaderValid()) {
-            throw new IllegalArgumentException("Not a " + DeviceType.AMAZFITCHEETAHPRO + " firmware");
-        }
-    }
-}
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
deleted file mode 100644
index 4c48362e0..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahpro/AmazfitCheetahProFWInstallHandler.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*  Copyright (C) 2023-2024 Raghd Hamzeh
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitcheetahpro;
-
-import android.content.Context;
-import android.net.Uri;
-
-import java.io.IOException;
-
-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.zeppos.AbstractZeppOsFwInstallHandler;
-
-class AmazfitCheetahProFWInstallHandler extends AbstractZeppOsFwInstallHandler {
-    AmazfitCheetahProFWInstallHandler(final Uri uri, final Context context) {
-        super(uri, context);
-    }
-
-    @Override
-    protected String getFwUpgradeNotice() {
-        return mContext.getString(R.string.fw_upgrade_notice_amazfit_cheetah_pro, helper.getHumanFirmwareVersion());
-    }
-
-    @Override
-    protected HuamiFWHelper createHelper(final Uri uri, final Context context) throws IOException {
-        return new AmazfitCheetahProFWHelper(uri, context);
-    }
-
-    @Override
-    protected boolean isSupportedDeviceType(final GBDevice device) {
-        return device.getType() == DeviceType.AMAZFITCHEETAHPRO;
-    }
-}
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 586e2c8d5..0b3ecb7b7 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
@@ -16,36 +16,30 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitcheetahround;
 
-import android.content.Context;
-import android.net.Uri;
-
-import androidx.annotation.NonNull;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
-import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
+import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitcheetahround.AmazfitCheetahRoundSupport;
 
 public class AmazfitCheetahRoundCoordinator extends ZeppOsCoordinator {
-    private static final Logger LOG = LoggerFactory.getLogger(AmazfitCheetahRoundCoordinator.class);
-
     @Override
     public boolean isExperimental() {
         return true;
     }
 
-    @NonNull
     @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
-        return AmazfitCheetahRoundSupport.class;
+    public String getDeviceBluetoothName() {
+        return HuamiConst.AMAZFIT_CHEETAH_ROUND_NAME;
+    }
+
+    @Override
+    public Set<Integer> getDeviceSources() {
+        return new HashSet<>(Arrays.asList(8192256, 8192257));
     }
 
     @Override
@@ -58,11 +52,6 @@ public class AmazfitCheetahRoundCoordinator extends ZeppOsCoordinator {
         return Pattern.compile(HuamiConst.AMAZFIT_CHEETAH_ROUND_NAME + ".*");
     }
 
-    @Override
-    public AbstractZeppOsFwInstallHandler createFwInstallHandler(final Uri uri, final Context context) {
-        return new AmazfitCheetahRoundFWInstallHandler(uri, context);
-    }
-
     @Override
     public boolean supportsContinuousFindDevice() {
         return true;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahround/AmazfitCheetahRoundFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahround/AmazfitCheetahRoundFWHelper.java
deleted file mode 100644
index 60fc1fef7..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahround/AmazfitCheetahRoundFWHelper.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*  Copyright (C) 2023-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitcheetahround;
-
-import android.content.Context;
-import android.net.Uri;
-
-import java.io.IOException;
-
-import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitcheetahround.AmazfitCheetahRoundFirmwareInfo;
-
-public class AmazfitCheetahRoundFWHelper extends HuamiFWHelper {
-    public AmazfitCheetahRoundFWHelper(final Uri uri, final Context context) throws IOException {
-        super(uri, context);
-    }
-
-    @Override
-    public long getMaxExpectedFileSize() {
-        return 1024 * 1024 * 128; // 128.0MB
-    }
-
-    @Override
-    protected void determineFirmwareInfo(final byte[] wholeFirmwareBytes) {
-        firmwareInfo = new AmazfitCheetahRoundFirmwareInfo(wholeFirmwareBytes);
-        if (!firmwareInfo.isHeaderValid()) {
-            throw new IllegalArgumentException("Not a Amazfit Cheetah (Round) firmware");
-        }
-    }
-}
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
deleted file mode 100644
index dfdd0fde7..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahround/AmazfitCheetahRoundFWInstallHandler.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*  Copyright (C) 2023-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitcheetahround;
-
-import android.content.Context;
-import android.net.Uri;
-
-import java.io.IOException;
-
-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.zeppos.AbstractZeppOsFwInstallHandler;
-
-class AmazfitCheetahRoundFWInstallHandler extends AbstractZeppOsFwInstallHandler {
-    AmazfitCheetahRoundFWInstallHandler(final Uri uri, final Context context) {
-        super(uri, context);
-    }
-
-    @Override
-    protected String getFwUpgradeNotice() {
-        final String deviceName = mContext.getString(R.string.devicetype_amazfit_cheetah_round);
-        return mContext.getString(R.string.fw_upgrade_notice_zepp_os, helper.getHumanFirmwareVersion(), deviceName);
-    }
-
-    @Override
-    protected HuamiFWHelper createHelper(final Uri uri, final Context context) throws IOException {
-        return new AmazfitCheetahRoundFWHelper(uri, context);
-    }
-
-    @Override
-    protected boolean isSupportedDeviceType(final GBDevice device) {
-        return device.getType() == DeviceType.AMAZFITCHEETAHROUND;
-    }
-}
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 a5ac83940..92e4faeff 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
@@ -16,36 +16,30 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitcheetahsquare;
 
-import android.content.Context;
-import android.net.Uri;
-
-import androidx.annotation.NonNull;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
-import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
+import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitcheetahsquare.AmazfitCheetahSquareSupport;
 
 public class AmazfitCheetahSquareCoordinator extends ZeppOsCoordinator {
-    private static final Logger LOG = LoggerFactory.getLogger(AmazfitCheetahSquareCoordinator.class);
-
     @Override
     public boolean isExperimental() {
         return true;
     }
 
-    @NonNull
     @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
-        return AmazfitCheetahSquareSupport.class;
+    public String getDeviceBluetoothName() {
+        return HuamiConst.AMAZFIT_CHEETAH_SQUARE_NAME;
+    }
+
+    @Override
+    public Set<Integer> getDeviceSources() {
+        return new HashSet<>(Collections.singletonList(8257793));
     }
 
     @Override
@@ -53,11 +47,6 @@ public class AmazfitCheetahSquareCoordinator extends ZeppOsCoordinator {
         return Pattern.compile(HuamiConst.AMAZFIT_CHEETAH_SQUARE_NAME + ".*");
     }
 
-    @Override
-    public AbstractZeppOsFwInstallHandler createFwInstallHandler(final Uri uri, final Context context) {
-        return new AmazfitCheetahSquareFWInstallHandler(uri, context);
-    }
-
     @Override
     public boolean supportsContinuousFindDevice() {
         return true;
@@ -98,13 +87,11 @@ public class AmazfitCheetahSquareCoordinator extends ZeppOsCoordinator {
         return true;
     }
 
-
     @Override
     public int getDeviceNameResource() {
         return R.string.devicetype_amazfit_cheetah_square;
     }
 
-
     @Override
     public int getDefaultIconResource() {
         return R.drawable.ic_device_amazfit_bip;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahsquare/AmazfitCheetahSquareFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahsquare/AmazfitCheetahSquareFWHelper.java
deleted file mode 100644
index bfbc766ac..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahsquare/AmazfitCheetahSquareFWHelper.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*  Copyright (C) 2023-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitcheetahsquare;
-
-import android.content.Context;
-import android.net.Uri;
-
-import java.io.IOException;
-
-import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitcheetahsquare.AmazfitCheetahSquareFirmwareInfo;
-
-public class AmazfitCheetahSquareFWHelper extends HuamiFWHelper {
-    public AmazfitCheetahSquareFWHelper(final Uri uri, final Context context) throws IOException {
-        super(uri, context);
-    }
-
-    @Override
-    public long getMaxExpectedFileSize() {
-        return 1024 * 1024 * 128; // 128.0MB
-    }
-
-    @Override
-    protected void determineFirmwareInfo(final byte[] wholeFirmwareBytes) {
-        firmwareInfo = new AmazfitCheetahSquareFirmwareInfo(wholeFirmwareBytes);
-        if (!firmwareInfo.isHeaderValid()) {
-            throw new IllegalArgumentException("Not a Amazfit Cheetah (Square) firmware");
-        }
-    }
-}
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
deleted file mode 100644
index 42b1ae4b7..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitcheetahsquare/AmazfitCheetahSquareFWInstallHandler.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*  Copyright (C) 2023-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitcheetahsquare;
-
-import android.content.Context;
-import android.net.Uri;
-
-import java.io.IOException;
-
-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.zeppos.AbstractZeppOsFwInstallHandler;
-
-class AmazfitCheetahSquareFWInstallHandler extends AbstractZeppOsFwInstallHandler {
-    AmazfitCheetahSquareFWInstallHandler(final Uri uri, final Context context) {
-        super(uri, context);
-    }
-
-    @Override
-    protected String getFwUpgradeNotice() {
-        final String deviceName = mContext.getString(R.string.devicetype_amazfit_cheetah_square);
-        return mContext.getString(R.string.fw_upgrade_notice_zepp_os, helper.getHumanFirmwareVersion(), deviceName);
-    }
-
-    @Override
-    protected HuamiFWHelper createHelper(final Uri uri, final Context context) throws IOException {
-        return new AmazfitCheetahSquareFWHelper(uri, context);
-    }
-
-    @Override
-    protected boolean isSupportedDeviceType(final GBDevice device) {
-        return device.getType() == DeviceType.AMAZFITCHEETAHSQUARE;
-    }
-}
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 2f7ea3d83..806e63eb0 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
@@ -16,36 +16,30 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitfalcon;
 
-import android.content.Context;
-import android.net.Uri;
-
-import androidx.annotation.NonNull;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
-import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
+import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitfalcon.AmazfitFalconSupport;
 
 public class AmazfitFalconCoordinator extends ZeppOsCoordinator {
-    private static final Logger LOG = LoggerFactory.getLogger(AmazfitFalconCoordinator.class);
-
     @Override
     public boolean isExperimental() {
         return true;
     }
 
-    @NonNull
     @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
-        return AmazfitFalconSupport.class;
+    public String getDeviceBluetoothName() {
+        return HuamiConst.AMAZFIT_FALCON_NAME;
+    }
+
+    @Override
+    public Set<Integer> getDeviceSources() {
+        return new HashSet<>(Arrays.asList(414, 415));
     }
 
     @Override
@@ -58,11 +52,6 @@ public class AmazfitFalconCoordinator extends ZeppOsCoordinator {
         return Pattern.compile(HuamiConst.AMAZFIT_FALCON_NAME + ".*");
     }
 
-    @Override
-    public AbstractZeppOsFwInstallHandler createFwInstallHandler(final Uri uri, final Context context) {
-        return new AmazfitFalconFWInstallHandler(uri, context);
-    }
-
     @Override
     public boolean sendAgpsAsFileTransfer() {
         return false;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitfalcon/AmazfitFalconFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitfalcon/AmazfitFalconFWHelper.java
deleted file mode 100644
index 63af00b33..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitfalcon/AmazfitFalconFWHelper.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*  Copyright (C) 2023-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitfalcon;
-
-import android.content.Context;
-import android.net.Uri;
-
-import java.io.IOException;
-
-import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitfalcon.AmazfitFalconFirmwareInfo;
-
-public class AmazfitFalconFWHelper extends HuamiFWHelper {
-    public AmazfitFalconFWHelper(final Uri uri, final Context context) throws IOException {
-        super(uri, context);
-    }
-
-    @Override
-    public long getMaxExpectedFileSize() {
-        return 1024 * 1024 * 128; // 128.0MB
-    }
-
-    @Override
-    protected void determineFirmwareInfo(final byte[] wholeFirmwareBytes) {
-        firmwareInfo = new AmazfitFalconFirmwareInfo(wholeFirmwareBytes);
-        if (!firmwareInfo.isHeaderValid()) {
-            throw new IllegalArgumentException("Not a Amazfit Falcon firmware");
-        }
-    }
-}
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
deleted file mode 100644
index 24c15a53c..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitfalcon/AmazfitFalconFWInstallHandler.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*  Copyright (C) 2023-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitfalcon;
-
-import android.content.Context;
-import android.net.Uri;
-
-import java.io.IOException;
-
-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.zeppos.AbstractZeppOsFwInstallHandler;
-
-class AmazfitFalconFWInstallHandler extends AbstractZeppOsFwInstallHandler {
-    AmazfitFalconFWInstallHandler(final Uri uri, final Context context) {
-        super(uri, context);
-    }
-
-    @Override
-    protected String getFwUpgradeNotice() {
-        final String deviceName = mContext.getString(R.string.devicetype_amazfit_falcon);
-        return mContext.getString(R.string.fw_upgrade_notice_zepp_os, helper.getHumanFirmwareVersion(), deviceName);
-    }
-
-    @Override
-    protected HuamiFWHelper createHelper(final Uri uri, final Context context) throws IOException {
-        return new AmazfitFalconFWHelper(uri, context);
-    }
-
-    @Override
-    protected boolean isSupportedDeviceType(final GBDevice device) {
-        return device.getType() == DeviceType.AMAZFITFALCON;
-    }
-}
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 8d4f7a05c..ebb44282b 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
@@ -16,45 +16,34 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgtr3;
 
-import android.content.Context;
-import android.net.Uri;
-
 import androidx.annotation.NonNull;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
-import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
+import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator;
 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.zeppos.AbstractZeppOsFwInstallHandler;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgtr3.AmazfitGTR3Support;
 
 public class AmazfitGTR3Coordinator extends ZeppOsCoordinator {
-    private static final Logger LOG = LoggerFactory.getLogger(AmazfitGTR3Coordinator.class);
-
-    @NonNull
     @Override
-    public boolean supports(final GBDeviceCandidate candidate) {
-        try {
-            final String name = candidate.getName();
-            if (name != null && name.startsWith(HuamiConst.AMAZFIT_GTR3_NAME) && !name.contains("Pro")) {
-                return true;
-            }
-        } catch (final Exception e) {
-            LOG.error("unable to check device support", e);
-        }
+    public String getDeviceBluetoothName() {
+        return HuamiConst.AMAZFIT_GTR3_NAME;
+    }
 
-        return false;
+    @Override
+    public Set<Integer> getDeviceSources() {
+        return new HashSet<>(Arrays.asList(226, 227));
     }
 
     @NonNull
     @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
-        return AmazfitGTR3Support.class;
+    public boolean supports(final GBDeviceCandidate candidate) {
+        final String name = candidate.getName();
+        return name.startsWith(HuamiConst.AMAZFIT_GTR3_NAME) && !name.contains("Pro");
     }
 
     @Override
@@ -62,11 +51,6 @@ public class AmazfitGTR3Coordinator extends ZeppOsCoordinator {
         return R.string.devicetype_amazfit_gtr3;
     }
 
-    @Override
-    public AbstractZeppOsFwInstallHandler createFwInstallHandler(final Uri uri, final Context context) {
-        return new AmazfitGTR3FWInstallHandler(uri, context);
-    }
-
     @Override
     public boolean sendAgpsAsFileTransfer() {
         return false;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3/AmazfitGTR3FWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3/AmazfitGTR3FWHelper.java
deleted file mode 100644
index 507c81549..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3/AmazfitGTR3FWHelper.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*  Copyright (C) 2022-2024 José Rebelo, thermatk
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgtr3;
-
-import android.content.Context;
-import android.net.Uri;
-
-import java.io.IOException;
-
-import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgtr3.AmazfitGTR3FirmwareInfo;
-
-public class AmazfitGTR3FWHelper extends HuamiFWHelper {
-    public AmazfitGTR3FWHelper(final Uri uri, final Context context) throws IOException {
-        super(uri, context);
-    }
-
-    @Override
-    public long getMaxExpectedFileSize() {
-        return 1024 * 1024 * 128; // 128.0MB
-    }
-
-    @Override
-    protected void determineFirmwareInfo(final byte[] wholeFirmwareBytes) {
-        firmwareInfo = new AmazfitGTR3FirmwareInfo(wholeFirmwareBytes);
-        if (!firmwareInfo.isHeaderValid()) {
-            throw new IllegalArgumentException("Not a Amazfit GTR 3 firmware");
-        }
-    }
-}
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
deleted file mode 100644
index fc9afaa48..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3/AmazfitGTR3FWInstallHandler.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*  Copyright (C) 2022-2024 José Rebelo, thermatk
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgtr3;
-
-import android.content.Context;
-import android.net.Uri;
-
-import java.io.IOException;
-
-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.zeppos.AbstractZeppOsFwInstallHandler;
-
-class AmazfitGTR3FWInstallHandler extends AbstractZeppOsFwInstallHandler {
-    AmazfitGTR3FWInstallHandler(Uri uri, Context context) {
-        super(uri, context);
-    }
-
-    @Override
-    protected String getFwUpgradeNotice() {
-        return mContext.getString(R.string.fw_upgrade_notice_amazfit_gtr3, helper.getHumanFirmwareVersion());
-    }
-
-    @Override
-    protected HuamiFWHelper createHelper(Uri uri, Context context) throws IOException {
-        return new AmazfitGTR3FWHelper(uri, context);
-    }
-
-    @Override
-    protected boolean isSupportedDeviceType(GBDevice device) {
-        return device.getType() == DeviceType.AMAZFITGTR3;
-    }
-}
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 f187d071a..002ca0a11 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
@@ -16,48 +16,37 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgtr3pro;
 
-import android.content.Context;
-import android.net.Uri;
-
-import androidx.annotation.NonNull;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
-import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
+import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgtr3pro.AmazfitGTR3ProSupport;
 
 public class AmazfitGTR3ProCoordinator extends ZeppOsCoordinator {
-    private static final Logger LOG = LoggerFactory.getLogger(AmazfitGTR3ProCoordinator.class);
+    @Override
+    public String getDeviceBluetoothName() {
+        return HuamiConst.AMAZFIT_GTR3_PRO_NAME;
+    }
+
+    @Override
+    public Set<Integer> getDeviceSources() {
+        return new HashSet<>(Arrays.asList(229, 230, 6095106));
+    }
 
     @Override
     protected Pattern getSupportedDeviceName() {
         return Pattern.compile(HuamiConst.AMAZFIT_GTR3_PRO_NAME + ".*");
     }
 
-    @NonNull
-    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
-        return AmazfitGTR3ProSupport.class;
-    }
-
     @Override
     public int getDeviceNameResource() {
         return R.string.devicetype_amazfit_gtr3_pro;
     }
 
-    @Override
-    public AbstractZeppOsFwInstallHandler createFwInstallHandler(final Uri uri, final Context context) {
-        return new AmazfitGTR3ProFWInstallHandler(uri, context);
-    }
-
     @Override
     public boolean sendAgpsAsFileTransfer() {
         return false;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3pro/AmazfitGTR3ProFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3pro/AmazfitGTR3ProFWHelper.java
deleted file mode 100644
index e767e36eb..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3pro/AmazfitGTR3ProFWHelper.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*  Copyright (C) 2023-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgtr3pro;
-
-import android.content.Context;
-import android.net.Uri;
-
-import java.io.IOException;
-
-import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgtr3pro.AmazfitGTR3ProFirmwareInfo;
-
-public class AmazfitGTR3ProFWHelper extends HuamiFWHelper {
-    public AmazfitGTR3ProFWHelper(final Uri uri, final Context context) throws IOException {
-        super(uri, context);
-    }
-
-    @Override
-    public long getMaxExpectedFileSize() {
-        return 1024 * 1024 * 128; // 128.0MB
-    }
-
-    @Override
-    protected void determineFirmwareInfo(final byte[] wholeFirmwareBytes) {
-        firmwareInfo = new AmazfitGTR3ProFirmwareInfo(wholeFirmwareBytes);
-        if (!firmwareInfo.isHeaderValid()) {
-            throw new IllegalArgumentException("Not a Amazfit GTR 3 Pro firmware");
-        }
-    }
-}
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
deleted file mode 100644
index 9bae5d5a4..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr3pro/AmazfitGTR3ProFWInstallHandler.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*  Copyright (C) 2023-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgtr3pro;
-
-import android.content.Context;
-import android.net.Uri;
-
-import java.io.IOException;
-
-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.zeppos.AbstractZeppOsFwInstallHandler;
-
-class AmazfitGTR3ProFWInstallHandler extends AbstractZeppOsFwInstallHandler {
-    AmazfitGTR3ProFWInstallHandler(Uri uri, Context context) {
-        super(uri, context);
-    }
-
-    @Override
-    protected String getFwUpgradeNotice() {
-        return mContext.getString(R.string.fw_upgrade_notice_amazfit_gtr3_pro, helper.getHumanFirmwareVersion());
-    }
-
-    @Override
-    protected HuamiFWHelper createHelper(Uri uri, Context context) throws IOException {
-        return new AmazfitGTR3ProFWHelper(uri, context);
-    }
-
-    @Override
-    protected boolean isSupportedDeviceType(GBDevice device) {
-        return device.getType() == DeviceType.AMAZFITGTR3PRO;
-    }
-}
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 f800bd5e4..3409dc741 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
@@ -16,36 +16,45 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgtr4;
 
-import android.content.Context;
-import android.net.Uri;
-
-import androidx.annotation.NonNull;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
 import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
-import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
+import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgtr4.AmazfitGTR4Support;
 
 public class AmazfitGTR4Coordinator extends ZeppOsCoordinator {
-    private static final Logger LOG = LoggerFactory.getLogger(AmazfitGTR4Coordinator.class);
+    @Override
+    public String getDeviceBluetoothName() {
+        return HuamiConst.AMAZFIT_GTR4_NAME;
+    }
+
+    @Override
+    public Set<Integer> getDeviceSources() {
+        return new HashSet<>(Arrays.asList(7930112, 7930113, 7864577));
+    }
 
     @Override
     protected Pattern getSupportedDeviceName() {
         return Pattern.compile(HuamiConst.AMAZFIT_GTR4_NAME + ".*");
     }
 
-    @NonNull
     @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
-        return AmazfitGTR4Support.class;
+    protected Map<Integer, String> getCrcMap() {
+        return new HashMap<Integer, String>() {{
+            // firmware
+            put(1699, "3.17.0.2");
+            put(20712, "3.18.1.1 (diff from 3.17.0.2)");
+            put(49685, "3.23.3.1 (diff from 3.21.0.1)");
+        }};
     }
 
     @Override
@@ -53,11 +62,6 @@ public class AmazfitGTR4Coordinator extends ZeppOsCoordinator {
         return R.string.devicetype_amazfit_gtr4;
     }
 
-    @Override
-    public AbstractZeppOsFwInstallHandler createFwInstallHandler(final Uri uri, final Context context) {
-        return new AmazfitGTR4FWInstallHandler(uri, context);
-    }
-
     @Override
     public boolean supportsContinuousFindDevice() {
         return true;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr4/AmazfitGTR4FWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr4/AmazfitGTR4FWHelper.java
deleted file mode 100644
index 0c1952524..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr4/AmazfitGTR4FWHelper.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*  Copyright (C) 2022-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgtr4;
-
-import android.content.Context;
-import android.net.Uri;
-
-import java.io.IOException;
-
-import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgtr4.AmazfitGTR4FirmwareInfo;
-
-public class AmazfitGTR4FWHelper extends HuamiFWHelper {
-    public AmazfitGTR4FWHelper(final Uri uri, final Context context) throws IOException {
-        super(uri, context);
-    }
-
-    @Override
-    public long getMaxExpectedFileSize() {
-        return 1024 * 1024 * 128; // 128.0MB
-    }
-
-    @Override
-    protected void determineFirmwareInfo(final byte[] wholeFirmwareBytes) {
-        firmwareInfo = new AmazfitGTR4FirmwareInfo(wholeFirmwareBytes);
-        if (!firmwareInfo.isHeaderValid()) {
-            throw new IllegalArgumentException("Not a Amazfit GTR 4 firmware");
-        }
-    }
-}
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
deleted file mode 100644
index 1d5fff622..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtr4/AmazfitGTR4FWInstallHandler.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*  Copyright (C) 2022-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgtr4;
-
-import android.content.Context;
-import android.net.Uri;
-
-import java.io.IOException;
-
-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.zeppos.AbstractZeppOsFwInstallHandler;
-
-class AmazfitGTR4FWInstallHandler extends AbstractZeppOsFwInstallHandler {
-    AmazfitGTR4FWInstallHandler(final Uri uri, final Context context) {
-        super(uri, context);
-    }
-
-    @Override
-    protected String getFwUpgradeNotice() {
-        return mContext.getString(R.string.fw_upgrade_notice_amazfit_gtr4, helper.getHumanFirmwareVersion());
-    }
-
-    @Override
-    protected HuamiFWHelper createHelper(final Uri uri, final Context context) throws IOException {
-        return new AmazfitGTR4FWHelper(uri, context);
-    }
-
-    @Override
-    protected boolean isSupportedDeviceType(final GBDevice device) {
-        return device.getType() == DeviceType.AMAZFITGTR4;
-    }
-}
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 0c32cbfba..dd5e7a0d2 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
@@ -16,31 +16,25 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgtrmini;
 
-import android.content.Context;
-import android.net.Uri;
-
-import androidx.annotation.NonNull;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
-import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
+import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgtrmini.AmazfitGTRMiniSupport;
 
 public class AmazfitGTRMiniCoordinator extends ZeppOsCoordinator {
-    private static final Logger LOG = LoggerFactory.getLogger(AmazfitGTRMiniCoordinator.class);
-
-    @NonNull
     @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
-        return AmazfitGTRMiniSupport.class;
+    public String getDeviceBluetoothName() {
+        return HuamiConst.AMAZFIT_GTR_MINI_NAME;
+    }
+
+    @Override
+    public Set<Integer> getDeviceSources() {
+        return new HashSet<>(Arrays.asList(250, 251));
     }
 
     @Override
@@ -53,11 +47,6 @@ public class AmazfitGTRMiniCoordinator extends ZeppOsCoordinator {
         return Pattern.compile(HuamiConst.AMAZFIT_GTR_MINI_NAME + ".*");
     }
 
-    @Override
-    public AbstractZeppOsFwInstallHandler createFwInstallHandler(final Uri uri, final Context context) {
-        return new AmazfitGTRMiniFWInstallHandler(uri, context);
-    }
-
     @Override
     public boolean sendAgpsAsFileTransfer() {
         // Even though it's a Zepp OS 2.0 device, it doesn't seem to support the AGPS service
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtrmini/AmazfitGTRMiniFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtrmini/AmazfitGTRMiniFWHelper.java
deleted file mode 100644
index d21a0d645..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtrmini/AmazfitGTRMiniFWHelper.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*  Copyright (C) 2023-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgtrmini;
-
-import android.content.Context;
-import android.net.Uri;
-
-import java.io.IOException;
-
-import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgtrmini.AmazfitGTRMiniFirmwareInfo;
-
-public class AmazfitGTRMiniFWHelper extends HuamiFWHelper {
-    public AmazfitGTRMiniFWHelper(final Uri uri, final Context context) throws IOException {
-        super(uri, context);
-    }
-
-    @Override
-    public long getMaxExpectedFileSize() {
-        return 1024 * 1024 * 128; // 128.0MB
-    }
-
-    @Override
-    protected void determineFirmwareInfo(final byte[] wholeFirmwareBytes) {
-        firmwareInfo = new AmazfitGTRMiniFirmwareInfo(wholeFirmwareBytes);
-        if (!firmwareInfo.isHeaderValid()) {
-            throw new IllegalArgumentException("Not a Amazfit GTR Mini firmware");
-        }
-    }
-}
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
deleted file mode 100644
index 87b6d4c56..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgtrmini/AmazfitGTRMiniFWInstallHandler.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*  Copyright (C) 2023-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgtrmini;
-
-import android.content.Context;
-import android.net.Uri;
-
-import java.io.IOException;
-
-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.zeppos.AbstractZeppOsFwInstallHandler;
-
-class AmazfitGTRMiniFWInstallHandler extends AbstractZeppOsFwInstallHandler {
-    AmazfitGTRMiniFWInstallHandler(final Uri uri, final Context context) {
-        super(uri, context);
-    }
-
-    @Override
-    protected String getFwUpgradeNotice() {
-        final String deviceName = mContext.getString(R.string.devicetype_amazfit_gtr_mini);
-        return mContext.getString(R.string.fw_upgrade_notice_zepp_os, helper.getHumanFirmwareVersion(), deviceName);
-    }
-
-    @Override
-    protected HuamiFWHelper createHelper(final Uri uri, final Context context) throws IOException {
-        return new AmazfitGTRMiniFWHelper(uri, context);
-    }
-
-    @Override
-    protected boolean isSupportedDeviceType(final GBDevice device) {
-        return device.getType() == DeviceType.AMAZFITGTRMINI;
-    }
-}
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 b5a7d3563..e10eee737 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
@@ -16,43 +16,32 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgts3;
 
-import android.content.Context;
-import android.net.Uri;
-
-import androidx.annotation.NonNull;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
-import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
+import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgts3.AmazfitGTS3Support;
 
 public class AmazfitGTS3Coordinator extends ZeppOsCoordinator {
-    private static final Logger LOG = LoggerFactory.getLogger(AmazfitGTS3Coordinator.class);
+    @Override
+    public String getDeviceBluetoothName() {
+        return HuamiConst.AMAZFIT_GTS3_NAME;
+    }
+
+    @Override
+    public Set<Integer> getDeviceSources() {
+        return new HashSet<>(Arrays.asList(224, 225));
+    }
 
     @Override
     protected Pattern getSupportedDeviceName() {
         return Pattern.compile(HuamiConst.AMAZFIT_GTS3_NAME + ".*");
     }
 
-    @NonNull
-    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
-        return AmazfitGTS3Support.class;
-    }
-
-    @Override
-    public AbstractZeppOsFwInstallHandler createFwInstallHandler(final Uri uri, final Context context) {
-        return new AmazfitGTS3FWInstallHandler(uri, context);
-    }
-
     @Override
     public boolean sendAgpsAsFileTransfer() {
         return false;
@@ -63,13 +52,11 @@ public class AmazfitGTS3Coordinator extends ZeppOsCoordinator {
         return false;
     }
 
-
     @Override
     public int getDeviceNameResource() {
         return R.string.devicetype_amazfit_gts3;
     }
 
-
     @Override
     public int getDefaultIconResource() {
         return R.drawable.ic_device_amazfit_bip;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts3/AmazfitGTS3FWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts3/AmazfitGTS3FWHelper.java
deleted file mode 100644
index 1e3cdcc45..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts3/AmazfitGTS3FWHelper.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*  Copyright (C) 2022-2024 José Rebelo, sedy89
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgts3;
-
-import android.content.Context;
-import android.net.Uri;
-
-import java.io.IOException;
-
-import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgts3.AmazfitGTS3FirmwareInfo;
-
-public class AmazfitGTS3FWHelper extends HuamiFWHelper {
-    public AmazfitGTS3FWHelper(final Uri uri, final Context context) throws IOException {
-        super(uri, context);
-    }
-
-    @Override
-    public long getMaxExpectedFileSize() {
-        return 1024 * 1024 * 128; // 128.0MB
-    }
-
-    @Override
-    protected void determineFirmwareInfo(final byte[] wholeFirmwareBytes) {
-        firmwareInfo = new AmazfitGTS3FirmwareInfo(wholeFirmwareBytes);
-        if (!firmwareInfo.isHeaderValid()) {
-            throw new IllegalArgumentException("Not a Amazfit GTS 3 firmware");
-        }
-    }
-}
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
deleted file mode 100644
index 32ec2d7be..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts3/AmazfitGTS3FWInstallHandler.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*  Copyright (C) 2022-2024 José Rebelo, sedy89
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgts3;
-
-import android.content.Context;
-import android.net.Uri;
-
-import java.io.IOException;
-
-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.zeppos.AbstractZeppOsFwInstallHandler;
-
-class AmazfitGTS3FWInstallHandler extends AbstractZeppOsFwInstallHandler {
-    AmazfitGTS3FWInstallHandler(Uri uri, Context context) {
-        super(uri, context);
-    }
-
-    @Override
-    protected String getFwUpgradeNotice() {
-        return mContext.getString(R.string.fw_upgrade_notice_amazfit_gts3, helper.getHumanFirmwareVersion());
-    }
-
-    @Override
-    protected HuamiFWHelper createHelper(Uri uri, Context context) throws IOException {
-        return new AmazfitGTS3FWHelper(uri, context);
-    }
-
-    @Override
-    protected boolean isSupportedDeviceType(GBDevice device) {
-        return device.getType() == DeviceType.AMAZFITGTS3;
-    }
-}
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 ea68f513d..a6e34e0db 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
@@ -16,49 +16,31 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgts4;
 
-import android.content.Context;
-import android.net.Uri;
-
-import androidx.annotation.NonNull;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
-import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
+import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator;
 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.zeppos.AbstractZeppOsFwInstallHandler;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgts4.AmazfitGTS4Support;
 
 public class AmazfitGTS4Coordinator extends ZeppOsCoordinator {
-    private static final Logger LOG = LoggerFactory.getLogger(AmazfitGTS4Coordinator.class);
+    @Override
+    public String getDeviceBluetoothName() {
+        return HuamiConst.AMAZFIT_GTS4_NAME;
+    }
+
+    @Override
+    public Set<Integer> getDeviceSources() {
+        return new HashSet<>(Arrays.asList(7995648, 7995649));
+    }
 
     @Override
     public boolean supports(final GBDeviceCandidate candidate) {
-        try {
-            final String name = candidate.getName();
-            if (name != null && name.startsWith(HuamiConst.AMAZFIT_GTS4_NAME) && !name.contains("Mini")) {
-                return true;
-            }
-        } catch (final Exception e) {
-            LOG.error("unable to check device support", e);
-        }
-
-        return false;
-    }
-
-    @NonNull
-    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
-        return AmazfitGTS4Support.class;
-    }
-
-    @Override
-    public AbstractZeppOsFwInstallHandler createFwInstallHandler(final Uri uri, final Context context) {
-        return new AmazfitGTS4FWInstallHandler(uri, context);
+        final String name = candidate.getName();
+        return name.startsWith(HuamiConst.AMAZFIT_GTS4_NAME) && !name.contains("Mini");
     }
 
     @Override
@@ -96,13 +78,11 @@ public class AmazfitGTS4Coordinator extends ZeppOsCoordinator {
         return true;
     }
 
-
     @Override
     public int getDeviceNameResource() {
         return R.string.devicetype_amazfit_gts4;
     }
 
-
     @Override
     public int getDefaultIconResource() {
         return R.drawable.ic_device_amazfit_bip;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4/AmazfitGTS4FWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4/AmazfitGTS4FWHelper.java
deleted file mode 100644
index 46e2357ac..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4/AmazfitGTS4FWHelper.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*  Copyright (C) 2022-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgts4;
-
-import android.content.Context;
-import android.net.Uri;
-
-import java.io.IOException;
-
-import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgts4.AmazfitGTS4FirmwareInfo;
-
-public class AmazfitGTS4FWHelper extends HuamiFWHelper {
-    public AmazfitGTS4FWHelper(final Uri uri, final Context context) throws IOException {
-        super(uri, context);
-    }
-
-    @Override
-    public long getMaxExpectedFileSize() {
-        return 1024 * 1024 * 128; // 128.0MB
-    }
-
-    @Override
-    protected void determineFirmwareInfo(final byte[] wholeFirmwareBytes) {
-        firmwareInfo = new AmazfitGTS4FirmwareInfo(wholeFirmwareBytes);
-        if (!firmwareInfo.isHeaderValid()) {
-            throw new IllegalArgumentException("Not a Amazfit GTS 4 firmware");
-        }
-    }
-}
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
deleted file mode 100644
index 2495cc7c0..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4/AmazfitGTS4FWInstallHandler.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*  Copyright (C) 2022-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgts4;
-
-import android.content.Context;
-import android.net.Uri;
-
-import java.io.IOException;
-
-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.zeppos.AbstractZeppOsFwInstallHandler;
-
-class AmazfitGTS4FWInstallHandler extends AbstractZeppOsFwInstallHandler {
-    AmazfitGTS4FWInstallHandler(final Uri uri, final Context context) {
-        super(uri, context);
-    }
-
-    @Override
-    protected String getFwUpgradeNotice() {
-        return mContext.getString(R.string.fw_upgrade_notice_amazfit_gts4, helper.getHumanFirmwareVersion());
-    }
-
-    @Override
-    protected HuamiFWHelper createHelper(final Uri uri, final Context context) throws IOException {
-        return new AmazfitGTS4FWHelper(uri, context);
-    }
-
-    @Override
-    protected boolean isSupportedDeviceType(final GBDevice device) {
-        return device.getType() == DeviceType.AMAZFITGTS4;
-    }
-}
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 f0f533560..f8be8dcc6 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
@@ -16,42 +16,32 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgts4mini;
 
-import android.content.Context;
-import android.net.Uri;
-
-import androidx.annotation.NonNull;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
-import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
+import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgts4mini.AmazfitGTS4MiniSupport;
 
 public class AmazfitGTS4MiniCoordinator extends ZeppOsCoordinator {
-    private static final Logger LOG = LoggerFactory.getLogger(AmazfitGTS4MiniCoordinator.class);
+    @Override
+    public String getDeviceBluetoothName() {
+        return HuamiConst.AMAZFIT_GTS4_MINI_NAME;
+    }
+
+    @Override
+    public Set<Integer> getDeviceSources() {
+        return new HashSet<>(Arrays.asList(246, 247));
+    }
 
     @Override
     protected Pattern getSupportedDeviceName() {
         return Pattern.compile(HuamiConst.AMAZFIT_GTS4_MINI_NAME + ".*");
     }
 
-    @NonNull
-    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
-        return AmazfitGTS4MiniSupport.class;
-    }
-
-    @Override
-    public AbstractZeppOsFwInstallHandler createFwInstallHandler(final Uri uri, final Context context) {
-        return new AmazfitGTS4MiniFWInstallHandler(uri, context);
-    }
 
     @Override
     public boolean sendAgpsAsFileTransfer() {
@@ -63,13 +53,11 @@ public class AmazfitGTS4MiniCoordinator extends ZeppOsCoordinator {
         return false;
     }
 
-
     @Override
     public int getDeviceNameResource() {
         return R.string.devicetype_amazfit_gts4_mini;
     }
 
-
     @Override
     public int getDefaultIconResource() {
         return R.drawable.ic_device_amazfit_bip;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4mini/AmazfitGTS4MiniFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4mini/AmazfitGTS4MiniFWHelper.java
deleted file mode 100644
index 321f03998..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4mini/AmazfitGTS4MiniFWHelper.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*  Copyright (C) 2022-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgts4mini;
-
-import android.content.Context;
-import android.net.Uri;
-
-import java.io.IOException;
-
-import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgts4mini.AmazfitGTS4MiniFirmwareInfo;
-
-public class AmazfitGTS4MiniFWHelper extends HuamiFWHelper {
-    public AmazfitGTS4MiniFWHelper(final Uri uri, final Context context) throws IOException {
-        super(uri, context);
-    }
-
-    @Override
-    public long getMaxExpectedFileSize() {
-        return 1024 * 1024 * 128; // 128.0MB
-    }
-
-    @Override
-    protected void determineFirmwareInfo(final byte[] wholeFirmwareBytes) {
-        firmwareInfo = new AmazfitGTS4MiniFirmwareInfo(wholeFirmwareBytes);
-        if (!firmwareInfo.isHeaderValid()) {
-            throw new IllegalArgumentException("Not a Amazfit GTS 4 Mini firmware");
-        }
-    }
-}
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
deleted file mode 100644
index 13ab4d237..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitgts4mini/AmazfitGTS4MiniFWInstallHandler.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*  Copyright (C) 2022-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgts4mini;
-
-import android.content.Context;
-import android.net.Uri;
-
-import java.io.IOException;
-
-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.zeppos.AbstractZeppOsFwInstallHandler;
-
-class AmazfitGTS4MiniFWInstallHandler extends AbstractZeppOsFwInstallHandler {
-    AmazfitGTS4MiniFWInstallHandler(final Uri uri, final Context context) {
-        super(uri, context);
-    }
-
-    @Override
-    protected String getFwUpgradeNotice() {
-        return mContext.getString(R.string.fw_upgrade_notice_amazfit_gts4_mini, helper.getHumanFirmwareVersion());
-    }
-
-    @Override
-    protected HuamiFWHelper createHelper(final Uri uri, final Context context) throws IOException {
-        return new AmazfitGTS4MiniFWHelper(uri, context);
-    }
-
-    @Override
-    protected boolean isSupportedDeviceType(final GBDevice device) {
-        return device.getType() == DeviceType.AMAZFITGTS4MINI;
-    }
-}
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 568feae10..b414d9321 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
@@ -16,48 +16,37 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfittrex2;
 
-import android.content.Context;
-import android.net.Uri;
-
-import androidx.annotation.NonNull;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
-import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
+import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfittrex2.AmazfitTRex2Support;
 
 public class AmazfitTRex2Coordinator extends ZeppOsCoordinator {
-    private static final Logger LOG = LoggerFactory.getLogger(AmazfitTRex2Coordinator.class);
+    @Override
+    public String getDeviceBluetoothName() {
+        return HuamiConst.AMAZFIT_TREX_2_NAME;
+    }
+
+    @Override
+    public Set<Integer> getDeviceSources() {
+        return new HashSet<>(Arrays.asList(418, 419));
+    }
 
     @Override
     protected Pattern getSupportedDeviceName() {
         return Pattern.compile(HuamiConst.AMAZFIT_TREX_2_NAME + ".*");
     }
 
-    @NonNull
-    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
-        return AmazfitTRex2Support.class;
-    }
-
     @Override
     public int getDeviceNameResource() {
         return R.string.devicetype_amazfit_trex_2;
     }
 
-    @Override
-    public AbstractZeppOsFwInstallHandler createFwInstallHandler(final Uri uri, final Context context) {
-        return new AmazfitTRex2FWInstallHandler(uri, context);
-    }
-
     @Override
     public boolean supportsControlCenter() {
         return true;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrex2/AmazfitTRex2FWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrex2/AmazfitTRex2FWHelper.java
deleted file mode 100644
index cc9a29a02..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrex2/AmazfitTRex2FWHelper.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*  Copyright (C) 2023-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfittrex2;
-
-import android.content.Context;
-import android.net.Uri;
-
-import java.io.IOException;
-
-import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfittrex2.AmazfitTRex2FirmwareInfo;
-
-public class AmazfitTRex2FWHelper extends HuamiFWHelper {
-    public AmazfitTRex2FWHelper(final Uri uri, final Context context) throws IOException {
-        super(uri, context);
-    }
-
-    @Override
-    public long getMaxExpectedFileSize() {
-        return 1024 * 1024 * 128; // 128.0MB
-    }
-
-    @Override
-    protected void determineFirmwareInfo(final byte[] wholeFirmwareBytes) {
-        firmwareInfo = new AmazfitTRex2FirmwareInfo(wholeFirmwareBytes);
-        if (!firmwareInfo.isHeaderValid()) {
-            throw new IllegalArgumentException("Not a Amazfit T-Rex 2 firmware");
-        }
-    }
-}
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
deleted file mode 100644
index d721d99d2..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrex2/AmazfitTRex2FWInstallHandler.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*  Copyright (C) 2023-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfittrex2;
-
-import android.content.Context;
-import android.net.Uri;
-
-import java.io.IOException;
-
-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.zeppos.AbstractZeppOsFwInstallHandler;
-
-class AmazfitTRex2FWInstallHandler extends AbstractZeppOsFwInstallHandler {
-    AmazfitTRex2FWInstallHandler(final Uri uri, final Context context) {
-        super(uri, context);
-    }
-
-    @Override
-    protected String getFwUpgradeNotice() {
-        return mContext.getString(R.string.fw_upgrade_notice_amazfit_trex2, helper.getHumanFirmwareVersion());
-    }
-
-    @Override
-    protected HuamiFWHelper createHelper(final Uri uri, final Context context) throws IOException {
-        return new AmazfitTRex2FWHelper(uri, context);
-    }
-
-    @Override
-    protected boolean isSupportedDeviceType(final GBDevice device) {
-        return device.getType() == DeviceType.AMAZFITTREX2;
-    }
-}
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 c8c09a379..8a3e6758d 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
@@ -16,31 +16,25 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfittrexultra;
 
-import android.content.Context;
-import android.net.Uri;
-
-import androidx.annotation.NonNull;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
-import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
+import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.AbstractZeppOsFwInstallHandler;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfittrexultra.AmazfitTRexUltraSupport;
 
 public class AmazfitTRexUltraCoordinator extends ZeppOsCoordinator {
-    private static final Logger LOG = LoggerFactory.getLogger(AmazfitTRexUltraCoordinator.class);
-
-    @NonNull
     @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
-        return AmazfitTRexUltraSupport.class;
+    public String getDeviceBluetoothName() {
+        return HuamiConst.AMAZFIT_TREX_ULTRA;
+    }
+
+    @Override
+    public Set<Integer> getDeviceSources() {
+        return new HashSet<>(Arrays.asList(6553856, 6553857));
     }
 
     @Override
@@ -53,11 +47,6 @@ public class AmazfitTRexUltraCoordinator extends ZeppOsCoordinator {
         return Pattern.compile(HuamiConst.AMAZFIT_TREX_ULTRA + ".*");
     }
 
-    @Override
-    public AbstractZeppOsFwInstallHandler createFwInstallHandler(final Uri uri, final Context context) {
-        return new AmazfitTRexUltraFWInstallHandler(uri, context);
-    }
-
     @Override
     public boolean supportsContinuousFindDevice() {
         return true;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrexultra/AmazfitTRexUltraFWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrexultra/AmazfitTRexUltraFWHelper.java
deleted file mode 100644
index ca02e43a0..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrexultra/AmazfitTRexUltraFWHelper.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*  Copyright (C) 2023-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfittrexultra;
-
-import android.content.Context;
-import android.net.Uri;
-
-import java.io.IOException;
-
-import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfittrexultra.AmazfitTRexUltraFirmwareInfo;
-
-public class AmazfitTRexUltraFWHelper extends HuamiFWHelper {
-    public AmazfitTRexUltraFWHelper(final Uri uri, final Context context) throws IOException {
-        super(uri, context);
-    }
-
-    @Override
-    public long getMaxExpectedFileSize() {
-        return 1024 * 1024 * 128; // 128.0MB
-    }
-
-    @Override
-    protected void determineFirmwareInfo(final byte[] wholeFirmwareBytes) {
-        firmwareInfo = new AmazfitTRexUltraFirmwareInfo(wholeFirmwareBytes);
-        if (!firmwareInfo.isHeaderValid()) {
-            throw new IllegalArgumentException("Not a Amazfit T-Rex Ultra firmware");
-        }
-    }
-}
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
deleted file mode 100644
index 52754ba2d..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfittrexultra/AmazfitTRexUltraFWInstallHandler.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*  Copyright (C) 2023-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfittrexultra;
-
-import android.content.Context;
-import android.net.Uri;
-
-import java.io.IOException;
-
-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.zeppos.AbstractZeppOsFwInstallHandler;
-
-class AmazfitTRexUltraFWInstallHandler extends AbstractZeppOsFwInstallHandler {
-    AmazfitTRexUltraFWInstallHandler(final Uri uri, final Context context) {
-        super(uri, context);
-    }
-
-    @Override
-    protected String getFwUpgradeNotice() {
-        final String deviceName = mContext.getString(R.string.devicetype_amazfit_trex_ultra);
-        return mContext.getString(R.string.fw_upgrade_notice_zepp_os, helper.getHumanFirmwareVersion(), deviceName);
-    }
-
-    @Override
-    protected HuamiFWHelper createHelper(final Uri uri, final Context context) throws IOException {
-        return new AmazfitTRexUltraFWHelper(uri, context);
-    }
-
-    @Override
-    protected boolean isSupportedDeviceType(final GBDevice device) {
-        return device.getType() == DeviceType.AMAZFITTREXULTRA;
-    }
-}
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 cf6f43463..c6a907dc4 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
@@ -16,32 +16,46 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.miband7;
 
-import android.content.Context;
-import android.net.Uri;
-
-import androidx.annotation.NonNull;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
-import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
+import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator;
 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.zeppos.AbstractZeppOsFwInstallHandler;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.miband7.MiBand7Support;
 
 public class MiBand7Coordinator extends ZeppOsCoordinator {
+    @Override
+    public String getDeviceBluetoothName() {
+        return HuamiConst.XIAOMI_SMART_BAND7_NAME;
+    }
+
+    @Override
+    public Set<Integer> getDeviceSources() {
+        return new HashSet<>(Arrays.asList(260, 262, 263, 264, 265));
+    }
+
+    @Override
+    protected Map<Integer, String> getCrcMap() {
+        return new HashMap<Integer, String>() {{
+            // firmware
+            put(26036, "1.20.3.1");
+            put(55449, "1.27.0.4");
+            put(14502, "2.0.0.2");
+            put(25658, "2.1.0.1");
+        }};
+    }
+
     @Override
     public boolean supports(final GBDeviceCandidate candidate) {
         final String name = candidate.getName();
         return name.startsWith(HuamiConst.XIAOMI_SMART_BAND7_NAME) && !name.contains("Pro");
     }
 
-    @Override
-    public AbstractZeppOsFwInstallHandler createFwInstallHandler(final Uri uri, final Context context) {
-        return new MiBand7FWInstallHandler(uri, context);
-    }
-
     @Override
     public boolean supportsAgpsUpdates() {
         return false;
@@ -52,24 +66,16 @@ public class MiBand7Coordinator extends ZeppOsCoordinator {
         return false;
     }
 
-    @NonNull
-    @Override
-    public Class<? extends DeviceSupport> getDeviceSupportClass() {
-        return MiBand7Support.class;
-    }
-
     @Override
     public boolean supportsBluetoothPhoneCalls(final GBDevice device) {
         return false;
     }
 
-
     @Override
     public int getDeviceNameResource() {
         return R.string.devicetype_miband7;
     }
 
-
     @Override
     public int getDefaultIconResource() {
         return R.drawable.ic_device_miband6;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband7/MiBand7FWHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband7/MiBand7FWHelper.java
deleted file mode 100644
index 28cbe32d5..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband7/MiBand7FWHelper.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*  Copyright (C) 2022-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.devices.huami.miband7;
-
-import android.content.Context;
-import android.net.Uri;
-
-import java.io.IOException;
-
-import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.miband7.MiBand7FirmwareInfo;
-
-public class MiBand7FWHelper extends HuamiFWHelper {
-    public MiBand7FWHelper(final Uri uri, final Context context) throws IOException {
-        super(uri, context);
-    }
-
-    @Override
-    public long getMaxExpectedFileSize() {
-        return 1024 * 1024 * 32; // 32.0MB
-    }
-
-    @Override
-    protected void determineFirmwareInfo(final byte[] wholeFirmwareBytes) {
-        firmwareInfo = new MiBand7FirmwareInfo(wholeFirmwareBytes);
-        if (!firmwareInfo.isHeaderValid()) {
-            throw new IllegalArgumentException("Not a Xiaomi Smart Band 7 firmware");
-        }
-    }
-}
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
deleted file mode 100644
index bdf67e957..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband7/MiBand7FWInstallHandler.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*  Copyright (C) 2022-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.devices.huami.miband7;
-
-import android.content.Context;
-import android.net.Uri;
-
-import java.io.IOException;
-
-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.zeppos.AbstractZeppOsFwInstallHandler;
-
-class MiBand7FWInstallHandler extends AbstractZeppOsFwInstallHandler {
-    MiBand7FWInstallHandler(Uri uri, Context context) {
-        super(uri, context);
-    }
-
-    @Override
-    protected String getFwUpgradeNotice() {
-        return mContext.getString(R.string.fw_upgrade_notice_miband7, helper.getHumanFirmwareVersion());
-    }
-
-    @Override
-    protected HuamiFWHelper createHelper(Uri uri, Context context) throws IOException {
-        return new MiBand7FWHelper(uri, context);
-    }
-
-    @Override
-    protected boolean isSupportedDeviceType(GBDevice device) {
-        return device.getType() == DeviceType.MIBAND7;
-    }
-}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/ZeppOsCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/ZeppOsCoordinator.java
index 0077cb81c..fadacce2a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/ZeppOsCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/ZeppOsCoordinator.java
@@ -28,7 +28,10 @@ import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.activities.appmanager.AppManagerActivity;
@@ -54,7 +57,9 @@ 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.zeppos.AbstractZeppOsFwInstallHandler;
+import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsFwInstallHandler;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsSupport;
 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;
@@ -69,7 +74,20 @@ import nodomain.freeyourgadget.gadgetbridge.util.FileUtils;
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 
 public abstract class ZeppOsCoordinator extends HuamiCoordinator {
-    public abstract AbstractZeppOsFwInstallHandler createFwInstallHandler(final Uri uri, final Context context);
+    public abstract String getDeviceBluetoothName();
+
+    public abstract Set<Integer> getDeviceSources();
+
+    protected Map<Integer, String> getCrcMap() {
+        // A map from CRC16 to human-readable version for flashable files
+        return Collections.emptyMap();
+    }
+
+    @NonNull
+    @Override
+    public final Class<? extends DeviceSupport> getDeviceSupportClass() {
+        return ZeppOsSupport.class;
+    }
 
     @Override
     public InstallHandler findInstallHandler(final Uri uri, final Context context) {
@@ -87,7 +105,12 @@ public abstract class ZeppOsCoordinator extends HuamiCoordinator {
             }
         }
 
-        final AbstractZeppOsFwInstallHandler handler = createFwInstallHandler(uri, context);
+        final ZeppOsFwInstallHandler handler = new ZeppOsFwInstallHandler(
+                uri,
+                context,
+                getDeviceBluetoothName(),
+                getDeviceSources()
+        );
         return handler.isValid() ? handler : null;
     }
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/ZeppOsFwHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/ZeppOsFwHelper.java
new file mode 100644
index 000000000..ff98ee073
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/ZeppOsFwHelper.java
@@ -0,0 +1,453 @@
+/*  Copyright (C) 2024 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.net.Uri;
+
+import androidx.annotation.Nullable;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.Set;
+import java.util.UUID;
+import java.util.zip.CRC32;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipException;
+import java.util.zip.ZipFile;
+
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceApp;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.HuamiFirmwareType;
+import nodomain.freeyourgadget.gadgetbridge.util.BitmapUtil;
+import nodomain.freeyourgadget.gadgetbridge.util.CheckSums;
+import nodomain.freeyourgadget.gadgetbridge.util.GBZipFile;
+import nodomain.freeyourgadget.gadgetbridge.util.UriHelper;
+
+public class ZeppOsFwHelper {
+    private static final Logger LOG = LoggerFactory.getLogger(ZeppOsFwHelper.class);
+
+    private final Uri uri;
+    private final Context context;
+    private final String deviceName;
+    private final Set<Integer> deviceSources;
+
+    private HuamiFirmwareType firmwareType = HuamiFirmwareType.INVALID;
+    private File file = null;
+    private int crc32;
+    private String version = "Unknown";
+    private GBDeviceApp gbDeviceApp = null;
+
+    public ZeppOsFwHelper(final Uri uri, final Context context, final String deviceName, final Set<Integer> deviceSources) {
+        this.uri = uri;
+        this.context = context;
+        this.deviceName = deviceName;
+        this.deviceSources = deviceSources;
+
+        processUri();
+    }
+
+    public HuamiFirmwareType getFirmwareType() {
+        return firmwareType;
+    }
+
+    public String getFirmwareVersion() {
+        return version;
+    }
+
+    public File getFile() {
+        if (file == null) {
+            throw new IllegalStateException("file is null");
+        }
+
+        return file;
+    }
+
+    public int getSize() {
+        if (file == null) {
+            throw new IllegalStateException("file is null");
+        }
+
+        return (int) file.length();
+    }
+
+    public int getCrc32() {
+        return crc32;
+    }
+
+    private void processUri() {
+        // Copy file to cache first
+        final File cacheDir = context.getCacheDir();
+        final File zpkCacheDir = new File(cacheDir, "zeppos");
+        zpkCacheDir.mkdir();
+
+        try {
+            file = File.createTempFile("fwhelper","bin", context.getCacheDir());
+            file.deleteOnExit();
+        } catch (final IOException e) {
+            LOG.error("Failed to create temp file for zpk", e);
+            return;
+        }
+
+        final UriHelper uriHelper;
+        try {
+            uriHelper = UriHelper.get(uri, context);
+        } catch (final IOException e) {
+            LOG.error("Failed to get uri helper", e);
+            return;
+        }
+
+        final CRC32 crc = new CRC32();
+        try (FileOutputStream outputStream = new FileOutputStream(file);
+             InputStream inputStream = uriHelper.openInputStream()) {
+            final byte[] buffer = new byte[64 * 1024];
+            int len;
+            while ((len = inputStream.read(buffer)) != -1) {
+                outputStream.write(buffer, 0, len);
+                crc.update(buffer, 0, len);
+            }
+            crc32 = (int) crc.getValue();
+        } catch (final IOException e) {
+            LOG.error("Failed to write bytes to temporary file", e);
+            return;
+        }
+
+        try (ZipFile zipFile = new ZipFile(file, java.util.zip.ZipFile.OPEN_READ)) {
+            processZipFile(zipFile);
+        } catch (final ZipException e) {
+            LOG.warn("{} is not a valid zip file", uri, e);
+        } catch (final IOException e) {
+            LOG.warn("Error while processing {}", uri, e);
+        }
+
+        // TODO process as UIHH
+    }
+
+    private void processZipFile(final ZipFile zipFile) {
+        // Attempt to handle as a firmware
+        final byte[] firmwareBin = getFileFromZip(zipFile, "META/firmware.bin");
+        if (firmwareBin != null) {
+            if (isCompatibleFirmwareBin(firmwareBin)) {
+                firmwareType = HuamiFirmwareType.FIRMWARE;
+                final JSONObject fwInfoRoot = getJson(zipFile, "META/fw_info");
+                if (fwInfoRoot != null) {
+                    final JSONArray fwInfoArr = fwInfoRoot.optJSONArray("fw_info");
+                    if (fwInfoArr != null) {
+                        for (int i = 0; i < fwInfoArr.length(); i++) {
+                            final JSONObject fwInfo = fwInfoArr.optJSONObject(i);
+                            if (fwInfo == null) {
+                                continue;
+                            }
+
+                            if ("firmware".equals(fwInfo.optString("name"))) {
+                                version = fwInfo.optString("version");
+                                break;
+                            }
+                        }
+                    }
+                } else {
+                    version = getFirmwareVersion(firmwareBin);
+                }
+            } else {
+                firmwareType = HuamiFirmwareType.INVALID;
+            }
+
+            return;
+        }
+
+        // Attempt to handle as an app / watchface
+        final JSONObject appJson = getJson(zipFile, "app.json");
+        if (appJson != null) {
+            final int appId;
+            final String appName;
+            final String appVersion;
+            final String appType;
+            final String appCreator;
+            final String appIconPath;
+            final JSONObject appJsonApp;
+            try {
+                appJsonApp = appJson.getJSONObject("app");
+                appId = appJsonApp.getInt("appId");
+                appName = appJsonApp.getString("appName");
+                appVersion = appJsonApp.getJSONObject("version").getString("name");
+                appType = appJsonApp.getString("appType");
+                appCreator = appJsonApp.getString("vender");
+                appIconPath = appJsonApp.getString("icon");
+            } catch (final Exception e) {
+                LOG.error("Failed to get appType from app.json", e);
+                firmwareType = HuamiFirmwareType.INVALID;
+                return;
+            }
+
+            final GBDeviceApp.Type gbDeviceAppType;
+            switch (appType) {
+                case "watchface":
+                    firmwareType = HuamiFirmwareType.WATCHFACE;
+                    gbDeviceAppType = GBDeviceApp.Type.WATCHFACE;
+                    version = String.format("%s (watchface)", appName);
+                    break;
+                case "app":
+                    firmwareType = HuamiFirmwareType.APP;
+                    gbDeviceAppType = GBDeviceApp.Type.APP_GENERIC;
+                    version = String.format("%s (app)", appName);
+                    break;
+                default:
+                    LOG.warn("Unknown app type {}", appType);
+                    firmwareType = HuamiFirmwareType.INVALID;
+                    return;
+            }
+
+            Bitmap icon = null;
+            final byte[] iconBytes = getFileFromZip(zipFile, "assets/" + appIconPath);
+            if (iconBytes != null) {
+                if (BitmapUtil.isPng(iconBytes)) {
+                    icon = BitmapFactory.decodeByteArray(iconBytes, 0, iconBytes.length);
+                } else {
+                    icon = BitmapUtil.decodeTga(iconBytes);
+                }
+            }
+
+            gbDeviceApp = new GBDeviceApp(
+                    UUID.fromString(String.format("%08x-0000-0000-0000-000000000000", appId)),
+                    appName,
+                    appCreator,
+                    appVersion,
+                    gbDeviceAppType,
+                    icon
+            );
+
+            return;
+        }
+
+        // Attempt to handle as a zab file
+        final byte[] zpkBytes = handleZabPackage(zipFile);
+        if (zpkBytes != null) {
+            final File cacheDir = context.getCacheDir();
+            final File zpkCacheDir = new File(cacheDir, "zpk");
+            zpkCacheDir.mkdir();
+
+            final File zpkFile;
+            try {
+                zpkFile = File.createTempFile("zpk","zip", context.getCacheDir());
+                zpkFile.deleteOnExit();
+            } catch (final IOException e) {
+                LOG.error("Failed to create temp file for zpk", e);
+                return;
+            }
+
+            try (FileOutputStream outputStream = new FileOutputStream(zpkFile)) {
+                outputStream.write(zpkBytes);
+            } catch (final IOException e) {
+                LOG.error("Failed to write zpk bytes to temporary file", e);
+                return;
+            }
+
+            try (ZipFile zpkZpkFile = new ZipFile(zpkFile, java.util.zip.ZipFile.OPEN_READ)) {
+                processZipFile(zpkZpkFile);
+            } catch (final ZipException e) {
+                LOG.warn("{} is not a valid zip file", uri, e);
+            } catch (final IOException e) {
+                LOG.warn("Error while processing {}", uri, e);
+            }
+
+            if (firmwareType != HuamiFirmwareType.INVALID) {
+                file = zpkFile;
+                crc32 = CheckSums.getCRC32(zpkBytes);
+            }
+        }
+    }
+
+    /**
+     * A zab package is a zip file with:
+     * - manifest.json
+     * - .sc (source code)
+     * - One or more zpk files
+     * <p>
+     * Right now, we only handle the first compatible zpk file that is supported by the connected device.
+     */
+    private byte[] handleZabPackage(final ZipFile zipFile) {
+        final JSONObject manifest = getJson(zipFile, "manifest.json");
+        if (manifest == null) {
+            return null;
+        }
+
+        final JSONArray zpks;
+        try {
+            zpks = manifest.getJSONArray("zpks");
+        } catch (final Exception e) {
+            LOG.error("Failed to get zpks from manifest.json", e);
+            return null;
+        }
+
+        // Iterate all zpks until a compatible one is found
+        for (int i = 0; i < zpks.length(); i++) {
+            try {
+                final JSONObject zpkEntry = zpks.getJSONObject(i);
+                final JSONArray platforms = zpkEntry.getJSONArray("platforms");
+
+                // Check if this zpk is compatible with the current device
+                for (int j = 0; j < platforms.length(); j++) {
+                    final JSONObject platform = platforms.getJSONObject(j);
+
+                    if (deviceSources.contains(platform.getInt("deviceSource"))) {
+                        // It's compatible with the device, fetch device.zip
+                        final String name = zpkEntry.getString("name");
+                        final byte[] zpkBytes = getFileFromZip(zipFile, name);
+                        if (!GBZipFile.isZipFile(zpkBytes)) {
+                            LOG.warn("bytes for {} not a zip file", name);
+                            continue;
+                        }
+                        final GBZipFile zpkFile = new GBZipFile(zpkBytes);
+                        final byte[] deviceZip = zpkFile.getFileFromZip("device.zip");
+                        if (!GBZipFile.isZipFile(zpkBytes)) {
+                            LOG.warn("bytes for device.zip of zpk {} not a zip file", name);
+                            continue;
+                        }
+
+                        return deviceZip;
+                    }
+                }
+            } catch (final Exception e) {
+                LOG.warn("Failed to parse zpk", e);
+            }
+        }
+
+        LOG.warn("No compatible zpk found in zab file");
+
+        return null;
+    }
+
+    @Nullable
+    public GBDeviceApp getAppInfo() {
+        return gbDeviceApp;
+    }
+
+    public boolean isValid() {
+        return firmwareType != HuamiFirmwareType.INVALID;
+    }
+
+    @Nullable
+    public Bitmap getPreview() {
+        if (gbDeviceApp != null) {
+            return gbDeviceApp.getPreviewImage();
+        }
+
+        return null;
+    }
+
+    private boolean isCompatibleFirmwareBin(final byte[] firmwareBin) {
+        if (firmwareBin == null) {
+            LOG.error("firmware bin is null");
+            return false;
+        }
+
+        if (!searchString(firmwareBin, deviceName)) {
+            LOG.warn("Failed to find {} in fwBytes", deviceName);
+            return false;
+        }
+
+        return true;
+    }
+
+    public static String getFirmwareVersion(final byte[] firmwareBin) {
+        int startIdx = 10;
+        int endIdx = -1;
+
+        for (int i = startIdx; i < startIdx + 20; i++) {
+            byte c = firmwareBin[i];
+
+            if (c == 0) {
+                endIdx = i;
+                break;
+            }
+
+            if (c != '.' && (c < '0' || c > '9')) {
+                // not a valid version character
+                break;
+            }
+        }
+
+        if (endIdx == -1) {
+            LOG.warn("Failed to find firmware version in expected offset");
+            return null;
+        }
+
+        return new String(Arrays.copyOfRange(firmwareBin, startIdx, endIdx));
+    }
+
+    @Nullable
+    private static JSONObject getJson(final ZipFile zipFile, final String path) {
+        final byte[] appJsonBin = getFileFromZip(zipFile, path);
+        if (appJsonBin == null) {
+            return null;
+        }
+
+        try {
+            final String appJsonString = new String(appJsonBin, StandardCharsets.UTF_8)
+                    // Remove UTF-8 BOM if present
+                    .replace("\uFEFF", "");
+            return new JSONObject(appJsonString);
+        } catch (final Exception e) {
+            LOG.error("Failed to parse " + path, e);
+        }
+
+        return null;
+    }
+
+    @Nullable
+    private static byte[] getFileFromZip(final ZipFile zipFile, final String path) {
+        try {
+            final ZipEntry entry = zipFile.getEntry(path);
+            if (entry == null) {
+                return null;
+            }
+            return GBZipFile.readAllBytes(zipFile.getInputStream(entry));
+        } catch (final IOException e) {
+            LOG.error("Failed to read " + path, e);
+            return null;
+        }
+    }
+
+    public static boolean searchString(final byte[] fwBytes, final String str) {
+        final byte[] strBytes = (str + "\0").getBytes(StandardCharsets.UTF_8);
+
+        for (int i = 0; i < fwBytes.length - strBytes.length + 1; i++) {
+            boolean found = true;
+            for (int j = 0; j < strBytes.length; j++) {
+                if (fwBytes[i + j] != strBytes[j]) {
+                    found = false;
+                    break;
+                }
+            }
+            if (found) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/PineTimeInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/PineTimeInstallHandler.java
index 27059ecce..5bbfcdc20 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/PineTimeInstallHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/PineTimeInstallHandler.java
@@ -16,8 +16,6 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.pinetime;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
-
 import android.content.Context;
 import android.net.Uri;
 
@@ -38,7 +36,7 @@ import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
 import nodomain.freeyourgadget.gadgetbridge.model.GenericItem;
 import nodomain.freeyourgadget.gadgetbridge.util.UriHelper;
-import nodomain.freeyourgadget.gadgetbridge.util.ZipFile;
+import nodomain.freeyourgadget.gadgetbridge.util.GBZipFile;
 import nodomain.freeyourgadget.gadgetbridge.util.ZipFileException;
 
 public class PineTimeInstallHandler implements InstallHandler {
@@ -57,7 +55,7 @@ public class PineTimeInstallHandler implements InstallHandler {
         try {
             uriHelper = UriHelper.get(uri, this.context);
 
-            ZipFile dfuPackage = new ZipFile(uriHelper.openInputStream());
+            GBZipFile dfuPackage = new GBZipFile(uriHelper.openInputStream());
             String manifest = new String(dfuPackage.getFileFromZip("manifest.json"));
 
             if (!manifest.trim().isEmpty()) {
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 2332225b9..33e224fcd 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
@@ -16,9 +16,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 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<HuamiSupport> {
@@ -31,9 +29,5 @@ public abstract class AbstractHuamiOperation extends AbstractMiBandOperation<Hua
         // TODO: check which notifications we should disable and re-enable here
 //        builder.notify(getCharacteristic(MiBandService.UUID_CHARACTERISTIC_REALTIME_STEPS), enable)
 //                .notify(getCharacteristic(MiBandService.UUID_CHARACTERISTIC_SENSOR_DATA), enable);
-        if (getSupport() instanceof ZeppOsSupport) {
-            // Disable 2021 chunked reads, otherwise firmware upgrades and activity sync get interrupted
-            builder.notify(getCharacteristic(HuamiService.UUID_CHARACTERISTIC_CHUNKEDTRANSFER_2021_READ), enable);
-        }
     }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiFirmwareType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiFirmwareType.java
index 549becccd..72bf2588b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiFirmwareType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiFirmwareType.java
@@ -16,35 +16,47 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.service.devices.huami;
 
+import androidx.annotation.StringRes;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+
 public enum HuamiFirmwareType {
-    FIRMWARE((byte) 0),
-    CHANGELOG_TXT((byte) 16),
+    FIRMWARE((byte) 0, R.string.kind_firmware),
+    CHANGELOG_TXT((byte) 16, R.string.action_changelog),
     // MB7 firmwares are sent as UIHH packing FIRMWARE (zip) + CHANGELOG_TXT, type 0xfd
-    FIRMWARE_UIHH_2021_ZIP_WITH_CHANGELOG((byte) -3),
-    FONT((byte) 1),
-    RES((byte) 2),
-    RES_COMPRESSED((byte) 130),
-    GPS((byte) 3),
-    GPS_CEP((byte) 4),
-    AGPS_UIHH((byte) -4),
-    GPS_ALMANAC((byte) 5),
-    WATCHFACE((byte) 8),
-    APP((byte) 8),
-    FONT_LATIN((byte) 11),
-    ZEPPOS_UNKNOWN_0X13((byte) 0x13),
-    ZEPPOS_APP((byte) 0xa0),
-    INVALID(Byte.MIN_VALUE);
+    FIRMWARE_UIHH_2021_ZIP_WITH_CHANGELOG((byte) -3, R.string.kind_firmware),
+    FONT((byte) 1, R.string.kind_font),
+    RES((byte) 2, R.string.kind_resources),
+    RES_COMPRESSED((byte) 130, R.string.kind_resources),
+    GPS((byte) 3, R.string.kind_gps),
+    GPS_CEP((byte) 4, R.string.kind_gps_cep),
+    AGPS_UIHH((byte) -4, R.string.kind_agps_bundle),
+    GPS_ALMANAC((byte) 5, R.string.kind_gps_almanac),
+    WATCHFACE((byte) 8, R.string.kind_watchface),
+    APP((byte) 8, R.string.kind_app),
+    FONT_LATIN((byte) 11, R.string.kind_font),
+    ZEPPOS_UNKNOWN_0X13((byte) 0x13, R.string.unknown),
+    ZEPPOS_APP((byte) 0xa0, R.string.kind_app),
+    INVALID(Byte.MIN_VALUE, R.string.kind_invalid),
+    ;
 
     private final byte value;
+    private final int nameResId;
 
-    HuamiFirmwareType(byte value) {
+    HuamiFirmwareType(byte value, int nameResId) {
         this.value = value;
+        this.nameResId = nameResId;
     }
 
     public byte getValue() {
         return value;
     }
 
+    @StringRes
+    public int getNameResId() {
+        return nameResId;
+    }
+
     public boolean isApp() {
         return this == APP || this == ZEPPOS_APP;
     }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitactive/AmazfitActiveFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitactive/AmazfitActiveFirmwareInfo.java
deleted file mode 100644
index 9a5d24492..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitactive/AmazfitActiveFirmwareInfo.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*  Copyright (C) 2023-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitactive;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-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.zeppos.ZeppOsFirmwareInfo;
-
-public class AmazfitActiveFirmwareInfo extends ZeppOsFirmwareInfo {
-    private static final Map<Integer, String> crcToVersion = new HashMap<Integer, String>() {{
-        // firmware
-    }};
-
-    public AmazfitActiveFirmwareInfo(final byte[] bytes) {
-        super(bytes);
-    }
-
-    @Override
-    public String deviceName() {
-        return HuamiConst.AMAZFIT_ACTIVE_NAME;
-    }
-
-    @Override
-    public Set<Integer> deviceSources() {
-        return new HashSet<>(Arrays.asList(8323328));
-    }
-
-    @Override
-    public boolean isGenerallyCompatibleWith(final GBDevice device) {
-        return isHeaderValid() && device.getType() == DeviceType.AMAZFITACTIVE;
-    }
-
-    @Override
-    protected Map<Integer, String> getCrcMap() {
-        return crcToVersion;
-    }
-}
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
deleted file mode 100644
index 05cf14908..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitactive/AmazfitActiveSupport.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*  Copyright (C) 2023-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitactive;
-
-import android.content.Context;
-import android.net.Uri;
-
-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.zeppos.ZeppOsSupport;
-
-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
deleted file mode 100644
index 273602e11..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitactiveedge/AmazfitActiveEdgeFirmwareInfo.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*  Copyright (C) 2023-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitactiveedge;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-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.zeppos.ZeppOsFirmwareInfo;
-
-public class AmazfitActiveEdgeFirmwareInfo extends ZeppOsFirmwareInfo {
-    private static final Map<Integer, String> crcToVersion = new HashMap<Integer, String>() {{
-        // firmware
-    }};
-
-    public AmazfitActiveEdgeFirmwareInfo(final byte[] bytes) {
-        super(bytes);
-    }
-
-    @Override
-    public String deviceName() {
-        return HuamiConst.AMAZFIT_ACTIVE_NAME;
-    }
-
-    @Override
-    public Set<Integer> deviceSources() {
-        return new HashSet<>(Arrays.asList(8388864, 8388865));
-    }
-
-    @Override
-    public boolean isGenerallyCompatibleWith(final GBDevice device) {
-        return isHeaderValid() && device.getType() == DeviceType.AMAZFITACTIVEEDGE;
-    }
-
-    @Override
-    protected Map<Integer, String> getCrcMap() {
-        return crcToVersion;
-    }
-}
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
deleted file mode 100644
index 2141be205..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitactiveedge/AmazfitActiveEdgeSupport.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*  Copyright (C) 2023-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitactiveedge;
-
-import android.content.Context;
-import android.net.Uri;
-
-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.zeppos.ZeppOsSupport;
-
-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
deleted file mode 100644
index 1618f7799..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbalance/AmazfitBalanceFirmwareInfo.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*  Copyright (C) 2023-2024 Maxime Reyrolle
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitbalance;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-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.zeppos.ZeppOsFirmwareInfo;
-
-public class AmazfitBalanceFirmwareInfo extends ZeppOsFirmwareInfo {
-    private static final Map<Integer, String> crcToVersion = new HashMap<Integer, String>() {{
-        // firmware
-    }};
-
-    public AmazfitBalanceFirmwareInfo(final byte[] bytes) {
-        super(bytes);
-    }
-
-    @Override
-    public String deviceName() {
-        return HuamiConst.AMAZFIT_BALANCE_NAME;
-    }
-
-    @Override
-    public Set<Integer> deviceSources() {
-        return new HashSet<>(Arrays.asList(8519936, 8519937, 8519939));
-    }
-
-    @Override
-    public boolean isGenerallyCompatibleWith(final GBDevice device) {
-        return isHeaderValid() && device.getType() == DeviceType.AMAZFITBALANCE;
-    }
-
-    @Override
-    protected Map<Integer, String> getCrcMap() {
-        return crcToVersion;
-    }
-}
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
deleted file mode 100644
index 1827f6e32..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbalance/AmazfitBalanceSupport.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*  Copyright (C) 2023-2024 Maxime Reyrolle
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitbalance;
-
-import android.content.Context;
-import android.net.Uri;
-
-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.zeppos.ZeppOsSupport;
-
-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
deleted file mode 100644
index 7e0e09ea8..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitband7/AmazfitBand7FirmwareInfo.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*  Copyright (C) 2022-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitband7;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-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.zeppos.ZeppOsFirmwareInfo;
-
-public class AmazfitBand7FirmwareInfo extends ZeppOsFirmwareInfo {
-    private static final Map<Integer, String> crcToVersion = new HashMap<Integer, String>() {{
-    }};
-
-    public AmazfitBand7FirmwareInfo(final byte[] bytes) {
-        super(bytes);
-    }
-
-    @Override
-    public String deviceName() {
-        return HuamiConst.AMAZFIT_BAND7_NAME;
-    }
-
-    @Override
-    public Set<Integer> deviceSources() {
-        return new HashSet<>(Arrays.asList(252, 253, 254));
-    }
-
-    @Override
-    public boolean isGenerallyCompatibleWith(final GBDevice device) {
-        return isHeaderValid() && device.getType() == DeviceType.AMAZFITBAND7;
-    }
-
-    @Override
-    protected Map<Integer, String> getCrcMap() {
-        return crcToVersion;
-    }
-}
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
deleted file mode 100644
index 0b894f292..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitband7/AmazfitBand7Support.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*  Copyright (C) 2022-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitband7;
-
-import android.content.Context;
-import android.net.Uri;
-
-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.zeppos.ZeppOsSupport;
-
-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
deleted file mode 100644
index bcbfc1f97..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip5/AmazfitBip5FirmwareInfo.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*  Copyright (C) 2023-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitbip5;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-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.zeppos.ZeppOsFirmwareInfo;
-
-public class AmazfitBip5FirmwareInfo extends ZeppOsFirmwareInfo {
-    private static final Map<Integer, String> crcToVersion = new HashMap<Integer, String>() {{
-        // firmware
-    }};
-
-    public AmazfitBip5FirmwareInfo(final byte[] bytes) {
-        super(bytes);
-    }
-
-    @Override
-    public String deviceName() {
-        return HuamiConst.AMAZFIT_BIP5_NAME;
-    }
-
-    @Override
-    public Set<Integer> deviceSources() {
-        return new HashSet<>(Arrays.asList(8454400, 8454401));
-    }
-
-    @Override
-    public boolean isGenerallyCompatibleWith(final GBDevice device) {
-        return isHeaderValid() && device.getType() == DeviceType.AMAZFITBIP5;
-    }
-
-    @Override
-    protected Map<Integer, String> getCrcMap() {
-        return crcToVersion;
-    }
-}
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
deleted file mode 100644
index 945a5f258..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitbip5/AmazfitBip5Support.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*  Copyright (C) 2023-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitbip5;
-
-import android.content.Context;
-import android.net.Uri;
-
-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.zeppos.ZeppOsSupport;
-
-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
deleted file mode 100644
index a586fad82..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcheetahpro/AmazfitCheetahProFirmwareInfo.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*  Copyright (C) 2023-2024 Raghd Hamzeh
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitcheetahpro;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-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.zeppos.ZeppOsFirmwareInfo;
-
-public class AmazfitCheetahProFirmwareInfo extends ZeppOsFirmwareInfo {
-    private static final Map<Integer, String> crcToVersion = new HashMap<Integer, String>() {{
-        // firmware
-    }};
-
-    public AmazfitCheetahProFirmwareInfo(final byte[] bytes) {
-        super(bytes);
-    }
-
-    @Override
-    public String deviceName() {
-        return HuamiConst.AMAZFIT_CHEETAH_PRO_NAME;
-    }
-
-    @Override
-    public Set<Integer> deviceSources() {
-        return new HashSet<>(Arrays.asList(8126720, 8126721));
-    }
-
-    @Override
-    public boolean isGenerallyCompatibleWith(final GBDevice device) {
-        return isHeaderValid() && device.getType() == DeviceType.AMAZFITCHEETAHPRO;
-    }
-
-    @Override
-    protected Map<Integer, String> getCrcMap() {
-        return crcToVersion;
-    }
-}
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
deleted file mode 100644
index fdb32bdc0..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcheetahpro/AmazfitCheetahProSupport.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*  Copyright (C) 2023-2024 Raghd Hamzeh
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitcheetahpro;
-
-import android.content.Context;
-import android.net.Uri;
-
-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.zeppos.ZeppOsSupport;
-
-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
deleted file mode 100644
index 76e2f6253..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcheetahround/AmazfitCheetahRoundFirmwareInfo.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*  Copyright (C) 2023-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitcheetahround;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-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.zeppos.ZeppOsFirmwareInfo;
-
-public class AmazfitCheetahRoundFirmwareInfo extends ZeppOsFirmwareInfo {
-    private static final Map<Integer, String> crcToVersion = new HashMap<Integer, String>() {{
-        // firmware
-    }};
-
-    public AmazfitCheetahRoundFirmwareInfo(final byte[] bytes) {
-        super(bytes);
-    }
-
-    @Override
-    public String deviceName() {
-        return HuamiConst.AMAZFIT_CHEETAH_ROUND_NAME;
-    }
-
-    @Override
-    public Set<Integer> deviceSources() {
-        return new HashSet<>(Arrays.asList(8192256, 8192257));
-    }
-
-    @Override
-    public boolean isGenerallyCompatibleWith(final GBDevice device) {
-        return isHeaderValid() && device.getType() == DeviceType.AMAZFITCHEETAHROUND;
-    }
-
-    @Override
-    protected Map<Integer, String> getCrcMap() {
-        return crcToVersion;
-    }
-}
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
deleted file mode 100644
index 59d8019c0..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcheetahround/AmazfitCheetahRoundSupport.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*  Copyright (C) 2023-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitcheetahround;
-
-import android.content.Context;
-import android.net.Uri;
-
-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.zeppos.ZeppOsSupport;
-
-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
deleted file mode 100644
index 1a232f2a5..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcheetahsquare/AmazfitCheetahSquareFirmwareInfo.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*  Copyright (C) 2023-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitcheetahsquare;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-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.zeppos.ZeppOsFirmwareInfo;
-
-public class AmazfitCheetahSquareFirmwareInfo extends ZeppOsFirmwareInfo {
-    private static final Map<Integer, String> crcToVersion = new HashMap<Integer, String>() {{
-        // firmware
-    }};
-
-    public AmazfitCheetahSquareFirmwareInfo(final byte[] bytes) {
-        super(bytes);
-    }
-
-    @Override
-    public String deviceName() {
-        return HuamiConst.AMAZFIT_CHEETAH_SQUARE_NAME;
-    }
-
-    @Override
-    public Set<Integer> deviceSources() {
-        return new HashSet<>(Collections.singletonList(8257793));
-    }
-
-    @Override
-    public boolean isGenerallyCompatibleWith(final GBDevice device) {
-        return isHeaderValid() && device.getType() == DeviceType.AMAZFITCHEETAHSQUARE;
-    }
-
-    @Override
-    protected Map<Integer, String> getCrcMap() {
-        return crcToVersion;
-    }
-}
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
deleted file mode 100644
index 3061f5e5c..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitcheetahsquare/AmazfitCheetahSquareSupport.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*  Copyright (C) 2023-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitcheetahsquare;
-
-import android.content.Context;
-import android.net.Uri;
-
-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.zeppos.ZeppOsSupport;
-
-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
deleted file mode 100644
index 2252f4732..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitfalcon/AmazfitFalconFirmwareInfo.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*  Copyright (C) 2023-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitfalcon;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-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.zeppos.ZeppOsFirmwareInfo;
-
-public class AmazfitFalconFirmwareInfo extends ZeppOsFirmwareInfo {
-    private static final Map<Integer, String> crcToVersion = new HashMap<Integer, String>() {{
-        // firmware
-    }};
-
-    public AmazfitFalconFirmwareInfo(final byte[] bytes) {
-        super(bytes);
-    }
-
-    @Override
-    public String deviceName() {
-        return HuamiConst.AMAZFIT_FALCON_NAME;
-    }
-
-    @Override
-    public Set<Integer> deviceSources() {
-        return new HashSet<>(Arrays.asList(414, 415));
-    }
-
-    @Override
-    public boolean isGenerallyCompatibleWith(final GBDevice device) {
-        return isHeaderValid() && device.getType() == DeviceType.AMAZFITFALCON;
-    }
-
-    @Override
-    protected Map<Integer, String> getCrcMap() {
-        return crcToVersion;
-    }
-}
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
deleted file mode 100644
index 8dcab31dc..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitfalcon/AmazfitFalconSupport.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*  Copyright (C) 2023-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitfalcon;
-
-import android.content.Context;
-import android.net.Uri;
-
-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.zeppos.ZeppOsSupport;
-
-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
deleted file mode 100644
index 0056b84ab..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr3/AmazfitGTR3FirmwareInfo.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*  Copyright (C) 2022-2024 José Rebelo, thermatk
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgtr3;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-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.zeppos.ZeppOsFirmwareInfo;
-
-public class AmazfitGTR3FirmwareInfo extends ZeppOsFirmwareInfo {
-    private static final Logger LOG = LoggerFactory.getLogger(AmazfitGTR3FirmwareInfo.class);
-
-    private static final Map<Integer, String> crcToVersion = new HashMap<Integer, String>() {{
-        // firmware
-    }};
-
-    public AmazfitGTR3FirmwareInfo(final byte[] bytes) {
-        super(bytes);
-    }
-
-    @Override
-    public String deviceName() {
-        return HuamiConst.AMAZFIT_GTR3_NAME;
-    }
-
-    @Override
-    public Set<Integer> deviceSources() {
-        return new HashSet<>(Arrays.asList(226, 227));
-    }
-
-    @Override
-    public boolean isGenerallyCompatibleWith(final GBDevice device) {
-        return isHeaderValid() && device.getType() == DeviceType.AMAZFITGTR3;
-    }
-
-    @Override
-    protected Map<Integer, String> getCrcMap() {
-        return crcToVersion;
-    }
-}
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
deleted file mode 100644
index 5d9417862..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr3/AmazfitGTR3Support.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*  Copyright (C) 2022-2024 José Rebelo, thermatk
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgtr3;
-
-import android.content.Context;
-import android.net.Uri;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-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.zeppos.ZeppOsSupport;
-
-public class AmazfitGTR3Support extends ZeppOsSupport {
-    private static final Logger LOG = LoggerFactory.getLogger(AmazfitGTR3Support.class);
-
-    @Override
-    public HuamiFWHelper createFWHelper(Uri uri, Context context) throws IOException {
-        return new AmazfitGTR3FWHelper(uri, context);
-    }
-}
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
deleted file mode 100644
index cc028f625..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr3pro/AmazfitGTR3ProFirmwareInfo.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*  Copyright (C) 2023-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgtr3pro;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-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.zeppos.ZeppOsFirmwareInfo;
-
-public class AmazfitGTR3ProFirmwareInfo extends ZeppOsFirmwareInfo {
-    private static final Logger LOG = LoggerFactory.getLogger(AmazfitGTR3ProFirmwareInfo.class);
-
-    private static final Map<Integer, String> crcToVersion = new HashMap<Integer, String>() {{
-        // firmware
-    }};
-
-    public AmazfitGTR3ProFirmwareInfo(final byte[] bytes) {
-        super(bytes);
-    }
-
-    @Override
-    public String deviceName() {
-        return HuamiConst.AMAZFIT_GTR3_PRO_NAME;
-    }
-
-    @Override
-    public Set<Integer> deviceSources() {
-        return new HashSet<>(Arrays.asList(229, 230, 6095106));
-    }
-
-    @Override
-    public boolean isGenerallyCompatibleWith(final GBDevice device) {
-        return isHeaderValid() && device.getType() == DeviceType.AMAZFITGTR3PRO;
-    }
-
-    @Override
-    protected Map<Integer, String> getCrcMap() {
-        return crcToVersion;
-    }
-}
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
deleted file mode 100644
index d88140bcf..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr3pro/AmazfitGTR3ProSupport.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*  Copyright (C) 2023-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgtr3pro;
-
-import android.content.Context;
-import android.net.Uri;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-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.zeppos.ZeppOsSupport;
-
-public class AmazfitGTR3ProSupport extends ZeppOsSupport {
-    private static final Logger LOG = LoggerFactory.getLogger(AmazfitGTR3ProSupport.class);
-
-    @Override
-    public HuamiFWHelper createFWHelper(Uri uri, Context context) throws IOException {
-        return new AmazfitGTR3ProFWHelper(uri, context);
-    }
-}
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
deleted file mode 100644
index 3ac35ae35..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr4/AmazfitGTR4FirmwareInfo.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*  Copyright (C) 2022-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgtr4;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-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.zeppos.ZeppOsFirmwareInfo;
-
-public class AmazfitGTR4FirmwareInfo extends ZeppOsFirmwareInfo {
-    private static final Map<Integer, String> crcToVersion = new HashMap<Integer, String>() {{
-        // firmware
-        put(1699, "3.17.0.2");
-        put(20712, "3.18.1.1 (diff from 3.17.0.2)");
-        put(49685, "3.23.3.1 (diff from 3.21.0.1)");
-    }};
-
-    public AmazfitGTR4FirmwareInfo(final byte[] bytes) {
-        super(bytes);
-    }
-
-    @Override
-    public String deviceName() {
-        return HuamiConst.AMAZFIT_GTR4_NAME;
-    }
-
-    @Override
-    public Set<Integer> deviceSources() {
-        return new HashSet<>(Arrays.asList(7930112, 7930113));
-    }
-
-    @Override
-    public boolean isGenerallyCompatibleWith(final GBDevice device) {
-        return isHeaderValid() && device.getType() == DeviceType.AMAZFITGTR4;
-    }
-
-    @Override
-    protected Map<Integer, String> getCrcMap() {
-        return crcToVersion;
-    }
-}
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
deleted file mode 100644
index 1c8686de2..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtr4/AmazfitGTR4Support.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*  Copyright (C) 2022-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgtr4;
-
-import android.content.Context;
-import android.net.Uri;
-
-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.zeppos.ZeppOsSupport;
-
-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
deleted file mode 100644
index 764d5f849..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtrmini/AmazfitGTRMiniFirmwareInfo.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*  Copyright (C) 2023-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgtrmini;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-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.zeppos.ZeppOsFirmwareInfo;
-
-public class AmazfitGTRMiniFirmwareInfo extends ZeppOsFirmwareInfo {
-    private static final Map<Integer, String> crcToVersion = new HashMap<Integer, String>() {{
-        // firmware
-    }};
-
-    public AmazfitGTRMiniFirmwareInfo(final byte[] bytes) {
-        super(bytes);
-    }
-
-    @Override
-    public String deviceName() {
-        return HuamiConst.AMAZFIT_GTR_MINI_NAME;
-    }
-
-    @Override
-    public Set<Integer> deviceSources() {
-        return new HashSet<>(Arrays.asList(250, 251));
-    }
-
-    @Override
-    public boolean isGenerallyCompatibleWith(final GBDevice device) {
-        return isHeaderValid() && device.getType() == DeviceType.AMAZFITGTRMINI;
-    }
-
-    @Override
-    protected Map<Integer, String> getCrcMap() {
-        return crcToVersion;
-    }
-}
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
deleted file mode 100644
index b4244827d..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgtrmini/AmazfitGTRMiniSupport.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*  Copyright (C) 2023-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgtrmini;
-
-import android.content.Context;
-import android.net.Uri;
-
-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.zeppos.ZeppOsSupport;
-
-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
deleted file mode 100644
index 157f3c807..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts3/AmazfitGTS3FirmwareInfo.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*  Copyright (C) 2022-2024 José Rebelo, sedy89
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgts3;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-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.zeppos.ZeppOsFirmwareInfo;
-
-public class AmazfitGTS3FirmwareInfo extends ZeppOsFirmwareInfo {
-    private static final Logger LOG = LoggerFactory.getLogger(AmazfitGTS3FirmwareInfo.class);
-
-    private static final Map<Integer, String> crcToVersion = new HashMap<Integer, String>() {{
-        // firmware
-    }};
-
-    public AmazfitGTS3FirmwareInfo(final byte[] bytes) {
-        super(bytes);
-    }
-
-    @Override
-    public String deviceName() {
-        return HuamiConst.AMAZFIT_GTS3_NAME;
-    }
-
-    @Override
-    public Set<Integer> deviceSources() {
-        return new HashSet<>(Arrays.asList(224, 225));
-    }
-
-    @Override
-    public boolean isGenerallyCompatibleWith(final GBDevice device) {
-        return isHeaderValid() && device.getType() == DeviceType.AMAZFITGTS3;
-    }
-
-    @Override
-    protected Map<Integer, String> getCrcMap() {
-        return crcToVersion;
-    }
-}
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
deleted file mode 100644
index e20dc7f5c..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts3/AmazfitGTS3Support.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*  Copyright (C) 2022-2024 José Rebelo, sedy89
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgts3;
-
-import android.content.Context;
-import android.net.Uri;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-
-import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper;
-import nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgts3.AmazfitGTS3FWHelper;
-import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsSupport;
-
-public class AmazfitGTS3Support extends ZeppOsSupport {
-    private static final Logger LOG = LoggerFactory.getLogger(AmazfitGTS3Support.class);
-
-    @Override
-    public HuamiFWHelper createFWHelper(Uri uri, Context context) throws IOException {
-        return new AmazfitGTS3FWHelper(uri, context);
-    }
-}
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
deleted file mode 100644
index 91e1d8553..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts4/AmazfitGTS4FirmwareInfo.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*  Copyright (C) 2022-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgts4;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-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.zeppos.ZeppOsFirmwareInfo;
-
-public class AmazfitGTS4FirmwareInfo extends ZeppOsFirmwareInfo {
-    private static final Map<Integer, String> crcToVersion = new HashMap<Integer, String>() {{
-        // firmware
-    }};
-
-    public AmazfitGTS4FirmwareInfo(final byte[] bytes) {
-        super(bytes);
-    }
-
-    @Override
-    public String deviceName() {
-        return HuamiConst.AMAZFIT_GTS4_NAME;
-    }
-
-    @Override
-    public Set<Integer> deviceSources() {
-        return new HashSet<>(Arrays.asList(7995648, 7995649));
-    }
-
-    @Override
-    public boolean isGenerallyCompatibleWith(final GBDevice device) {
-        return isHeaderValid() && device.getType() == DeviceType.AMAZFITGTS4;
-    }
-
-    @Override
-    protected Map<Integer, String> getCrcMap() {
-        return crcToVersion;
-    }
-}
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
deleted file mode 100644
index bd91e9799..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts4/AmazfitGTS4Support.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*  Copyright (C) 2022-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgts4;
-
-import android.content.Context;
-import android.net.Uri;
-
-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.zeppos.ZeppOsSupport;
-
-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
deleted file mode 100644
index 7866b8be1..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts4mini/AmazfitGTS4MiniFirmwareInfo.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*  Copyright (C) 2022-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgts4mini;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-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.zeppos.ZeppOsFirmwareInfo;
-
-public class AmazfitGTS4MiniFirmwareInfo extends ZeppOsFirmwareInfo {
-    private static final Map<Integer, String> crcToVersion = new HashMap<Integer, String>() {{
-        // firmware
-    }};
-
-    public AmazfitGTS4MiniFirmwareInfo(final byte[] bytes) {
-        super(bytes);
-    }
-
-    @Override
-    public String deviceName() {
-        return HuamiConst.AMAZFIT_GTS4_MINI_NAME;
-    }
-
-    @Override
-    public Set<Integer> deviceSources() {
-        return new HashSet<>(Arrays.asList(246, 247));
-    }
-
-    @Override
-    public boolean isGenerallyCompatibleWith(final GBDevice device) {
-        return isHeaderValid() && device.getType() == DeviceType.AMAZFITGTS4MINI;
-    }
-
-    @Override
-    protected Map<Integer, String> getCrcMap() {
-        return crcToVersion;
-    }
-}
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
deleted file mode 100644
index e85ea3d53..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfitgts4mini/AmazfitGTS4MiniSupport.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*  Copyright (C) 2022-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfitgts4mini;
-
-import android.content.Context;
-import android.net.Uri;
-
-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.zeppos.ZeppOsSupport;
-
-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
deleted file mode 100644
index d0b94a115..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfittrex2/AmazfitTRex2FirmwareInfo.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*  Copyright (C) 2023-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfittrex2;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-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.zeppos.ZeppOsFirmwareInfo;
-
-public class AmazfitTRex2FirmwareInfo extends ZeppOsFirmwareInfo {
-    private static final Map<Integer, String> crcToVersion = new HashMap<Integer, String>() {{
-        // firmware
-    }};
-
-    public AmazfitTRex2FirmwareInfo(final byte[] bytes) {
-        super(bytes);
-    }
-
-    @Override
-    public String deviceName() {
-        return HuamiConst.AMAZFIT_TREX_2_NAME;
-    }
-
-    @Override
-    public Set<Integer> deviceSources() {
-        return new HashSet<>(Arrays.asList(418, 419));
-    }
-
-    @Override
-    public boolean isGenerallyCompatibleWith(final GBDevice device) {
-        return isHeaderValid() && device.getType() == DeviceType.AMAZFITTREX2;
-    }
-
-    @Override
-    protected Map<Integer, String> getCrcMap() {
-        return crcToVersion;
-    }
-}
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
deleted file mode 100644
index 249d8bb2e..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfittrex2/AmazfitTRex2Support.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*  Copyright (C) 2023-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfittrex2;
-
-import android.content.Context;
-import android.net.Uri;
-
-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.zeppos.ZeppOsSupport;
-
-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
deleted file mode 100644
index 6041aa299..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfittrexultra/AmazfitTRexUltraFirmwareInfo.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*  Copyright (C) 2023-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfittrexultra;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-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.zeppos.ZeppOsFirmwareInfo;
-
-public class AmazfitTRexUltraFirmwareInfo extends ZeppOsFirmwareInfo {
-    private static final Map<Integer, String> crcToVersion = new HashMap<Integer, String>() {{
-        // firmware
-    }};
-
-    public AmazfitTRexUltraFirmwareInfo(final byte[] bytes) {
-        super(bytes);
-    }
-
-    @Override
-    public String deviceName() {
-        return HuamiConst.AMAZFIT_TREX_ULTRA;
-    }
-
-    @Override
-    public Set<Integer> deviceSources() {
-        return new HashSet<>(Arrays.asList(6553856, 6553857));
-    }
-
-    @Override
-    public boolean isGenerallyCompatibleWith(final GBDevice device) {
-        return isHeaderValid() && device.getType() == DeviceType.AMAZFITTREXULTRA;
-    }
-
-    @Override
-    protected Map<Integer, String> getCrcMap() {
-        return crcToVersion;
-    }
-}
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
deleted file mode 100644
index d3a7d40fd..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/amazfittrexultra/AmazfitTRexUltraSupport.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*  Copyright (C) 2023-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.amazfittrexultra;
-
-import android.content.Context;
-import android.net.Uri;
-
-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.zeppos.ZeppOsSupport;
-
-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
deleted file mode 100644
index dbf225624..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband7/MiBand7FirmwareInfo.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*  Copyright (C) 2022-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.miband7;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-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.zeppos.ZeppOsFirmwareInfo;
-
-public class MiBand7FirmwareInfo extends ZeppOsFirmwareInfo {
-    private static final Map<Integer, String> crcToVersion = new HashMap<Integer, String>() {{
-        // firmware
-        put(26036, "1.20.3.1");
-        put(55449, "1.27.0.4");
-        put(14502, "2.0.0.2");
-        put(25658, "2.1.0.1");
-    }};
-
-    public MiBand7FirmwareInfo(final byte[] bytes) {
-        super(bytes);
-    }
-
-    @Override
-    public String deviceName() {
-        return HuamiConst.XIAOMI_SMART_BAND7_NAME;
-    }
-
-    @Override
-    public Set<Integer> deviceSources() {
-        return new HashSet<>(Arrays.asList(260, 262, 263, 264, 265));
-    }
-
-    @Override
-    public boolean isGenerallyCompatibleWith(final GBDevice device) {
-        return isHeaderValid() && device.getType() == DeviceType.MIBAND7;
-    }
-
-    @Override
-    protected Map<Integer, String> getCrcMap() {
-        return crcToVersion;
-    }
-}
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
deleted file mode 100644
index 9dd0bde50..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/miband7/MiBand7Support.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*  Copyright (C) 2022-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.miband7;
-
-import android.content.Context;
-import android.net.Uri;
-
-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.zeppos.ZeppOsSupport;
-
-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/UpdateFirmwareOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/UpdateFirmwareOperation.java
index 2d7846746..173e51f79 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/UpdateFirmwareOperation.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/UpdateFirmwareOperation.java
@@ -80,7 +80,7 @@ public class UpdateFirmwareOperation extends AbstractHuamiOperation {
         //the firmware will be sent by the notification listener if the band confirms that the metadata are ok.
     }
 
-    AbstractHuamiFirmwareInfo createFwInfo(Uri uri, Context context) throws IOException {
+    protected AbstractHuamiFirmwareInfo createFwInfo(Uri uri, Context context) throws IOException {
         HuamiFWHelper fwHelper = getSupport().createFWHelper(uri, context);
         return fwHelper.getFirmwareInfo();
     }
@@ -283,7 +283,7 @@ public class UpdateFirmwareOperation extends AbstractHuamiOperation {
         builder.queue(getQueue());
     }
 
-    AbstractHuamiFirmwareInfo getFirmwareInfo() {
+    protected AbstractHuamiFirmwareInfo getFirmwareInfo() {
         return firmwareInfo;
     }
 
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
deleted file mode 100644
index 891e53226..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/UpdateFirmwareOperation2021.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*  Copyright (C) 2022-2024 José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.operations;
-
-import android.content.Context;
-import android.net.Uri;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-
-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.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 ZeppOsSupport support) {
-        super(uri, support);
-    }
-
-    @Override
-    AbstractHuamiFirmwareInfo createFwInfo(final Uri uri, final Context context) throws IOException {
-        return super.createFwInfo(uri, context);
-
-        /*  This does not actually seem to be needed, but it's what the official app does
-        final HuamiFWHelper fwHelper = getSupport().createFWHelper(uri, context);
-        final AbstractHuamiFirmwareInfo firmwareInfo = fwHelper.getFirmwareInfo();
-
-        if (!(firmwareInfo instanceof Huami2021FirmwareInfo)) {
-            throw new IllegalArgumentException("Firmware not Huami2021FirmwareInfo");
-        }
-
-        final Huami2021FirmwareInfo firmwareInfo2021 = (Huami2021FirmwareInfo) firmwareInfo;
-        if (firmwareInfo2021.getFirmwareType() == HuamiFirmwareType.FIRMWARE) {
-            // This does not actually seem to be needed, but it's what the official app does
-            return firmwareInfo2021.repackFirmwareInUIHH();
-        }
-
-        return firmwareInfo;
-        */
-    }
-
-    @Override
-    public ZeppOsSupport getSupport() {
-        return (ZeppOsSupport) super.getSupport();
-    }
-
-    @Override
-    protected void handleNotificationNotif(byte[] value) {
-        super.handleNotificationNotif(value);
-
-        if (ArrayUtils.startsWith(value, new byte[]{HuamiService.RESPONSE, COMMAND_FINALIZE_UPDATE, HuamiService.SUCCESS})) {
-            if (getFirmwareInfo().getFirmwareType() == HuamiFirmwareType.APP) {
-                // After an app is installed, request the display items from the band (new app will be at the end)
-                try {
-                    TransactionBuilder builder = performInitialized("request display items and apps");
-                    getSupport().requestDisplayItems(builder);
-                    getSupport().requestApps(builder);
-                    builder.queue(getQueue());
-                } catch (final IOException e) {
-                    LOG.error("Failed to request display items after app install", e);
-                }
-            } else if (getFirmwareInfo().getFirmwareType() == HuamiFirmwareType.WATCHFACE) {
-                // After a watchface is installed, request the watchfaces from the band (new watchface will be at the end)
-                try {
-                    TransactionBuilder builder = performInitialized("request watchfaces and apps");
-                    getSupport().requestWatchfaces(builder);
-                    getSupport().requestApps(builder);
-                    builder.queue(getQueue());
-                } catch (final IOException e) {
-                    LOG.error("Failed to request watchfaces after watchface install", e);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected byte[] buildFirmwareInfoCommand() {
-        final int fwSize = firmwareInfo.getSize();
-        final int crc32 = firmwareInfo.getCrc32();
-
-        final byte[] sizeBytes = BLETypeConversions.fromUint32(fwSize);
-        final byte[] chunkSizeBytes = BLETypeConversions.fromUint16(mChunkLength);
-        final byte[] crcBytes = BLETypeConversions.fromUint32(crc32);
-
-        return new byte[]{
-                COMMAND_SEND_FIRMWARE_INFO,
-                getFirmwareInfo().getFirmwareType().getValue(),
-                sizeBytes[0],
-                sizeBytes[1],
-                sizeBytes[2],
-                sizeBytes[3],
-                crcBytes[0],
-                crcBytes[1],
-                crcBytes[2],
-                crcBytes[3],
-                chunkSizeBytes[0],
-                chunkSizeBytes[1],
-                0, // 0 to update in foreground, 1 for background
-                (byte) 0xff, // ??
-        };
-    }
-}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/AbstractZeppOsFwInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/AbstractZeppOsFwInstallHandler.java
deleted file mode 100644
index ecca27e0e..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/AbstractZeppOsFwInstallHandler.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*  Copyright (C) 2022-2024 Daniel Dakhno, José Rebelo
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.net.Uri;
-
-import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.Writer;
-
-import nodomain.freeyourgadget.gadgetbridge.devices.DeviceCoordinator;
-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.service.devices.huami.AbstractHuamiFirmwareInfo;
-import nodomain.freeyourgadget.gadgetbridge.util.FileUtils;
-
-public abstract class AbstractZeppOsFwInstallHandler extends AbstractMiBandFWInstallHandler {
-    private static final Logger LOG = LoggerFactory.getLogger(AbstractZeppOsFwInstallHandler.class);
-
-    public AbstractZeppOsFwInstallHandler(final Uri uri, final Context context) {
-        super(uri, context);
-    }
-
-    @Override
-    public void onStartInstall(final GBDevice device) {
-        final AbstractHuamiFirmwareInfo firmwareInfo = getHelper().getFirmwareInfo();
-        final boolean shouldCache = firmwareInfo.getFirmwareType().isApp() || firmwareInfo.getFirmwareType().isWatchface();
-        if (shouldCache) {
-            if (firmwareInfo instanceof ZeppOsFirmwareInfo) {
-                saveToCache((ZeppOsFirmwareInfo) firmwareInfo, device);
-            } else {
-                LOG.warn("firmwareInfo is {} - this should never happen", firmwareInfo.getClass());
-            }
-        }
-
-        // Unset the firmware bytes
-        // Huami2021 firmwares are large (> 130MB). With the current architecture, the update operation
-        // will re-read them to memory, and we run out-of-memory.
-        helper.unsetFwBytes();
-    }
-
-    protected abstract HuamiFWHelper createHelper(Uri uri, Context context) throws IOException;
-
-    public HuamiFWHelper getHelper() {
-        return (HuamiFWHelper) helper;
-    }
-
-    private void saveToCache(final ZeppOsFirmwareInfo firmwareInfo, final GBDevice device) {
-        final DeviceCoordinator coordinator = device.getDeviceCoordinator();
-
-        final File appCacheDir;
-        try {
-            appCacheDir = coordinator.getAppCacheDir();
-        } catch (final IOException e) {
-            LOG.error("Failed to get app cache dir", e);
-            return ;
-        }
-
-        final GBDeviceApp app = firmwareInfo.getAppInfo();
-
-        // write app zip
-        final File appOutputFile = new File(appCacheDir, app.getUUID().toString() + coordinator.getAppFileExtension());
-        try {
-            appCacheDir.mkdirs();
-            FileUtils.copyURItoFile(getContext(), getUri(), appOutputFile);
-        } catch (final IOException e) {
-            LOG.error("Failed to save app to cache", e);
-            return;
-        }
-
-        // write app metadata
-        final File metadataOutputFile = new File(appCacheDir, app.getUUID().toString() + ".json");
-        try (Writer writer = new BufferedWriter(new FileWriter(metadataOutputFile))) {
-            final JSONObject appJSON = app.getJSON();
-            writer.write(appJSON.toString());
-        } catch (final IOException e) {
-            LOG.error("Failed to write app metadata", e);
-            return;
-        }
-
-        if (app.getPreviewImage() != null) {
-            final File previewOutputFile = new File(appCacheDir, app.getUUID().toString() + "_preview.png");
-            try (FileOutputStream fos = new FileOutputStream(previewOutputFile)) {
-                app.getPreviewImage().compress(Bitmap.CompressFormat.PNG, 9, fos);
-            } catch (final IOException e) {
-                LOG.error("Failed to write app preview", e);
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsFirmwareInfo.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsFirmwareInfo.java
deleted file mode 100644
index 6225b70ec..000000000
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsFirmwareInfo.java
+++ /dev/null
@@ -1,471 +0,0 @@
-/*  Copyright (C) 2022-2024 José Rebelo, MPeter
-
-    This file is part of Gadgetbridge.
-
-    Gadgetbridge is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Gadgetbridge is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
-
-package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos;
-
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-
-import androidx.annotation.Nullable;
-
-import org.json.JSONArray;
-import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.lang.reflect.Constructor;
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-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 ZeppOsFirmwareInfo extends AbstractHuamiFirmwareInfo {
-    private static final Logger LOG = LoggerFactory.getLogger(ZeppOsFirmwareInfo.class);
-
-    private final String preComputedVersion;
-    private GBDeviceApp gbDeviceApp;
-
-    public ZeppOsFirmwareInfo(final byte[] bytes) {
-        super(bytes);
-        this.preComputedVersion = preComputeVersion();
-    }
-
-    /**
-     * The device name, to search on firmware.bin in order to determine compatibility.
-     */
-    public abstract String deviceName();
-
-    /**
-     * The device sources, to match compatible packages.
-     * As per: https://docs.zepp.com/docs/reference/related-resources/device-list/
-     */
-    public abstract Set<Integer> deviceSources();
-
-    @Override
-    protected HuamiFirmwareType determineFirmwareType(final byte[] bytes) {
-        if (ArrayUtils.equals(bytes, UIHHContainer.UIHH_HEADER, 0)) {
-            return handleUihhPackage(bytes);
-        } else if (ZipFile.isZipFile(bytes)) {
-            return handleZipPackage(bytes);
-        } else {
-            return HuamiFirmwareType.INVALID;
-        }
-    }
-
-    private HuamiFirmwareType handleUihhPackage(byte[] bytes) {
-        final UIHHContainer uihh = UIHHContainer.fromRawBytes(bytes);
-        if (uihh == null) {
-            LOG.warn("Invalid UIHH file");
-            return HuamiFirmwareType.INVALID;
-        }
-
-        final Set<UIHHContainer.FileType> agpsEpoTypes = new HashSet<>();
-        UIHHContainer.FileEntry uihhFirmwareZipFile = null;
-        boolean hasChangelog = false;
-        for (final UIHHContainer.FileEntry file : uihh.getFiles()) {
-            switch (file.getType()) {
-                case FIRMWARE_ZIP:
-                    uihhFirmwareZipFile = file;
-                    continue;
-                case FIRMWARE_CHANGELOG:
-                    hasChangelog = true;
-                    continue;
-                case AGPS_EPO_GR_3:
-                case AGPS_EPO_GAL_7:
-                case AGPS_EPO_BDS_3:
-                    agpsEpoTypes.add(file.getType());
-                    continue;
-                default:
-                    LOG.warn("Unexpected file for {}", file.getType());
-            }
-        }
-
-        if (uihhFirmwareZipFile != null && hasChangelog) {
-            // UIHH firmware update
-            final ZipFile zipFile = new ZipFile(uihhFirmwareZipFile.getContent());
-            final byte[] firmwareBin;
-            try {
-                firmwareBin = zipFile.getFileFromZip("META/firmware.bin");
-            } catch (final ZipFileException e) {
-                LOG.error("Failed to read zip from UIHH", e);
-                return HuamiFirmwareType.INVALID;
-            }
-
-            if (isCompatibleFirmwareBin(firmwareBin)) {
-                return HuamiFirmwareType.FIRMWARE_UIHH_2021_ZIP_WITH_CHANGELOG;
-            }
-        }
-
-        if (agpsEpoTypes.size() == 3) {
-            // AGPS EPO update
-            return HuamiFirmwareType.AGPS_UIHH;
-        }
-
-        return HuamiFirmwareType.INVALID;
-    }
-
-    private HuamiFirmwareType handleZipPackage(byte[] bytes) {
-        final ZipFile zipFile = new ZipFile(bytes);
-
-        // Attempt to handle as a firmware
-        try {
-            final byte[] firmwareBin = zipFile.getFileFromZip("META/firmware.bin");
-            if (isCompatibleFirmwareBin(firmwareBin)) {
-                return HuamiFirmwareType.FIRMWARE;
-            } else {
-                return HuamiFirmwareType.INVALID;
-            }
-        } catch (final ZipFileException e) {
-            LOG.warn("Failed to get firmware.bin from zip file", e);
-        }
-
-        // Attempt to handle as an app / watchface
-        final JSONObject appJson = getJson(zipFile, "app.json");
-        if (appJson != null) {
-            final int appId;
-            final String appName;
-            final String appVersion;
-            final String appType;
-            final String appCreator;
-            final String appIconPath;
-            final JSONObject appJsonApp;
-            try {
-                appJsonApp = appJson.getJSONObject("app");
-                appId = appJsonApp.getInt("appId");
-                appName = appJsonApp.getString("appName");
-                appVersion = appJsonApp.getJSONObject("version").getString("name");
-                appType = appJsonApp.getString("appType");
-                appCreator = appJsonApp.getString("vender");
-                appIconPath = appJsonApp.getString("icon");
-            } catch (final Exception e) {
-                LOG.error("Failed to get appType from app.json", e);
-                return HuamiFirmwareType.INVALID;
-            }
-
-            final HuamiFirmwareType huamiFirmwareType;
-            final GBDeviceApp.Type gbDeviceAppType;
-            switch (appType) {
-                case "watchface":
-                    huamiFirmwareType = HuamiFirmwareType.WATCHFACE;
-                    gbDeviceAppType = GBDeviceApp.Type.WATCHFACE;
-                    break;
-                case "app":
-                    huamiFirmwareType = HuamiFirmwareType.APP;
-                    gbDeviceAppType = GBDeviceApp.Type.APP_GENERIC;
-                    break;
-                default:
-                    LOG.warn("Unknown app type {}", appType);
-                    return HuamiFirmwareType.INVALID;
-            }
-
-            Bitmap icon = null;
-            try {
-                final byte[] iconBytes = zipFile.getFileFromZip("assets/" + appIconPath);
-                if (BitmapUtil.isPng(iconBytes)) {
-                    icon = BitmapFactory.decodeByteArray(iconBytes, 0, iconBytes.length);
-                } else {
-                    icon = BitmapUtil.decodeTga(iconBytes);
-                }
-            } catch (final ZipFileException e) {
-                LOG.error("Failed to get app icon from zip", e);
-            }
-
-            gbDeviceApp = new GBDeviceApp(
-                    UUID.fromString(String.format("%08x-0000-0000-0000-000000000000", appId)),
-                    appName,
-                    appCreator,
-                    appVersion,
-                    gbDeviceAppType,
-                    icon
-            );
-
-            return huamiFirmwareType;
-        }
-
-        // Attempt to handle as a zab file
-        final byte[] zpk = handleZabPackage(zipFile);
-        if (zpk != null) {
-            setBytes(zpk);
-            return handleZipPackage(zpk);
-        }
-
-        return HuamiFirmwareType.INVALID;
-    }
-
-    /**
-     * A zab package is a zip file with:
-     * - manifest.json
-     * - .sc (source code)
-     * - One or more zpk files
-     * <p>
-     * Right now, we only handle the first compatible zpk file that is supported by the connected device.
-     */
-    private byte[] handleZabPackage(final ZipFile zipFile) {
-        final JSONObject manifest = getJson(zipFile, "manifest.json");
-        if (manifest == null) {
-            return null;
-        }
-
-        final JSONArray zpks;
-        try {
-            zpks = manifest.getJSONArray("zpks");
-        } catch (final Exception e) {
-            LOG.error("Failed to get zpks from manifest.json", e);
-            return null;
-        }
-
-        // Iterate all zpks until a compatible one is found
-        for (int i = 0; i < zpks.length(); i++) {
-            try {
-                final JSONObject zpkEntry = zpks.getJSONObject(i);
-                final JSONArray platforms = zpkEntry.getJSONArray("platforms");
-
-                // Check if this zpk is compatible with the current device
-                for (int j = 0; j < platforms.length(); j++) {
-                    final JSONObject platform = platforms.getJSONObject(j);
-
-                    if (deviceSources().contains(platform.getInt("deviceSource"))) {
-                        // It's compatible with the device, fetch device.zip
-                        final String name = zpkEntry.getString("name");
-                        final byte[] zpkBytes = zipFile.getFileFromZip(name);
-                        if (!ZipFile.isZipFile(zpkBytes)) {
-                            LOG.warn("bytes for {} not a zip file", name);
-                            continue;
-                        }
-                        final ZipFile zpkFile = new ZipFile(zpkBytes);
-                        final byte[] deviceZip = zpkFile.getFileFromZip("device.zip");
-                        if (!ZipFile.isZipFile(zpkBytes)) {
-                            LOG.warn("bytes for device.zip of zpk {} not a zip file", name);
-                            continue;
-                        }
-
-                        return deviceZip;
-                    }
-                }
-            } catch (final Exception e) {
-                LOG.warn("Failed to parse zpk", e);
-            }
-        }
-
-        LOG.warn("No compatible zpk found in zab file");
-
-        return null;
-    }
-
-    @Override
-    public String toVersion(int crc16) {
-        final String crcMapVersion = getCrcMap().get(crc16);
-        if (crcMapVersion != null) {
-            return crcMapVersion;
-        }
-
-        return preComputedVersion;
-    }
-
-    public String preComputeVersion() {
-        try {
-            switch (firmwareType) {
-                case FIRMWARE_UIHH_2021_ZIP_WITH_CHANGELOG:
-                    final UIHHContainer uihh = UIHHContainer.fromRawBytes(getBytes());
-                    if (uihh == null) {
-                        return null;
-                    }
-                    return getFirmwareVersion(uihh.getFile(UIHHContainer.FileType.FIRMWARE_ZIP));
-                case FIRMWARE:
-                    return getFirmwareVersion(getBytes());
-                case WATCHFACE:
-                    final String watchfaceName = getAppName(new ZipFile(getBytes()));
-                    if (watchfaceName == null) {
-                        return "(unknown watchface)";
-                    }
-                    return String.format("%s (watchface)", watchfaceName);
-                case APP:
-                    final String appName = getAppName(new ZipFile(getBytes()));
-                    if (appName == null) {
-                        return "(unknown app)";
-                    }
-                    return String.format("%s (app)", appName);
-            }
-        } catch (final Exception e) {
-            LOG.error("Failed to pre compute version", e);
-        }
-
-        return null;
-    }
-
-    public GBDeviceApp getAppInfo() {
-        return gbDeviceApp;
-    }
-
-    @Nullable
-    @Override
-    public Bitmap getPreview() {
-        if (gbDeviceApp != null) {
-            return gbDeviceApp.getPreviewImage();
-        }
-
-        return null;
-    }
-
-    public ZeppOsFirmwareInfo repackFirmwareInUIHH() throws IOException {
-        if (!firmwareType.equals(HuamiFirmwareType.FIRMWARE)) {
-            throw new IllegalStateException("Can only repack FIRMWARE");
-        }
-
-        final UIHHContainer uihh = packFirmwareInUIHH(getBytes());
-
-        try {
-            final Constructor<? extends ZeppOsFirmwareInfo> 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);
-        }
-    }
-
-    private static UIHHContainer packFirmwareInUIHH(final byte[] zipBytes) {
-        final UIHHContainer uihh = new UIHHContainer();
-        final byte[] timestampBytes = BLETypeConversions.fromUint32((int) (System.currentTimeMillis() / 1000L));
-        final String changelogText = "Unknown changelog";
-        final byte[] changelogBytes = BLETypeConversions.join(
-                timestampBytes,
-                changelogText.getBytes(StandardCharsets.UTF_8)
-        );
-        uihh.addFile(UIHHContainer.FileType.FIRMWARE_ZIP, zipBytes);
-        uihh.addFile(UIHHContainer.FileType.FIRMWARE_CHANGELOG, changelogBytes);
-        return uihh;
-    }
-
-    private boolean isCompatibleFirmwareBin(final byte[] firmwareBin) {
-        if (firmwareBin == null) {
-            LOG.error("firmware bin is null");
-            return false;
-        }
-
-        if (!searchString(firmwareBin, deviceName())) {
-            LOG.warn("Failed to find {} in fwBytes", deviceName());
-            return false;
-        }
-
-        return true;
-    }
-
-    public static String getFirmwareVersion(final byte[] fwBytes) {
-        final ZipFile zipFile = new ZipFile(fwBytes);
-        final byte[] firmwareBin;
-        try {
-            firmwareBin = zipFile.getFileFromZip("META/firmware.bin");
-        } catch (final ZipFileException e) {
-            LOG.error("Failed to get firmware.bin from zip", e);
-            return null;
-        }
-
-        int startIdx = 10;
-        int endIdx = -1;
-
-        for (int i = startIdx; i < startIdx + 20; i++) {
-            byte c = firmwareBin[i];
-
-            if (c == 0) {
-                endIdx = i;
-                break;
-            }
-
-            if (c != '.' && (c < '0' || c > '9')) {
-                // not a valid version character
-                break;
-            }
-        }
-
-        if (endIdx == -1) {
-            LOG.warn("Failed to find firmware version in expected offset");
-            return null;
-        }
-
-        return new String(Arrays.copyOfRange(firmwareBin, startIdx, endIdx));
-    }
-
-    public String getAppName(final ZipFile zipFile) {
-        // TODO check i18n section?
-        // TODO Show preview icon?
-
-        final JSONObject appJson = getJson(zipFile, "app.json");
-        if (appJson == null) {
-            return null;
-        }
-
-        try {
-            return appJson.getJSONObject("app").getString("appName");
-        } catch (final Exception e) {
-            LOG.error("Failed to get appName from app.json", e);
-        }
-
-        return null;
-    }
-
-    private static JSONObject getJson(final ZipFile zipFile, final String path) {
-        final byte[] appJsonBin;
-        try {
-            appJsonBin = zipFile.getFileFromZip(path);
-        } catch (final ZipFileException e) {
-            LOG.error("Failed to read " + path, e);
-            return null;
-        }
-
-        try {
-            final String appJsonString = new String(appJsonBin, StandardCharsets.UTF_8)
-                    // Remove UTF-8 BOM if present
-                    .replace("\uFEFF", "");
-            return new JSONObject(appJsonString);
-        } catch (final Exception e) {
-            LOG.error("Failed to parse " + path, e);
-        }
-
-        return null;
-    }
-
-    public static boolean searchString(final byte[] fwBytes, final String str) {
-        final byte[] strBytes = (str + "\0").getBytes(StandardCharsets.UTF_8);
-
-        for (int i = 0; i < fwBytes.length - strBytes.length + 1; i++) {
-            boolean found = true;
-            for (int j = 0; j < strBytes.length; j++) {
-                if (fwBytes[i + j] != strBytes[j]) {
-                    found = false;
-                    break;
-                }
-            }
-            if (found) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsFwInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsFwInstallHandler.java
new file mode 100644
index 000000000..3a7fa6521
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsFwInstallHandler.java
@@ -0,0 +1,177 @@
+/*  Copyright (C) 2022-2024 Daniel Dakhno, José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos;
+
+import static nodomain.freeyourgadget.gadgetbridge.service.devices.huami.HuamiFirmwareType.AGPS_UIHH;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.net.Uri;
+
+import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.Writer;
+import java.util.Set;
+
+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.zeppos.ZeppOsFwHelper;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceApp;
+import nodomain.freeyourgadget.gadgetbridge.model.GenericItem;
+import nodomain.freeyourgadget.gadgetbridge.util.FileUtils;
+
+public class ZeppOsFwInstallHandler implements InstallHandler {
+    private static final Logger LOG = LoggerFactory.getLogger(ZeppOsFwInstallHandler.class);
+
+    private final Uri mUri;
+    private final Context mContext;
+
+    private final ZeppOsFwHelper mHelper;
+
+    public ZeppOsFwInstallHandler(final Uri uri, final Context context, final String deviceName, final Set<Integer> deviceSources) {
+        mUri = uri;
+        mContext = context;
+        mHelper = new ZeppOsFwHelper(uri, context, deviceName, deviceSources);
+    }
+
+    @Override
+    public boolean isValid() {
+        return mHelper.isValid();
+    }
+
+    @Override
+    public void validateInstallation(InstallActivity installActivity, GBDevice device) {
+        if (device.isBusy()) {
+            installActivity.setInfoText(device.getBusyTask());
+            installActivity.setInstallEnabled(false);
+            return;
+        }
+
+        if (!device.isInitialized()) {
+            installActivity.setInfoText(mContext.getString(R.string.fwapp_install_device_not_ready));
+            installActivity.setInstallEnabled(false);
+            return;
+        }
+
+        if (!mHelper.isValid()) {
+            installActivity.setInfoText(mContext.getString(R.string.fwapp_install_device_not_supported));
+            installActivity.setInstallEnabled(false);
+            return;
+        }
+
+        final DeviceCoordinator coordinator = device.getDeviceCoordinator();
+
+        final GenericItem fwItem = new GenericItem(mContext.getString(
+                R.string.installhandler_firmware_name,
+                device.getAliasOrName(),
+                mHelper.getFirmwareType(), // TODO human name
+                mHelper.getFirmwareVersion()
+        ));
+        fwItem.setIcon(coordinator.getDefaultIconResource());
+
+        final StringBuilder sb = new StringBuilder();
+        if (!mHelper.getFirmwareType().isWatchface() && !mHelper.getFirmwareType().isApp() && mHelper.getFirmwareType() != AGPS_UIHH) {
+            sb.append(mContext.getString(
+                    R.string.fw_upgrade_notice,
+                    mContext.getString(R.string.fw_upgrade_notice_zepp_os, mHelper.getFirmwareVersion(), device.getAliasOrName())
+            ));
+
+            // TODO whitelisted firmware
+            //if (mHelper.isFirmwareWhitelisted()) {
+            //    sb.append(" ").append(mContext.getString(R.string.miband_firmware_known));
+            //    fwItem.setDetails(mContext.getString(R.string.miband_fwinstaller_compatible_version));
+            //    // TODO: set a CHECK (OKAY) button
+            //} else {
+                sb.append("  ").append(mContext.getString(R.string.miband_firmware_unknown_warning)).append(" \n\n")
+                        .append(mContext.getString(R.string.miband_firmware_suggest_whitelist, String.valueOf(mHelper.getFirmwareVersion())));
+                fwItem.setDetails(mContext.getString(R.string.miband_fwinstaller_untested_version));
+                // TODO: set a UNKNOWN (question mark) button
+            //}
+        }
+
+        installActivity.setPreview(mHelper.getPreview());
+
+        installActivity.setInfoText(sb.toString());
+        installActivity.setInstallItem(fwItem);
+        installActivity.setInstallEnabled(true);
+    }
+
+    @Override
+    public void onStartInstall(final GBDevice device) {
+        final boolean shouldCache = mHelper.getFirmwareType().isApp() || mHelper.getFirmwareType().isWatchface();
+        if (shouldCache) {
+            saveToCache(device);
+        }
+    }
+
+    private void saveToCache(final GBDevice device) {
+        final DeviceCoordinator coordinator = device.getDeviceCoordinator();
+
+        final File appCacheDir;
+        try {
+            appCacheDir = coordinator.getAppCacheDir();
+        } catch (final IOException e) {
+            LOG.error("Failed to get app cache dir", e);
+            return;
+        }
+
+        final GBDeviceApp app = mHelper.getAppInfo();
+        if (app == null) {
+            LOG.warn("Unable to cache app, appInfo is null");
+            return;
+        }
+
+        // write app zip
+        final File appOutputFile = new File(appCacheDir, app.getUUID().toString() + coordinator.getAppFileExtension());
+        try {
+            appCacheDir.mkdirs();
+            FileUtils.copyURItoFile(mContext, mUri, appOutputFile);
+        } catch (final IOException e) {
+            LOG.error("Failed to save app to cache", e);
+            return;
+        }
+
+        // write app metadata
+        final File metadataOutputFile = new File(appCacheDir, app.getUUID().toString() + ".json");
+        try (Writer writer = new BufferedWriter(new FileWriter(metadataOutputFile))) {
+            final JSONObject appJSON = app.getJSON();
+            writer.write(appJSON.toString());
+        } catch (final IOException e) {
+            LOG.error("Failed to write app metadata", e);
+            return;
+        }
+
+        if (app.getPreviewImage() != null) {
+            final File previewOutputFile = new File(appCacheDir, app.getUUID().toString() + "_preview.png");
+            try (FileOutputStream fos = new FileOutputStream(previewOutputFile)) {
+                app.getPreviewImage().compress(Bitmap.CompressFormat.PNG, 9, fos);
+            } catch (final IOException e) {
+                LOG.error("Failed to write app preview", e);
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsSupport.java
index c42643902..6a7aeffa1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsSupport.java
@@ -38,6 +38,7 @@ import static nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.
 import static nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services.ZeppOsConfigService.ConfigArg.TEMPERATURE_UNIT;
 import static nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.services.ZeppOsConfigService.ConfigArg.TIME_FORMAT;
 
+import android.content.Context;
 import android.location.Location;
 import android.net.Uri;
 import android.os.Handler;
@@ -78,6 +79,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.HuamiFWHelper;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.Huami2021Service;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
@@ -111,7 +113,7 @@ import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.HuamiPhoneGpsS
 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.operations.ZeppOsFirmwareUpdateOperation;
 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;
@@ -143,7 +145,7 @@ import nodomain.freeyourgadget.gadgetbridge.util.GBPrefs;
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 import nodomain.freeyourgadget.gadgetbridge.util.SilentMode;
 
-public abstract class ZeppOsSupport extends HuamiSupport implements ZeppOsFileTransferService.Callback {
+public final 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
@@ -592,6 +594,11 @@ public abstract class ZeppOsSupport extends HuamiSupport implements ZeppOsFileTr
         writeToChunked2021("toggle realtime steps", CHUNKED2021_ENDPOINT_STEPS, cmd, false);
     }
 
+    @Override
+    public UpdateFirmwareOperation createUpdateFirmwareOperation(final Uri uri) {
+        throw new UnsupportedOperationException("this method should not be used");
+    }
+
     @Override
     public void onInstallApp(final Uri uri) {
         final ZeppOsAgpsInstallHandler agpsHandler = new ZeppOsAgpsInstallHandler(uri, getContext());
@@ -635,7 +642,7 @@ public abstract class ZeppOsSupport extends HuamiSupport implements ZeppOsFileTr
                         return;
                     }
 
-                    new UpdateFirmwareOperation2021(Uri.parse(uihhFile.toURI().toString()), this).perform();
+                    new ZeppOsFirmwareUpdateOperation(Uri.parse(uihhFile.toURI().toString()), this).perform();
                 }
 
             } catch (final Exception e) {
@@ -656,11 +663,13 @@ public abstract class ZeppOsSupport extends HuamiSupport implements ZeppOsFileTr
             } catch (final Exception e) {
                 GB.toast(getContext(), "Gpx route file cannot be installed: " + e.getMessage(), Toast.LENGTH_LONG, GB.ERROR, e);
             }
-
-            return;
         }
 
-        super.onInstallApp(uri);
+        try {
+            new ZeppOsFirmwareUpdateOperation(uri, this).perform();
+        } catch (final IOException ex) {
+            GB.toast(getContext(), "Firmware cannot be installed: " + ex.getMessage(), Toast.LENGTH_LONG, GB.ERROR, ex);
+        }
     }
 
     @Override
@@ -999,6 +1008,12 @@ public abstract class ZeppOsSupport extends HuamiSupport implements ZeppOsFileTr
         servicesService.requestServices(builder);
     }
 
+    @Override
+    @Deprecated
+    public final HuamiFWHelper createFWHelper(final Uri uri, final Context context) throws IOException {
+        throw new UnsupportedOperationException("This function should not be used for Zepp OS devices");
+    }
+
     public void addSupportedService(final short endpoint, final boolean encrypted) {
         mSupportedServices.add(endpoint);
         if (encrypted) {
@@ -1054,11 +1069,6 @@ public abstract class ZeppOsSupport extends HuamiSupport implements ZeppOsFileTr
         return mServiceMap.get(endpoint);
     }
 
-    @Override
-    public UpdateFirmwareOperation createUpdateFirmwareOperation(final Uri uri) {
-        return new UpdateFirmwareOperation2021(uri, this);
-    }
-
     @Override
     public int getActivitySampleSize() {
         return 8;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/operations/ZeppOsAgpsFile.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/operations/ZeppOsAgpsFile.java
index f13ac8953..9b2727af5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/operations/ZeppOsAgpsFile.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/operations/ZeppOsAgpsFile.java
@@ -23,7 +23,7 @@ import org.slf4j.LoggerFactory;
 import java.nio.charset.StandardCharsets;
 
 import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.UIHHContainer;
-import nodomain.freeyourgadget.gadgetbridge.util.ZipFile;
+import nodomain.freeyourgadget.gadgetbridge.util.GBZipFile;
 import nodomain.freeyourgadget.gadgetbridge.util.ZipFileException;
 
 public class ZeppOsAgpsFile {
@@ -36,11 +36,11 @@ public class ZeppOsAgpsFile {
     }
 
     public boolean isValid() {
-        if (!ZipFile.isZipFile(zipBytes)) {
+        if (!GBZipFile.isZipFile(zipBytes)) {
             return false;
         }
 
-        final ZipFile zipFile = new ZipFile(zipBytes);
+        final GBZipFile zipFile = new GBZipFile(zipBytes);
 
         try {
             final byte[] manifestBin = zipFile.getFileFromZip("META-INF/MANIFEST.MF");
@@ -67,7 +67,7 @@ public class ZeppOsAgpsFile {
     public byte[] getUihhBytes() {
         final UIHHContainer uihh = new UIHHContainer();
 
-        final ZipFile zipFile = new ZipFile(zipBytes);
+        final GBZipFile zipFile = new GBZipFile(zipBytes);
 
         try {
             uihh.addFile(UIHHContainer.FileType.AGPS_EPO_GR_3, zipFile.getFileFromZip("EPO_GR_3.DAT"));
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/operations/ZeppOsFirmwareUpdateOperation.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/operations/ZeppOsFirmwareUpdateOperation.java
new file mode 100644
index 000000000..2fc48b5e6
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/operations/ZeppOsFirmwareUpdateOperation.java
@@ -0,0 +1,376 @@
+/*  Copyright (C) 2022-2024 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.operations;
+
+import android.bluetooth.BluetoothGatt;
+import android.bluetooth.BluetoothGattCharacteristic;
+import android.net.Uri;
+import android.widget.Toast;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.util.UUID;
+
+import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventDisplayMessage;
+import nodomain.freeyourgadget.gadgetbridge.devices.DeviceCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiService;
+import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator;
+import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsFwHelper;
+import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.BLETypeConversions;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetDeviceBusyAction;
+import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetProgressAction;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.HuamiFirmwareType;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.operations.UpdateFirmwareOperation2020;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.zeppos.ZeppOsSupport;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.miband.operations.AbstractMiBandOperation;
+import nodomain.freeyourgadget.gadgetbridge.util.ArrayUtils;
+import nodomain.freeyourgadget.gadgetbridge.util.GB;
+
+/**
+ * This class is basically UpdateFirmwareOperation2020. However, Zepp OS firmwares are growing huge (200+MB),
+ * which crash Gadgetbridge. In order to refactor the upgrade process for Zepp OS devices without having to
+ * refactor all 52 devices, the code was moved to this class so it can be refactored with a smaller impact.
+ * <p>
+ * The protocol for Zepp OS devices differs from UpdateFirmwareOperation2020 in the following points:
+ * - no crc16 support (not needed for zepp os)
+ * - buildFirmwareInfoCommand is slightly different
+ * - at the end of the update, we request display items / watchfaces depending on what was installed, to refresh the
+ * preferences in the UI
+ */
+public class ZeppOsFirmwareUpdateOperation extends AbstractMiBandOperation<ZeppOsSupport> {
+    private static final Logger LOG = LoggerFactory.getLogger(ZeppOsFirmwareUpdateOperation.class);
+
+    private final Uri uri;
+    private final BluetoothGattCharacteristic fwCControlChar;
+    private final BluetoothGattCharacteristic fwCDataChar;
+    private ZeppOsFwHelper fwHelper;
+    private RandomAccessFile raf;
+
+    protected int mChunkLength = -1;
+
+    public ZeppOsFirmwareUpdateOperation(final Uri uri, final ZeppOsSupport support) {
+        super(support);
+        this.uri = uri;
+        this.fwCControlChar = getCharacteristic(HuamiService.UUID_CHARACTERISTIC_FIRMWARE);
+        this.fwCDataChar = getCharacteristic(HuamiService.UUID_CHARACTERISTIC_FIRMWARE_DATA);
+    }
+
+    @Override
+    protected void enableNeededNotifications(TransactionBuilder builder, boolean enable) {
+        builder.notify(fwCControlChar, enable);
+    }
+
+    @Override
+    protected void enableOtherNotifications(final TransactionBuilder builder, final boolean enable) {
+        // Disable 2021 chunked reads, otherwise firmware upgrades and activity sync get interrupted
+        // FIXME is this still needed?
+        builder.notify(getCharacteristic(HuamiService.UUID_CHARACTERISTIC_CHUNKEDTRANSFER_2021_READ), enable);
+    }
+
+    @Override
+    protected void doPerform() throws IOException {
+        final GBDevice device = getDevice();
+        final DeviceCoordinator coordinator = device.getDeviceCoordinator();
+        if (!(coordinator instanceof ZeppOsCoordinator)) {
+            throw new IOException("Not a Zepp OS coordinator for " + getDevice().getAddress());
+        }
+
+        fwHelper = new ZeppOsFwHelper(
+                uri,
+                getContext(),
+                ((ZeppOsCoordinator) coordinator).getDeviceBluetoothName(),
+                ((ZeppOsCoordinator) coordinator).getDeviceSources()
+        );
+
+        if (!fwHelper.isValid()) {
+            throw new IOException("Firmware is not valid for: " + getDevice().getAddress());
+        }
+
+        raf = new RandomAccessFile(fwHelper.getFile(), "r");
+
+        if (!requestParameters()) {
+            displayErrorMessage("Error requesting parameters, aborting.");
+            done();
+        }
+    }
+
+    protected void done() {
+        LOG.info("Operation done.");
+        operationFinished();
+        unsetBusy();
+    }
+
+    @Override
+    public boolean onCharacteristicWrite(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic, int status) {
+        if (status != BluetoothGatt.GATT_SUCCESS) {
+            operationFailed();
+        }
+        return super.onCharacteristicWrite(gatt, characteristic, status);
+    }
+
+    void operationFailed() {
+        GB.updateInstallNotification(getContext().getString(R.string.updatefirmwareoperation_write_failed), false, 0, getContext());
+    }
+
+    @Override
+    public boolean onCharacteristicChanged(BluetoothGatt gatt,
+                                           BluetoothGattCharacteristic characteristic) {
+        UUID characteristicUUID = characteristic.getUuid();
+        if (fwCControlChar.getUuid().equals(characteristicUUID)) {
+            handleNotificationNotif(characteristic.getValue());
+            return true; // don't let anyone else handle it
+        } else {
+            super.onCharacteristicChanged(gatt, characteristic);
+        }
+        return false;
+    }
+
+    protected void handleNotificationNotif(byte[] value) {
+        boolean success = (value[2] == HuamiService.SUCCESS) || ((value[1] == UpdateFirmwareOperation2020.REPLY_UPDATE_PROGRESS) && value.length >= 6); // ugly
+
+        if (value[0] == HuamiService.RESPONSE && success) {
+            try {
+                switch (value[1]) {
+                    case UpdateFirmwareOperation2020.COMMAND_REQUEST_PARAMETERS: {
+                        mChunkLength = (value[4] & 0xff) | ((value[5] & 0xff) << 8);
+                        LOG.info("got chunk length of " + mChunkLength);
+                        sendFwInfo();
+                        break;
+                    }
+                    case UpdateFirmwareOperation2020.COMMAND_SEND_FIRMWARE_INFO:
+                        sendTransferStart();
+                        break;
+                    case UpdateFirmwareOperation2020.COMMAND_START_TRANSFER:
+                        sendFirmwareDataChunk(0);
+                        break;
+                    // not used in zepp os
+                    //case HuamiService.COMMAND_FIRMWARE_START_DATA:
+                    //    sendChecksum();
+                    //    break;
+                    case UpdateFirmwareOperation2020.REPLY_UPDATE_PROGRESS:
+                        int offset = (value[2] & 0xff) | ((value[3] & 0xff) << 8) | ((value[4] & 0xff) << 16) | ((value[5] & 0xff) << 24);
+                        LOG.info("update progress " + offset + " bytes");
+                        sendFirmwareDataChunk(offset);
+                        break;
+                    case UpdateFirmwareOperation2020.COMMAND_COMPLETE_TRANSFER:
+                        sendFinalize();
+                        break;
+                    case UpdateFirmwareOperation2020.COMMAND_FINALIZE_UPDATE: {
+                        if (fwHelper.getFirmwareType() == HuamiFirmwareType.FIRMWARE) {
+                            TransactionBuilder builder = performInitialized("reboot");
+                            getSupport().sendReboot(builder);
+                            builder.queue(getQueue());
+                        } else {
+                            GB.updateInstallNotification(getContext().getString(R.string.updatefirmwareoperation_update_complete), false, 100, getContext());
+                            done();
+                        }
+                        break;
+                    }
+                    case HuamiService.COMMAND_FIRMWARE_REBOOT: {
+                        LOG.info("Reboot command successfully sent.");
+                        GB.updateInstallNotification(getContext().getString(R.string.updatefirmwareoperation_update_complete), false, 100, getContext());
+                        done();
+                        break;
+                    }
+                    default: {
+                        LOG.error("Unexpected response during firmware update: ");
+                        getSupport().logMessageContent(value);
+                        operationFailed();
+                        displayErrorMessage(getContext().getString(R.string.updatefirmwareoperation_updateproblem_do_not_reboot));
+                        done();
+                    }
+                }
+            } catch (Exception ex) {
+                displayErrorMessage(getContext().getString(R.string.updatefirmwareoperation_updateproblem_do_not_reboot));
+                done();
+            }
+        } else {
+            LOG.error("Unexpected notification during firmware update: ");
+            operationFailed();
+            getSupport().logMessageContent(value);
+            int errorMessage = R.string.updatefirmwareoperation_metadata_updateproblem;
+            // Display a more specific error message for known errors
+
+            if (value[0] == HuamiService.RESPONSE && value[1] == UpdateFirmwareOperation2020.COMMAND_START_TRANSFER && value[2] == UpdateFirmwareOperation2020.REPLY_ERROR_FREE_SPACE) {
+                // Not enough free space on the device
+                errorMessage = R.string.updatefirmwareoperation_updateproblem_free_space;
+            } else if (value[0] == HuamiService.RESPONSE && value[1] == UpdateFirmwareOperation2020.COMMAND_SEND_FIRMWARE_INFO && value[2] == UpdateFirmwareOperation2020.REPLY_ERROR_LOW_BATTERY) {
+                // Battery is too low
+                errorMessage = R.string.updatefirmwareoperation_updateproblem_low_battery;
+            }
+            displayErrorMessage(getContext().getString(errorMessage));
+            done();
+        }
+
+        if (ArrayUtils.startsWith(value, new byte[]{HuamiService.RESPONSE, UpdateFirmwareOperation2020.COMMAND_FINALIZE_UPDATE, HuamiService.SUCCESS})) {
+            if (fwHelper.getFirmwareType() == HuamiFirmwareType.APP) {
+                // After an app is installed, request the display items from the band (new app will be at the end)
+                try {
+                    TransactionBuilder builder = performInitialized("request display items and apps");
+                    getSupport().requestDisplayItems(builder);
+                    getSupport().requestApps(builder);
+                    builder.queue(getQueue());
+                } catch (final IOException e) {
+                    LOG.error("Failed to request display items after app install", e);
+                }
+            } else if (fwHelper.getFirmwareType() == HuamiFirmwareType.WATCHFACE) {
+                // After a watchface is installed, request the watchfaces from the band (new watchface will be at the end)
+                try {
+                    TransactionBuilder builder = performInitialized("request watchfaces and apps");
+                    getSupport().requestWatchfaces(builder);
+                    getSupport().requestApps(builder);
+                    builder.queue(getQueue());
+                } catch (final IOException e) {
+                    LOG.error("Failed to request watchfaces after watchface install", e);
+                }
+            }
+        }
+    }
+
+    private void displayErrorMessage(String message) {
+        getSupport().handleGBDeviceEvent(new GBDeviceEventDisplayMessage(message, Toast.LENGTH_LONG, GB.ERROR));
+    }
+
+    public void sendFwInfo() {
+        try {
+            TransactionBuilder builder = performInitialized("send firmware info");
+            builder.add(new SetDeviceBusyAction(getDevice(), getContext().getString(R.string.updating_firmware), getContext()));
+            builder.write(fwCControlChar, buildFirmwareInfoCommand());
+            builder.queue(getQueue());
+        } catch (IOException e) {
+            LOG.error("Error sending firmware info: " + e.getLocalizedMessage(), e);
+        }
+    }
+
+    protected byte[] buildFirmwareInfoCommand() {
+        final int fwSize = fwHelper.getSize();
+        final int crc32 = fwHelper.getCrc32();
+
+        final byte[] sizeBytes = BLETypeConversions.fromUint32(fwSize);
+        final byte[] chunkSizeBytes = BLETypeConversions.fromUint16(mChunkLength);
+        final byte[] crcBytes = BLETypeConversions.fromUint32(crc32);
+
+        return new byte[]{
+                UpdateFirmwareOperation2020.COMMAND_SEND_FIRMWARE_INFO,
+                fwHelper.getFirmwareType().getValue(),
+                sizeBytes[0],
+                sizeBytes[1],
+                sizeBytes[2],
+                sizeBytes[3],
+                crcBytes[0],
+                crcBytes[1],
+                crcBytes[2],
+                crcBytes[3],
+                chunkSizeBytes[0],
+                chunkSizeBytes[1],
+                0, // 0 to update in foreground, 1 for background
+                (byte) 0xff, // ??
+        };
+    }
+
+    public boolean requestParameters() {
+        try {
+            TransactionBuilder builder = performInitialized("get update capabilities");
+            byte[] bytes = new byte[]{UpdateFirmwareOperation2020.COMMAND_REQUEST_PARAMETERS};
+            builder.write(fwCControlChar, bytes);
+            builder.queue(getQueue());
+            return true;
+        } catch (IOException e) {
+            LOG.error("Error sending firmware info: " + e.getLocalizedMessage(), e);
+            return false;
+        }
+    }
+
+    private void sendFirmwareDataChunk(int offset) {
+        int len = fwHelper.getSize();
+        int remaining = len - offset;
+        final int packetLength = getSupport().getMTU() - 3;
+
+        int chunkLength = mChunkLength;
+        if (remaining < mChunkLength) {
+            chunkLength = remaining;
+        }
+
+        int packets = chunkLength / packetLength;
+        int chunkProgress = 0;
+
+        try {
+            if (remaining <= 0) {
+                sendTransferComplete();
+                return;
+            }
+
+            TransactionBuilder builder = performInitialized("send firmware packets");
+
+            for (int i = 0; i < packets; i++) {
+                raf.seek(offset + (long) i * packetLength);
+                byte[] fwChunk = new byte[packetLength];
+                raf.read(fwChunk);
+
+                builder.write(fwCDataChar, fwChunk);
+                chunkProgress += packetLength;
+            }
+
+            if (chunkProgress < chunkLength) {
+                raf.seek(offset + (long) packets * packetLength);
+                byte[] lastChunk = new byte[chunkLength - chunkProgress];
+                raf.read(lastChunk);
+                builder.write(fwCDataChar, lastChunk);
+            }
+
+            int progressPercent = (int) ((((float) (offset + chunkLength)) / len) * 100);
+
+            builder.add(new SetProgressAction(getContext().getString(R.string.updatefirmwareoperation_update_in_progress), true, progressPercent, getContext()));
+
+            builder.queue(getQueue());
+
+        } catch (final IOException e) {
+            LOG.error("Unable to send fw to device", e);
+            GB.updateInstallNotification(getContext().getString(R.string.updatefirmwareoperation_firmware_not_sent), false, 0, getContext());
+        }
+    }
+
+    protected void sendTransferStart() throws IOException {
+        final TransactionBuilder builder = performInitialized("transfer complete");
+        builder.write(fwCControlChar, new byte[]{
+                UpdateFirmwareOperation2020.COMMAND_START_TRANSFER, 1,
+        });
+        builder.queue(getQueue());
+    }
+
+    protected void sendTransferComplete() throws IOException {
+        final TransactionBuilder builder = performInitialized("transfer complete");
+        builder.write(fwCControlChar, new byte[]{
+                UpdateFirmwareOperation2020.COMMAND_COMPLETE_TRANSFER,
+        });
+        builder.queue(getQueue());
+    }
+
+    protected void sendFinalize() throws IOException {
+        final TransactionBuilder builder = performInitialized("finalize firmware");
+        builder.write(fwCControlChar, new byte[]{
+                UpdateFirmwareOperation2020.COMMAND_FINALIZE_UPDATE,
+        });
+        builder.queue(getQueue());
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/ZipFile.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GBZipFile.java
similarity index 93%
rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/ZipFile.java
rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GBZipFile.java
index 4d194569b..08c33e192 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/ZipFile.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GBZipFile.java
@@ -27,13 +27,11 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipException;
 import java.util.zip.ZipInputStream;
 
-import androidx.annotation.Nullable;
-
 /**
  * Utility class for recognition and reading of ZIP archives.
  */
-public class ZipFile {
-    private static final Logger LOG = LoggerFactory.getLogger(ZipFile.class);
+public class GBZipFile {
+    private static final Logger LOG = LoggerFactory.getLogger(GBZipFile.class);
     public static final byte[] ZIP_HEADER = new byte[]{
         0x50, 0x4B, 0x03, 0x04
     };
@@ -44,7 +42,7 @@ public class ZipFile {
      * Open ZIP file from byte array already in memory.
      * @param zipBytes data to handle as a ZIP file.
      */
-    public ZipFile(byte[] zipBytes) {
+    public GBZipFile(byte[] zipBytes) {
         this.zipBytes = zipBytes;
     }
 
@@ -53,7 +51,7 @@ public class ZipFile {
      * This will read the entire file into memory at once.
      * @param inputStream data to handle as a ZIP file.
      */
-    public ZipFile(InputStream inputStream) throws IOException {
+    public GBZipFile(InputStream inputStream) throws IOException {
         this.zipBytes = readAllBytes(inputStream);
     }
 
@@ -118,7 +116,7 @@ public class ZipFile {
         }
     }
 
-    private static byte[] readAllBytes(final InputStream is) throws IOException {
+    public static byte[] readAllBytes(final InputStream is) throws IOException {
         final ByteArrayOutputStream buffer = new ByteArrayOutputStream();
 
         int n;
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/test/ZipFileTest.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/test/GBZipFileTest.java
similarity index 93%
rename from app/src/test/java/nodomain/freeyourgadget/gadgetbridge/test/ZipFileTest.java
rename to app/src/test/java/nodomain/freeyourgadget/gadgetbridge/test/GBZipFileTest.java
index e9934b135..d634643d6 100644
--- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/test/ZipFileTest.java
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/test/GBZipFileTest.java
@@ -12,10 +12,10 @@ import java.nio.charset.StandardCharsets;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
-import nodomain.freeyourgadget.gadgetbridge.util.ZipFile;
+import nodomain.freeyourgadget.gadgetbridge.util.GBZipFile;
 import nodomain.freeyourgadget.gadgetbridge.util.ZipFileException;
 
-public class ZipFileTest extends TestBase {
+public class GBZipFileTest extends TestBase {
     private static final String TEST_FILE_NAME = "manifest.json";
     private static final String TEST_NESTED_FILE_NAME = "directory/manifest.json";
     private static final String TEST_FILE_CONTENTS_1 = "{ \"mykey\": \"myvalue\", \"myarr\": [0, 1, 2, 3] }";
@@ -44,7 +44,7 @@ public class ZipFileTest extends TestBase {
 
         byte[] zipArchive = createZipArchive(TEST_FILE_NAME, contents);
 
-        ZipFile zipFile = new ZipFile(zipArchive);
+        GBZipFile zipFile = new GBZipFile(zipArchive);
         String readContents = new String(zipFile.getFileFromZip(TEST_FILE_NAME));
 
         Assert.assertEquals(contents, readContents);
@@ -56,7 +56,7 @@ public class ZipFileTest extends TestBase {
 
         byte[] zipArchive = createZipArchive(TEST_FILE_NAME, contents);
 
-        ZipFile zipFile = new ZipFile(zipArchive);
+        GBZipFile zipFile = new GBZipFile(zipArchive);
         String readContents = new String(zipFile.getFileFromZip(TEST_FILE_NAME));
 
         Assert.assertEquals(contents, readContents);
@@ -68,7 +68,7 @@ public class ZipFileTest extends TestBase {
 
         byte[] zipArchive = createZipArchive(TEST_FILE_NAME, contents);
 
-        ZipFile zipFile = new ZipFile(zipArchive);
+        GBZipFile zipFile = new GBZipFile(zipArchive);
         String readContents = new String(zipFile.getFileFromZip(TEST_FILE_NAME));
 
         Assert.assertEquals(contents, readContents);
@@ -80,7 +80,7 @@ public class ZipFileTest extends TestBase {
 
         byte[] zipArchive = createZipArchive(TEST_FILE_NAME, contents);
 
-        ZipFile zipFile = new ZipFile(zipArchive);
+        GBZipFile zipFile = new GBZipFile(zipArchive);
         String readContents = new String(zipFile.getFileFromZip(TEST_FILE_NAME));
 
         Assert.assertEquals(contents, readContents);
@@ -92,7 +92,7 @@ public class ZipFileTest extends TestBase {
 
         byte[] zipArchive = createZipArchive(TEST_NESTED_FILE_NAME, contents);
 
-        ZipFile zipFile = new ZipFile(zipArchive);
+        GBZipFile zipFile = new GBZipFile(zipArchive);
         String readContents = new String(zipFile.getFileFromZip(TEST_NESTED_FILE_NAME));
 
         Assert.assertEquals(contents, readContents);
@@ -112,7 +112,7 @@ public class ZipFileTest extends TestBase {
         writeFileToZip(contents3, "file3", zipWriteStream);
         zipWriteStream.close();
 
-        ZipFile zipFile = new ZipFile(baos.toByteArray());
+        GBZipFile zipFile = new GBZipFile(baos.toByteArray());
         String readContents2 = new String(zipFile.getFileFromZip("file2"));
         String readContents1 = new String(zipFile.getFileFromZip("file1"));
         String readContents3 = new String(zipFile.getFileFromZip("file3"));
@@ -132,7 +132,7 @@ public class ZipFileTest extends TestBase {
         writeFileToZip("Hello, World!", "folder1/file3", zipWriteStream);
         zipWriteStream.close();
 
-        final ZipFile zipFile = new ZipFile(baos.toByteArray());
+        final GBZipFile zipFile = new GBZipFile(baos.toByteArray());
         Assert.assertTrue(zipFile.fileExists("file2"));
         Assert.assertTrue(zipFile.fileExists("file1"));
         Assert.assertTrue(zipFile.fileExists("folder1/file3"));

From aa4a7912eff43ff27a519cc3e8939aabec778810 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Thu, 1 Feb 2024 18:45:45 +0000
Subject: [PATCH 528/595] Zepp OS: Match devices by exact bluetooth name

This attemts to reduce false positives, especially for devices that
present as two bluetooth devices such as the GTR 4.
---
 .../huami/amazfitactive/AmazfitActiveCoordinator.java  |  7 -------
 .../AmazfitActiveEdgeCoordinator.java                  |  6 ------
 .../amazfitbalance/AmazfitBalanceCoordinator.java      |  7 -------
 .../huami/amazfitband7/AmazfitBand7Coordinator.java    |  6 ------
 .../huami/amazfitbip5/AmazfitBip5Coordinator.java      |  6 ------
 .../AmazfitCheetahProCoordinator.java                  |  6 ------
 .../AmazfitCheetahRoundCoordinator.java                |  6 ------
 .../AmazfitCheetahSquareCoordinator.java               |  6 ------
 .../huami/amazfitfalcon/AmazfitFalconCoordinator.java  |  6 ------
 .../huami/amazfitgtr3/AmazfitGTR3Coordinator.java      | 10 ----------
 .../amazfitgtr3pro/AmazfitGTR3ProCoordinator.java      |  6 ------
 .../huami/amazfitgtr4/AmazfitGTR4Coordinator.java      |  6 ------
 .../amazfitgtrmini/AmazfitGTRMiniCoordinator.java      |  6 ------
 .../huami/amazfitgts3/AmazfitGTS3Coordinator.java      |  6 ------
 .../huami/amazfitgts4/AmazfitGTS4Coordinator.java      |  7 -------
 .../amazfitgts4mini/AmazfitGTS4MiniCoordinator.java    |  7 -------
 .../huami/amazfittrex2/AmazfitTRex2Coordinator.java    |  6 ------
 .../amazfittrexultra/AmazfitTRexUltraCoordinator.java  |  6 ------
 .../devices/huami/miband7/MiBand7Coordinator.java      |  7 -------
 .../devices/huami/zeppos/ZeppOsCoordinator.java        | 10 ++++++++++
 20 files changed, 10 insertions(+), 123 deletions(-)

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 ec2c4a32e..e253d7661 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
@@ -24,7 +24,6 @@ import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
 
 public class AmazfitActiveCoordinator extends ZeppOsCoordinator {
     @Override
@@ -42,12 +41,6 @@ public class AmazfitActiveCoordinator extends ZeppOsCoordinator {
         return R.string.devicetype_amazfit_active;
     }
 
-    @Override
-    public boolean supports(final GBDeviceCandidate candidate) {
-        final String name = candidate.getName();
-        return name.startsWith(HuamiConst.AMAZFIT_ACTIVE_NAME) && !name.contains("Edge");
-    }
-
     @Override
     public boolean supportsContinuousFindDevice() {
         return true;
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 b362b0aa2..bc0a7cbc5 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
@@ -19,7 +19,6 @@ package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitactiveedge;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
-import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
@@ -47,11 +46,6 @@ public class AmazfitActiveEdgeCoordinator extends ZeppOsCoordinator {
         return R.string.devicetype_amazfit_active_edge;
     }
 
-    @Override
-    protected Pattern getSupportedDeviceName() {
-        return Pattern.compile(HuamiConst.AMAZFIT_ACTIVE_EDGE_NAME + ".*");
-    }
-
     @Override
     public boolean supportsContinuousFindDevice() {
         return true;
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 1a593c12b..34c0c1b19 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
@@ -19,7 +19,6 @@ package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitbalance;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
-import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
@@ -42,12 +41,6 @@ public class AmazfitBalanceCoordinator extends ZeppOsCoordinator {
         return R.string.devicetype_amazfit_balance;
     }
 
-    @Override
-    protected Pattern getSupportedDeviceName() {
-        return Pattern.compile(HuamiConst.AMAZFIT_BALANCE_NAME + ".*");
-    }
-
-
     @Override
     public boolean supportsContinuousFindDevice() {
         return true;
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 069c70ae5..bbbdcce43 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
@@ -19,7 +19,6 @@ package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitband7;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
-import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
@@ -37,11 +36,6 @@ public class AmazfitBand7Coordinator extends ZeppOsCoordinator {
         return new HashSet<>(Arrays.asList(252, 253, 254));
     }
 
-    @Override
-    protected Pattern getSupportedDeviceName() {
-        return Pattern.compile(HuamiConst.AMAZFIT_BAND7_NAME + ".*", Pattern.CASE_INSENSITIVE);
-    }
-
     @Override
     public boolean supportsAgpsUpdates() {
         return false;
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 e0dbbcc7d..b21fac3ca 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
@@ -19,7 +19,6 @@ package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitbip5;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
-import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
@@ -37,11 +36,6 @@ public class AmazfitBip5Coordinator extends ZeppOsCoordinator {
         return new HashSet<>(Arrays.asList(8454400, 8454401));
     }
 
-    @Override
-    protected Pattern getSupportedDeviceName() {
-        return Pattern.compile(HuamiConst.AMAZFIT_BIP5_NAME + ".*");
-    }
-
     @Override
     public boolean supportsContinuousFindDevice() {
         return true;
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 1baa0da64..0e164de68 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
@@ -19,7 +19,6 @@ package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitcheetahpro;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
-import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
@@ -37,11 +36,6 @@ public class AmazfitCheetahProCoordinator extends ZeppOsCoordinator {
         return new HashSet<>(Arrays.asList(8126720, 8126721));
     }
 
-    @Override
-    protected Pattern getSupportedDeviceName() {
-        return Pattern.compile(HuamiConst.AMAZFIT_CHEETAH_PRO_NAME + ".*");
-    }
-
     @Override
     public int getDeviceNameResource() {
         return R.string.devicetype_amazfit_cheetah_pro;
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 0b3ecb7b7..75a93482d 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
@@ -19,7 +19,6 @@ package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitcheetahround;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
-import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
@@ -47,11 +46,6 @@ public class AmazfitCheetahRoundCoordinator extends ZeppOsCoordinator {
         return R.string.devicetype_amazfit_cheetah_round;
     }
 
-    @Override
-    protected Pattern getSupportedDeviceName() {
-        return Pattern.compile(HuamiConst.AMAZFIT_CHEETAH_ROUND_NAME + ".*");
-    }
-
     @Override
     public boolean supportsContinuousFindDevice() {
         return true;
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 92e4faeff..5a326c0fa 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
@@ -19,7 +19,6 @@ package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitcheetahsquare;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
-import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
@@ -42,11 +41,6 @@ public class AmazfitCheetahSquareCoordinator extends ZeppOsCoordinator {
         return new HashSet<>(Collections.singletonList(8257793));
     }
 
-    @Override
-    protected Pattern getSupportedDeviceName() {
-        return Pattern.compile(HuamiConst.AMAZFIT_CHEETAH_SQUARE_NAME + ".*");
-    }
-
     @Override
     public boolean supportsContinuousFindDevice() {
         return true;
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 806e63eb0..30b078f0e 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
@@ -19,7 +19,6 @@ package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitfalcon;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
-import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
@@ -47,11 +46,6 @@ public class AmazfitFalconCoordinator extends ZeppOsCoordinator {
         return R.string.devicetype_amazfit_falcon;
     }
 
-    @Override
-    protected Pattern getSupportedDeviceName() {
-        return Pattern.compile(HuamiConst.AMAZFIT_FALCON_NAME + ".*");
-    }
-
     @Override
     public boolean sendAgpsAsFileTransfer() {
         return false;
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 ebb44282b..b177036be 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
@@ -16,8 +16,6 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgtr3;
 
-import androidx.annotation.NonNull;
-
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
@@ -26,7 +24,6 @@ import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
 
 public class AmazfitGTR3Coordinator extends ZeppOsCoordinator {
     @Override
@@ -39,13 +36,6 @@ public class AmazfitGTR3Coordinator extends ZeppOsCoordinator {
         return new HashSet<>(Arrays.asList(226, 227));
     }
 
-    @NonNull
-    @Override
-    public boolean supports(final GBDeviceCandidate candidate) {
-        final String name = candidate.getName();
-        return name.startsWith(HuamiConst.AMAZFIT_GTR3_NAME) && !name.contains("Pro");
-    }
-
     @Override
     public int getDeviceNameResource() {
         return R.string.devicetype_amazfit_gtr3;
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 002ca0a11..c1ca86942 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
@@ -19,7 +19,6 @@ package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgtr3pro;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
-import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
@@ -37,11 +36,6 @@ public class AmazfitGTR3ProCoordinator extends ZeppOsCoordinator {
         return new HashSet<>(Arrays.asList(229, 230, 6095106));
     }
 
-    @Override
-    protected Pattern getSupportedDeviceName() {
-        return Pattern.compile(HuamiConst.AMAZFIT_GTR3_PRO_NAME + ".*");
-    }
-
     @Override
     public int getDeviceNameResource() {
         return R.string.devicetype_amazfit_gtr3_pro;
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 3409dc741..ee9f879ee 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
@@ -24,7 +24,6 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
@@ -42,11 +41,6 @@ public class AmazfitGTR4Coordinator extends ZeppOsCoordinator {
         return new HashSet<>(Arrays.asList(7930112, 7930113, 7864577));
     }
 
-    @Override
-    protected Pattern getSupportedDeviceName() {
-        return Pattern.compile(HuamiConst.AMAZFIT_GTR4_NAME + ".*");
-    }
-
     @Override
     protected Map<Integer, String> getCrcMap() {
         return new HashMap<Integer, String>() {{
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 dd5e7a0d2..bfe8472f3 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
@@ -19,7 +19,6 @@ package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgtrmini;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
-import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
@@ -42,11 +41,6 @@ public class AmazfitGTRMiniCoordinator extends ZeppOsCoordinator {
         return R.string.devicetype_amazfit_gtr_mini;
     }
 
-    @Override
-    protected Pattern getSupportedDeviceName() {
-        return Pattern.compile(HuamiConst.AMAZFIT_GTR_MINI_NAME + ".*");
-    }
-
     @Override
     public boolean sendAgpsAsFileTransfer() {
         // Even though it's a Zepp OS 2.0 device, it doesn't seem to support the AGPS service
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 e10eee737..2bf8c0add 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
@@ -19,7 +19,6 @@ package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgts3;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
-import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
@@ -37,11 +36,6 @@ public class AmazfitGTS3Coordinator extends ZeppOsCoordinator {
         return new HashSet<>(Arrays.asList(224, 225));
     }
 
-    @Override
-    protected Pattern getSupportedDeviceName() {
-        return Pattern.compile(HuamiConst.AMAZFIT_GTS3_NAME + ".*");
-    }
-
     @Override
     public boolean sendAgpsAsFileTransfer() {
         return false;
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 a6e34e0db..0ecf35ac0 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
@@ -24,7 +24,6 @@ import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
 
 public class AmazfitGTS4Coordinator extends ZeppOsCoordinator {
     @Override
@@ -37,12 +36,6 @@ public class AmazfitGTS4Coordinator extends ZeppOsCoordinator {
         return new HashSet<>(Arrays.asList(7995648, 7995649));
     }
 
-    @Override
-    public boolean supports(final GBDeviceCandidate candidate) {
-        final String name = candidate.getName();
-        return name.startsWith(HuamiConst.AMAZFIT_GTS4_NAME) && !name.contains("Mini");
-    }
-
     @Override
     public boolean supportsContinuousFindDevice() {
         return true;
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 f8be8dcc6..f5101bd5c 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
@@ -19,7 +19,6 @@ package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgts4mini;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
-import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
@@ -37,12 +36,6 @@ public class AmazfitGTS4MiniCoordinator extends ZeppOsCoordinator {
         return new HashSet<>(Arrays.asList(246, 247));
     }
 
-    @Override
-    protected Pattern getSupportedDeviceName() {
-        return Pattern.compile(HuamiConst.AMAZFIT_GTS4_MINI_NAME + ".*");
-    }
-
-
     @Override
     public boolean sendAgpsAsFileTransfer() {
         return false;
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 b414d9321..0e0ff52e5 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
@@ -19,7 +19,6 @@ package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfittrex2;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
-import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
@@ -37,11 +36,6 @@ public class AmazfitTRex2Coordinator extends ZeppOsCoordinator {
         return new HashSet<>(Arrays.asList(418, 419));
     }
 
-    @Override
-    protected Pattern getSupportedDeviceName() {
-        return Pattern.compile(HuamiConst.AMAZFIT_TREX_2_NAME + ".*");
-    }
-
     @Override
     public int getDeviceNameResource() {
         return R.string.devicetype_amazfit_trex_2;
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 8a3e6758d..16dad5bc3 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
@@ -19,7 +19,6 @@ package nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfittrexultra;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
-import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
@@ -42,11 +41,6 @@ public class AmazfitTRexUltraCoordinator extends ZeppOsCoordinator {
         return R.string.devicetype_amazfit_trex_ultra;
     }
 
-    @Override
-    protected Pattern getSupportedDeviceName() {
-        return Pattern.compile(HuamiConst.AMAZFIT_TREX_ULTRA + ".*");
-    }
-
     @Override
     public boolean supportsContinuousFindDevice() {
         return true;
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 c6a907dc4..297cae6b3 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
@@ -26,7 +26,6 @@ import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
-import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
 
 public class MiBand7Coordinator extends ZeppOsCoordinator {
     @Override
@@ -50,12 +49,6 @@ public class MiBand7Coordinator extends ZeppOsCoordinator {
         }};
     }
 
-    @Override
-    public boolean supports(final GBDeviceCandidate candidate) {
-        final String name = candidate.getName();
-        return name.startsWith(HuamiConst.XIAOMI_SMART_BAND7_NAME) && !name.contains("Pro");
-    }
-
     @Override
     public boolean supportsAgpsUpdates() {
         return false;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/ZeppOsCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/ZeppOsCoordinator.java
index fadacce2a..4d25919dc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/ZeppOsCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/ZeppOsCoordinator.java
@@ -32,6 +32,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.regex.Pattern;
 
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.activities.appmanager.AppManagerActivity;
@@ -83,6 +84,15 @@ public abstract class ZeppOsCoordinator extends HuamiCoordinator {
         return Collections.emptyMap();
     }
 
+    @Override
+    protected final Pattern getSupportedDeviceName() {
+        // Most devices use the exact bluetooth name
+        // Some devices have a " XXXX" suffix with the last 4 digits of mac address (eg. Mi Band 7)
+        // *However*, some devices broadcast a 2nd bluetooth device with "-XXXX" suffix, which is only
+        // used for calls and Gadgetbridge can't use for pairing.
+        return Pattern.compile("^" + getDeviceBluetoothName() + "( [A-Z0-9]{4})?$");
+    }
+
     @NonNull
     @Override
     public final Class<? extends DeviceSupport> getDeviceSupportClass() {

From dbfb8e5c38c04e8bea0342ff82e2b4de07a9065a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Thu, 1 Feb 2024 13:37:53 +0000
Subject: [PATCH 529/595] Zepp OS: Improve logging

- Do not log characteristic changes handled by parent class
- Log discovered service names
- Request and log supported config groups
---
 .../service/devices/huami/HuamiSupport.java   | 12 ++++++--
 .../zeppos/services/ZeppOsConfigService.java  | 28 ++++++++++++++++++-
 .../services/ZeppOsServicesService.java       |  7 ++++-
 3 files changed, 42 insertions(+), 5 deletions(-)

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 5729c9995..90011767d 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
@@ -2272,9 +2272,12 @@ public abstract class HuamiSupport extends AbstractBTLEDeviceSupport implements
     @Override
     public boolean onCharacteristicChanged(BluetoothGatt gatt,
                                            BluetoothGattCharacteristic characteristic) {
-        super.onCharacteristicChanged(gatt, characteristic);
+        if (super.onCharacteristicChanged(gatt, characteristic)) {
+            // handled upstream
+            return true;
+        }
 
-        UUID characteristicUUID = characteristic.getUuid();
+        final UUID characteristicUUID = characteristic.getUuid();
         if (HuamiService.UUID_CHARACTERISTIC_6_BATTERY_INFO.equals(characteristicUUID)) {
             handleBatteryInfo(characteristic.getValue(), BluetoothGatt.GATT_SUCCESS);
             return true;
@@ -2317,7 +2320,10 @@ public abstract class HuamiSupport extends AbstractBTLEDeviceSupport implements
     @Override
     public boolean onCharacteristicRead(BluetoothGatt gatt,
                                         BluetoothGattCharacteristic characteristic, int status) {
-        super.onCharacteristicRead(gatt, characteristic, status);
+        if (super.onCharacteristicRead(gatt, characteristic, status)) {
+            // handled upstream
+            return true;
+        }
 
         UUID characteristicUUID = characteristic.getUuid();
         if (GattCharacteristic.UUID_CHARACTERISTIC_DEVICE_NAME.equals(characteristicUUID)) {
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 2171b0aeb..6fdf0b133 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
@@ -107,6 +107,10 @@ public class ZeppOsConfigService extends AbstractZeppOsService {
     @Override
     public void handlePayload(final byte[] payload) {
         switch (payload[0]) {
+            case CMD_CAPABILITIES_RESPONSE:
+                handleCapabilitiesResponse(payload);
+                return;
+
             case CMD_ACK:
                 LOG.info("Configuration ACK, status = {}", payload[1]);
                 return;
@@ -125,7 +129,8 @@ public class ZeppOsConfigService extends AbstractZeppOsService {
     }
 
     @Override
-    public void initialize(TransactionBuilder builder) {
+    public void initialize(final TransactionBuilder builder) {
+        write(builder, CMD_CAPABILITIES_REQUEST);
         requestAllConfigs(builder);
     }
 
@@ -152,6 +157,27 @@ public class ZeppOsConfigService extends AbstractZeppOsService {
         return false;
     }
 
+    private void handleCapabilitiesResponse(final byte[] payload) {
+        final int version = payload[1] & 0xFF;
+        LOG.info("Got config service version={}", version);
+        if (version > 3) {
+            LOG.error("Unsupported config service version {}", version);
+            return;
+        }
+        final int numGroups = payload[2] & 0xFF;
+        if (payload.length != numGroups + 3) {
+            LOG.error("Unexpected config capabilities response length {} for {} groups", payload.length, numGroups);
+            return;
+        }
+
+        for (int i = 0; i < numGroups; i++) {
+            final ConfigGroup configGroup = ConfigGroup.fromValue(payload[3 + i]);
+            LOG.debug("Got supported config group {}: {}", String.format("0x%02x", payload[3 + i]), configGroup);
+        }
+
+        // TODO: We should only request supported config groups
+    }
+
     private boolean sentFitnessGoal = false;
 
     private void handle2021ConfigResponse(final byte[] payload) {
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 f059b4ec0..4e0b19dcf 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
@@ -72,7 +72,12 @@ public class ZeppOsServicesService extends AbstractZeppOsService {
 
             final AbstractZeppOsService service = getSupport().getService(endpoint);
 
-            LOG.debug("Service: endpoint={} encrypted={} known={}", String.format("%04x", endpoint), encrypted, service != null);
+            LOG.debug(
+                    "Zepp OS Service: endpoint={} encrypted={} name={}",
+                    String.format("%04x", endpoint),
+                    encrypted,
+                    service != null ? service.getClass().getSimpleName() : "unknown"
+            );
 
             if (service != null && encrypted != null) {
                 service.setEncrypted(encrypted);

From b647631c075435b19c3afd0cc222f5f545aef9fb Mon Sep 17 00:00:00 2001
From: Victor Kareh <vkareh@redhat.com>
Date: Thu, 1 Feb 2024 09:00:11 -0500
Subject: [PATCH 530/595] pinetime: Fix weather forecast write

Fixes a typo in the weather forecast characteristic writer that causes
Gadgetbridge to send the current weather twice rather than sending the
forecast.
---
 .../service/devices/pinetime/PineTimeJFSupport.java             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pinetime/PineTimeJFSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pinetime/PineTimeJFSupport.java
index 39d12207c..46bef2d16 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pinetime/PineTimeJFSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pinetime/PineTimeJFSupport.java
@@ -1021,7 +1021,7 @@ public class PineTimeJFSupport extends AbstractBTLEDeviceSupport implements DfuL
         TransactionBuilder forecastBuilder = createTransactionBuilder("SimpleWeatherData");
         safeWriteToCharacteristic(forecastBuilder,
                 PineTimeJFConstants.UUID_CHARACTERISTIC_SIMPLE_WEATHER_DATA,
-                currentPacket.array());
+                forecastPacket.array());
 
         forecastBuilder.queue(getQueue());
     }

From 90d4bebdf5236994cf90d4571e326cb9c05c8280 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Thu, 1 Feb 2024 19:15:48 +0000
Subject: [PATCH 531/595] Update changelog

---
 CHANGELOG.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 818df2a0a..8c53ee4a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,17 +2,26 @@
 
 #### Next Version (WIP)
 
+* Initial support for Honor Magic Watch 2
 * Initial support for Mijia MHO-C303
+* Initial support for Nothing CMF Watch Pro
 * Initial support for Sony WI-SP600N
+* Experimental support for Redmi Watch 2
 * Experimental support for Xiaomi Smart Band 8 Pro
 * Experimental support for Xiaomi Watch S1 Pro
 * Experimental support for Xiaomi Watch S1
 * Experimental support for Xiaomi Watch S3
 * Redmi Smart Band Pro: Fix password digits
+* Pebble: Fix app configuration page
+* PineTime: Fix weather forecast on InfiniTime's new simple weather
 * Xiaomi: Fix sleep sometimes extending past the wakeup time
 * Xiaomi: Request battery level and charging state periodically
+* Xiaomi: Fix sleep stage parsing for some devices
+* Zepp OS: Improve device discovery
 * Zepp OS: Fix weather not working on some devices
+* Zepp OS: Prevent crash when installing large firmware updates
 * Fix sport activity summary group order
+* Fix reconnection to devices failing occasionally
 
 #### 0.78.0
 * Initial support for Honor Band 3,4,5,6

From 3e08a754e041fcdd471ee3496be17c3460c45559 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Thu, 1 Feb 2024 20:02:31 +0000
Subject: [PATCH 532/595] Xiaomi: Fix indoor cycling recognition

---
 .../devices/xiaomi/activity/impl/WorkoutSummaryParser.java       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java
index d28173510..129c76406 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/WorkoutSummaryParser.java
@@ -142,6 +142,7 @@ public class WorkoutSummaryParser extends XiaomiActivityParser implements Activi
                 // TODO
                 break;
             case SPORTS_INDOOR_CYCLING:
+                summary.setActivityKind(ActivityKind.TYPE_INDOOR_CYCLING);
                 parser = getIndoorCyclingParser(fileId);
                 break;
             case SPORTS_FREESTYLE:

From 2a377ba5ab95faad4f0bfc7a5010167b0bf76032 Mon Sep 17 00:00:00 2001
From: Damien 'Psolyca' Gaignon <damien.gaignon@gmail.com>
Date: Tue, 30 Jan 2024 22:14:28 +0100
Subject: [PATCH 533/595] [Huawei] Change bonding style for all BR gadgets

---
 .../gadgetbridge/devices/huawei/HuaweiBRCoordinator.java     | 2 +-
 .../huawei/honormagicwatch2/HonorMagicWatch2Coordinator.java | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiBRCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiBRCoordinator.java
index 228645812..bd2606efb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiBRCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiBRCoordinator.java
@@ -79,7 +79,7 @@ public abstract class HuaweiBRCoordinator extends AbstractBLClassicDeviceCoordin
     
     @Override
     public int getBondingStyle(){
-        return BONDING_STYLE_NONE;
+        return BONDING_STYLE_ASK;
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honormagicwatch2/HonorMagicWatch2Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honormagicwatch2/HonorMagicWatch2Coordinator.java
index 724e738e3..d7d3715cc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honormagicwatch2/HonorMagicWatch2Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/honormagicwatch2/HonorMagicWatch2Coordinator.java
@@ -54,11 +54,6 @@ public class HonorMagicWatch2Coordinator extends HuaweiBRCoordinator {
         return Pattern.compile(HuaweiConstants.HO_MAGICWATCH2_NAME + ".*", Pattern.CASE_INSENSITIVE);
     }
 
-    @Override
-    public int getBondingStyle(){
-        return BONDING_STYLE_ASK;
-    }
-
     @Override
     public boolean supportsSpo2() {
         return true;

From 944e0d92a7e6ce51e1f9476b3353eb87142837dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 2 Feb 2024 20:50:58 +0000
Subject: [PATCH 534/595] Zepp OS: Fix AGPS uploads

Regression introduced by 34fd18885a - UIHH upload is needed for AGPS
updates on older devices.
---
 .../devices/huami/zeppos/ZeppOsFwHelper.java  | 103 ++++++++++++++++--
 .../devices/huami/zeppos/ZeppOsSupport.java   |  14 ++-
 2 files changed, 103 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/ZeppOsFwHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/ZeppOsFwHelper.java
index ff98ee073..803d6a0f7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/ZeppOsFwHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/ZeppOsFwHelper.java
@@ -28,12 +28,15 @@ import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.BufferedInputStream;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.Set;
 import java.util.UUID;
 import java.util.zip.CRC32;
@@ -43,10 +46,13 @@ import java.util.zip.ZipFile;
 
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceApp;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.HuamiFirmwareType;
+import nodomain.freeyourgadget.gadgetbridge.service.devices.huami.UIHHContainer;
 import nodomain.freeyourgadget.gadgetbridge.util.BitmapUtil;
 import nodomain.freeyourgadget.gadgetbridge.util.CheckSums;
+import nodomain.freeyourgadget.gadgetbridge.util.FileUtils;
 import nodomain.freeyourgadget.gadgetbridge.util.GBZipFile;
 import nodomain.freeyourgadget.gadgetbridge.util.UriHelper;
+import nodomain.freeyourgadget.gadgetbridge.util.ZipFileException;
 
 public class ZeppOsFwHelper {
     private static final Logger LOG = LoggerFactory.getLogger(ZeppOsFwHelper.class);
@@ -106,7 +112,7 @@ public class ZeppOsFwHelper {
         zpkCacheDir.mkdir();
 
         try {
-            file = File.createTempFile("fwhelper","bin", context.getCacheDir());
+            file = File.createTempFile("fwhelper", "bin", context.getCacheDir());
             file.deleteOnExit();
         } catch (final IOException e) {
             LOG.error("Failed to create temp file for zpk", e);
@@ -136,15 +142,77 @@ public class ZeppOsFwHelper {
             return;
         }
 
-        try (ZipFile zipFile = new ZipFile(file, java.util.zip.ZipFile.OPEN_READ)) {
-            processZipFile(zipFile);
-        } catch (final ZipException e) {
-            LOG.warn("{} is not a valid zip file", uri, e);
-        } catch (final IOException e) {
-            LOG.warn("Error while processing {}", uri, e);
+        final byte[] header = getHeader(file, 4);
+        if (header == null) {
+            return;
         }
 
-        // TODO process as UIHH
+        if (Arrays.equals(header, GBZipFile.ZIP_HEADER)) {
+            try (ZipFile zipFile = new ZipFile(file, java.util.zip.ZipFile.OPEN_READ)) {
+                processZipFile(zipFile);
+            } catch (final ZipException e) {
+                LOG.warn("{} is not a valid zip file", uri, e);
+            } catch (final IOException e) {
+                LOG.warn("Error while processing {}", uri, e);
+            }
+        } else if (Arrays.equals(header, UIHHContainer.UIHH_HEADER)) {
+            // FIXME: This should be refactored to avoid pulling the entire file to memory
+            // However, it's currently only used for agps updates, which are usually just ~140KB
+            try (InputStream in = new BufferedInputStream(uriHelper.openInputStream())) {
+                final byte[] fullFile = FileUtils.readAll(in, 32 * 1024 * 1024); // 32MB
+                processAsUihh(fullFile);
+            } catch (final IOException e) {
+                LOG.error("Failed to read full uihh from file", e);
+            }
+        }
+    }
+
+    private void processAsUihh(byte[] bytes) {
+        final UIHHContainer uihh = UIHHContainer.fromRawBytes(bytes);
+        if (uihh == null) {
+            LOG.warn("Invalid UIHH file");
+            return;
+        }
+
+        final Set<UIHHContainer.FileType> agpsEpoTypes = new HashSet<>();
+        UIHHContainer.FileEntry uihhFirmwareZipFile = null;
+        boolean hasChangelog = false;
+        for (final UIHHContainer.FileEntry file : uihh.getFiles()) {
+            switch (file.getType()) {
+                case FIRMWARE_ZIP:
+                    uihhFirmwareZipFile = file;
+                    continue;
+                case FIRMWARE_CHANGELOG:
+                    hasChangelog = true;
+                    continue;
+                case AGPS_EPO_GR_3:
+                case AGPS_EPO_GAL_7:
+                case AGPS_EPO_BDS_3:
+                    agpsEpoTypes.add(file.getType());
+                    continue;
+                default:
+                    LOG.warn("Unexpected file for {}", file.getType());
+            }
+        }
+
+        if (uihhFirmwareZipFile != null && hasChangelog) {
+            // UIHH firmware update
+            final GBZipFile zipFile = new GBZipFile(uihhFirmwareZipFile.getContent());
+            final byte[] firmwareBin;
+            try {
+                firmwareBin = zipFile.getFileFromZip("META/firmware.bin");
+            } catch (final ZipFileException e) {
+                LOG.error("Failed to read zip from UIHH", e);
+                return;
+            }
+
+            if (isCompatibleFirmwareBin(firmwareBin)) {
+                firmwareType = HuamiFirmwareType.FIRMWARE_UIHH_2021_ZIP_WITH_CHANGELOG;
+            }
+        } else if (agpsEpoTypes.size() == 3) {
+            // AGPS EPO update
+            firmwareType = HuamiFirmwareType.AGPS_UIHH;
+        }
     }
 
     private void processZipFile(final ZipFile zipFile) {
@@ -252,7 +320,7 @@ public class ZeppOsFwHelper {
 
             final File zpkFile;
             try {
-                zpkFile = File.createTempFile("zpk","zip", context.getCacheDir());
+                zpkFile = File.createTempFile("zpk", "zip", context.getCacheDir());
                 zpkFile.deleteOnExit();
             } catch (final IOException e) {
                 LOG.error("Failed to create temp file for zpk", e);
@@ -432,6 +500,23 @@ public class ZeppOsFwHelper {
         }
     }
 
+    @Nullable
+    public static byte[] getHeader(final File file, final int bytes) {
+        final byte[] header = new byte[bytes];
+
+        try (InputStream is = new FileInputStream(file)) {
+            if (is.read(header) != header.length) {
+                LOG.warn("Read unexpected number of header bytes");
+                return null;
+            }
+        } catch (final IOException e) {
+            LOG.error("Error while reading header bytes", e);
+            return null;
+        }
+
+        return header;
+    }
+
     public static boolean searchString(final byte[] fwBytes, final String str) {
         final byte[] strBytes = (str + "\0").getBytes(StandardCharsets.UTF_8);
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsSupport.java
index 6a7aeffa1..6a5de07d9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsSupport.java
@@ -642,11 +642,13 @@ public final class ZeppOsSupport extends HuamiSupport implements ZeppOsFileTrans
                         return;
                     }
 
-                    new ZeppOsFirmwareUpdateOperation(Uri.parse(uihhFile.toURI().toString()), this).perform();
+                    new ZeppOsFirmwareUpdateOperation(
+                            Uri.parse(uihhFile.toURI().toString()),
+                            this
+                    ).perform();
                 }
-
             } catch (final Exception e) {
-                GB.toast(getContext(), "AGPS file cannot be installed: " + e.getMessage(), Toast.LENGTH_LONG, GB.ERROR, e);
+                GB.toast(getContext(), "AGPS install error: " + e.getMessage(), Toast.LENGTH_LONG, GB.ERROR, e);
             }
 
             return;
@@ -661,14 +663,16 @@ public final class ZeppOsSupport extends HuamiSupport implements ZeppOsFileTrans
                         fileTransferService
                 ).perform();
             } catch (final Exception e) {
-                GB.toast(getContext(), "Gpx route file cannot be installed: " + e.getMessage(), Toast.LENGTH_LONG, GB.ERROR, e);
+                GB.toast(getContext(), "Gpx install error: " + e.getMessage(), Toast.LENGTH_LONG, GB.ERROR, e);
             }
+
+            return;
         }
 
         try {
             new ZeppOsFirmwareUpdateOperation(uri, this).perform();
         } catch (final IOException ex) {
-            GB.toast(getContext(), "Firmware cannot be installed: " + ex.getMessage(), Toast.LENGTH_LONG, GB.ERROR, ex);
+            GB.toast(getContext(), "Firmware install error: " + ex.getMessage(), Toast.LENGTH_LONG, GB.ERROR, ex);
         }
     }
 

From 145c2b8c6c2b5c5ef191814d34576970852db61d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Fri, 2 Feb 2024 20:58:00 +0000
Subject: [PATCH 535/595] Zepp OS: Recognize devices with a dash before mac
 address suffix

---
 .../devices/huami/zeppos/ZeppOsCoordinator.java            | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/ZeppOsCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/ZeppOsCoordinator.java
index 4d25919dc..73ce5af7b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/ZeppOsCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/ZeppOsCoordinator.java
@@ -88,9 +88,10 @@ public abstract class ZeppOsCoordinator extends HuamiCoordinator {
     protected final Pattern getSupportedDeviceName() {
         // Most devices use the exact bluetooth name
         // Some devices have a " XXXX" suffix with the last 4 digits of mac address (eg. Mi Band 7)
-        // *However*, some devices broadcast a 2nd bluetooth device with "-XXXX" suffix, which is only
-        // used for calls and Gadgetbridge can't use for pairing.
-        return Pattern.compile("^" + getDeviceBluetoothName() + "( [A-Z0-9]{4})?$");
+        // *However*, some devices broadcast a 2nd bluetooth device with "-XXXX" suffix, which I believe
+        // is only used for calls, and Gadgetbridge can't use for pairing, but I was not yet able to
+        // fully confirm this, so we still recognize them.
+        return Pattern.compile("^" + getDeviceBluetoothName() + "([- ][A-Z0-9]{4})?$");
     }
 
     @NonNull

From 8aaa766dcd61d7657356a09fa60ac5f9624c09cc Mon Sep 17 00:00:00 2001
From: Arjan Schrijver <a_gadgetbridge@anymore.nl>
Date: Sun, 4 Feb 2024 20:35:40 +0100
Subject: [PATCH 536/595] Fix crash when receiving empty music state

---
 .../externalevents/NotificationListener.java   | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
index 1dc673a45..3727d6f2c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
@@ -700,15 +700,17 @@ public class NotificationListener extends NotificationListenerService {
             };
             mHandler.postDelayed(mSetMusicInfoRunnable, 100);
 
-            if (mSetMusicStateRunnable != null) {
-                mHandler.removeCallbacks(mSetMusicStateRunnable);
-            }
-            mSetMusicStateRunnable = new Runnable() {
-                @Override
-                public void run() {
-                    GBApplication.deviceService().onSetMusicState(stateSpec);
+            if (stateSpec != null) {
+                if (mSetMusicStateRunnable != null) {
+                    mHandler.removeCallbacks(mSetMusicStateRunnable);
                 }
-            };
+                mSetMusicStateRunnable = new Runnable() {
+                    @Override
+                    public void run() {
+                        GBApplication.deviceService().onSetMusicState(stateSpec);
+                    }
+                };
+            }
             mHandler.postDelayed(mSetMusicStateRunnable, 100);
 
             return true;

From 2880297c51a59f9e37e7bf1690b13e454d2ed6c6 Mon Sep 17 00:00:00 2001
From: Damien 'Psolyca' Gaignon <damien.gaignon@gmail.com>
Date: Fri, 2 Feb 2024 00:09:35 +0100
Subject: [PATCH 537/595] [Huawei] Fix pin code encoding

---
 .../devices/huawei/HuaweiCrypto.java          | 24 ++++++++++++-------
 .../devices/huawei/HuaweiPacket.java          |  9 +++++++
 .../devices/huawei/packets/DeviceConfig.java  |  8 +++++--
 .../devices/huawei/HuaweiSupportProvider.java |  1 +
 .../huawei/requests/GetAuthRequest.java       |  7 ++++--
 .../huawei/requests/GetLinkParamsRequest.java |  1 +
 .../gadgetbridge/util/CryptoUtils.java        |  6 ++---
 7 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCrypto.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCrypto.java
index 08ef0a60f..80a9fb6d2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCrypto.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCrypto.java
@@ -17,7 +17,9 @@
 package nodomain.freeyourgadget.gadgetbridge.devices.huawei;
 
 import nodomain.freeyourgadget.gadgetbridge.util.CryptoUtils;
+import nodomain.freeyourgadget.gadgetbridge.util.GB;
 
+import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 import java.security.InvalidAlgorithmParameterException;
@@ -100,13 +102,15 @@ public class HuaweiCrypto {
     }
 
     private byte[] getDigestSecret() {
+        byte[] digest;
         if (authVersion == 1) {
-            return DIGEST_SECRET_v1;
+            digest = DIGEST_SECRET_v1.clone();
         } else if (authVersion == 2) {
-            return DIGEST_SECRET_v2;
+            digest = DIGEST_SECRET_v2.clone();
         } else {
-            return DIGEST_SECRET_v3;
+            digest = DIGEST_SECRET_v3.clone();
         }
+        return digest;
     }
     public byte[] computeDigest(byte[] message, byte[] nonce) throws NoSuchAlgorithmException, InvalidKeyException {
         byte[] digestSecret = getDigestSecret();
@@ -118,9 +122,9 @@ public class HuaweiCrypto {
         return CryptoUtils.calcHmacSha256(digestStep1, nonce);
     }
 
-    public byte[] computeDigestHiChainLite(byte[] message, byte[] key, byte[] nonce) throws NoSuchAlgorithmException, InvalidKeyException, InvalidKeySpecException {
+    public byte[] computeDigestHiChainLite(byte[] message, byte[] key, byte[] nonce) throws NoSuchAlgorithmException, InvalidKeyException, InvalidKeySpecException, UnsupportedEncodingException {
         byte[] digestStep1;
-        byte[] hashKey = CryptoUtils.digest(key);
+        byte[] hashKey = CryptoUtils.digest(GB.hexdump(key).getBytes("UTF-8"));
         byte[] digestSecret = getDigestSecret();
         for (int i = 0; i < digestSecret.length; i++) {
             digestSecret[i] = (byte) (((0xFF & hashKey[i]) ^ (digestSecret[i] & 0xFF)) & 0xFF);
@@ -130,14 +134,14 @@ public class HuaweiCrypto {
                 .put(message)
                 .array();
         if (authAlgo == 0x01) {
-            digestStep1 = CryptoUtils.pbkdf2Sha256(msgToDigest, nonce, 0x3e8, 0x100);
+            digestStep1 = CryptoUtils.pbkdf2Sha256(GB.hexdump(msgToDigest), GB.hexdump(nonce), 0x3e8, 0x100);
         } else {
             digestStep1 = CryptoUtils.calcHmacSha256(msgToDigest, nonce);
         }
         return CryptoUtils.calcHmacSha256(digestStep1, nonce);
     }
 
-    public byte[] digestChallenge(byte[] secretKey, byte[] nonce) throws NoSuchAlgorithmException, InvalidKeyException, InvalidKeySpecException {
+    public byte[] digestChallenge(byte[] secretKey, byte[] nonce) throws NoSuchAlgorithmException, InvalidKeyException, InvalidKeySpecException, UnsupportedEncodingException {
         if (authMode == 0x02) {
             if (secretKey == null)
                 return null;
@@ -153,7 +157,7 @@ public class HuaweiCrypto {
         return computeDigest(MESSAGE_CHALLENGE, nonce);
     }
 
-    public byte[] digestResponse(byte[] secretKey, byte[] nonce) throws NoSuchAlgorithmException, InvalidKeyException, InvalidKeySpecException {
+    public byte[] digestResponse(byte[] secretKey, byte[] nonce) throws NoSuchAlgorithmException, InvalidKeyException, InvalidKeySpecException, UnsupportedEncodingException {
         if (authMode == 0x02) {
             if (secretKey == null)
                 return null;
@@ -216,9 +220,11 @@ public class HuaweiCrypto {
         return CryptoUtils.decryptAES_CBC_Pad(data, encryptionKey, iv);
     }
 
-    public byte[] decryptPinCode(byte[] message, byte[] iv) throws CryptoException {
+    public byte[] decryptPinCode(byte encryptMethod, byte[] message, byte[] iv) throws CryptoException {
         byte[] secretKey = getDigestSecret();
         try {
+            if (encryptMethod == 0x1)
+                return CryptoUtils.decryptAES_GCM_NoPad(message, secretKey, iv, null);
             return CryptoUtils.decryptAES_CBC_Pad(message, secretKey, iv);
         } catch (Exception e) {
             throw new CryptoException(e);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiPacket.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiPacket.java
index e7f7efaf6..314b29760 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiPacket.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiPacket.java
@@ -57,6 +57,7 @@ public class HuaweiPacket {
 
         protected byte interval;
         protected byte authAlgo;
+        protected byte encryptMethod;
 
         public void setAuthVersion(byte authVersion) {
             this.authVersion = authVersion;
@@ -144,6 +145,14 @@ public class HuaweiPacket {
         public byte getAuthAlgo () {
             return this.authAlgo;
         }
+
+        public void setEncryptMethod(byte encryptMethod) {
+            this.encryptMethod = encryptMethod;
+        }
+
+        public byte getEncryptMethod () {
+            return this.encryptMethod;
+        }
     }
 
     public static abstract class ParseException extends Exception {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DeviceConfig.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DeviceConfig.java
index 91281404a..3bc32a01e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DeviceConfig.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DeviceConfig.java
@@ -78,6 +78,7 @@ public class DeviceConfig {
             public byte authAlgo = 0x00;
             public byte bondState = 0x00;
             public short interval = 0x0;
+            public byte encryptMethod = 0x00;
 
             public Response(ParamsProvider paramsProvider) {
                 super(paramsProvider);
@@ -111,6 +112,9 @@ public class DeviceConfig {
 
                 if (this.tlv.contains(0x09))
                     this.bondState = this.tlv.getByte(0x09);
+
+                if (this.tlv.contains(0x0C))
+                    this.encryptMethod = this.tlv.getByte(0x0C);
             }
         }
     }
@@ -1400,7 +1404,7 @@ public class DeviceConfig {
 
                 HuaweiCrypto huaweiCrypto = new HuaweiCrypto(paramsProvider.getAuthVersion());
                 try {
-                    pinCode = huaweiCrypto.decryptPinCode(message, iv);
+                    pinCode = huaweiCrypto.decryptPinCode(paramsProvider.getEncryptMethod(), message, iv);
                 } catch (HuaweiCrypto.CryptoException e) {
                     throw new CryptoException("Could not decrypt pinCode", e);
                 }
@@ -1487,7 +1491,7 @@ public class DeviceConfig {
                 this.tlv = new HuaweiTLV()
                     .put(0x01, authMode);
                 if (authMode == 0x02 || authMode == 0x04)
-                    this.tlv.put(0x02, (byte)0x01);
+                    this.tlv.put(0x02, (byte)0x01); //force to not reconnected else 0x02
                 this.tlv.put(0x05, deviceUUID)
                         .put(0x03, (byte)0x01)
                         .put(0x04, (byte)0x00);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiSupportProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiSupportProvider.java
index eed8a0a7d..477bead17 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiSupportProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiSupportProvider.java
@@ -331,6 +331,7 @@ public class HuaweiSupportProvider {
                             initializeDeviceHiChainMode(linkParamsReq);
                         } else if (securityNegoReq.authType == 0x01 || securityNegoReq.authType == 0x02) {
                             LOG.debug("HiChain Lite mode");
+                            // Keep track the gadget is connected
                             initializeDeviceHiChainLiteMode(linkParamsReq);
                         }
                     }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetAuthRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetAuthRequest.java
index e4a98141a..81e070b6f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetAuthRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetAuthRequest.java
@@ -19,6 +19,7 @@ package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
@@ -30,6 +31,7 @@ import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiCrypto;
 import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
 import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.DeviceConfig;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+import nodomain.freeyourgadget.gadgetbridge.util.GB;
 import nodomain.freeyourgadget.gadgetbridge.util.StringUtils;
 
 public class GetAuthRequest extends Request {
@@ -73,12 +75,13 @@ public class GetAuthRequest extends Request {
                     .put(clientNonce)
                     .array();
             byte[] challenge = huaweiCrypto.digestChallenge(key, doubleNonce);
+            LOG.debug("challenge: " + GB.hexdump(challenge));
             if (challenge == null)
                 throw new RequestCreationException("Challenge null");
             return new DeviceConfig.Auth.Request(paramsProvider, challenge, nonce).serialize();
         } catch (HuaweiPacket.CryptoException e) {
             throw new RequestCreationException(e);
-        } catch (NoSuchAlgorithmException | InvalidKeyException | InvalidKeySpecException e) {
+        } catch (NoSuchAlgorithmException | InvalidKeyException | InvalidKeySpecException | UnsupportedEncodingException e) {
             throw new RequestCreationException("Digest exception", e);
         }
     }
@@ -102,7 +105,7 @@ public class GetAuthRequest extends Request {
                         + StringUtils.bytesToHex(expectedAnswer)
                 );
             }
-        } catch (NoSuchAlgorithmException | InvalidKeyException | InvalidKeySpecException e) {
+        } catch (NoSuchAlgorithmException | InvalidKeyException | InvalidKeySpecException | UnsupportedEncodingException e) {
             throw new ResponseParseException("Challenge response digest exception");
         }
     }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetLinkParamsRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetLinkParamsRequest.java
index 8c135eb86..7ba643f3b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetLinkParamsRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetLinkParamsRequest.java
@@ -84,5 +84,6 @@ public class GetLinkParamsRequest extends Request {
         this.bondState = ((LinkParams.Response) receivedPacket).bondState;
 
         paramsProvider.setAuthAlgo(((LinkParams.Response) receivedPacket).authAlgo);
+        paramsProvider.setEncryptMethod(((LinkParams.Response) receivedPacket).encryptMethod);
     }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/CryptoUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/CryptoUtils.java
index 7dde79c70..c5e4cc686 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/CryptoUtils.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/CryptoUtils.java
@@ -18,6 +18,7 @@ package nodomain.freeyourgadget.gadgetbridge.util;
 
 import android.annotation.SuppressLint;
 
+import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 import java.security.InvalidAlgorithmParameterException;
@@ -133,10 +134,9 @@ public class CryptoUtils {
         return result;
     }
 
-    public static byte[] pbkdf2Sha256(byte[] key, byte[] iv, int count, int length) throws InvalidKeySpecException, NoSuchAlgorithmException  {
+    public static byte[] pbkdf2Sha256(String key, String iv, int count, int length) throws InvalidKeySpecException, NoSuchAlgorithmException, UnsupportedEncodingException {
         SecretKeyFactory secretKeyFactory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256");
-        String keyStr = new String(key, StandardCharsets.UTF_8);
-        PBEKeySpec keySpec = new PBEKeySpec(keyStr.toCharArray(), iv, count, length);
+        PBEKeySpec keySpec = new PBEKeySpec(key.toCharArray(), iv.getBytes("utf-8"), count, length);
         return secretKeyFactory.generateSecret(keySpec).getEncoded();
     }
 }

From 270212a771b9b7828af266d0757323ec5dc1df6a Mon Sep 17 00:00:00 2001
From: Damien 'Psolyca' Gaignon <damien.gaignon@gmail.com>
Date: Sat, 3 Feb 2024 16:22:35 +0100
Subject: [PATCH 538/595] [Huawei] Rename authMode to deviceSupportType

---
 .../gadgetbridge/devices/huawei/HuaweiCrypto.java    | 10 +++++-----
 .../gadgetbridge/devices/huawei/HuaweiPacket.java    | 12 ++++++------
 .../gadgetbridge/devices/huawei/HuaweiTLV.java       |  4 ++--
 .../devices/huawei/packets/DeviceConfig.java         |  6 +++---
 .../devices/huawei/HuaweiSupportProvider.java        |  4 ++--
 .../devices/huawei/requests/GetAuthRequest.java      |  8 ++++----
 .../huawei/requests/GetLinkParamsRequest.java        |  2 +-
 .../requests/GetSecurityNegotiationRequest.java      |  2 +-
 .../devices/huawei/TestHuaweiPacket.java             |  6 +++---
 .../gadgetbridge/devices/huawei/TestHuaweiTLV.java   |  2 +-
 .../devices/huawei/packets/TestAlarms.java           |  2 +-
 .../devices/huawei/packets/TestDeviceConfig.java     |  2 +-
 .../huawei/packets/TestDisconnectNotification.java   |  2 +-
 .../devices/huawei/packets/TestFindPhone.java        |  2 +-
 .../devices/huawei/packets/TestFitnessData.java      |  2 +-
 .../devices/huawei/packets/TestLocaleConfig.java     |  2 +-
 .../devices/huawei/packets/TestMusicControl.java     |  2 +-
 .../devices/huawei/packets/TestNotifications.java    |  2 +-
 .../devices/huawei/packets/TestWorkMode.java         |  2 +-
 .../devices/huawei/packets/TestWorkout.java          |  2 +-
 20 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCrypto.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCrypto.java
index 80a9fb6d2..fbd395cdf 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCrypto.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCrypto.java
@@ -81,16 +81,16 @@ public class HuaweiCrypto {
     public static final long ENCRYPTION_COUNTER_MAX = 0xFFFFFFFF;
 
     protected int authVersion;
-    protected int authMode;
+    protected int deviceSupportType;
     protected byte authAlgo;
 
     public HuaweiCrypto(int authVersion) {
         this.authVersion = authVersion;
     }
 
-    public HuaweiCrypto(int authVersion, byte authAlgo, int authMode) {
+    public HuaweiCrypto(int authVersion, byte authAlgo, int deviceSupportType) {
         this(authVersion);
-        this.authMode = authMode;
+        this.deviceSupportType = deviceSupportType;
         this.authAlgo = authAlgo;
     }
 
@@ -142,7 +142,7 @@ public class HuaweiCrypto {
     }
 
     public byte[] digestChallenge(byte[] secretKey, byte[] nonce) throws NoSuchAlgorithmException, InvalidKeyException, InvalidKeySpecException, UnsupportedEncodingException {
-        if (authMode == 0x02) {
+        if (deviceSupportType == 0x02) {
             if (secretKey == null)
                 return null;
             if (authVersion == 0x02) {
@@ -158,7 +158,7 @@ public class HuaweiCrypto {
     }
 
     public byte[] digestResponse(byte[] secretKey, byte[] nonce) throws NoSuchAlgorithmException, InvalidKeyException, InvalidKeySpecException, UnsupportedEncodingException {
-        if (authMode == 0x02) {
+        if (deviceSupportType == 0x02) {
             if (secretKey == null)
                 return null;
             if (authVersion == 0x02) {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiPacket.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiPacket.java
index 314b29760..3c5c56972 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiPacket.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiPacket.java
@@ -46,7 +46,7 @@ public class HuaweiPacket {
     public static class ParamsProvider {
 
         protected byte authVersion;
-        protected byte authMode;
+        protected byte deviceSupportType;
         protected byte[] secretKey;
         protected int slicesize = 0xf4;
         protected boolean transactionsCrypted = true;
@@ -67,12 +67,12 @@ public class HuaweiPacket {
             return this.authVersion;
         }
 
-        public void setAuthMode(byte authMode) {
-            this.authMode = authMode;
+        public void setDeviceSupportType(byte deviceSupportType) {
+            this.deviceSupportType = deviceSupportType;
         }
 
-        public byte getAuthMode(){
-            return this.authMode;
+        public byte getDeviceSupportType(){
+            return this.deviceSupportType;
         }
 
         public void setSecretKey(byte[] secretKey) {
@@ -124,7 +124,7 @@ public class HuaweiPacket {
 
         public byte[] getIv() {
             byte[] iv = null;
-            if (this.authMode == 0x04) {
+            if (this.deviceSupportType == 0x04) {
                 iv = HuaweiCrypto.generateNonce();
             } else {
                 ByteBuffer ivCounter = HuaweiCrypto.initializationVector(this.encryptionCounter);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiTLV.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiTLV.java
index 51568de32..80d8f6753 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiTLV.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiTLV.java
@@ -291,7 +291,7 @@ public class HuaweiTLV {
         byte[] serializedTLV = serialize();
         byte[] key = paramsProvider.getSecretKey();
         byte[] nonce = paramsProvider.getIv();
-        byte[] encryptedTLV = HuaweiCrypto.encrypt(paramsProvider.getAuthMode(), serializedTLV, key, nonce);
+        byte[] encryptedTLV = HuaweiCrypto.encrypt(paramsProvider.getDeviceSupportType(), serializedTLV, key, nonce);
         return new HuaweiTLV()
                 .put(CryptoTags.encryption, (byte) 0x01)
                 .put(CryptoTags.initVector, nonce)
@@ -300,7 +300,7 @@ public class HuaweiTLV {
 
     public void decrypt(ParamsProvider paramsProvider) throws CryptoException, HuaweiPacket.MissingTagException {
         byte[] key = paramsProvider.getSecretKey();
-        byte[] decryptedTLV = HuaweiCrypto.decrypt(paramsProvider.getAuthMode(), getBytes(CryptoTags.cipherText), key, getBytes(CryptoTags.initVector));
+        byte[] decryptedTLV = HuaweiCrypto.decrypt(paramsProvider.getDeviceSupportType(), getBytes(CryptoTags.cipherText), key, getBytes(CryptoTags.initVector));
         this.valueMap = new ArrayList<>();
         parse(decryptedTLV);
     }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DeviceConfig.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DeviceConfig.java
index 3bc32a01e..e470f559d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DeviceConfig.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DeviceConfig.java
@@ -74,7 +74,7 @@ public class DeviceConfig {
             public short sliceSize = 0x00f4;
             public byte authVersion = 0x00;
             public byte[] serverNonce = new byte[16];
-            public byte authMode = 0x00;
+            public byte deviceSupportType = 0x00;
             public byte authAlgo = 0x00;
             public byte bondState = 0x00;
             public short interval = 0x0;
@@ -105,7 +105,7 @@ public class DeviceConfig {
                 this.authVersion = (byte)this.tlv.getBytes(0x05)[1];
 
                 if (this.tlv.contains(0x07))
-                    this.authMode = this.tlv.getByte(0x07);
+                    this.deviceSupportType = this.tlv.getByte(0x07);
 
                 if (this.tlv.contains(0x08))
                     this.authAlgo = this.tlv.getByte(0x08);
@@ -607,7 +607,7 @@ public class DeviceConfig {
                 this.tlv = new HuaweiTLV()
                         .put(0x01, challenge)
                         .put(0x02, nonce);
-                if (paramsProvider.getAuthMode() == 0x02)
+                if (paramsProvider.getDeviceSupportType() == 0x02)
                     this.tlv.put(0x03, paramsProvider.getAuthAlgo());
                 this.isEncrypted = false;
                 this.complete = true;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiSupportProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiSupportProvider.java
index 477bead17..5f8cb6a27 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiSupportProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/HuaweiSupportProvider.java
@@ -306,12 +306,12 @@ public class HuaweiSupportProvider {
         // 1 or 3 : HiChain
         // 2 or 8 : HiChainLite -> normal mode
         // 4 : HiChain3
-        byte authMode = paramsProvider.getAuthMode();
+        byte authMode = paramsProvider.getDeviceSupportType();
         return authMode == 0x01 || authMode == 0x03 || authMode == 0x04 || isHiChainLite();
     }
 
     protected boolean isHiChainLite() {
-        byte authMode = paramsProvider.getAuthMode();
+        byte authMode = paramsProvider.getDeviceSupportType();
         return authMode == 0x02;
     }
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetAuthRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetAuthRequest.java
index 81e070b6f..9c252fe20 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetAuthRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetAuthRequest.java
@@ -42,7 +42,7 @@ public class GetAuthRequest extends Request {
     protected byte authAlgo;
     protected byte[] doubleNonce;
     protected byte[] key = null;
-    protected byte authMode;
+    protected byte deviceSupportType;
 
     public GetAuthRequest(HuaweiSupportProvider support,
             Request linkParamsReq) {
@@ -56,16 +56,16 @@ public class GetAuthRequest extends Request {
                 .array();
         this.authVersion = paramsProvider.getAuthVersion();
         this.authAlgo = paramsProvider.getAuthAlgo();
-        this.authMode = paramsProvider.getAuthMode();
+        this.deviceSupportType = paramsProvider.getDeviceSupportType();
     }
 
     @Override
     protected List<byte[]> createRequest() throws RequestCreationException {
-        huaweiCrypto = new HuaweiCrypto(authVersion, authAlgo, authMode);
+        huaweiCrypto = new HuaweiCrypto(authVersion, authAlgo, deviceSupportType);
         byte[] nonce;
 
         try {
-            if (authMode == 0x02) {
+            if (deviceSupportType == 0x02) {
                 key = paramsProvider.getPinCode();
                 if (authVersion == 0x02)
                     key = paramsProvider.getSecretKey();
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetLinkParamsRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetLinkParamsRequest.java
index 7ba643f3b..1be952a5b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetLinkParamsRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetLinkParamsRequest.java
@@ -73,7 +73,7 @@ public class GetLinkParamsRequest extends Request {
             throw new ResponseTypeMismatchException(receivedPacket, LinkParams.Response.class);
 
         supportProvider.setProtocolVersion(((LinkParams.Response) receivedPacket).protocolVersion);
-        paramsProvider.setAuthMode(((LinkParams.Response) receivedPacket).authMode);
+        paramsProvider.setDeviceSupportType(((LinkParams.Response) receivedPacket).deviceSupportType);
 
         paramsProvider.setSliceSize(((LinkParams.Response) receivedPacket).sliceSize);
         paramsProvider.setMtu(((LinkParams.Response) receivedPacket).mtu);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSecurityNegotiationRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSecurityNegotiationRequest.java
index f4bf41b00..73d6c3c49 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSecurityNegotiationRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetSecurityNegotiationRequest.java
@@ -42,7 +42,7 @@ public class GetSecurityNegotiationRequest extends Request {
         try {
             return new DeviceConfig.SecurityNegotiation.Request(
                     paramsProvider,
-                    paramsProvider.getAuthMode(),
+                    paramsProvider.getDeviceSupportType(),
                     supportProvider.getAndroidId(),
                     Build.MODEL
                 ).serialize();
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/TestHuaweiPacket.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/TestHuaweiPacket.java
index ee19ca808..a6b761242 100644
--- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/TestHuaweiPacket.java
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/TestHuaweiPacket.java
@@ -29,7 +29,7 @@ public class TestHuaweiPacket {
     HuaweiPacket.ParamsProvider paramsProvider = new HuaweiPacket.ParamsProvider() {
 
         @Override
-        public byte getAuthMode() {
+        public byte getDeviceSupportType() {
             return 0;
         }
 
@@ -62,7 +62,7 @@ public class TestHuaweiPacket {
     HuaweiPacket.ParamsProvider paramsProviderEncrypt = new HuaweiPacket.ParamsProvider() {
 
         @Override
-        public byte getAuthMode() {
+        public byte getDeviceSupportType() {
             return 0;
         }
 
@@ -95,7 +95,7 @@ public class TestHuaweiPacket {
     HuaweiPacket.ParamsProvider paramsProviderSmallSlice = new HuaweiPacket.ParamsProvider() {
 
         @Override
-        public byte getAuthMode() {
+        public byte getDeviceSupportType() {
             return 0;
         }
 
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/TestHuaweiTLV.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/TestHuaweiTLV.java
index 83c6dfda1..62f9ab3dd 100644
--- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/TestHuaweiTLV.java
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/TestHuaweiTLV.java
@@ -26,7 +26,7 @@ public class TestHuaweiTLV {
 
     HuaweiPacket.ParamsProvider secretsProvider = new HuaweiPacket.ParamsProvider() {
         @Override
-        public byte getAuthMode() {
+        public byte getDeviceSupportType() {
             return 0;
         }
 
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestAlarms.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestAlarms.java
index 3f1c5cfbc..0712dd247 100644
--- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestAlarms.java
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestAlarms.java
@@ -29,7 +29,7 @@ public class TestAlarms {
 
     HuaweiPacket.ParamsProvider paramsProvider = new HuaweiPacket.ParamsProvider() {
         @Override
-        public byte getAuthMode() {
+        public byte getDeviceSupportType() {
             return 0;
         }
 
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestDeviceConfig.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestDeviceConfig.java
index 5ade9f698..af9788c1b 100644
--- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestDeviceConfig.java
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestDeviceConfig.java
@@ -42,7 +42,7 @@ public class TestDeviceConfig {
 
     HuaweiPacket.ParamsProvider secretsProvider = new HuaweiPacket.ParamsProvider() {
         @Override
-        public byte getAuthMode() {
+        public byte getDeviceSupportType() {
             return 0;
         }
 
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestDisconnectNotification.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestDisconnectNotification.java
index dc28bd370..9db856237 100644
--- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestDisconnectNotification.java
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestDisconnectNotification.java
@@ -29,7 +29,7 @@ public class TestDisconnectNotification {
 
     HuaweiPacket.ParamsProvider secretsProvider = new HuaweiPacket.ParamsProvider() {
         @Override
-        public byte getAuthMode() {
+        public byte getDeviceSupportType() {
             return 0;
         }
 
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestFindPhone.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestFindPhone.java
index 495c06fe0..7204f200f 100644
--- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestFindPhone.java
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestFindPhone.java
@@ -28,7 +28,7 @@ public class TestFindPhone {
 
     HuaweiPacket.ParamsProvider secretsProvider = new HuaweiPacket.ParamsProvider() {
         @Override
-        public byte getAuthMode() {
+        public byte getDeviceSupportType() {
             return 0;
         }
 
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestFitnessData.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestFitnessData.java
index 04774cde0..717944dc3 100644
--- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestFitnessData.java
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestFitnessData.java
@@ -30,7 +30,7 @@ public class TestFitnessData {
 
     HuaweiPacket.ParamsProvider secretsProvider = new HuaweiPacket.ParamsProvider() {
         @Override
-        public byte getAuthMode() {
+        public byte getDeviceSupportType() {
             return 0;
         }
 
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestLocaleConfig.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestLocaleConfig.java
index 168e355f1..a8b288cc3 100644
--- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestLocaleConfig.java
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestLocaleConfig.java
@@ -29,7 +29,7 @@ public class TestLocaleConfig {
 
     HuaweiPacket.ParamsProvider paramsProvider = new HuaweiPacket.ParamsProvider() {
         @Override
-        public byte getAuthMode() {
+        public byte getDeviceSupportType() {
             return 0;
         }
 
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestMusicControl.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestMusicControl.java
index a5eb5dad8..e45bf134e 100644
--- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestMusicControl.java
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestMusicControl.java
@@ -32,7 +32,7 @@ public class TestMusicControl {
 
     HuaweiPacket.ParamsProvider secretsProvider = new HuaweiPacket.ParamsProvider() {
         @Override
-        public byte getAuthMode() {
+        public byte getDeviceSupportType() {
             return 0;
         }
 
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestNotifications.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestNotifications.java
index 9911b3552..fb42a7c8e 100644
--- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestNotifications.java
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestNotifications.java
@@ -30,7 +30,7 @@ public class TestNotifications {
 
     HuaweiPacket.ParamsProvider secretsProvider = new HuaweiPacket.ParamsProvider() {
         @Override
-        public byte getAuthMode() {
+        public byte getDeviceSupportType() {
             return 0;
         }
 
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestWorkMode.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestWorkMode.java
index b6773f92d..2be8d6cf6 100644
--- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestWorkMode.java
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestWorkMode.java
@@ -29,7 +29,7 @@ public class TestWorkMode {
 
     HuaweiPacket.ParamsProvider secretsProvider = new HuaweiPacket.ParamsProvider() {
         @Override
-        public byte getAuthMode() {
+        public byte getDeviceSupportType() {
             return 0;
         }
 
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestWorkout.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestWorkout.java
index 714d4b67f..d29b173de 100644
--- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestWorkout.java
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestWorkout.java
@@ -30,7 +30,7 @@ public class TestWorkout {
 
     HuaweiPacket.ParamsProvider secretsProvider = new HuaweiPacket.ParamsProvider() {
         @Override
-        public byte getAuthMode() {
+        public byte getDeviceSupportType() {
             return 0;
         }
 

From 05c11cbd14e457cc0dc2b4c71dd743e5d7f31098 Mon Sep 17 00:00:00 2001
From: Damien 'Psolyca' Gaignon <damien.gaignon@gmail.com>
Date: Mon, 5 Feb 2024 19:09:55 +0100
Subject: [PATCH 539/595] [Huawei] Add HiChainLite firstKey handling

---
 .../devices/huawei/HuaweiCrypto.java          | 24 +++++++++++++++----
 .../devices/huawei/HuaweiPacket.java          |  9 +++++++
 .../huawei/requests/GetAuthRequest.java       | 12 ++++++++--
 3 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCrypto.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCrypto.java
index fbd395cdf..c82bcf82c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCrypto.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCrypto.java
@@ -119,7 +119,11 @@ public class HuaweiCrypto {
                                                 .put(message)
                                                 .array();
         byte[] digestStep1 = CryptoUtils.calcHmacSha256(msgToDigest, nonce);
-        return CryptoUtils.calcHmacSha256(digestStep1, nonce);
+        byte[] challenge = ByteBuffer.allocate(0x40)
+                .put(CryptoUtils.calcHmacSha256(digestStep1, nonce))
+                .put(digestStep1)
+                .array();
+        return challenge;
     }
 
     public byte[] computeDigestHiChainLite(byte[] message, byte[] key, byte[] nonce) throws NoSuchAlgorithmException, InvalidKeyException, InvalidKeySpecException, UnsupportedEncodingException {
@@ -138,7 +142,11 @@ public class HuaweiCrypto {
         } else {
             digestStep1 = CryptoUtils.calcHmacSha256(msgToDigest, nonce);
         }
-        return CryptoUtils.calcHmacSha256(digestStep1, nonce);
+        byte[] challenge = ByteBuffer.allocate(0x40)
+                .put(CryptoUtils.calcHmacSha256(digestStep1, nonce))
+                .put(digestStep1)
+                .array();
+        return challenge;
     }
 
     public byte[] digestChallenge(byte[] secretKey, byte[] nonce) throws NoSuchAlgorithmException, InvalidKeyException, InvalidKeySpecException, UnsupportedEncodingException {
@@ -150,7 +158,11 @@ public class HuaweiCrypto {
                         .put(secretKey)
                         .put(MESSAGE_CHALLENGE)
                         .array();
-                return CryptoUtils.calcHmacSha256(key, nonce);
+                byte[] challenge = ByteBuffer.allocate(0x40)
+                        .put(CryptoUtils.calcHmacSha256(key, nonce))
+                        .put(key)
+                        .array();
+                return challenge;
             }
             return computeDigestHiChainLite(MESSAGE_CHALLENGE, secretKey, nonce);
         }
@@ -166,7 +178,11 @@ public class HuaweiCrypto {
                         .put(secretKey)
                         .put(MESSAGE_RESPONSE)
                         .array();
-                return CryptoUtils.calcHmacSha256(key, nonce);
+                byte[] challenge = ByteBuffer.allocate(0x40)
+                        .put(CryptoUtils.calcHmacSha256(key, nonce))
+                        .put(key)
+                        .array();
+                return challenge;
             }
             return computeDigestHiChainLite(MESSAGE_RESPONSE, secretKey, nonce);
         }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiPacket.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiPacket.java
index 3c5c56972..b7c0ba3c1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiPacket.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiPacket.java
@@ -58,6 +58,7 @@ public class HuaweiPacket {
         protected byte interval;
         protected byte authAlgo;
         protected byte encryptMethod;
+        protected byte[] firstKey;
 
         public void setAuthVersion(byte authVersion) {
             this.authVersion = authVersion;
@@ -153,6 +154,14 @@ public class HuaweiPacket {
         public byte getEncryptMethod () {
             return this.encryptMethod;
         }
+
+        public void setFirstKey(byte[] firstKey) {
+            this.firstKey = firstKey;
+        }
+
+        public byte[] getFirstKey() {
+            return firstKey;
+        }
     }
 
     public static abstract class ParseException extends Exception {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetAuthRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetAuthRequest.java
index 9c252fe20..15f7445ce 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetAuthRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetAuthRequest.java
@@ -74,8 +74,13 @@ public class GetAuthRequest extends Request {
                     .putShort(authVersion)
                     .put(clientNonce)
                     .array();
-            byte[] challenge = huaweiCrypto.digestChallenge(key, doubleNonce);
+            ByteBuffer digestedChallenge = ByteBuffer.wrap(huaweiCrypto.digestChallenge(key, doubleNonce));
+            byte[] challenge = new byte[0x20];
+            digestedChallenge.get(challenge, 0x00, 0x20);
             LOG.debug("challenge: " + GB.hexdump(challenge));
+            byte[] firstKey = new byte[0x10];
+            digestedChallenge.get(firstKey, 0x00, 0x10);
+            paramsProvider.setFirstKey(firstKey);
             if (challenge == null)
                 throw new RequestCreationException("Challenge null");
             return new DeviceConfig.Auth.Request(paramsProvider, challenge, nonce).serialize();
@@ -94,7 +99,10 @@ public class GetAuthRequest extends Request {
             throw new ResponseTypeMismatchException(receivedPacket, DeviceConfig.Auth.Response.class);
 
         try {
-            byte[] expectedAnswer = huaweiCrypto.digestResponse(key, doubleNonce);
+            ByteBuffer digestedChallenge = ByteBuffer.wrap(huaweiCrypto.digestResponse(key, doubleNonce));
+            byte[] expectedAnswer = new byte[0x20];
+            digestedChallenge.get(expectedAnswer, 0x00, 0x20);
+            LOG.debug("challenge: " + GB.hexdump(expectedAnswer));
             if (expectedAnswer == null)
                 throw new ResponseParseException("Challenge null");
             byte[] actualAnswer = ((DeviceConfig.Auth.Response) receivedPacket).challengeResponse;

From bb5fe00643078f66302a0e99357f775eab69ce4f Mon Sep 17 00:00:00 2001
From: Damien 'Psolyca' Gaignon <damien.gaignon@gmail.com>
Date: Mon, 5 Feb 2024 20:16:23 +0100
Subject: [PATCH 540/595] [Huawei] Change bond request behaviour

---
 .../devices/huawei/HuaweiCrypto.java          |  5 ++--
 .../devices/huawei/packets/DeviceConfig.java  | 27 ++++++++----------
 .../huawei/requests/GetBondRequest.java       | 28 ++++++++++++++++---
 3 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCrypto.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCrypto.java
index c82bcf82c..64691b958 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCrypto.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCrypto.java
@@ -226,8 +226,9 @@ public class HuaweiCrypto {
         return Arrays.copyOfRange(finalMixedKeyHash, 0, 16);
     }
 
-    public byte[] encryptBondingKey(byte[] data, String mac, byte[] iv) throws NoSuchAlgorithmException, InvalidAlgorithmParameterException, NoSuchPaddingException, IllegalBlockSizeException, BadPaddingException, InvalidKeyException, IllegalArgumentException {
-        byte[] encryptionKey = createSecretKey(mac);
+    public byte[] encryptBondingKey(byte encryptMethod, byte[] data, byte[] encryptionKey, byte[] iv) throws NoSuchAlgorithmException, InvalidAlgorithmParameterException, NoSuchPaddingException, IllegalBlockSizeException, BadPaddingException, InvalidKeyException, IllegalArgumentException {
+        if (encryptMethod == 0x01)
+            return CryptoUtils.encryptAES_GCM_NoPad(data, encryptionKey, iv, null);
         return CryptoUtils.encryptAES_CBC_Pad(data, encryptionKey, iv);
     }
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DeviceConfig.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DeviceConfig.java
index e470f559d..98ce781eb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DeviceConfig.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/DeviceConfig.java
@@ -469,26 +469,21 @@ public class DeviceConfig {
             public Request(
                     ParamsProvider paramsProvider,
                     byte[] clientSerial,
-                    String mac,
-                    HuaweiCrypto huaweiCrypto
-            ) throws CryptoException {
+                    byte[] key,
+                    byte[] iv
+            ) {
                 super(paramsProvider);
                 this.serviceId = DeviceConfig.id;
                 this.commandId = id;
-                byte[] iv = paramsProvider.getIv();
 
-                try {
-                    this.tlv = new HuaweiTLV()
-                            .put(0x01)
-                            .put(0x03, (byte) 0x00)
-                            .put(0x05, clientSerial)
-                            .put(0x06, huaweiCrypto.encryptBondingKey(paramsProvider.getSecretKey(), mac, iv))
-                            .put(0x07, iv);
-                    this.isEncrypted = false;
-                    this.complete = true;
-                } catch (InvalidAlgorithmParameterException | NoSuchPaddingException | IllegalBlockSizeException | NoSuchAlgorithmException | BadPaddingException | InvalidKeyException e) {
-                    throw new CryptoException("Bonding key creation exception", e);
-                }
+                this.tlv = new HuaweiTLV()
+                        .put(0x01)
+                        .put(0x03, (byte) 0x00)
+                        .put(0x05, clientSerial)
+                        .put(0x06, key)
+                        .put(0x07, iv);
+                this.isEncrypted = false;
+                this.complete = true;
             }
         }
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetBondRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetBondRequest.java
index 65bc0d30b..f5c85d23f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetBondRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetBondRequest.java
@@ -19,11 +19,20 @@ package nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.requests;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
 import java.util.List;
 
+import javax.crypto.BadPaddingException;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
+
+import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiCrypto;
 import nodomain.freeyourgadget.gadgetbridge.devices.huawei.HuaweiPacket;
 import nodomain.freeyourgadget.gadgetbridge.devices.huawei.packets.DeviceConfig;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.huawei.HuaweiSupportProvider;
+import nodomain.freeyourgadget.gadgetbridge.util.GB;
 
 public class GetBondRequest extends Request {
     private static final Logger LOG = LoggerFactory.getLogger(GetBondRequest.class);
@@ -39,14 +48,25 @@ public class GetBondRequest extends Request {
     @Override
     protected List<byte[]> createRequest() throws RequestCreationException {
         try {
+            byte[] iv = paramsProvider.getIv();
+            huaweiCrypto = new HuaweiCrypto(paramsProvider.getAuthVersion());
+            byte[] encryptionKey;
+            if (paramsProvider.getDeviceSupportType() == 0x02) { //HiChainLite
+                encryptionKey = paramsProvider.getFirstKey();
+            } else {
+                encryptionKey = huaweiCrypto.createSecretKey(supportProvider.getDeviceMac());
+            }
+            byte[] key = huaweiCrypto.encryptBondingKey(paramsProvider.getEncryptMethod(), paramsProvider.getSecretKey(), encryptionKey, iv);
+            LOG.debug("key: " + GB.hexdump(key));
             return new DeviceConfig.Bond.Request(
                     paramsProvider,
                     supportProvider.getSerial(),
-                    supportProvider.getDeviceMac(),
-                    huaweiCrypto
+                    key,
+                    iv
             ).serialize();
-        } catch (HuaweiPacket.CryptoException e) {
-            throw new RequestCreationException(e);
+        } catch (HuaweiPacket.CryptoException | NoSuchAlgorithmException | NoSuchPaddingException | InvalidAlgorithmParameterException | InvalidKeyException | IllegalBlockSizeException |
+                 BadPaddingException e) {
+            throw new RequestCreationException(e.toString());
         }
     }
 

From d5cecc4a84b96fe67b359db5d9e36d1fe5945e33 Mon Sep 17 00:00:00 2001
From: Damien 'Psolyca' Gaignon <damien.gaignon@gmail.com>
Date: Wed, 7 Feb 2024 16:51:05 +0100
Subject: [PATCH 541/595] [Huawei] GT2 transaction crypted

---
 .../devices/huawei/huaweiwatchgt2/HuaweiWatchGT2Coordinator.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt2/HuaweiWatchGT2Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt2/HuaweiWatchGT2Coordinator.java
index a76e0decb..3540a54db 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt2/HuaweiWatchGT2Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/huaweiwatchgt2/HuaweiWatchGT2Coordinator.java
@@ -37,7 +37,6 @@ public class HuaweiWatchGT2Coordinator extends HuaweiBRCoordinator {
 
     public HuaweiWatchGT2Coordinator() {
         super();
-        getHuaweiCoordinator().setTransactionCrypted(false);
     }
 
     @Override

From 510b8096ed2eb930d91f9c21574c18dd1a2d0ba3 Mon Sep 17 00:00:00 2001
From: Damien 'Psolyca' Gaignon <damien.gaignon@gmail.com>
Date: Thu, 8 Feb 2024 11:23:32 +0100
Subject: [PATCH 542/595] [Huawei] Fix transactions encryption

---
 .../devices/huawei/HuaweiCrypto.java             | 16 ++++++----------
 .../gadgetbridge/devices/huawei/HuaweiTLV.java   |  4 ++--
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCrypto.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCrypto.java
index 64691b958..32c2fab91 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCrypto.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCrypto.java
@@ -248,25 +248,21 @@ public class HuaweiCrypto {
         }
     }
 
-    public static byte[] encrypt(byte authMode, byte[] message, byte[] key, byte[] iv) throws CryptoException {
+    public static byte[] encrypt(byte encryptMethod, byte[] message, byte[] key, byte[] iv) throws CryptoException {
         try {
-            if (authMode == 0x04) {
+            if (encryptMethod == 0x01)
                 return CryptoUtils.encryptAES_GCM_NoPad(message, key, iv, null);
-            } else {
-                return CryptoUtils.encryptAES_CBC_Pad(message, key, iv);
-            }
+            return CryptoUtils.encryptAES_CBC_Pad(message, key, iv);
         } catch (InvalidAlgorithmParameterException | NoSuchPaddingException | IllegalBlockSizeException | NoSuchAlgorithmException | BadPaddingException | InvalidKeyException | IllegalArgumentException e) {
             throw new CryptoException(e);
         }
     }
 
-    public static byte[] decrypt(byte authMode, byte[] message, byte[] key, byte[] iv) throws CryptoException {
+    public static byte[] decrypt(byte encryptMethod, byte[] message, byte[] key, byte[] iv) throws CryptoException {
         try {
-            if (authMode == 0x04) {
+            if (encryptMethod == 0x01)
                 return CryptoUtils.decryptAES_GCM_NoPad(message, key, iv, null);
-            } else {
-                return CryptoUtils.decryptAES_CBC_Pad(message, key, iv);
-            }
+            return CryptoUtils.decryptAES_CBC_Pad(message, key, iv);
         } catch (InvalidAlgorithmParameterException | NoSuchPaddingException | IllegalBlockSizeException | NoSuchAlgorithmException | BadPaddingException | InvalidKeyException | IllegalArgumentException e) {
             throw new CryptoException(e);
         }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiTLV.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiTLV.java
index 80d8f6753..bccc420ef 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiTLV.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiTLV.java
@@ -291,7 +291,7 @@ public class HuaweiTLV {
         byte[] serializedTLV = serialize();
         byte[] key = paramsProvider.getSecretKey();
         byte[] nonce = paramsProvider.getIv();
-        byte[] encryptedTLV = HuaweiCrypto.encrypt(paramsProvider.getDeviceSupportType(), serializedTLV, key, nonce);
+        byte[] encryptedTLV = HuaweiCrypto.encrypt(paramsProvider.getEncryptMethod(), serializedTLV, key, nonce);
         return new HuaweiTLV()
                 .put(CryptoTags.encryption, (byte) 0x01)
                 .put(CryptoTags.initVector, nonce)
@@ -300,7 +300,7 @@ public class HuaweiTLV {
 
     public void decrypt(ParamsProvider paramsProvider) throws CryptoException, HuaweiPacket.MissingTagException {
         byte[] key = paramsProvider.getSecretKey();
-        byte[] decryptedTLV = HuaweiCrypto.decrypt(paramsProvider.getDeviceSupportType(), getBytes(CryptoTags.cipherText), key, getBytes(CryptoTags.initVector));
+        byte[] decryptedTLV = HuaweiCrypto.decrypt(paramsProvider.getEncryptMethod(), getBytes(CryptoTags.cipherText), key, getBytes(CryptoTags.initVector));
         this.valueMap = new ArrayList<>();
         parse(decryptedTLV);
     }

From 21b97a9276bd44cd491763808c84b15cc16e472b Mon Sep 17 00:00:00 2001
From: Damien 'Psolyca' Gaignon <damien.gaignon@gmail.com>
Date: Thu, 8 Feb 2024 11:25:11 +0100
Subject: [PATCH 543/595] [Huawei] Fix BondParamsRequest stopChain

---
 .../devices/huawei/requests/GetBondParamsRequest.java      | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetBondParamsRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetBondParamsRequest.java
index e4b5ba211..d1fab7c4b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetBondParamsRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetBondParamsRequest.java
@@ -55,9 +55,10 @@ public class GetBondParamsRequest extends Request {
             throw new ResponseTypeMismatchException(receivedPacket, DeviceConfig.BondParams.Response.class);
 
         paramsProvider.setEncryptionCounter(((DeviceConfig.BondParams.Response) receivedPacket).encryptionCounter);
-        int status = ((DeviceConfig.BondParams.Response) receivedPacket).status;
-        if (status == 1) {
-            stopChain(this);
+        if (paramsProvider.getDeviceSupportType() != 0x02) {
+            if (((DeviceConfig.BondParams.Response) receivedPacket).status == 1) {
+                stopChain(this);
+            }
         }
     }
 }

From ef06fd4d5e01a61b5843d69aa2158a62c11c9d88 Mon Sep 17 00:00:00 2001
From: Damien 'Psolyca' Gaignon <damien.gaignon@gmail.com>
Date: Mon, 5 Feb 2024 20:18:00 +0100
Subject: [PATCH 544/595] [Huawei] Fix test

---
 .../devices/huawei/packets/TestDeviceConfig.java  | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestDeviceConfig.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestDeviceConfig.java
index af9788c1b..d8d48c180 100644
--- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestDeviceConfig.java
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/packets/TestDeviceConfig.java
@@ -413,21 +413,23 @@ public class TestDeviceConfig {
         HuaweiCrypto huaweiCrypto = new HuaweiCrypto(0x01);
         Field tlvField = HuaweiPacket.class.getDeclaredField("tlv");
         tlvField.setAccessible(true);
-
         try {
+            byte[] encryptionKey = huaweiCrypto.createSecretKey(mac);
+            byte[] iv = secretsProvider.getIv();
+            byte[] key = huaweiCrypto.encryptBondingKey(secretsProvider.getEncryptMethod(), secretsProvider.getSecretKey(), encryptionKey, iv);
             HuaweiTLV expectedTlv = new HuaweiTLV()
                     .put(0x01)
                     .put(0x03, (byte) 0x00)
                     .put(0x05, clientSerial)
-                    .put(0x06, huaweiCrypto.encryptBondingKey(secretsProvider.getSecretKey(), mac, secretsProvider.getIv()))
-                    .put(0x07, secretsProvider.getIv());
+                    .put(0x06, key)
+                    .put(0x07, iv);
 
             byte[] serialized = new byte[]{(byte) 0x5A, (byte) 0x00, (byte) 0x44, (byte) 0x00, (byte) 0x01, (byte) 0x0E, (byte) 0x01, (byte) 0x00, (byte) 0x03, (byte) 0x01, (byte) 0x00, (byte) 0x05, (byte) 0x06, (byte) 0x54, (byte) 0x56, (byte) 0x64, (byte) 0x54, (byte) 0x4D, (byte) 0x44, (byte) 0x06, (byte) 0x20, (byte) 0x88, (byte) 0x45, (byte) 0xAA, (byte) 0xB5, (byte) 0x9C, (byte) 0x84, (byte) 0x39, (byte) 0xAE, (byte) 0xD8, (byte) 0xE9, (byte) 0x71, (byte) 0x01, (byte) 0x5D, (byte) 0xC8, (byte) 0x34, (byte) 0x05, (byte) 0xC5, (byte) 0x9A, (byte) 0x6B, (byte) 0xDB, (byte) 0x62, (byte) 0x7D, (byte) 0xC8, (byte) 0xC3, (byte) 0xF4, (byte) 0xCC, (byte) 0x30, (byte) 0x74, (byte) 0x21, (byte) 0xD4, (byte) 0x45, (byte) 0x0E, (byte) 0x07, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x72, (byte) 0xFC};
             DeviceConfig.Bond.Request request = new DeviceConfig.Bond.Request(
                     secretsProvider,
                     clientSerial,
-                    mac,
-                    huaweiCrypto
+                    key,
+                    iv
             );
 
             Assert.assertEquals(0x01, request.serviceId);
@@ -489,8 +491,7 @@ public class TestDeviceConfig {
         DeviceConfig.Auth.Request request = new DeviceConfig.Auth.Request(
                 secretsProvider,
                 challenge,
-                nonce,
-                false
+                nonce
         );
 
         Assert.assertEquals(0x01, request.serviceId);

From fc857b8adb57b790753861be90d0b41634e331e4 Mon Sep 17 00:00:00 2001
From: Damien 'Psolyca' Gaignon <damien.gaignon@gmail.com>
Date: Mon, 5 Feb 2024 22:35:42 +0100
Subject: [PATCH 545/595] [Huawei] Fix attribut keyword

---
 .../service/devices/huawei/requests/GetAuthRequest.java         | 2 +-
 .../gadgetbridge/service/devices/huawei/requests/Request.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetAuthRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetAuthRequest.java
index 15f7445ce..ce15c110f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetAuthRequest.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetAuthRequest.java
@@ -57,11 +57,11 @@ public class GetAuthRequest extends Request {
         this.authVersion = paramsProvider.getAuthVersion();
         this.authAlgo = paramsProvider.getAuthAlgo();
         this.deviceSupportType = paramsProvider.getDeviceSupportType();
+        this.huaweiCrypto = new HuaweiCrypto(authVersion, authAlgo, deviceSupportType);
     }
 
     @Override
     protected List<byte[]> createRequest() throws RequestCreationException {
-        huaweiCrypto = new HuaweiCrypto(authVersion, authAlgo, deviceSupportType);
         byte[] nonce;
 
         try {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/Request.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/Request.java
index 193cb4edc..cb418abbe 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/Request.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/Request.java
@@ -102,7 +102,7 @@ public class Request {
     protected RequestCallback finalizeReq = null;
     // Stop chaining requests and clean support.inProgressRequests from these requests
     protected boolean stopChain = false;
-    protected static HuaweiCrypto huaweiCrypto = null;
+    protected HuaweiCrypto huaweiCrypto = null;
     protected boolean addToResponse = true;
 
     public static class RequestCallback {

From 88f3cc4fd029992bd8120b0a59cfd4c3728eaf69 Mon Sep 17 00:00:00 2001
From: Damien 'Psolyca' Gaignon <damien.gaignon@gmail.com>
Date: Fri, 9 Feb 2024 22:21:28 +0100
Subject: [PATCH 546/595] [Huawei] Fix regression introduced with HiChainLite

---
 .../gadgetbridge/devices/huawei/HuaweiCrypto.java    |  8 ++++----
 .../gadgetbridge/devices/huawei/HuaweiTLV.java       | 12 ++++++++++--
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCrypto.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCrypto.java
index 32c2fab91..38658959e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCrypto.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiCrypto.java
@@ -248,9 +248,9 @@ public class HuaweiCrypto {
         }
     }
 
-    public static byte[] encrypt(byte encryptMethod, byte[] message, byte[] key, byte[] iv) throws CryptoException {
+    public static byte[] encrypt(boolean useGCM, byte[] message, byte[] key, byte[] iv) throws CryptoException {
         try {
-            if (encryptMethod == 0x01)
+            if (useGCM)
                 return CryptoUtils.encryptAES_GCM_NoPad(message, key, iv, null);
             return CryptoUtils.encryptAES_CBC_Pad(message, key, iv);
         } catch (InvalidAlgorithmParameterException | NoSuchPaddingException | IllegalBlockSizeException | NoSuchAlgorithmException | BadPaddingException | InvalidKeyException | IllegalArgumentException e) {
@@ -258,9 +258,9 @@ public class HuaweiCrypto {
         }
     }
 
-    public static byte[] decrypt(byte encryptMethod, byte[] message, byte[] key, byte[] iv) throws CryptoException {
+    public static byte[] decrypt(boolean useGCM, byte[] message, byte[] key, byte[] iv) throws CryptoException {
         try {
-            if (encryptMethod == 0x01)
+            if (useGCM)
                 return CryptoUtils.decryptAES_GCM_NoPad(message, key, iv, null);
             return CryptoUtils.decryptAES_CBC_Pad(message, key, iv);
         } catch (InvalidAlgorithmParameterException | NoSuchPaddingException | IllegalBlockSizeException | NoSuchAlgorithmException | BadPaddingException | InvalidKeyException | IllegalArgumentException e) {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiTLV.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiTLV.java
index bccc420ef..7eff8c12b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiTLV.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiTLV.java
@@ -291,7 +291,11 @@ public class HuaweiTLV {
         byte[] serializedTLV = serialize();
         byte[] key = paramsProvider.getSecretKey();
         byte[] nonce = paramsProvider.getIv();
-        byte[] encryptedTLV = HuaweiCrypto.encrypt(paramsProvider.getEncryptMethod(), serializedTLV, key, nonce);
+        byte[] encryptedTLV = HuaweiCrypto.encrypt(
+                paramsProvider.getEncryptMethod() == 0x01 || paramsProvider.getDeviceSupportType() == 0x04,
+                serializedTLV,
+                key,
+                nonce);
         return new HuaweiTLV()
                 .put(CryptoTags.encryption, (byte) 0x01)
                 .put(CryptoTags.initVector, nonce)
@@ -300,7 +304,11 @@ public class HuaweiTLV {
 
     public void decrypt(ParamsProvider paramsProvider) throws CryptoException, HuaweiPacket.MissingTagException {
         byte[] key = paramsProvider.getSecretKey();
-        byte[] decryptedTLV = HuaweiCrypto.decrypt(paramsProvider.getEncryptMethod(), getBytes(CryptoTags.cipherText), key, getBytes(CryptoTags.initVector));
+        byte[] decryptedTLV = HuaweiCrypto.decrypt(
+                paramsProvider.getEncryptMethod() == 0x01 || paramsProvider.getDeviceSupportType() == 0x04,
+                getBytes(CryptoTags.cipherText),
+                key,
+                getBytes(CryptoTags.initVector));
         this.valueMap = new ArrayList<>();
         parse(decryptedTLV);
     }

From 983b7352cb23b2ed69ab7d0220177662082bd509 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sat, 10 Feb 2024 12:46:55 +0000
Subject: [PATCH 547/595] Galaxy Buds2 Pro: Fix recognition of some versions

Not all earbuds use "Galaxy" in the name, apparently.

Fixes #3569
---
 .../devices/galaxy_buds/GalaxyBuds2ProDeviceCoordinator.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBuds2ProDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBuds2ProDeviceCoordinator.java
index 82c5162e4..9579a2962 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBuds2ProDeviceCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/galaxy_buds/GalaxyBuds2ProDeviceCoordinator.java
@@ -30,7 +30,7 @@ import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
 public class GalaxyBuds2ProDeviceCoordinator extends GalaxyBudsGenericCoordinator {
     @Override
     protected Pattern getSupportedDeviceName() {
-        return Pattern.compile("Galaxy Buds2 Pro.*");
+        return Pattern.compile("^(Galaxy )?Buds2 Pro.*");
     }
 
     @Override

From 2c316bfe9d7753eba7e0bb810c2085a332cf84c6 Mon Sep 17 00:00:00 2001
From: Aleksandr Ivanov <sqsvp@ya.ru>
Date: Sun, 28 Jan 2024 22:52:56 +0300
Subject: [PATCH 548/595] Pebble: fix of pairing issue with Pebble 2

---
 .../gadgetbridge/util/BondingUtil.java        | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/BondingUtil.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/BondingUtil.java
index 5db0c72d9..73bed52b3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/BondingUtil.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/BondingUtil.java
@@ -100,7 +100,7 @@ public class BondingUtil {
                             case BluetoothDevice.BOND_BONDED: {
                                 LOG.info("Bonded with " + device.getAddress());
                                 //noinspection StatementWithEmptyBody
-                                if (isLePebble(device) || !bondingInterface.getAttemptToConnect()) {
+                                if (isLePebble(device) || isPebble2(device) || !bondingInterface.getAttemptToConnect()) {
                                     // Do not initiate connection to LE Pebble and some others!
                                 } else {
                                     attemptToFirstConnect(bondingInterface.getCurrentTarget().getDevice());
@@ -293,6 +293,15 @@ public class BondingUtil {
                 (device.getName().startsWith("Pebble-LE ") || device.getName().startsWith("Pebble Time LE "));
     }
 
+    /**
+     * Checks if device is Pebble 2
+     */
+    public static boolean isPebble2(BluetoothDevice device) {
+        return device.getType() == BluetoothDevice.DEVICE_TYPE_LE &&
+                device.getName().startsWith("Pebble ") &&
+                !device.getName().startsWith("Pebble Time LE ");
+    }
+
     /**
      * Uses the CompanionDeviceManager bonding method
      */
@@ -379,9 +388,15 @@ public class BondingUtil {
 
         GB.toast(bondingInterface.getContext(), bondingInterface.getContext().getString(R.string.pairing_creating_bond_with, device.getName(), device.getAddress()), Toast.LENGTH_LONG, GB.INFO);
         toast(bondingInterface.getContext(), bondingInterface.getContext().getString(R.string.discovery_attempting_to_pair, macAddress), Toast.LENGTH_SHORT, GB.INFO);
-        if (GBApplication.getPrefs().getBoolean("enable_companiondevice_pairing", true) &&
-                Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+
+        boolean companionPairingEnabled = GBApplication.getPrefs().getBoolean("enable_companiondevice_pairing", true) &&
+                Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;
+
+        if (companionPairingEnabled && !isPebble2(device)) {
             companionDeviceManagerBond(bondingInterface, device, macAddress);
+        } else if (isPebble2(device)) {
+            // TODO: start companionDevicePairing after connecting to Pebble 2 but before writing to pairing trigger
+            attemptToFirstConnect(device);
         } else {
             bluetoothBond(bondingInterface, device);
         }

From f449d88ad1723fb8acd2e07ecac1b8bf453fdb3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sun, 11 Feb 2024 21:19:36 +0000
Subject: [PATCH 549/595] Update changelog

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c53ee4a0..fc35a7f66 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,8 +11,11 @@
 * Experimental support for Xiaomi Watch S1 Pro
 * Experimental support for Xiaomi Watch S1
 * Experimental support for Xiaomi Watch S3
+* Galaxy Buds2 Pro: Fix recognition of some versions
+* Huawei Watch GT 2: Fix pairing
 * Redmi Smart Band Pro: Fix password digits
 * Pebble: Fix app configuration page
+* Pebble: Fix pairing issue with Pebble 2
 * PineTime: Fix weather forecast on InfiniTime's new simple weather
 * Xiaomi: Fix sleep sometimes extending past the wakeup time
 * Xiaomi: Request battery level and charging state periodically

From 5b804bfb171e331e778c8d2dded7d6c4196b04fb Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Mon, 12 Feb 2024 15:36:30 +0100
Subject: [PATCH 550/595] update changelogs, bump version

---
 CHANGELOG.md                                  |  5 ++--
 app/build.gradle                              |  4 +--
 app/src/main/res/xml/changelog_master.xml     | 25 +++++++++++++++++++
 .../metadata/android/en-US/changelogs/229.txt | 23 +++++++++++++++++
 4 files changed, 52 insertions(+), 5 deletions(-)
 create mode 100644 src/main/fastlane/metadata/android/en-US/changelogs/229.txt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fc35a7f66..602be018f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,6 @@
 ### Changelog
 
-#### Next Version (WIP)
-
+#### 0.79.0
 * Initial support for Honor Magic Watch 2
 * Initial support for Mijia MHO-C303
 * Initial support for Nothing CMF Watch Pro
@@ -15,7 +14,7 @@
 * Huawei Watch GT 2: Fix pairing
 * Redmi Smart Band Pro: Fix password digits
 * Pebble: Fix app configuration page
-* Pebble: Fix pairing issue with Pebble 2
+* Pebble 2: Fix pairing issue
 * PineTime: Fix weather forecast on InfiniTime's new simple weather
 * Xiaomi: Fix sleep sometimes extending past the wakeup time
 * Xiaomi: Request battery level and charging state periodically
diff --git a/app/build.gradle b/app/build.gradle
index b5afb38b2..ed5180e8b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -89,8 +89,8 @@ android {
         compileSdk 33
 
         // Note: always bump BOTH versionCode and versionName!
-        versionName "0.78.0"
-        versionCode 228
+        versionName "0.79.0"
+        versionCode 229
         vectorDrawables.useSupportLibrary = true
         buildConfigField "String", "GIT_HASH_SHORT", "\"${getGitHashShort()}\""
         buildConfigField "boolean", "INTERNET_ACCESS", "false"
diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
index 62ea1ad0b..0b3fc33d4 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -1,5 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
+    <release version="0.79.0" versioncode="229">
+        <change>Initial support for Honor Magic Watch 2</change>
+        <change>Initial support for Mijia MHO-C303</change>
+        <change>Initial support for Nothing CMF Watch Pro</change>
+        <change>Initial support for Sony WI-SP600N</change>
+        <change>Experimental support for Redmi Watch 2</change>
+        <change>Experimental support for Xiaomi Smart Band 8 Pro</change>
+        <change>Experimental support for Xiaomi Watch S1 Pro</change>
+        <change>Experimental support for Xiaomi Watch S1</change>
+        <change>Experimental support for Xiaomi Watch S3</change>
+        <change>Galaxy Buds2 Pro: Fix recognition of some versions</change>
+        <change>Huawei Watch GT 2: Fix pairing</change>
+        <change>Redmi Smart Band Pro: Fix password digits</change>
+        <change>Pebble: Fix app configuration page</change>
+        <change>Pebble 2: Fix pairing issue</change>
+        <change>PineTime: Fix weather forecast on InfiniTime's new simple weather</change>
+        <change>Xiaomi: Fix sleep sometimes extending past the wakeup time</change>
+        <change>Xiaomi: Request battery level and charging state periodically</change>
+        <change>Xiaomi: Fix sleep stage parsing for some devices</change>
+        <change>Zepp OS: Improve device discovery</change>
+        <change>Zepp OS: Fix weather not working on some devices</change>
+        <change>Zepp OS: Prevent crash when installing large firmware updates</change>
+        <change>Fix sport activity summary group order</change>
+        <change>Fix reconnection to devices failing occasionally</change>
+    </release>
     <release version="0.78.0" versioncode="228">
         <change>Initial support for Honor Band 3,4,5,6</change>
         <change>Initial support for Huawei Band 4, 4 Pro, 6, 7, 3e, 4e</change>
diff --git a/src/main/fastlane/metadata/android/en-US/changelogs/229.txt b/src/main/fastlane/metadata/android/en-US/changelogs/229.txt
new file mode 100644
index 000000000..fb398599b
--- /dev/null
+++ b/src/main/fastlane/metadata/android/en-US/changelogs/229.txt
@@ -0,0 +1,23 @@
+* Initial support for Honor Magic Watch 2
+* Initial support for Mijia MHO-C303
+* Initial support for Nothing CMF Watch Pro
+* Initial support for Sony WI-SP600N
+* Experimental support for Redmi Watch 2
+* Experimental support for Xiaomi Smart Band 8 Pro
+* Experimental support for Xiaomi Watch S1 Pro
+* Experimental support for Xiaomi Watch S1
+* Experimental support for Xiaomi Watch S3
+* Galaxy Buds2 Pro: Fix recognition of some versions
+* Huawei Watch GT 2: Fix pairing
+* Redmi Smart Band Pro: Fix password digits
+* Pebble: Fix app configuration page
+* Pebble 2: Fix pairing issue
+* PineTime: Fix weather forecast on InfiniTime's new simple weather
+* Xiaomi: Fix sleep sometimes extending past the wakeup time
+* Xiaomi: Request battery level and charging state periodically
+* Xiaomi: Fix sleep stage parsing for some devices
+* Zepp OS: Improve device discovery
+* Zepp OS: Fix weather not working on some devices
+* Zepp OS: Prevent crash when installing large firmware updates
+* Fix sport activity summary group order
+* Fix reconnection to devices failing occasionally

From 6f48f67dcd135a516288edaa4416b1510ed080fe Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Wed, 17 Jan 2024 14:14:38 +0000
Subject: [PATCH 551/595] Translated using Weblate (Spanish)

Currently translated at 100.0% (2487 of 2487 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/es/
---
 app/src/main/res/values-es/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index d0ac140de..34bd1f35e 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -2696,4 +2696,5 @@
     <string name="huawei_ignore_wakeup_status_end_description">Puede ayudar a detectar correctamente el sueño. Visible inmediatamente en la vista de actividades diarias.</string>
     <string name="updatefirmwareoperation_updateproblem_low_battery">La batería del dispositivo está demasiado baja</string>
     <string name="menuitem_buzzer_intensity">Intensidad del zumbador</string>
+    <string name="prefs_password_4_digits_0_to_9_summary">La contraseña debe tener 4 dígitos, utilizando sólo números</string>
 </resources>
\ No newline at end of file

From 2a2c2de0411607e0b6fbee5221d86d8f60fed90a Mon Sep 17 00:00:00 2001
From: Gregory Blanco <qartez@protonmail.com>
Date: Wed, 17 Jan 2024 16:26:04 +0000
Subject: [PATCH 552/595] Translated using Weblate (Polish)

Currently translated at 100.0% (2487 of 2487 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/pl/
---
 app/src/main/res/values-pl/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 0e6e20dd6..3bfecffb7 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -2703,4 +2703,5 @@
 \nKONTYNUUJ NA WŁASNE RYZYKO!</string>
     <string name="pref_force_dnd_support">Wymuś wspacie dla trybu Nie przeszkadzać</string>
     <string name="huawei_trusleep_summary_light">Poprawione monitorowanie snu</string>
+    <string name="prefs_password_4_digits_0_to_9_summary">Hasło musi składać się z 4 znaków i zawierać jedynie cyfry</string>
 </resources>
\ No newline at end of file

From 8da0b76af174d1ad6865f05387dd1d6943025294 Mon Sep 17 00:00:00 2001
From: 0que <0que@users.noreply.hosted.weblate.org>
Date: Wed, 17 Jan 2024 15:51:59 +0000
Subject: [PATCH 553/595] Translated using Weblate (Russian)

Currently translated at 99.5% (2475 of 2487 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ru/
---
 app/src/main/res/values-ru/strings.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 9d3b53ec5..fd2a10dbc 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -1690,7 +1690,7 @@
     <string name="menuitem_sun_moon">Солнце и Луна</string>
     <string name="menuitem_phone">Телефон</string>
     <string name="menuitem_lockscreen">Экран блокировки</string>
-    <string name="prefs_password_6_digits_0_to_9_summary">Пароль должен состоять из 6 цифр, используя только цифры</string>
+    <string name="prefs_password_6_digits_0_to_9_summary">Пароль должен состоять из 6 цифр</string>
     <string name="prefs_password_summary">Блокировка браслета паролем при снятии с запястья</string>
     <string name="activity_type_hiit">Интенсивная интервальная тренировка</string>
     <string name="prefs_fm_presets_presets">Предустановки</string>
@@ -2695,4 +2695,5 @@
     <string name="pref_summary_general_reconnectonlytoconnected">Переподключаться только к подключенным устройствам, а не ко всем подряд</string>
     <string name="updatefirmwareoperation_updateproblem_low_battery">Заряд батареи слишком низок</string>
     <string name="menuitem_buzzer_intensity">Мощность звукоизлучателя</string>
+    <string name="prefs_password_4_digits_0_to_9_summary">Пароль должен состоять из 4 цифр</string>
 </resources>
\ No newline at end of file

From 3f0e0c203dc7d8396117c4c99564eb1ed42121f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B0=91=E4=B8=BE?= <oshirisu.red@gmail.com>
Date: Wed, 17 Jan 2024 01:22:22 +0000
Subject: [PATCH 554/595] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (2487 of 2487 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/zh_Hans/
---
 app/src/main/res/values-zh-rCN/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 44e841a4c..34ec97f24 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -2694,4 +2694,5 @@
     <string name="pref_summary_general_reconnectonlytoconnected">仅重新连接到已连接的设备，而不是重新连接到所有设备</string>
     <string name="updatefirmwareoperation_updateproblem_low_battery">设备电池电量过低</string>
     <string name="menuitem_buzzer_intensity">蜂鸣器强度</string>
+    <string name="prefs_password_4_digits_0_to_9_summary">密码必须为 4 位数字，且只能使用数字</string>
 </resources>
\ No newline at end of file

From 8a1bc1b5247c934a20244cf282e4df4cbef7ba21 Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Thu, 18 Jan 2024 16:49:09 +0000
Subject: [PATCH 555/595] Translated using Weblate (Spanish)

Currently translated at 99.9% (2509 of 2510 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/es/
---
 app/src/main/res/values-es/strings.xml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 34bd1f35e..76a1f92d4 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -2697,4 +2697,23 @@
     <string name="updatefirmwareoperation_updateproblem_low_battery">La batería del dispositivo está demasiado baja</string>
     <string name="menuitem_buzzer_intensity">Intensidad del zumbador</string>
     <string name="prefs_password_4_digits_0_to_9_summary">La contraseña debe tener 4 dígitos, utilizando sólo números</string>
+    <string name="devicetype_miband8pro">Xiaomi Smart Band 8 Pro</string>
+    <string name="sony_protocol_v2">Versión 2</string>
+    <string name="pref_force_connection_type_title">Forzar el tipo de conexión</string>
+    <string name="activity_info">Información de la actividad</string>
+    <string name="devicetype_mijia_mho_c303">Mijia MHO-C303</string>
+    <string name="sony_protocol_v1">Versión 1</string>
+    <string name="sony_protocol_v3">Versión 3</string>
+    <string name="protocol_version">Versión del protocolo</string>
+    <string name="devicetype_xiaomi_watch_s1">Xiaomi Watch S1</string>
+    <string name="devicetype_xiaomi_watch_s3">Xiaomi Watch S3</string>
+    <string name="devicetype_xiaomi_watch_s1_pro">Xiaomi Watch S1 Pro</string>
+    <string name="uploading_watchface">Subiendo esfera del reloj…</string>
+    <string name="uploadwatchfaceoperation_in_progress">Subiendo esfera del reloj</string>
+    <string name="uploadwatchfaceoperation_complete">Instalación de la esfera del reloj completada</string>
+    <string name="uploadwatchfaceoperation_failed">La instalación de la esfera del reloj falló</string>
+    <string name="pref_force_connection_type_auto">Automático</string>
+    <string name="pref_force_connection_type_ble">Bluetooth de baja energía</string>
+    <string name="pref_force_connection_type_bt_classic">Bluetooth</string>
+    <string name="pref_force_connection_type_description">Puedes intentar forzar el tipo de conexión en caso de que tu dispositivo no responda a Gadgetbridge</string>
 </resources>
\ No newline at end of file

From 969ee2c55e2e9851d946a3f35ed617f6c86a3ba9 Mon Sep 17 00:00:00 2001
From: Gregory Blanco <qartez@protonmail.com>
Date: Thu, 18 Jan 2024 14:20:21 +0000
Subject: [PATCH 556/595] Translated using Weblate (Polish)

Currently translated at 99.8% (2505 of 2510 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/pl/
---
 app/src/main/res/values-pl/strings.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 3bfecffb7..6fa12d4f9 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -2704,4 +2704,19 @@
     <string name="pref_force_dnd_support">Wymuś wspacie dla trybu Nie przeszkadzać</string>
     <string name="huawei_trusleep_summary_light">Poprawione monitorowanie snu</string>
     <string name="prefs_password_4_digits_0_to_9_summary">Hasło musi składać się z 4 znaków i zawierać jedynie cyfry</string>
+    <string name="flatDistance">Płaski dystans</string>
+    <string name="sony_protocol_v1">Wersja 1</string>
+    <string name="sony_protocol_v2">Wersja 2</string>
+    <string name="sony_protocol_v3">Wersja 3</string>
+    <string name="devicetype_xiaomi_watch_s1">Xiaomi Watch S1</string>
+    <string name="protocol_version">Wersja protokołu</string>
+    <string name="devicetype_xiaomi_watch_s3">Xiaomi Watch S3</string>
+    <string name="devicetype_xiaomi_watch_s1_pro">Xiaomi Watch S1 Pro</string>
+    <string name="uploadwatchfaceoperation_failed">Instalacja tarczy zegarka nie powiodła się</string>
+    <string name="uploadwatchfaceoperation_complete">Instalacja tarczy zegarka zakończona</string>
+    <string name="uploadwatchfaceoperation_in_progress">Wysyłanie tarczy zegarka</string>
+    <string name="uploading_watchface">Wysyłanie tarczy zegarka…</string>
+    <string name="pref_force_connection_type_title">Wymuś typ połączenia</string>
+    <string name="devicetype_miband8pro">Xiaomi Smart Band 8 Pro</string>
+    <string name="devicetype_mijia_mho_c303">Mijia MHO-C303</string>
 </resources>
\ No newline at end of file

From 2286839891d9ab9900427b5683ccc074abd5a444 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B0=91=E4=B8=BE?= <oshirisu.red@gmail.com>
Date: Thu, 18 Jan 2024 05:59:11 +0000
Subject: [PATCH 557/595] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (2510 of 2510 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/zh_Hans/
---
 app/src/main/res/values-zh-rCN/strings.xml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 34ec97f24..4fee4f999 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -2695,4 +2695,24 @@
     <string name="updatefirmwareoperation_updateproblem_low_battery">设备电池电量过低</string>
     <string name="menuitem_buzzer_intensity">蜂鸣器强度</string>
     <string name="prefs_password_4_digits_0_to_9_summary">密码必须为 4 位数字，且只能使用数字</string>
+    <string name="devicetype_mijia_mho_c303">米家 MHO-C303</string>
+    <string name="sony_protocol_v1">版本 1</string>
+    <string name="devicetype_miband8pro">小米智能手环 8 Pro</string>
+    <string name="flatDistance">平面距离</string>
+    <string name="protocol_version">协议版本</string>
+    <string name="devicetype_xiaomi_watch_s3">小米手表 S3</string>
+    <string name="sony_protocol_v2">版本 2</string>
+    <string name="devicetype_xiaomi_watch_s1">小米手表 S1</string>
+    <string name="sony_protocol_v3">版本 3</string>
+    <string name="devicetype_xiaomi_watch_s1_pro">小米手表 S1 Pro</string>
+    <string name="activity_info">活动信息</string>
+    <string name="pref_force_connection_type_description">如果您的设备不响应 Gadgetbridge，您可以尝试强制连接类型</string>
+    <string name="uploading_watchface">正在上传表盘……</string>
+    <string name="uploadwatchfaceoperation_in_progress">正在上传表盘</string>
+    <string name="uploadwatchfaceoperation_complete">表盘安装已完成</string>
+    <string name="uploadwatchfaceoperation_failed">表盘安装失败</string>
+    <string name="pref_force_connection_type_title">强制连接类型</string>
+    <string name="pref_force_connection_type_auto">自动</string>
+    <string name="pref_force_connection_type_ble">低功耗蓝牙</string>
+    <string name="pref_force_connection_type_bt_classic">经典蓝牙</string>
 </resources>
\ No newline at end of file

From 4f6bc4616899b9ba532b52f3d9d9867067bae0ca Mon Sep 17 00:00:00 2001
From: skdubg <skdubg@autistici.org>
Date: Fri, 19 Jan 2024 05:35:47 +0000
Subject: [PATCH 558/595] Translated using Weblate (German)

Currently translated at 92.9% (2333 of 2510 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/de/
---
 app/src/main/res/values-de/strings.xml | 192 ++++++++++++++++---------
 1 file changed, 127 insertions(+), 65 deletions(-)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 242bec82a..a2d7a68f0 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -52,7 +52,7 @@
     <!--Strings related to Settings-->
     <string name="title_activity_settings">Einstellungen</string>
     <string name="pref_header_general">Allgemeine Einstellungen</string>
-    <string name="pref_title_general_autoconnectonbluetooth">Verbinde, wenn Bluetooth eingeschaltet ist</string>
+    <string name="pref_title_general_autoconnectonbluetooth">Verbindung mit Gadgetbridge-Gerät(en) herstellen, wenn Bluetooth eingeschaltet ist</string>
     <string name="pref_title_general_autostartonboot">Automatisch starten</string>
     <string name="pref_title_general_autoreconnect">Verbindung automatisch wiederherstellen</string>
     <string name="pref_title_audio_player">Bevorzugter Audioplayer</string>
@@ -469,9 +469,9 @@
     <string name="kind_gps">GPS-Firmware</string>
     <string name="devicetype_unknown">Unbekanntes Gerät</string>
     <string name="devicetype_test">Testgerät</string>
-    <string name="devicetype_pebble">Pebble</string>
-    <string name="devicetype_miband">Mi Band</string>
-    <string name="devicetype_miband2">Mi Band 2</string>
+    <string name="devicetype_pebble"></string>
+    <string name="devicetype_miband"></string>
+    <string name="devicetype_miband2"></string>
     <string name="devicetype_amazfit_bip">Amazfit Bip</string>
     <string name="devicetype_amazfit_cor">Amazfit Cor</string>
     <string name="devicetype_vibratissimo">Vibratissimo</string>
@@ -534,7 +534,7 @@
 \nINSTALLATION AUF EIGENE GEFAHR!</string>
     <string name="pref_summary_pebble_gatt_clientonly">Dies ist nur für Pebble 2 und experimentell, versuche dies, wenn du Verbindungsprobleme hast</string>
     <string name="pref_auto_fetch">Aktivitätsdaten automatisch abrufen</string>
-    <string name="devicetype_miband3">Mi Band 3</string>
+    <string name="devicetype_miband3"></string>
     <string name="devicetype_q8">Q8</string>
     <string name="blacklist_all_for_notifications">Blacklist für alle Benachrichtigungen</string>
     <string name="whitelist_all_for_notifications">Whitelist für alle Benachrichtigungen</string>
@@ -710,7 +710,7 @@
     <string name="vietnamese">Vietnamesisch</string>
     <string name="portuguese">Portugiesisch</string>
     <string name="devicetype_amazfit_cor2">Amazfit Cor 2</string>
-    <string name="devicetype_miband4">Mi Band 4</string>
+    <string name="devicetype_miband4"></string>
     <string name="fw_upgrade_notice_miband4">Du bist dabei, die Firmware %s auf dein Mi Band 4 zu installieren.
 \n
 \nBitte stelle sicher, dass du die .fw Datei und die .res Datei installierst. Dein Band wird nach der Installation der .fw Datei neu gestartet.
@@ -925,7 +925,7 @@
     <string name="error_background_service_reason_truncated">Hintergrunddienst konnte nicht gestartet werden, wegen…</string>
     <string name="error_background_service">Start des Hintergrunddienstes fehlgeschlagen</string>
     <string name="menuitem_breathing">Atemübungen</string>
-    <string name="devicetype_miband5">Mi Band 5</string>
+    <string name="devicetype_miband5"></string>
     <string name="fw_upgrade_notice_miband5">Du bist dabei, die Firmware %s auf dein Mi Band 5 zu installieren.
 \n
 \nBitte stelle sicher, dass du zuerst die .fw Datei und dann die .res Datei installierst. Dein Band wird nach der Installation der .fw Datei neu starten.
@@ -984,7 +984,7 @@
     <string name="prefs_events_forwarding_startnonwear">Beim nicht tragend</string>
     <string name="prefs_events_forwarding_wokeup">Beim Aufwachen</string>
     <string name="prefs_events_forwarding_fellsleep">Beim Einschlafen</string>
-    <string name="activity_type_yoga">Yoga</string>
+    <string name="activity_type_yoga"></string>
     <string name="activity_type_swimming_openwater">Schwimmen (Freiwasser)</string>
     <string name="Strokes">Züge</string>
     <string name="calories_unit">kcal</string>
@@ -1030,7 +1030,7 @@
     <string name="activity_summary_edit_name_title">Beschriftung bearbeiten</string>
     <string name="swolf_index">Swolf-Index</string>
     <string name="baseAltitude">Basishöhe</string>
-    <string name="swolfIndex">Swolf-Index</string>
+    <string name="swolfIndex">SWOLF</string>
     <string name="activity_filter_individual_items">Individuell ausgewählte Elemente</string>
     <string name="addto_filter">Zu Filter hinzufügen</string>
     <string name="activity_summaries_all_devices">Alle Geräte</string>
@@ -1045,9 +1045,9 @@
     <string name="yes">Ja</string>
     <string name="averageSpeed">Durchschnittliche Geschwindigkeit</string>
     <string name="about_links">Links</string>
-    <string name="activity_type_badminton">Badminton</string>
+    <string name="activity_type_badminton"></string>
     <string name="activity_type_pingpong">Tischtennis</string>
-    <string name="activity_type_basketball">Basketball</string>
+    <string name="activity_type_basketball"></string>
     <string name="activity_type_cricket">Kricket</string>
     <string name="activity_type_rowing_machine">Rudergerät</string>
     <string name="activity_type_soccer">Fußball</string>
@@ -1213,7 +1213,7 @@
     <string name="menuitem_temperature">Temperatur</string>
     <string name="menuitem_widgets">Widgets</string>
     <string name="menuitem_events">Ereignisse</string>
-    <string name="devicetype_miband6">Mi Band 6</string>
+    <string name="devicetype_miband6"></string>
     <string name="fw_upgrade_notice_miband6">Du bist dabei, die Firmware %s auf dein Mi Band 6 zu installieren.
 \n
 \nBitte stelle sicher, dass du die .fw Datei und die .res Datei installierst. Dein Band wird nach der Installation der .fw Datei neu gestartet.
@@ -1349,7 +1349,7 @@
     <string name="devicetype_sony_wh_1000xm3">Sony WH-1000XM3</string>
     <string name="devicetype_galaxybuds_live">Galaxy Buds Live</string>
     <string name="pref_title_equalizer_normal">Normal</string>
-    <string name="pref_header_equalizer">Equalizer</string>
+    <string name="pref_header_equalizer"></string>
     <string name="pref_header_system">System</string>
     <string name="devicetype_galaxybuds">Galaxy Buds</string>
     <string name="prefs_equalizer_preset">Equalizer-Voreinstellungen</string>
@@ -1597,8 +1597,8 @@
     <string name="about_description_banglejs_nopebble">Android-Begleit-App für Bangle.js, die auf dem Gadgetbridge-Projekt aufbaut, mit zusätzlichem Internetzugang.
 \n
 \nAufgrund der Richtlinien des Google Play Stores ist es uns nicht erlaubt, einen Spendenlink in der App selbst einzubauen, aber wenn dir diese App gefällt, ziehe bitte eine Spende über die Gadgetbridge-Homepage unten in Erwägung.</string>
-    <string name="application_name_main_nightly">Gadgetbridge (Nightly)</string>
-    <string name="title_activity_controlcenter_main_nightly">Gadgetbridge Nightly</string>
+    <string name="application_name_main_nightly"></string>
+    <string name="title_activity_controlcenter_main_nightly"></string>
     <string name="about_activity_title_main_nightly">Über Gadgetbridge Nightly</string>
     <string name="about_description_main_nightly">Cloudloser und freier quelloffener Ersatz für Closed-Source Android-Gadget-Apps von Anbietern. Nächtliche Veröffentlichungen von Gadgetbridge. Es kann nicht installiert werden, wenn du bereits die Gadgetbridge- oder die Pebble-App installiert hast, da es einen Konflikt mit dem Pebble-Anbieter gibt.</string>
     <string name="gadgetbridge_running_main_nightly">Nightly GB läuft</string>
@@ -1818,8 +1818,8 @@
     <string name="controlcenter_get_heartrate_measurement">Herzfrequenzmessung</string>
     <string name="pref_write_logfiles_not_available">Die Initialisierung der Dateiprotokollierung ist fehlgeschlagen, das Schreiben von Protokolldateien ist derzeit nicht möglich. Starte die App neu, um zu versuchen, die Protokolldateien erneut zu initialisieren.</string>
     <string name="devicetype_binary_sensor">Binärer Sensor</string>
-    <string name="application_name_banglejs_nightly">Bangle.js Gadgetbridge (Nightly)</string>
-    <string name="title_activity_controlcenter_banglejs_nightly">Bangle.js Gadgetbridge (Nightly)</string>
+    <string name="application_name_banglejs_nightly"></string>
+    <string name="title_activity_controlcenter_banglejs_nightly"></string>
     <string name="about_activity_title_banglejs_nightly">Über Bangle.js Gadgetbridge (Nightly)</string>
     <string name="about_description_banglejs_nightly">Android-Begleit-App für Bangle.js, die auf dem Gadgetbridge-Projekt aufbaut, mit zusätzlichem Internetzugang.
 \n
@@ -1860,9 +1860,9 @@
     <string name="seconds_14">14 Sekunden</string>
     <string name="seconds_15">15 Sekunden</string>
     <string name="prefs_always_on_display">Display immer eingeschaltet</string>
-    <string name="smart">Smart</string>
+    <string name="smart"></string>
     <string name="mi2_dnd_always">Immer</string>
-    <string name="devicetype_miband7">Xiaomi Smart Band 7</string>
+    <string name="devicetype_miband7"></string>
     <string name="menuitem_countdown">Countdown</string>
     <string name="menuitem_personal_activity_intelligence">Persönliche Aktivitätsintelligenz</string>
     <string name="menuitem_female_health">Weibliche Gesundheit</string>
@@ -1908,18 +1908,18 @@
 \nINSTALLATION AUF EIGENE GEFAHR!</string>
     <string name="pref_title_notification_prefer_long_text">Langen Benachrichtigungstext bevorzugen</string>
     <string name="pref_summary_notification_prefer_long_text">Falls verfügbar, langen Benachrichtigungstext an das Gerät senden</string>
-    <string name="devicetype_amazfit_gts3">Amazfit GTS 3</string>
+    <string name="devicetype_amazfit_gts3"></string>
     <string name="menuitem_unknown_app">Unbekannt (%s)</string>
     <string name="pref_summary_overwrite_settings_on_connection">Beim Verbinden mit dem Band überschreibst du alle Einstellungen des Bandes.</string>
     <string name="pref_title_overwrite_settings_on_connection">Überschreiben von Einstellungen bei der Verbindung</string>
-    <string name="kind_app">App</string>
+    <string name="kind_app"></string>
     <string name="dismiss">Ablehnen</string>
     <string name="fw_upgrade_notice_amazfit_gtr3">Du bist dabei, die Firmware %s auf deine Amazfit GTR 3 zu installieren.
 \n
 \nDeine Uhr wird nach der Installation der .zip Datei neu starten.
 \n
 \nINSTALLATION AUF EIGENE GEFAHR!</string>
-    <string name="devicetype_amazfit_gtr3">Amazfit GTR 3</string>
+    <string name="devicetype_amazfit_gtr3"></string>
     <string name="pref_summary_third_party_app_device_settings">Erlaube anderen installierten Apps von Drittanbietern, Geräteeinstellungen über Intents festzulegen.</string>
     <string name="pref_title_third_party_app_device_settings">Ändern von Einstellungen durch App von Drittanbietern zulassen</string>
     <string name="activity_type_dance">Tanzen</string>
@@ -1930,10 +1930,10 @@
     <string name="activity_type_stretching">Dehnen</string>
     <string name="activity_type_stepper">Stepper</string>
     <string name="activity_type_pilates">Pilates</string>
-    <string name="activity_type_volleyball">Volleyball</string>
+    <string name="activity_type_volleyball"></string>
     <string name="activity_type_table_tennis">Tischtennis</string>
-    <string name="activity_type_bowling">Bowling</string>
-    <string name="activity_type_zumba">Zumba</string>
+    <string name="activity_type_bowling"></string>
+    <string name="activity_type_zumba"></string>
     <string name="activity_type_indoor_ice_skating">Indoor-Eislaufen</string>
     <string name="devicetype_amazfit_gtr_lite">Amazfit GTR Lite</string>
     <string name="activity_type_street_dance">Street Dance</string>
@@ -1966,7 +1966,7 @@
     <string name="devicetype_sony_wh_1000xm2">Sony WH-1000XM2</string>
     <string name="devicetype_sony_wf_1000xm4">Sony WF-1000XM4</string>
     <string name="balanced">Ausgewogen</string>
-    <string name="dual_band">Dual Band</string>
+    <string name="dual_band"></string>
     <string name="low_power_gps">Stromsparendes GPS</string>
     <string name="gps">GPS</string>
     <string name="gps_bds">GPS + BDS</string>
@@ -2010,7 +2010,7 @@
     <string name="menuitem_offline_voice">Offline Stimme</string>
     <string name="menuitem_screen_always_lit">Bildschirm leuchtet immer</string>
     <string name="pref_header_sound_vibration">Ton &amp; Vibration</string>
-    <string name="single_band">Single Band</string>
+    <string name="single_band"></string>
     <string name="gps_galileo">GPS + GALILEO</string>
     <string name="pref_text_to_speech">Text in Sprache</string>
     <string name="offline_voice_respond_turn_wrist">Reagiert beim Drehen des Handgelenks</string>
@@ -2069,7 +2069,7 @@
     <string name="devicetype_amazfit_band7">Amazfit Band 7</string>
     <string name="function_enabled">Aktiviert</string>
     <string name="world_clock_code">Code</string>
-    <string name="devicetype_amazfit_gts4">Amazfit GTS 4</string>
+    <string name="devicetype_amazfit_gts4"></string>
     <string name="pref_title_touch_spotify_official_app">Spotify (nur offizielle App)</string>
     <string name="pref_title_touch_spotify_galaxy_app">Spotify (nur Galaxy Wearable App)</string>
     <string name="fw_upgrade_notice_amazfit_gts4">Du bist dabei, die Firmware %s auf deine Amazfit GTS 4 zu installieren.
@@ -2084,7 +2084,7 @@
 \nDeine Uhr wird nach der Installation der .zip Datei neu starten.
 \n
 \nINSTALLATION AUF EIGENE GEFAHR!</string>
-    <string name="devicetype_amazfit_gts4_mini">Amazfit GTS 4 Mini</string>
+    <string name="devicetype_amazfit_gts4_mini"></string>
     <string name="devicetype_sony_linkbuds_s">Sony LinkBuds S</string>
     <string name="intent_api_allow_trigger_export_title">Datenbankexport zulassen</string>
     <string name="menuitem_wechat_pay">WeChat Pay</string>
@@ -2183,7 +2183,7 @@
     <string name="quick_attention">Schnelle Aufmerksamkeit</string>
     <string name="double_tap">Doppeltes Antippen</string>
     <string name="continue_pressing">Gedrückt halten</string>
-    <string name="devicetype_amazfit_gtr3_pro">Amazfit GTR 3 Pro</string>
+    <string name="devicetype_amazfit_gtr3_pro"></string>
     <string name="menuitem_vo2_max">VO₂ Max</string>
     <string name="menuitem_mi_ai">MI AI</string>
     <string name="zepp_os_watchface_simplicity_data">Einfache Daten</string>
@@ -2324,14 +2324,14 @@
     <string name="activity_type_surfing">Surfen</string>
     <string name="activity_type_windsurfing">Windsurfen</string>
     <string name="activity_type_football">Fußball</string>
-    <string name="activity_type_rugby">Rugby</string>
+    <string name="activity_type_rugby"></string>
     <string name="activity_type_baseball">Baseball</string>
-    <string name="activity_type_handball">Handball</string>
-    <string name="activity_type_tennis">Tennis</string>
-    <string name="activity_type_squash">Squash</string>
+    <string name="activity_type_handball"></string>
+    <string name="activity_type_tennis"></string>
+    <string name="activity_type_squash"></string>
     <string name="activity_type_weightlifting">Gewichtheben</string>
     <string name="activity_type_skiing">Skifahren</string>
-    <string name="activity_type_hockey">Hockey</string>
+    <string name="activity_type_hockey"></string>
     <string name="activity_type_icehockey">Eishockey</string>
     <string name="activity_type_iceskating">Schlittschuhlaufen</string>
     <string name="activity_type_golf">Golfen</string>
@@ -2359,7 +2359,7 @@
     <string name="pref_theme_dynamic_colors_not_available_warning">Dynamische Farben sind auf deinem Gerät nicht verfügbar, nur Android 12+ unterstützt diese Funktion. Gadgetbridge verwendet die Standardfarben von Material 3.</string>
     <string name="pref_theme_dynamic_colors_explanation">Hinweis: Für das Design mit dynamischen Farben musst du Hintergrundbildfarben oder Farbpalette in deinen Android 12+ Darstellungseinstellungen aktivieren. Wenn du das nicht tust, wird Gadgetbridge die Standardfarben von Material 3 verwenden.</string>
     <string name="menuitem_zepp_coach">Zepp Coach</string>
-    <string name="devicetype_amazfit_bip3_pro">Amazfit Bip 3 Pro</string>
+    <string name="devicetype_amazfit_bip3_pro"></string>
     <string name="fw_upgrade_notice_amazfit_cheetah_pro">Du bist dabei, die Firmware %s auf deine Amazfit Cheetah Pro zu installieren.
 \n
 \nDeine Uhr wird nach der Installation der .zip-Datei neu starten.
@@ -2380,8 +2380,8 @@
 \n
 \nINSTALLATION AUF EIGENE GEFAHR!</string>
     <string name="devicetype_amazfit_cheetah_round">Amazfit Cheetah (Rund)</string>
-    <string name="devicetype_amazfit_cheetah_pro">Amazfit Cheetah Pro</string>
-    <string name="devicetype_amazfit_bip5">Amazfit Bip 5</string>
+    <string name="devicetype_amazfit_cheetah_pro"></string>
+    <string name="devicetype_amazfit_bip5"></string>
     <string name="devicetype_amazfit_trex_ultra">Amazfit T-Rex Ultra</string>
     <string name="devicetype_amazfit_falcon">Amazfit Falcon</string>
     <string name="devicetype_amazfit_gtr_mini">Amazfit GTR Mini</string>
@@ -2407,7 +2407,7 @@
     <string name="prefs_home_icon_left_item">Links</string>
     <string name="prefs_wena3_led_none">Keine LED</string>
     <string name="updatefirmwareoperation_failed_low_mtu">Die aktuelle MTU von %1$d ist zu niedrig,bitte aktiviere eine hohe MTU in den Geräteeinstellungen und trenne/schließe das Gerät neu an.</string>
-    <string name="prefs_wena3_home_icon_name_riiiver">Riiiver</string>
+    <string name="prefs_wena3_home_icon_name_riiiver"></string>
     <string name="pref_message_privacy_mode_bodyonly">Nur Nachrichtentext ausblenden</string>
     <string name="prefs_wena3_home_icon_name_suica">Suica Kontostand</string>
     <string name="prefs_wena3_vibration_strength_item_medium">Mittel</string>
@@ -2464,7 +2464,7 @@
     <string name="error_invalid_menu_structure">Ungültiges JSON für Menüstruktur</string>
     <string name="prefs_wena3_item_large_font">Größere Schriftgröße</string>
     <string name="button_reset_menu_structure">Menüstruktur zurücksetzen</string>
-    <string name="prefs_wena3_hint_large_font">Schriftgröße in Kalender, Benachrichtigungen, etc. vergrößern</string>
+    <string name="prefs_wena3_hint_large_font">Schriftgröße in Kalender, Benachrichtigungen usw. vergrößern</string>
     <string name="prefs_wena3_receive_calls_item">Anrufbenachrichtigungen empfangen</string>
     <string name="prefs_wena3_notification_default_call_vibration">Eingehende Anrufvibration</string>
     <string name="prefs_wena3_notification_default_call_led">LED-Farbe bei eingehendem Anruf</string>
@@ -2480,7 +2480,7 @@
     <string name="menuitem_zepp_pay">Zepp Pay</string>
     <string name="femometer_measurement_mode_quick">Schneller Modus (30s)</string>
     <string name="pref_title_notifications_ignore_work_profile">Arbeitsprofilbenachrichtigungen ignorieren</string>
-    <string name="devicetype_amazfit_balance">Amazfit Balance</string>
+    <string name="devicetype_amazfit_balance"></string>
     <string name="yard">yd</string>
     <string name="strokes_minute">Züge/min</string>
     <string name="femometer_measurement_mode_title">Messmodus</string>
@@ -2494,37 +2494,99 @@
     <string name="menuitem_thermometer">Thermometer</string>
     <string name="common_symbols">Gebräuchliche Symbole</string>
     <string name="devicetype_femometer_vinca2">Femometer Vinca II</string>
-    <string name="activity_type_trekking">Wandern</string>
-    <string name="activity_type_wrestling">Ringkampf</string>
-    <string name="devicetype_redmi_smart_band_pro">Redmi Smart Band Pro</string>
+    <string name="activity_type_trekking">Wanderung</string>
+    <string name="activity_type_wrestling"></string>
+    <string name="devicetype_redmi_smart_band_pro"></string>
     <string name="menuitem_readiness">Bereitschaft</string>
-    <string name="devicetype_xiaomi_watch_lite">Xiaomi Watch Lite</string>
-    <string name="devicetype_amazfit_active_edge">Amazfit Active Edge</string>
-    <string name="pref_summary_casio_alert_call">Alarm (Vibration/Ton) für eingehende Anrufe</string>
-    <string name="pref_title_casio_alert_email">Alarm für E-Mail-Benachrichtigungen</string>
-    <string name="devicetype_miband7pro">Xiaomi Smart Band 7 Pro</string>
+    <string name="devicetype_xiaomi_watch_lite"></string>
+    <string name="devicetype_amazfit_active_edge"></string>
+    <string name="pref_summary_casio_alert_call">Klingeln (Vibration/Ton) bei eingehenden Anrufen</string>
+    <string name="pref_title_casio_alert_email">Alarm für Mail-Benachrichtigungen</string>
+    <string name="devicetype_miband7pro"></string>
     <string name="clap_hands_to_wakeup_device">Klatsche in die Hände, um den Bildschirm zu aktivieren</string>"
-    <string name="devicetype_colacao21">ColaCao 2021</string>
-    <string name="devicetype_colacao23">ColaCao 2023</string>
-    <string name="devicetype_redmiwatch3active">Redmi Watch 3 Active</string>
-    <string name="devicetype_redmi_smart_band_2">Redmi Smart Band 2</string>
+    <string name="devicetype_colacao21"></string>
+    <string name="devicetype_colacao23"></string>
+    <string name="devicetype_redmiwatch3active"></string>
+    <string name="devicetype_redmi_smart_band_2"></string>
     <string name="standing_time">Steh-Zeit</string>
     <string name="active_time">Aktiv-Zeit</string>
     <string name="pref_title_send_app_notifications">Sende Benachrichtigungen</string>
     <string name="pref_summary_send_app_notifications">Sende App-Benachrichtigungen an das Gerät</string>
-    <string name="pref_title_preview_message_in_title">Zeige eine Vorschau der Nachricht im Titel</string>
-    <string name="pref_summary_preview_message_in_title">Zeige eine Vorschau der Nachricht im Titel der Benachrichtigung, wie es die Einstellungen des Gerätes erlaubt</string>
-    <string name="pref_title_casio_alert_calendar">Alarm für Kalenderbenachrichtigungen</string>
-    <string name="pref_summary_casio_alert_calendar">Alarm (Vibration/Ton) für Kalenderbenachrichtigungen</string>
-    <string name="pref_title_casio_alert_call">Alarm für eingehende Anrufe</string>
-    <string name="pref_summary_casio_alert_email">Alarm (Vibration/Ton) für E-Mail-Benachrichtigungen</string>
-    <string name="pref_title_casio_alert_sms">Alarm für SMS-Benachrichtigungen</string>
+    <string name="pref_title_preview_message_in_title">Nachrichtenvorschau in Titelleiste anzeigen</string>
+    <string name="pref_summary_preview_message_in_title">Zeigt vom Gerät zugelassene Vorschau der Nachricht im Benachrichtigungstitel an</string>
+    <string name="pref_title_casio_alert_calendar">Alarmton für Kalender-Erinnerungen</string>
+    <string name="pref_summary_casio_alert_calendar">Alarm (Vibration/Ton) für Kalender-Erinnerungen</string>
+    <string name="pref_title_casio_alert_call">Klingelton bei eingehenden Anrufen</string>
+    <string name="pref_summary_casio_alert_email">Alarm (Vibration/Ton) für Mail-Benachrichtigungen</string>
+    <string name="pref_title_casio_alert_sms">SMS-Klingelton</string>
     <string name="pref_title_casio_alert_other">Alarm für andere Benachrichtigungen</string>
     <string name="pref_summary_casio_alert_other">Alarm (Vibration/Ton) für Benachrichtigungen in anderen Kategorien</string>
-    <string name="devicetype_miband8">Xiaomi Smart Band 8</string>
+    <string name="devicetype_miband8"></string>
     <string name="devicetype_mijia_lywsd03">Mijia Temperatur- und Feuchtigkeitssensor 2</string>
-    <string name="menuitem_body_composition">Körperzusammensetzung</string>
-    <string name="devicetype_amazfit_active">Amazfit Active</string>
-    <string name="pref_title_goal_secondary">Zweites Ziel</string>
-    <string name="devicetype_redmi_watch_2_lite">Redmi Watch 2 Lite</string>
+    <string name="menuitem_body_composition">Körperliche Zusammensetzung</string>
+    <string name="devicetype_amazfit_active"></string>
+    <string name="pref_title_goal_secondary">Zusätzliches Ziel</string>
+    <string name="devicetype_redmi_watch_2_lite"></string>
+    <string name="wake_up_time">Aufwachen</string>
+    <string name="pixoo_power_saving_summary">Der Bildschirm schaltet sich aus, wenn das Mikrofon eine Zeit lang Stille erkannt hat</string>
+    <string name="activity_info">Informationen zur Aktivität</string>
+    <string name="prefs_password_4_digits_0_to_9_summary">Das Passwort muss 4-stellig sein und darf nur Zahlen enthalten</string>
+    <string name="activity_type_trail_run">Geländelauf</string>
+    <string name="pref_force_connection_type_title">Verbindungstyp erzwingen</string>
+    <string name="uploadwatchfaceoperation_complete">Installation des Zifferblatts abgeschlossen</string>
+    <string name="uploadwatchfaceoperation_failed">Installation des Zifferblatts fehlgeschlagen</string>
+    <string name="pref_heartrate_automatic_enable">Automatische Pulsmessung aktivieren</string>
+    <string name="zepp_os_watchface_vast_sky">Weitläufiger Himmel</string>
+    <string name="zepp_os_watchface_pure_white">Reines Weiß</string>
+    <string name="prefs_wena3_hint_rich_design">Fügt abgerundete Ecken um Home Screen Icons hinzu</string>
+    <string name="error_menu_companion_not_installed">\'HR Menu Companion\" ist wahrscheinlich nicht installiert</string>
+    <string name="pref_vitality_score_7_day_title">7-Tage-Fortschritt</string>
+    <string name="pref_vitality_score_daily_title">Täglicher Fortschritt</string>
+    <string name="pref_vitality_score_title">Vitalitätswert</string>
+    <string name="zepp_os_watchface_guider">Reiseführer</string>
+    <string name="prefs_phone_silent_mode">Telefonstummschaltung</string>
+    <string name="silent_mode_normal_vibrate">Normal / Vibration</string>
+    <string name="prefs_wena3_vibration_smart_item">Intelligente Vibration</string>
+    <string name="bedtime">Bettzeit</string>
+    <string name="prefs_wena3_auto_power_off_item">Automatisches Ausschalten</string>
+    <string name="prefs_disconnect_notification_summary">Benachrichtigung auf dem Gerät, wenn die Verbindung zu Bluetooth getrennt wird.</string>
+    <string name="dnd_all_day">Ganztägig</string>
+    <string name="pref_force_options">Optionen erzwingen</string>
+    <string name="pref_force_smart_alarm">Intelligenten Alarm erzwingen</string>
+    <string name="notification_channel_connection_status_name">Status der Verbindung</string>
+    <string name="pref_force_dnd_support">Unterstützung von \"Bitte-Nicht-Stören\" erzwingen</string>
+    <string name="charts_legend_spo2_average">Durchschnittlicher Blutsauerstoff</string>
+    <string name="pref_disable_find_phone_with_dnd">Telefon suchen deaktivieren, wenn Bitte-Nicht-Stören aktiv ist</string>
+    <string name="pref_enable_call_reject">Ablehnen von Anrufen aktivieren</string>
+    <string name="pref_spo_automatic_enable">Automatische SpO2-Messung aktivieren</string>
+    <string name="prefs_wena3_item_background_sync">Datensynchronisierung im Hintergrund</string>
+    <string name="prefs_wena3_title_alarm">Alarm Einstellungen</string>
+    <string name="updatefirmwareoperation_updateproblem_low_battery">Der Akku des Geräts ist zu schwach</string>
+    <string name="silent_mode_normal_silent">Normal / Lautlos</string>
+    <string name="silent_mode_vibrate_silent">Vibration / Lautlos</string>
+    <string name="clap_hands_to_wakeup_device_summary">Erneutes Klatschen schaltet den Bildschirm aus</string>"
+    <string name="busy_task_fetch_statistics">Statistiken abrufen</string>
+    <string name="busy_task_fetch_temperature">Abruf der Temperaturdaten</string>
+    <string name="prefs_wearmode">Tragemodus</string>
+    <string name="zepp_os_watchface_starry_sky">Sternenhimmel</string>
+    <string name="prefs_wena3_hint_background_sync">Erlaube Wena, Gadgetbridge in regelmäßigen Abständen aufzufordern, Aktivitätsdaten vom Gerät herunterzuladen</string>
+    <string name="fossil_hr_nav_app_not_installed_notify_title">Navigations-App nicht auf der Uhr installiert</string>
+    <string name="call_rejection_method_reject">Ablehnen</string>
+    <string name="pref_sleep_mode_schedule_title">Zeitplan für Schlafmodus</string>
+    <string name="pref_sleep_mode_schedule_summary">Sendet eine Erinnerung und schaltet zur Bettzeit in den Schlafmodus. Zur geplanten Aufwachzeit ertönt der Weckalarm.</string>
+    <string name="pref_vitality_score_7_day_summary">Erhalte eine Benachrichtigung, wenn dein Vitalitätswert in den letzten 7 Tagen 30, 60 oder 100 erreicht hat</string>
+    <string name="pref_vitality_score_daily_summary">Erhalte eine Benachrichtigung, wenn du die maximale Anzahl an Vitalitätspunkten für den Tag erreicht hast</string>
+    <string name="wearmode_band">Armband</string>
+    <string name="wearmode_necklace">Halskette (Halsband)</string>
+    <string name="wearmode_pebble">Kieselsteine (Schuhschnalle)</string>
+    <string name="danish">Dänisch</string>
+    <string name="pref_summary_casio_alert_sms">Alarm (Vibration/Ton) für SMS (Textnachrichten)</string>
+    <string name="prefs_wena3_button_action_item_long">Lange drücken</string>
+    <string name="menuitem_buzzer_intensity">Summer-Intensität</string>
+    <string name="zepp_os_watchface_lightning_flash">Blitzschlag</string>
+    <string name="uploading_watchface">Zifferblatt hochladen…</string>
+    <string name="uploadwatchfaceoperation_in_progress">Zifferblatt hochladen</string>
+    <string name="pref_title_fossil_hr_nav_vibrate">Vibrieren bei neuer Anweisung</string>
+    <string name="pref_title_fossil_hr_nav_foreground">In den Vordergrund rücken</string>
+    <string name="prefs_device_name">Gerätebezeichnung</string>
 </resources>
\ No newline at end of file

From 7f5ce816859eee264598b0c107a4eacc0d1fd1bf Mon Sep 17 00:00:00 2001
From: Traladarer <Traladarer@users.noreply.hosted.weblate.org>
Date: Fri, 19 Jan 2024 07:07:19 +0000
Subject: [PATCH 559/595] Translated using Weblate (German)

Currently translated at 92.9% (2333 of 2510 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/de/
---
 app/src/main/res/values-de/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index a2d7a68f0..df8d68840 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -2479,7 +2479,7 @@
     <string name="femometer_measurement_mode_normal">Normaler Modus (60s-90s)</string>
     <string name="menuitem_zepp_pay">Zepp Pay</string>
     <string name="femometer_measurement_mode_quick">Schneller Modus (30s)</string>
-    <string name="pref_title_notifications_ignore_work_profile">Arbeitsprofilbenachrichtigungen ignorieren</string>
+    <string name="pref_title_notifications_ignore_work_profile">Ignoriere Arbeitsprofilbenachrichtigungen</string>
     <string name="devicetype_amazfit_balance"></string>
     <string name="yard">yd</string>
     <string name="strokes_minute">Züge/min</string>
@@ -2492,7 +2492,7 @@
     <string name="menuitem_apps_shortcuts">Apps-Verknüpfungen</string>
     <string name="pref_summary_notifications_ignore_work_profile">Benachrichtigungen von Apps im Arbeitsprofil nicht an die Uhr senden</string>
     <string name="menuitem_thermometer">Thermometer</string>
-    <string name="common_symbols">Gebräuchliche Symbole</string>
+    <string name="common_symbols">Häufige Symbole</string>
     <string name="devicetype_femometer_vinca2">Femometer Vinca II</string>
     <string name="activity_type_trekking">Wanderung</string>
     <string name="activity_type_wrestling"></string>

From d647def6096be6602f9154590932f739f67f5563 Mon Sep 17 00:00:00 2001
From: Traladarer <Traladarer@users.noreply.hosted.weblate.org>
Date: Fri, 19 Jan 2024 08:07:08 +0000
Subject: [PATCH 560/595] Translated using Weblate (German)

Currently translated at 92.9% (2333 of 2510 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/de/
---
 app/src/main/res/values-de/strings.xml | 102 ++++++++++++-------------
 1 file changed, 51 insertions(+), 51 deletions(-)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index df8d68840..c0e6f4d10 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -469,9 +469,9 @@
     <string name="kind_gps">GPS-Firmware</string>
     <string name="devicetype_unknown">Unbekanntes Gerät</string>
     <string name="devicetype_test">Testgerät</string>
-    <string name="devicetype_pebble"></string>
-    <string name="devicetype_miband"></string>
-    <string name="devicetype_miband2"></string>
+    <string name="devicetype_pebble"/>
+    <string name="devicetype_miband"/>
+    <string name="devicetype_miband2"/>
     <string name="devicetype_amazfit_bip">Amazfit Bip</string>
     <string name="devicetype_amazfit_cor">Amazfit Cor</string>
     <string name="devicetype_vibratissimo">Vibratissimo</string>
@@ -534,7 +534,7 @@
 \nINSTALLATION AUF EIGENE GEFAHR!</string>
     <string name="pref_summary_pebble_gatt_clientonly">Dies ist nur für Pebble 2 und experimentell, versuche dies, wenn du Verbindungsprobleme hast</string>
     <string name="pref_auto_fetch">Aktivitätsdaten automatisch abrufen</string>
-    <string name="devicetype_miband3"></string>
+    <string name="devicetype_miband3"/>
     <string name="devicetype_q8">Q8</string>
     <string name="blacklist_all_for_notifications">Blacklist für alle Benachrichtigungen</string>
     <string name="whitelist_all_for_notifications">Whitelist für alle Benachrichtigungen</string>
@@ -710,7 +710,7 @@
     <string name="vietnamese">Vietnamesisch</string>
     <string name="portuguese">Portugiesisch</string>
     <string name="devicetype_amazfit_cor2">Amazfit Cor 2</string>
-    <string name="devicetype_miband4"></string>
+    <string name="devicetype_miband4"/>
     <string name="fw_upgrade_notice_miband4">Du bist dabei, die Firmware %s auf dein Mi Band 4 zu installieren.
 \n
 \nBitte stelle sicher, dass du die .fw Datei und die .res Datei installierst. Dein Band wird nach der Installation der .fw Datei neu gestartet.
@@ -925,7 +925,7 @@
     <string name="error_background_service_reason_truncated">Hintergrunddienst konnte nicht gestartet werden, wegen…</string>
     <string name="error_background_service">Start des Hintergrunddienstes fehlgeschlagen</string>
     <string name="menuitem_breathing">Atemübungen</string>
-    <string name="devicetype_miband5"></string>
+    <string name="devicetype_miband5"/>
     <string name="fw_upgrade_notice_miband5">Du bist dabei, die Firmware %s auf dein Mi Band 5 zu installieren.
 \n
 \nBitte stelle sicher, dass du zuerst die .fw Datei und dann die .res Datei installierst. Dein Band wird nach der Installation der .fw Datei neu starten.
@@ -984,7 +984,7 @@
     <string name="prefs_events_forwarding_startnonwear">Beim nicht tragend</string>
     <string name="prefs_events_forwarding_wokeup">Beim Aufwachen</string>
     <string name="prefs_events_forwarding_fellsleep">Beim Einschlafen</string>
-    <string name="activity_type_yoga"></string>
+    <string name="activity_type_yoga"/>
     <string name="activity_type_swimming_openwater">Schwimmen (Freiwasser)</string>
     <string name="Strokes">Züge</string>
     <string name="calories_unit">kcal</string>
@@ -1045,9 +1045,9 @@
     <string name="yes">Ja</string>
     <string name="averageSpeed">Durchschnittliche Geschwindigkeit</string>
     <string name="about_links">Links</string>
-    <string name="activity_type_badminton"></string>
+    <string name="activity_type_badminton"/>
     <string name="activity_type_pingpong">Tischtennis</string>
-    <string name="activity_type_basketball"></string>
+    <string name="activity_type_basketball"/>
     <string name="activity_type_cricket">Kricket</string>
     <string name="activity_type_rowing_machine">Rudergerät</string>
     <string name="activity_type_soccer">Fußball</string>
@@ -1213,7 +1213,7 @@
     <string name="menuitem_temperature">Temperatur</string>
     <string name="menuitem_widgets">Widgets</string>
     <string name="menuitem_events">Ereignisse</string>
-    <string name="devicetype_miband6"></string>
+    <string name="devicetype_miband6"/>
     <string name="fw_upgrade_notice_miband6">Du bist dabei, die Firmware %s auf dein Mi Band 6 zu installieren.
 \n
 \nBitte stelle sicher, dass du die .fw Datei und die .res Datei installierst. Dein Band wird nach der Installation der .fw Datei neu gestartet.
@@ -1349,7 +1349,7 @@
     <string name="devicetype_sony_wh_1000xm3">Sony WH-1000XM3</string>
     <string name="devicetype_galaxybuds_live">Galaxy Buds Live</string>
     <string name="pref_title_equalizer_normal">Normal</string>
-    <string name="pref_header_equalizer"></string>
+    <string name="pref_header_equalizer"/>
     <string name="pref_header_system">System</string>
     <string name="devicetype_galaxybuds">Galaxy Buds</string>
     <string name="prefs_equalizer_preset">Equalizer-Voreinstellungen</string>
@@ -1597,8 +1597,8 @@
     <string name="about_description_banglejs_nopebble">Android-Begleit-App für Bangle.js, die auf dem Gadgetbridge-Projekt aufbaut, mit zusätzlichem Internetzugang.
 \n
 \nAufgrund der Richtlinien des Google Play Stores ist es uns nicht erlaubt, einen Spendenlink in der App selbst einzubauen, aber wenn dir diese App gefällt, ziehe bitte eine Spende über die Gadgetbridge-Homepage unten in Erwägung.</string>
-    <string name="application_name_main_nightly"></string>
-    <string name="title_activity_controlcenter_main_nightly"></string>
+    <string name="application_name_main_nightly"/>
+    <string name="title_activity_controlcenter_main_nightly"/>
     <string name="about_activity_title_main_nightly">Über Gadgetbridge Nightly</string>
     <string name="about_description_main_nightly">Cloudloser und freier quelloffener Ersatz für Closed-Source Android-Gadget-Apps von Anbietern. Nächtliche Veröffentlichungen von Gadgetbridge. Es kann nicht installiert werden, wenn du bereits die Gadgetbridge- oder die Pebble-App installiert hast, da es einen Konflikt mit dem Pebble-Anbieter gibt.</string>
     <string name="gadgetbridge_running_main_nightly">Nightly GB läuft</string>
@@ -1818,8 +1818,8 @@
     <string name="controlcenter_get_heartrate_measurement">Herzfrequenzmessung</string>
     <string name="pref_write_logfiles_not_available">Die Initialisierung der Dateiprotokollierung ist fehlgeschlagen, das Schreiben von Protokolldateien ist derzeit nicht möglich. Starte die App neu, um zu versuchen, die Protokolldateien erneut zu initialisieren.</string>
     <string name="devicetype_binary_sensor">Binärer Sensor</string>
-    <string name="application_name_banglejs_nightly"></string>
-    <string name="title_activity_controlcenter_banglejs_nightly"></string>
+    <string name="application_name_banglejs_nightly"/>
+    <string name="title_activity_controlcenter_banglejs_nightly"/>
     <string name="about_activity_title_banglejs_nightly">Über Bangle.js Gadgetbridge (Nightly)</string>
     <string name="about_description_banglejs_nightly">Android-Begleit-App für Bangle.js, die auf dem Gadgetbridge-Projekt aufbaut, mit zusätzlichem Internetzugang.
 \n
@@ -1860,9 +1860,9 @@
     <string name="seconds_14">14 Sekunden</string>
     <string name="seconds_15">15 Sekunden</string>
     <string name="prefs_always_on_display">Display immer eingeschaltet</string>
-    <string name="smart"></string>
+    <string name="smart"/>
     <string name="mi2_dnd_always">Immer</string>
-    <string name="devicetype_miband7"></string>
+    <string name="devicetype_miband7"/>
     <string name="menuitem_countdown">Countdown</string>
     <string name="menuitem_personal_activity_intelligence">Persönliche Aktivitätsintelligenz</string>
     <string name="menuitem_female_health">Weibliche Gesundheit</string>
@@ -1908,18 +1908,18 @@
 \nINSTALLATION AUF EIGENE GEFAHR!</string>
     <string name="pref_title_notification_prefer_long_text">Langen Benachrichtigungstext bevorzugen</string>
     <string name="pref_summary_notification_prefer_long_text">Falls verfügbar, langen Benachrichtigungstext an das Gerät senden</string>
-    <string name="devicetype_amazfit_gts3"></string>
+    <string name="devicetype_amazfit_gts3"/>
     <string name="menuitem_unknown_app">Unbekannt (%s)</string>
     <string name="pref_summary_overwrite_settings_on_connection">Beim Verbinden mit dem Band überschreibst du alle Einstellungen des Bandes.</string>
     <string name="pref_title_overwrite_settings_on_connection">Überschreiben von Einstellungen bei der Verbindung</string>
-    <string name="kind_app"></string>
+    <string name="kind_app"/>
     <string name="dismiss">Ablehnen</string>
     <string name="fw_upgrade_notice_amazfit_gtr3">Du bist dabei, die Firmware %s auf deine Amazfit GTR 3 zu installieren.
 \n
 \nDeine Uhr wird nach der Installation der .zip Datei neu starten.
 \n
 \nINSTALLATION AUF EIGENE GEFAHR!</string>
-    <string name="devicetype_amazfit_gtr3"></string>
+    <string name="devicetype_amazfit_gtr3"/>
     <string name="pref_summary_third_party_app_device_settings">Erlaube anderen installierten Apps von Drittanbietern, Geräteeinstellungen über Intents festzulegen.</string>
     <string name="pref_title_third_party_app_device_settings">Ändern von Einstellungen durch App von Drittanbietern zulassen</string>
     <string name="activity_type_dance">Tanzen</string>
@@ -1930,10 +1930,10 @@
     <string name="activity_type_stretching">Dehnen</string>
     <string name="activity_type_stepper">Stepper</string>
     <string name="activity_type_pilates">Pilates</string>
-    <string name="activity_type_volleyball"></string>
+    <string name="activity_type_volleyball"/>
     <string name="activity_type_table_tennis">Tischtennis</string>
-    <string name="activity_type_bowling"></string>
-    <string name="activity_type_zumba"></string>
+    <string name="activity_type_bowling"/>
+    <string name="activity_type_zumba"/>
     <string name="activity_type_indoor_ice_skating">Indoor-Eislaufen</string>
     <string name="devicetype_amazfit_gtr_lite">Amazfit GTR Lite</string>
     <string name="activity_type_street_dance">Street Dance</string>
@@ -1966,7 +1966,7 @@
     <string name="devicetype_sony_wh_1000xm2">Sony WH-1000XM2</string>
     <string name="devicetype_sony_wf_1000xm4">Sony WF-1000XM4</string>
     <string name="balanced">Ausgewogen</string>
-    <string name="dual_band"></string>
+    <string name="dual_band"/>
     <string name="low_power_gps">Stromsparendes GPS</string>
     <string name="gps">GPS</string>
     <string name="gps_bds">GPS + BDS</string>
@@ -2010,7 +2010,7 @@
     <string name="menuitem_offline_voice">Offline Stimme</string>
     <string name="menuitem_screen_always_lit">Bildschirm leuchtet immer</string>
     <string name="pref_header_sound_vibration">Ton &amp; Vibration</string>
-    <string name="single_band"></string>
+    <string name="single_band"/>
     <string name="gps_galileo">GPS + GALILEO</string>
     <string name="pref_text_to_speech">Text in Sprache</string>
     <string name="offline_voice_respond_turn_wrist">Reagiert beim Drehen des Handgelenks</string>
@@ -2069,7 +2069,7 @@
     <string name="devicetype_amazfit_band7">Amazfit Band 7</string>
     <string name="function_enabled">Aktiviert</string>
     <string name="world_clock_code">Code</string>
-    <string name="devicetype_amazfit_gts4"></string>
+    <string name="devicetype_amazfit_gts4"/>
     <string name="pref_title_touch_spotify_official_app">Spotify (nur offizielle App)</string>
     <string name="pref_title_touch_spotify_galaxy_app">Spotify (nur Galaxy Wearable App)</string>
     <string name="fw_upgrade_notice_amazfit_gts4">Du bist dabei, die Firmware %s auf deine Amazfit GTS 4 zu installieren.
@@ -2084,7 +2084,7 @@
 \nDeine Uhr wird nach der Installation der .zip Datei neu starten.
 \n
 \nINSTALLATION AUF EIGENE GEFAHR!</string>
-    <string name="devicetype_amazfit_gts4_mini"></string>
+    <string name="devicetype_amazfit_gts4_mini"/>
     <string name="devicetype_sony_linkbuds_s">Sony LinkBuds S</string>
     <string name="intent_api_allow_trigger_export_title">Datenbankexport zulassen</string>
     <string name="menuitem_wechat_pay">WeChat Pay</string>
@@ -2183,7 +2183,7 @@
     <string name="quick_attention">Schnelle Aufmerksamkeit</string>
     <string name="double_tap">Doppeltes Antippen</string>
     <string name="continue_pressing">Gedrückt halten</string>
-    <string name="devicetype_amazfit_gtr3_pro"></string>
+    <string name="devicetype_amazfit_gtr3_pro"/>
     <string name="menuitem_vo2_max">VO₂ Max</string>
     <string name="menuitem_mi_ai">MI AI</string>
     <string name="zepp_os_watchface_simplicity_data">Einfache Daten</string>
@@ -2324,14 +2324,14 @@
     <string name="activity_type_surfing">Surfen</string>
     <string name="activity_type_windsurfing">Windsurfen</string>
     <string name="activity_type_football">Fußball</string>
-    <string name="activity_type_rugby"></string>
+    <string name="activity_type_rugby"/>
     <string name="activity_type_baseball">Baseball</string>
-    <string name="activity_type_handball"></string>
-    <string name="activity_type_tennis"></string>
-    <string name="activity_type_squash"></string>
+    <string name="activity_type_handball"/>
+    <string name="activity_type_tennis"/>
+    <string name="activity_type_squash"/>
     <string name="activity_type_weightlifting">Gewichtheben</string>
     <string name="activity_type_skiing">Skifahren</string>
-    <string name="activity_type_hockey"></string>
+    <string name="activity_type_hockey"/>
     <string name="activity_type_icehockey">Eishockey</string>
     <string name="activity_type_iceskating">Schlittschuhlaufen</string>
     <string name="activity_type_golf">Golfen</string>
@@ -2359,7 +2359,7 @@
     <string name="pref_theme_dynamic_colors_not_available_warning">Dynamische Farben sind auf deinem Gerät nicht verfügbar, nur Android 12+ unterstützt diese Funktion. Gadgetbridge verwendet die Standardfarben von Material 3.</string>
     <string name="pref_theme_dynamic_colors_explanation">Hinweis: Für das Design mit dynamischen Farben musst du Hintergrundbildfarben oder Farbpalette in deinen Android 12+ Darstellungseinstellungen aktivieren. Wenn du das nicht tust, wird Gadgetbridge die Standardfarben von Material 3 verwenden.</string>
     <string name="menuitem_zepp_coach">Zepp Coach</string>
-    <string name="devicetype_amazfit_bip3_pro"></string>
+    <string name="devicetype_amazfit_bip3_pro"/>
     <string name="fw_upgrade_notice_amazfit_cheetah_pro">Du bist dabei, die Firmware %s auf deine Amazfit Cheetah Pro zu installieren.
 \n
 \nDeine Uhr wird nach der Installation der .zip-Datei neu starten.
@@ -2380,8 +2380,8 @@
 \n
 \nINSTALLATION AUF EIGENE GEFAHR!</string>
     <string name="devicetype_amazfit_cheetah_round">Amazfit Cheetah (Rund)</string>
-    <string name="devicetype_amazfit_cheetah_pro"></string>
-    <string name="devicetype_amazfit_bip5"></string>
+    <string name="devicetype_amazfit_cheetah_pro"/>
+    <string name="devicetype_amazfit_bip5"/>
     <string name="devicetype_amazfit_trex_ultra">Amazfit T-Rex Ultra</string>
     <string name="devicetype_amazfit_falcon">Amazfit Falcon</string>
     <string name="devicetype_amazfit_gtr_mini">Amazfit GTR Mini</string>
@@ -2407,7 +2407,7 @@
     <string name="prefs_home_icon_left_item">Links</string>
     <string name="prefs_wena3_led_none">Keine LED</string>
     <string name="updatefirmwareoperation_failed_low_mtu">Die aktuelle MTU von %1$d ist zu niedrig,bitte aktiviere eine hohe MTU in den Geräteeinstellungen und trenne/schließe das Gerät neu an.</string>
-    <string name="prefs_wena3_home_icon_name_riiiver"></string>
+    <string name="prefs_wena3_home_icon_name_riiiver"/>
     <string name="pref_message_privacy_mode_bodyonly">Nur Nachrichtentext ausblenden</string>
     <string name="prefs_wena3_home_icon_name_suica">Suica Kontostand</string>
     <string name="prefs_wena3_vibration_strength_item_medium">Mittel</string>
@@ -2480,7 +2480,7 @@
     <string name="menuitem_zepp_pay">Zepp Pay</string>
     <string name="femometer_measurement_mode_quick">Schneller Modus (30s)</string>
     <string name="pref_title_notifications_ignore_work_profile">Ignoriere Arbeitsprofilbenachrichtigungen</string>
-    <string name="devicetype_amazfit_balance"></string>
+    <string name="devicetype_amazfit_balance"/>
     <string name="yard">yd</string>
     <string name="strokes_minute">Züge/min</string>
     <string name="femometer_measurement_mode_title">Messmodus</string>
@@ -2495,19 +2495,19 @@
     <string name="common_symbols">Häufige Symbole</string>
     <string name="devicetype_femometer_vinca2">Femometer Vinca II</string>
     <string name="activity_type_trekking">Wanderung</string>
-    <string name="activity_type_wrestling"></string>
-    <string name="devicetype_redmi_smart_band_pro"></string>
+    <string name="activity_type_wrestling"/>
+    <string name="devicetype_redmi_smart_band_pro"/>
     <string name="menuitem_readiness">Bereitschaft</string>
-    <string name="devicetype_xiaomi_watch_lite"></string>
-    <string name="devicetype_amazfit_active_edge"></string>
+    <string name="devicetype_xiaomi_watch_lite"/>
+    <string name="devicetype_amazfit_active_edge"/>
     <string name="pref_summary_casio_alert_call">Klingeln (Vibration/Ton) bei eingehenden Anrufen</string>
     <string name="pref_title_casio_alert_email">Alarm für Mail-Benachrichtigungen</string>
-    <string name="devicetype_miband7pro"></string>
+    <string name="devicetype_miband7pro"/>
     <string name="clap_hands_to_wakeup_device">Klatsche in die Hände, um den Bildschirm zu aktivieren</string>"
-    <string name="devicetype_colacao21"></string>
-    <string name="devicetype_colacao23"></string>
-    <string name="devicetype_redmiwatch3active"></string>
-    <string name="devicetype_redmi_smart_band_2"></string>
+    <string name="devicetype_colacao21"/>
+    <string name="devicetype_colacao23"/>
+    <string name="devicetype_redmiwatch3active"/>
+    <string name="devicetype_redmi_smart_band_2"/>
     <string name="standing_time">Steh-Zeit</string>
     <string name="active_time">Aktiv-Zeit</string>
     <string name="pref_title_send_app_notifications">Sende Benachrichtigungen</string>
@@ -2521,12 +2521,12 @@
     <string name="pref_title_casio_alert_sms">SMS-Klingelton</string>
     <string name="pref_title_casio_alert_other">Alarm für andere Benachrichtigungen</string>
     <string name="pref_summary_casio_alert_other">Alarm (Vibration/Ton) für Benachrichtigungen in anderen Kategorien</string>
-    <string name="devicetype_miband8"></string>
+    <string name="devicetype_miband8"/>
     <string name="devicetype_mijia_lywsd03">Mijia Temperatur- und Feuchtigkeitssensor 2</string>
     <string name="menuitem_body_composition">Körperliche Zusammensetzung</string>
-    <string name="devicetype_amazfit_active"></string>
+    <string name="devicetype_amazfit_active"/>
     <string name="pref_title_goal_secondary">Zusätzliches Ziel</string>
-    <string name="devicetype_redmi_watch_2_lite"></string>
+    <string name="devicetype_redmi_watch_2_lite"/>
     <string name="wake_up_time">Aufwachen</string>
     <string name="pixoo_power_saving_summary">Der Bildschirm schaltet sich aus, wenn das Mikrofon eine Zeit lang Stille erkannt hat</string>
     <string name="activity_info">Informationen zur Aktivität</string>
@@ -2538,7 +2538,7 @@
     <string name="pref_heartrate_automatic_enable">Automatische Pulsmessung aktivieren</string>
     <string name="zepp_os_watchface_vast_sky">Weitläufiger Himmel</string>
     <string name="zepp_os_watchface_pure_white">Reines Weiß</string>
-    <string name="prefs_wena3_hint_rich_design">Fügt abgerundete Ecken um Home Screen Icons hinzu</string>
+    <string name="prefs_wena3_hint_rich_design">Fügt um Startbildschirmsymbole abgerundete Rechtecke hinzu</string>
     <string name="error_menu_companion_not_installed">\'HR Menu Companion\" ist wahrscheinlich nicht installiert</string>
     <string name="pref_vitality_score_7_day_title">7-Tage-Fortschritt</string>
     <string name="pref_vitality_score_daily_title">Täglicher Fortschritt</string>

From 9ad503cfe0090a4f7695a200d7b7f932989dd85c Mon Sep 17 00:00:00 2001
From: skdubg <skdubg@autistici.org>
Date: Fri, 19 Jan 2024 15:33:34 +0000
Subject: [PATCH 561/595] Translated using Weblate (German)

Currently translated at 94.9% (2383 of 2510 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/de/
---
 app/src/main/res/values-de/strings.xml | 87 ++++++++++++++++++++------
 1 file changed, 69 insertions(+), 18 deletions(-)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index c0e6f4d10..cf6ad6dec 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -984,7 +984,7 @@
     <string name="prefs_events_forwarding_startnonwear">Beim nicht tragend</string>
     <string name="prefs_events_forwarding_wokeup">Beim Aufwachen</string>
     <string name="prefs_events_forwarding_fellsleep">Beim Einschlafen</string>
-    <string name="activity_type_yoga"/>
+    <string name="activity_type_yoga"></string>
     <string name="activity_type_swimming_openwater">Schwimmen (Freiwasser)</string>
     <string name="Strokes">Züge</string>
     <string name="calories_unit">kcal</string>
@@ -1045,9 +1045,9 @@
     <string name="yes">Ja</string>
     <string name="averageSpeed">Durchschnittliche Geschwindigkeit</string>
     <string name="about_links">Links</string>
-    <string name="activity_type_badminton"/>
+    <string name="activity_type_badminton"></string>
     <string name="activity_type_pingpong">Tischtennis</string>
-    <string name="activity_type_basketball"/>
+    <string name="activity_type_basketball"></string>
     <string name="activity_type_cricket">Kricket</string>
     <string name="activity_type_rowing_machine">Rudergerät</string>
     <string name="activity_type_soccer">Fußball</string>
@@ -1597,8 +1597,8 @@
     <string name="about_description_banglejs_nopebble">Android-Begleit-App für Bangle.js, die auf dem Gadgetbridge-Projekt aufbaut, mit zusätzlichem Internetzugang.
 \n
 \nAufgrund der Richtlinien des Google Play Stores ist es uns nicht erlaubt, einen Spendenlink in der App selbst einzubauen, aber wenn dir diese App gefällt, ziehe bitte eine Spende über die Gadgetbridge-Homepage unten in Erwägung.</string>
-    <string name="application_name_main_nightly"/>
-    <string name="title_activity_controlcenter_main_nightly"/>
+    <string name="application_name_main_nightly"></string>
+    <string name="title_activity_controlcenter_main_nightly">Gadgetbridge (Nightly)</string>
     <string name="about_activity_title_main_nightly">Über Gadgetbridge Nightly</string>
     <string name="about_description_main_nightly">Cloudloser und freier quelloffener Ersatz für Closed-Source Android-Gadget-Apps von Anbietern. Nächtliche Veröffentlichungen von Gadgetbridge. Es kann nicht installiert werden, wenn du bereits die Gadgetbridge- oder die Pebble-App installiert hast, da es einen Konflikt mit dem Pebble-Anbieter gibt.</string>
     <string name="gadgetbridge_running_main_nightly">Nightly GB läuft</string>
@@ -1818,8 +1818,8 @@
     <string name="controlcenter_get_heartrate_measurement">Herzfrequenzmessung</string>
     <string name="pref_write_logfiles_not_available">Die Initialisierung der Dateiprotokollierung ist fehlgeschlagen, das Schreiben von Protokolldateien ist derzeit nicht möglich. Starte die App neu, um zu versuchen, die Protokolldateien erneut zu initialisieren.</string>
     <string name="devicetype_binary_sensor">Binärer Sensor</string>
-    <string name="application_name_banglejs_nightly"/>
-    <string name="title_activity_controlcenter_banglejs_nightly"/>
+    <string name="application_name_banglejs_nightly"></string>
+    <string name="title_activity_controlcenter_banglejs_nightly"></string>
     <string name="about_activity_title_banglejs_nightly">Über Bangle.js Gadgetbridge (Nightly)</string>
     <string name="about_description_banglejs_nightly">Android-Begleit-App für Bangle.js, die auf dem Gadgetbridge-Projekt aufbaut, mit zusätzlichem Internetzugang.
 \n
@@ -1930,9 +1930,9 @@
     <string name="activity_type_stretching">Dehnen</string>
     <string name="activity_type_stepper">Stepper</string>
     <string name="activity_type_pilates">Pilates</string>
-    <string name="activity_type_volleyball"/>
+    <string name="activity_type_volleyball"></string>
     <string name="activity_type_table_tennis">Tischtennis</string>
-    <string name="activity_type_bowling"/>
+    <string name="activity_type_bowling"></string>
     <string name="activity_type_zumba"/>
     <string name="activity_type_indoor_ice_skating">Indoor-Eislaufen</string>
     <string name="devicetype_amazfit_gtr_lite">Amazfit GTR Lite</string>
@@ -2324,14 +2324,14 @@
     <string name="activity_type_surfing">Surfen</string>
     <string name="activity_type_windsurfing">Windsurfen</string>
     <string name="activity_type_football">Fußball</string>
-    <string name="activity_type_rugby"/>
+    <string name="activity_type_rugby"></string>
     <string name="activity_type_baseball">Baseball</string>
-    <string name="activity_type_handball"/>
-    <string name="activity_type_tennis"/>
-    <string name="activity_type_squash"/>
+    <string name="activity_type_handball"></string>
+    <string name="activity_type_tennis"></string>
+    <string name="activity_type_squash"></string>
     <string name="activity_type_weightlifting">Gewichtheben</string>
     <string name="activity_type_skiing">Skifahren</string>
-    <string name="activity_type_hockey"/>
+    <string name="activity_type_hockey"></string>
     <string name="activity_type_icehockey">Eishockey</string>
     <string name="activity_type_iceskating">Schlittschuhlaufen</string>
     <string name="activity_type_golf">Golfen</string>
@@ -2495,7 +2495,7 @@
     <string name="common_symbols">Häufige Symbole</string>
     <string name="devicetype_femometer_vinca2">Femometer Vinca II</string>
     <string name="activity_type_trekking">Wanderung</string>
-    <string name="activity_type_wrestling"/>
+    <string name="activity_type_wrestling"></string>
     <string name="devicetype_redmi_smart_band_pro"/>
     <string name="menuitem_readiness">Bereitschaft</string>
     <string name="devicetype_xiaomi_watch_lite"/>
@@ -2518,7 +2518,7 @@
     <string name="pref_summary_casio_alert_calendar">Alarm (Vibration/Ton) für Kalender-Erinnerungen</string>
     <string name="pref_title_casio_alert_call">Klingelton bei eingehenden Anrufen</string>
     <string name="pref_summary_casio_alert_email">Alarm (Vibration/Ton) für Mail-Benachrichtigungen</string>
-    <string name="pref_title_casio_alert_sms">SMS-Klingelton</string>
+    <string name="pref_title_casio_alert_sms">Alarm für SMS-Benachrichtigungen</string>
     <string name="pref_title_casio_alert_other">Alarm für andere Benachrichtigungen</string>
     <string name="pref_summary_casio_alert_other">Alarm (Vibration/Ton) für Benachrichtigungen in anderen Kategorien</string>
     <string name="devicetype_miband8"/>
@@ -2538,7 +2538,7 @@
     <string name="pref_heartrate_automatic_enable">Automatische Pulsmessung aktivieren</string>
     <string name="zepp_os_watchface_vast_sky">Weitläufiger Himmel</string>
     <string name="zepp_os_watchface_pure_white">Reines Weiß</string>
-    <string name="prefs_wena3_hint_rich_design">Fügt um Startbildschirmsymbole abgerundete Rechtecke hinzu</string>
+    <string name="prefs_wena3_hint_rich_design">Fügt abgerundete Rechtecke um Startbildschirmsymbole hinzu</string>
     <string name="error_menu_companion_not_installed">\'HR Menu Companion\" ist wahrscheinlich nicht installiert</string>
     <string name="pref_vitality_score_7_day_title">7-Tage-Fortschritt</string>
     <string name="pref_vitality_score_daily_title">Täglicher Fortschritt</string>
@@ -2566,7 +2566,7 @@
     <string name="silent_mode_vibrate_silent">Vibration / Lautlos</string>
     <string name="clap_hands_to_wakeup_device_summary">Erneutes Klatschen schaltet den Bildschirm aus</string>"
     <string name="busy_task_fetch_statistics">Statistiken abrufen</string>
-    <string name="busy_task_fetch_temperature">Abruf der Temperaturdaten</string>
+    <string name="busy_task_fetch_temperature">Temperaturdaten abrufen</string>
     <string name="prefs_wearmode">Tragemodus</string>
     <string name="zepp_os_watchface_starry_sky">Sternenhimmel</string>
     <string name="prefs_wena3_hint_background_sync">Erlaube Wena, Gadgetbridge in regelmäßigen Abständen aufzufordern, Aktivitätsdaten vom Gerät herunterzuladen</string>
@@ -2589,4 +2589,55 @@
     <string name="pref_title_fossil_hr_nav_vibrate">Vibrieren bei neuer Anweisung</string>
     <string name="pref_title_fossil_hr_nav_foreground">In den Vordergrund rücken</string>
     <string name="prefs_device_name">Gerätebezeichnung</string>
+    <string name="not_set">Nicht festgelegt</string>
+    <string name="widget_screen_delete_confirm_description">Bist du sicher, dass du \'%1$s\' löschen möchtest?</string>
+    <string name="widget_move_down">Nach unten verschieben</string>
+    <string name="protocol_version">Protokoll-Version</string>
+    <string name="flatDistance">Flache Strecke</string>
+    <string name="pref_enable_call_accept">Annehmen von Anrufen aktivieren</string>
+    <string name="fossil_hr_nav_app_not_installed_notify_text">Navigation gestartet, aber die Navigation-App ist nicht auf der Uhr installiert. Bitte installiere sie über den App-Manager.</string>
+    <string name="pref_summary_fossil_hr_nav_foreground">Ob die Navigations-App automatisch in den Vordergrund kommen soll, wenn sie eine Navigationsanweisung erhält</string>
+    <string name="pref_force_connection_type_description">Du kannst versuchen, den Verbindungstyp zu erzwingen, falls dein Gerät nicht auf Gadgetbridge reagiert</string>
+    <string name="pref_force_connection_type_auto">Automatisch</string>
+    <string name="pref_force_connection_type_ble">Bluetooth-LE</string>
+    <string name="pref_device_action_dnd_alarms">Bitte-Nicht-Stören - nur Alarme</string>
+    <string name="pref_title_navigation_apps">Navigations-Apps</string>
+    <string name="pref_summary_osmand_packagename">Dient zur Auswahl der Version von OsmAnd, mit der eine Verbindung hergestellt werden soll</string>
+    <string name="pref_title_navigation_prefs">Einstellungen zur Navigation</string>
+    <string name="pref_title_osmand_packagename">OsmAnd Paketname</string>
+    <string name="widget_missing_parts">Bitte alle Widgets auswählen</string>
+    <string name="widget_layout_top_1_bot_2">1 oben, 2 unten</string>
+    <string name="widget_unknown_workout">Unbekanntes Workout - %s</string>
+    <string name="prefs_wena3_auto_power_off_turn_off_time_item">Ausschaltzeit</string>
+    <string name="pref_device_action_dnd_off">Bitte-Nicht-Stören - Aus</string>
+    <string name="zepp_os_watchface_free_combination">Freie Kombination</string>
+    <string name="pref_title_debug">Debug-Anfrage</string>
+    <string name="prefs_wena3_button_action_name_activity_screen">Aktivitätsbildschirm</string>
+    <string name="pref_title_general_reconnectonlytoconnected">Verbindung nur mit verbundenen Geräten wiederherstellen</string>
+    <string name="pref_summary_general_reconnectonlytoconnected">Verbindung nur mit verbundenen Geräten wiederherstellen, statt mit allen Geräten neu zu verbinden</string>
+    <string name="prefs_active_noise_cancelling_transparency">Transparenz</string>
+    <string name="prefs_workmode">Arbeitsmodus</string>
+    <string name="pref_summary_debug">Eine Debug-Anfrage an das Huawei-Gerät senden</string>
+    <string name="prefs_wena3_hint_weather_statusbar">Symbol für aktuelle Wetterbedingungen in der oberen linken Ecke des Startbildschirms anzeigen</string>
+    <string name="pref_title_prefix_notification_with_app">App-Name in der Benachrichtigung</string>
+    <string name="pref_device_action_dnd_on">Bitte-Nicht-Stören - Ein</string>
+    <string name="pref_force_dnd_support_summary">Unterstützung von \"Bitte-Nicht-Stören\" erzwingen
+\nVERWENDUNG AUF EIGENE GEFAHR</string>
+    <string name="prefs_wena3_notification_per_app_settings_title">App-spezifische Einstellungen für Benachrichtigungen</string>
+    <string name="serial_number">Seriennummer</string>
+    <string name="menuitem_stats">Statistiken</string>
+    <string name="menuitem_alerts">Meldungen</string>
+    <string name="widget_layout_top_2_bot_1">2 oben, 1 unten</string>
+    <string name="widget_layout_top_2_bot_2">2 oben, 2 unten</string>
+    <string name="widget_layout">Widget-Anordnung</string>
+    <string name="widget_layout_single">1 Widget</string>
+    <string name="widget_move_up">Nach oben verschieben</string>
+    <string name="widget_layout_two">2 Widgets</string>
+    <string name="call_rejection_method_ignore">Ignorieren (Stille)</string>
+    <string name="huawei_trusleep_summary_light">Verbesserte Schlafüberwachung</string>
+    <string name="pref_force_smart_alarm_summary">Unterstützung für intelligente Alarme erzwingen
+\nVERWENDUNG AUF EIGENE GEFAHR</string>
+    <string name="prefs_wena3_button_action_name_start_timer">Starte Aktivitätstimer</string>
+    <string name="pref_title_fossil_hr_navigation_instructions">Anweisungen für die Navigation</string>
+    <string name="pref_summary_fossil_hr_nav_vibrate">Ob die Uhr bei jeder neuen oder geänderten Navigationsanweisung vibrieren soll (nur wenn die App im Vordergrund ist)</string>
 </resources>
\ No newline at end of file

From 40aba39ea5effb0d4aaeb6b1bc537f2fb4a985aa Mon Sep 17 00:00:00 2001
From: arjan-s <a_gitlab@anymore.nl>
Date: Fri, 19 Jan 2024 10:04:07 +0000
Subject: [PATCH 562/595] Translated using Weblate (Dutch)

Currently translated at 100.0% (2510 of 2510 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/nl/
---
 app/src/main/res/values-nl/strings.xml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index cb93070c0..e851d2326 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -2694,4 +2694,25 @@
     <string name="pref_title_debug">Foutopsporingsverzoek</string>
     <string name="huawei_reparse_workout_data_description">Dit zal alleen iets doen na bepaalde updates</string>
     <string name="menuitem_buzzer_intensity">Zoemerintensiteit</string>
+    <string name="flatDistance">Afstand zonder hoogteverschil</string>
+    <string name="sony_protocol_v2">Versie 2</string>
+    <string name="sony_protocol_v3">Versie 3</string>
+    <string name="protocol_version">Protocolversie</string>
+    <string name="prefs_password_4_digits_0_to_9_summary">Het wachtwoord moet uit 4 cijfers bestaan</string>
+    <string name="devicetype_miband8pro">Xiaomi Smart Band 8 Pro</string>
+    <string name="devicetype_mijia_mho_c303">Mijia MHO-C303</string>
+    <string name="sony_protocol_v1">Versie 1</string>
+    <string name="devicetype_xiaomi_watch_s1">Xiaomi Watch S1</string>
+    <string name="devicetype_xiaomi_watch_s3">Xiaomi Watch S3</string>
+    <string name="devicetype_xiaomi_watch_s1_pro">Xiaomi Watch S1 Pro</string>
+    <string name="uploading_watchface">Wijzerplaat uploaden…</string>
+    <string name="uploadwatchfaceoperation_in_progress">Wijzerplaat uploaden</string>
+    <string name="uploadwatchfaceoperation_complete">Wijzerplaat-installatie gelukt</string>
+    <string name="uploadwatchfaceoperation_failed">Wijzerplaat-installatie mislukt</string>
+    <string name="pref_force_connection_type_title">Forceer verbindingstype</string>
+    <string name="pref_force_connection_type_description">U kunt proberen het type verbinding te forceren indien het Gadgetbridge niet lukt om verbinding te maken</string>
+    <string name="pref_force_connection_type_auto">Automatisch</string>
+    <string name="pref_force_connection_type_ble">Bluetooth LE</string>
+    <string name="pref_force_connection_type_bt_classic">Bluetooth (klassiek)</string>
+    <string name="activity_info">Activiteitsinformatie</string>
 </resources>
\ No newline at end of file

From 411197c8f3b66941d8137917bde345f32a2ef455 Mon Sep 17 00:00:00 2001
From: skdubg <skdubg@autistici.org>
Date: Sat, 20 Jan 2024 10:10:05 +0000
Subject: [PATCH 563/595] Translated using Weblate (German)

Currently translated at 94.8% (2380 of 2510 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/de/
---
 app/src/main/res/values-de/strings.xml | 45 +++++++++++++-------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index cf6ad6dec..56c001ba1 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <string name="application_name_generic">Gadgetbridge</string>
-    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
+    <string name="application_name_generic"></string>
+    <string name="title_activity_controlcenter_generic"></string>
     <string name="action_settings">Einstellungen</string>
     <string name="action_debug">Debug</string>
     <string name="action_quit">Beenden</string>
@@ -984,7 +984,7 @@
     <string name="prefs_events_forwarding_startnonwear">Beim nicht tragend</string>
     <string name="prefs_events_forwarding_wokeup">Beim Aufwachen</string>
     <string name="prefs_events_forwarding_fellsleep">Beim Einschlafen</string>
-    <string name="activity_type_yoga"></string>
+    <string name="activity_type_yoga"/>
     <string name="activity_type_swimming_openwater">Schwimmen (Freiwasser)</string>
     <string name="Strokes">Züge</string>
     <string name="calories_unit">kcal</string>
@@ -1045,9 +1045,9 @@
     <string name="yes">Ja</string>
     <string name="averageSpeed">Durchschnittliche Geschwindigkeit</string>
     <string name="about_links">Links</string>
-    <string name="activity_type_badminton"></string>
+    <string name="activity_type_badminton"/>
     <string name="activity_type_pingpong">Tischtennis</string>
-    <string name="activity_type_basketball"></string>
+    <string name="activity_type_basketball"/>
     <string name="activity_type_cricket">Kricket</string>
     <string name="activity_type_rowing_machine">Rudergerät</string>
     <string name="activity_type_soccer">Fußball</string>
@@ -1487,7 +1487,7 @@
     <string name="devicetype_sony_wf_sp800n">Sony WF-SP800N</string>
     <string name="controlcenter_power_off_confirm_title">Ausschalten</string>
     <string name="controlcenter_power_off">Ausschalten</string>
-    <string name="controlcenter_power_off_confirm_description">Sind Sie sicher, dass Sie das Gerät abschalten wollen\?</string>
+    <string name="controlcenter_power_off_confirm_description">Bist du sicher, dass du das Gerät abschalten willst?</string>
     <string name="discover_unsupported_devices">Nicht unterstützte Geräte finden</string>
     <string name="minStride">Min Schrittlänge</string>
     <string name="discover_unsupported_devices_description">Wenn du diese Option aktivierst, werden beim Scannen alle erkannten Bluetooth-Geräte angezeigt. Durch kurzes Antippen werden Gerätename und MAC-Adresse in die Zwischenablage kopiert. Langes Drücken startet den Dialog \"Testgerät hinzufügen\". Kann zu Problemen mit einfrierender App führen.</string>
@@ -1588,8 +1588,8 @@
     <string name="autoExport_lastTime_label">Letzter autom. Export: %1$s</string>
     <string name="activity_db_management_autoexport_location">Standort ermittelt nicht möglich. Wahrscheinlich ein Problem des neueren Android-Berechtigungssystems. Höchstwahrscheinlich funktioniert der autom. Export jetzt nicht.</string>
     <string name="menuitem_email">E-Mail</string>
-    <string name="application_name_banglejs_main">Bangle.js Gadgetbridge</string>
-    <string name="title_activity_controlcenter_banglejs_main">Bangle.js Gadgetbridge</string>
+    <string name="application_name_banglejs_main"></string>
+    <string name="title_activity_controlcenter_banglejs_main"></string>
     <string name="about_description_banglejs_main">Android-Begleit-App für Bangle.js, die auf dem Gadgetbridge-Projekt aufbaut, mit zusätzlichem Internetzugang.
 \n
 \nAufgrund der Richtlinien des Google Play Stores ist es uns nicht erlaubt, einen Spendenlink in der App selbst einzubauen, aber wenn dir diese App gefällt, ziehe bitte eine Spende über die Gadgetbridge-Homepage unten in Erwägung.</string>
@@ -1597,14 +1597,14 @@
     <string name="about_description_banglejs_nopebble">Android-Begleit-App für Bangle.js, die auf dem Gadgetbridge-Projekt aufbaut, mit zusätzlichem Internetzugang.
 \n
 \nAufgrund der Richtlinien des Google Play Stores ist es uns nicht erlaubt, einen Spendenlink in der App selbst einzubauen, aber wenn dir diese App gefällt, ziehe bitte eine Spende über die Gadgetbridge-Homepage unten in Erwägung.</string>
-    <string name="application_name_main_nightly"></string>
+    <string name="application_name_main_nightly"/>
     <string name="title_activity_controlcenter_main_nightly">Gadgetbridge (Nightly)</string>
-    <string name="about_activity_title_main_nightly">Über Gadgetbridge Nightly</string>
+    <string name="about_activity_title_main_nightly">Über Gadgetbridge (Nightly)</string>
     <string name="about_description_main_nightly">Cloudloser und freier quelloffener Ersatz für Closed-Source Android-Gadget-Apps von Anbietern. Nächtliche Veröffentlichungen von Gadgetbridge. Es kann nicht installiert werden, wenn du bereits die Gadgetbridge- oder die Pebble-App installiert hast, da es einen Konflikt mit dem Pebble-Anbieter gibt.</string>
     <string name="gadgetbridge_running_main_nightly">Nightly GB läuft</string>
     <string name="application_name_main_nopebble">Gadgetbridge (Nightly, kein Pebble-Anbieter)</string>
-    <string name="title_activity_controlcenter_main_nopebble">Gadgetbridge Nightly kein Pebble</string>
-    <string name="about_activity_title_main_nopebble">Über Gadgetbridge Nightly kein Pebble</string>
+    <string name="title_activity_controlcenter_main_nopebble">Gadgetbridge (Nightly, kein Pebble)</string>
+    <string name="about_activity_title_main_nopebble">Über Gadgetbridge (Nightly, kein Pebble)</string>
     <string name="gadgetbridge_running_main_nopebble">Nightly kein Pebble GB läuft</string>
     <string name="prefs_activate_display_on_lift_sensitivity">Empfindlichkeit</string>
     <string name="normal">Normal</string>
@@ -1818,8 +1818,8 @@
     <string name="controlcenter_get_heartrate_measurement">Herzfrequenzmessung</string>
     <string name="pref_write_logfiles_not_available">Die Initialisierung der Dateiprotokollierung ist fehlgeschlagen, das Schreiben von Protokolldateien ist derzeit nicht möglich. Starte die App neu, um zu versuchen, die Protokolldateien erneut zu initialisieren.</string>
     <string name="devicetype_binary_sensor">Binärer Sensor</string>
-    <string name="application_name_banglejs_nightly"></string>
-    <string name="title_activity_controlcenter_banglejs_nightly"></string>
+    <string name="application_name_banglejs_nightly"/>
+    <string name="title_activity_controlcenter_banglejs_nightly"/>
     <string name="about_activity_title_banglejs_nightly">Über Bangle.js Gadgetbridge (Nightly)</string>
     <string name="about_description_banglejs_nightly">Android-Begleit-App für Bangle.js, die auf dem Gadgetbridge-Projekt aufbaut, mit zusätzlichem Internetzugang.
 \n
@@ -1930,9 +1930,9 @@
     <string name="activity_type_stretching">Dehnen</string>
     <string name="activity_type_stepper">Stepper</string>
     <string name="activity_type_pilates">Pilates</string>
-    <string name="activity_type_volleyball"></string>
+    <string name="activity_type_volleyball"/>
     <string name="activity_type_table_tennis">Tischtennis</string>
-    <string name="activity_type_bowling"></string>
+    <string name="activity_type_bowling"/>
     <string name="activity_type_zumba"/>
     <string name="activity_type_indoor_ice_skating">Indoor-Eislaufen</string>
     <string name="devicetype_amazfit_gtr_lite">Amazfit GTR Lite</string>
@@ -2324,14 +2324,14 @@
     <string name="activity_type_surfing">Surfen</string>
     <string name="activity_type_windsurfing">Windsurfen</string>
     <string name="activity_type_football">Fußball</string>
-    <string name="activity_type_rugby"></string>
+    <string name="activity_type_rugby"/>
     <string name="activity_type_baseball">Baseball</string>
-    <string name="activity_type_handball"></string>
-    <string name="activity_type_tennis"></string>
-    <string name="activity_type_squash"></string>
+    <string name="activity_type_handball"/>
+    <string name="activity_type_tennis"/>
+    <string name="activity_type_squash"/>
     <string name="activity_type_weightlifting">Gewichtheben</string>
     <string name="activity_type_skiing">Skifahren</string>
-    <string name="activity_type_hockey"></string>
+    <string name="activity_type_hockey"/>
     <string name="activity_type_icehockey">Eishockey</string>
     <string name="activity_type_iceskating">Schlittschuhlaufen</string>
     <string name="activity_type_golf">Golfen</string>
@@ -2495,7 +2495,7 @@
     <string name="common_symbols">Häufige Symbole</string>
     <string name="devicetype_femometer_vinca2">Femometer Vinca II</string>
     <string name="activity_type_trekking">Wanderung</string>
-    <string name="activity_type_wrestling"></string>
+    <string name="activity_type_wrestling"/>
     <string name="devicetype_redmi_smart_band_pro"/>
     <string name="menuitem_readiness">Bereitschaft</string>
     <string name="devicetype_xiaomi_watch_lite"/>
@@ -2640,4 +2640,5 @@
     <string name="prefs_wena3_button_action_name_start_timer">Starte Aktivitätstimer</string>
     <string name="pref_title_fossil_hr_navigation_instructions">Anweisungen für die Navigation</string>
     <string name="pref_summary_fossil_hr_nav_vibrate">Ob die Uhr bei jeder neuen oder geänderten Navigationsanweisung vibrieren soll (nur wenn die App im Vordergrund ist)</string>
+    <string name="pref_summary_fossil_hr_navigation_instructions">Konfiguriere das Verhalten der Navigations-App</string>
 </resources>
\ No newline at end of file

From 14635dbf3a9cb929fa12b779ae257ddb192f67f4 Mon Sep 17 00:00:00 2001
From: 0que <0que@users.noreply.hosted.weblate.org>
Date: Sat, 20 Jan 2024 18:37:58 +0000
Subject: [PATCH 564/595] Translated using Weblate (Russian)

Currently translated at 99.5% (2498 of 2510 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ru/
---
 app/src/main/res/values-ru/strings.xml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index fd2a10dbc..02f0e293e 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -2696,4 +2696,24 @@
     <string name="updatefirmwareoperation_updateproblem_low_battery">Заряд батареи слишком низок</string>
     <string name="menuitem_buzzer_intensity">Мощность звукоизлучателя</string>
     <string name="prefs_password_4_digits_0_to_9_summary">Пароль должен состоять из 4 цифр</string>
+    <string name="devicetype_xiaomi_watch_s1_pro">Xiaomi Watch S1 Pro</string>
+    <string name="uploadwatchfaceoperation_complete">Установка циферблата завершена</string>
+    <string name="uploadwatchfaceoperation_failed">Установка циферблата не удалась</string>
+    <string name="pref_force_connection_type_title">Принудительная установка типа соединения</string>
+    <string name="pref_force_connection_type_auto">Автоматический</string>
+    <string name="pref_force_connection_type_ble">Bluetooth LE (низкое энергопотребление)</string>
+    <string name="pref_force_connection_type_bt_classic">Bluetooth Classic</string>
+    <string name="activity_info">Информация об активности</string>
+    <string name="sony_protocol_v1">Версия 1</string>
+    <string name="sony_protocol_v3">Версия 3</string>
+    <string name="protocol_version">Версия протокола</string>
+    <string name="sony_protocol_v2">Версия 2</string>
+    <string name="flatDistance">Плоское расстояние</string>
+    <string name="devicetype_xiaomi_watch_s1">Xiaomi Watch S1</string>
+    <string name="devicetype_xiaomi_watch_s3">Xiaomi Watch S3</string>
+    <string name="uploading_watchface">Загрузка циферблата…</string>
+    <string name="uploadwatchfaceoperation_in_progress">Загрузка циферблата</string>
+    <string name="pref_force_connection_type_description">Возможно, вам удаться заставить устройство работать с Gadgetbridge, принудительно выставив нужный тип соединения</string>
+    <string name="devicetype_miband8pro">Xiaomi Smart Band 8 Pro</string>
+    <string name="devicetype_mijia_mho_c303">Mijia MHO-C303</string>
 </resources>
\ No newline at end of file

From 1fe4c2db3542f1fed52cfba725f068f5a668ee2e Mon Sep 17 00:00:00 2001
From: skdubg <skdubg@autistici.org>
Date: Sun, 21 Jan 2024 15:03:46 +0000
Subject: [PATCH 565/595] Translated using Weblate (German)

Currently translated at 94.8% (2381 of 2510 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/de/
---
 app/src/main/res/values-de/strings.xml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 56c001ba1..b061be52e 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <string name="application_name_generic"></string>
-    <string name="title_activity_controlcenter_generic"></string>
+    <string name="application_name_generic"/>
+    <string name="title_activity_controlcenter_generic"/>
     <string name="action_settings">Einstellungen</string>
     <string name="action_debug">Debug</string>
     <string name="action_quit">Beenden</string>
@@ -1588,8 +1588,8 @@
     <string name="autoExport_lastTime_label">Letzter autom. Export: %1$s</string>
     <string name="activity_db_management_autoexport_location">Standort ermittelt nicht möglich. Wahrscheinlich ein Problem des neueren Android-Berechtigungssystems. Höchstwahrscheinlich funktioniert der autom. Export jetzt nicht.</string>
     <string name="menuitem_email">E-Mail</string>
-    <string name="application_name_banglejs_main"></string>
-    <string name="title_activity_controlcenter_banglejs_main"></string>
+    <string name="application_name_banglejs_main"/>
+    <string name="title_activity_controlcenter_banglejs_main"/>
     <string name="about_description_banglejs_main">Android-Begleit-App für Bangle.js, die auf dem Gadgetbridge-Projekt aufbaut, mit zusätzlichem Internetzugang.
 \n
 \nAufgrund der Richtlinien des Google Play Stores ist es uns nicht erlaubt, einen Spendenlink in der App selbst einzubauen, aber wenn dir diese App gefällt, ziehe bitte eine Spende über die Gadgetbridge-Homepage unten in Erwägung.</string>
@@ -1598,7 +1598,7 @@
 \n
 \nAufgrund der Richtlinien des Google Play Stores ist es uns nicht erlaubt, einen Spendenlink in der App selbst einzubauen, aber wenn dir diese App gefällt, ziehe bitte eine Spende über die Gadgetbridge-Homepage unten in Erwägung.</string>
     <string name="application_name_main_nightly"/>
-    <string name="title_activity_controlcenter_main_nightly">Gadgetbridge (Nightly)</string>
+    <string name="title_activity_controlcenter_main_nightly"></string>
     <string name="about_activity_title_main_nightly">Über Gadgetbridge (Nightly)</string>
     <string name="about_description_main_nightly">Cloudloser und freier quelloffener Ersatz für Closed-Source Android-Gadget-Apps von Anbietern. Nächtliche Veröffentlichungen von Gadgetbridge. Es kann nicht installiert werden, wenn du bereits die Gadgetbridge- oder die Pebble-App installiert hast, da es einen Konflikt mit dem Pebble-Anbieter gibt.</string>
     <string name="gadgetbridge_running_main_nightly">Nightly GB läuft</string>
@@ -1824,7 +1824,7 @@
     <string name="about_description_banglejs_nightly">Android-Begleit-App für Bangle.js, die auf dem Gadgetbridge-Projekt aufbaut, mit zusätzlichem Internetzugang.
 \n
 \nAufgrund der Richtlinien des Google Play Stores ist es uns nicht erlaubt, einen Spendenlink in der App selbst einzubauen, aber wenn dir diese App gefällt, ziehe bitte eine Spende über die Gadgetbridge-Homepage unten in Erwägung.</string>
-    <string name="gadgetbridge_running_banglejs_nightly">Nightly Bangle.js wird ausgeführt</string>
+    <string name="gadgetbridge_running_banglejs_nightly">Bangle.js (Nightly) wird ausgeführt</string>
     <string name="prefs_hourly_chime">Stündlicher Klang</string>
     <string name="prefs_hourly_chime_summary">Die Uhr piept einmal pro Stunde</string>
     <string name="step_streaks_achievements_sharing_message">Meine täglichen Schritterfolge!</string>
@@ -2641,4 +2641,6 @@
     <string name="pref_title_fossil_hr_navigation_instructions">Anweisungen für die Navigation</string>
     <string name="pref_summary_fossil_hr_nav_vibrate">Ob die Uhr bei jeder neuen oder geänderten Navigationsanweisung vibrieren soll (nur wenn die App im Vordergrund ist)</string>
     <string name="pref_summary_fossil_hr_navigation_instructions">Konfiguriere das Verhalten der Navigations-App</string>
+    <string name="manual">Manuell</string>
+    <string name="pref_do_not_disturb_not_wear">Bitte-Nicht-Stören wenn nicht getragen</string>
 </resources>
\ No newline at end of file

From a91dc76d82e578644ebca6fa2cadac1ff00e3d73 Mon Sep 17 00:00:00 2001
From: Software In Interlingua <softinterlingua@gmail.com>
Date: Mon, 22 Jan 2024 00:09:06 +0100
Subject: [PATCH 566/595] Added translation using Weblate (Interlingua)

---
 app/src/main/res/values-ia/strings.xml | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 app/src/main/res/values-ia/strings.xml

diff --git a/app/src/main/res/values-ia/strings.xml b/app/src/main/res/values-ia/strings.xml
new file mode 100644
index 000000000..a6b3daec9
--- /dev/null
+++ b/app/src/main/res/values-ia/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
\ No newline at end of file

From 8dc09c631dab0c28fc996cdf7b51c91d39b99eb3 Mon Sep 17 00:00:00 2001
From: nautilusx <translate@disroot.org>
Date: Sun, 21 Jan 2024 21:30:31 +0000
Subject: [PATCH 567/595] Translated using Weblate (German)

Currently translated at 98.2% (2467 of 2510 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/de/
---
 app/src/main/res/values-de/strings.xml | 138 +++++++++++++++----------
 1 file changed, 86 insertions(+), 52 deletions(-)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index b061be52e..87fc4f7ae 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <string name="application_name_generic"/>
-    <string name="title_activity_controlcenter_generic"/>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
     <string name="action_settings">Einstellungen</string>
     <string name="action_debug">Debug</string>
     <string name="action_quit">Beenden</string>
@@ -469,9 +469,9 @@
     <string name="kind_gps">GPS-Firmware</string>
     <string name="devicetype_unknown">Unbekanntes Gerät</string>
     <string name="devicetype_test">Testgerät</string>
-    <string name="devicetype_pebble"/>
-    <string name="devicetype_miband"/>
-    <string name="devicetype_miband2"/>
+    <string name="devicetype_pebble">Pebble</string>
+    <string name="devicetype_miband">Mi Band</string>
+    <string name="devicetype_miband2">Mi Band 2</string>
     <string name="devicetype_amazfit_bip">Amazfit Bip</string>
     <string name="devicetype_amazfit_cor">Amazfit Cor</string>
     <string name="devicetype_vibratissimo">Vibratissimo</string>
@@ -534,7 +534,7 @@
 \nINSTALLATION AUF EIGENE GEFAHR!</string>
     <string name="pref_summary_pebble_gatt_clientonly">Dies ist nur für Pebble 2 und experimentell, versuche dies, wenn du Verbindungsprobleme hast</string>
     <string name="pref_auto_fetch">Aktivitätsdaten automatisch abrufen</string>
-    <string name="devicetype_miband3"/>
+    <string name="devicetype_miband3">Mi Band 3</string>
     <string name="devicetype_q8">Q8</string>
     <string name="blacklist_all_for_notifications">Blacklist für alle Benachrichtigungen</string>
     <string name="whitelist_all_for_notifications">Whitelist für alle Benachrichtigungen</string>
@@ -710,7 +710,7 @@
     <string name="vietnamese">Vietnamesisch</string>
     <string name="portuguese">Portugiesisch</string>
     <string name="devicetype_amazfit_cor2">Amazfit Cor 2</string>
-    <string name="devicetype_miband4"/>
+    <string name="devicetype_miband4">Mi Band 4</string>
     <string name="fw_upgrade_notice_miband4">Du bist dabei, die Firmware %s auf dein Mi Band 4 zu installieren.
 \n
 \nBitte stelle sicher, dass du die .fw Datei und die .res Datei installierst. Dein Band wird nach der Installation der .fw Datei neu gestartet.
@@ -925,7 +925,7 @@
     <string name="error_background_service_reason_truncated">Hintergrunddienst konnte nicht gestartet werden, wegen…</string>
     <string name="error_background_service">Start des Hintergrunddienstes fehlgeschlagen</string>
     <string name="menuitem_breathing">Atemübungen</string>
-    <string name="devicetype_miband5"/>
+    <string name="devicetype_miband5">Mi Band 5</string>
     <string name="fw_upgrade_notice_miband5">Du bist dabei, die Firmware %s auf dein Mi Band 5 zu installieren.
 \n
 \nBitte stelle sicher, dass du zuerst die .fw Datei und dann die .res Datei installierst. Dein Band wird nach der Installation der .fw Datei neu starten.
@@ -984,7 +984,7 @@
     <string name="prefs_events_forwarding_startnonwear">Beim nicht tragend</string>
     <string name="prefs_events_forwarding_wokeup">Beim Aufwachen</string>
     <string name="prefs_events_forwarding_fellsleep">Beim Einschlafen</string>
-    <string name="activity_type_yoga"/>
+    <string name="activity_type_yoga">Yoga</string>
     <string name="activity_type_swimming_openwater">Schwimmen (Freiwasser)</string>
     <string name="Strokes">Züge</string>
     <string name="calories_unit">kcal</string>
@@ -1045,9 +1045,9 @@
     <string name="yes">Ja</string>
     <string name="averageSpeed">Durchschnittliche Geschwindigkeit</string>
     <string name="about_links">Links</string>
-    <string name="activity_type_badminton"/>
+    <string name="activity_type_badminton">Badminton</string>
     <string name="activity_type_pingpong">Tischtennis</string>
-    <string name="activity_type_basketball"/>
+    <string name="activity_type_basketball">Basketball</string>
     <string name="activity_type_cricket">Kricket</string>
     <string name="activity_type_rowing_machine">Rudergerät</string>
     <string name="activity_type_soccer">Fußball</string>
@@ -1213,7 +1213,7 @@
     <string name="menuitem_temperature">Temperatur</string>
     <string name="menuitem_widgets">Widgets</string>
     <string name="menuitem_events">Ereignisse</string>
-    <string name="devicetype_miband6"/>
+    <string name="devicetype_miband6">Mi Band 6</string>
     <string name="fw_upgrade_notice_miband6">Du bist dabei, die Firmware %s auf dein Mi Band 6 zu installieren.
 \n
 \nBitte stelle sicher, dass du die .fw Datei und die .res Datei installierst. Dein Band wird nach der Installation der .fw Datei neu gestartet.
@@ -1349,7 +1349,7 @@
     <string name="devicetype_sony_wh_1000xm3">Sony WH-1000XM3</string>
     <string name="devicetype_galaxybuds_live">Galaxy Buds Live</string>
     <string name="pref_title_equalizer_normal">Normal</string>
-    <string name="pref_header_equalizer"/>
+    <string name="pref_header_equalizer">Equalizer</string>
     <string name="pref_header_system">System</string>
     <string name="devicetype_galaxybuds">Galaxy Buds</string>
     <string name="prefs_equalizer_preset">Equalizer-Voreinstellungen</string>
@@ -1588,8 +1588,8 @@
     <string name="autoExport_lastTime_label">Letzter autom. Export: %1$s</string>
     <string name="activity_db_management_autoexport_location">Standort ermittelt nicht möglich. Wahrscheinlich ein Problem des neueren Android-Berechtigungssystems. Höchstwahrscheinlich funktioniert der autom. Export jetzt nicht.</string>
     <string name="menuitem_email">E-Mail</string>
-    <string name="application_name_banglejs_main"/>
-    <string name="title_activity_controlcenter_banglejs_main"/>
+    <string name="application_name_banglejs_main">Bangle.js Gadgetbridge</string>
+    <string name="title_activity_controlcenter_banglejs_main">Bangle.js Gadgetbridge</string>
     <string name="about_description_banglejs_main">Android-Begleit-App für Bangle.js, die auf dem Gadgetbridge-Projekt aufbaut, mit zusätzlichem Internetzugang.
 \n
 \nAufgrund der Richtlinien des Google Play Stores ist es uns nicht erlaubt, einen Spendenlink in der App selbst einzubauen, aber wenn dir diese App gefällt, ziehe bitte eine Spende über die Gadgetbridge-Homepage unten in Erwägung.</string>
@@ -1597,8 +1597,8 @@
     <string name="about_description_banglejs_nopebble">Android-Begleit-App für Bangle.js, die auf dem Gadgetbridge-Projekt aufbaut, mit zusätzlichem Internetzugang.
 \n
 \nAufgrund der Richtlinien des Google Play Stores ist es uns nicht erlaubt, einen Spendenlink in der App selbst einzubauen, aber wenn dir diese App gefällt, ziehe bitte eine Spende über die Gadgetbridge-Homepage unten in Erwägung.</string>
-    <string name="application_name_main_nightly"/>
-    <string name="title_activity_controlcenter_main_nightly"></string>
+    <string name="application_name_main_nightly">Gadgetbridge (Nightly)</string>
+    <string name="title_activity_controlcenter_main_nightly">Gadgetbridge Nightly</string>
     <string name="about_activity_title_main_nightly">Über Gadgetbridge (Nightly)</string>
     <string name="about_description_main_nightly">Cloudloser und freier quelloffener Ersatz für Closed-Source Android-Gadget-Apps von Anbietern. Nächtliche Veröffentlichungen von Gadgetbridge. Es kann nicht installiert werden, wenn du bereits die Gadgetbridge- oder die Pebble-App installiert hast, da es einen Konflikt mit dem Pebble-Anbieter gibt.</string>
     <string name="gadgetbridge_running_main_nightly">Nightly GB läuft</string>
@@ -1818,8 +1818,8 @@
     <string name="controlcenter_get_heartrate_measurement">Herzfrequenzmessung</string>
     <string name="pref_write_logfiles_not_available">Die Initialisierung der Dateiprotokollierung ist fehlgeschlagen, das Schreiben von Protokolldateien ist derzeit nicht möglich. Starte die App neu, um zu versuchen, die Protokolldateien erneut zu initialisieren.</string>
     <string name="devicetype_binary_sensor">Binärer Sensor</string>
-    <string name="application_name_banglejs_nightly"/>
-    <string name="title_activity_controlcenter_banglejs_nightly"/>
+    <string name="application_name_banglejs_nightly">Bangle.js Gadgetbridge (Nightly)</string>
+    <string name="title_activity_controlcenter_banglejs_nightly">Bangle.js Gadgetbridge (Nightly)</string>
     <string name="about_activity_title_banglejs_nightly">Über Bangle.js Gadgetbridge (Nightly)</string>
     <string name="about_description_banglejs_nightly">Android-Begleit-App für Bangle.js, die auf dem Gadgetbridge-Projekt aufbaut, mit zusätzlichem Internetzugang.
 \n
@@ -1860,9 +1860,9 @@
     <string name="seconds_14">14 Sekunden</string>
     <string name="seconds_15">15 Sekunden</string>
     <string name="prefs_always_on_display">Display immer eingeschaltet</string>
-    <string name="smart"/>
+    <string name="smart">Smart</string>
     <string name="mi2_dnd_always">Immer</string>
-    <string name="devicetype_miband7"/>
+    <string name="devicetype_miband7">Xiaomi Smart Band 7</string>
     <string name="menuitem_countdown">Countdown</string>
     <string name="menuitem_personal_activity_intelligence">Persönliche Aktivitätsintelligenz</string>
     <string name="menuitem_female_health">Weibliche Gesundheit</string>
@@ -1908,18 +1908,18 @@
 \nINSTALLATION AUF EIGENE GEFAHR!</string>
     <string name="pref_title_notification_prefer_long_text">Langen Benachrichtigungstext bevorzugen</string>
     <string name="pref_summary_notification_prefer_long_text">Falls verfügbar, langen Benachrichtigungstext an das Gerät senden</string>
-    <string name="devicetype_amazfit_gts3"/>
+    <string name="devicetype_amazfit_gts3">Amazfit GTS 3</string>
     <string name="menuitem_unknown_app">Unbekannt (%s)</string>
     <string name="pref_summary_overwrite_settings_on_connection">Beim Verbinden mit dem Band überschreibst du alle Einstellungen des Bandes.</string>
     <string name="pref_title_overwrite_settings_on_connection">Überschreiben von Einstellungen bei der Verbindung</string>
-    <string name="kind_app"/>
+    <string name="kind_app">App</string>
     <string name="dismiss">Ablehnen</string>
     <string name="fw_upgrade_notice_amazfit_gtr3">Du bist dabei, die Firmware %s auf deine Amazfit GTR 3 zu installieren.
 \n
 \nDeine Uhr wird nach der Installation der .zip Datei neu starten.
 \n
 \nINSTALLATION AUF EIGENE GEFAHR!</string>
-    <string name="devicetype_amazfit_gtr3"/>
+    <string name="devicetype_amazfit_gtr3">Amazfit GTR 3</string>
     <string name="pref_summary_third_party_app_device_settings">Erlaube anderen installierten Apps von Drittanbietern, Geräteeinstellungen über Intents festzulegen.</string>
     <string name="pref_title_third_party_app_device_settings">Ändern von Einstellungen durch App von Drittanbietern zulassen</string>
     <string name="activity_type_dance">Tanzen</string>
@@ -1930,10 +1930,10 @@
     <string name="activity_type_stretching">Dehnen</string>
     <string name="activity_type_stepper">Stepper</string>
     <string name="activity_type_pilates">Pilates</string>
-    <string name="activity_type_volleyball"/>
+    <string name="activity_type_volleyball">Volleyball</string>
     <string name="activity_type_table_tennis">Tischtennis</string>
-    <string name="activity_type_bowling"/>
-    <string name="activity_type_zumba"/>
+    <string name="activity_type_bowling">Bowling</string>
+    <string name="activity_type_zumba">Zumba</string>
     <string name="activity_type_indoor_ice_skating">Indoor-Eislaufen</string>
     <string name="devicetype_amazfit_gtr_lite">Amazfit GTR Lite</string>
     <string name="activity_type_street_dance">Street Dance</string>
@@ -2069,7 +2069,7 @@
     <string name="devicetype_amazfit_band7">Amazfit Band 7</string>
     <string name="function_enabled">Aktiviert</string>
     <string name="world_clock_code">Code</string>
-    <string name="devicetype_amazfit_gts4"/>
+    <string name="devicetype_amazfit_gts4">Amazfit GTS 4</string>
     <string name="pref_title_touch_spotify_official_app">Spotify (nur offizielle App)</string>
     <string name="pref_title_touch_spotify_galaxy_app">Spotify (nur Galaxy Wearable App)</string>
     <string name="fw_upgrade_notice_amazfit_gts4">Du bist dabei, die Firmware %s auf deine Amazfit GTS 4 zu installieren.
@@ -2084,7 +2084,7 @@
 \nDeine Uhr wird nach der Installation der .zip Datei neu starten.
 \n
 \nINSTALLATION AUF EIGENE GEFAHR!</string>
-    <string name="devicetype_amazfit_gts4_mini"/>
+    <string name="devicetype_amazfit_gts4_mini">Amazfit GTS 4 Mini</string>
     <string name="devicetype_sony_linkbuds_s">Sony LinkBuds S</string>
     <string name="intent_api_allow_trigger_export_title">Datenbankexport zulassen</string>
     <string name="menuitem_wechat_pay">WeChat Pay</string>
@@ -2183,7 +2183,7 @@
     <string name="quick_attention">Schnelle Aufmerksamkeit</string>
     <string name="double_tap">Doppeltes Antippen</string>
     <string name="continue_pressing">Gedrückt halten</string>
-    <string name="devicetype_amazfit_gtr3_pro"/>
+    <string name="devicetype_amazfit_gtr3_pro">Amazfit GTR 3 Pro</string>
     <string name="menuitem_vo2_max">VO₂ Max</string>
     <string name="menuitem_mi_ai">MI AI</string>
     <string name="zepp_os_watchface_simplicity_data">Einfache Daten</string>
@@ -2324,14 +2324,14 @@
     <string name="activity_type_surfing">Surfen</string>
     <string name="activity_type_windsurfing">Windsurfen</string>
     <string name="activity_type_football">Fußball</string>
-    <string name="activity_type_rugby"/>
+    <string name="activity_type_rugby">Rugby</string>
     <string name="activity_type_baseball">Baseball</string>
-    <string name="activity_type_handball"/>
-    <string name="activity_type_tennis"/>
-    <string name="activity_type_squash"/>
+    <string name="activity_type_handball">Handball</string>
+    <string name="activity_type_tennis">Tennis</string>
+    <string name="activity_type_squash">Squash</string>
     <string name="activity_type_weightlifting">Gewichtheben</string>
     <string name="activity_type_skiing">Skifahren</string>
-    <string name="activity_type_hockey"/>
+    <string name="activity_type_hockey">Hockey</string>
     <string name="activity_type_icehockey">Eishockey</string>
     <string name="activity_type_iceskating">Schlittschuhlaufen</string>
     <string name="activity_type_golf">Golfen</string>
@@ -2359,7 +2359,7 @@
     <string name="pref_theme_dynamic_colors_not_available_warning">Dynamische Farben sind auf deinem Gerät nicht verfügbar, nur Android 12+ unterstützt diese Funktion. Gadgetbridge verwendet die Standardfarben von Material 3.</string>
     <string name="pref_theme_dynamic_colors_explanation">Hinweis: Für das Design mit dynamischen Farben musst du Hintergrundbildfarben oder Farbpalette in deinen Android 12+ Darstellungseinstellungen aktivieren. Wenn du das nicht tust, wird Gadgetbridge die Standardfarben von Material 3 verwenden.</string>
     <string name="menuitem_zepp_coach">Zepp Coach</string>
-    <string name="devicetype_amazfit_bip3_pro"/>
+    <string name="devicetype_amazfit_bip3_pro">Amazfit Bip 3 Pro</string>
     <string name="fw_upgrade_notice_amazfit_cheetah_pro">Du bist dabei, die Firmware %s auf deine Amazfit Cheetah Pro zu installieren.
 \n
 \nDeine Uhr wird nach der Installation der .zip-Datei neu starten.
@@ -2380,8 +2380,8 @@
 \n
 \nINSTALLATION AUF EIGENE GEFAHR!</string>
     <string name="devicetype_amazfit_cheetah_round">Amazfit Cheetah (Rund)</string>
-    <string name="devicetype_amazfit_cheetah_pro"/>
-    <string name="devicetype_amazfit_bip5"/>
+    <string name="devicetype_amazfit_cheetah_pro">Amazfit Cheetah Pro</string>
+    <string name="devicetype_amazfit_bip5">Amazfit Bip 5</string>
     <string name="devicetype_amazfit_trex_ultra">Amazfit T-Rex Ultra</string>
     <string name="devicetype_amazfit_falcon">Amazfit Falcon</string>
     <string name="devicetype_amazfit_gtr_mini">Amazfit GTR Mini</string>
@@ -2407,7 +2407,7 @@
     <string name="prefs_home_icon_left_item">Links</string>
     <string name="prefs_wena3_led_none">Keine LED</string>
     <string name="updatefirmwareoperation_failed_low_mtu">Die aktuelle MTU von %1$d ist zu niedrig,bitte aktiviere eine hohe MTU in den Geräteeinstellungen und trenne/schließe das Gerät neu an.</string>
-    <string name="prefs_wena3_home_icon_name_riiiver"/>
+    <string name="prefs_wena3_home_icon_name_riiiver">Riiiver</string>
     <string name="pref_message_privacy_mode_bodyonly">Nur Nachrichtentext ausblenden</string>
     <string name="prefs_wena3_home_icon_name_suica">Suica Kontostand</string>
     <string name="prefs_wena3_vibration_strength_item_medium">Mittel</string>
@@ -2480,7 +2480,7 @@
     <string name="menuitem_zepp_pay">Zepp Pay</string>
     <string name="femometer_measurement_mode_quick">Schneller Modus (30s)</string>
     <string name="pref_title_notifications_ignore_work_profile">Ignoriere Arbeitsprofilbenachrichtigungen</string>
-    <string name="devicetype_amazfit_balance"/>
+    <string name="devicetype_amazfit_balance">Amazfit Balance</string>
     <string name="yard">yd</string>
     <string name="strokes_minute">Züge/min</string>
     <string name="femometer_measurement_mode_title">Messmodus</string>
@@ -2495,19 +2495,19 @@
     <string name="common_symbols">Häufige Symbole</string>
     <string name="devicetype_femometer_vinca2">Femometer Vinca II</string>
     <string name="activity_type_trekking">Wanderung</string>
-    <string name="activity_type_wrestling"/>
-    <string name="devicetype_redmi_smart_band_pro"/>
+    <string name="activity_type_wrestling">Wrestling</string>
+    <string name="devicetype_redmi_smart_band_pro">Redmi Smart Band Pro</string>
     <string name="menuitem_readiness">Bereitschaft</string>
-    <string name="devicetype_xiaomi_watch_lite"/>
-    <string name="devicetype_amazfit_active_edge"/>
+    <string name="devicetype_xiaomi_watch_lite">Xiaomi Watch Lite</string>
+    <string name="devicetype_amazfit_active_edge">Amazfit Active Edge</string>
     <string name="pref_summary_casio_alert_call">Klingeln (Vibration/Ton) bei eingehenden Anrufen</string>
     <string name="pref_title_casio_alert_email">Alarm für Mail-Benachrichtigungen</string>
-    <string name="devicetype_miband7pro"/>
+    <string name="devicetype_miband7pro">Xiaomi Smart Band 7 Pro</string>
     <string name="clap_hands_to_wakeup_device">Klatsche in die Hände, um den Bildschirm zu aktivieren</string>"
-    <string name="devicetype_colacao21"/>
-    <string name="devicetype_colacao23"/>
-    <string name="devicetype_redmiwatch3active"/>
-    <string name="devicetype_redmi_smart_band_2"/>
+    <string name="devicetype_colacao21">ColaCao 2021</string>
+    <string name="devicetype_colacao23">ColaCao 2023</string>
+    <string name="devicetype_redmiwatch3active">Redmi Watch 3 Active</string>
+    <string name="devicetype_redmi_smart_band_2">Redmi Smart Band 2</string>
     <string name="standing_time">Steh-Zeit</string>
     <string name="active_time">Aktiv-Zeit</string>
     <string name="pref_title_send_app_notifications">Sende Benachrichtigungen</string>
@@ -2521,12 +2521,12 @@
     <string name="pref_title_casio_alert_sms">Alarm für SMS-Benachrichtigungen</string>
     <string name="pref_title_casio_alert_other">Alarm für andere Benachrichtigungen</string>
     <string name="pref_summary_casio_alert_other">Alarm (Vibration/Ton) für Benachrichtigungen in anderen Kategorien</string>
-    <string name="devicetype_miband8"/>
+    <string name="devicetype_miband8">Xiaomi Smart Band 8</string>
     <string name="devicetype_mijia_lywsd03">Mijia Temperatur- und Feuchtigkeitssensor 2</string>
     <string name="menuitem_body_composition">Körperliche Zusammensetzung</string>
-    <string name="devicetype_amazfit_active"/>
+    <string name="devicetype_amazfit_active">Amazfit Active</string>
     <string name="pref_title_goal_secondary">Zusätzliches Ziel</string>
-    <string name="devicetype_redmi_watch_2_lite"/>
+    <string name="devicetype_redmi_watch_2_lite">Redmi Watch 2 Lite</string>
     <string name="wake_up_time">Aufwachen</string>
     <string name="pixoo_power_saving_summary">Der Bildschirm schaltet sich aus, wenn das Mikrofon eine Zeit lang Stille erkannt hat</string>
     <string name="activity_info">Informationen zur Aktivität</string>
@@ -2643,4 +2643,38 @@
     <string name="pref_summary_fossil_hr_navigation_instructions">Konfiguriere das Verhalten der Navigations-App</string>
     <string name="manual">Manuell</string>
     <string name="pref_do_not_disturb_not_wear">Bitte-Nicht-Stören wenn nicht getragen</string>
+    <string name="widget">Widget</string>
+    <string name="sony_protocol_v2">Version 2</string>
+    <string name="sony_protocol_v3">Version 3</string>
+    <string name="pref_navigation_app_gmaps">Google Maps</string>
+    <string name="devicetype_nothingear2">Nothing Ear (2)</string>
+    <string name="prefs_active_noise_cancelling_light">Leichte aktive Geräuschunterdrückung</string>
+    <string name="huawei_trusleep_title">HUAWEI TruSleep ™</string>
+    <string name="pref_device_action_dnd_priority">Bitte-Nicht-Stören - nur Prioritäten</string>
+    <string name="devicetype_honor_band4">Honor Band 4</string>
+    <string name="devicetype_honor_band5">Honor Band 5</string>
+    <string name="devicetype_honor_band6">Honor Band 6</string>
+    <string name="devicetype_honor_band7">Honor Band 7</string>
+    <string name="devicetype_huawei_band_aw70">Huawei Band (AW70)</string>
+    <string name="devicetype_huawei_band6">Huawei Band 6</string>
+    <string name="devicetype_huawei_band7">Huawei Band 7</string>
+    <string name="devicetype_huawei_band8">Huawei Band 8</string>
+    <string name="devicetype_huawei_watch_gt">Huawei Watch GT</string>
+    <string name="devicetype_huawei_band4pro">Huawei Band 4 (Pro)</string>
+    <string name="devicetype_huawei_watchgt2">Huawei Watch GT 2 (Pro)</string>
+    <string name="devicetype_huawei_watchgt2e">Huawei Watch GT 2e</string>
+    <string name="devicetype_huawei_talk_band_b6">Huawei Talk Band B6</string>
+    <string name="devicetype_huawei_watchgt3">Huawei Watch GT 3 (Pro)</string>
+    <string name="menuitem_running">Laufen</string>
+    <string name="devicetype_xiaomi_watch_s1_active">Xiaomi Watch S1 Active</string>
+    <string name="devicetype_mi_watch_color_sport">Mi Watch Color Sport</string>
+    <string name="devicetype_pixoo">Pixoo</string>
+    <string name="sony_protocol_v1">Version 1</string>
+    <string name="devicetype_xiaomi_watch_s1">Xiaomi Watch S1</string>
+    <string name="devicetype_xiaomi_watch_s3">Xiaomi Watch S3</string>
+    <string name="devicetype_xiaomi_watch_s1_pro">Xiaomi Watch S1 Pro</string>
+    <string name="devicetype_miband8pro">Xiaomi Smart Band 8 Pro</string>
+    <string name="devicetype_mijia_mho_c303">Mijia MHO-C303</string>
+    <string name="devicetype_honor_band3">Honor Band 3</string>
+    <string name="devicetype_nothingearstick">Nothing Ear (Stick)</string>
 </resources>
\ No newline at end of file

From 3dda7621cfd79d563b96b81359ee239acf6948f6 Mon Sep 17 00:00:00 2001
From: Rex_sa <rex.sa@pm.me>
Date: Sun, 21 Jan 2024 23:16:14 +0000
Subject: [PATCH 568/595] Translated using Weblate (Arabic)

Currently translated at 100.0% (2510 of 2510 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ar/
---
 app/src/main/res/values-ar/strings.xml | 90 +++++++++++++++++++++++++-
 1 file changed, 89 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 4eeb11e4f..342d9f7b6 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -440,7 +440,7 @@
 \nأنت ممنوع من تثبيتها!</string>
     <string name="miband_firmware_suggest_whitelist">إذا كنت لا تزال ترغب في المتابعة واستمرت الأمور في العمل بشكل صحيح بعد ذلك ، فالرجاء إخبار مطوري Gadgetbridge بإدراج إصدار البرنامج الثابت %s في القائمة البيضاء.</string>
     <string name="open_fw_installer_info_text">يسمح لك برنامج Firmware / Watchface / App / File Installer بتحميل / تثبيت الملفات المدعومة (البرامج الثابتة ، وواجهات المراقبة ، والتطبيقات ، ونظام تحديد المواقع العالمي (GPS) ، والموارد ، والخطوط ...) على الجهاز. اطلع على مزيد من المعلومات في الويكي: https://codeberg.org/Freeyourgadget/Gadgetbridge/wiki/Firmware-Update</string>
-    <string name="pref_title_general_autoconnectonbluetooth">قم بالاتصال بجهاز Gadgetbridge عند تشغيل Bluetooth</string>
+    <string name="pref_title_general_autoconnectonbluetooth">قم بالاتصال بالجهاز/أجهزة Gadgetbridge عند تشغيل Bluetooth</string>
     <string name="open_fw_installer_connect_minimum_one_device">الرجاء توصيل جهاز واحد على الأقل الذي تريد إرسال الملف إليه.</string>
     <string name="pref_summary_minimize_priority_off">يتم عرض الرمز الموجود في شريط الحالة والإشعار في شاشة القفل</string>
     <string name="ignore_bonded_devices_description">سيؤدي تمكين هذا الخيار إلى تجاهل الأجهزة التي تم ربطها / إقرانها بالفعل عند المسح</string>
@@ -2620,4 +2620,92 @@
     <string name="prefs_active_noise_cancelling_transparency">الشفافية</string>
     <string name="devicetype_nothingearstick">نوثينج Ear (Stick)</string>
     <string name="prefs_active_noise_cancelling_light">إلغاء الضوضاء النشطة الخفيفة</string>
+    <string name="devicetype_huawei_watchgt2e">ساعة هواوي جي تي 2 اي</string>
+    <string name="pref_heartrate_automatic_enable">تمكين قياس معدل ضربات القلب التلقائي</string>
+    <string name="pref_spo_automatic_enable">تمكين قياس معدل الأوكسجين التلقائي</string>
+    <string name="devicetype_xiaomi_watch_s1_pro">ساعة شاومي S1 برو</string>
+    <string name="devicetype_xiaomi_watch_s3">ساعة شاومي اس ٣</string>
+    <string name="uploadwatchfaceoperation_complete">اكتمل تثبيت واجهة الساعة</string>
+    <string name="pref_activity_recognize_biking">التعرف على ركوب الدراجات</string>
+    <string name="pref_activity_recognize_walking">التعرف على المشي</string>
+    <string name="flatDistance">مسافة مسطحة</string>
+    <string name="sony_protocol_v1">الإصدار ١</string>
+    <string name="sony_protocol_v2">الإصدار ٢</string>
+    <string name="sony_protocol_v3">الإصدار ٣</string>
+    <string name="protocol_version">إصدار البروتوكول</string>
+    <string name="uploadwatchfaceoperation_in_progress">جارٍ تحميل واجهة الساعة</string>
+    <string name="pref_force_connection_type_bt_classic">بلوتوث كلاسيك</string>
+    <string name="pref_force_connection_type_description">يمكنك محاولة فرض نوع الاتصال في حالة عدم استجابة جهازك لـ Gadgetbridge</string>
+    <string name="devicetype_honor_band3">سوار اونر ٣</string>
+    <string name="devicetype_honor_band4">سوار اونر ٤</string>
+    <string name="devicetype_honor_band5">سوار اونر ٥</string>
+    <string name="devicetype_honor_band6">سوار اونر ٦</string>
+    <string name="devicetype_honor_band7">سوار اونر ٧</string>
+    <string name="pref_activity_recognize_rowing">التعرف على التجديف</string>
+    <string name="pref_activity_recognition_mode_none">لاشيء</string>
+    <string name="pref_enable_call_accept_summary">تمكين قبول المكالمات من الجهاز</string>
+    <string name="pref_enable_call_accept">تمكين قبول المكالمات</string>
+    <string name="pref_force_dnd_support_summary">فرض دعم عدم الإزعاج.
+\nاستخدام على مسؤوليتك الخاصة</string>
+    <string name="huawei_ignore_wakeup_status_end">تجاهل حالة نهاية الاستيقاظ</string>
+    <string name="pref_title_general_reconnectonlytoconnected">أعد الاتصال بالأجهزة المتصلة فقط</string>
+    <string name="pref_summary_general_reconnectonlytoconnected">أعد الاتصال بالأجهزة المتصلة فقط، بدلاً من إعادة الاتصال بجميع الأجهزة</string>
+    <string name="prefs_disconnect_notification_summary">إشعار على الجهاز عند فصله عن BT.</string>
+    <string name="manual">يدوي</string>
+    <string name="dnd_all_day">كل اليوم</string>
+    <string name="devicetype_huawei_band6">سوار هواوي ٦</string>
+    <string name="pref_enable_call_reject_summary">تمكين رفض المكالمات من الجهاز</string>
+    <string name="pref_enable_call_reject">تمكين رفض المكالمات</string>
+    <string name="pref_force_options_summary">تدعي بعض الأجهزة كذباً أنها لا تدعم بعض الخيارات. يمكن استخدام هذه الإعدادات لتمكينها على أي حال.
+\nاستخدام على مسؤوليتك الخاصة
+\nاقرأ الويكي</string>
+    <string name="huawei_reparse_workout_data">إعادة تحليل بيانات التمرين</string>
+    <string name="huawei_ignore_wakeup_status_start_description">قد يساعد في اكتشاف النوم المناسب. مرئية على الفور في عرض الأنشطة اليومية.</string>
+    <string name="pref_summary_debug">أرسل طلب تصحيح إلى جهاز هواوي</string>
+    <string name="pref_title_debug">طلب التصحيح</string>
+    <string name="prefs_password_4_digits_0_to_9_summary">يجب أن تتكون كلمة المرور من 4 أرقام، باستخدام الأرقام فقط</string>
+    <string name="prefs_workmode">وضع العمل</string>
+    <string name="prefs_activity_recognition">إعدادات التعرف على النشاط</string>
+    <string name="pref_activity_recognition_mode_auto">تلقائي</string>
+    <string name="updatefirmwareoperation_updateproblem_low_battery">بطارية الجهاز منخفضة جدًا</string>
+    <string name="do_not_disturb_lift_wrist_summary">فقط في حالة تفعيل الشاشة عند الرفع</string>
+    <string name="pref_do_not_disturb_not_wear">لا تزعج عندما لا ترتدي</string>
+    <string name="devicetype_huawei_watchgt2">هواوي واتش جي تي 2 (برو)</string>
+    <string name="devicetype_huawei_band4pro">هواوي باند 4 (برو)</string>
+    <string name="devicetype_huawei_band7">سوار هواوي ٧</string>
+    <string name="devicetype_huawei_band_aw70">سوار هواوي (AW70)</string>
+    <string name="devicetype_huawei_band8">سوار هواوي ٨</string>
+    <string name="devicetype_huawei_watch_gt">ساعة هواوي جي تي</string>
+    <string name="devicetype_huawei_watchgt3">هواوي واتش جي تي 3 (برو)</string>
+    <string name="devicetype_huawei_talk_band_b6">هواوي توك باند B6</string>
+    <string name="huawei_alarm_smart_description">لا تقم بإلغاء تحديد خانة اختيار التنبيه الذكي.</string>
+    <string name="huawei_alarm_event_description">لا تحدد خانة اختيار التنبيه الذكي.</string>
+    <string name="huawei_trusleep_title">هواوي ترو سليب™</string>
+    <string name="huawei_trusleep_summary_light">تحسين مراقبة النوم</string>
+    <string name="huawei_trusleep_summary">مراقبة نوعية نومك ونمط التنفس في الوقت الحقيقي.
+\nقم بتحليل أنماط نومك وتشخيص 6 أنواع من مشاكل النوم بدقة.</string>
+    <string name="pref_force_wear_location_summary">فرض دعم موقع wear.
+\nاستخدام على مسؤوليتك الخاصة</string>
+    <string name="huawei_reparse_workout_data_description">لن يقدم هذا شيئا إلا بعد تحديثات معينة</string>
+    <string name="pref_force_dnd_support">فرض دعم عدم الإزعاج</string>
+    <string name="pref_force_wear_location">فرض موقع wear</string>
+    <string name="huawei_ignore_wakeup_status_end_description">قد يساعد في اكتشاف النوم المناسب. مرئية على الفور في عرض الأنشطة اليومية.</string>
+    <string name="huawei_ignore_wakeup_status_start">تجاهل حالة بدء الاستيقاظ</string>
+    <string name="pref_force_smart_alarm_summary">فرض دعم أجهزة الإنذار الذكية.
+\nاستخدام على مسؤوليتك الخاصة</string>
+    <string name="devicetype_miband8pro">سوار شاومي الذكي 8 برو</string>
+    <string name="devicetype_mijia_mho_c303">ميجيا MHO-C303</string>
+    <string name="menuitem_buzzer_intensity">شدة الجرس</string>
+    <string name="pref_force_smart_alarm">فرض التنبيه الذكي</string>
+    <string name="pref_activity_recognize_running">التعرف على الجري</string>
+    <string name="pref_force_options">خيارات القوة</string>
+    <string name="pref_activity_recognition_mode_ask">طلب</string>
+    <string name="pref_disable_find_phone_with_dnd">قم بتعطيل العثور على هاتفي عندما يكون وضع عدم الإزعاج نشطًا</string>
+    <string name="devicetype_xiaomi_watch_s1">ساعة شاومي اس 1</string>
+    <string name="uploadwatchfaceoperation_failed">فشل تثبيت واجهة الساعة</string>
+    <string name="pref_force_connection_type_title">فرض نوع الاتصال</string>
+    <string name="uploading_watchface">جارٍ تحميل واجهة الساعة…</string>
+    <string name="pref_force_connection_type_ble">بلوتوث إل إي</string>
+    <string name="activity_info">معلومات النشاط</string>
+    <string name="pref_force_connection_type_auto">تلقائي</string>
 </resources>
\ No newline at end of file

From af204c7f95e13df853fea6ac5f91f125df5ed667 Mon Sep 17 00:00:00 2001
From: skdubg <skdubg@autistici.org>
Date: Mon, 22 Jan 2024 05:28:43 +0000
Subject: [PATCH 569/595] Translated using Weblate (German)

Currently translated at 98.9% (2484 of 2510 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/de/
---
 app/src/main/res/values-de/strings.xml | 31 ++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 87fc4f7ae..637d374b4 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1349,7 +1349,7 @@
     <string name="devicetype_sony_wh_1000xm3">Sony WH-1000XM3</string>
     <string name="devicetype_galaxybuds_live">Galaxy Buds Live</string>
     <string name="pref_title_equalizer_normal">Normal</string>
-    <string name="pref_header_equalizer">Equalizer</string>
+    <string name="pref_header_equalizer"></string>
     <string name="pref_header_system">System</string>
     <string name="devicetype_galaxybuds">Galaxy Buds</string>
     <string name="prefs_equalizer_preset">Equalizer-Voreinstellungen</string>
@@ -1598,7 +1598,7 @@
 \n
 \nAufgrund der Richtlinien des Google Play Stores ist es uns nicht erlaubt, einen Spendenlink in der App selbst einzubauen, aber wenn dir diese App gefällt, ziehe bitte eine Spende über die Gadgetbridge-Homepage unten in Erwägung.</string>
     <string name="application_name_main_nightly">Gadgetbridge (Nightly)</string>
-    <string name="title_activity_controlcenter_main_nightly">Gadgetbridge Nightly</string>
+    <string name="title_activity_controlcenter_main_nightly">Gadgetbridge (Nightly)</string>
     <string name="about_activity_title_main_nightly">Über Gadgetbridge (Nightly)</string>
     <string name="about_description_main_nightly">Cloudloser und freier quelloffener Ersatz für Closed-Source Android-Gadget-Apps von Anbietern. Nächtliche Veröffentlichungen von Gadgetbridge. Es kann nicht installiert werden, wenn du bereits die Gadgetbridge- oder die Pebble-App installiert hast, da es einen Konflikt mit dem Pebble-Anbieter gibt.</string>
     <string name="gadgetbridge_running_main_nightly">Nightly GB läuft</string>
@@ -1860,7 +1860,7 @@
     <string name="seconds_14">14 Sekunden</string>
     <string name="seconds_15">15 Sekunden</string>
     <string name="prefs_always_on_display">Display immer eingeschaltet</string>
-    <string name="smart">Smart</string>
+    <string name="smart"></string>
     <string name="mi2_dnd_always">Immer</string>
     <string name="devicetype_miband7">Xiaomi Smart Band 7</string>
     <string name="menuitem_countdown">Countdown</string>
@@ -2407,7 +2407,7 @@
     <string name="prefs_home_icon_left_item">Links</string>
     <string name="prefs_wena3_led_none">Keine LED</string>
     <string name="updatefirmwareoperation_failed_low_mtu">Die aktuelle MTU von %1$d ist zu niedrig,bitte aktiviere eine hohe MTU in den Geräteeinstellungen und trenne/schließe das Gerät neu an.</string>
-    <string name="prefs_wena3_home_icon_name_riiiver">Riiiver</string>
+    <string name="prefs_wena3_home_icon_name_riiiver"></string>
     <string name="pref_message_privacy_mode_bodyonly">Nur Nachrichtentext ausblenden</string>
     <string name="prefs_wena3_home_icon_name_suica">Suica Kontostand</string>
     <string name="prefs_wena3_vibration_strength_item_medium">Mittel</string>
@@ -2677,4 +2677,27 @@
     <string name="devicetype_mijia_mho_c303">Mijia MHO-C303</string>
     <string name="devicetype_honor_band3">Honor Band 3</string>
     <string name="devicetype_nothingearstick">Nothing Ear (Stick)</string>
+    <string name="info_menu_structure_set">JSON-Menüstruktur in Gadgetbridge gesetzt</string>
+    <string name="zepp_os_watchface_the_ultima">The Ultima</string>
+    <string name="zepp_os_watchface_city_of_speed">City of Speed</string>
+    <string name="widget_screen">Widget-Bildschirm</string>
+    <string name="widget_screen_min_screens">Es müssen mindestens %1$s Widget-Bildschirme vorhanden sein</string>
+    <string name="widget_screen_no_free_slots_description">Das Gerät hat keine freien Plätze für Widget-Bildschirme (insgesamt: %1$s)</string>
+    <string name="huawei_trusleep_summary">Überwache deine Schlafqualität und dein Atemmuster in Echtzeit.
+\nAnalysiere dein Schlafmuster und diagnostiziere genau 6 Arten von Schlafproblemen.</string>
+    <string name="prefs_wena3_button_action_item_double">Doppelt Drücken</string>
+    <string name="prefs_wena3_day_start_hour_item">Der Tag beginnt um</string>
+    <string name="prefs_wena3_vibration_step_up">Schritt hoch</string>
+    <string name="prefs_wena3_vibration_step_down">Schritt runter</string>
+    <string name="huawei_ignore_wakeup_status_start_description">Kann bei der korrekten Schlaferkennung helfen. Sofort sichtbar in der Ansicht der täglichen Aktivitäten.</string>
+    <string name="huawei_alarm_smart_description">Deaktiviere nicht das Kontrollkästchen für das intelligente Aufwecken.</string>
+    <string name="pref_force_options_summary">Einige Geräte behaupten fälschlicherweise, dass sie einige Optionen nicht unterstützen. Diese Einstellungen können verwendet werden, um sie trotzdem zu aktivieren.
+\nVERWENDUNG AUF EIGENE GEFAHR
+\nLese auf der Webseite</string>
+    <string name="pref_enable_call_reject_summary">Aktiviere das Abweisen von Anrufen vom Gerät</string>
+    <string name="pref_enable_call_accept_summary">Aktiviere die Annahme von Anrufen vom Gerät</string>
+    <string name="huawei_reparse_workout_data">Reparieren der Trainingsdaten</string>
+    <string name="huawei_alarm_event_description">Aktiviere nicht das Kontrollkästchen für das intelligente Aufwecken.</string>
+    <string name="huawei_ignore_wakeup_status_end_description">Kann bei der korrekten Schlaferkennung helfen. Sofort sichtbar in der Ansicht der täglichen Aktivitäten.</string>
+    <string name="widget_screen_delete_confirm_title">Widget-Bildschirm löschen</string>
 </resources>
\ No newline at end of file

From 9300e7035f71a3e7368cd17679a6d12f04d99061 Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Mon, 22 Jan 2024 11:39:54 +0000
Subject: [PATCH 570/595] Translated using Weblate (Spanish)

Currently translated at 100.0% (2510 of 2510 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/es/
---
 app/src/main/res/values-es/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 76a1f92d4..4c5b3d9bd 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -2716,4 +2716,5 @@
     <string name="pref_force_connection_type_ble">Bluetooth de baja energía</string>
     <string name="pref_force_connection_type_bt_classic">Bluetooth</string>
     <string name="pref_force_connection_type_description">Puedes intentar forzar el tipo de conexión en caso de que tu dispositivo no responda a Gadgetbridge</string>
+    <string name="flatDistance">Ruta llana</string>
 </resources>
\ No newline at end of file

From cb38d095e121733bdea1187a05891f53ea514034 Mon Sep 17 00:00:00 2001
From: MattSolo451 <mattsolo45@vivaldi.net>
Date: Sat, 27 Jan 2024 21:29:25 +0000
Subject: [PATCH 571/595] Translated using Weblate (Polish)

Currently translated at 100.0% (2510 of 2510 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/pl/
---
 app/src/main/res/values-pl/strings.xml | 36 +++++++++++++-------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 6fa12d4f9..d82008408 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <string name="application_name_generic">Urządzenia na ciele</string>
-    <string name="title_activity_controlcenter_generic">Urządzenia na ciele</string>
+    <string name="application_name_generic">Gadgetbridge</string>
+    <string name="title_activity_controlcenter_generic">Gadgetbridge</string>
     <string name="action_settings">Ustawienia</string>
     <string name="action_debug">Odpluskwiaj</string>
     <string name="action_quit">Wyjdź</string>
@@ -105,7 +105,7 @@
     <string name="tap_connected_device_for_app_mananger">Kliknij połączone urządzenie, aby uruchomić menadżer aplikacji</string>
     <string name="tap_a_device_to_connect">Dotknij urządzenie aby połączyć</string>
     <string name="cannot_connect_bt_address_invalid_">Nie można połączyć. Nieprawidłowy adres Bluetooth\?</string>
-    <string name="gadgetbridge_running_generic">Urządzenia na ciele uruchomione</string>
+    <string name="gadgetbridge_running_generic">Gadgetbridge jest uruchomiony</string>
     <string name="installing_binary_d_d">Instalowanie binarki %1$d/%2$d</string>
     <string name="installation_failed_">Instalacja nie powiodła się</string>
     <string name="installation_successful">Zainstalowano</string>
@@ -903,7 +903,7 @@
     <string name="hr_widget_last_notification">Ostatnie powiadomienie</string>
     <string name="controlcenter_set_alias">Ustaw własną nazwę (alias)</string>
     <string name="about_contributors">Współtwórcy</string>
-    <string name="about_activity_title_generic">O Urządzeniach na ciele</string>
+    <string name="about_activity_title_generic">Informacje o Gadgetbridge</string>
     <string name="devicetype_amazfit_trex">Amazfit T-Rex</string>
     <string name="backstroke">Styl grzbietowy</string>
     <string name="freestyle">Styl dowolny</string>
@@ -1600,9 +1600,9 @@
     <string name="pref_screen_vibration_patterns_summary">Skonfiguruj wzory wibracji dla różnych powiadomień</string>
     <string name="devicetype_sony_wf_1000xm3">Sony WF-1000XM3</string>
     <string name="devicetype_galaxybuds_pro">Galaxy Buds Pro</string>
-    <string name="about_activity_title_banglejs_main">O Bangle.js Urządzeń na ciele</string>
-    <string name="application_name_banglejs_main">Bangle.js Urządzeń na ciele</string>
-    <string name="title_activity_controlcenter_banglejs_main">Bangle.js Urządzeń na ciele</string>
+    <string name="about_activity_title_banglejs_main">O Bangle.js Gadgetbridge</string>
+    <string name="application_name_banglejs_main">Bangle.js Gadgetbridge</string>
+    <string name="title_activity_controlcenter_banglejs_main">Bangle.js Gadgetbridge</string>
     <string name="gadgetbridge_running_banglejs_main">Bangle.js jest uruchomiony</string>
     <string name="about_activity_title_banglejs_nopebble">O Bangle.js Gadgetbridge</string>
     <string name="application_name_banglejs_nopebble">Bangle.js Gadgetbridge</string>
@@ -1716,12 +1716,12 @@
     <string name="pref_title_banglejs_webview_url">Adres URL programu ładującego aplikacje</string>
     <string name="pref_summary_banglejs_webview_url">Jeśli chcesz mieć niestandardowy program ładujący aplikacje, umieść swój adres URL https://.../android.html tutaj. W przeciwnym razie pozostaw puste miejsce dla https://banglejs.com/apps</string>
     <string name="pref_summary_device_intents">Zezwalaj aplikacjom zegarkowym Bangle.js na wysyłanie intencji Androida i zezwalaj innym aplikacjom na Androida (jak Tasker) na wysyłanie danych do Bangle.js z intencją com.banglejs.uart.tx. Wymaga pozwolenia na wyświetlanie nad innymi aplikacjami, aby działać w tle.</string>
-    <string name="about_description_banglejs_main">Aplikacja towarzysząca dla Bangle.js, zbudowana na bazie projektu Urządzeń na ciele, z dodanym dostępem do Internetu.
+    <string name="about_description_banglejs_main">Aplikacja towarzysząca dla Bangle.js, zbudowana na bazie projektu Gadgetbridge, z dodanym dostępem do Internetu.
 \n
-\nZe względu na politykę Sklepu Google Play, nie możemy umieścić linku do darowizny w samej aplikacji, ale jeśli Ci się ona podoba, rozważ przekazanie darowizny poprzez stronę główną Urządzenia na ciele poniżej.</string>
-    <string name="application_name_main_nightly">Urządzenia na ciele (Wczesna)</string>
-    <string name="title_activity_controlcenter_main_nightly">Urządzenia na ciele Wczesna</string>
-    <string name="about_activity_title_main_nightly">O Urządzenia na ciele Wczesna</string>
+\nZe względu na politykę Sklepu Google Play, nie możemy umieścić linku do darowizny w samej aplikacji, ale jeśli Ci się ona podoba, rozważ przekazanie darowizny poprzez stronę główną Gadgetbridge poniżej.</string>
+    <string name="application_name_main_nightly">Gadgetbridge (Nightly)</string>
+    <string name="title_activity_controlcenter_main_nightly">Gadgetbridge Nightly</string>
+    <string name="about_activity_title_main_nightly">Informacje o Gadgetbridge Nightly</string>
     <string name="about_description_main_nightly">Niewymagający chmury wolny zamiennik dla zamknięto źródłowych aplikacji dostarczanych przez producentów gadżetów na system Android. Wydania Wczesne Urządzenia na ciele. Nie można go zainstalować, jeśli masz już zainstalowaną aplikację Urządzenia na ciele lub Pebble, ze względu na konflikt w dostawcy Pebble.</string>
     <string name="gadgetbridge_running_main_nightly">Urządzenia na ciele (Wczesna) działa</string>
     <string name="application_name_main_nopebble">Urządzenia na ciele (Wczesna, bez dostawcy Pebble)</string>
@@ -1752,13 +1752,13 @@
     <string name="open_fw_installer_getting_files_text">Ponieważ nie możemy rozpowszechniać plików oprogramowania sprzętowego, będziesz musiał zdobyć je samodzielnie. Oznacza to, że będziesz musiał szukać plików w plikach apk, online, na forach, na Amazfitwatchfaces (dla urządzeń Miband/Amazfit) i tak dalej.</string>
     <string name="open_fw_installer_connect_minimum_one_device">Proszę podłączyć PRZYNAJMNIEJ JEDNO urządzenie, do którego chcesz wysłać plik.</string>
     <string name="pref_write_logfiles_not_available">Inicjalizacja logowania plików nie powiodła się, zapisywanie plików dziennika jest obecnie niedostępne. Uruchom ponownie aplikację, aby spróbować ponownie zainicjować pliki dziennika.</string>
-    <string name="application_name_banglejs_nightly">Bangle.js Urządzenia na ciele (Wczesna)</string>
-    <string name="title_activity_controlcenter_banglejs_nightly">Bangle.js Urządzenia na ciele (Wczesna)</string>
-    <string name="about_activity_title_banglejs_nightly">O Bangle.js Urządzenia na ciele (Wczesna)</string>
-    <string name="about_description_banglejs_nightly">Aplikacja towarzysząca dla Bangle.js, zbudowana na bazie projektu Urządzenia na ciele, z dodanym dostępem do Internetu.
+    <string name="application_name_banglejs_nightly">Bangle.js Gadgetbridge (Nightly)</string>
+    <string name="title_activity_controlcenter_banglejs_nightly">Bangle.js Gadgetbridge (Nightly)</string>
+    <string name="about_activity_title_banglejs_nightly">O Bangle.js Gadgetbridge (Nightly)</string>
+    <string name="about_description_banglejs_nightly">Aplikacja towarzysząca dla Bangle.js, zbudowana na bazie projektu Gadgetbridge, z dodanym dostępem do Internetu.
 \n
-\nZe względu na politykę Sklepu Google Play, nie możemy umieścić linku do darowizny w samej aplikacji, ale jeśli Ci się ona podoba, rozważ przekazanie darowizny poprzez stronę główną Urządzenia na ciele poniżej.</string>
-    <string name="gadgetbridge_running_banglejs_nightly">Bangle.js (Wczesna) działa</string>
+\nZe względu na politykę Sklepu Google Play, nie możemy umieścić linku do darowizny w samej aplikacji, ale jeśli Ci się ona podoba, rozważ przekazanie darowizny poprzez stronę główną Gadgetbridge poniżej.</string>
+    <string name="gadgetbridge_running_banglejs_nightly">Bangle.js jest uruchomiony (Nightly)</string>
     <string name="pref_summary_notification_delay_calls">Opóźnienie przed wysłaniem powiadomień o połączeniach przychodzących do urządzenia, w sekundach.</string>
     <string name="world_clock_delete_confirm_description">Czy na pewno chcesz usunąć zegar światowy\?</string>
     <string name="prefs_heartrate_alert_experimental_title">Alarm tętna (eksperymentalny)</string>

From e8936124c145142e2a33436fc79770b7c3f55696 Mon Sep 17 00:00:00 2001
From: Xtremo3 <a.lewicki95@gmail.com>
Date: Sat, 27 Jan 2024 10:08:39 +0000
Subject: [PATCH 572/595] Translated using Weblate (Polish)

Currently translated at 100.0% (2510 of 2510 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/pl/
---
 app/src/main/res/values-pl/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index d82008408..fa2091a2a 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -2719,4 +2719,9 @@
     <string name="pref_force_connection_type_title">Wymuś typ połączenia</string>
     <string name="devicetype_miband8pro">Xiaomi Smart Band 8 Pro</string>
     <string name="devicetype_mijia_mho_c303">Mijia MHO-C303</string>
+    <string name="activity_info">Info o aktywności</string>
+    <string name="pref_force_connection_type_description">Możesz spróbować wymusić typ połączenia na wypadek, gdyby urządzenie nie odpowiedziało na Urządzenia na ciele</string>
+    <string name="pref_force_connection_type_auto">Automatycznie</string>
+    <string name="pref_force_connection_type_ble">Bluetooth LE</string>
+    <string name="pref_force_connection_type_bt_classic">Bluetooth Classic</string>
 </resources>
\ No newline at end of file

From 4a43e31a0f2ce893ac7b67f2afc36de36970b92f Mon Sep 17 00:00:00 2001
From: MattSolo451 <mattsolo45@vivaldi.net>
Date: Sat, 27 Jan 2024 21:32:11 +0000
Subject: [PATCH 573/595] Translated using Weblate (Polish)

Currently translated at 100.0% (2510 of 2510 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/pl/
---
 app/src/main/res/values-pl/strings.xml | 68 +++++++++++++-------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index fa2091a2a..1608b8cff 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -31,15 +31,15 @@
     <!--Strings related to FwAppInstaller-->
     <string name="title_activity_fw_app_insaller">Instalator oprogramowania układowego/aplikacji</string>
     <string name="fw_upgrade_notice">Zamierzasz zainstalować %s.</string>
-    <string name="miband_firmware_known">To oprogramowanie układowe zostało przetestowane i jest ono kompatybilne z Urządzenia na ciele.</string>
-    <string name="miband_firmware_unknown_warning">To oprogramowanie układowe nie zostało przetestowane i może być niekompatybilne z Urządzenia na ciele.
+    <string name="miband_firmware_known">To oprogramowanie układowe zostało przetestowane i jest ono kompatybilne z Gadgetbridge.</string>
+    <string name="miband_firmware_unknown_warning">To oprogramowanie układowe nie zostało przetestowane i może być niekompatybilne z Gadgetbridge.
 \n
 \nWgrywanie tego oprogramowania jest NIEZALECANE!</string>
-    <string name="miband_firmware_suggest_whitelist">Jeśli nadal chcesz kontynuować i po instalacji wszystko będzie działać prawidłowo, proszę powiadomić programistów Urządzenia na ciele, aby dodali wersję %s oprogramowania układowego do białej listy.</string>
+    <string name="miband_firmware_suggest_whitelist">Jeśli nadal chcesz kontynuować i po instalacji wszystko będzie działać prawidłowo, proszę powiadomić programistów Gadgetbridge, aby dodali wersję %s oprogramowania układowego do białej listy.</string>
     <!--Strings related to Settings-->
     <string name="title_activity_settings">Ustawienia</string>
     <string name="pref_header_general">Ustawienia ogólne</string>
-    <string name="pref_title_general_autoconnectonbluetooth">Połącz z Urządzenia na ciele, gdy Bluetooth jest włączony</string>
+    <string name="pref_title_general_autoconnectonbluetooth">Połącz urządzenia z Gadgetbridge, gdy Bluetooth jest włączony</string>
     <string name="pref_title_general_autoreconnect">Automatycznie ponów połączenie</string>
     <string name="pref_title_audio_player">Preferowany odtwarzacz muzyki</string>
     <string name="pref_default">Domyślny</string>
@@ -99,7 +99,7 @@
     <string name="_unknown_">(nieznane)</string>
     <string name="test">Testuj</string>
     <string name="test_notification">Test powiadomień</string>
-    <string name="this_is_a_test_notification_from_gadgetbridge">To jest testowe powiadomienie z Urządzenia na ciele</string>
+    <string name="this_is_a_test_notification_from_gadgetbridge">To jest testowe powiadomienie z Gadgetbridge</string>
     <string name="bluetooth_is_not_supported_">Bluetooth nie jest obsługiwany.</string>
     <string name="bluetooth_is_disabled_">Bluetooth jest wyłączony.</string>
     <string name="tap_connected_device_for_app_mananger">Kliknij połączone urządzenie, aby uruchomić menadżer aplikacji</string>
@@ -276,7 +276,7 @@
     <string name="appmanager_weather_install_provider">Zainstaluj aplikację Weather Notification</string>
     <string name="title_activity_calblacklist">Lista zablokowanych kalendarzy</string>
     <string name="pref_title_general_autostartonboot">Uruchom automatycznie</string>
-    <string name="pref_title_minimize_priority">Ukryj powiadomienia Urządzenia na ciele</string>
+    <string name="pref_title_minimize_priority">Ukryj powiadomienia Gadgetbridge</string>
     <string name="pref_summary_minimize_priority_off">Ikona na pasku stanu i powiadomienia będą wyświetlane na zablokowanym ekranie</string>
     <string name="pref_summary_minimize_priority_on">Ikona na pasku stanu i powiadomienia będą ukrywane na zablokowanym ekranie</string>
     <string name="pref_summary_notification_filter">Blokuj wszystkie powiadomienia, gdy tryb \"Nie przeszkadzać\" jest włączony w telefonie</string>
@@ -391,7 +391,7 @@
     <string name="pref_summary_pebble_forcele">Użyj eksperymentalnego wsparcia Pebble LE (Low Energy), zamiast Bluetooth Classic, dla wszystkich typów Pebble. Wymaga sparowania poprzez BT Classic, a następnie LE</string>
     <string name="pref_title_pebble_gatt_clientonly">Tylko klient GATT</string>
     <string name="pref_summary_pebble_gatt_clientonly">Ta eksperymentalna opcja przeznaczona jest wyłącznie dla Pebble 2. Wypróbuj ją jeżeli masz problemy z połączeniem</string>
-    <string name="pref_summary_pebble_enable_applogs">Spowoduje, że logi z aplikacji zegarka będą zapisywane przez Urządzenia na ciele (wymaga ponownego połączenia)</string>
+    <string name="pref_summary_pebble_enable_applogs">Spowoduje, że logi z aplikacji zegarka będą zapisywane przez Gadgetbridge (wymaga ponownego połączenia)</string>
     <string name="pref_title_pebble_always_ack_pebblekit">Przedwczesne ACK PebbleKit</string>
     <string name="pref_summary_pebble_always_ack_pebblekit">Spowoduje, że wiadomości wysyłane do zewnętrznych aplikacji będą zawsze natychmiast potwierdzane</string>
     <string name="pref_title_screentime">Czas włączenia ekranu</string>
@@ -404,7 +404,7 @@
     <string name="pref_auto_fetch_limit_fetches_summary">Pobieranie co %d minut(y)</string>
     <string name="horizontal">Poziomo</string>
     <string name="vertical">Pionowo</string>
-    <string name="discovery_connected_devices_hint">Upewnij się, że urządzenie (opaska/smartwatch) jest wykrywalne. Aktualnie połączone urządzenia prawdopodobnie nie będą wykrywalne. Na Androidzie 6+ włącz dostęp do lokalizacji (GPS). Wyłącz Privacy Guard dla Urządzenia na ciele, ponieważ mogą ze sobą kolidować i zrestartuj telefon. Jeżeli urządzenie nie zostanie wykryte w przeciągu paru minut, spróbuj ponownie po ponownym uruchomieniu telefonu.</string>
+    <string name="discovery_connected_devices_hint">Upewnij się, że urządzenie (opaska/smartwatch) jest wykrywalne. Aktualnie połączone urządzenia prawdopodobnie nie będą wykrywalne. Na Androidzie 6+ włącz dostęp do lokalizacji (GPS). Wyłącz Privacy Guard dla Gadgetbridge, ponieważ mogą ze sobą kolidować i zrestartuj telefon. Jeżeli urządzenie nie zostanie wykryte w przeciągu paru minut, spróbuj ponownie po ponownym uruchomieniu telefonu.</string>
     <string name="watch9_pairing_tap_hint">Jeśli Twój zegarek (opaska) wibruje, potrząśnij nim lub wciśnij na nim przycisk.</string>
     <string name="stats_x_axis_label">Całkowicie minut</string>
     <string name="notif_battery_low">%1$s rozładowana bateria</string>
@@ -519,7 +519,7 @@
     <string name="watch9_time_hours">Godziny:</string>
     <string name="watch9_time_seconds">Sekundy:</string>
     <string name="watch9_calibration_button">Kalibruj</string>
-    <string name="share_log_warning">Prosimy pamiętać, że logi Urządzenia na ciele mogą zawierać wiele informacji osobistych, w tym dane dotyczące zdrowia, unikalne identyfikatory (takie jak adresy MAC urządzeń), preferencje muzyczne itd. Rozważ edycję logów i usunięcie takich informacji zanim wyślesz je przy zgłaszaniu problemu.</string>
+    <string name="share_log_warning">Prosimy pamiętać, że logi Gadgetbridge mogą zawierać wiele informacji osobistych, w tym dane dotyczące zdrowia, unikalne identyfikatory (takie jak adresy MAC urządzeń), preferencje muzyczne itd. Rozważ edycję logów i usunięcie takich informacji, zanim wyślesz je przy zgłaszaniu problemu.</string>
     <string name="warning">Ostrzeżenie!</string>
     <string name="no_data">Brak danych</string>
     <string name="preferences_led_color">Kolor LED</string>
@@ -530,7 +530,7 @@
     <string name="pref_title_auto_export_interval">Częstość eksportowania</string>
     <string name="unit_imperial">imperialne</string>
     <string name="debugactivity_really_factoryreset_title">Przywrócić do ustawień fabrycznych\?</string>
-    <string name="debugactivity_really_factoryreset">Powrót do ustawień fabrycznych spowoduje usunięcie wszystkich danych z podłączonego urządzenia (jeśli jest obsługiwane). Urządzenia Xiaomi/Huami zmienią również adres MAC Bluetooth, więc pojawią się dla Urządzenia na ciele jako nowe urządzenia.</string>
+    <string name="debugactivity_really_factoryreset">Powrót do ustawień fabrycznych spowoduje usunięcie wszystkich danych z podłączonego urządzenia (jeśli jest obsługiwane). Urządzenia Xiaomi/Huami zmienią również adres MAC Bluetooth, więc pojawią się dla Gadgetbridge jako nowe urządzenia.</string>
     <string name="overslept">Nadmiar snu: %1$s</string>
     <string name="overstep">Przekroczenie: %1$d</string>
     <string name="you_did_not_sleep">Nie spałeś(-aś)</string>
@@ -682,7 +682,7 @@
     <string name="weeksleepchart_sleep_a_month">Sen w miesiącu</string>
     <string name="devicetype_mijia_lywsd02">Mijia Smart Clock</string>
     <string name="menuitem_nfc">NFC</string>
-    <string name="pref_summary_expose_hr">Zezwala innym aplikacjom na dostęp do danych HR w czasie rzeczywistym, gdy urządzenie jest połączone</string>
+    <string name="pref_summary_expose_hr">Umożliwia innym aplikacjom dostęp do danych HR w czasie rzeczywistym, gdy Gadgetbridge jest podłączony</string>
     <string name="pref_title_use_custom_font">Użyj niestandardowej czcionki</string>
     <string name="pref_summary_use_custom_font">Włącz tę opcję, jeśli Twoje urządzenie ma niestandardowy firmware czcionek do obsługi emoji</string>
     <string name="activity_db_management_autoexport_label">Automatyczny eksport</string>
@@ -742,13 +742,13 @@
     <string name="devicetype_banglejs">Bangle.js</string>
     <string name="devicetype_y5">Y5</string>
     <string name="alarm_snooze">Drzemka</string>
-    <string name="activity_db_management_import_export_explanation">Działanie importu/eksportu używa następującej ścieżki (zobacz poniżej) do katalogu na urządzeniu. Katalog ten jest dostępny dla innych aplikacji Androida i twojego komputera. Należy pamiętać, że ten katalog i wszystkie zawarte w nim pliki zostaną usunięte, jeśli odinstalujesz Urządzenia na ciele.
+    <string name="activity_db_management_import_export_explanation">Działanie importu/eksportu używa następującej ścieżki (zobacz poniżej) do katalogu na urządzeniu. Katalog ten jest dostępny dla innych aplikacji Androida i twojego komputera. Należy pamiętać, że ten katalog i wszystkie zawarte w nim pliki zostaną usunięte, jeśli odinstalujesz Gadgetbridge.
 \n
 \nDane eksportu obejmują:
 \n • Export_preference – ustawienia globalne
 \n • Export_preference_MAC – ustawienia danego urządzenia
-\n • Urządzenia na ciele – baza danych urządzeń i aktywności
-\n • Urządzenia na ciele_date – baza danych wyeksportowana w danym dniu
+\n • Gadgetbridge – baza danych urządzeń i aktywności
+\n • Gadgetbridge_date – baza danych wyeksportowana w danym dniu
 \n • Pliki z rozszerzeniem GPX – trasy GPS
 \n • Pliki z rozszerzeniem LOG – pliki rejestrów dziennika
 \n
@@ -845,7 +845,7 @@
     <string name="pref_title_force_white_color_scheme">Wymuś schemat kolorów czarno na białym</string>
     <string name="pref_summary_force_white_color_scheme">Użyteczne, jeśli twój zegarek ma ciemne wskazówki</string>
     <string name="notification_channel_high_priority_name">Wysoki priorytet</string>
-    <string name="pref_summary_custom_deviceicon">Pokaż specyficzną dla urządzenia ikonę powiadomienia zamiast ikony Urządzenia na ciele, gdy połączono</string>
+    <string name="pref_summary_custom_deviceicon">Pokaż specyficzną dla urządzenia ikonę powiadomienia kiedy zostanie połączone zamiast ikony Gadgetbridge</string>
     <string name="hr_appname_workout">Trening</string>
     <string name="hr_appname_stopwatch">Stoper</string>
     <string name="pref_title_vibration_strength">Siła wibracji</string>
@@ -936,7 +936,7 @@
     <string name="devicetype_pinetime_jf">PineTime (Firmware JF)</string>
     <string name="activity_summary_detail">Szczegóły aktywności sportowej</string>
     <string name="activity_type_jump_roping">Skakanka</string>
-    <string name="pref_title_weather_summary">Używane przez dostawcę pogody LineageOS. Inne wersje systemu Android powinny używać innej aplikacji, np. Weather notification. Więcej informacji znajdziesz na stronie projektu Urządzenia na ciele.</string>
+    <string name="pref_title_weather_summary">Używane przez dostawcę pogody LineageOS. Inne wersje systemu Android powinny używać innej aplikacji, np. Weather notification. Więcej informacji znajdziesz na stronie projektu Gadgetbridge.</string>
     <string name="fw_upgrade_notice_miband5">Właśnie zamierzasz zainstalować oprogramowanie układowe %s na swoim Mi Band 5.
 \n
 \nProszę upewnić się, że zainstalowany został plik .fw, a następnie plik .res. Po zainstalowaniu pliku .fw Twój zegarek zostanie ponownie uruchomiony.
@@ -1015,7 +1015,7 @@
     <string name="error_background_service_reason">Uruchomienie usługi w tle nie powiodło się z powodu wyjątku. Błąd:</string>
     <string name="error_background_service_reason_truncated">Uruchomienie usługi w tle nie powiodło się, ponieważ…</string>
     <string name="error_background_service">Nie udało się uruchomić usługi w tle</string>
-    <string name="companiondevice_pairing_details">Włącza obsługę nowego interfejsu API urządzeń towarzyszących (CompanionDevice) (ma wpływ tylko na Android 8 lub nowszy), który zwiększa niezawodność, jeśli usługa będzie musiała zostać ponownie uruchomiona w tle, aby odniosło skutek wymaga to ponownego sparowania przy użyciu Urządzenia na ciele</string>
+    <string name="companiondevice_pairing_details">Włącza obsługę nowego interfejsu API urządzeń towarzyszących (CompanionDevice) (ma wpływ tylko na Android 8 lub nowszy), który zwiększa niezawodność, jeśli usługa będzie musiała zostać ponownie uruchomiona w tle, aby odniosło skutek wymaga to ponownego sparowania przy użyciu Gadgetbridge</string>
     <string name="companiondevice_pairing">Parowanie urządzeń towarzyszących (CompanionDevice Pairing)</string>
     <string name="error_version_check_extreme_caution">UWAGA: Błąd przy sprawdzaniu informacji o wersji! Nie należy kontynuować! Nazwa wersji \"%s\"</string>
     <string name="about_links">Linki</string>
@@ -1263,7 +1263,7 @@
     <string name="set">Ustaw</string>
     <string name="gpx_receiver_files_received">Otrzymane pliki GPX:</string>
     <string name="gpx_receiver_overwrite_some_files">Niektóre pliki już istnieją. Nadpisać\?</string>
-    <string name="gpx_receiver_activity_title">Odbiornik GPX Urządzenia na ciele</string>
+    <string name="gpx_receiver_activity_title">Odbiornik GPX Gadgetbridge</string>
     <string name="activity_summary_detail_clear_gpx_track">Wyczyść trasę GPX</string>
     <string name="activity_summary_detail_select_gpx_track">Wybierz trasę GPX</string>
     <string name="watchface_dialog_widget_color">Kolor</string>
@@ -1722,14 +1722,14 @@
     <string name="application_name_main_nightly">Gadgetbridge (Nightly)</string>
     <string name="title_activity_controlcenter_main_nightly">Gadgetbridge Nightly</string>
     <string name="about_activity_title_main_nightly">Informacje o Gadgetbridge Nightly</string>
-    <string name="about_description_main_nightly">Niewymagający chmury wolny zamiennik dla zamknięto źródłowych aplikacji dostarczanych przez producentów gadżetów na system Android. Wydania Wczesne Urządzenia na ciele. Nie można go zainstalować, jeśli masz już zainstalowaną aplikację Urządzenia na ciele lub Pebble, ze względu na konflikt w dostawcy Pebble.</string>
-    <string name="gadgetbridge_running_main_nightly">Urządzenia na ciele (Wczesna) działa</string>
-    <string name="application_name_main_nopebble">Urządzenia na ciele (Wczesna, bez dostawcy Pebble)</string>
-    <string name="title_activity_controlcenter_main_nopebble">Urządzenia na ciele Wczesna bez Pebble</string>
-    <string name="about_activity_title_main_nopebble">O Urządzenia na ciele Wczesna bez Pebble</string>
-    <string name="about_description_main_nopebble">Niewymagający chmury wolny zamiennik dla zamknięto źródłowych aplikacji dostarczanych przez producentów gadżetów na system Android. Wydania Wczesne Urządzenia na ciele W tej wersji zmieniono nazwę dostawcy Pebble, aby zapobiec konfliktom, więc niektóre integracje związane z Pebble nie będą działać, ale można ją zainstalować obok istniejącej instalacji Urządzenia na ciele.</string>
-    <string name="gadgetbridge_running_main_nopebble">Urządzenia na ciele (Wczesna bez Pebble) działa</string>
-    <string name="pref_summary_banglejs_text_bitmap">Jeśli słowo nie może być wygenerowane za pomocą czcionki zegarka, wygeneruj je do bitmapy w Urządzenia na ciele i wyświetl ją na zegarku</string>
+    <string name="about_description_main_nightly">Niewymagający chmury wolny zamiennik dla zamknięto źródłowych aplikacji dostarczanych przez producentów gadżetów na system Android. Wczesne wydanie Gadgetbridge. Nie można go zainstalować, jeśli masz już zainstalowaną aplikację Urządzenia na ciele lub Pebble, ze względu na konflikt w dostawcy Pebble.</string>
+    <string name="gadgetbridge_running_main_nightly">Gadgetbridge (Nightly) jest uruchomiony</string>
+    <string name="application_name_main_nopebble">Gadgetbridge (Nightly, No Pebble provider)</string>
+    <string name="title_activity_controlcenter_main_nopebble">Gadgetbridge Nightly NoPebble</string>
+    <string name="about_activity_title_main_nopebble">Informacje o Gadgetbridge Nightly NoPebble</string>
+    <string name="about_description_main_nopebble">Niewymagający chmury wolny zamiennik dla zamknięto źródłowych aplikacji dostarczanych przez producentów gadżetów na system Android. Wczesne wydanie Gadgetbridge. W tej wersji zmieniono nazwę dostawcy Pebble, aby zapobiec konfliktom, więc niektóre integracje związane z Pebble nie będą działać, ale można ją zainstalować obok istniejącej instalacji Gadgetbridge.</string>
+    <string name="gadgetbridge_running_main_nopebble">Gadgetbridge (Nightly NoPebble) jest uruchomiona</string>
+    <string name="pref_summary_banglejs_text_bitmap">Jeśli słowo nie może być wygenerowane za pomocą czcionki zegarka, wygeneruj je do bitmapy w Gadgetbridge i wyświetl ją na zegarku</string>
     <string name="open_fw_installer_warning_text">Ta funkcja ma potencjał, aby pozostawić z Twojego urządzenia cegłę. To powiedziawszy, taka sytuacja nigdy nie zdarzyła się żadnemu z programistów poprzez flashowanie, ale pamiętaj, że robisz to na własne ryzyko.</string>
     <string name="open_fw_installer_getting_files_title">Pobieranie pliku z oprogramowaniem sprzętowym/aplikacją</string>
     <string name="discovery_scanning_intensity">Intensywność skanowania</string>
@@ -1777,7 +1777,7 @@
     <string name="controlcenter_connected_fraction">Połączono: %d/%d</string>
     <string name="activity_type_elliptical">Eliptyczna</string>
     <string name="error_deleting_device">Błąd przy usuwaniu urządzenia: %s</string>
-    <string name="notification_gps_title">GPS Urządzenia na ciele</string>
+    <string name="notification_gps_title">Gadgetbridge GPS</string>
     <string name="menuitem_unknown_app">Nieznane (%s)</string>
     <string name="devicetype_binary_sensor">Czujnik binarny</string>
     <string name="notification_gps_text">Wysyłanie lokalizacji GPS do %1$d urządzeń</string>
@@ -2287,7 +2287,7 @@
     <string name="prefs_wena3_vibration_smart_item">Inteligentne wibracje</string>
     <string name="prefs_wena3_home_icon_name_riiiver">Riiiver</string>
     <string name="pref_message_privacy_mode_bodyonly">Ukryj tylko główną treść</string>
-    <string name="prefs_wena3_hint_background_sync">Pozwól urządzeniu Wena okresowo prosić Urządzenia na ciele o pobranie danych o aktywności z urządzenia</string>
+    <string name="prefs_wena3_hint_background_sync">Pozwól urządzeniu Wena okresowo prosić Gadgetbridge o pobranie danych o aktywności z urządzenia</string>
     <string name="pref_morning_updates_categories_summary">Lista kategorii wyświetlana każdego ranka</string>
     <string name="english_in">Angielski (Indie)</string>
     <string name="prefs_wena3_home_icon_name_suica">Równowaga Suica</string>
@@ -2330,14 +2330,14 @@
     <string name="prefs_wena3_vibration_strength_item_weak">Słabe</string>
     <string name="description">Opis</string>
     <string name="prefs_wena3_home_icon_title">Ikony ekranu głównego</string>
-    <string name="pref_show_changelog_summary">Wyświetl dziennik zmian od ostatniej wersji po aktualizacji Urządzenia na ciele</string>
+    <string name="pref_show_changelog_summary">Wyświetl dziennik zmian od ostatniej wersji po aktualizacji Gadgetbridge</string>
     <string name="busy_task_fetch_sleep_respiratory_rate_data">Pobieranie danych dotyczących częstości oddechów podczas snu</string>
     <string name="debug_companion_pair_current">Sparuj bieżące urządzenie jako towarzysza</string>
     <string name="pref_morning_updates_summary">Wyświetlaj aktualizacje każdego ranka</string>
     <string name="menuitem_cards">Karty</string>
     <string name="prefs_wena3_item_weather_statusbar">Pogoda w pasku stanu</string>
     <string name="loyalty_cards_sync_groups_only">Synchronizuj tylko określone grupy</string>
-    <string name="loyalty_cards_catima_permissions_summary">Urządzenia na ciele potrzebuje uprawnień do odczytu kart Catima, aby je zsynchronizować. Dotknij tego przycisku, aby je przyznać.</string>
+    <string name="loyalty_cards_catima_permissions_summary">Gadgetbridge potrzebuje uprawnień do odczytu kart Catima, aby je zsynchronizować. Dotknij tego przycisku, aby je przyznać.</string>
     <string name="zepp_os_watchface_red_fantasy">Czerwona fantazja</string>
     <string name="prefs_shortcut_cards">Karty skrótów</string>
     <string name="temperature_scale_celsius">Skala Celciusza</string>
@@ -2416,7 +2416,7 @@
     <string name="wifi_hotspot_stop_summary">Zatrzymaj hotspot Wi-Fi na zegarku</string>
     <string name="intent_api_allow_debug_commands_title">Zezwalaj na polecenia debugowania</string>
     <string name="fwapp_install_device_not_supported">Nie można zainstalować pliku, urządzenie nie jest obsługiwane.</string>
-    <string name="pref_theme_dynamic_colors_explanation">Uwaga: aby uzyskać motyw dynamicznych kolorów, musisz włączyć opcję Kolory tapety lub Paleta kolorów w ustawieniach wyglądu Androida 12+. Jeśli tego nie zrobisz, Urządzenia na ciele użyje domyślnych kolorów Material 3.</string>
+    <string name="pref_theme_dynamic_colors_explanation">Uwaga: aby uzyskać motyw dynamicznych kolorów, musisz włączyć opcję Kolory tapety lub Paleta kolorów w ustawieniach wyglądu Androida 12+. Jeśli tego nie zrobisz, Gadgetbridge użyje domyślnych kolorów Material 3.</string>
     <string name="zepp_os_watchface_simplicity_data">Proste dane</string>
     <string name="red">Czerwony</string>
     <string name="voice_service_class_title">Klasa usług głosowych</string>
@@ -2438,7 +2438,7 @@
     <string name="intent_api_allow_debug_commands_summary">Zezwalaj na uruchamianie poleceń menu debugowania za pośrednictwem interfejsu Intent API</string>
     <string name="loyalty_cards_sync_options">Opcje synchronizacji</string>
     <string name="prefs_wena3_notification_default_vibration">Wibracja powiadomień</string>
-    <string name="loyalty_cards_catima_not_compatible">Zainstalowana wersja Catimy nie jest kompatybilna z Urządzenia na ciele. Zaktualizuj Catima i Urządzenia na ciele do najnowszych wersji.</string>
+    <string name="loyalty_cards_catima_not_compatible">Zainstalowana wersja Catimy nie jest kompatybilna z Gadgetbridge. Zaktualizuj Catima i Gadgetbridge do najnowszych wersji.</string>
     <string name="prefs_wena3_notification_vibration_repetition_0">W sposób nieokreślony</string>
     <string name="activity_detail_share_raw_details">Udostępnij surowe szczegóły</string>
     <string name="activity_type_windsurfing">Windsurfing</string>
@@ -2447,7 +2447,7 @@
     <string name="temperature_scale_fahrenheit">Skala Fahrenheita</string>
     <string name="prefs_wena3_vibration_strength_item">Siła wibracji</string>
     <string name="english_us">Angielski (Stany Zjednoczone)</string>
-    <string name="pref_theme_dynamic_colors_not_available_warning">Dynamiczne kolory nie są dostępne na Twoim urządzeniu, tylko Android 12+ obsługuje tę funkcję. Urządzenia na ciele użyje domyślnych kolorów Material 3.</string>
+    <string name="pref_theme_dynamic_colors_not_available_warning">Dynamiczne kolory nie są dostępne na Twoim urządzeniu, tylko Android 12+ obsługuje tę funkcję. Gadgetbridge użyje domyślnych kolorów Material 3.</string>
     <string name="withings_bt_calibration_previous">Wstecz</string>
     <string name="ftp_server_stop_summary">Zatrzymaj serwer FTP na zegarku</string>
     <string name="changelog_show_full">Więcej…</string>
@@ -2720,7 +2720,7 @@
     <string name="devicetype_miband8pro">Xiaomi Smart Band 8 Pro</string>
     <string name="devicetype_mijia_mho_c303">Mijia MHO-C303</string>
     <string name="activity_info">Info o aktywności</string>
-    <string name="pref_force_connection_type_description">Możesz spróbować wymusić typ połączenia na wypadek, gdyby urządzenie nie odpowiedziało na Urządzenia na ciele</string>
+    <string name="pref_force_connection_type_description">Możesz spróbować wymusić typ połączenia na wypadek, gdyby urządzenie nie odpowiedziało na Gadgetbridge</string>
     <string name="pref_force_connection_type_auto">Automatycznie</string>
     <string name="pref_force_connection_type_ble">Bluetooth LE</string>
     <string name="pref_force_connection_type_bt_classic">Bluetooth Classic</string>

From 2dee70022f74b024468e4d0716cc43557ccef9aa Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Sun, 28 Jan 2024 16:04:33 +0000
Subject: [PATCH 574/595] Translated using Weblate (Spanish)

Currently translated at 100.0% (2511 of 2511 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/es/
---
 app/src/main/res/values-es/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 4c5b3d9bd..43958790b 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -2717,4 +2717,5 @@
     <string name="pref_force_connection_type_bt_classic">Bluetooth</string>
     <string name="pref_force_connection_type_description">Puedes intentar forzar el tipo de conexión en caso de que tu dispositivo no responda a Gadgetbridge</string>
     <string name="flatDistance">Ruta llana</string>
+    <string name="devicetype_sony_wi_sp600n">Sony WI-SP600N</string>
 </resources>
\ No newline at end of file

From b33e36eec25ad66edac471bd2f44706bfbe5c493 Mon Sep 17 00:00:00 2001
From: 0que <0que@users.noreply.hosted.weblate.org>
Date: Sun, 28 Jan 2024 11:43:35 +0000
Subject: [PATCH 575/595] Translated using Weblate (Russian)

Currently translated at 99.5% (2499 of 2511 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ru/
---
 app/src/main/res/values-ru/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 02f0e293e..65ecb8c3e 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -2716,4 +2716,5 @@
     <string name="pref_force_connection_type_description">Возможно, вам удаться заставить устройство работать с Gadgetbridge, принудительно выставив нужный тип соединения</string>
     <string name="devicetype_miband8pro">Xiaomi Smart Band 8 Pro</string>
     <string name="devicetype_mijia_mho_c303">Mijia MHO-C303</string>
+    <string name="devicetype_sony_wi_sp600n">Sony WI-SP600N</string>
 </resources>
\ No newline at end of file

From c5753d3ab98b3ff2f5da62c7c24294ca5b9dd24d Mon Sep 17 00:00:00 2001
From: Ihor Hordiichuk <igor_ck@outlook.com>
Date: Sun, 28 Jan 2024 00:44:42 +0000
Subject: [PATCH 576/595] Translated using Weblate (Ukrainian)

Currently translated at 97.2% (2441 of 2511 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/uk/
---
 app/src/main/res/values-uk/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index f1178df21..9c10d58dd 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -2643,4 +2643,9 @@
     <string name="notification_channel_connection_status_name">Стан з\'єднання</string>
     <string name="devicetype_nothingearstick">Nothing Ear (Stick)</string>
     <string name="prefs_active_noise_cancelling_transparency">Прозорість</string>
+    <string name="updatefirmwareoperation_updateproblem_low_battery">Занизький рівень заряду акумулятора пристрою</string>
+    <string name="do_not_disturb_lift_wrist_summary">Лише якщо ввімкнено активування піднесенням руки</string>
+    <string name="prefs_password_4_digits_0_to_9_summary">Пароль повинен складатися з 4 цифр, і містити лише цифри</string>
+    <string name="pref_summary_general_reconnectonlytoconnected">Повторно з\'єднатися лише з під\'єднаними пристроями, замість з\'єднання з усіма пристроями</string>
+    <string name="prefs_disconnect_notification_summary">Сповіщення на пристрої після від\'єднання від BT.</string>
 </resources>
\ No newline at end of file

From b6140c8879416e5221b6a1ef9c2ead7986457c9a Mon Sep 17 00:00:00 2001
From: Rex_sa <rex.sa@pm.me>
Date: Sun, 28 Jan 2024 13:51:49 +0000
Subject: [PATCH 577/595] Translated using Weblate (Arabic)

Currently translated at 100.0% (2511 of 2511 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ar/
---
 app/src/main/res/values-ar/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 342d9f7b6..1909e695f 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -2708,4 +2708,5 @@
     <string name="pref_force_connection_type_ble">بلوتوث إل إي</string>
     <string name="activity_info">معلومات النشاط</string>
     <string name="pref_force_connection_type_auto">تلقائي</string>
+    <string name="devicetype_sony_wi_sp600n">سوني WI-SP600N</string>
 </resources>
\ No newline at end of file

From 1474692a69f7adee7bd86e7188f5ce3572c0876f Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Sun, 28 Jan 2024 20:17:57 +0000
Subject: [PATCH 578/595] Translated using Weblate (Spanish)

Currently translated at 96.7% (2513 of 2597 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/es/
---
 app/src/main/res/values-es/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 43958790b..57e298dd6 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -2718,4 +2718,6 @@
     <string name="pref_force_connection_type_description">Puedes intentar forzar el tipo de conexión en caso de que tu dispositivo no responda a Gadgetbridge</string>
     <string name="flatDistance">Ruta llana</string>
     <string name="devicetype_sony_wi_sp600n">Sony WI-SP600N</string>
+    <string name="heartrate_bpm_155">155 bpm</string>
+    <string name="heartrate_bpm_165">165 bpm</string>
 </resources>
\ No newline at end of file

From ad46e23ebce8105ea9234e04afaefd1940be8d1b Mon Sep 17 00:00:00 2001
From: skdubg <skdubg@autistici.org>
Date: Mon, 29 Jan 2024 12:06:56 +0000
Subject: [PATCH 579/595] Translated using Weblate (German)

Currently translated at 98.8% (2567 of 2597 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/de/
---
 app/src/main/res/values-de/strings.xml | 89 ++++++++++++++++++++++++--
 1 file changed, 84 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 637d374b4..ce369f896 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1349,7 +1349,7 @@
     <string name="devicetype_sony_wh_1000xm3">Sony WH-1000XM3</string>
     <string name="devicetype_galaxybuds_live">Galaxy Buds Live</string>
     <string name="pref_title_equalizer_normal">Normal</string>
-    <string name="pref_header_equalizer"></string>
+    <string name="pref_header_equalizer">Equalizer</string>
     <string name="pref_header_system">System</string>
     <string name="devicetype_galaxybuds">Galaxy Buds</string>
     <string name="prefs_equalizer_preset">Equalizer-Voreinstellungen</string>
@@ -1860,7 +1860,7 @@
     <string name="seconds_14">14 Sekunden</string>
     <string name="seconds_15">15 Sekunden</string>
     <string name="prefs_always_on_display">Display immer eingeschaltet</string>
-    <string name="smart"></string>
+    <string name="smart">Smart</string>
     <string name="mi2_dnd_always">Immer</string>
     <string name="devicetype_miband7">Xiaomi Smart Band 7</string>
     <string name="menuitem_countdown">Countdown</string>
@@ -1966,7 +1966,7 @@
     <string name="devicetype_sony_wh_1000xm2">Sony WH-1000XM2</string>
     <string name="devicetype_sony_wf_1000xm4">Sony WF-1000XM4</string>
     <string name="balanced">Ausgewogen</string>
-    <string name="dual_band"/>
+    <string name="dual_band">Doppelband</string>
     <string name="low_power_gps">Stromsparendes GPS</string>
     <string name="gps">GPS</string>
     <string name="gps_bds">GPS + BDS</string>
@@ -2010,7 +2010,7 @@
     <string name="menuitem_offline_voice">Offline Stimme</string>
     <string name="menuitem_screen_always_lit">Bildschirm leuchtet immer</string>
     <string name="pref_header_sound_vibration">Ton &amp; Vibration</string>
-    <string name="single_band"/>
+    <string name="single_band">Einzelband</string>
     <string name="gps_galileo">GPS + GALILEO</string>
     <string name="pref_text_to_speech">Text in Sprache</string>
     <string name="offline_voice_respond_turn_wrist">Reagiert beim Drehen des Handgelenks</string>
@@ -2407,7 +2407,7 @@
     <string name="prefs_home_icon_left_item">Links</string>
     <string name="prefs_wena3_led_none">Keine LED</string>
     <string name="updatefirmwareoperation_failed_low_mtu">Die aktuelle MTU von %1$d ist zu niedrig,bitte aktiviere eine hohe MTU in den Geräteeinstellungen und trenne/schließe das Gerät neu an.</string>
-    <string name="prefs_wena3_home_icon_name_riiiver"></string>
+    <string name="prefs_wena3_home_icon_name_riiiver">Riiiver</string>
     <string name="pref_message_privacy_mode_bodyonly">Nur Nachrichtentext ausblenden</string>
     <string name="prefs_wena3_home_icon_name_suica">Suica Kontostand</string>
     <string name="prefs_wena3_vibration_strength_item_medium">Mittel</string>
@@ -2700,4 +2700,83 @@
     <string name="huawei_alarm_event_description">Aktiviere nicht das Kontrollkästchen für das intelligente Aufwecken.</string>
     <string name="huawei_ignore_wakeup_status_end_description">Kann bei der korrekten Schlaferkennung helfen. Sofort sichtbar in der Ansicht der täglichen Aktivitäten.</string>
     <string name="widget_screen_delete_confirm_title">Widget-Bildschirm löschen</string>
+    <string name="pref_force_wear_location">Erzwinge Standort der Uhr</string>
+    <string name="huawei_reparse_workout_data_description">Dies wird nur nach bestimmten Aktualisierungen geschehen</string>
+    <string name="prefs_wena3_button_action_item">Schaltflächenaktion</string>
+    <string name="pref_call_rejection_method_summary">Welche Aktion wird ausgeführt wenn ein eingehender Anruf von der Uhr abgelehnt wird</string>
+    <string name="do_not_disturb_lift_wrist_summary">Nur falls beim \"Hochheben Display aktivieren\" aktiviert ist</string>
+    <string name="menuitem_focus">Fokus</string>
+    <string name="pref_call_rejection_method_title">Methode zur Ablehnung von Anrufen</string>
+    <string name="prefs_wena3_auto_power_off_turn_on_time_item">Zeit fortsetzen</string>
+    <string name="heartrate_bpm_155">155 Schläge/min</string>
+    <string name="heartrate_bpm_165">165 Schläge/min</string>
+    <string name="heartrate_bpm_175">175 Schläge/min</string>
+    <string name="heartrate_bpm_185">185 Schläge/min</string>
+    <string name="heartrate_bpm_195">195 Schläge/min</string>
+    <string name="heartrate_bpm_205">205 Schläge/min</string>
+    <string name="devicetype_sony_wi_sp600n">Sony WI-SP600N</string>
+    <string name="pref_navigation_app_osmand">OsmAnd(+)</string>
+    <string name="pref_force_connection_type_bt_classic">Bluetooth-Classic</string>
+    <string name="prefs_heartrate_alert_active_high_threshold">Alarmschwelle für hohe Aktivität der Herzfrequenz</string>
+    <string name="hydration_dnd_summary">Deaktivieren von Hydrationswarnungen für ein bestimmtes Zeitintervall</string>
+    <string name="activity_type_karate">Karate</string>
+    <string name="activity_type_kendo">Kendo</string>
+    <string name="activity_type_long_jump">Weitsprung</string>
+    <string name="activity_type_high_jump">Hochsprung</string>
+    <string name="activity_type_ice_hockey">Eishockey</string>
+    <string name="devicetype_honor_magicwatch2">Honor MagicWatch 2</string>
+    <string name="activity_type_trampoline">Trampolin</string>
+    <string name="activity_type_javelin">Speerwurf</string>
+    <string name="devicetype_nothing_cmf_watch_pro">CMF Watch Pro</string>
+    <string name="activity_type_belly_dance">Bauchtanz</string>
+    <string name="activity_type_hunting">Jagen</string>
+    <string name="pref_force_wear_location_summary">Erzwinge Unterstützung für Standort der Uhr
+\nBENUTZUNG AUF EIGENE GEFAHR</string>
+    <string name="activity_type_outdoor_walking">Outdoor-Wandern</string>
+    <string name="activity_type_rock_climbing">Bergsteigen</string>
+    <string name="activity_type_skateboarding">Skateboarden</string>
+    <string name="activity_type_snow_sports">Wintersport</string>
+    <string name="activity_type_cross_country_skiing">Skilanglauf</string>
+    <string name="activity_type_curling">Curling</string>
+    <string name="activity_type_jet_skiing">Jetski fahren</string>
+    <string name="activity_type_sailing">Segeln</string>
+    <string name="activity_type_mountain_hike">Bergwandern</string>
+    <string name="activity_type_indoor_running">Indoor-Laufen</string>
+    <string name="activity_type_cross_trainer">Crosstrainer</string>
+    <string name="activity_type_rower">Ruderer</string>
+    <string name="activity_type_fitness_exercises">Fitnessübungen</string>
+    <string name="activity_type_functional_training">Funktionales Training</string>
+    <string name="activity_type_physical_training">Körperliches Training</string>
+    <string name="activity_type_taekwondo">Taekwondo</string>
+    <string name="activity_type_fencing">Fechten</string>
+    <string name="activity_type_cooldown">Abkühlung</string>
+    <string name="activity_type_dodgeball">Völkerball</string>
+    <string name="activity_type_softball">Softball</string>
+    <string name="activity_type_shuttlecock">Federball</string>
+    <string name="activity_type_fishing">Angeln</string>
+    <string name="activity_type_stairs">Treppen</string>
+    <string name="activity_type_jazz_dance">Jazz-Tanz</string>
+    <string name="activity_type_latin_dance">Lateinischer Tanz</string>
+    <string name="activity_type_ballet">Ballett</string>
+    <string name="activity_type_roller_skating">Rollschuhlaufen</string>
+    <string name="activity_type_martial_arts">Martial Arts</string>
+    <string name="activity_type_tai_chi">Tai-Chi</string>
+    <string name="activity_type_hula_hooping">Hula Hoop</string>
+    <string name="activity_type_darts">Darten</string>
+    <string name="activity_type_archery">Bogenschießen</string>
+    <string name="activity_type_horse_riding">Pferdereiten</string>
+    <string name="activity_type_swing">Schaukeln</string>
+    <string name="activity_type_kite_flying">Drachensteigen</string>
+    <string name="activity_type_lacross">Lacross</string>
+    <string name="activity_type_free_training">Freies Training</string>
+    <string name="activity_type_track_and_field">Leichtathletik</string>
+    <string name="activity_type_aerobic_exercise">Aerobic-Übung</string>
+    <string name="activity_type_push_ups">Liegestütze</string>
+    <string name="activity_type_skating">Eislaufen</string>
+    <string name="activity_type_mind_and_body">Körper und Geist</string>
+    <string name="activity_type_hand_cycling">Handrad fahren</string>
+    <string name="activity_type_other_dance">Andere Tänze</string>
+    <string name="activity_type_cross_country_running">Querfeldeinlauf</string>
+    <string name="activity_type_pull_ups">Klimmzüge</string>
+    <string name="activity_type_billiards">Billard</string>
 </resources>
\ No newline at end of file

From 7aa66605a2e9edf8bd362c43cca37e9e8280b031 Mon Sep 17 00:00:00 2001
From: Gregory Blanco <qartez@protonmail.com>
Date: Sun, 28 Jan 2024 23:23:44 +0000
Subject: [PATCH 580/595] Translated using Weblate (Polish)

Currently translated at 98.9% (2571 of 2597 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/pl/
---
 app/src/main/res/values-pl/strings.xml | 85 ++++++++++++++++++++++----
 1 file changed, 73 insertions(+), 12 deletions(-)

diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 1608b8cff..5804dd6b2 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -498,7 +498,7 @@
     <string name="activity_type_not_measured">Nie zmierzono</string>
     <string name="activity_type_activity">Aktywność</string>
     <string name="activity_type_not_worn">Urządzenie nie noszone</string>
-    <string name="activity_type_walking">Chodzenie</string>
+    <string name="activity_type_walking">Spacer</string>
     <string name="activity_type_unknown">Nieznana aktywność</string>
     <string name="activity_summaries">Aktywności sportowe</string>
     <string name="activity_type_biking">Jazda na rowerze</string>
@@ -1611,19 +1611,19 @@
     <string name="pref_title_banglejs_text_bitmap">Tekst jako bitmapy</string>
     <string name="pref_title_device_internet_access">Zezwól na dostęp do internetu</string>
     <string name="pref_summary_device_internet_access">Zezwól aplikacjom na tym urządzeniu na dostęp do Internetu</string>
-    <string name="heartrate_bpm_100">100 uderzeń</string>
+    <string name="heartrate_bpm_100">100 uderzeń/min</string>
     <string name="world_clock_delete_confirm_title">Usuń \'%1$s\'</string>
     <string name="world_clock_timezone">Strefa czasowa</string>
-    <string name="heartrate_bpm_105">105 uderzeń</string>
-    <string name="heartrate_bpm_110">110 uderzeń</string>
+    <string name="heartrate_bpm_105">105 uderzeń/min</string>
+    <string name="heartrate_bpm_110">110 uderzeń/min</string>
     <string name="heartrate_bpm_112">112 bpm</string>
-    <string name="heartrate_bpm_120">120 uderzeń</string>
-    <string name="heartrate_bpm_125">125 uderzeń</string>
-    <string name="heartrate_bpm_130">130 uderzeń</string>
-    <string name="heartrate_bpm_135">135 uderzeń</string>
-    <string name="heartrate_bpm_140">140 uderzeń</string>
-    <string name="heartrate_bpm_145">145 uderzeń</string>
-    <string name="heartrate_bpm_150">150 uderzeń</string>
+    <string name="heartrate_bpm_120">120 uderzeń/min</string>
+    <string name="heartrate_bpm_125">125 uderzeń/min</string>
+    <string name="heartrate_bpm_130">130 uderzeń/min</string>
+    <string name="heartrate_bpm_135">135 uderzeń/min</string>
+    <string name="heartrate_bpm_140">140 uderzeń/min</string>
+    <string name="heartrate_bpm_145">145 uderzeń/min</string>
+    <string name="heartrate_bpm_150">150 uderzeń/min</string>
     <string name="pref_title_touch_spotify">Spotify</string>
     <string name="pref_voice_detect_duration_5">5 sekund</string>
     <string name="pref_voice_detect_duration_10">10 sekund</string>
@@ -1649,7 +1649,7 @@
     <string name="pref_header_calendar">Kalendarz</string>
     <string name="pref_header_health">Zdrowie</string>
     <string name="pref_header_time">Czas</string>
-    <string name="heartrate_bpm_40">40 uderzeń</string>
+    <string name="heartrate_bpm_40">40 uderzeń/min</string>
     <string name="heartrate_bpm_45">45 uderzeń/min</string>
     <string name="heartrate_bpm_50">50 uderzeń/min</string>
     <string name="spo2_perc_80">80%</string>
@@ -2724,4 +2724,65 @@
     <string name="pref_force_connection_type_auto">Automatycznie</string>
     <string name="pref_force_connection_type_ble">Bluetooth LE</string>
     <string name="pref_force_connection_type_bt_classic">Bluetooth Classic</string>
+    <string name="heartrate_bpm_155">155 uderzeń/min</string>
+    <string name="heartrate_bpm_165">165 uderzeń/min</string>
+    <string name="heartrate_bpm_175">175 uderzeń/min</string>
+    <string name="heartrate_bpm_185">185 uderzeń/min</string>
+    <string name="heartrate_bpm_195">195 uderzeń/min</string>
+    <string name="heartrate_bpm_205">205 uderzeń/min</string>
+    <string name="activity_type_cross_trainer">Orbitrek</string>
+    <string name="activity_type_rower">Ergometr wioślarski</string>
+    <string name="activity_type_crossfit">Crossfit</string>
+    <string name="activity_type_physical_training">Trening fizyczny</string>
+    <string name="activity_type_karate">Karate</string>
+    <string name="activity_type_fitness_gaming">Gra fitness</string>
+    <string name="activity_type_aerobic_exercise">Aerobik</string>
+    <string name="activity_type_push_ups">Pompki</string>
+    <string name="activity_type_pull_ups">Podciąganie się</string>
+    <string name="activity_type_plank">Plank</string>
+    <string name="activity_type_trampoline">Trampolina</string>
+    <string name="activity_type_jazz_dance">Taniec jazzowy</string>
+    <string name="activity_type_latin_dance">Taniec latynoski</string>
+    <string name="activity_type_ballet">Balet</string>
+    <string name="activity_type_other_dance">Inny taniec</string>
+    <string name="activity_type_roller_skating">Jazda na rolkach</string>
+    <string name="activity_type_martial_arts">Sztuki walki</string>
+    <string name="activity_type_tai_chi">Tai chi</string>
+    <string name="activity_type_hula_hooping">Hula hop</string>
+    <string name="activity_type_disc_sports">Sporty z dyskiem</string>
+    <string name="activity_type_darts">Rzutki</string>
+    <string name="activity_type_archery">Łucznictwo</string>
+    <string name="activity_type_horse_riding">Jazda konno</string>
+    <string name="activity_type_kite_flying">Puszczanie latawca</string>
+    <string name="activity_type_stairs">Schody</string>
+    <string name="activity_type_fishing">Wędkarstwo</string>
+    <string name="activity_type_horizontal_bar">Drążek</string>
+    <string name="activity_type_parallel_bar">Poręcze symetryczne</string>
+    <string name="activity_type_flexibility">Rozciąganie</string>
+    <string name="activity_type_kabaddi">Kabaddi</string>
+    <string name="activity_type_karting">Karting</string>
+    <string name="activity_type_billiards">Bilard</string>
+    <string name="activity_type_australian_football">Futbol australijski</string>
+    <string name="activity_type_pickleball">Pickleball</string>
+    <string name="activity_type_sailing">Żeglarstwo</string>
+    <string name="activity_type_ice_hockey">Hokej na lodzie</string>
+    <string name="activity_type_snow_sports">Sporty zimowe</string>
+    <string name="activity_type_skateboarding">Jazda na deskorolce</string>
+    <string name="activity_type_rock_climbing">Wspinaczka skałkowa</string>
+    <string name="activity_type_dodgeball">Dwa ognie</string>
+    <string name="devicetype_sony_wi_sp600n">Sony WI-SP600N</string>
+    <string name="devicetype_honor_magicwatch2">Honor MagicWatch 2</string>
+    <string name="devicetype_nothing_cmf_watch_pro">CMF Watch Pro</string>
+    <string name="activity_type_outdoor_walking">Spacer na zewnątrz</string>
+    <string name="hydration_dnd_summary">Wyłącz przypomnienia o nawadnianiu dla zadanego przedziału czasu</string>
+    <string name="prefs_heartrate_alert_active_high_threshold">Próg alarmowy tętna podczas intensywnej aktywności</string>
+    <string name="activity_type_indoor_running">Bieg wewnątrz</string>
+    <string name="activity_type_mountain_hike">Wędrówka górska</string>
+    <string name="activity_type_fitness_exercises">Trening fitness</string>
+    <string name="activity_type_taekwondo">Taekwondo</string>
+    <string name="activity_type_fencing">Szermierka</string>
+    <string name="activity_type_kendo">Kendo</string>
+    <string name="activity_type_hunting">Polowanie</string>
+    <string name="activity_type_sit_ups">Przysiady</string>
+    <string name="activity_type_softball">Softball</string>
 </resources>
\ No newline at end of file

From a8a94d8a23026587b4928b1426c986f76ed031e2 Mon Sep 17 00:00:00 2001
From: 0que <0que@users.noreply.hosted.weblate.org>
Date: Mon, 29 Jan 2024 16:27:10 +0000
Subject: [PATCH 581/595] Translated using Weblate (Russian)

Currently translated at 97.3% (2528 of 2597 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ru/
---
 app/src/main/res/values-ru/strings.xml | 29 ++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 65ecb8c3e..134e94037 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -2717,4 +2717,33 @@
     <string name="devicetype_miband8pro">Xiaomi Smart Band 8 Pro</string>
     <string name="devicetype_mijia_mho_c303">Mijia MHO-C303</string>
     <string name="devicetype_sony_wi_sp600n">Sony WI-SP600N</string>
+    <string name="heartrate_bpm_155">155 уд/м</string>
+    <string name="heartrate_bpm_165">165 уд/м</string>
+    <string name="prefs_heartrate_alert_active_high_threshold">Порог предупреждения о повышенном сердцебиении</string>
+    <string name="activity_type_fitness_exercises">Фитнес-упражнения</string>
+    <string name="activity_type_physical_training">Физическая подготовка</string>
+    <string name="activity_type_taekwondo">Тхэквондо</string>
+    <string name="activity_type_fencing">Фехтование</string>
+    <string name="activity_type_kendo">Кэндо</string>
+    <string name="activity_type_sit_ups">Подъём туловища</string>
+    <string name="activity_type_pull_ups">Подтягивания</string>
+    <string name="activity_type_plank">Планка</string>
+    <string name="activity_type_javelin">Копье</string>
+    <string name="activity_type_long_jump">Прыжки в длину</string>
+    <string name="activity_type_trampoline">Трамплин</string>
+    <string name="activity_type_ballet">Балет</string>
+    <string name="activity_type_martial_arts">Боевые искусства</string>
+    <string name="activity_type_tai_chi">Тай-чи</string>
+    <string name="heartrate_bpm_175">175 уд/м</string>
+    <string name="heartrate_bpm_185">185 уд/м</string>
+    <string name="heartrate_bpm_195">195 уд/м</string>
+    <string name="heartrate_bpm_205">205 уд/м</string>
+    <string name="hydration_dnd_summary">Выключить напоминания об употреблении воды на временной промежуток</string>
+    <string name="activity_type_indoor_running">Бег в помещении</string>
+    <string name="activity_type_karate">Карате</string>
+    <string name="activity_type_push_ups">Отжимания</string>
+    <string name="activity_type_high_jump">Прыжки в высоту</string>
+    <string name="activity_type_hula_hooping">Обруч</string>
+    <string name="devicetype_nothing_cmf_watch_pro">CMF Watch Pro</string>
+    <string name="activity_type_hunting">Охота</string>
 </resources>
\ No newline at end of file

From 11e2d55cf606261ab6ede072fe60d5cbd660567d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B0=91=E4=B8=BE?= <oshirisu.red@gmail.com>
Date: Mon, 29 Jan 2024 02:14:45 +0000
Subject: [PATCH 582/595] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (2597 of 2597 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/zh_Hans/
---
 app/src/main/res/values-zh-rCN/strings.xml | 87 ++++++++++++++++++++++
 1 file changed, 87 insertions(+)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 4fee4f999..de2c2bdc8 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -2715,4 +2715,91 @@
     <string name="pref_force_connection_type_auto">自动</string>
     <string name="pref_force_connection_type_ble">低功耗蓝牙</string>
     <string name="pref_force_connection_type_bt_classic">经典蓝牙</string>
+    <string name="devicetype_nothing_cmf_watch_pro">CMF Watch Pro</string>
+    <string name="heartrate_bpm_155">155 bpm</string>
+    <string name="heartrate_bpm_165">165 bpm</string>
+    <string name="heartrate_bpm_175">175 bpm</string>
+    <string name="heartrate_bpm_185">185 bpm</string>
+    <string name="heartrate_bpm_195">195 bpm</string>
+    <string name="heartrate_bpm_205">205 bpm</string>
+    <string name="prefs_heartrate_alert_active_high_threshold">强力运动心率警报阈值</string>
+    <string name="activity_type_indoor_running">室内跑步</string>
+    <string name="activity_type_mountain_hike">登山</string>
+    <string name="activity_type_cross_trainer">交叉训练机</string>
+    <string name="activity_type_free_training">自由训练</string>
+    <string name="activity_type_rower">赛艇</string>
+    <string name="activity_type_dynamic_cycle">动感单车</string>
+    <string name="activity_type_stair_stepper">楼梯踏步机</string>
+    <string name="activity_type_fitness_exercises">健身运动</string>
+    <string name="activity_type_crossfit">综合健身</string>
+    <string name="activity_type_functional_training">功能训练</string>
+    <string name="activity_type_physical_training">体力训练</string>
+    <string name="activity_type_taekwondo">跆拳道</string>
+    <string name="activity_type_cross_country_running">越野跑</string>
+    <string name="activity_type_karate">空手道</string>
+    <string name="activity_type_fencing">击剑</string>
+    <string name="activity_type_kendo">剑道</string>
+    <string name="activity_type_horizontal_bar">单杠</string>
+    <string name="activity_type_parallel_bar">双杠</string>
+    <string name="activity_type_cooldown">冷却</string>
+    <string name="activity_type_cross_training">交叉训练</string>
+    <string name="activity_type_sit_ups">仰卧起坐</string>
+    <string name="activity_type_fitness_gaming">健身游戏</string>
+    <string name="activity_type_aerobic_exercise">有氧运动</string>
+    <string name="activity_type_rolling">滚动</string>
+    <string name="activity_type_push_ups">俯卧撑</string>
+    <string name="activity_type_battle_rope">战绳</string>
+    <string name="activity_type_pull_ups">引体向上</string>
+    <string name="activity_type_plank">木板</string>
+    <string name="activity_type_javelin">标枪</string>
+    <string name="activity_type_long_jump">跳远</string>
+    <string name="activity_type_dumbbell">哑铃</string>
+    <string name="activity_type_belly_dance">肚皮舞</string>
+    <string name="activity_type_jazz_dance">爵士舞</string>
+    <string name="activity_type_latin_dance">拉丁舞</string>
+    <string name="activity_type_ballet">芭蕾舞</string>
+    <string name="activity_type_darts">飞镖</string>
+    <string name="activity_type_archery">射箭</string>
+    <string name="activity_type_horse_riding">骑马</string>
+    <string name="activity_type_kite_flying">放风筝</string>
+    <string name="activity_type_swing">摇摆</string>
+    <string name="activity_type_stairs">楼梯</string>
+    <string name="activity_type_fishing">钓鱼</string>
+    <string name="activity_type_hand_cycling">手骑自行车</string>
+    <string name="activity_type_mind_and_body">心灵和身体</string>
+    <string name="activity_type_kabaddi">卡巴迪</string>
+    <string name="activity_type_karting">卡丁车</string>
+    <string name="activity_type_billiards">台球</string>
+    <string name="activity_type_shuttlecock">羽毛球</string>
+    <string name="activity_type_dodgeball">躲避球</string>
+    <string name="activity_type_australian_football">澳大利亚足球</string>
+    <string name="activity_type_pickleball">匹克球</string>
+    <string name="activity_type_lacross">曲棍球</string>
+    <string name="activity_type_shot">射击</string>
+    <string name="activity_type_sailing">帆船运动</string>
+    <string name="activity_type_jet_skiing">滑水</string>
+    <string name="devicetype_sony_wi_sp600n">索尼 WI-SP600N</string>
+    <string name="activity_type_martial_arts">武术</string>
+    <string name="activity_type_smith_machine">史密斯机</string>
+    <string name="activity_type_flexibility">灵活性</string>
+    <string name="activity_type_track_and_field">田径</string>
+    <string name="hydration_dnd_summary">在一段时间内禁用补充水分警告</string>
+    <string name="activity_type_high_jump">跳高</string>
+    <string name="activity_type_other_dance">其他舞蹈</string>
+    <string name="activity_type_tai_chi">太极</string>
+    <string name="activity_type_disc_sports">飞盘运动</string>
+    <string name="activity_type_trampoline">蹦床</string>
+    <string name="activity_type_ice_hockey">冰球</string>
+    <string name="activity_type_roller_skating">轮滑</string>
+    <string name="activity_type_hula_hooping">呼啦圈</string>
+    <string name="activity_type_softball">垒球</string>
+    <string name="activity_type_skating">溜冰</string>
+    <string name="activity_type_curling">冰壶</string>
+    <string name="activity_type_snow_sports">雪上运动</string>
+    <string name="activity_type_hunting">打猎</string>
+    <string name="activity_type_outdoor_walking">户外散步</string>
+    <string name="activity_type_cross_country_skiing">越野滑雪</string>
+    <string name="activity_type_skateboarding">滑板运动</string>
+    <string name="activity_type_rock_climbing">攀岩</string>
+    <string name="devicetype_honor_magicwatch2">荣耀 MagicWatch 2</string>
 </resources>
\ No newline at end of file

From d913c4e082c76b87cb301e6b1ff215e88f853115 Mon Sep 17 00:00:00 2001
From: skdubg <skdubg@autistici.org>
Date: Mon, 29 Jan 2024 21:07:44 +0000
Subject: [PATCH 583/595] Translated using Weblate (German)

Currently translated at 98.8% (2568 of 2598 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/de/
---
 app/src/main/res/values-de/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index ce369f896..787536635 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -2779,4 +2779,5 @@
     <string name="activity_type_cross_country_running">Querfeldeinlauf</string>
     <string name="activity_type_pull_ups">Klimmzüge</string>
     <string name="activity_type_billiards">Billard</string>
+    <string name="devicetype_redmi_watch_2">Redmi Watch 2</string>
 </resources>
\ No newline at end of file

From b7122aeb29cbf52603e373f79826403de66cb5d4 Mon Sep 17 00:00:00 2001
From: skdubg <skdubg@autistici.org>
Date: Tue, 30 Jan 2024 10:17:04 +0000
Subject: [PATCH 584/595] Translated using Weblate (German)

Currently translated at 100.0% (2598 of 2598 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/de/
---
 app/src/main/res/values-de/strings.xml | 30 ++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 787536635..4e9a23834 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -2780,4 +2780,34 @@
     <string name="activity_type_pull_ups">Klimmzüge</string>
     <string name="activity_type_billiards">Billard</string>
     <string name="devicetype_redmi_watch_2">Redmi Watch 2</string>
+    <string name="drag_handle">Ziehgriff</string>
+    <string name="prefs_wena3_item_rich_design">Rich-Design verwenden</string>
+    <string name="pref_summary_prefix_notification_with_app">Präfix des Benachrichtigungstitels mit dem Namen der Quellanwendung</string>
+    <string name="huawei_ignore_wakeup_status_end">Endstatus des Weckens ignorieren</string>
+    <string name="huawei_ignore_wakeup_status_start">Startstatus beim Aufwachen ignorieren</string>
+    <string name="prefs_wena3_smart_alarm_margin_item">Intelligente Alarmspanne</string>
+    <string name="widget_subtype">Widget-Untertyp</string>
+    <string name="widget_screen_x">Widget-Bildschirm %s</string>
+    <string name="button_open_menu_companion">Begleit-App Menü öffnen</string>
+    <string name="activity_type_stair_stepper">Stepper</string>
+    <string name="activity_type_sit_ups">Sit-ups</string>
+    <string name="activity_type_fitness_gaming">Fitness-Spiele</string>
+    <string name="activity_type_flexibility">Beweglichkeit</string>
+    <string name="activity_type_dumbbell">Kurzhantel</string>
+    <string name="activity_type_crossfit">CrossFit</string>
+    <string name="activity_type_horizontal_bar">Horizontale Stange</string>
+    <string name="activity_type_parallel_bar">Barren</string>
+    <string name="activity_type_cross_training">Cross-Training</string>
+    <string name="activity_type_plank">Plank</string>
+    <string name="activity_type_rolling">Rollen</string>
+    <string name="activity_type_battle_rope">Seiltraining</string>
+    <string name="activity_type_smith_machine">Smith-Gerät</string>
+    <string name="activity_type_dynamic_cycle">Dynamischer Zyklus</string>
+    <string name="activity_type_pickleball">Pickleball</string>
+    <string name="activity_type_karting">Kartsport</string>
+    <string name="activity_type_disc_sports">Diskus-Sport</string>
+    <string name="activity_type_kabaddi">Kabaddi</string>
+    <string name="activity_type_australian_football">Australisches Football</string>
+    <string name="activity_type_shot">Shot</string>
+    <string name="prefs_wena3_status_page_title">Statusseite bereitstellen</string>
 </resources>
\ No newline at end of file

From 8ff20514300401cb6562b0b279d7ee6e711f196a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B0=91=E4=B8=BE?= <oshirisu.red@gmail.com>
Date: Tue, 30 Jan 2024 05:02:14 +0000
Subject: [PATCH 585/595] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (2598 of 2598 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/zh_Hans/
---
 app/src/main/res/values-zh-rCN/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index de2c2bdc8..3c4c9400c 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -2802,4 +2802,5 @@
     <string name="activity_type_skateboarding">滑板运动</string>
     <string name="activity_type_rock_climbing">攀岩</string>
     <string name="devicetype_honor_magicwatch2">荣耀 MagicWatch 2</string>
+    <string name="devicetype_redmi_watch_2">红米手表2</string>
 </resources>
\ No newline at end of file

From 4603be0993a6da68f7cdc5670d93d1b8b556675a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81cs=20Zolt=C3=A1n?= <acszoltan111@gmail.com>
Date: Wed, 31 Jan 2024 11:39:02 +0000
Subject: [PATCH 586/595] Translated using Weblate (Hungarian)

Currently translated at 52.6% (1367 of 2598 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/hu/
---
 app/src/main/res/values-hu/strings.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index d63fe32cd..1b46cd46d 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -640,7 +640,7 @@
     <string name="sports_activity_confirm_delete_description">Biztosan törölni szeretne %d aktivitást\?</string>
     <string name="sports_activity_quick_filter_7days">7 nap</string>
     <string name="activity_summaries">Sportaktivitások</string>
-    <string name="pref_title_support_voip_calls">VoIP alkalmazáshívások engedélyezése</string>
+    <string name="pref_title_support_voip_calls">VoIP alkalmazás hívásainak engedélyezése</string>
     <string name="pref_blacklist_calendars">Naptárak feketelistázása</string>
     <string name="pref_title_auto_export_location">Exportálás helye</string>
     <string name="pref_title_auto_export_enabled">Automatikus exportálás engedélyezve</string>
@@ -1404,7 +1404,7 @@
     <string name="menuitem_running">Futás</string>
     <string name="pref_activity_recognize_biking">kerékpározás felismerése</string>
     <string name="wearmode_pebble">Pebble (cipőcsat)</string>
-    <string name="pref_summary_pebble_gatt_clientonly">Ez csak a Pebble 2 számára van, és kísérleti, próbálja ezt, ha kapcsolódási problémái vannak</string>
+    <string name="pref_summary_pebble_gatt_clientonly">Ez csak a Pebble 2 számára készült és kísérleti, próbálja ezt, ha kapcsolódási problémái vannak.</string>
     <string name="pref_activity_recognize_running">futás felismerése</string>
     <string name="about_description_banglejs_nightly">Android társalkalmazás a Bangle.js számára, amely a Gadgetbridge projektre épül, hozzáadott internet-hozzáféréssel.
 \n
@@ -1415,4 +1415,5 @@
     <string name="pref_title_pebble_enable_bgjs">Háttérbeli JS engedélyezése</string>
     <string name="devicetype_sony_wena3">Sony Wena 3</string>
     <string name="sony_surround_mode_outdoor_stage">Kültéri színpad</string>
+    <string name="notif_export_failed_title">Az adatbázis exportálása meghiúsult. Ellenőrizze a beállításait!</string>
 </resources>
\ No newline at end of file

From cd9e22a2a47cdf4e5c7496def3396b7fdc5f9536 Mon Sep 17 00:00:00 2001
From: Ihor Hordiichuk <igor_ck@outlook.com>
Date: Tue, 30 Jan 2024 22:55:04 +0000
Subject: [PATCH 587/595] Translated using Weblate (Ukrainian)

Currently translated at 94.3% (2450 of 2598 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/uk/
---
 app/src/main/res/values-uk/strings.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 9c10d58dd..9b8622d3a 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -2648,4 +2648,13 @@
     <string name="prefs_password_4_digits_0_to_9_summary">Пароль повинен складатися з 4 цифр, і містити лише цифри</string>
     <string name="pref_summary_general_reconnectonlytoconnected">Повторно з\'єднатися лише з під\'єднаними пристроями, замість з\'єднання з усіма пристроями</string>
     <string name="prefs_disconnect_notification_summary">Сповіщення на пристрої після від\'єднання від BT.</string>
+    <string name="heartrate_bpm_155">155 уд/хв</string>
+    <string name="heartrate_bpm_165">165 уд/хв</string>
+    <string name="heartrate_bpm_175">175 уд/хв</string>
+    <string name="heartrate_bpm_185">185 уд/хв</string>
+    <string name="heartrate_bpm_195">195 уд/хв</string>
+    <string name="heartrate_bpm_205">205 уд/хв</string>
+    <string name="pref_force_connection_type_bt_classic">Bluetooth Classic</string>
+    <string name="pref_title_general_reconnectonlytoconnected">Повторно під\'єднуватись лише до пов\'язаних пристроїв</string>
+    <string name="pref_force_connection_type_ble">Bluetooth LE</string>
 </resources>
\ No newline at end of file

From 099a4bf8ef08eac14a6420f9f7985511586319b7 Mon Sep 17 00:00:00 2001
From: 0que <0que@users.noreply.hosted.weblate.org>
Date: Thu, 1 Feb 2024 08:53:50 +0000
Subject: [PATCH 588/595] Translated using Weblate (Russian)

Currently translated at 97.5% (2535 of 2598 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ru/
---
 app/src/main/res/values-ru/strings.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 134e94037..7a3d6ab8d 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -2746,4 +2746,11 @@
     <string name="activity_type_hula_hooping">Обруч</string>
     <string name="devicetype_nothing_cmf_watch_pro">CMF Watch Pro</string>
     <string name="activity_type_hunting">Охота</string>
+    <string name="activity_type_fishing">Рыбалка</string>
+    <string name="devicetype_redmi_watch_2">Redmi Watch 2</string>
+    <string name="activity_type_karting">Картинг</string>
+    <string name="activity_type_billiards">Бильярд</string>
+    <string name="activity_type_dodgeball">Вышибалы</string>
+    <string name="activity_type_softball">Софтбол</string>
+    <string name="activity_type_pickleball">Пиклбол</string>
 </resources>
\ No newline at end of file

From 43c3d8576204b9a116d482231c71c3a494282cb3 Mon Sep 17 00:00:00 2001
From: Ghost of Sparta <makesocialfoss32@keemail.me>
Date: Sat, 3 Feb 2024 19:27:32 +0000
Subject: [PATCH 589/595] Translated using Weblate (Hungarian)

Currently translated at 53.5% (1390 of 2598 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/hu/
---
 app/src/main/res/values-hu/strings.xml | 135 +++++++++++++++++++++++++
 1 file changed, 135 insertions(+)

diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 1b46cd46d..7ec96a4ba 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -1416,4 +1416,139 @@
     <string name="devicetype_sony_wena3">Sony Wena 3</string>
     <string name="sony_surround_mode_outdoor_stage">Kültéri színpad</string>
     <string name="notif_export_failed_title">Az adatbázis exportálása meghiúsult. Ellenőrizze a beállításait!</string>
+    <string name="fw_upgrade_notice_amazfitcor2">Ön telepíteni kívánja a %s firmware-t az Amazfit Cor 2 készülékére.
+\n
+\nKérjük, győződjön meg róla, hogy a .fw fájlt, majd ezt követően a .res fájlt is telepíti. A karkötő a .fw fájl telepítése után újraindul.
+\n
+\nMegjegyzés: Nem kell telepítenie a .res fájlt, ha az pontosan megegyezik a korábban telepítettel.
+\n
+\nFOLYTATÁS CSAK SAJÁT FELELŐSSÉGRE!
+\n
+\nTELJESEN TESZTELETLEN, VALÓSZÍNŰLEG A BEATS_W FIRMWARE-t kell feltöltenie, HA A KÉSZÜLÉK NEVE \"Amazfit Band 2\"</string>
+    <string name="fw_upgrade_notice_amazfitgts">Ön telepíteni kívánja a %s firmware-t az Amazfit GTS készülékére.
+\n
+\nKérjük, győződjön meg róla, hogy telepíti a .fw fájlt, a .res fájlt, végül pedig a .gps fájlt. Az óra a .fw fájl telepítése után újraindul.
+\n
+\nMegjegyzés: Nem kell telepítenie a .res és .gps fájlokat, ha azok pontosan megegyeznek a korábban telepítettel.
+\n
+\nFOLYTATÁS CSAK SAJÁT FELELŐSSÉGRE!</string>
+    <string name="fw_upgrade_notice_amazfitvergel">Ön telepíteni kívánja a %s firmware-t az Amazfit Verge Lite készülékére.
+\n
+\nKérjük, győződjön meg róla, hogy telepíti a .fw fájlt, a .res fájlt, végül pedig a .gps fájlt. Az óra a .fw fájl telepítése után újraindul.
+\n
+\nMegjegyzés: Nem kell telepítenie a .res és .gps fájlokat, ha azok pontosan megegyeznek a korábban telepítettel.
+\n
+\nFOLYTATÁS CSAK SAJÁT FELELŐSSÉGRE!</string>
+    <string name="fw_upgrade_notice_amazfit_gts4">Ön telepíteni kívánja a %s firmware-t az Amazfit GTS 4 készülékére.
+\n
+\nA .zip fájl telepítése után a karkötője újraindul.
+\n
+\nFOLYTATÁS CSAK SAJÁT FELELŐSSÉGRE!</string>
+    <string name="fw_upgrade_notice_miband5">Ön telepíteni kívánja a %s firmware-t az Mi Band 5 készülékére.
+\n
+\nKérjük, győződjön meg róla, hogy először a .fw fájlt telepítse, utána pedig a .res fájlt. A karkötő a .fw fájl telepítése után újraindul.
+\n
+\nMegjegyzés: Nem kell telepítenie a .res és .gps fájlokat, ha azok pontosan megegyeznek a korábban telepítettel.
+\n
+\nFOLYTATÁS CSAK SAJÁT FELELŐSSÉGRE!</string>
+    <string name="fw_upgrade_notice_miband6">Ön telepíteni kívánja a %s firmware-t az Mi Band 6 készülékére.
+\n
+\nKérjük, győződjön meg róla, hogy először a .fw fájlt telepítse, utána pedig a .res fájlt. A karkötő a .fw fájl telepítése után újraindul.
+\n
+\nMegjegyzés: Nem kell telepítenie a .res és .gps fájlokat, ha azok pontosan megegyeznek a korábban telepítettel.
+\n
+\nFOLYTATÁS CSAK SAJÁT FELELŐSSÉGRE!</string>
+    <string name="fw_upgrade_notice_amazfit_gts3">Ön telepíteni kívánja a %s firmware-t az Amazfit GTS 3 készülékére.
+\n
+\nA .zip fájl telepítése után a karkötője újraindul.
+\n
+\nFOLYTATÁS CSAK SAJÁT FELELŐSSÉGRE!</string>
+    <string name="fw_upgrade_notice_amazfit_gtr3_pro">Ön telepíteni kívánja a %s firmware-t az Amazfit GTR 3 PRO készülékére.
+\n
+\nA .zip fájl telepítése után a karkötője újraindul.
+\n
+\nFOLYTATÁS CSAK SAJÁT FELELŐSSÉGRE!</string>
+    <string name="fw_upgrade_notice_amazfit_gtr4">Ön telepíteni kívánja a %s firmware-t az Amazfit GTR 4 készülékére.
+\n
+\nA .zip fájl telepítése után a karkötője újraindul.
+\n
+\nFOLYTATÁS CSAK SAJÁT FELELŐSSÉGRE!</string>
+    <string name="fw_upgrade_notice_amazfit_trex2">Ön telepíteni kívánja a %s firmware-t az Amazfit T-Rex 2 készülékére.
+\n
+\nA .zip fájl telepítése után a karkötője újraindul.
+\n
+\nFOLYTATÁS CSAK SAJÁT FELELŐSSÉGRE!</string>
+    <string name="fw_upgrade_notice_amazfitbip3pro">Ön telepíteni kívánja a %s firmware-t az Amazfit Bip 3 Pro készülékére.
+\n
+\nKérjük, győződjön meg róla, hogy a .fw fájlt, majd ezt követően a .res fájlt is telepíti. Az órája az .fw fájl telepítése után újraindul.
+\n
+\nMegjegyzés: Nem kell telepítenie a .res fájlt, ha az pontosan megegyezik a korábban telepítettel.
+\n
+\nFOLYTATÁS CSAK SAJÁT FELELŐSSÉGRE!</string>
+    <string name="fw_upgrade_notice_amazfitx">Ön telepíteni kívánja a %s firmware-t az Amazfit X készülékére.
+\n
+\nKérjük győződjön meg róla, hogy először telepítse a .fw fájlt, majd ezt követően a .res fájlt. A .fw fájl telepítése után a karkötője újraindul.
+\n
+\nMegjegyzés: Nem kell telepítenie a .res fájlt, ha az pontosan ugyanaz, mint a korábban telepített.
+\n
+\nFOLYTATÁS CSAK SAJÁT FELELŐSSÉGRE!</string>
+    <string name="gps_galileo">GPS + GALILEO</string>
+    <string name="fw_upgrade_notice_miband3">Ön telepíteni kívánja a %s firmware-t az Mi Band 3 készülékére.
+\n
+\nKérjük, győződjön meg róla, hogy először a .fw fájlt telepítse, utána pedig a .res fájlt. A karkötő a .fw fájl telepítése után újraindul.
+\n
+\nMegjegyzés: Nem kell telepítenie a .res és .gps fájlokat, ha azok pontosan megegyeznek a korábban telepítettel.
+\n
+\nFOLYTATÁS CSAK SAJÁT FELELŐSSÉGRE!</string>
+    <string name="fw_upgrade_notice_amazfitgtr">Ön telepíteni kívánja a %s firmware-t az Amazfit GTR készülékére.
+\n
+\nKérjük, győződjön meg róla, hogy telepíti a .fw fájlt, a .res fájlt, végül pedig a .gps fájlt. Az óra a .fw fájl telepítése után újraindul.
+\n
+\nMegjegyzés: Nem kell telepítenie a .res és .gps fájlokat, ha azok pontosan megegyeznek a korábban telepítettel.
+\n
+\nFOLYTATÁS CSAK SAJÁT FELELŐSSÉGRE!</string>
+    <string name="fw_upgrade_notice_amazfit_trex">Ön telepíteni kívánja a %s firmware-t az Amazfit T-Rex készülékére.
+\n
+\nKérjük, győződjön meg róla, hogy telepíti a .fw fájlt, a .res fájlt, végül pedig a .gps fájlt. Az óra a .fw fájl telepítése után újraindul.
+\n
+\nMegjegyzés: Nem kell telepítenie a .res és .gps fájlokat, ha azok pontosan megegyeznek a korábban telepítettel.
+\n
+\nFOLYTATÁS CSAK SAJÁT FELELŐSSÉGRE!</string>
+    <string name="fw_upgrade_notice_miband4">Ön telepíteni kívánja a %s firmware-t az Mi Band 4 készülékére.
+\n
+\nKérjük, győződjön meg róla, hogy először a .fw fájlt telepítse, utána pedig a .res fájlt. A karkötő a .fw fájl telepítése után újraindul.
+\n
+\nMegjegyzés: Nem kell telepítenie a .res és .gps fájlokat, ha azok pontosan megegyeznek a korábban telepítettel.
+\n
+\nFOLYTATÁS CSAK SAJÁT FELELŐSSÉGRE!</string>
+    <string name="fw_upgrade_notice_miband7">Ön telepíteni kívánja a %s firmware-t a Xiaomi Smart Band 7 készülékére.
+\n
+\nA .zip fájl telepítése után a karkötője újraindul.
+\n
+\nFOLYTATÁS CSAK SAJÁT FELELŐSSÉGRE!</string>
+    <string name="fw_upgrade_notice_amazfit_gts4_mini">Ön telepíteni kívánja a %s firmware-t az Amazfit GTS 4 Mini készülékére.
+\n
+\nA .zip fájl telepítése után a karkötője újraindul.
+\n
+\nFOLYTATÁS CSAK SAJÁT FELELŐSSÉGRE!</string>
+    <string name="fw_upgrade_notice_amazfit_gtr3">Ön telepíteni kívánja a %s firmware-t az Amazfit GTR 3 készülékére.
+\n
+\nA .zip fájl telepítése után a karkötője újraindul.
+\n
+\nFOLYTATÁS CSAK SAJÁT FELELŐSSÉGRE!</string>
+    <string name="fw_upgrade_notice_amazfit_band7">Ön telepíteni kívánja a %s firmware-t az Amazfit Band 7 készülékére.
+\n
+\nA .zip fájl telepítése után a karkötője újraindul.
+\n
+\nFOLYTATÁS CSAK SAJÁT FELELŐSSÉGRE!</string>
+    <string name="fw_upgrade_notice_amazfit_cheetah_pro">Ön telepíteni kívánja a %s firmware-t az Amazfit Cheetah Pro készülékére.
+\n
+\nA .zip fájl telepítése után a karkötője újraindul.
+\n
+\nFOLYTATÁS CSAK SAJÁT FELELŐSSÉGRE!</string>
+    <string name="fw_upgrade_notice_zepp_os">A %s firmware-t készül telepíteni a %s készülékre.
+\n
+\nA .zip fájl telepítése után az órája újraindul.
+\n
+\nFOLYTATÁS CSAK SAJÁT FELELŐSSÉGRE!</string>
 </resources>
\ No newline at end of file

From 0b0b3876a55f11d8924e2198629341fc185db05b Mon Sep 17 00:00:00 2001
From: Rex_sa <rex.sa@pm.me>
Date: Sun, 4 Feb 2024 15:09:25 +0000
Subject: [PATCH 590/595] Translated using Weblate (Arabic)

Currently translated at 100.0% (2598 of 2598 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ar/
---
 app/src/main/res/values-ar/strings.xml | 87 ++++++++++++++++++++++++++
 1 file changed, 87 insertions(+)

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 1909e695f..6d539225d 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -2709,4 +2709,91 @@
     <string name="activity_info">معلومات النشاط</string>
     <string name="pref_force_connection_type_auto">تلقائي</string>
     <string name="devicetype_sony_wi_sp600n">سوني WI-SP600N</string>
+    <string name="prefs_heartrate_alert_active_high_threshold">عتبة تنبيه معدل ضربات القلب عالية النشاط</string>
+    <string name="hydration_dnd_summary">قم بتعطيل تحذيرات الترطيب لفترة زمنية</string>
+    <string name="activity_type_indoor_running">الركض في الداخل</string>
+    <string name="activity_type_cross_trainer">مدرب متقاطع</string>
+    <string name="activity_type_stair_stepper">الدرج السائر</string>
+    <string name="activity_type_functional_training">التدريب الوظيفي</string>
+    <string name="activity_type_fitness_exercises">التمارين الرياضية</string>
+    <string name="activity_type_crossfit">لياقة بدنية</string>
+    <string name="activity_type_physical_training">التدريب البدني</string>
+    <string name="activity_type_horizontal_bar">عارضة أفقية</string>
+    <string name="activity_type_taekwondo">تيكواندو</string>
+    <string name="activity_type_cross_country_running">الجري عبر البلاد</string>
+    <string name="activity_type_parallel_bar">قضبان متوازية</string>
+    <string name="activity_type_karate">كاريت</string>
+    <string name="activity_type_cooldown">فترة التهدئة</string>
+    <string name="activity_type_cross_training">التدريب المتقاطع</string>
+    <string name="activity_type_sit_ups">الجلوس</string>
+    <string name="activity_type_fencing">التنقيب</string>
+    <string name="activity_type_fitness_gaming">ألعاب اللياقة البدنية</string>
+    <string name="activity_type_rolling">التدحرج</string>
+    <string name="activity_type_kendo">كيندو</string>
+    <string name="activity_type_aerobic_exercise">التمارين الهوائية</string>
+    <string name="activity_type_snow_sports">رياضة الثلج</string>
+    <string name="devicetype_honor_magicwatch2">ساعة ماجيك اونر 2</string>
+    <string name="devicetype_nothing_cmf_watch_pro">ساعة سي ام اف برو</string>
+    <string name="devicetype_redmi_watch_2">ساعة ريدمي 2</string>
+    <string name="heartrate_bpm_155">155 نبضة في الدقيقة</string>
+    <string name="heartrate_bpm_165">165 نبضة في الدقيقة</string>
+    <string name="heartrate_bpm_175">175 نبضة في الدقيقة</string>
+    <string name="heartrate_bpm_185">185 نبضة في الدقيقة</string>
+    <string name="heartrate_bpm_195">195 نبضة في الدقيقة</string>
+    <string name="heartrate_bpm_205">205 نبضة في الدقيقة</string>
+    <string name="activity_type_mountain_hike">نزهة جبلية</string>
+    <string name="activity_type_free_training">التدريب الحر</string>
+    <string name="activity_type_rower">‬المجدف</string>
+    <string name="activity_type_dynamic_cycle">الدورة الديناميكية</string>
+    <string name="activity_type_flexibility">المرونة</string>
+    <string name="activity_type_track_and_field">المسار والميدان</string>
+    <string name="activity_type_push_ups">تمرين الضغط</string>
+    <string name="activity_type_battle_rope">حبل قتال</string>
+    <string name="activity_type_smith_machine">آلة سميث</string>
+    <string name="activity_type_plank">اللوح</string>
+    <string name="activity_type_javelin">الرمح</string>
+    <string name="activity_type_long_jump">قفزة طويلة</string>
+    <string name="activity_type_high_jump">قفزة عالية</string>
+    <string name="activity_type_trampoline">الترامبولين</string>
+    <string name="activity_type_dumbbell">الدمبل</string>
+    <string name="activity_type_belly_dance">الرقص الشرقي</string>
+    <string name="activity_type_jazz_dance">رقصة الجاز</string>
+    <string name="activity_type_latin_dance">الرقص اللاتيني</string>
+    <string name="activity_type_ballet">باليه</string>
+    <string name="activity_type_other_dance">رقصة أخرى</string>
+    <string name="activity_type_roller_skating">تزلج</string>
+    <string name="activity_type_martial_arts">الفنون القتالية</string>
+    <string name="activity_type_tai_chi">تاي شي</string>
+    <string name="activity_type_hula_hooping">حولا هوب</string>
+    <string name="activity_type_disc_sports">الألعاب الرياضية</string>
+    <string name="activity_type_pull_ups">سحب النفس للأعلى</string>
+    <string name="activity_type_darts">السهام الصغيرة</string>
+    <string name="activity_type_archery">القوس والسهم</string>
+    <string name="activity_type_horse_riding">ركوب الحصان</string>
+    <string name="activity_type_kite_flying">الطائرة الورقية</string>
+    <string name="activity_type_swing">التأرجح</string>
+    <string name="activity_type_stairs">سلالم</string>
+    <string name="activity_type_fishing">صيد السمك</string>
+    <string name="activity_type_hand_cycling">الدراجة اليدوية</string>
+    <string name="activity_type_mind_and_body">العقل والجسم</string>
+    <string name="activity_type_kabaddi">كابادي</string>
+    <string name="activity_type_karting">الكارتينج</string>
+    <string name="activity_type_billiards">بلياردو</string>
+    <string name="activity_type_shuttlecock">مكوك</string>
+    <string name="activity_type_softball">كرة خفيفة</string>
+    <string name="activity_type_dodgeball">كرة تجاوز</string>
+    <string name="activity_type_australian_football">كرة القدم الأسترالية</string>
+    <string name="activity_type_pickleball">بيكبول</string>
+    <string name="activity_type_lacross">لاكروس</string>
+    <string name="activity_type_shot">طلقة</string>
+    <string name="activity_type_sailing">الإبحار</string>
+    <string name="activity_type_jet_skiing">تزلج طائرة</string>
+    <string name="activity_type_skating">التزلج</string>
+    <string name="activity_type_ice_hockey">الهوكي الجليدي</string>
+    <string name="activity_type_curling">الشباك</string>
+    <string name="activity_type_cross_country_skiing">تزلج عبر البلد</string>
+    <string name="activity_type_skateboarding">ركوب التزلج</string>
+    <string name="activity_type_rock_climbing">تسلق الصخور</string>
+    <string name="activity_type_hunting">الصيد</string>
+    <string name="activity_type_outdoor_walking">المشي في الهواء الطلق</string>
 </resources>
\ No newline at end of file

From a8e7e3fb10bcd736408d26c0dbff79484265061a Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Mon, 5 Feb 2024 14:08:47 +0000
Subject: [PATCH 591/595] Translated using Weblate (Spanish)

Currently translated at 96.7% (2514 of 2598 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/es/
---
 app/src/main/res/values-es/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 57e298dd6..8661d7963 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -2720,4 +2720,5 @@
     <string name="devicetype_sony_wi_sp600n">Sony WI-SP600N</string>
     <string name="heartrate_bpm_155">155 bpm</string>
     <string name="heartrate_bpm_165">165 bpm</string>
+    <string name="heartrate_bpm_175">175 lpm</string>
 </resources>
\ No newline at end of file

From 151cc6120a1165a29cb0dfdd1b9f5ba3652a6c43 Mon Sep 17 00:00:00 2001
From: skdubg <skdubg@autistici.org>
Date: Sat, 10 Feb 2024 10:46:07 +0000
Subject: [PATCH 592/595] Translated using Weblate (German)

Currently translated at 100.0% (2598 of 2598 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/de/
---
 app/src/main/res/values-de/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 4e9a23834..ef86812c4 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1889,7 +1889,7 @@
     <string name="heartrate_bpm_40">40 BPM</string>
     <string name="heartrate_bpm_45">45 BPM</string>
     <string name="prefs_relaxation_reminder_title">Erinnerung zur Entspannung</string>
-    <string name="prefs_spo2_alert_threshold">SPO2-Alarmschwelle</string>
+    <string name="prefs_spo2_alert_threshold">SpO2-Alarmschwelle</string>
     <string name="seconds_7">7 Sekunden</string>
     <string name="seconds_8">8 Sekunden</string>
     <string name="seconds_9">9 Sekunden</string>

From 88dacc2d3b687209520735a5b46622a9bb21b5b3 Mon Sep 17 00:00:00 2001
From: arjan-s <a_gitlab@anymore.nl>
Date: Sun, 11 Feb 2024 18:59:11 +0000
Subject: [PATCH 593/595] Translated using Weblate (Dutch)

Currently translated at 96.8% (2516 of 2598 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/nl/
---
 app/src/main/res/values-nl/strings.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index e851d2326..457661fac 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -2715,4 +2715,10 @@
     <string name="pref_force_connection_type_ble">Bluetooth LE</string>
     <string name="pref_force_connection_type_bt_classic">Bluetooth (klassiek)</string>
     <string name="activity_info">Activiteitsinformatie</string>
+    <string name="heartrate_bpm_155">155 bpm</string>
+    <string name="heartrate_bpm_165">165 bpm</string>
+    <string name="heartrate_bpm_175">175 bpm</string>
+    <string name="heartrate_bpm_185">185 bpm</string>
+    <string name="heartrate_bpm_195">195 bpm</string>
+    <string name="heartrate_bpm_205">205 bpm</string>
 </resources>
\ No newline at end of file

From a977436200e161df691bc9f1b7216e190e3f3598 Mon Sep 17 00:00:00 2001
From: arjan-s <a_gitlab@anymore.nl>
Date: Mon, 12 Feb 2024 10:39:18 +0000
Subject: [PATCH 594/595] Translated using Weblate (Dutch)

Currently translated at 100.0% (2598 of 2598 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/nl/
---
 app/src/main/res/values-nl/strings.xml | 82 ++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)

diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 457661fac..ebc35458d 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -2721,4 +2721,86 @@
     <string name="heartrate_bpm_185">185 bpm</string>
     <string name="heartrate_bpm_195">195 bpm</string>
     <string name="heartrate_bpm_205">205 bpm</string>
+    <string name="hydration_dnd_summary">Schakel drinkherinneringen tijdelijk uit</string>
+    <string name="activity_type_indoor_running">Binnen hardlopen</string>
+    <string name="activity_type_mountain_hike">Bergwandelen</string>
+    <string name="activity_type_cross_country_running">Veldlopen</string>
+    <string name="activity_type_karate">Karate</string>
+    <string name="activity_type_fitness_exercises">Fitnessoefeningen</string>
+    <string name="activity_type_crossfit">Crossfit</string>
+    <string name="activity_type_jazz_dance">Jazz-dansen</string>
+    <string name="activity_type_latin_dance">Latin-dansen</string>
+    <string name="activity_type_jet_skiing">Jetski</string>
+    <string name="activity_type_skating">Skaten</string>
+    <string name="activity_type_ballet">Ballet</string>
+    <string name="activity_type_other_dance">Overige dansen</string>
+    <string name="activity_type_snow_sports">Sneeuwsporten</string>
+    <string name="devicetype_redmi_watch_2">Redmi Watch 2</string>
+    <string name="devicetype_nothing_cmf_watch_pro">CMF Watch Pro</string>
+    <string name="prefs_heartrate_alert_active_high_threshold">Meldingsdrempel maximale hartslag</string>
+    <string name="activity_type_cross_trainer">Crosstrainer</string>
+    <string name="activity_type_free_training">Vrije training</string>
+    <string name="activity_type_rower">Roeimachine</string>
+    <string name="activity_type_dynamic_cycle">Dynamisch fietsen</string>
+    <string name="activity_type_stair_stepper">Traploop-apparaat</string>
+    <string name="activity_type_functional_training">Functionele training</string>
+    <string name="activity_type_physical_training">Fysieke training</string>
+    <string name="activity_type_taekwondo">Taekwondo</string>
+    <string name="activity_type_fencing">Schermen</string>
+    <string name="activity_type_kendo">Kendo</string>
+    <string name="activity_type_horizontal_bar">Rekstok</string>
+    <string name="activity_type_parallel_bar">Brug met gelijke leggers</string>
+    <string name="activity_type_cooldown">Afkoelen</string>
+    <string name="activity_type_cross_training">Crosstraining</string>
+    <string name="activity_type_sit_ups">Sit-ups</string>
+    <string name="activity_type_fitness_gaming">Fitness-gamen</string>
+    <string name="activity_type_aerobic_exercise">Aerobics</string>
+    <string name="activity_type_rolling">Rollen</string>
+    <string name="activity_type_flexibility">Rekken</string>
+    <string name="activity_type_track_and_field">Atletiek</string>
+    <string name="activity_type_push_ups">Push-ups</string>
+    <string name="activity_type_battle_rope">Battle rope</string>
+    <string name="activity_type_smith_machine">Smith machine</string>
+    <string name="activity_type_pull_ups">Pull-ups</string>
+    <string name="activity_type_plank">Planken</string>
+    <string name="activity_type_javelin">Speerwerpen</string>
+    <string name="activity_type_long_jump">Verspringen</string>
+    <string name="activity_type_high_jump">Hoogspringen</string>
+    <string name="activity_type_trampoline">Trampoline</string>
+    <string name="activity_type_dumbbell">Dumbbell</string>
+    <string name="activity_type_belly_dance">Buikdansen</string>
+    <string name="activity_type_roller_skating">Rolschaatsen</string>
+    <string name="activity_type_martial_arts">Vechtsporten</string>
+    <string name="activity_type_tai_chi">Tai chi</string>
+    <string name="activity_type_hula_hooping">Hoelahoep</string>
+    <string name="activity_type_disc_sports">Discuswerpen</string>
+    <string name="activity_type_darts">Darten</string>
+    <string name="activity_type_archery">Boogschieten</string>
+    <string name="activity_type_horse_riding">Paardrijden</string>
+    <string name="activity_type_kite_flying">Kiten</string>
+    <string name="activity_type_swing">Schommelen</string>
+    <string name="activity_type_stairs">Traplopen</string>
+    <string name="activity_type_fishing">Vissen</string>
+    <string name="activity_type_hand_cycling">Handfietsen</string>
+    <string name="activity_type_mind_and_body">Geest en lichaam</string>
+    <string name="activity_type_kabaddi">Kabaddi</string>
+    <string name="activity_type_karting">Karten</string>
+    <string name="activity_type_billiards">Biljard</string>
+    <string name="activity_type_shuttlecock">Badminton</string>
+    <string name="activity_type_softball">Softbal</string>
+    <string name="activity_type_dodgeball">Trefbal</string>
+    <string name="activity_type_australian_football">Australisch football</string>
+    <string name="activity_type_pickleball">Pickleball</string>
+    <string name="activity_type_lacross">Lacrosse</string>
+    <string name="activity_type_shot">Shot</string>
+    <string name="activity_type_sailing">Zeilen</string>
+    <string name="activity_type_ice_hockey">IJshockey</string>
+    <string name="activity_type_curling">Curling</string>
+    <string name="activity_type_cross_country_skiing">Langlaufen</string>
+    <string name="activity_type_skateboarding">Skateboarden</string>
+    <string name="activity_type_rock_climbing">Rotsklimmen</string>
+    <string name="activity_type_hunting">Jagen</string>
+    <string name="activity_type_outdoor_walking">Buiten wandelen</string>
+    <string name="devicetype_sony_wi_sp600n">Sony WI-SP600N</string>
+    <string name="devicetype_honor_magicwatch2">Honor MagicWatch 2</string>
 </resources>
\ No newline at end of file

From 8b9462f5219c88bb51df28e68d6392cd77f9b04a Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Mon, 12 Feb 2024 18:31:48 +0100
Subject: [PATCH 595/595] fix tests

---
 .../devices/huawei/HuaweiPacket.java           |  2 +-
 .../devices/huami/zeppos/ZeppOsSupport.java    |  4 ++--
 .../devices/huawei/TestHuaweiTLV.java          | 18 +++++++++---------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiPacket.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiPacket.java
index b7c0ba3c1..624a2b739 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiPacket.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiPacket.java
@@ -245,7 +245,7 @@ public class HuaweiPacket {
     }
 
     public boolean attemptDecrypt() throws ParseException {
-        if (paramsProvider.getSecretKey() == null)
+        if (paramsProvider == null || paramsProvider.getSecretKey() == null)
             return false;
         if (this.tlv == null)
             return false;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsSupport.java
index 6a5de07d9..8e0366eb0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsSupport.java
@@ -145,7 +145,7 @@ import nodomain.freeyourgadget.gadgetbridge.util.GBPrefs;
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 import nodomain.freeyourgadget.gadgetbridge.util.SilentMode;
 
-public final class ZeppOsSupport extends HuamiSupport implements ZeppOsFileTransferService.Callback {
+public 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
@@ -1014,7 +1014,7 @@ public final class ZeppOsSupport extends HuamiSupport implements ZeppOsFileTrans
 
     @Override
     @Deprecated
-    public final HuamiFWHelper createFWHelper(final Uri uri, final Context context) throws IOException {
+    public HuamiFWHelper createFWHelper(final Uri uri, final Context context) throws IOException {
         throw new UnsupportedOperationException("This function should not be used for Zepp OS devices");
     }
 
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/TestHuaweiTLV.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/TestHuaweiTLV.java
index 62f9ab3dd..02fcdb665 100644
--- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/TestHuaweiTLV.java
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/TestHuaweiTLV.java
@@ -288,7 +288,7 @@ public class TestHuaweiTLV {
     }
 
     @Test
-    public void testGetBytesEmpty() {
+    public void testGetBytesEmpty() throws HuaweiPacket.MissingTagException {
         int tag = 0x01;
         ArrayList<HuaweiTLV.TLV> input = new ArrayList<>();
         input.add(new HuaweiTLV.TLV((byte) 0x01, new byte[] {}));
@@ -301,7 +301,7 @@ public class TestHuaweiTLV {
     }
 
     @Test
-    public void testGetBytes() {
+    public void testGetBytes() throws HuaweiPacket.MissingTagException {
         int tag = 0x01;
         ArrayList<HuaweiTLV.TLV> input = new ArrayList<>();
         input.add(new HuaweiTLV.TLV((byte) 0x01, new byte[] {0x01, 0x02, 0x03}));
@@ -314,7 +314,7 @@ public class TestHuaweiTLV {
     }
 
     @Test
-    public void testGetByte() {
+    public void testGetByte() throws HuaweiPacket.MissingTagException {
         int tag = 0x01;
         ArrayList<HuaweiTLV.TLV> input = new ArrayList<>();
         input.add(new HuaweiTLV.TLV((byte) 0x01, new byte[] {0x04}));
@@ -327,7 +327,7 @@ public class TestHuaweiTLV {
     }
 
     @Test
-    public void testGetBooleans() {
+    public void testGetBooleans() throws HuaweiPacket.MissingTagException {
         ArrayList<HuaweiTLV.TLV> input = new ArrayList<>();
         input.add(new HuaweiTLV.TLV((byte) 0x01, new byte[] {0x01}));
         input.add(new HuaweiTLV.TLV((byte) 0x02, new byte[] {0x00}));
@@ -340,7 +340,7 @@ public class TestHuaweiTLV {
     }
 
     @Test
-    public void testGetInteger() {
+    public void testGetInteger() throws HuaweiPacket.MissingTagException {
         int tag = 0x01;
         ArrayList<HuaweiTLV.TLV> input = new ArrayList<>();
         input.add(new HuaweiTLV.TLV((byte) 0x01, new byte[] {(byte) 0xDE, (byte) 0xAD, (byte) 0xBE, (byte) 0xEF}));
@@ -353,7 +353,7 @@ public class TestHuaweiTLV {
     }
 
     @Test
-    public void testGetShort() {
+    public void testGetShort() throws HuaweiPacket.MissingTagException {
         int tag = 0x01;
         ArrayList<HuaweiTLV.TLV> input = new ArrayList<>();
         input.add(new HuaweiTLV.TLV((byte) 0x01, new byte[] {(byte) 0xCA, (byte) 0xFE}));
@@ -366,7 +366,7 @@ public class TestHuaweiTLV {
     }
 
     @Test
-    public void testGetString() {
+    public void testGetString() throws HuaweiPacket.MissingTagException {
         int tag = 0x01;
         ArrayList<HuaweiTLV.TLV> input = new ArrayList<>();
         input.add(new HuaweiTLV.TLV((byte) 0x01, new byte[] {0x48, 0x65, 0x6C, 0x6C, 0x6F, 0x20, 0x77, 0x6F, 0x72, 0x6C, 0x64, 0x21}));
@@ -379,7 +379,7 @@ public class TestHuaweiTLV {
     }
 
     @Test
-    public void testGetObject() {
+    public void testGetObject() throws HuaweiPacket.MissingTagException {
         int tag = 0x01;
         ArrayList<HuaweiTLV.TLV> input = new ArrayList<>();
         input.add(new HuaweiTLV.TLV((byte) 0x01, new byte[] {0x01, 0x00}));
@@ -512,7 +512,7 @@ public class TestHuaweiTLV {
      * Following test also depends on the HuaweiCrypto class functioning correctly
      */
     @Test
-    public void testDecrypt() throws HuaweiCrypto.CryptoException {
+    public void testDecrypt() throws HuaweiCrypto.CryptoException, HuaweiPacket.MissingTagException {
         byte[] ciphertext = {(byte) 0x0E, (byte) 0xA0, (byte) 0x01, (byte) 0xBB, (byte) 0x1E, (byte) 0xDA, (byte) 0xCB, (byte) 0x09, (byte) 0x83, (byte) 0x20, (byte) 0x40, (byte) 0x7D, (byte) 0x97, (byte) 0x1B, (byte) 0xF6, (byte) 0xD0};
         ArrayList<HuaweiTLV.TLV> input = new ArrayList<>();
         input.add(new HuaweiTLV.TLV((byte) 0x7C, new byte[] {0x01}));