From 8577c5d5464f194b6b4660cdd8edcf1be32e0260 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Wed, 21 Aug 2024 21:52:46 +0100
Subject: [PATCH] Zepp OS 4: Fix shortcut cards

---
 .../huami/zeppos/services/ZeppOsShortcutCardsService.java | 8 +++-----
 app/src/main/res/values/arrays.xml                        | 4 ++++
 app/src/main/res/values/strings.xml                       | 1 +
 3 files changed, 8 insertions(+), 5 deletions(-)

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 606a030e5..8ff7d058f 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
@@ -90,6 +90,8 @@ public class ZeppOsShortcutCardsService extends AbstractZeppOsService {
         READINESS("34", "1"),
         ALEXA("35", "1"),
         ZEPP_PAY("37", "1"),
+        CALORIES("38", "1"),
+        HRV("1047865", "1"),
         ;
 
         private final String appNum;
@@ -194,11 +196,7 @@ public class ZeppOsShortcutCardsService extends AbstractZeppOsService {
             final String appNum = StringUtils.untilNullTerminator(buf);
             final String cardNum = StringUtils.untilNullTerminator(buf);
             final boolean enabled = buf.get() == 0x01;
-            final byte b = buf.get();
-            if (b != 0) {
-                LOG.warn("Unexpected byte {} at pos {}", b, buf.position() - 1);
-                return;
-            }
+            final String version = StringUtils.untilNullTerminator(buf);
             final ShortcutCard card = ShortcutCard.fromCodes(appNum, cardNum);
             final String cardPrefValue;
             if (card != null) {
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 6fe89f18b..ea1a9eb6a 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -954,6 +954,7 @@
         <item>@string/menuitem_sleep</item>
         <item>@string/menuitem_hr</item>
         <item>@string/menuitem_activity</item>
+        <item>@string/calories</item>
         <item>@string/menuitem_spo2</item>
         <item>@string/menuitem_phone</item>
         <item>@string/menuitem_events</item>
@@ -973,6 +974,7 @@
         <item>@string/menuitem_recommendation</item>
         <item>@string/menuitem_zepp_coach</item>
         <item>@string/menuitem_zepp_pay</item>
+        <item>@string/hrv</item>
         <item>@string/menuitem_readiness</item>
         <item>@string/menuitem_body_composition</item>
         <item>@string/menuitem_thermometer</item>
@@ -990,6 +992,7 @@
         <item>sleep</item>
         <item>heartrate</item>
         <item>activity</item>
+        <item>calories</item>
         <item>spo2</item>
         <item>phone</item>
         <item>events</item>
@@ -1009,6 +1012,7 @@
         <item>recommendation</item>
         <item>zepp_coach</item>
         <item>zepp_pay</item>
+        <item>hrv</item>
         <item>readiness</item>
         <item>body_composition</item>
         <item>thermometer</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3df5ba088..4bd05b33d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -843,6 +843,7 @@
     <string name="prefs_charts_tabs_summary">Visible chart tabs</string>
     <string name="sleepchart_your_sleep">Sleep</string>
     <string name="hrv_status">HRV Status</string>
+    <string name="hrv">HRV</string>
     <string name="weeksleepchart_sleep_a_week">Sleep per week</string>
     <string name="weeksleepchart_today_sleep_description">Sleep today, target: %1$s</string>
     <string name="weekstepschart_steps_a_week">Steps per week</string>