From 63b1cffe2a5cfe83bd1eef7f12ba3ea16e339db1 Mon Sep 17 00:00:00 2001
From: Nathan Philipp Bo Seddig <natpbs@gmail.com>
Date: Sun, 25 Sep 2022 11:10:38 +0200
Subject: [PATCH] Mi Band 6: Enable adding workout activity types to the "more"
 section

---
 .../service/devices/huami/HuamiSupport.java   | 34 +++++++++++++------
 app/src/main/res/values/arrays.xml            |  5 +++
 2 files changed, 29 insertions(+), 10 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 f593aa52d..8dfd937a0 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
@@ -2371,6 +2371,7 @@ public abstract class HuamiSupport extends AbstractBTLEDeviceSupport implements
                         break;
                     case COMMAND_WORKOUT_ACTIVITY_TYPES:
                         LOG.warn("got workout activity types, not handled");
+                        logMessageContent(reassemblyBuffer);
                         break;
                     default:
                         LOG.warn("got unknown chunked configuration response for {}, not handled", String.format("0x%02x", reassemblyType));
@@ -3479,11 +3480,11 @@ public abstract class HuamiSupport extends AbstractBTLEDeviceSupport implements
     protected HuamiSupport setWorkoutActivityTypes(final TransactionBuilder builder) {
         final SharedPreferences prefs = GBApplication.getDeviceSpecificSharedPrefs(gbDevice.getAddress());
 
-        final List<String> defaultActivityTypes = Arrays.asList(HuamiWorkoutActivityType.Freestyle.name().toLowerCase(Locale.ROOT));
+        final List<String> defaultActivityTypes = Arrays.asList(HuamiWorkoutScreenActivityType.Freestyle.name().toLowerCase(Locale.ROOT));
         final String activityTypesPref = prefs.getString(HuamiConst.PREF_WORKOUT_ACTIVITY_TYPES_SORTABLE, null);
 
         final List<String> enabledActivityTypes;
-        if (activityTypesPref == null || activityTypesPref.equals("")) {
+        if (activityTypesPref == null || activityTypesPref.equals("") || activityTypesPref.equals("more")) {
             enabledActivityTypes = defaultActivityTypes;
         } else {
             enabledActivityTypes = Arrays.asList(activityTypesPref.split(","));
@@ -3491,19 +3492,32 @@ public abstract class HuamiSupport extends AbstractBTLEDeviceSupport implements
 
         LOG.info("Setting workout types to {}", enabledActivityTypes);
 
-        final byte[] command = new byte[enabledActivityTypes.size() * 3 + 2];
-        command[0] = 0x0b;
-        command[1] = 0x00;
+        int workoutCount = enabledActivityTypes.size();
+        if (enabledActivityTypes.contains("more")) {
+            // we shouldn't count the more item when it is present, since it isn't a real
+            // workout type and isn't sent to the device
+            workoutCount--;
+        }
+        final ByteBuffer command = ByteBuffer.allocate(workoutCount * 3 + 2);
+        command.order(ByteOrder.LITTLE_ENDIAN);
+        command.putShort((short) workoutCount);
 
-        int pos = 2;
+        // a value of 1 puts items in the main section, a value of 0 puts them in the more section
+        // by default items are put in the main section
+        byte section = 0x01;
 
         for (final String workoutType : enabledActivityTypes) {
-            command[pos++] = HuamiWorkoutScreenActivityType.fromPrefValue(workoutType).getCode();
-            command[pos++] = 0x00;
-            command[pos++] = 0x01;
+            if (workoutType.equals("more")) {
+                // all items that follow the More separator are put in the more section
+                section = 0x00;
+                continue;
+            }
+            byte code = HuamiWorkoutScreenActivityType.fromPrefValue(workoutType).getCode();
+            command.putShort(code);
+            command.put(section);
         }
 
-        writeToChunked(builder, 9, command);
+        writeToChunked(builder, 9, command.array());
 
         return this;
     }
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 5f0ea5552..9a65ed49f 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -705,6 +705,8 @@
         <item>street_dance</item>
         <item>zumba</item>
         <item>indoor_ice_skating</item>
+        <!-- more is not an actual workout activity type, only a placeholder to separate types between the main and the more section -->
+        <item>more</item>
     </string-array>
 
     <string-array name="pref_miband6_workout_activity_types">
@@ -738,6 +740,8 @@
         <item>@string/activity_type_street_dance</item>
         <item>@string/activity_type_zumba</item>
         <item>@string/activity_type_indoor_ice_skating</item>
+        <!-- more is not an actual workout activity type, only a placeholder to separate types between the main and the more section -->
+        <item>@string/menuitem_more</item>
     </string-array>
 
     <string-array name="pref_miband6_workout_activity_types_default">
@@ -752,6 +756,7 @@
         <item>jump_rope</item>
         <item>rowing_machine</item>
         <item>yoga</item>
+        <item>more</item>
         <item>dance</item>
         <item>indoor_fitness</item>
         <item>gymnastics</item>