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

calendar trigger

Browse Source
This commit is contained in:
jens
2023-12-26 11:56:02 +01:00
parent b6bf31589a
commit 9b28aeef8b
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/jens/automation2/Trigger.java
View File

@@ -622,7 +622,7 @@ public class Trigger
try
{
String[] conditions = this.getTriggerParameter2().split(Trigger.triggerParameter2Split);
List<CalendarReceiver.CalendarEvent> calendarEvents = CalendarReceiver.readCalendarEvents(AutomationService.getInstance());
List<CalendarReceiver.CalendarEvent> calendarEvents = CalendarReceiver.readCalendarEvents(AutomationService.getInstance(), false);
/*
0 = titleDirection

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

@@ -107,7 +107,7 @@ public class CalendarReceiver extends BroadcastReceiver implements AutomationLis
}
}
public static List<CalendarEvent> readCalendarEvents(Context context)
public static List<CalendarEvent> readCalendarEvents(Context context, boolean includePastEvents)
{
Cursor cursor;
@@ -128,6 +128,8 @@ public class CalendarReceiver extends BroadcastReceiver implements AutomationLis
List<CalendarEvent> eventlist = new ArrayList<>();
Calendar now = Calendar.getInstance();
for (int i = 0; i < CNames.length; i++)
{
try
@@ -142,7 +144,9 @@ public class CalendarReceiver extends BroadcastReceiver implements AutomationLis
event.end = Miscellaneous.calendarFromLong(Long.parseLong(cursor.getString(6)));
event.location = cursor.getString(7);
event.availability = cursor.getString(8);
eventlist.add(event);
if(includePastEvents || event.end.getTimeInMillis() > now.getTimeInMillis())
eventlist.add(event);
}
catch (Exception e)
{}