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

Huami: Avoid infinite loop when fetching very short activity

Browse Source
This commit is contained in:
José Rebelo
2026-05-17 16:04:14 +01:00
parent d085e6ae72
commit 3fe42f3d8f
1 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/operations/fetch/FetchSportsDetailsOperation.java
+23
View File
@@ -26,6 +26,7 @@ import java.io.File;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.GregorianCalendar; import java.util.GregorianCalendar;
import java.util.Locale; import java.util.Locale;
@@ -118,8 +119,22 @@ public class FetchSportsDetailsOperation extends AbstractFetchOperation {
} }
// Always increment the sync timestamp on success, even if we did not get data // Always increment the sync timestamp on success, even if we did not get data
final GregorianCalendar startTime = BLETypeConversions.createCalendar();
startTime.setTime(summary.getStartTime());
final GregorianCalendar endTime = BLETypeConversions.createCalendar(); final GregorianCalendar endTime = BLETypeConversions.createCalendar();
endTime.setTime(summary.getEndTime()); endTime.setTime(summary.getEndTime());
if (sameMinute(startTime, endTime)) {
// #6072 #2958 #3199 - If the activity starts and ends in the same minute, we might get stuck fetching it
// over and over again. Move the start timestamp to the next minute if we're truncating fetch operation timestamps
final boolean truncate = GBApplication.getDevicePrefs(fetcher.getDevice())
.getBoolean("huami_truncate_fetch_operation_timestamps", true);
if (truncate) {
LOG.warn("Activity starts and ends in the same minute - pushing timestamp forward 1 minute");
endTime.add(Calendar.MINUTE, 1);
}
}
saveLastSyncTimestamp(endTime); saveLastSyncTimestamp(endTime);
if (needsAnotherFetch(endTime)) { if (needsAnotherFetch(endTime)) {
@@ -130,6 +145,14 @@ public class FetchSportsDetailsOperation extends AbstractFetchOperation {
return true; return true;
} }
private boolean sameMinute(final GregorianCalendar startTime, final GregorianCalendar endTime) {
return startTime.get(Calendar.YEAR) == endTime.get(Calendar.YEAR)
&& startTime.get(Calendar.MONTH) == endTime.get(Calendar.MONTH)
&& startTime.get(Calendar.DAY_OF_MONTH) == endTime.get(Calendar.DAY_OF_MONTH)
&& startTime.get(Calendar.HOUR_OF_DAY) == endTime.get(Calendar.HOUR_OF_DAY)
&& startTime.get(Calendar.MINUTE) == endTime.get(Calendar.MINUTE);
}
private boolean needsAnotherFetch(GregorianCalendar lastSyncTimestamp) { private boolean needsAnotherFetch(GregorianCalendar lastSyncTimestamp) {
// We have 2 operations per fetch round: summary + details // We have 2 operations per fetch round: summary + details
if (fetchCount > 20) { if (fetchCount > 20) {