New version

# Conflicts:
#	app/src/main/java/com/jens/automation2/Actions.java

.gitignore

@@ -145,7 +145,7 @@ fabric.properties
 
 # End of https://www.toptal.com/developers/gitignore/api/androidstudio
 
-
+output-metadata.json
 /app/app-release.apk
 Automation_settings.xml
 /app/googlePlayFlavor/

app/build.gradle

@@ -8,11 +8,11 @@ android {
     defaultConfig {
         applicationId "com.jens.automation2"
         minSdkVersion 16
-        compileSdkVersion 31
+        compileSdkVersion 33
         buildToolsVersion '29.0.2'
         useLibrary  'org.apache.http.legacy'
-        versionCode 120
-        versionName "1.7.6"
+        versionCode 142
+        versionName "1.8.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -36,9 +36,15 @@ android {
         {
             dimension "version"
             versionNameSuffix "-googlePlay"
-            targetSdkVersion 30
+            targetSdkVersion 33
         }
 
+        /*
+            targetSdkVersion is kept at 28 for as long as possible.
+            If raised wifi cannot be switched on or off anymore without root permissions.
+            In the Google version I'm forced to raise the value regularly.
+         */
+
         fdroidFlavor
         {
             dimension "version"
@@ -72,9 +78,9 @@ dependencies {
 
     //implementation "androidx.security:security-crypto:1.0.0"
     //implementation "androidx.security:security-identity-credential:1.0.0-alpha02"
-    implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'com.google.android.material:material:1.3.0'
-    testImplementation 'junit:junit:4.+'
+    implementation 'androidx.appcompat:appcompat:1.4.2'
+    implementation 'com.google.android.material:material:1.6.1'
+    testImplementation 'junit:junit:4'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 }

app/googlePlayFlavor/release/output-metadata.json

@@ -1,20 +0,0 @@
-{
-  "version": 3,
-  "artifactType": {
-    "type": "APK",
-    "kind": "Directory"
-  },
-  "applicationId": "com.jens.automation2",
-  "variantName": "googlePlayFlavorRelease",
-  "elements": [
-    {
-      "type": "SINGLE",
-      "filters": [],
-      "attributes": [],
-      "versionCode": 119,
-      "versionName": "1.7.5-googlePlay",
-      "outputFile": "app-googlePlayFlavor-release.apk"
-    }
-  ],
-  "elementType": "File"
-}

app/src/apkFlavor/AndroidManifest.xml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <supports-screens
         android:anyDensity="true"
@@ -50,7 +52,6 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
-<!--    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />-->
     <uses-permission android:name="android.permission.GET_TASKS" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.NFC" />
@@ -66,6 +67,18 @@
     <uses-permission android:name="com.wireguard.android.permission.CONTROL_TUNNELS"/>
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
     <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
+    <uses-permission android:name="android.permission.CALL_PHONE" />
+    <uses-permission android:name="android.permission.ANSWER_PHONE_CALLS" />
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+    <uses-permission android:name="android.permission.READ_CALL_LOG" />
+    <uses-permission android:name="android.permission.READ_CALENDAR" />
+    <uses-permission
+        android:name="android.permission.WRITE_SECURE_SETTINGS"
+        tools:ignore="ProtectedPermissions" />
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"/>
+        <!--android:maxSdkVersion="32" />
+    <uses-permission android:name="android.permission.USE_EXACT_ALARM" />-->
+
 
     <uses-feature
         android:name="android.hardware.telephony"
@@ -83,7 +96,7 @@
     <application
         android:allowBackup="true"
         android:allowClearUserData="true"
-        android:icon="@drawable/gears"
+        android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme"
         android:networkSecurityConfig="@xml/network_security_config">
@@ -126,6 +139,7 @@
             </intent-filter>
         </receiver>
         <receiver android:name=".receivers.PackageReplacedReceiver"
+            android:exported="true"
             android:enabled="true">
             <intent-filter>
                 <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
@@ -134,9 +148,11 @@
         <receiver android:name=".receivers.DateTimeListener" />
         <receiver android:name=".receivers.ConnectivityReceiver" />
         <receiver android:name=".receivers.TimeZoneListener" />
+        <receiver android:name=".receivers.CalendarReceiver" />
 
         <receiver
             android:name=".DeviceAdmin"
+            android:exported="true"
             android:description="@string/app_name"
             android:label="@string/app_name"
             android:permission= "android.permission.BIND_DEVICE_ADMIN" >
@@ -169,8 +185,18 @@
         <activity android:name=".ActivityManageActionRunExecutable" />
         <activity android:name=".ActivityManageActionWifi" />
         <activity android:name=".ActivityManageTriggerTethering" />
+        <activity android:name=".ActivityManageActionWakeLock" />
+        <activity android:name=".ActivityManageTriggerSubSystemState" />
+        <activity android:name=".ActivityManageActionMakePhoneCall" />
+        <activity android:name=".ActivityManageActionSetVariable" />
+        <activity android:name=".ActivityManageTriggerCheckVariable" />
+        <activity android:name=".ActivityManageActionCopyToClipboard" />
+        <activity android:name=".ActivityManageActionLocationService" />
+        <activity android:name=".ActivityManageTriggerCharging" />
+
         <activity
             android:name=".ActivityMainTabLayout"
+            android:exported="true"
             android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -216,9 +242,11 @@
         <activity android:name=".ActivityVolumeTest" />
         <activity android:name=".ActivityPermissions"></activity>
         <activity android:name=".ActivityManageTriggerNotification" />
+        <activity android:name=".ActivityManageTriggerCalendar" />
 
         <service
             android:name=".receivers.NotificationListener"
+            android:exported="true"
             android:label="@string/app_name"
             android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE" >
             <intent-filter>
@@ -250,6 +278,17 @@
             android:exported="true"
             />
 
+        <service android:name=".MyAccessibilityService"
+            android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
+            <intent-filter>
+                <action android:name="android.accessibilityservice.AccessibilityService" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.accessibilityservice"
+                android:resource="@xml/config_accessibility_service" />
+        </service>
+
     </application>
 
 </manifest>

app/src/apkFlavor/java/com/jens/automation2/MyGoogleApiClient.java

@@ -18,7 +18,7 @@ public class MyGoogleApiClient
     public com.google.android.gms.appindexing.Action getIndexApiAction()
     {
         Thing object = new Thing.Builder()
-                .setName("ActivityMainScreen Page") // TODO: Define a title for the content shown.
+                .setName("ActivityMainScreen Page")
                 // TODO: Make sure this auto-generated URL is correct.
                 .setUrl(Uri.parse("http://[ENTER-YOUR-URL-HERE]"))
                 .build();

app/src/apkFlavor/java/com/jens/automation2/Rule.java

@@ -10,9 +10,12 @@ import android.os.Looper;
 import android.util.Log;
 import android.widget.Toast;
 
+import androidx.annotation.Nullable;
+
 import com.google.android.gms.location.DetectedActivity;
 import com.jens.automation2.receivers.ActivityDetectionReceiver;
 import com.jens.automation2.receivers.BroadcastListener;
+import com.jens.automation2.receivers.CalendarReceiver;
 
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -107,7 +110,7 @@ public class Rule implements Comparable<Rule>
 	}
 	public void setName(String name)
 	{
-		this.name = name;
+		this.name = name.trim();
 	}
 
 	public static void readFromFile()
@@ -347,7 +350,16 @@ public class Rule implements Comparable<Rule>
 			if(oneTrigger.getTriggerType().equals(Trigger.Trigger_Enum.timeFrame))
 			{
 				if(oneTrigger.getTimeFrame().repetition > 0)
-					return true;
+				{
+					if(this.getLastExecution() != null)
+					{
+						Calendar now = Calendar.getInstance();
+						if (this.getLastExecution().getTimeInMillis() + oneTrigger.getTimeFrame().getRepetition() * 1000 <= now.getTimeInMillis())
+							return true;
+					}
+					else
+						return true;
+				}
 			}
 			else if(oneTrigger.getTriggerType().equals(Trigger.Trigger_Enum.broadcastReceived))
 			{
@@ -364,23 +376,28 @@ public class Rule implements Comparable<Rule>
 		{
 			if(hasNotAppliedSinceLastExecution())
 			{
-				Miscellaneous.logEvent("i", "getsGreenLight()", "Rule " + getName() + " applies and has flipped since its last execution.", 4);
+				Miscellaneous.logEvent("i", "getsGreenLight()", "Rule \"" + getName() + "\" applies and has flipped since its last execution.", 4);
+				return true;
+			}
+			else if(hasTriggerOfType(Trigger.Trigger_Enum.calendarEvent) && CalendarReceiver.mayRuleStillBeActivatedForPendingCalendarEvents(this))
+			{
+				Miscellaneous.logEvent("i", "getsGreenLight()", "Rule \"" + getName() + "\" applies, has not flipped since its last execution, but may still be executed for other calendar events.", 4);
 				return true;
 			}
 			else
-				Miscellaneous.logEvent("i", "getsGreenLight()", "Rule " + getName() + " has not flipped since its last execution.", 4);
+				Miscellaneous.logEvent("i", "getsGreenLight()", "Rule \"" + getName() + "\" has not flipped since its last execution.", 4);
 		}
 		else
-			Miscellaneous.logEvent("i", "getsGreenLight()", "Rule " + getName() + " does not apply.", 4);
+			Miscellaneous.logEvent("i", "getsGreenLight()", "Rule \"" + getName() + "\" does not apply.", 4);
 
 		return false;
 	}
-	
+
 	public boolean applies(Context context)
 	{
 		if(AutomationService.getInstance() == null)
 		{
-			Miscellaneous.logEvent("i", "RuleCheck", "Automation service not running. Rule " + getName() + " cannot apply.", 3);
+			Miscellaneous.logEvent("i", "RuleCheck", "Automation service not running. Rule \"" + getName() + "\" cannot apply.", 3);
 			return false;
 		}
 		
@@ -392,11 +409,11 @@ public class Rule implements Comparable<Rule>
 					return false;
 			}
 
-			Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), String.format("Rule %1$s generally applies currently. Checking if it's really due, yet will be done separately.", this.getName()), 3);
+			Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), String.format("Rule \"%1$s\" generally applies currently. Checking if it's really due, yet will be done separately.", this.getName()), 3);
 			return true;
 		}
 		
