From 9a962bd495c6c0862b0ce46059b93050a1104bfb Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Fri, 15 Nov 2024 10:21:00 +0000
Subject: [PATCH] Bangle.js: Support sending activity type from Bangle (#4323)

---
 CHANGELOG.md                                  |  1 +
 .../banglejs/BangleJSSampleProvider.java      | 11 ++-------
 .../banglejs/BangleJSDeviceSupport.java       | 23 ++++++++-----------
 3 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 397589b46..64592a153 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -47,6 +47,7 @@
 * Xiaomi-protobuf: Improve workout parsing
 * Zepp OS: Add sleep respiratory rate chart
 * Zepp OS: Send notification pictures
+* Bangle.js: Support sending activity type from Bangle
 
 #### 0.82.1
 * Huawei: Improve activity parsing
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 6a7b0c559..304e590cf 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
@@ -40,8 +40,6 @@ public class BangleJSSampleProvider extends AbstractSampleProvider<BangleJSActiv
         super(device, session);
     }
 
-    public static final int TYPE_ACTIVITY = 0;
-
     @Override
     public AbstractDao<BangleJSActivitySample, ?> getSampleDao() {
         return getSession().getBangleJSActivitySampleDao();
@@ -67,17 +65,12 @@ public class BangleJSSampleProvider extends AbstractSampleProvider<BangleJSActiv
 
     @Override
     public ActivityKind normalizeType(int rawType) {
-        switch (rawType) {
-            case TYPE_ACTIVITY:
-                return ActivityKind.ACTIVITY;
-            default: // fall through
-                return ActivityKind.UNKNOWN;
-        }
+        return ActivityKind.fromCode(rawType);
     }
 
     @Override
     public int toRawActivityKind(ActivityKind activityKind) {
-        return TYPE_ACTIVITY;
+        return activityKind.getCode();
     }
 
     @Override
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 aaa03b0ff..dbd5eeae1 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
@@ -126,6 +126,7 @@ import nodomain.freeyourgadget.gadgetbridge.externalevents.gps.GBLocationProvide
 import nodomain.freeyourgadget.gadgetbridge.externalevents.gps.GBLocationService;
 import nodomain.freeyourgadget.gadgetbridge.externalevents.sleepasandroid.SleepAsAndroidAction;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.model.ActivityKind;
 import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
 import nodomain.freeyourgadget.gadgetbridge.model.Alarm;
 import nodomain.freeyourgadget.gadgetbridge.model.BatteryState;
@@ -821,25 +822,21 @@ public class BangleJSDeviceSupport extends AbstractBTLEDeviceSupport {
         int steps = json.optInt("stp", 0);
         int intensity = json.optInt("mov", ActivitySample.NOT_MEASURED);
         boolean realtime = json.optInt("rt", 0) == 1;
-        int activity = BangleJSSampleProvider.TYPE_ACTIVITY;
-        /*if (json.has("act")) {
-            String actName = "TYPE_" + json.getString("act").toUpperCase();
+        ActivityKind activity = ActivityKind.ACTIVITY;
+        if (json.has("act")) {
             try {
-                Field f = ActivityKind.class.getField(actName);
-                try {
-                    activity = f.getInt(null);
-                } catch (IllegalAccessException e) {
-                    LOG.info("JSON activity '"+actName+"' not readable");
-                }
-            } catch (NoSuchFieldException e) {
-                LOG.info("JSON activity '"+actName+"' not found");
+                String actName = json.optString("act","").toUpperCase();
+                activity = ActivityKind.valueOf(actName);
+            } catch (final Exception e) {
+                LOG.warn("JSON activity not known", e);
+                activity = ActivityKind.UNKNOWN;
             }
-        }*/
+        }
         if(hrm>0) {
             sleepAsAndroidSender.onHrChanged(hrm, 0);
         }
         sample.setTimestamp(timestamp);
-        sample.setRawKind(activity);
+        sample.setRawKind(activity.getCode());
         sample.setHeartRate(hrm);
         sample.setSteps(steps);
         sample.setRawIntensity(intensity);