calendar trigger

app/src/apkFlavor/AndroidManifest.xml

@@ -144,7 +144,12 @@
         <receiver android:name=".receivers.DateTimeListener" />
         <receiver android:name=".receivers.ConnectivityReceiver" />
         <receiver android:name=".receivers.TimeZoneListener" />
-        <receiver android:name=".receivers.CalendarReceiver" />
+        <receiver android:name=".receivers.CalendarReceiver">
+        <intent-filter>
+            <action android:name="android.intent.action.PROVIDER_CHANGED"/>
+            <data android:scheme="content"/>
+            <data android:host="com.android.calendar"/>
+        </intent-filter> </receiver>
 
         <receiver
             android:name=".DeviceAdmin"

app/src/main/AndroidManifest.xml

@@ -1,4 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
 </manifest>

app/src/main/java/com/jens/automation2/ActivityManageTriggerCalendar.java

@@ -18,13 +18,14 @@ import androidx.annotation.Nullable;
 
 import com.jens.automation2.receivers.CalendarReceiver;
 
-import java.sql.Array;
+import org.apache.commons.lang3.StringUtils;
+
 import java.util.ArrayList;
 import java.util.List;
 
 public class ActivityManageTriggerCalendar extends Activity
 {
-    CheckBox chkCalendarEventActive, chkCalendarAvailabilityBusy, chkCalendarAvailabilityFree, chkCalendarAvailabilityTentative, chkCalendarAvailabilityOutOfOffice, chkCalendarAvailabilityWorkingElsewhere;
+    CheckBox chkCalendarEventActive, chkCalendarAvailabilityBusy, chkCalendarAvailabilityFree, chkCalendarAvailabilityTentative, chkCalendarAvailabilityOutOfOffice, chkCalendarAvailabilityWorkingElsewhere, chkCalendarAllDayEvent;
     Spinner spinnerCalendarTitleDirection, spinnerCalendarLocationDirection, spinnerCalendarDescriptionDirection;
     EditText etCalendarTitle, etCalendarLocation, etCalendarDescription;
     LinearLayout llCalendarSelection;
@@ -47,6 +48,7 @@ public class ActivityManageTriggerCalendar extends Activity
         spinnerCalendarTitleDirection = (Spinner)findViewById(R.id.spinnerCalendarTitleDirection);
         spinnerCalendarLocationDirection = (Spinner)findViewById(R.id.spinnerCalendarLocationDirection);
         spinnerCalendarDescriptionDirection = (Spinner)findViewById(R.id.spinnerCalendarDescriptionDirection);
+        chkCalendarAllDayEvent = (CheckBox)findViewById(R.id.chkCalendarAllDayEvent);
         chkCalendarAvailabilityBusy = (CheckBox)findViewById(R.id.chkCalendarAvailabilityBusy);
         chkCalendarAvailabilityFree = (CheckBox)findViewById(R.id.chkCalendarAvailabilityFree);
         chkCalendarAvailabilityTentative = (CheckBox)findViewById(R.id.chkCalendarAvailabilityTentative);
@@ -80,7 +82,7 @@ public class ActivityManageTriggerCalendar extends Activity
         for(CalendarReceiver.AndroidCalendar cal : CalendarReceiver.readCalendars(ActivityManageTriggerCalendar.this))
         {
             CheckBox oneCalCheckbox = new CheckBox(ActivityManageTriggerCalendar.this);
-            oneCalCheckbox.setText(cal.displayName);
+            oneCalCheckbox.setText(cal.toString());
             oneCalCheckbox.setTag(cal);
             llCalendarSelection.addView(oneCalCheckbox);
             checkboxesCalendars.add(oneCalCheckbox);
@@ -98,6 +100,18 @@ public class ActivityManageTriggerCalendar extends Activity
             }
         });
 
