From fa070579be502d525ffca5b1c7385d299fc3aa4b Mon Sep 17 00:00:00 2001
From: Arjan Schrijver <a_gadgetbridge@anymore.nl>
Date: Mon, 2 Sep 2024 22:34:32 +0200
Subject: [PATCH] Moyoung: Fix HR history packet parsing and activity sample
 provider

---
 .../moyoung/samples/MoyoungActivitySampleProvider.java     | 7 ++++++-
 .../service/devices/moyoung/MoyoungDeviceSupport.java      | 5 +++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/samples/MoyoungActivitySampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/samples/MoyoungActivitySampleProvider.java
index 4864b730a..d6903a12f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/samples/MoyoungActivitySampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/moyoung/samples/MoyoungActivitySampleProvider.java
@@ -165,7 +165,12 @@ public class MoyoungActivitySampleProvider extends AbstractSampleProvider<Moyoun
         );
         final long nanoStart = System.nanoTime();
 
-        final List<MoyoungActivitySample> samples = super.getGBActivitySamples(timestamp_from, timestamp_to);
+        final List<MoyoungActivitySample> samples = fillGaps(
+                super.getGBActivitySamples(timestamp_from, timestamp_to),
+                timestamp_from,
+                timestamp_to
+        );
+
         final Map<Integer, MoyoungActivitySample> sampleByTs = new HashMap<>();
         for (final MoyoungActivitySample sample : samples) {
             sampleByTs.put(sample.getTimestamp(), sample);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/moyoung/MoyoungDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/moyoung/MoyoungDeviceSupport.java
index 1a4f78d24..20a67c901 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/moyoung/MoyoungDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/moyoung/MoyoungDeviceSupport.java
@@ -701,13 +701,14 @@ public class MoyoungDeviceSupport extends AbstractBTLEDeviceSupport {
         final Calendar cal = Calendar.getInstance();
         cal.add(Calendar.DAY_OF_MONTH, -daysAgo);
         cal.set(Calendar.SECOND, 0);
+        LOG.info("Received HR history packet: index={}, daysAgo={}, startHour={}", packetIndex, daysAgo, startHour);
         int index = 1;
         for (int hour=startHour; hour<startHour+6; hour++) {
             cal.set(Calendar.HOUR_OF_DAY, hour);
             for (int minute=0; minute<60; minute+=5) {
                 cal.set(Calendar.MINUTE, minute);
                 int hr = data[index] & 0xff;
-                if (HeartRateUtils.getInstance().isValidHeartRateValue(hr)) {
+                if (HeartRateUtils.getInstance().isValidHeartRateValue(hr) && cal.getTimeInMillis() < System.currentTimeMillis()) {
                     MoyoungHeartRateSample sample = new MoyoungHeartRateSample();
                     sample.setTimestamp(cal.getTimeInMillis());
                     sample.setHeartRate(hr);
@@ -1191,7 +1192,7 @@ public class MoyoungDeviceSupport extends AbstractBTLEDeviceSupport {
         switch (config) {
             case ActivityUser.PREF_USER_HEIGHT_CM:
             case ActivityUser.PREF_USER_WEIGHT_KG:
-            case ActivityUser.PREF_USER_YEAR_OF_BIRTH:
+            case ActivityUser.PREF_USER_DATE_OF_BIRTH:
             case ActivityUser.PREF_USER_GENDER:
                 sendSetting(getSetting("USER_INFO"), new ActivityUser());
                 break;