calendar trigger

app/src/apkFlavor/AndroidManifest.xml

@@ -144,12 +144,7 @@
         <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/java/com/jens/automation2/ActivityManageTriggerCalendar.java

@@ -1,7 +1,12 @@
 package com.jens.automation2;
 
+import android.Manifest;
 import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.os.Build;
 import android.os.Bundle;
 import android.provider.CalendarContract;
 import android.view.View;
@@ -14,6 +19,7 @@ import android.widget.LinearLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.jens.automation2.receivers.CalendarReceiver;
@@ -36,6 +42,7 @@ public class ActivityManageTriggerCalendar extends Activity
 
     private static String[] directions;
     ArrayAdapter<String> directionSpinnerAdapter;
+    public static int requestCodePermissionReadCalendar = 815;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState)
@@ -79,14 +86,36 @@ public class ActivityManageTriggerCalendar extends Activity
         spinnerCalendarDescriptionDirection.setAdapter(directionSpinnerAdapter);
         directionSpinnerAdapter.notifyDataSetChanged();
 
-        for(CalendarReceiver.AndroidCalendar cal : CalendarReceiver.readCalendars(ActivityManageTriggerCalendar.this))
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
         {
-            CheckBox oneCalCheckbox = new CheckBox(ActivityManageTriggerCalendar.this);
+            if(ActivityPermissions.havePermission(Manifest.permission.READ_CALENDAR, ActivityManageTriggerCalendar.this) || ActivityPermissions.havePermission(Manifest.permission.WRITE_CALENDAR, ActivityManageTriggerCalendar.this))
-            oneCalCheckbox.setText(cal.toString());
+                populateCalenderCheckboxes();
-            oneCalCheckbox.setTag(cal);
+            else
-            llCalendarSelection.addView(oneCalCheckbox);
+            {
-            checkboxesCalendars.add(oneCalCheckbox);
+                AlertDialog.Builder builder = new AlertDialog.Builder(ActivityManageTriggerCalendar.this);
+                builder.setTitle(getResources().getString(R.string.info));
+                builder.setMessage(getResources().getString(R.string.permissionCalendarRequired));
+                builder.setNegativeButton(getResources().getString(R.string.cancel), new DialogInterface.OnClickListener()
+                {
+                    @Override
+                    public void onClick(DialogInterface dialogInterface, int i)
+                    {
+                        ActivityManageTriggerCalendar.this.finish();
                     }
+                });
+                builder.setPositiveButton(getResources().getString(R.string.ok), new DialogInterface.OnClickListener()
+                {
+                    @Override
+                    public void onClick(DialogInterface dialogInterface, int i)
+                    {
+                        requestPermissions(new String[]{ Manifest.permission.READ_CALENDAR } , requestCodePermissionReadCalendar);
+                    }
+                });
+                builder.show();
+            }
+        }
+        else
+            populateCalenderCheckboxes();
 
         chkCalendarEventActive.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener()
         {
@@ -172,6 +201,30 @@ public class ActivityManageTriggerCalendar extends Activity
             loadValuesIntoGui(inputIntent);
     }
 