+        chkCalendarAllDayEvent.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener()
+        {
+            @Override
+            public void onCheckedChanged(CompoundButton compoundButton, boolean checked)
+            {
+                if(checked)
+                    chkCalendarAllDayEvent.setText(getResources().getString(R.string.allDayEventTrue));
+                else
+                    chkCalendarAllDayEvent.setText(getResources().getString(R.string.allDayEventFalse));
+            }
+        });
+
         bSaveTriggerCalendar.setOnClickListener(new View.OnClickListener()
         {
             @Override
@@ -140,6 +154,7 @@ public class ActivityManageTriggerCalendar extends Activity
                         titleDir + Trigger.triggerParameter2Split + title + Trigger.triggerParameter2Split +
                         descriptionDir + Trigger.triggerParameter2Split + description + Trigger.triggerParameter2Split +
                         locationDir + Trigger.triggerParameter2Split + location + Trigger.triggerParameter2Split +
+                        String.valueOf(chkCalendarAllDayEvent.isChecked()) + Trigger.triggerParameter2Split +
                         Miscellaneous.explode(separator, availabilityList.toArray(new String[availabilityList.size()])) + Trigger.triggerParameter2Split +
                         Miscellaneous.explode(separator, selectedCalendarsIdArray.toArray(new String[selectedCalendarsIdArray.size()]));
 
@@ -174,8 +189,9 @@ public class ActivityManageTriggerCalendar extends Activity
                 3 = description
                 4 = locationDir
                 5 = location
-                6 = availability list
+                6 = all day event
-                7 = calendars list
+                7 = availability list
+                8 = calendars list
             */
 
             for(int i = 0; i < directions.length; i++)
@@ -194,31 +210,43 @@ public class ActivityManageTriggerCalendar extends Activity
             etCalendarDescription.setText(input[3]);
             etCalendarLocation.setText(input[5]);
 
-            String[] availabilities = input[6].split(separator);
+            chkCalendarAllDayEvent.setChecked(Boolean.parseBoolean(input[6]));
-            String[] calendars = input[7].split(separator);
 
-            for(String avail : availabilities)
+            String[] availabilities = null;
+            if(!StringUtils.isEmpty(input[7]))
+                availabilities = input[7].split(separator);
+
+            String[] calendars = null;
+            if(!StringUtils.isEmpty(input[8]))
+                calendars = input[8].split(separator);
+
+            if(availabilities != null)
             {
-                if(Integer.parseInt(avail) == CalendarContract.Events.AVAILABILITY_BUSY)
+                for (String avail : availabilities)
+                {
+                    if (Integer.parseInt(avail) == CalendarContract.Events.AVAILABILITY_BUSY)
                         chkCalendarAvailabilityBusy.setChecked(true);
-                else if(Integer.parseInt(avail) == CalendarContract.Events.AVAILABILITY_FREE)
+                    else if (Integer.parseInt(avail) == CalendarContract.Events.AVAILABILITY_FREE)
                         chkCalendarAvailabilityFree.setChecked(true);
-                else if(Integer.parseInt(avail) == CalendarContract.Events.AVAILABILITY_TENTATIVE)
+                    else if (Integer.parseInt(avail) == CalendarContract.Events.AVAILABILITY_TENTATIVE)
                         chkCalendarAvailabilityTentative.setChecked(true);
-                else if(Integer.parseInt(avail) == CalendarReceiver.AVAILABILITY_OUT_OF_OFFICE)
+                    else if (Integer.parseInt(avail) == CalendarReceiver.AVAILABILITY_OUT_OF_OFFICE)
                         chkCalendarAvailabilityOutOfOffice.setChecked(true);
-                else if(Integer.parseInt(avail) == CalendarReceiver.AVAILABILITY_WORKING_ELSEWHERE)
+                    else if (Integer.parseInt(avail) == CalendarReceiver.AVAILABILITY_WORKING_ELSEWHERE)
                         chkCalendarAvailabilityWorkingElsewhere.setChecked(true);
                 }
+            }
 
+            if(calendars != null)
+            {
                 List<String> usedCalendarIDs = new ArrayList<>();
                 List<String> unusedCalendarIDs = new ArrayList<>();
-            for(CheckBox checkbox : checkboxesCalendars)
+                for (CheckBox checkbox : checkboxesCalendars)
                 {
-                int id = ((CalendarReceiver.AndroidCalendar)checkbox.getTag()).calendarId;
+                    int id = ((CalendarReceiver.AndroidCalendar) checkbox.getTag()).calendarId;
-                for(String calId : calendars)
+                    for (String calId : calendars)
                     {
-                    if(calId.equals(String.valueOf(id)))
+                        if (calId.equals(String.valueOf(id)))
                         {
                             usedCalendarIDs.add(String.valueOf(id));
                             checkbox.setChecked(true);
@@ -226,12 +254,12 @@ public class ActivityManageTriggerCalendar extends Activity
                         }
                     }
                 }
-            for(String calId : calendars)
+                for (String calId : calendars)
                 {
-                if(!Miscellaneous.arraySearch((ArrayList<String>) usedCalendarIDs, calId, false, true))
+                    if (!Miscellaneous.arraySearch((ArrayList<String>) usedCalendarIDs, calId, false, true))
                         unusedCalendarIDs.add(calId);
                 }
-            if(unusedCalendarIDs.size() > 0)
+                if (unusedCalendarIDs.size() > 0)
                 {
                 /*
                     A calendar has been configured that has been deleted since. We cannot resolve it.
@@ -243,4 +271,5 @@ public class ActivityManageTriggerCalendar extends Activity
                 }
             }
         }
+    }
 }

app/src/main/java/com/jens/automation2/Trigger.java

@@ -631,8 +631,9 @@ public class Trigger
 				3 = description
 				4 = eventLocationDirection
 				5 = eventLocation
-				6 = availabilityDirection
+				6 = all day event
-				7 = availability
+				7 = availabilityList
+				8 = calendarList
 			 */
 
 			for(CalendarReceiver.CalendarEvent event : calendarEvents)
@@ -641,7 +642,7 @@ public class Trigger
 				if(isActive != event.isCurrentlyActive())
 				{
 					Miscellaneous.logEvent("i", "CalendarCheck", "Event has to be currently active: " + String.valueOf(triggerParameter) + ", but is required otherwise.", 5);
-					break;
+					continue;
 				}
 
 				if(!StringUtils.isEmpty(conditions[1]))
@@ -649,7 +650,7 @@ public class Trigger
 					if (!Miscellaneous.compare(conditions[0], conditions[1], event.title))
 					{
 						Miscellaneous.logEvent("i", "CalendarCheck", "Title does not match.", 5);
-						break;
+						continue;
 					}
 				}
 
@@ -658,7 +659,7 @@ public class Trigger
 					if (!Miscellaneous.compare(conditions[2], conditions[3], event.description))
 					{
 						Miscellaneous.logEvent("i", "CalendarCheck", "Description does not match.", 5);
-						break;
+						continue;
 					}
 				}
 
@@ -667,27 +668,39 @@ public class Trigger
 					if (!Miscellaneous.compare(conditions[4], conditions[5], event.location))
 					{
 						Miscellaneous.logEvent("i", "CalendarCheck", "Location does not match.", 5);
-						break;
+						continue;
 					}
 				}
 
-				String[] availabilities = conditions[6].split(ActivityManageTriggerCalendar.separator);
+				if (Boolean.parseBoolean(conditions[6]) != event.allDay)
-				if(availabilities.length > 0)
 				{
-					if(!Miscellaneous.arraySearch(availabilities, event.availability, false, true))
+					Miscellaneous.logEvent("i", "CalendarCheck", "All day setting does not match.", 5);
+					continue;
+				}
+
+				if(!StringUtils.isEmpty(conditions[7]))
+				{
+					String[] availabilities = conditions[7].split(ActivityManageTriggerCalendar.separator);
+					if (availabilities.length > 0)
+					{
+						if (!Miscellaneous.arraySearch(availabilities, event.availability, false, true))
 						{
 							Miscellaneous.logEvent("i", "CalendarCheck", "Availability does not match.", 5);
-						break;
+							continue;
+						}
 					}
 				}
 
-				String[] calendars = conditions[7].split(ActivityManageTriggerCalendar.separator);
+				if(!StringUtils.isEmpty(conditions[8]))
-				if(availabilities.length > 0)
 				{
-					if(!Miscellaneous.arraySearch(calendars, String.valueOf(event.calendarId), false, true))
+					String[] calendars = conditions[8].split(ActivityManageTriggerCalendar.separator);
+					if (calendars.length > 0)
+					{
+						if (!Miscellaneous.arraySearch(calendars, String.valueOf(event.calendarId), false, true))
 						{
 							Miscellaneous.logEvent("i", "CalendarCheck", "Calendar does not match.", 5);
-						break;
+							continue;
+						}
 					}
 				}
 
@@ -696,9 +709,16 @@ public class Trigger
 				return true;
 			}
 
