hollorol/Clockplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug where addOneMinute() was extending paused Timers whose end times have passed by more than a minute

Browse Source
This commit is contained in:
Phillip Hsu 2016-09-18 15:38:23 -07:00
parent 8022536ec8
commit 0163fd7b7e
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/com/philliphsu/clock2/Timer.java
View File

@ -127,10 +127,12 @@ public abstract class Timer extends ObjectWithId implements Parcelable {
} }
public void addOneMinute() { public void addOneMinute() {
// Allow extending even if paused. if (!isRunning()) {
// if (!isRunning()) resume();
// throw new IllegalStateException("Cannot extend a timer that is not running"); addOneMinute(); // recursion!
if (expired()) { pause();
return;
} else if (expired()) {
endTime = SystemClock.elapsedRealtime() + MINUTE; endTime = SystemClock.elapsedRealtime() + MINUTE;
// If the timer's normal duration is >= MINUTE, then an extra run time of one minute // If the timer's normal duration is >= MINUTE, then an extra run time of one minute
// will still be within the normal duration. Thus, the progress calculation does not // will still be within the normal duration. Thus, the progress calculation does not
@ -140,11 +142,12 @@ public abstract class Timer extends ObjectWithId implements Parcelable {
// This scales the progress bar to a full minute. // This scales the progress bar to a full minute.
duration = MINUTE; duration = MINUTE;
} }
} else { return;
}
endTime += MINUTE; endTime += MINUTE;
duration += MINUTE; duration += MINUTE;
} }
}
public boolean hasStarted() { public boolean hasStarted() {
return endTime > 0; return endTime > 0;