+    private void populateCalenderCheckboxes()
+    {
+        List<CalendarReceiver.AndroidCalendar> calList = CalendarReceiver.readCalendars(ActivityManageTriggerCalendar.this);
+
+        if(calList != null)
+        {
+            if(calList.size() > 0)
+            {
+                for (CalendarReceiver.AndroidCalendar cal : calList)
+                {
+                    CheckBox oneCalCheckbox = new CheckBox(ActivityManageTriggerCalendar.this);
+                    oneCalCheckbox.setText(cal.toString());
+                    oneCalCheckbox.setTag(cal);
+                    llCalendarSelection.addView(oneCalCheckbox);
+                    checkboxesCalendars.add(oneCalCheckbox);
+                }
+            }
+            else
+                Miscellaneous.messageBox(getResources().getString(R.string.warning), getResources().getString(R.string.noCalendarsOnYourDevice), ActivityManageTriggerCalendar.this).show();
+        }
+        else
+            Miscellaneous.messageBox(getResources().getString(R.string.warning), getResources().getString(R.string.errorReadingCalendars), ActivityManageTriggerCalendar.this).show();
+    }
+
     void loadValuesIntoGui(Intent data)
     {
         //TODO:try-catch
@@ -181,7 +234,7 @@ public class ActivityManageTriggerCalendar extends Activity
 
         if(data.hasExtra(ActivityManageRule.intentNameTriggerParameter2))
         {
-            String input[] = data.getStringExtra(ActivityManageRule.intentNameTriggerParameter2).split(Trigger.triggerParameter2Split);
+            String input[] = data.getStringExtra(ActivityManageRule.intentNameTriggerParameter2).split(Trigger.triggerParameter2Split, -1);
             /*
                 0 = titleDir
                 1 = title
@@ -216,10 +269,6 @@ public class ActivityManageTriggerCalendar extends Activity
             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)
             {
                 for (String avail : availabilities)
@@ -237,6 +286,10 @@ public class ActivityManageTriggerCalendar extends Activity
                 }
             }
 
+            String[] calendars = null;
+            if(!StringUtils.isEmpty(input[8]))
+                calendars = input[8].split(separator);
+
             if(calendars != null)
             {
                 List<String> usedCalendarIDs = new ArrayList<>();
@@ -272,4 +325,25 @@ public class ActivityManageTriggerCalendar extends Activity
             }
         }
     }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults)
+    {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+
+        if(requestCode == requestCodePermissionReadCalendar)
+        {
+            if(
+                    permissions[0].equals(Manifest.permission.READ_CALENDAR)
+                        ||
+                    permissions[0].equals(Manifest.permission.WRITE_CALENDAR)
+            )
+            {
+                if(grantResults[0] == PackageManager.PERMISSION_GRANTED)
+                    populateCalenderCheckboxes();
+                else
+                    finish();
+            }
+        }
+    }
 }

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

@@ -806,7 +806,7 @@ public class Miscellaneous extends Service
 		alertDialog.setTitle(title);
 		alertDialog.setMessage(message);		
 
-		alertDialog.setPositiveButton("Ok", new DialogInterface.OnClickListener()
+		alertDialog.setPositiveButton(context.getResources().getString(R.string.ok), new DialogInterface.OnClickListener()
 		{
 			public void onClick(DialogInterface dialog, int whichButton)
 			{

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

@@ -1933,25 +1933,18 @@ public class Trigger
 					returnString.append(String.format(Miscellaneous.getAnyContext().getResources().getString(R.string.variableCheckStringDeleted), triggerParameter2));
 				break;
 			case calendarEvent:
+				returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.calendarEvent));
+
+				returnString.append(" (");
+
 				if(triggerParameter)
 					returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.eventIsCurrentlyHappening));
 				else
 					returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.eventIsCurrentlyNotHappening));
 
-				String[] conditions = triggerParameter2.split(triggerParameter2Split, -1);
+				returnString.append( ", ");
 
-				if(
+				String[] conditions = triggerParameter2.split(triggerParameter2Split, -1);
-						!StringUtils.isEmpty(conditions[1])
-							||
-						!StringUtils.isEmpty(conditions[3])
-							||
-						!StringUtils.isEmpty(conditions[5])
-							||
-						!StringUtils.isEmpty(conditions[7])
-							||
-						!StringUtils.isEmpty(conditions[8]))
-				{
-					returnString.append(" (");
 
 				if (!StringUtils.isEmpty(conditions[1]))
 					returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.title) + " " + conditions[0] + " " + conditions[1] + ", ");
@@ -1975,7 +1968,7 @@ public class Trigger
 					returnString.delete(returnString.length() - 2, returnString.length());
 
 				returnString.append(")");
-				}
+
 				break;
 			default:
 				returnString.append("error");

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

@@ -17,6 +17,8 @@ import com.jens.automation2.Trigger;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
+import java.util.Timer;
+import java.util.TimerTask;
 
 public class CalendarReceiver extends BroadcastReceiver implements AutomationListenerInterface
 {
@@ -32,6 +34,10 @@ public class CalendarReceiver extends BroadcastReceiver implements AutomationLis
     static List<AndroidCalendar> calendarsCache = null;
     static List<CalendarEvent> calendarEventsCache = null;
 
+    static Timer timer = null;
+    static TimerTask timerTask = null;
+    static Calendar nextWakeup = null;
+
     public static CalendarReceiver getInstance()
     {
         if(calendarReceiverInstance == null)
@@ -45,9 +51,18 @@ public class CalendarReceiver extends BroadcastReceiver implements AutomationLis
     {
         if(intent.getAction().equalsIgnoreCase(Intent.ACTION_PROVIDER_CHANGED))
         {
+            Miscellaneous.logEvent("i", "CalendarReceiver", "Received " + intent.getAction(), 5);
+
             calendarsCache = null;
             calendarEventsCache = null;
 
+            checkForRules(context);
+            armOrRearmTimer();
+        }
+    }
+
+    private static void checkForRules(Context context)
+    {
         ArrayList<Rule> ruleCandidates = Rule.findRuleCandidates(Trigger.Trigger_Enum.calendarEvent);
         for(int i = 0; i < ruleCandidates.size(); i++)
         {
@@ -55,7 +70,6 @@ public class CalendarReceiver extends BroadcastReceiver implements AutomationLis
                 ruleCandidates.get(i).activate(AutomationService.getInstance(), false);
         }
     }
-    }
 
     @Override
     public void startListener(AutomationService automationService)
@@ -242,11 +256,79 @@ public class CalendarReceiver extends BroadcastReceiver implements AutomationLis
 
             if(cursor != null)
                 cursor.close();
+
         }
 
         return calendarEventsCache;
     }
 
+    private static void armOrRearmTimer()
+    {
+        timerTask = new TimerTask()
+        {
+            @Override
+            public void run()
+            {
+                checkForRules(Miscellaneous.getAnyContext());
+
+                // Set next timer
+
+                calculateNextWakeup();
+                armOrRearmTimer();
+            }
+        };
+
+        if(timer != null)
+        {
+            timer.cancel();
+            timer.purge();
+        }
+        timer = new Timer();
+
+        if(nextWakeup == null)
+        {
+            readCalendarEvents(Miscellaneous.getAnyContext(), false);
+            calculateNextWakeup();
+        }
+
+        // If it's now filled, go on
+        if(nextWakeup != null)
+            timer.schedule(timerTask, nextWakeup.getTimeInMillis());
+    }
+
+    private static void calculateNextWakeup()
+    {
+        Calendar now = Calendar.getInstance();
+        if (nextWakeup != null && nextWakeup.getTimeInMillis() < now.getTimeInMillis())
+            nextWakeup = null;
+
+        List<CalendarEvent> events = readCalendarEvents(Miscellaneous.getAnyContext(), false);
+        if (events.size() > 0)
+        {
+            for (CalendarEvent event : events)
+            {
+                if (event.isCurrentlyActive())
+                {
+                    if (nextWakeup == null || event.end.getTimeInMillis() < nextWakeup.getTimeInMillis())
+                    {
+                        nextWakeup = event.end;
+                        Miscellaneous.logEvent("i", "calculateNextWakeupForCalendar()", "Choosing end of event " + event.title + " as next wakeup.", 5);
+                    }
+                }
+                else
+                {
+                    if (nextWakeup == null || event.start.getTimeInMillis() < nextWakeup.getTimeInMillis())
+                    {
+                        nextWakeup = event.start;
+                        Miscellaneous.logEvent("i", "calculateNextWakeupForCalendar()", "Choosing start of event " + event.title + " as next wakeup.", 5);
+                    }
+                }
+            }
+        }
+        //else
+        //  we expect to be called byOnReceive() when new items exist
+    }
+
     public static void startCalendarReceiver(final AutomationService automationServiceRef)
     {
         if (!calendarReceiverActive)
@@ -260,25 +342,15 @@ public class CalendarReceiver extends BroadcastReceiver implements AutomationLis
             {
                 calendarIntentFilter = new IntentFilter();
                 calendarIntentFilter.addAction(Intent.ACTION_PROVIDER_CHANGED);
+                calendarIntentFilter.addDataScheme("content");
+                calendarIntentFilter.addDataAuthority("com.android.calendar", null);
             }
 
             calendarIntent = automationServiceRef.registerReceiver(calendarReceiverInstance, calendarIntentFilter);
 
             calendarReceiverActive = true;
-        }
-    }
 
-    public static void stopScreenStateReceiver()
+            armOrRearmTimer();
-    {
-        if (calendarReceiverActive)
-        {
-            if (calendarReceiverInstance != null)
-            {
-                automationServiceRef.unregisterReceiver(calendarReceiverInstance);
-                calendarReceiverInstance = null;
-            }
-
-            calendarReceiverActive = false;
         }
     }
 }

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

@@ -301,8 +301,9 @@
 
 				<TextView
 					android:id="@+id/tvMissingCalendarHint"
-					android:layout_width="match_parent"
+					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
+					android:layout_marginRight="@dimen/default_margin"
 					android:layout_gravity="center_vertical"
 					android:textStyle="bold" />
 

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

@@ -765,7 +765,7 @@
     <string name="startPhoneCall">Llamar al número de teléfono</string>
     <string name="android.permission.CALL_PHONE">Llamar al número de teléfono</string>
     <string name="makePhoneCallExplanation1">Aquí puede ingresar un número de teléfono al que se llamará sin más indicaciones. Puede usar esto para realizar configuraciones como realizar ajustes en el enrutamiento de llamadas, etc. Por favor, busque los códigos necesarios para esto por su cuenta.</string>
-    <string name="endPhoneCall">Terminar llamda de teléfono</string>
+    <string name="endPhoneCall">Terminar llamada de teléfono</string>
     <string name="android.permission.ANSWER_PHONE_CALLS">Terminar llamda de teléfono</string>
     <string name="settingsReferringToRestrictedFeaturesInGoogle">La configuración y/o las reglas hacen referencia a funciones que no se pueden proporcionar en la versión de Google Play. Entre otras cosas que incluye todo lo relacionado con llamadas telefónicas y mensajes de texto.</string>
     <string name="variableCheckStringDeleted">Si la variable %1$s no está establecida</string>

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

@@ -918,9 +918,9 @@
     <string name="calendarStringTentative">tentative</string>
     <string name="calendarStringOutOfOffice">out of office</string>
     <string name="calendarStringWorkingElsewhere">working elsewhere</string>
-    <string name="selectingNoneItemForAllToMatch">Select no item if any will do.</string>
+    <string name="selectingNoneItemForAllToMatch">If you select no item, any one will be ok.</string>
     <string name="calendars">Calendars</string>
-    <string name="calendarAvailabilityTypesUnsupported">It may be that only the first 3 types are actually working becaue the other types are not part of Google Calendar.</string>
+    <string name="calendarAvailabilityTypesUnsupported">It may be that only the first 3 types are actually working because the other types are not part of Google Calendar.</string>
     <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>
@@ -928,4 +928,7 @@
     <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>
+    <string name="permissionCalendarRequired">The permission to read your calendar will be required for a calendar trigger. It will already be required to populate the calendar fields in this window.</string>
+    <string name="noCalendarsOnYourDevice">It appears like no calendars have been set up on your device. You can save this trigger, but it will never return true.</string>
+    <string name="errorReadingCalendars">There was an error reading the calendars on your device.</string>
 </resources>