MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-12-24 09:35:50 +01:00
Code Releases Wiki Activity

Dashboard: Make today widget data loading more efficient

Browse Source
This commit is contained in:
Arjan Schrijver 2024-12-18 23:30:59 +01:00
parent ae4079eb14
commit 2ec37fa77a
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,7 +44,9 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
import java.util.stream.Collectors;
import nodomain.freeyourgadget.gadgetbridge.GBApplication;
import nodomain.freeyourgadget.gadgetbridge.R;
@ -400,7 +402,7 @@ public class DashboardTodayWidget extends AbstractDashboardWidget {
}
private class FillDataAsyncTask extends AsyncTask<Void, Void, Void> {
private final TreeMap<Long, ActivityKind> activityTimestamps = new TreeMap<>();
private final HashMap<Long, ActivityKind> activityTimestamps = new HashMap<>();
/**
* Add per-second activities to `activityTimestamps`
@ -507,7 +509,11 @@ public class DashboardTodayWidget extends AbstractDashboardWidget {
long currentTime = Calendar.getInstance().getTimeInMillis() / 1000;
long midDaySecond = dashboardData.timeTo - (12 * 60 * 60);
DashboardFragment.DashboardData.GeneralizedActivity previous = null;
for (Map.Entry<Long, ActivityKind> activity : activityTimestamps.entrySet()) {
List<Map.Entry<Long, ActivityKind>> sortedActivityTimestamps = activityTimestamps.entrySet()
.stream()
.sorted(Map.Entry.comparingByKey())
.collect(Collectors.toList());
for (Map.Entry<Long, ActivityKind> activity : sortedActivityTimestamps) {
long timestamp = activity.getKey();
ActivityKind activityKind = activity.getValue();
// Start a new merged activity on certain conditions