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

Fixed binding of dismiss button in AlarmVH when cancelling snoozed alarm

Browse Source
This commit is contained in:
Phillip Hsu 2016-06-07 13:43:00 -07:00
parent 9f151fa9cc
commit 5eb52ee510
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/philliphsu/clock2/alarms/AlarmViewHolder.java
View File

@ -96,7 +96,11 @@ public class AlarmViewHolder extends BaseViewHolder<Alarm> implements AlarmCount
@OnClick(R.id.dismiss) @OnClick(R.id.dismiss)
void onClick() { void onClick() {
AlarmUtils.cancelAlarm(getContext(), getAlarm()); Alarm alarm = getAlarm();
AlarmUtils.cancelAlarm(getContext(), alarm);
if (alarm.isSnoozed()) {
alarm.stopSnoozing(); // TOneverDO: before cancelAlarm()
}
bindDismissButton(false, ""); // Will be set to correct text the next time we bind. bindDismissButton(false, ""); // Will be set to correct text the next time we bind.
// TODO: Check if alarm has no recurrence, then turn it off. // TODO: Check if alarm has no recurrence, then turn it off.
} }

3
app/src/main/java/com/philliphsu/clock2/util/AlarmUtils.java
View File

@ -67,6 +67,9 @@ public final class AlarmUtils {
removeUpcomingAlarmNotification(c, a); removeUpcomingAlarmNotification(c, a);
// If service is not running, nothing happens // If service is not running, nothing happens
// TODO: Since RingtoneService is a bound service, will this destroy the service after returning?
// Note that if a stopped service still has ServiceConnection objects bound to it with the
// BIND_AUTO_CREATE set, it will not be destroyed until all of these bindings are removed.
c.stopService(new Intent(c, RingtoneService.class)); c.stopService(new Intent(c, RingtoneService.class));
} }