From a3c59b0e0e81734a002f38e194226f136a6a7f0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sat, 10 Jun 2023 17:19:22 +0100
Subject: [PATCH] Zepp OS: Add experimental sync of SpO2, stress, PAI, HR stats
 and sleep respiratory rate

---
 .../adapter/GBDeviceAdapterv2.java            |  2 +-
 .../externalevents/IntentApiReceiver.java     |  2 +-
 .../gadgetbridge/model/RecordedDataTypes.java |  5 +++
 .../service/devices/huami/HuamiSupport.java   | 37 ++++++++++---------
 .../receivers/GBAutoFetchReceiver.java        |  2 +-
 5 files changed, 28 insertions(+), 20 deletions(-)

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 83274480f..daf7bcf9a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java
@@ -418,7 +418,7 @@ public class GBDeviceAdapterv2 extends ListAdapter<GBDevice, GBDeviceAdapterv2.V
                                                         @Override
                                                         public void onClick(View v) {
                                                             showTransientSnackbar(R.string.busy_task_fetch_activity_data);
-                                                            GBApplication.deviceService(device).onFetchRecordedData(RecordedDataTypes.TYPE_ACTIVITY);
+                                                            GBApplication.deviceService(device).onFetchRecordedData(RecordedDataTypes.TYPE_SYNC);
                                                         }
                                                     }
         );
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 364c1b7e4..5ffeac8f5 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/IntentApiReceiver.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/IntentApiReceiver.java
@@ -74,7 +74,7 @@ public class IntentApiReceiver extends BroadcastReceiver {
                     }
                     dataTypes = Integer.parseInt(matcher.group(1), 16);
                 } else {
-                    dataTypes = RecordedDataTypes.TYPE_ACTIVITY;
+                    dataTypes = RecordedDataTypes.TYPE_SYNC;
                 }
 
                 LOG.info("Triggering activity sync for data types {}", String.format("0x%08x", dataTypes));
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 0c5586e38..459ab25e4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/RecordedDataTypes.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/RecordedDataTypes.java
@@ -30,4 +30,9 @@ public class RecordedDataTypes {
     public static final int TYPE_SLEEP_RESPIRATORY_RATE = 0x00000200;
 
     public static final int TYPE_ALL          = (int)0xffffffff;
+
+    // Types to fetch during sync - scheduled, sync button, etc.
+    // Does not include debug logs or workouts
+    public static final int TYPE_SYNC = TYPE_ACTIVITY | TYPE_SPO2 | TYPE_STRESS |
+            TYPE_HEART_RATE | TYPE_PAI | TYPE_SLEEP_RESPIRATORY_RATE;
 }
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 aa8b4a5b3..a69205ce6 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
@@ -89,6 +89,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.Huami2021Service;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiConst;
 import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiCoordinator;
@@ -1668,27 +1669,29 @@ public abstract class HuamiSupport extends AbstractBTLEDeviceSupport implements
             this.fetchOperationQueue.add(new HuamiFetchDebugLogsOperation(this));
         }
 
-        if ((dataTypes & RecordedDataTypes.TYPE_SPO2) != 0 && coordinator.supportsSpo2()) {
-            this.fetchOperationQueue.add(new FetchSpo2NormalOperation(this));
-        }
+        if (Huami2021Coordinator.experimentalFeatures(getDevice())) {
+            if ((dataTypes & RecordedDataTypes.TYPE_SPO2) != 0 && coordinator.supportsSpo2()) {
+                this.fetchOperationQueue.add(new FetchSpo2NormalOperation(this));
+            }
 
-        if ((dataTypes & RecordedDataTypes.TYPE_STRESS) != 0 && coordinator.supportsStressMeasurement()) {
-            this.fetchOperationQueue.add(new FetchStressAutoOperation(this));
-            this.fetchOperationQueue.add(new FetchStressManualOperation(this));
-        }
+            if ((dataTypes & RecordedDataTypes.TYPE_STRESS) != 0 && coordinator.supportsStressMeasurement()) {
+                this.fetchOperationQueue.add(new FetchStressAutoOperation(this));
+                this.fetchOperationQueue.add(new FetchStressManualOperation(this));
+            }
 
-        if ((dataTypes & RecordedDataTypes.TYPE_HEART_RATE) != 0 && coordinator.supportsHeartRateStats()) {
-            this.fetchOperationQueue.add(new FetchHeartRateManualOperation(this));
-            this.fetchOperationQueue.add(new FetchHeartRateMaxOperation(this));
-            this.fetchOperationQueue.add(new FetchHeartRateRestingOperation(this));
-        }
+            if ((dataTypes & RecordedDataTypes.TYPE_HEART_RATE) != 0 && coordinator.supportsHeartRateStats()) {
+                this.fetchOperationQueue.add(new FetchHeartRateManualOperation(this));
+                this.fetchOperationQueue.add(new FetchHeartRateMaxOperation(this));
+                this.fetchOperationQueue.add(new FetchHeartRateRestingOperation(this));
+            }
 
-        if ((dataTypes & RecordedDataTypes.TYPE_PAI) != 0 && coordinator.supportsPai()) {
-            this.fetchOperationQueue.add(new FetchPaiOperation(this));
-        }
+            if ((dataTypes & RecordedDataTypes.TYPE_PAI) != 0 && coordinator.supportsPai()) {
+                this.fetchOperationQueue.add(new FetchPaiOperation(this));
+            }
 
-        if ((dataTypes & RecordedDataTypes.TYPE_SLEEP_RESPIRATORY_RATE) != 0 && coordinator.supportsSleepRespiratoryRate()) {
-            this.fetchOperationQueue.add(new FetchSleepRespiratoryRateOperation(this));
+            if ((dataTypes & RecordedDataTypes.TYPE_SLEEP_RESPIRATORY_RATE) != 0 && coordinator.supportsSleepRespiratoryRate()) {
+                this.fetchOperationQueue.add(new FetchSleepRespiratoryRateOperation(this));
+            } 
         }
 
         final AbstractFetchOperation nextOperation = this.fetchOperationQueue.poll();
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 69c1f9359..b0ca6fedb 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
@@ -35,7 +35,7 @@ public class GBAutoFetchReceiver extends BroadcastReceiver {
     public void onReceive(Context context, Intent intent) {
         Date nextSync = DateUtils.addMinutes(lastSync, GBApplication.getPrefs().getInt("auto_fetch_interval_limit", 0));
         if (nextSync.before(new Date())) {
-            GBApplication.deviceService().onFetchRecordedData(RecordedDataTypes.TYPE_ACTIVITY);
+            GBApplication.deviceService().onFetchRecordedData(RecordedDataTypes.TYPE_SYNC);
             lastSync = new Date();
         }
     }