-		Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), String.format(context.getResources().getString(R.string.ruleIsDeactivatedCantApply), this.getName()), 3);
+		Miscellaneous.logEvent("i", String.format(context.getResources().getString(R.string.ruleCheckOf), this.getName()), String.format(context.getResources().getString(R.string.ruleIsDeactivatedCantApply), this.getName()), 4);
 		return false;
 	}
 
@@ -467,7 +484,9 @@ public class Rule implements Comparable<Rule>
 		{
 			AutomationService service = AutomationService.getInstance();
 			service.speak(messages[0], false);
-			Toast.makeText(service, messages[0], Toast.LENGTH_LONG).show();
+
+			if(Settings.showToasts)
+				Toast.makeText(service, messages[0], Toast.LENGTH_LONG).show();
 			
 			super.onProgressUpdate(messages);
 		}
@@ -496,7 +515,7 @@ public class Rule implements Comparable<Rule>
 		{
 			boolean isActuallyToggleable = isActuallyToggable();
 
-			boolean notLastActive = getLastActivatedRule() == null || !getLastActivatedRule().equals(Rule.this);
+//			boolean notLastActive = getLastActivatedRule() == null || !getLastActivatedRule().equals(Rule.this);
 			boolean doToggle = ruleToggle && isActuallyToggleable;
 
 			String message;
@@ -510,6 +529,29 @@ public class Rule implements Comparable<Rule>
 			if(Settings.startNewThreadForRuleActivation)
 				publishProgress(message);
 
+			/*
+				Make a note of Rule/CalendarEvent executed combinations
+			 */
+			if(Rule.this.hasTriggerOfType(Trigger.Trigger_Enum.calendarEvent))
+			{
+				for(CalendarReceiver.CalendarEvent event : CalendarReceiver.getApplyingCalendarEvents(Rule.this))
+				{
+					if(!CalendarReceiver.hasEventBeenUsedInRule(Rule.this, event))
+					{
+						/*
+							Record only the first calendar event that matched because the rule may
+							be executed once for every matching event.
+						 */
+						Miscellaneous.logEvent("i", "Rule", "Executing this rule run for calender event: " + event, 5);
+						CalendarReceiver.addUsedPair(new CalendarReceiver.RuleEventPair(Rule.this, event));
+						break;
+					}
+				}
+			}
+
+			/*
+				Run actions one after another
+			 */
 			for(int i = 0; i< Rule.this.getActionSet().size(); i++)
 			{
 				try
@@ -769,4 +811,71 @@ public class Rule implements Comparable<Rule>
 
 		return null;
 	}
+
+	@Override
+	public boolean equals(@Nullable Object obj)
+	{
+		return this.getName().equals(((Rule)obj).getName());
+	}
+
+	public boolean hasTriggerOfType(Trigger.Trigger_Enum queryType)
+	{
+		for(Trigger t : getTriggerSet())
+		{
+			if(t.getTriggerType().equals(queryType))
+				return true;
+		}
+
+		return false;
+	}
+
+	public boolean hasActionOfType(Action.Action_Enum queryType)
+	{
+		for(Action a : getActionSet())
+		{
+			if(a.getAction().equals(queryType))
+				return true;
+		}
+
+		return false;
+	}
+
+	public int getAmountOfTriggersForType(Trigger.Trigger_Enum type)
+	{
+		int amount = 0;
+
+		for(Trigger t : getTriggerSet())
+		{
+			if(t.getTriggerType().equals(type))
+				amount++;
+		}
+
+		return amount;
+	}
+
+	public int getAmountOfActionsForType(Action.Action_Enum type)
+	{
+		int amount = 0;
+
+		for(Action a : getActionSet())
+		{
+			if(a.getAction().equals(type))
+				amount++;
+		}
+
+		return amount;
+	}
+
+	public static int getAmountOfActivatedRules()
+	{
+		int amount = 0;
+
<