mirrors
/
Gadgetbridge
mirror of https://github.com/nico202/Gadgetbridge.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix getLast24Hours() -- take end time into account

live-activity-data
cpfeiffer 2015-09-01 22:37:20 +02:00
parent a6d18e599b
commit d791054e42
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractChartFragment.java
View File

@ -273,20 +273,19 @@ public abstract class AbstractChartFragment extends AbstractGBFragment {
*/
protected List<ActivitySample> getAllSamples(DBHandler db, GBDevice device, int tsFrom, int tsTo) {
if (tsFrom == -1) {
tsFrom = getTSLast24Hours();
tsFrom = getTSLast24Hours(tsTo);
}
SampleProvider provider = getProvider(device);
return db.getAllActivitySamples(tsFrom, tsTo, provider);
}
private int getTSLast24Hours() {
long now = System.currentTimeMillis();
return (int) ((now / 1000) - (24 * 60 * 60)); // -24 hours
private int getTSLast24Hours(int tsTo) {
return (tsTo) - (24 * 60 * 60); // -24 hours
}
protected List<ActivitySample> getActivitySamples(DBHandler db, GBDevice device, int tsFrom, int tsTo) {
if (tsFrom == -1) {
tsFrom = getTSLast24Hours();
tsFrom = getTSLast24Hours(tsTo);
}
SampleProvider provider = getProvider(device);
return db.getActivitySamples(tsFrom, tsTo, provider);
@ -295,7 +294,7 @@ public abstract class AbstractChartFragment extends AbstractGBFragment {
protected List<ActivitySample> getSleepSamples(DBHandler db, GBDevice device, int tsFrom, int tsTo) {
if (tsFrom == -1) {
tsFrom = getTSLast24Hours();
tsFrom = getTSLast24Hours(tsTo);
}
SampleProvider provider = getProvider(device);
return db.getSleepSamples(tsFrom, tsTo, provider);