Merge branch 'master' of codeberg.org:Freeyourgadget/Gadgetbridge

CHANGELOG.md

@@ -1,5 +1,8 @@
 ### Changelog
 
+### NEXT
+* Amazfit Bip U/Pro/Band 5: enable extended HR/stress monitoring setting
+
 ### 0.67.0
 * Initial Support for Sony WF-1000XM3
 * Initial Support for Galaxy Buds Pro

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitband5/AmazfitBand5Coordinator.java

@@ -101,7 +101,7 @@ public class AmazfitBand5Coordinator extends HuamiCoordinator {
                 R.xml.devicesettings_amazfitband5,
                 R.xml.devicesettings_vibrationpatterns,
                 R.xml.devicesettings_wearlocation,
-                R.xml.devicesettings_heartrate_sleep,
+                R.xml.devicesettings_heartrate_sleep_alert_activity_stress,
                 R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_custom_emoji_font,
                 R.xml.devicesettings_timeformat,

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipu/AmazfitBipUCoordinator.java

@@ -112,7 +112,7 @@ public class AmazfitBipUCoordinator extends HuamiCoordinator {
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_world_clocks,
                 R.xml.devicesettings_wearlocation,
-                R.xml.devicesettings_heartrate_sleep,
+                R.xml.devicesettings_heartrate_sleep_alert_activity_stress,
                 R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_custom_emoji_font,
                 R.xml.devicesettings_liftwrist_display_sensitivity,

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipupro/AmazfitBipUProCoordinator.java

@@ -111,7 +111,7 @@ public class AmazfitBipUProCoordinator extends HuamiCoordinator {
                 R.xml.devicesettings_timeformat,
                 R.xml.devicesettings_world_clocks,
                 R.xml.devicesettings_wearlocation,
-                R.xml.devicesettings_heartrate_sleep,
+                R.xml.devicesettings_heartrate_sleep_alert_activity_stress,
                 R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_custom_emoji_font,
                 R.xml.devicesettings_liftwrist_display_sensitivity,

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband5/MiBand5Coordinator.java

@@ -106,7 +106,7 @@ public class MiBand5Coordinator extends HuamiCoordinator {
                 R.xml.devicesettings_miband5,
                 R.xml.devicesettings_vibrationpatterns,
                 R.xml.devicesettings_wearlocation,
-                R.xml.heartrate_sleep_alert_activity_stress,
+                R.xml.devicesettings_heartrate_sleep_alert_activity_stress,
                 R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_custom_emoji_font,
                 R.xml.devicesettings_timeformat,

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/miband6/MiBand6Coordinator.java

@@ -86,7 +86,7 @@ public class MiBand6Coordinator extends HuamiCoordinator {
                 R.xml.devicesettings_miband6,
                 R.xml.devicesettings_vibrationpatterns,
                 R.xml.devicesettings_wearlocation,
-                R.xml.heartrate_sleep_alert_activity_stress,
+                R.xml.devicesettings_heartrate_sleep_alert_activity_stress,
                 R.xml.devicesettings_goal_notification,
                 R.xml.devicesettings_custom_emoji_font,
                 R.xml.devicesettings_timeformat,

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java

@@ -1339,20 +1339,28 @@ public class HuamiSupport extends AbstractBTLEDeviceSupport {
             return;
         }
 
+        String artist = "";
+        String album = "";
+        String track = "";
+
         byte flags = 0x00;
         flags |= 0x01;
         int length = 5;
         if (musicSpec != null) {
-            if (musicSpec.artist != null && musicSpec.artist.getBytes().length > 0) {
+            artist = StringUtils.truncate(musicSpec.artist, 80);
-                length += musicSpec.artist.getBytes().length + 1;
+            album = StringUtils.truncate(musicSpec.album, 80);
+            track = StringUtils.truncate(musicSpec.album, 80);
+
+            if (artist.getBytes().length > 0) {
+                length += artist.getBytes().length + 1;
                 flags |= 0x02;
             }
-            if (musicSpec.album != null && musicSpec.album.getBytes().length > 0) {
+            if (album.getBytes().length > 0) {
-                length += musicSpec.album.getBytes().length + 1;
+                length += album.getBytes().length + 1;
                 flags |= 0x04;
             }
-            if (musicSpec.track != null && musicSpec.track.getBytes().length > 0) {
+            if (track.getBytes().length > 0) {
-                length += musicSpec.track.getBytes().length + 1;
+                length += track.getBytes().length + 1;
                 flags |= 0x08;
             }
             if (musicSpec.duration != 0) {
@@ -1379,16 +1387,16 @@ public class HuamiSupport extends AbstractBTLEDeviceSupport {
             buf.putShort((short) musicStateSpec.position);
 
             if (musicSpec != null) {
-                if (musicSpec.artist != null && musicSpec.artist.getBytes().length > 0) {
+                if (artist.getBytes().length > 0) {
-                    buf.put(musicSpec.artist.getBytes());
+                    buf.put(artist.getBytes());
                     buf.put((byte) 0);
                 }
-                if (musicSpec.album != null && musicSpec.album.getBytes().length > 0) {
+                if (album.getBytes().length > 0) {
-                    buf.put(musicSpec.album.getBytes());
+                    buf.put(album.getBytes());
                     buf.put((byte) 0);
                 }
-                if (musicSpec.track != null && musicSpec.track.getBytes().length > 0) {
+                if (track.getBytes().length > 0) {
-                    buf.put(musicSpec.track.getBytes());
+                    buf.put(track.getBytes());
                     buf.put((byte) 0);
                 }
                 if (musicSpec.duration != 0) {