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

Refactor if-block to perform primary behavior of UpcomingAlarmReceiver first.

Browse Source
This commit is contained in:
Phillip Hsu 2017-03-01 13:51:07 -08:00
parent 05d96ca48e
commit 0216c83db9
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/com/philliphsu/clock2/alarms/background/UpcomingAlarmReceiver.java
View File

@ -57,11 +57,8 @@ public class UpcomingAlarmReceiver extends BroadcastReceiver {
final NotificationManager nm = (NotificationManager) final NotificationManager nm = (NotificationManager)
context.getSystemService(Context.NOTIFICATION_SERVICE); context.getSystemService(Context.NOTIFICATION_SERVICE);
if (ACTION_CANCEL_NOTIFICATION.equals(intent.getAction())) { final boolean actionShowSnoozing = ACTION_SHOW_SNOOZING.equals(intent.getAction());
nm.cancel(TAG, (int) id); if (intent.getAction() == null || actionShowSnoozing) {
} else if (ACTION_DISMISS_NOW.equals(intent.getAction())) {
new AlarmController(context, null).cancelAlarm(alarm, false, true);
} else {
// Prepare notification // Prepare notification
// http://stackoverflow.com/a/15803726/5055032 // http://stackoverflow.com/a/15803726/5055032
// Notifications aren't updated on the UI thread, so we could have // Notifications aren't updated on the UI thread, so we could have
@ -69,9 +66,10 @@ public class UpcomingAlarmReceiver extends BroadcastReceiver {
// done here, so doing so is a premature optimization. // done here, so doing so is a premature optimization.
String title; String title;
String text; String text;
if (ACTION_SHOW_SNOOZING.equals(intent.getAction())) { if (actionShowSnoozing) {
if (!alarm.isSnoozed()) if (!alarm.isSnoozed()) {
throw new IllegalStateException("Can't show snoozing notif. if alarm not snoozed!"); throw new IllegalStateException("Can't show snoozing notif. if alarm not snoozed!");
}
title = alarm.label().isEmpty() ? context.getString(R.string.alarm) : alarm.label(); title = alarm.label().isEmpty() ? context.getString(R.string.alarm) : alarm.label();
text = context.getString(R.string.title_snoozing_until, text = context.getString(R.string.title_snoozing_until,
formatTime(context, alarm.snoozingUntil())); formatTime(context, alarm.snoozingUntil()));
@ -96,6 +94,10 @@ public class UpcomingAlarmReceiver extends BroadcastReceiver {
.addAction(R.drawable.ic_dismiss_alarm_24dp, context.getString(R.string.dismiss_now), piDismiss) .addAction(R.drawable.ic_dismiss_alarm_24dp, context.getString(R.string.dismiss_now), piDismiss)
.build(); .build();
nm.notify(TAG, (int) id, note); nm.notify(TAG, (int) id, note);
} else if (ACTION_CANCEL_NOTIFICATION.equals(intent.getAction())) {
nm.cancel(TAG, (int) id);
} else if (ACTION_DISMISS_NOW.equals(intent.getAction())) {
new AlarmController(context, null).cancelAlarm(alarm, false, true);
} }
} }
} }