demus/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge.git synced 2026-07-31 07:44:24 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

Prevent out of order samples when filling gaps

Browse Source
This commit is contained in:
José Rebelo
2025-12-20 14:43:11 +00:00
parent 46ea7cc1c5
commit e7c4cc11f7
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractSampleProvider.java
+18 -1
View File
@@ -44,6 +44,7 @@ import nodomain.freeyourgadget.gadgetbridge.entities.Device;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.model.ActivityKind;
import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
import nodomain.freeyourgadget.gadgetbridge.util.DateTimeUtils;
/**
* Base class for all sample providers. A Sample provider is device specific and provides
@@ -365,13 +366,29 @@ public abstract class AbstractSampleProvider<T extends AbstractActivitySample> i
final ListIterator<T> it = ret.listIterator();
T previousSample = it.next();
if (LOG.isTraceEnabled()) {
LOG.trace("Starting filling gapps at {}", DateTimeUtils.formatDateTime(DateTimeUtils.parseTimestampMillis(previousSample.getTimestamp() * 1000L)));
}
while (it.hasNext()) {
final T sample = it.next();
if (LOG.isTraceEnabled()) {
LOG.trace("Processing for gaps at {}", DateTimeUtils.formatDateTime(DateTimeUtils.parseTimestampMillis(sample.getTimestamp() * 1000L)));
}
if (sample.getTimestamp() - previousSample.getTimestamp() > 60) {
LOG.trace("Filling gap between {} and {}", Instant.ofEpochSecond(previousSample.getTimestamp() + 60), Instant.ofEpochSecond(sample.getTimestamp()));
// Rewind before we insert the dummy samples so the list stays in order
it.previous();
if (LOG.isTraceEnabled()) {
LOG.trace("Filling gap between {} and {}", Instant.ofEpochSecond(previousSample.getTimestamp() + 60), Instant.ofEpochSecond(sample.getTimestamp()));
}
for (int ts = previousSample.getTimestamp() + 60; ts < sample.getTimestamp(); ts += 60) {
if (LOG.isTraceEnabled()) {
LOG.trace("Inserting dummy sample at {}", DateTimeUtils.formatDateTime(DateTimeUtils.parseTimestampMillis(ts * 1000L)));
}
it.add(createDummySample(ts));
}
// Move forward again
it.next();
}
previousSample = sample;
}