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

When changes made via TimerVH, do not modify notification chronometer unless new Timer's end time is different from previous Timer

Browse Source
This commit is contained in:
Phillip Hsu 2016-09-18 17:48:17 -07:00
parent 07ff5d715b
commit 8f1a42ef53
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/com/philliphsu/clock2/timers/TimerNotificationService.java
View File

@ -163,15 +163,17 @@ public class TimerNotificationService extends ChronometerNotificationService {
@Override @Override
protected void handleDefaultAction(Intent intent, int flags, int startId) { protected void handleDefaultAction(Intent intent, int flags, int startId) {
Timer timer = intent.getParcelableExtra(EXTRA_TIMER); final Timer timer = intent.getParcelableExtra(EXTRA_TIMER);
if (timer == null) { if (timer == null) {
throw new IllegalStateException("Cannot start TimerNotificationService without a Timer"); throw new IllegalStateException("Cannot start TimerNotificationService without a Timer");
} }
final long id = timer.getId(); final long id = timer.getId();
final boolean isUpdate = mTimers.containsKey(id); // could use either map boolean updateChronometer = false;
mTimers.put(id, timer); Timer oldTimer = mTimers.put(id, timer);
if (oldTimer != null) {
updateChronometer = oldTimer.endTime() != timer.endTime();
}
mControllers.put(id, new TimerController(timer, mUpdateHandler)); mControllers.put(id, new TimerController(timer, mUpdateHandler));
mMostRecentTimerId = id; mMostRecentTimerId = id;
// If isUpdate == true, this won't call through because the id already exists in the // If isUpdate == true, this won't call through because the id already exists in the
// internal mappings as well. // internal mappings as well.
@ -182,12 +184,14 @@ public class TimerNotificationService extends ChronometerNotificationService {
title = getString(R.string.timer); title = getString(R.string.timer);
} }
setContentTitle(id, title); setContentTitle(id, title);
if (isUpdate) { if (updateChronometer) {
// Immediately push any updates, or else there will be a noticeable delay. // Immediately push any duration updates, or else there will be a noticeable delay.
// If there were any duration changes, this will reflect them.
setBase(id, timer.endTime()); setBase(id, timer.endTime());
updateNotification(id, true); updateNotification(id, true);
} }
// This handles any other notification updates like the title or actions, even if
// the timer is not running because the current thread will update the notification
// (besides the content text) before quitting.
syncNotificationWithTimerState(id, timer.isRunning()); syncNotificationWithTimerState(id, timer.isRunning());
} }