-			//At this point none of the calendar items matches this trigger
+			// At this point none of the calendar items matches this trigger
 
-			//TODO: If trigger demands no calendar event and there is absolutely no future event, we'll need to check for that.
+			// If trigger demands no calendar event and there is absolutely no future event, we'll need to check for that.
+			if(calendarEvents.size() == 0)
+			{
+				 if(getTriggerParameter() == false)
+					 return true;
+
+				 // Further criteria don't matter if there are no events to check
+			}
 		}
 		catch(Exception e)
 		{
@@ -1927,9 +1947,9 @@ public class Trigger
 							||
 						!StringUtils.isEmpty(conditions[5])
 							||
-						!StringUtils.isEmpty(conditions[6])
+						!StringUtils.isEmpty(conditions[7])
 							||
-						!StringUtils.isEmpty(conditions[7]))
+						!StringUtils.isEmpty(conditions[8]))
 				{
 					returnString.append(" (");
 
@@ -1940,11 +1960,16 @@ public class Trigger
 					if (!StringUtils.isEmpty(conditions[5]))
 						returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.calendarDescription) + " " + conditions[4] + " " + conditions[5] + ", ");
 
-					if (!StringUtils.isEmpty(conditions[6]))
+					if(Boolean.parseBoolean(conditions[6]))
-						returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.availabilities) + " " + conditions[6] + ", ");
+						returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.allDayEventTrue) + ", ");
+					else
+						returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.allDayEventFalse) + ", ");
 
 					if (!StringUtils.isEmpty(conditions[7]))
