nixo
/
GadgetBridge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix negative steps in Charts with Morpheuz

This commit is contained in:
Andreas Shimokawa 2016-08-02 00:30:05 +02:00
parent 43d7566c0b
commit 9520e23439
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityAnalysis.java
View File

@ -17,7 +17,7 @@ public class ActivityAnalysis {
ActivityAmount previousAmount = null; ActivityAmount previousAmount = null;
ActivitySample previousSample = null; ActivitySample previousSample = null;
for (ActivitySample sample : samples) { for (ActivitySample sample : samples) {
ActivityAmount amount = null; ActivityAmount amount;
switch (sample.getKind()) { switch (sample.getKind()) {
case ActivityKind.TYPE_DEEP_SLEEP: case ActivityKind.TYPE_DEEP_SLEEP:
amount = deepSleep; amount = deepSleep;
@ -43,8 +43,6 @@ public class ActivityAnalysis {
previousAmount.addSeconds(sharedTimeDifference); previousAmount.addSeconds(sharedTimeDifference);
amount.addSeconds(sharedTimeDifference); amount.addSeconds(sharedTimeDifference);
} }
} else {
// nothing to do, we can only calculate when we have the next sample
} }
previousAmount = amount; previousAmount = amount;
@ -69,7 +67,10 @@ public class ActivityAnalysis {
public int calculateTotalSteps(List<? extends ActivitySample> samples) { public int calculateTotalSteps(List<? extends ActivitySample> samples) {
int totalSteps = 0; int totalSteps = 0;
for (ActivitySample sample : samples) { for (ActivitySample sample : samples) {
totalSteps += sample.getSteps(); int steps = sample.getSteps();
if (steps > 0) {
totalSteps += sample.getSteps();
}
} }
return totalSteps; return totalSteps;
} }