MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-07-17 10:54:03 +02:00
Code Releases Wiki Activity

Merge sequential not_worn activity samples

Browse Source
This commit is contained in:
Arjan Schrijver 2024-01-03 17:10:42 +01:00
parent 0d06058b2f
commit 88cb3cd1cb
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/dashboard/DashboardTodayWidget.java
View File

@ -131,6 +131,14 @@ public class DashboardTodayWidget extends AbstractDashboardWidget {
List<GeneralizedActivity> generalizedActivities = new ArrayList<>();
for (ActivitySample sample : allActivitySamples) {
if (sample.getKind() != ActivityKind.TYPE_NOT_WORN) continue;
if (generalizedActivities.size() > 0) {
GeneralizedActivity previous = generalizedActivities.get(generalizedActivities.size() - 1);
if (previous.activityKind == ActivityKind.TYPE_NOT_WORN && previous.timeTo > sample.getTimestamp() - 60) {
// If the current sample starts within a minute after the end of the previous not worn session, merge them
generalizedActivities.get(generalizedActivities.size() - 1).timeTo = sample.getTimestamp() + 60;
continue;
}
}
generalizedActivities.add(new GeneralizedActivity(
sample.getKind(),
sample.getTimestamp(),