-						returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.calendars) + " " + conditions[7]);
+						returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.availabilities) + " " + conditions[7] + ", ");
+
+					if (!StringUtils.isEmpty(conditions[8]))
+						returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.calendars) + " " + conditions[8]);
 
 					if (returnString.toString().endsWith(", "))
 						returnString.delete(returnString.length() - 2, returnString.length());

app/src/main/java/com/jens/automation2/receivers/CalendarReceiver.java

@@ -30,6 +30,7 @@ public class CalendarReceiver extends BroadcastReceiver implements AutomationLis
     public static final int AVAILABILITY_WORKING_ELSEWHERE = 5;
 
     static List<AndroidCalendar> calendarsCache = null;
+    static List<CalendarEvent> calendarEventsCache = null;
 
     public static CalendarReceiver getInstance()
     {
@@ -44,6 +45,9 @@ public class CalendarReceiver extends BroadcastReceiver implements AutomationLis
     {
         if(intent.getAction().equalsIgnoreCase(Intent.ACTION_PROVIDER_CHANGED))
         {
+            calendarsCache = null;
+            calendarEventsCache = null;
+
             ArrayList<Rule> ruleCandidates = Rule.findRuleCandidates(Trigger.Trigger_Enum.calendarEvent);
             for(int i = 0; i < ruleCandidates.size(); i++)
             {
@@ -65,6 +69,7 @@ public class CalendarReceiver extends BroadcastReceiver implements AutomationLis
             {
                 calendarIntentFilter = new IntentFilter();
                 calendarIntentFilter.addAction(Intent.ACTION_PROVIDER_CHANGED);
+//                calendarIntentFilter.addDataScheme("content");
             }
 
             AutomationService.getInstance().registerReceiver(calendarReceiverInstance, calendarIntentFilter);
@@ -104,6 +109,14 @@ public class CalendarReceiver extends BroadcastReceiver implements AutomationLis
     {
         public int calendarId;
         public String displayName;
+        public String accountString;
+
+        @NonNull
+        @Override
+        public String toString()
+        {
+            return displayName + " (" + accountString + ")";
+        }
     }
 
     public static class CalendarEvent
@@ -142,7 +155,7 @@ public class CalendarReceiver extends BroadcastReceiver implements AutomationLis
 
             cursor = context.getContentResolver().query(
                     Uri.parse("content://com.android.calendar/calendars"),
-                    new String[]{"_id", "calendar_displayName"},
+                    new String[]{ "_id", "calendar_displayName", "ownerAccount",  },
                     null, null, null);
 
             cursor.moveToFirst();
@@ -158,6 +171,7 @@ public class CalendarReceiver extends BroadcastReceiver implements AutomationLis
                     AndroidCalendar calendar = new AndroidCalendar();
                     calendar.calendarId = Integer.parseInt(cursor.getString(0));
                     calendar.displayName = cursor.getString(1);
+                    calendar.accountString = cursor.getString(2);
 
                     calendarsCache.add(calendar);
                 }
@@ -176,6 +190,10 @@ public class CalendarReceiver extends BroadcastReceiver implements AutomationLis
 
     public static List<CalendarEvent> readCalendarEvents(Context context, boolean includePastEvents)
     {
+        if(calendarEventsCache == null)
+        {
+            calendarEventsCache = new ArrayList<>();
+
             Cursor cursor;
 
                 cursor = context.getContentResolver().query(
@@ -187,8 +205,6 @@ public class CalendarReceiver extends BroadcastReceiver implements AutomationLis
             // fetching calendars name
             String CNames[] = new String[cursor.getCount()];
 
-        List<CalendarEvent> eventlist = new ArrayList<>();
-
             Calendar now = Calendar.getInstance();
 
             for (int i = 0; i < CNames.length; i++)
@@ -217,7 +233,7 @@ public class CalendarReceiver extends BroadcastReceiver implements AutomationLis
                     event.availability = cursor.getString(8);
 
                     if(includePastEvents || event.end.getTimeInMillis() > now.getTimeInMillis())
-                    eventlist.add(event);
+                        calendarEventsCache.add(event);
                 }
                 catch (Exception e)
                 {}
@@ -226,8 +242,9 @@ public class CalendarReceiver extends BroadcastReceiver implements AutomationLis
 
             if(cursor != null)
                 cursor.close();
+        }
 
-        return eventlist;
+        return calendarEventsCache;
     }
 
     public static void startCalendarReceiver(final AutomationService automationServiceRef)

app/src/main/res/layout/activity_manage_trigger_calendar.xml

@@ -168,6 +168,30 @@
 
 			</TableRow>
 
+			<ImageView
+				android:layout_width="match_parent"
+				android:layout_height="1dp"
+				android:layout_margin="10dp"
+				android:layout_marginVertical="@dimen/default_margin"
+				android:background="#aa000000" />
+
+			<TableRow
+				android:layout_marginBottom="@dimen/activity_vertical_margin">
+
+				<TextView
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_gravity="center_vertical"
+					android:text="@string/allDayEvent" />
+
+				<CheckBox
+					android:id="@+id/chkCalendarAllDayEvent"
+					android:checked="false"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content" />
+
+			</TableRow>
+
 			<ImageView
 				android:layout_width="match_parent"
 				android:layout_height="1dp"

app/src/main/res/values/strings.xml

@@ -924,4 +924,8 @@
     <string name="anyCalendar">any calender</string>
     <string name="availabilities">availabilities</string>
     <string name="calendarsMissingHint">In this trigger calendars with IDs %1$s have been previously configured, but have been deleted since. With the next save those will be removed from this trigger. Until then this trigger/condition will never be met.</string>
+    <string name="account">account</string>
+    <string name="allDayEvent">All day event</string>
+    <string name="allDayEventTrue">event is an all day event</string>
+    <string name="allDayEventFalse">event is not an all day event</string>
 </resources>