jens/Automation
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Calendar trigger

Browse Source
This commit is contained in:
Jens 2024-01-09 22:56:42 +01:00
parent 6e566c664d
commit b38ca31df5
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/com/jens/automation2/receivers/CalendarReceiver.java
View File

@ -46,7 +46,7 @@ public class CalendarReceiver extends BroadcastReceiver implements AutomationLis
static TimerTask timerTask = null; static TimerTask timerTask = null;
static Calendar nextWakeup = null; static Calendar nextWakeup = null;
static AlarmManager alarmManager = null; static AlarmManager alarmManager = null;
static boolean wakeupNeedsToBeScheduled = false; static boolean wakeupNeedsToBeScheduledOrRescheduled = false;
public static class RuleEventPair public static class RuleEventPair
{ {
@ -94,8 +94,7 @@ public class CalendarReceiver extends BroadcastReceiver implements AutomationLis
calendarEventsCache = null; calendarEventsCache = null;
calendarEventsReoccurringCache = null; calendarEventsReoccurringCache = null;
checkForRules(context); routineAtAlarm();
armOrRearmTimer();
} }
else if(intent.getAction().equalsIgnoreCase(calendarAlarmAction)) else if(intent.getAction().equalsIgnoreCase(calendarAlarmAction))
{ {
@ -466,7 +465,7 @@ public class CalendarReceiver extends BroadcastReceiver implements AutomationLis
} }
// If it's now filled, go on // If it's now filled, go on
if(nextWakeup != null && wakeupNeedsToBeScheduled) if(nextWakeup != null && wakeupNeedsToBeScheduledOrRescheduled)
{ {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
{ {
@ -482,7 +481,7 @@ public class CalendarReceiver extends BroadcastReceiver implements AutomationLis
} }
Miscellaneous.logEvent("i", "armOrRearmTimer()", "Scheduling wakeup for calendar at " + Miscellaneous.formatDate(nextWakeup.getTime()), 4); Miscellaneous.logEvent("i", "armOrRearmTimer()", "Scheduling wakeup for calendar at " + Miscellaneous.formatDate(nextWakeup.getTime()), 4);
alarmManager.setExactAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, nextWakeup.getTimeInMillis(), pi); alarmManager.setExactAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, nextWakeup.getTimeInMillis(), pi);
wakeupNeedsToBeScheduled = false; wakeupNeedsToBeScheduledOrRescheduled = false;
} }
} }
else else
@ -543,8 +542,8 @@ public class CalendarReceiver extends BroadcastReceiver implements AutomationLis
else else
Miscellaneous.logEvent("i", "calculateNextWakeupForCalendar()", "Chose " + Miscellaneous.formatDate(newAlarm.getTime()) + " as next wakeup for calendar triggers. Old was " + Miscellaneous.formatDate(nextWakeup.getTime()), 4); Miscellaneous.logEvent("i", "calculateNextWakeupForCalendar()", "Chose " + Miscellaneous.formatDate(newAlarm.getTime()) + " as next wakeup for calendar triggers. Old was " + Miscellaneous.formatDate(nextWakeup.getTime()), 4);
nextWakeup = newAlarm; nextWakeup = newAlarm;
if (!wakeupNeedsToBeScheduled) if (!wakeupNeedsToBeScheduledOrRescheduled)
wakeupNeedsToBeScheduled = true; wakeupNeedsToBeScheduledOrRescheduled = true;
} }
else else
Miscellaneous.logEvent("i", "calculateNextWakeupForCalendar()", "Alarm " + Miscellaneous.formatDate(nextWakeup.getTime()) + " has been selected as next wakeup, but not rescheduling since this was not a change.", 4); Miscellaneous.logEvent("i", "calculateNextWakeupForCalendar()", "Alarm " + Miscellaneous.formatDate(nextWakeup.getTime()) + " has been selected as next wakeup, but not rescheduling since this was not a change.", 4);

1
app/src/main/res/layout/activity_manage_action_close_notification.xml
View File

@ -180,6 +180,7 @@
android:id="@+id/rbNotificationDismissSimple" android:id="@+id/rbNotificationDismissSimple"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:checked="true"
android:text="@string/simplyDismissNotification" /> android:text="@string/simplyDismissNotification" />
<RadioButton <RadioButton