v118

app/build.gradle

@@ -8,11 +8,11 @@ android {
     defaultConfig {
         applicationId "com.jens.automation2"
         minSdkVersion 16
-        compileSdkVersion 29
+        compileSdkVersion 31
         buildToolsVersion '29.0.2'
         useLibrary  'org.apache.http.legacy'
-        versionCode 114
-        versionName "1.7"
+        versionCode 118
+        versionName "1.7.4"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -28,10 +28,6 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
-    lintOptions {
-        checkReleaseBuilds false
-        abortOnError false
-    }
 
     flavorDimensions "version"
 
@@ -57,9 +53,14 @@ android {
             targetSdkVersion 28
         }
     }
+    lint {
+        abortOnError false
+        checkReleaseBuilds false
+    }
 }
 
 dependencies {
+    implementation 'org.jetbrains:annotations:15.0'
     googlePlayFlavorImplementation 'com.google.firebase:firebase-appindexing:20.0.0'
     googlePlayFlavorImplementation 'com.google.android.gms:play-services-location:18.0.0'
 
@@ -71,9 +72,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.3.0'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
     implementation 'com.google.android.material:material:1.3.0'
     testImplementation 'junit:junit:4.+'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 }

app/googlePlayFlavor/release/output-metadata.json

@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 114,
-      "versionName": "1.7-googlePlay",
+      "versionCode": 118,
+      "versionName": "1.7.4-googlePlay",
       "outputFile": "app-googlePlayFlavor-release.apk"
     }
   ],

app/src/apkFlavor/AndroidManifest.xml

@@ -65,6 +65,8 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
     <uses-permission android:name="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE"/>
     <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-feature
         android:name="android.hardware.telephony"
@@ -72,6 +74,12 @@
     <uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS" />
     <uses-permission android:name="android.permission.SEND_SMS"/>
 
+    <queries>
+        <intent>
+            <action
+                android:name="android.intent.action.TTS_SERVICE" />
+        </intent>
+    </queries>
 
     <application
         android:allowBackup="true"
@@ -121,15 +129,7 @@
         <receiver android:name=".receivers.PackageReplacedReceiver"
             android:enabled="true">
             <intent-filter>
-                <!--<action android:name="android.intent.action.PACKAGE_ADDED"/>
-                <action android:name="android.intent.action.PACKAGE_REPLACED" />
-                <action android:name="android.intent.action.PACKAGE_REMOVED"/>
-                <action android:name="android.intent.action.ACTION_PACKAGE_REPLACED" />-->
                 <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
-
-                <!--<data
-                    android:path="com.jens.automation2"
-                    android:scheme="package" />-->
             </intent-filter>
         </receiver>
         <receiver android:name=".receivers.DateTimeListener" />
@@ -154,13 +154,17 @@
         <activity android:name=".ActivityDisplayLongMessage" />
         <activity android:name=".ActivityManageActionSendTextMessage" />
         <activity android:name=".ActivityManageActionPlaySound" />
+        <activity android:name=".ActivityManageActionCloseNotification" />
+        <activity android:name=".ActivityManageTriggerProfile" />
         <activity android:name=".ActivityManageTriggerTimeFrame" />
-        <activity android:name=".ActivityMaintenance" />
+        <activity android:name=".ActivityControlCenter" />
         <activity android:name=".ActivityManageTriggerPhoneCall" />
         <activity android:name=".ActivityManageActionBrightnessSetting" />
+        <activity android:name=".ActivityManageActionCreateNotification" />
         <activity android:name=".ActivityManageTriggerDeviceOrientation" />
         <activity android:name=".ActivityHelp" />
         <activity android:name=".ActivityManageActionVibrate" />
+        <activity android:name=".ActivityManageActionControlMedia" />
         <activity
             android:name=".ActivityMainTabLayout"
             android:launchMode="singleTask">

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

@@ -5,6 +5,7 @@ import static com.jens.automation2.Trigger.triggerParameter2Split;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Looper;
 import android.util.Log;
 import android.widget.Toast;
@@ -12,20 +13,19 @@ import android.widget.Toast;
 import com.google.android.gms.location.DetectedActivity;
 import com.jens.automation2.receivers.ActivityDetectionReceiver;
 
-import java.sql.Time;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.List;
 
 
 public class Rule implements Comparable<Rule>
 {
 	private static ArrayList<Rule> ruleCollection = new ArrayList<Rule>();
-	public static boolean isAnyRuleActive = false;
+
+	private static List<Rule> ruleRunHistory = new ArrayList<Rule>();
 	
-	private static ArrayList<Rule> ruleRunHistory = new ArrayList<Rule>();
-	
-	public static ArrayList<Rule> getRuleRunHistory()
+	public static List<Rule> getRuleRunHistory()
 	{
 		return ruleRunHistory;
 	}
@@ -312,19 +312,12 @@ public class Rule implements Comparable<Rule>
 			switch(action.getAction())
 			{
 				case setAirplaneMode:
-					return true;
 				case setBluetooth:
-					return true;
 				case setDataConnection:
-					return true;
 				case setDisplayRotation:
-					return true;
 				case setUsbTethering:
-					return true;
 				case setWifi:
-					return true;
 				case setWifiTethering:
-					return true;
 				case setBluetoothTethering:
 					return true;
 				default:
@@ -351,7 +344,10 @@ public class Rule implements Comparable<Rule>
 		if(applies(context))
 		{
 			if(hasNotAppliedSinceLastExecution())
+			{
+				Miscellaneous.logEvent("i", "getsGreenLight()", "Rule " + getName() + " applies and has flipped since its last execution.", 4);
 				return true;
+			}
 			else
 				Miscellaneous.logEvent("i", "getsGreenLight()", "Rule " + getName() + " has not flipped since its last execution.", 4);
 		}
@@ -433,7 +429,7 @@ public class Rule implements Comparable<Rule>
 			
 			Thread.setDefaultUncaughtExceptionHandler(Miscellaneous.uncaughtExceptionHandler);
 
-			// without this line debugger will - for some reason - skip all breakpoints in this class
+			// without this line the debugger will - for some reason - skip all breakpoints in this class
 			if(android.os.Debug.isDebuggerConnected())
 				android.os.Debug.waitForDebugger();
 			
@@ -441,7 +437,7 @@ public class Rule implements Comparable<Rule>
 	        	Looper.prepare();
 
 			setLastExecution(Calendar.getInstance());
-			wasActivated = activateInternally((AutomationService)params[0], (Boolean)params[1]);
+			wasActivated = activateInternally((AutomationService)params[0]);
 
 			return null;
 		}
@@ -476,66 +472,57 @@ public class Rule implements Comparable<Rule>
 		 * Will activate the rule. Should be called by a separate execution thread
 		 * @param automationService
 		 */
-		protected boolean activateInternally(AutomationService automationService, boolean force)
+		protected boolean activateInternally(AutomationService automationService)
 		{
-			boolean isActuallyToggable = isActuallyToggable();
+			boolean isActuallyToggleable = isActuallyToggable();
 
 			boolean notLastActive = getLastActivatedRule() == null || !getLastActivatedRule().equals(Rule.this);
-			boolean doToggle = ruleToggle && isActuallyToggable;
+			boolean doToggle = ruleToggle && isActuallyToggleable;
 
-			//if(notLastActive || force || doToggle)
-//			if(force || doToggle)
-//			{
-				String message;
-				if(!doToggle)
-					message = String.format(automationService.getResources().getString(R.string.ruleActivate), Rule.this.getName());
-				else
-					message = String.format(automationService.getResources().getString(R.string.ruleActivateToggle), Rule.this.getName());
-				Miscellaneous.logEvent("i", "Rule", message, 2);
-//				automationService.speak(message);
-//				Toast.makeText(automationService, message, Toast.LENGTH_LONG).show();
-				if(Settings.startNewThreadForRuleActivation)
-					publishProgress(message);
+			String message;
+			if(!doToggle)
+				message = String.format(automationService.getResources().getString(R.string.ruleActivate), Rule.this.getName());
+			else
+				message = String.format(automationService.getResources().getString(R.string.ruleActivateToggle), Rule.this.getName());
 
-				for(int i = 0; i< Rule.this.getActionSet().size(); i++)
-				{
-					try
-					{
-						Rule.this.getActionSet().get(i).run(automationService, doToggle);
-					}
-					catch(Exception e)
-					{
-						Miscellaneous.logEvent("e", "RuleExecution", "Error running action of rule " + Rule.this.getName() + ": " + Log.getStackTraceString(e), 1);
-					}
-				}
+			Miscellaneous.logEvent("i", "Rule", message, 2);
 
-				// Keep log of last x rule activations (Settings)
+			if(Settings.startNewThreadForRuleActivation)
+				publishProgress(message);
+
+			for(int i = 0; i< Rule.this.getActionSet().size(); i++)
+			{
 				try
 				{
-					Rule.ruleRunHistory.add(0, Rule.this);		// add at beginning for better visualization
-					Rule.lastActivatedRuleActivationTime = new Date();
-
-					while(ruleRunHistory.size() > Settings.rulesThatHaveBeenRanHistorySize)
-						ruleRunHistory.remove(ruleRunHistory.size()-1);
-					String history = "";
-					for(Rule rule : ruleRunHistory)
-						history += rule.getName() + ", ";
-					if(history.length() > 0)
-						history = history.substring(0, history.length()-2);
-					Miscellaneous.logEvent("i", "Rule history", "Most recent first: " + history, 4);
+					Rule.this.getActionSet().get(i).run(automationService, doToggle);
 				}
 				catch(Exception e)
 				{
-					Miscellaneous.logEvent("e", "Rule history error", Log.getStackTraceString(e), 3);
+					Miscellaneous.logEvent("e", "RuleExecution", "Error running action of rule " + Rule.this.getName() + ": " + Log.getStackTraceString(e), 1);
 				}
+			}
 
-				Miscellaneous.logEvent("i", "Rule", String.format(Miscellaneous.getAnyContext().getResources().getString(R.string.ruleActivationComplete), Rule.this.getName()), 2);
-//			}
-//			else
-//			{
-//				Miscellaneous.logEvent("i", "Rule", "Request to activate rule " + Rule.this.getName() + ", but it is the last one that was activated. Won't do it again.", 3);
-//				return false;
-//			}
+			// Keep log of last x rule activations (Settings)
+			try
+			{
+				Rule.ruleRunHistory.add(0, Rule.this);		// add at beginning for better visualization
+				Rule.lastActivatedRuleActivationTime = new Date();
+
+				while(ruleRunHistory.size() > Settings.rulesThatHaveBeenRanHistorySize)
+					ruleRunHistory.remove(ruleRunHistory.size()-1);
+				String history = "";
+				for(Rule rule : ruleRunHistory)
+					history += rule.getName() + ", ";
+				if(history.length() > 0)
+					history = history.substring(0, history.length()-2);
+				Miscellaneous.logEvent("i", "Rule history", "Most recent first: " + history, 4);
+			}
+			catch(Exception e)
+			{
+				Miscellaneous.logEvent("e", "Rule history error", Log.getStackTraceString(e), 3);
+			}
+
+			Miscellaneous.logEvent("i", "Rule", String.format(Miscellaneous.getAnyContext().getResources().getString(R.string.ruleActivationComplete), Rule.this.getName()), 2);
 
 			return true;
 		}
@@ -544,7 +531,10 @@ public class Rule implements Comparable<Rule>
 	public void activate(AutomationService automationService, boolean force)
 	{
 		ActivateRuleTask task = new ActivateRuleTask();
-		task.execute(automationService, force);
+		if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)
+			task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, automationService, force);
+		else
+			task.execute(automationService, force);
 	}
 
 	public static ArrayList<Rule> findRuleCandidates(Trigger.Trigger_Enum triggerType)
@@ -553,13 +543,33 @@ public class Rule implements Comparable<Rule>
 
 		for(Rule oneRule : ruleCollection)
 		{
-			innerloop:
+			innerLoop:
 			for(Trigger oneTrigger : oneRule.getTriggerSet())
 			{
-				if(oneTrigger.getTriggerType() == triggerType)
+				if(oneTrigger.getTriggerType().equals(triggerType))
 				{
 					ruleCandidates.add(oneRule);
-					break innerloop; // we don't need to check the other triggers in the same rule
+					break innerLoop; // we don't need to check the other triggers in the same rule
+				}
+			}
+		}
+
+		return ruleCandidates;
+	}
+
+	public static ArrayList<Rule> findRuleCandidates(Action.Action_Enum actionType)
+	{
+		ArrayList<Rule> ruleCandidates = new ArrayList<Rule>();
+
+		for(Rule oneRule : ruleCollection)
+		{
+			innerloop:
+			for(Action oneAction : oneRule.getActionSet())
+			{
+				if(oneAction.getAction().equals(actionType))
+				{
+					ruleCandidates.add(oneRule);
+					break innerloop; // we don't need to check the other actions in the same rule
 				}
 			}
 		}
@@ -608,186 +618,6 @@ public class Rule implements Comparable<Rule>
 		return ruleCandidates;
 	}
 	
-	/*public static ArrayList<Rule> findRuleCandidatesByTimeFrame(TimeFrame searchTimeFrame, boolean triggerParameter)
-	{
-		ArrayList<Rule> ruleCandidates = new ArrayList<Rule>();
-		
-		for(int i=0; i<ruleCollection.size(); i++)
-		{
-			innerloop:
-			for(int j=0; j<ruleCollection.get(i).getTriggerSet().size(); j++)
-			{
-				if(ruleCollection.get(i).getTriggerSet().get(j).getTriggerType() == Trigger.Trigger_Enum.timeFrame)
-				{
-					if(ruleCollection.get(i).getTriggerSet().get(j).getTimeFrame().equals(searchTimeFrame) && ruleCollection.get(i).getTriggerSet().get(j).getTriggerParameter() == triggerParameter)
-					{
-						ruleCandidates.add(ruleCollection.get(i));
-						break innerloop; //if the poi is found we don't need to search the other triggers in the same rule
-					}
-				}
-			}
-		}
-		
-		return ruleCandidates;
-	}*/
-
-	/*public static ArrayList<Rule> findRuleCandidatesByTime(Time searchTime)
-	{
-		Miscellaneous.logEvent("i", "RuleSearch", "Searching for rules with TimeFrame with time " + searchTime.toString() + ". RuleCollection-Size: " + String.valueOf(ruleCollection.size()), 3);;
-		ArrayList<Rule> ruleCandidates = new ArrayList<Rule>();
-		
-		for(Rule oneRule : ruleCollection)
-		{
-			innerloop:
-			for(Trigger oneTrigger : oneRule.getTriggerSet())
-			{
-				if(oneTrigger.getTriggerType() == Trigger.Trigger_Enum.timeFrame)
-				{
-					Miscellaneous.logEvent("i", "RuleSearch", "Searching interval: " + oneTrigger.getTimeFrame().getTriggerTimeStart().toString() + " to " + oneTrigger.getTimeFrame().getTriggerTimeStop().toString(), 5);
-					Miscellaneous.logEvent("i", "RuleSearch", "interval start: " + String.valueOf(oneTrigger.getTimeFrame().getTriggerTimeStart().getTime()), 5);
-					Miscellaneous.logEvent("i", "RuleSearch", "search time: " + String.valueOf(searchTime.getTime()), 5);
-					Miscellaneous.logEvent("i", "RuleSearch", "interval stop: " + String.valueOf(oneTrigger.getTimeFrame().getTriggerTimeStop().getTime()), 5);
-					
-					if(oneTrigger.getTimeFrame().getTriggerTimeStart().getTime() > oneTrigger.getTimeFrame().getTriggerTimeStop().getTime())
-					{
-						Miscellaneous.logEvent("i", "Timeframe search", "Rule (" + oneRule.getName() + ") stretches over midnight.", 5);
-						if(oneTrigger.getTimeFrame().getTriggerTimeStart().getTime() <= searchTime.getTime() || searchTime.getTime() <= oneTrigger.getTimeFrame().getTriggerTimeStop().getTime()+20000) //add 20 seconds because of delay
-						{
-							ruleCandidates.add(oneRule);
-							break innerloop; //if the poi is found we don't need to search the other triggers in the same rule
-						}
-					}
-					else if(oneTrigger.getTimeFrame().getTriggerTimeStart().getTime() <= searchTime.getTime() && searchTime.getTime() <= oneTrigger.getTimeFrame().getTriggerTimeStop().getTime()+20000) //add 20 seconds because of delay
-					{
-						Miscellaneous.logEvent("i", "RuleSearch", "Rule found (" + oneRule.getName() + ") with TimeFrame with time " + searchTime.toString(), 3);
-						ruleCandidates.add(oneRule);
-						break innerloop; //if the poi is found we don't need to search the other triggers in the same rule
-					}
-				}
-			}
-		}
-
-		Miscellaneous.logEvent("i", "RuleSearch", String.valueOf(ruleCandidates.size()) + " Rule(s) found with TimeFrame with time " + searchTime.toString(), 3);
-		
-		return ruleCandidates;
-	}*/
-	
-	/*public static ArrayList<Rule> findRuleCandidatesByCharging(boolean triggerParameter)
-	{
-		ArrayList<Rule> ruleCandidates = new ArrayList<Rule>();
-		
-		for(Rule oneRule : ruleCollection)
-		{
-			innerloop:
-			for(Trigger oneTrigger : oneRule.getTriggerSet())
-			{
-				if(oneTrigger.getTriggerType() == Trigger.Trigger_Enum.charging)
-				{
-					if(oneTrigger.getTriggerParameter() == triggerParameter)
-					{
-						ruleCandidates.add(oneRule);
-						break innerloop; //if the poi is found we don't need to search the other triggers in the same rule
-					}
-				}
-			}
-		}
-		
-		return ruleCandidates;
-	}*/
-	
-	/*public static ArrayList<Rule> findRuleCandidatesByUsbHost(boolean triggerParameter)
-	{
-		ArrayList<Rule> ruleCandidates = new ArrayList<Rule>();
-		
-		for(Rule oneRule : ruleCollection)
-		{
-			innerloop:
-			for(Trigger oneTrigger : oneRule.getTriggerSet())
-			{
-				if(oneTrigger.getTriggerType() == Trigger.Trigger_Enum.usb_host_connection)
-				{
-					if(oneTrigger.getTriggerParameter() == triggerParameter)
-					{
-						ruleCandidates.add(oneRule);
-						break innerloop; //if the poi is found we don't need to search the other triggers in the same rule
-					}
-				}
-			}
-		}
-		
-		return ruleCandidates;
-	}*/
-	
-	/*public static ArrayList<Rule> findRuleCandidatesByAirplaneMode(boolean triggerParameter)
-	{
-		ArrayList<Rule> ruleCandidates = new ArrayList<Rule>();
-		
-		for(Rule oneRule : ruleCollection)
-		{
-			innerloop:
-			for(Trigger oneTrigger : oneRule.getTriggerSet())
-			{
-				if(oneTrigger.getTriggerType() == Trigger.Trigger_Enum.airplaneMode)
-				{
-					if(oneTrigger.getTriggerParameter() == triggerParameter)
-					{
-						ruleCandidates.add(oneRule);
-						break innerloop; //we don't need to search the other triggers in the same rule
-					}
-				}
-			}
-		}
-		
-		return ruleCandidates;
-	}*/
-	
-	/*public static ArrayList<Rule> findRuleCandidatesByRoaming(boolean triggerParameter)
-	{
-		ArrayList<Rule> ruleCandidates = new ArrayList<Rule>();
-		
-		for(Rule oneRule : ruleCollection)
-		{
-			innerloop:
-			for(Trigger oneTrigger : oneRule.getTriggerSet())
-			{
-				if(oneTrigger.getTriggerType() == Trigger.Trigger_Enum.roaming)
-				{
-					if(oneTrigger.getTriggerParameter() == triggerParameter)
-					{
-						ruleCandidates.add(oneRule);
-						break innerloop; //we don't need to search the other triggers in the same rule
-					}
-				}
-			}
-		}
-		
-		return ruleCandidates;
-	}*/
-	
-	/*public static ArrayList<Rule> findRuleCandidatesByPhoneCall(String direction)
-	{
-		ArrayList<Rule> ruleCandidates = new ArrayList<Rule>();
-
-		for(Rule oneRule : ruleCollection)
-		{
-			innerloop:
-			for(Trigger oneTrigger : oneRule.getTriggerSet())
-			{
-				if(oneTrigger.getTriggerType() == Trigger.Trigger_Enum.phoneCall)
-				{
-					String[] elements = oneTrigger.getTriggerParameter2().split(triggerParameter2Split);
-					if(elements[1].equals(Trigger.triggerPhoneCallDirectionAny) || elements[1].equals(direction))
-					{
-						ruleCandidates.add(oneRule);
-						break innerloop; //we don't need to search the other triggers in the same rule
-					}
-				}
-			}
-		}
-
-		return ruleCandidates;
-	}*/
-	
 	public static ArrayList<Rule> findRuleCandidatesByPoi(PointOfInterest searchPoi)
 	{
 		ArrayList<Rule> ruleCandidates = new ArrayList<Rule>();
@@ -810,31 +640,32 @@ public class Rule implements Comparable<Rule>
 		
 		return ruleCandidates;
 	}
-	
-	/*public static ArrayList<Rule> findRuleCandidatesByHeadphoneJack(boolean triggerParameter)
+
+	public static ArrayList<Rule> findRuleCandidatesByTriggerProfile(Profile profile)
 	{
 		ArrayList<Rule> ruleCandidates = new ArrayList<Rule>();
-		
+
 		for(Rule oneRule : ruleCollection)
 		{
 			innerloop:
 			for(Trigger oneTrigger : oneRule.getTriggerSet())
 			{
-				if(oneTrigger.getTriggerType() == Trigger.Trigger_Enum.headsetPlugged)
+				if(oneTrigger.getTriggerType() == Trigger.Trigger_Enum.profileActive)
 				{
-					if(oneTrigger.getTriggerParameter() == triggerParameter)
+					String profileName = oneTrigger.getTriggerParameter2().split(triggerParameter2Split)[0];
+					if(profileName.equals(profile.getName()))
 					{
 						ruleCandidates.add(oneRule);
-						break innerloop; //we don't need to search the other triggers in the same rule
+						break innerloop; //if the profile is found we don't need to search the other triggers in the same rule
 					}
 				}
 			}
 		}
-		
+
 		return ruleCandidates;
-	}*/
+	}
 	
-	public static ArrayList<Rule> findRuleCandidatesByProfile(Profile profile)
+	public static ArrayList<Rule> findRuleCandidatesByActionProfile(Profile profile)
 	{
 		ArrayList<Rule> ruleCandidates = new ArrayList<Rule>();
 		
@@ -907,4 +738,15 @@ public class Rule implements Comparable<Rule>
 	{
 		return ActivityPermissions.havePermissionsForRule(this, Miscellaneous.getAnyContext());
 	}
-}
+
+	public static Rule getByName(String ruleName)
+	{
+		for(Rule r : Rule.getRuleCollection())
+		{
+			if(r.getName().equals(ruleName))
+				return r;
+		}
+
+		return null;
+	}
+}

app/src/fdroidFlavor/AndroidManifest.xml

@@ -51,6 +51,7 @@
     <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" />
@@ -62,6 +63,8 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
     <uses-permission android:name="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE"/>
     <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-feature
         android:name="android.hardware.telephony"
@@ -69,6 +72,12 @@
     <uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS" />
     <uses-permission android:name="android.permission.SEND_SMS"/>
 
+    <queries>
+        <intent>
+            <action
+                android:name="android.intent.action.TTS_SERVICE" />
+        </intent>
+    </queries>
 
     <application
         android:allowBackup="true"
@@ -118,15 +127,7 @@
         <receiver android:name=".receivers.PackageReplacedReceiver"
             android:enabled="true">
             <intent-filter>
-                <!--<action android:name="android.intent.action.PACKAGE_ADDED"/>
-                <action android:name="android.intent.action.PACKAGE_REPLACED" />
-                <action android:name="android.intent.action.PACKAGE_REMOVED"/>
-                <action android:name="android.intent.action.ACTION_PACKAGE_REPLACED" />-->
                 <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
-
-                <!--<data
-                    android:path="com.jens.automation2"
-                    android:scheme="package" />-->
             </intent-filter>
         </receiver>
         <receiver android:name=".receivers.DateTimeListener" />
@@ -151,13 +152,17 @@
         <activity android:name=".ActivityDisplayLongMessage" />
         <activity android:name=".ActivityManageActionSendTextMessage" />
         <activity android:name=".ActivityManageActionPlaySound" />
+        <activity android:name=".ActivityManageActionCloseNotification" />
+        <activity android:name=".ActivityManageTriggerProfile" />
         <activity android:name=".ActivityManageTriggerTimeFrame" />
-        <activity android:name=".ActivityMaintenance" />
+        <activity android:name=".ActivityControlCenter" />
         <activity android:name=".ActivityManageTriggerPhoneCall" />
         <activity android:name=".ActivityManageActionBrightnessSetting" />
+        <activity android:name=".ActivityManageActionCreateNotification" />
         <activity android:name=".ActivityManageTriggerDeviceOrientation" />
         <activity android:name=".ActivityHelp" />
         <activity android:name=".ActivityManageActionVibrate" />
+        <activity android:name=".ActivityManageActionControlMedia" />
         <activity
             android:name=".ActivityMainTabLayout"
             android:launchMode="singleTask">
@@ -184,6 +189,7 @@
 			</intent-filter>
             -->
 
+
             <!--
                  <meta-data
 		        android:name="android.nfc.action.TECH_DISCOVERED"
@@ -217,7 +223,6 @@
 
         <activity android:name=".ActivityPermissions" />
 
-
 <!--        https://developer.android.com/about/versions/pie/android-9.0-changes-28#apache-p-->
         <uses-library android:name="org.apache.http.legacy" android:required="false"/>
 

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

@@ -5,23 +5,24 @@ import static com.jens.automation2.Trigger.triggerParameter2Split;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Looper;
 import android.util.Log;
 import android.widget.Toast;
-import java.sql.Time;
+
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.List;
 
 
 public class Rule implements Comparable<Rule>
 {
 	private static ArrayList<Rule> ruleCollection = new ArrayList<Rule>();
-	public static boolean isAnyRuleActive = false;
+
+	private static List<Rule> ruleRunHistory = new ArrayList<Rule>();
 	
-	private static ArrayList<Rule> ruleRunHistory = new ArrayList<Rule>();
-	
-	public static ArrayList<Rule> getRuleRunHistory()
+	public static List<Rule> getRuleRunHistory()
 	{
 		return ruleRunHistory;
 	}
@@ -44,7 +45,7 @@ public class Rule implements Comparable<Rule>
 	{
 		this.lastExecution = lastExecution;
 	}
-	
+
 	public boolean isRuleToggle()
 	{
 		return ruleToggle;
@@ -308,19 +309,12 @@ public class Rule implements Comparable<Rule>
 			switch(action.getAction())
 			{
 				case setAirplaneMode:
-					return true;
 				case setBluetooth:
-					return true;
 				case setDataConnection:
-					return true;
 				case setDisplayRotation:
-					return true;
 				case setUsbTethering:
-					return true;
 				case setWifi:
-					return true;
 				case setWifiTethering:
-					return true;
 				case setBluetoothTethering:
 					return true;
 				default:
@@ -347,7 +341,10 @@ public class Rule implements Comparable<Rule>
 		if(applies(context))
 		{
 			if(hasNotAppliedSinceLastExecution())
+			{
+				Miscellaneous.logEvent("i", "getsGreenLight()", "Rule " + getName() + " applies and has flipped since its last execution.", 4);
 				return true;
+			}
 			else
 				Miscellaneous.logEvent("i", "getsGreenLight()", "Rule " + getName() + " has not flipped since its last execution.", 4);
 		}
@@ -405,7 +402,7 @@ public class Rule implements Comparable<Rule>
 			
 			Thread.setDefaultUncaughtExceptionHandler(Miscellaneous.uncaughtExceptionHandler);
 
-			// without this line debugger will - for some reason - skip all breakpoints in this class
+			// without this line the debugger will - for some reason - skip all breakpoints in this class
 			if(android.os.Debug.isDebuggerConnected())
 				android.os.Debug.waitForDebugger();
 			
@@ -413,7 +410,7 @@ public class Rule implements Comparable<Rule>
 	        	Looper.prepare();
 
 			setLastExecution(Calendar.getInstance());
-			wasActivated = activateInternally((AutomationService)params[0], (Boolean)params[1]);
+			wasActivated = activateInternally((AutomationService)params[0]);
 
 			return null;
 		}
@@ -448,66 +445,57 @@ public class Rule implements Comparable<Rule>
 		 * Will activate the rule. Should be called by a separate execution thread
 		 * @param automationService
 		 */
-		protected boolean activateInternally(AutomationService automationService, boolean force)
+		protected boolean activateInternally(AutomationService automationService)
 		{
-			boolean isActuallyToggable = isActuallyToggable();
+			boolean isActuallyToggleable = isActuallyToggable();
 
 			boolean notLastActive = getLastActivatedRule() == null || !getLastActivatedRule().equals(Rule.this);
-			boolean doToggle = ruleToggle && isActuallyToggable;
+			boolean doToggle = ruleToggle && isActuallyToggleable;
 
-			//if(notLastActive || force || doToggle)
-//			if(force || doToggle)
-//			{
-				String message;
-				if(!doToggle)
-					message = String.format(automationService.getResources().getString(R.string.ruleActivate), Rule.this.getName());
-				else
-					message = String.format(automationService.getResources().getString(R.string.ruleActivateToggle), Rule.this.getName());
-				Miscellaneous.logEvent("i", "Rule", message, 2);
-//				automationService.speak(message);
-//				Toast.makeText(automationService, message, Toast.LENGTH_LONG).show();
-				if(Settings.startNewThreadForRuleActivation)
-					publishProgress(message);
+			String message;
+			if(!doToggle)
+				message = String.format(automationService.getResources().getString(R.string.ruleActivate), Rule.this.getName());
+			else
+				message = String.format(automationService.getResources().getString(R.string.ruleActivateToggle), Rule.this.getName());
 
-				for(int i = 0; i< Rule.this.getActionSet().size(); i++)
-				{
-					try
-					{
-						Rule.this.getActionSet().get(i).run(automationService, doToggle);
-					}
-					catch(Exception e)
-					{
-						Miscellaneous.logEvent("e", "RuleExecution", "Error running action of rule " + Rule.this.getName() + ": " + Log.getStackTraceString(e), 1);
-					}
-				}
+			Miscellaneous.logEvent("i", "Rule", message, 2);
 
-				// Keep log of last x rule activations (Settings)
+			if(Settings.startNewThreadForRuleActivation)
+				publishProgress(message);
+
+			for(int i = 0; i< Rule.this.getActionSet().size(); i++)
+			{
 				try
 				{
-					Rule.ruleRunHistory.add(0, Rule.this);		// add at beginning for better visualization
-					Rule.lastActivatedRuleActivationTime = new Date();
-
-					while(ruleRunHistory.size() > Settings.rulesThatHaveBeenRanHistorySize)
-						ruleRunHistory.remove(ruleRunHistory.size()-1);
-					String history = "";
-					for(Rule rule : ruleRunHistory)
-						history += rule.getName() + ", ";
-					if(history.length() > 0)
-						history = history.substring(0, history.length()-2);
-					Miscellaneous.logEvent("i", "Rule history", "Most recent first: " + history, 4);
+					Rule.this.getActionSet().get(i).run(automationService, doToggle);
 				}
 				catch(Exception e)
 				{
-					Miscellaneous.logEvent("e", "Rule history error", Log.getStackTraceString(e), 3);
+					Miscellaneous.logEvent("e", "RuleExecution", "Error running action of rule " + Rule.this.getName() + ": " + Log.getStackTraceString(e), 1);
 				}
+			}
 
-				Miscellaneous.logEvent("i", "Rule", String.format(Miscellaneous.getAnyContext().getResources().getString(R.string.ruleActivationComplete), Rule.this.getName()), 2);
-//			}
-//			else
-//			{
-//				Miscellaneous.logEvent("i", "Rule", "Request to activate rule " + Rule.this.getName() + ", but it is the last one that was activated. Won't do it again.", 3);
-//				return false;
-//			}
+			// Keep log of last x rule activations (Settings)
+			try
+			{
+				Rule.ruleRunHistory.add(0, Rule.this);		// add at beginning for better visualization
+				Rule.lastActivatedRuleActivationTime = new Date();
+
+				while(ruleRunHistory.size() > Settings.rulesThatHaveBeenRanHistorySize)
+					ruleRunHistory.remove(ruleRunHistory.size()-1);
+				String history = "";
+				for(Rule rule : ruleRunHistory)
+					history += rule.getName() + ", ";
+				if(history.length() > 0)
+					history = history.substring(0, history.length()-2);
+				Miscellaneous.logEvent("i", "Rule history", "Most recent first: " + history, 4);
+			}
+			catch(Exception e)
+			{
+				Miscellaneous.logEvent("e", "Rule history error", Log.getStackTraceString(e), 3);
+			}
+
+			Miscellaneous.logEvent("i", "Rule", String.format(Miscellaneous.getAnyContext().getResources().getString(R.string.ruleActivationComplete), Rule.this.getName()), 2);
 
 			return true;
 		}
@@ -516,7 +504,10 @@ public class Rule implements Comparable<Rule>
 	public void activate(AutomationService automationService, boolean force)
 	{
 		ActivateRuleTask task = new ActivateRuleTask();
-		task.execute(automationService, force);
+		if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)
+			task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, automationService, force);
+		else
+			task.execute(automationService, force);
 	}
 
 	public static ArrayList<Rule> findRuleCandidates(Trigger.Trigger_Enum triggerType)
@@ -525,13 +516,33 @@ public class Rule implements Comparable<Rule>
 
 		for(Rule oneRule : ruleCollection)
 		{
-			innerloop:
+			innerLoop:
 			for(Trigger oneTrigger : oneRule.getTriggerSet())
 			{
-				if(oneTrigger.getTriggerType() == triggerType)
+				if(oneTrigger.getTriggerType().equals(triggerType))
 				{
 					ruleCandidates.add(oneRule);
-					break innerloop; // we don't need to check the other triggers in the same rule
+					break innerLoop; // we don't need to check the other triggers in the same rule
+				}
+			}
+		}
+
+		return ruleCandidates;
+	}
+
+	public static ArrayList<Rule> findRuleCandidates(Action.Action_Enum actionType)
+	{
+		ArrayList<Rule> ruleCandidates = new ArrayList<Rule>();
+
+		for(Rule oneRule : ruleCollection)
+		{
+			innerloop:
+			for(Action oneAction : oneRule.getActionSet())
+			{
+				if(oneAction.getAction().equals(actionType))
+				{
+					ruleCandidates.add(oneRule);
+					break innerloop; // we don't need to check the other actions in the same rule
 				}
 			}
 		}
@@ -580,186 +591,6 @@ public class Rule implements Comparable<Rule>
 		return ruleCandidates;
 	}
 	
-	/*public static ArrayList<Rule> findRuleCandidatesByTimeFrame(TimeFrame searchTimeFrame, boolean triggerParameter)
-	{
-		ArrayList<Rule> ruleCandidates = new ArrayList<Rule>();
-		
-		for(int i=0; i<ruleCollection.size(); i++)
-		{
-			innerloop:
-			for(int j=0; j<ruleCollection.get(i).getTriggerSet().size(); j++)
-			{
-				if(ruleCollection.get(i).getTriggerSet().get(j).getTriggerType() == Trigger.Trigger_Enum.timeFrame)
-				{
-					if(ruleCollection.get(i).getTriggerSet().get(j).getTimeFrame().equals(searchTimeFrame) && ruleCollection.get(i).getTriggerSet().get(j).getTriggerParameter() == triggerParameter)
-					{
-						ruleCandidates.add(ruleCollection.get(i));
-						break innerloop; //if the poi is found we don't need to search the other triggers in the same rule
-					}
-				}
-			}
-		}
-		
-		return ruleCandidates;
-	}*/
-
-	/*public static ArrayList<Rule> findRuleCandidatesByTime(Time searchTime)
-	{
-		Miscellaneous.logEvent("i", "RuleSearch", "Searching for rules with TimeFrame with time " + searchTime.toString() + ". RuleCollection-Size: " + String.valueOf(ruleCollection.size()), 3);;
-		ArrayList<Rule> ruleCandidates = new ArrayList<Rule>();
-		
-		for(Rule oneRule : ruleCollection)
-		{
-			innerloop:
-			for(Trigger oneTrigger : oneRule.getTriggerSet())
-			{
-				if(oneTrigger.getTriggerType() == Trigger.Trigger_Enum.timeFrame)
-				{
-					Miscellaneous.logEvent("i", "RuleSearch", "Searching interval: " + oneTrigger.getTimeFrame().getTriggerTimeStart().toString() + " to " + oneTrigger.getTimeFrame().getTriggerTimeStop().toString(), 5);
-					Miscellaneous.logEvent("i", "RuleSearch", "interval start: " + String.valueOf(oneTrigger.getTimeFrame().getTriggerTimeStart().getTime()), 5);
-					Miscellaneous.logEvent("i", "RuleSearch", "search time: " + String.valueOf(searchTime.getTime()), 5);
-					Miscellaneous.logEvent("i", "RuleSearch", "interval stop: " + String.valueOf(oneTrigger.getTimeFrame().getTriggerTimeStop().getTime()), 5);
-					
-					if(oneTrigger.getTimeFrame().getTriggerTimeStart().getTime() > oneTrigger.getTimeFrame().getTriggerTimeStop().getTime())
-					{
-						Miscellaneous.logEvent("i", "Timeframe search", "Rule (" + oneRule.getName() + ") stretches over midnight.", 5);
-						if(oneTrigger.getTimeFrame().getTriggerTimeStart().getTime() <= searchTime.getTime() || searchTime.getTime() <= oneTrigger.getTimeFrame().getTriggerTimeStop().getTime()+20000) //add 20 seconds because of delay
-						{
-							ruleCandidates.add(oneRule);
-							break innerloop; //if the poi is found we don't need to search the other triggers in the same rule
-						}
-					}
-					else if(oneTrigger.getTimeFrame().getTriggerTimeStart().getTime() <= searchTime.getTime() && searchTime.getTime() <= oneTrigger.getTimeFrame().getTriggerTimeStop().getTime()+20000) //add 20 seconds because of delay
-					{
-						Miscellaneous.logEvent("i", "RuleSearch", "Rule found (" + oneRule.getName() + ") with TimeFrame with time " + searchTime.toString(), 3);
-						ruleCandidates.add(oneRule);
-						break innerloop; //if the poi is found we don't need to search the other triggers in the same rule
-					}
-				}
-			}
-		}
-
-		Miscellaneous.logEvent("i", "RuleSearch", String.valueOf(ruleCandidates.size()) + " Rule(s) found with TimeFrame with time " + searchTime.toString(), 3);
-		
-		return ruleCandidates;
-	}*/
-	
-	/*public static ArrayList<Rule> findRuleCandidatesByCharging(boolean triggerParameter)
-	{
-		ArrayList<Rule> ruleCandidates = new ArrayList<Rule>();
-		
-		for(Rule oneRule : ruleCollection)
-		{
-			innerloop:
-			for(Trigger oneTrigger : oneRule.getTriggerSet())
-			{
-				if(oneTrigger.getTriggerType() == Trigger.Trigger_Enum.charging)
-				{
-					if(oneTrigger.getTriggerParameter() == triggerParameter)
-					{
-						ruleCandidates.add(oneRule);
-						break innerloop; //if the poi is found we don't need to search the other triggers in the same rule
-					}
-				}
-			}
-		}
-		
-		return ruleCandidates;
-	}*/
-	
-	/*public static ArrayList<Rule> findRuleCandidatesByUsbHost(boolean triggerParameter)
-	{
-		ArrayList<Rule> ruleCandidates = new ArrayList<Rule>();
-		
-		for(Rule oneRule : ruleCollection)
-		{
-			innerloop:
-			for(Trigger oneTrigger : oneRule.getTriggerSet())
-			{
-				if(oneTrigger.getTriggerType() == Trigger.Trigger_Enum.usb_host_connection)
-				{
-					if(oneTrigger.getTriggerParameter() == triggerParameter)
-					{
-						ruleCandidates.add(oneRule);
-						break innerloop; //if the poi is found we don't need to search the other triggers in the same rule
-					}
-				}
-			}
-		}
-		
-		return ruleCandidates;
-	}*/
-	
-	/*public static ArrayList<Rule> findRuleCandidatesByAirplaneMode(boolean triggerParameter)
-	{
-		ArrayList<Rule> ruleCandidates = new ArrayList<Rule>();
-		
-		for(Rule oneRule : ruleCollection)
-		{
-			innerloop:
-			for(Trigger oneTrigger : oneRule.getTriggerSet())
-			{
-				if(oneTrigger.getTriggerType() == Trigger.Trigger_Enum.airplaneMode)
-				{
-					if(oneTrigger.getTriggerParameter() == triggerParameter)
-					{
-						ruleCandidates.add(oneRule);
-						break innerloop; //we don't need to search the other triggers in the same rule
-					}
-				}
-			}
-		}
-		
-		return ruleCandidates;
-	}*/
-	
-	/*public static ArrayList<Rule> findRuleCandidatesByRoaming(boolean triggerParameter)
-	{
-		ArrayList<Rule> ruleCandidates = new ArrayList<Rule>();
-		
-		for(Rule oneRule : ruleCollection)
-		{
-			innerloop:
-			for(Trigger oneTrigger : oneRule.getTriggerSet())
-			{
-				if(oneTrigger.getTriggerType() == Trigger.Trigger_Enum.roaming)
-				{
-					if(oneTrigger.getTriggerParameter() == triggerParameter)
-					{
-						ruleCandidates.add(oneRule);
-						break innerloop; //we don't need to search the other triggers in the same rule
-					}
-				}
-			}
-		}
-		
-		return ruleCandidates;
-	}*/
-	
-	/*public static ArrayList<Rule> findRuleCandidatesByPhoneCall(String direction)
-	{
-		ArrayList<Rule> ruleCandidates = new ArrayList<Rule>();
-
-		for(Rule oneRule : ruleCollection)
-		{
-			innerloop:
-			for(Trigger oneTrigger : oneRule.getTriggerSet())
-			{
-				if(oneTrigger.getTriggerType() == Trigger.Trigger_Enum.phoneCall)
-				{
-					String[] elements = oneTrigger.getTriggerParameter2().split(triggerParameter2Split);
-					if(elements[1].equals(Trigger.triggerPhoneCallDirectionAny) || elements[1].equals(direction))
-					{
-						ruleCandidates.add(oneRule);
-						break innerloop; //we don't need to search the other triggers in the same rule
-					}
-				}
-			}
-		}
-
-		return ruleCandidates;
-	}*/
-	
 	public static ArrayList<Rule> findRuleCandidatesByPoi(PointOfInterest searchPoi)
 	{
 		ArrayList<Rule> ruleCandidates = new ArrayList<Rule>();
@@ -782,31 +613,32 @@ public class Rule implements Comparable<Rule>
 		
 		return ruleCandidates;
 	}
-	
-	/*public static ArrayList<Rule> findRuleCandidatesByHeadphoneJack(boolean triggerParameter)
+
+	public static ArrayList<Rule> findRuleCandidatesByTriggerProfile(Profile profile)
 	{
 		ArrayList<Rule> ruleCandidates = new ArrayList<Rule>();
-		
+
 		for(Rule oneRule : ruleCollection)
 		{
 			innerloop:
 			for(Trigger oneTrigger : oneRule.getTriggerSet())
 			{
-				if(oneTrigger.getTriggerType() == Trigger.Trigger_Enum.headsetPlugged)
+				if(oneTrigger.getTriggerType() == Trigger.Trigger_Enum.profileActive)
 				{
-					if(oneTrigger.getTriggerParameter() == triggerParameter)
+					String profileName = oneTrigger.getTriggerParameter2().split(triggerParameter2Split)[0];
+					if(profileName.equals(profile.getName()))
 					{
 						ruleCandidates.add(oneRule);
-						break innerloop; //we don't need to search the other triggers in the same rule
+						break innerloop; //if the profile is found we don't need to search the other triggers in the same rule
 					}
 				}
 			}
 		}
-		
+
 		return ruleCandidates;
-	}*/
+	}
 	
-	public static ArrayList<Rule> findRuleCandidatesByProfile(Profile profile)
+	public static ArrayList<Rule> findRuleCandidatesByActionProfile(Profile profile)
 	{
 		ArrayList<Rule> ruleCandidates = new ArrayList<Rule>();
 		
@@ -879,4 +711,15 @@ public class Rule implements Comparable<Rule>
 	{
 		return ActivityPermissions.havePermissionsForRule(this, Miscellaneous.getAnyContext());
 	}
+
+	public static Rule getByName(String ruleName)
+	{
+		for(Rule r : Rule.getRuleCollection())
+		{
+			if(r.getName().equals(ruleName))
+				return r;
+		}
+
+		return null;
+	}
 }

app/src/googlePlayFlavor/AndroidManifest.xml

@@ -64,6 +64,8 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
     <uses-permission android:name="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE"/>
     <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"/>
 
     <application
         android:allowBackup="true"
@@ -113,15 +115,7 @@
         <receiver android:name=".receivers.PackageReplacedReceiver"
             android:enabled="true">
             <intent-filter>
-                <!--<action android:name="android.intent.action.PACKAGE_ADDED"/>
-                <action android:name="android.intent.action.PACKAGE_REPLACED" />
-                <action android:name="android.intent.action.PACKAGE_REMOVED"/>
-                <action android:name="android.intent.action.ACTION_PACKAGE_REPLACED" />-->
                 <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
-
-                <!--<data
-                    android:path="com.jens.automation2"
-                    android:scheme="package" />-->
             </intent-filter>
         </receiver>
         <receiver android:name=".receivers.DateTimeListener" />
@@ -146,13 +140,17 @@
         <activity android:name=".ActivityDisplayLongMessage" />
         <activity android:name=".ActivityManageActionSendTextMessage" />
         <activity android:name=".ActivityManageActionPlaySound" />
+        <activity android:name=".ActivityManageActionCloseNotification" />
+        <activity android:name=".ActivityManageTriggerProfile" />
         <activity android:name=".ActivityManageTriggerTimeFrame" />
-        <activity android:name=".ActivityMaintenance" />
+        <activity android:name=".ActivityControlCenter" />
         <activity android:name=".ActivityManageTriggerPhoneCall" />
         <activity android:name=".ActivityManageActionBrightnessSetting" />
+        <activity android:name=".ActivityManageActionCreateNotification" />
         <activity android:name=".ActivityManageTriggerDeviceOrientation" />
         <activity android:name=".ActivityHelp" />
         <activity android:name=".ActivityManageActionVibrate" />
+        <activity android:name=".ActivityManageActionControlMedia" />
         <activity
             android:name=".ActivityMainTabLayout"
             android:launchMode="singleTask">
@@ -213,7 +211,6 @@
 
         <activity android:name=".ActivityPermissions" />
 
-
 <!--        https://developer.android.com/about/versions/pie/android-9.0-changes-28#apache-p-->
         <uses-library android:name="org.apache.http.legacy" android:required="false"/>
 

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

@@ -5,6 +5,7 @@ import static com.jens.automation2.Trigger.triggerParameter2Split;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Looper;
 import android.util.Log;
 import android.widget.Toast;
@@ -12,20 +13,19 @@ import android.widget.Toast;
 import com.google.android.gms.location.DetectedActivity;
 import com.jens.automation2.receivers.ActivityDetectionReceiver;
 
-import java.sql.Time;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.List;
 
 
 public class Rule implements Comparable<Rule>
 {
 	private static ArrayList<Rule> ruleCollection = new ArrayList<Rule>();
-	public static boolean isAnyRuleActive = false;
+
+	private static List<Rule> ruleRunHistory = new ArrayList<Rule>();
 	
-	private static ArrayList<Rule> ruleRunHistory = new ArrayList<Rule>();
-	
-	public static ArrayList<Rule> getRuleRunHistory()
+	public static List<Rule> getRuleRunHistory()
 	{
 		return ruleRunHistory;
 	}
@@ -312,19 +312,12 @@ public class Rule implements Comparable<Rule>
 			switch(action.getAction())
 			{
 				case setAirplaneMode:
-					return true;
 				case setBluetooth:
-					return true;
 				case setDataConnection:
-					return true;
 				case setDisplayRotation:
-					return true;
 				case setUsbTethering:
-					return true;
 				case setWifi:
-					return true;
 				case setWifiTethering:
-					return true;
 				case setBluetoothTethering:
 					return true;
 				default:
@@ -351,7 +344,10 @@ public class Rule implements Comparable<Rule>
 		if(applies(context))
 		{
 			if(hasNotAppliedSinceLastExecution())
+			{
+				Miscellaneous.logEvent("i", "getsGreenLight()", "Rule " + getName() + " applies and has flipped since its last execution.", 4);
 				return true;
+			}
 			else
 				Miscellaneous.logEvent("i", "getsGreenLight()", "Rule " + getName() + " has not flipped since its last execution.", 4);
 		}
@@ -433,7 +429,7 @@ public class Rule implements Comparable<Rule>
 			
 			Thread.setDefaultUncaughtExceptionHandler(Miscellaneous.uncaughtExceptionHandler);
 
-			// without this line debugger will - for some reason - skip all breakpoints in this class
+			// without this line the debugger will - for some reason - skip all breakpoints in this class
 			if(android.os.Debug.isDebuggerConnected())
 				android.os.Debug.waitForDebugger();
 			
@@ -441,7 +437,7 @@ public class Rule implements Comparable<Rule>
 	        	Looper.prepare();
 
 			setLastExecution(Calendar.getInstance());
-			wasActivated = activateInternally((AutomationService)params[0], (Boolean)params[1]);
+			wasActivated = activateInternally((AutomationService)params[0]);
 
 			return null;
 		}
@@ -476,66 +472,57 @@ public class Rule implements Comparable<Rule>
 		 * Will activate the rule. Should be called by a separate execution thread
 		 * @param automationService
 		 */
-		protected boolean activateInternally(AutomationService automationService, boolean force)
+		protected boolean activateInternally(AutomationService automationService)
 		{
-			boolean isActuallyToggable = isActuallyToggable();
+			boolean isActuallyToggleable = isActuallyToggable();
 
 			boolean notLastActive = getLastActivatedRule() == null || !getLastActivatedRule().equals(Rule.this);
-			boolean doToggle = ruleToggle && isActuallyToggable;
+			boolean doToggle = ruleToggle && isActuallyToggleable;
 
-			//if(notLastActive || force || doToggle)
-//			if(force || doToggle)
-//			{
-				String message;
-				if(!doToggle)
-					message = String.format(automationService.getResources().getString(R.string.ruleActivate), Rule.this.getName());
-				else
-					message = String.format(automationService.getResources().getString(R.string.ruleActivateToggle), Rule.this.getName());
-				Miscellaneous.logEvent("i", "Rule", message, 2);
-//				automationService.speak(message);
-//				Toast.makeText(automationService, message, Toast.LENGTH_LONG).show();
-				if(Settings.startNewThreadForRuleActivation)
-					publishProgress(message);
+			String message;
+			if(!doToggle)
+				message = String.format(automationService.getResources().getString(R.string.ruleActivate), Rule.this.getName());
+			else
+				message = String.format(automationService.getResources().getString(R.string.ruleActivateToggle), Rule.this.getName());
 
-				for(int i = 0; i< Rule.this.getActionSet().size(); i++)
-				{
-					try
-					{
-						Rule.this.getActionSet().get(i).run(automationService, doToggle);
-					}
-					catch(Exception e)
-					{
-						Miscellaneous.logEvent("e", "RuleExecution", "Error running action of rule " + Rule.this.getName() + ": " + Log.getStackTraceString(e), 1);
-					}
-				}
+			Miscellaneous.logEvent("i", "Rule", message, 2);
 
-				// Keep log of last x rule activations (Settings)
+			if(Settings.startNewThreadForRuleActivation)
+				publishProgress(message);
+
+			for(int i = 0; i< Rule.this.getActionSet().size(); i++)
+			{
 				try
 				{
-					Rule.ruleRunHistory.add(0, Rule.this);		// add at beginning for better visualization
-					Rule.lastActivatedRuleActivationTime = new Date();
-
-					while(ruleRunHistory.size() > Settings.rulesThatHaveBeenRanHistorySize)
-						ruleRunHistory.remove(ruleRunHistory.size()-1);
-					String history = "";
-					for(Rule rule : ruleRunHistory)
-						history += rule.getName() + ", ";
-					if(history.length() > 0)
-						history = history.substring(0, history.length()-2);
-					Miscellaneous.logEvent("i", "Rule history", "Most recent first: " + history, 4);
+					Rule.this.getActionSet().get(i).run(automationService, doToggle);
 				}
 				catch(Exception e)
 				{
-					Miscellaneous.logEvent("e", "Rule history error", Log.getStackTraceString(e), 3);
+					Miscellaneous.logEvent("e", "RuleExecution", "Error running action of rule " + Rule.this.getName() + ": " + Log.getStackTraceString(e), 1);
 				}
+			}
 
-				Miscellaneous.logEvent("i", "Rule", String.format(Miscellaneous.getAnyContext().getResources().getString(R.string.ruleActivationComplete), Rule.this.getName()), 2);
-//			}
-//			else
-//			{
-//				Miscellaneous.logEvent("i", "Rule", "Request to activate rule " + Rule.this.getName() + ", but it is the last one that was activated. Won't do it again.", 3);
-//				return false;
-//			}
+			// Keep log of last x rule activations (Settings)
+			try
+			{
+				Rule.ruleRunHistory.add(0, Rule.this);		// add at beginning for better visualization
+				Rule.lastActivatedRuleActivationTime = new Date();
+
+				while(ruleRunHistory.size() > Settings.rulesThatHaveBeenRanHistorySize)
+					ruleRunHistory.remove(ruleRunHistory.size()-1);
+				String history = "";
+				for(Rule rule : ruleRunHistory)
+					history += rule.getName() + ", ";
+				if(history.length() > 0)
+					history = history.substring(0, history.length()-2);
+				Miscellaneous.logEvent("i", "Rule history", "Most recent first: " + history, 4);
+			}
+			catch(Exception e)
+			{
+				Miscellaneous.logEvent("e", "Rule history error", Log.getStackTraceString(e), 3);
+			}
+
+			Miscellaneous.logEvent("i", "Rule", String.format(Miscellaneous.getAnyContext().getResources().getString(R.string.ruleActivationComplete), Rule.this.getName()), 2);
 
 			return true;
 		}
@@ -544,7 +531,10 @@ public class Rule implements Comparable<Rule>
 	public void activate(AutomationService automationService, boolean force)
 	{
 		ActivateRuleTask task = new ActivateRuleTask();
-		task.execute(automationService, force);
+		if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)
+			task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, automationService, force);
+		else
+			task.execute(automationService, force);
 	}
 
 	public static ArrayList<Rule> findRuleCandidates(Trigger.Trigger_Enum triggerType)
@@ -553,13 +543,33 @@ public class Rule implements Comparable<Rule>
 
 		for(Rule oneRule : ruleCollection)
 		{
-			innerloop:
+			innerLoop:
 			for(Trigger oneTrigger : oneRule.getTriggerSet())
 			{
-				if(oneTrigger.getTriggerType() == triggerType)
+				if(oneTrigger.getTriggerType().equals(triggerType))
 				{
 					ruleCandidates.add(oneRule);
-					break innerloop; // we don't need to check the other triggers in the same rule
+					break innerLoop; // we don't need to check the other triggers in the same rule
+				}
+			}
+		}
+
+		return ruleCandidates;
+	}
+
+	public static ArrayList<Rule> findRuleCandidates(Action.Action_Enum actionType)
+	{
+		ArrayList<Rule> ruleCandidates = new ArrayList<Rule>();
+
+		for(Rule oneRule : ruleCollection)
+		{
+			innerloop:
+			for(Action oneAction : oneRule.getActionSet())
+			{
+				if(oneAction.getAction().equals(actionType))
+				{
+					ruleCandidates.add(oneRule);
+					break innerloop; // we don't need to check the other actions in the same rule
 				}
 			}
 		}
@@ -608,186 +618,6 @@ public class Rule implements Comparable<Rule>
 		return ruleCandidates;
 	}
 	
-	/*public static ArrayList<Rule> findRuleCandidatesByTimeFrame(TimeFrame searchTimeFrame, boolean triggerParameter)
-	{
-		ArrayList<Rule> ruleCandidates = new ArrayList<Rule>();
-		
-		for(int i=0; i<ruleCollection.size(); i++)
-		{
-			innerloop:
-			for(int j=0; j<ruleCollection.get(i).getTriggerSet().size(); j++)
-			{
-				if(ruleCollection.get(i).getTriggerSet().get(j).getTriggerType() == Trigger.Trigger_Enum.timeFrame)
-				{
-					if(ruleCollection.get(i).getTriggerSet().get(j).getTimeFrame().equals(searchTimeFrame) && ruleCollection.get(i).getTriggerSet().get(j).getTriggerParameter() == triggerParameter)
-					{
-						ruleCandidates.add(ruleCollection.get(i));
-						break innerloop; //if the poi is found we don't need to search the other triggers in the same rule
-					}
-				}
-			}
-		}
-		
-		return ruleCandidates;
-	}*/
-
-	/*public static ArrayList<Rule> findRuleCandidatesByTime(Time searchTime)
-	{
-		Miscellaneous.logEvent("i", "RuleSearch", "Searching for rules with TimeFrame with time " + searchTime.toString() + ". RuleCollection-Size: " + String.valueOf(ruleCollection.size()), 3);;
-		ArrayList<Rule> ruleCandidates = new ArrayList<Rule>();
-		
-		for(Rule oneRule : ruleCollection)
-		{
-			innerloop:
-			for(Trigger oneTrigger : oneRule.getTriggerSet())
-			{
-				if(oneTrigger.getTriggerType() == Trigger.Trigger_Enum.timeFrame)
-				{
-					Miscellaneous.logEvent("i", "RuleSearch", "Searching interval: " + oneTrigger.getTimeFrame().getTriggerTimeStart().toString() + " to " + oneTrigger.getTimeFrame().getTriggerTimeStop().toString(), 5);
-					Miscellaneous.logEvent("i", "RuleSearch", "interval start: " + String.valueOf(oneTrigger.getTimeFrame().getTriggerTimeStart().getTime()), 5);
-					Miscellaneous.logEvent("i", "RuleSearch", "search time: " + String.valueOf(searchTime.getTime()), 5);
-					Miscellaneous.logEvent("i", "RuleSearch", "interval stop: " + String.valueOf(oneTrigger.getTimeFrame().getTriggerTimeStop().getTime()), 5);
-					
-					if(oneTrigger.getTimeFrame().getTriggerTimeStart().getTime() > oneTrigger.getTimeFrame().getTriggerTimeStop().getTime())
-					{
-						Miscellaneous.logEvent("i", "Timeframe search", "Rule (" + oneRule.getName() + ") stretches over midnight.", 5);
-						if(oneTrigger.getTimeFrame().getTriggerTimeStart().getTime() <= searchTime.getTime() || searchTime.getTime() <= oneTrigger.getTimeFrame().getTriggerTimeStop().getTime()+20000) //add 20 seconds because of delay
-						{
-							ruleCandidates.add(oneRule);
-							break innerloop; //if the poi is found we don't need to search the other triggers in the same rule
-						}
-					}
-					else if(oneTrigger.getTimeFrame().getTriggerTimeStart().getTime() <= searchTime.getTime() && searchTime.getTime() <= oneTrigger.getTimeFrame().getTriggerTimeStop().getTime()+20000) //add 20 seconds because of delay
-					{
-						Miscellaneous.logEvent("i", "RuleSearch", "Rule found (" + oneRule.getName() + ") with TimeFrame with time " + searchTime.toString(), 3);
-						ruleCandidates.add(oneRule);
-						break innerloop; //if the poi is found we don't need to search the other triggers in the same rule
-					}
-				}
-			}
-		}
-
-		Miscellaneous.logEvent("i", "RuleSearch", String.valueOf(ruleCandidates.size()) + " Rule(s) found with TimeFrame with time " + searchTime.toString(), 3);
-		
-		return ruleCandidates;
-	}*/
-	
-	/*public static ArrayList<Rule> findRuleCandidatesByCharging(boolean triggerParameter)
-	{
-		ArrayList<Rule> ruleCandidates = new ArrayList<Rule>();
-		
-		for(Rule oneRule : ruleCollection)
-		{
-			innerloop:
-			for(Trigger oneTrigger : oneRule.getTriggerSet())
-			{
-				if(oneTrigger.getTriggerType() == Trigger.Trigger_Enum.charging)
-				{
-					if(oneTrigger.getTriggerParameter() == triggerParameter)
-					{
-						ruleCandidates.add(oneRule);
-						break innerloop; //if the poi is found we don't need to search the other triggers in the same rule
-					}
-				}
-			}
-		}
-		
-		return ruleCandidates;
-	}*/
-	
-	/*public static ArrayList<Rule> findRuleCandidatesByUsbHost(boolean triggerParameter)
-	{
-		ArrayList<Rule> ruleCandidates = new ArrayList<Rule>();
-		
-		for(Rule oneRule : ruleCollection)
-		{
-			innerloop:
-			for(Trigger oneTrigger : oneRule.getTriggerSet())
-			{
-				if(oneTrigger.getTriggerType() == Trigger.Trigger_Enum.usb_host_connection)
-				{
-					if(oneTrigger.getTriggerParameter() == triggerParameter)
-					{
-						ruleCandidates.add(oneRule);
-						break innerloop; //if the poi is found we don't need to search the other triggers in the same rule
-					}
-				}
-			}
-		}
-		
-		return ruleCandidates;
-	}*/
-	
-	/*public static ArrayList<Rule> findRuleCandidatesByAirplaneMode(boolean triggerParameter)
-	{
-		ArrayList<Rule> ruleCandidates = new ArrayList<Rule>();
-		
-		for(Rule oneRule : ruleCollection)
-		{
-			innerloop:
-			for(Trigger oneTrigger : oneRule.getTriggerSet())
-			{
-				if(oneTrigger.getTriggerType() == Trigger.Trigger_Enum.airplaneMode)
-				{
-					if(oneTrigger.getTriggerParameter() == triggerParameter)
-					{
-						ruleCandidates.add(oneRule);
-						break innerloop; //we don't need to search the other triggers in the same rule
-					}
-				}
-			}
-		}
-		
-		return ruleCandidates;
-	}*/
-	
-	/*public static ArrayList<Rule> findRuleCandidatesByRoaming(boolean triggerParameter)
-	{
-		ArrayList<Rule> ruleCandidates = new ArrayList<Rule>();
-		
-		for(Rule oneRule : ruleCollection)
-		{
-			innerloop:
-			for(Trigger oneTrigger : oneRule.getTriggerSet())
-			{
-				if(oneTrigger.getTriggerType() == Trigger.Trigger_Enum.roaming)
-				{
-					if(oneTrigger.getTriggerParameter() == triggerParameter)
-					{
-						ruleCandidates.add(oneRule);
-						break innerloop; //we don't need to search the other triggers in the same rule
-					}
-				}
-			}
-		}
-		
-		return ruleCandidates;
-	}*/
-	
-	/*public static ArrayList<Rule> findRuleCandidatesByPhoneCall(String direction)
-	{
-		ArrayList<Rule> ruleCandidates = new ArrayList<Rule>();
-
-		for(Rule oneRule : ruleCollection)
-		{
-			innerloop:
-			for(Trigger oneTrigger : oneRule.getTriggerSet())
-			{
-				if(oneTrigger.getTriggerType() == Trigger.Trigger_Enum.phoneCall)
-				{
-					String[] elements = oneTrigger.getTriggerParameter2().split(triggerParameter2Split);
-					if(elements[1].equals(Trigger.triggerPhoneCallDirectionAny) || elements[1].equals(direction))
-					{
-						ruleCandidates.add(oneRule);
-						break innerloop; //we don't need to search the other triggers in the same rule
-					}
-				}
-			}
-		}
-
-		return ruleCandidates;
-	}*/
-	
 	public static ArrayList<Rule> findRuleCandidatesByPoi(PointOfInterest searchPoi)
 	{
 		ArrayList<Rule> ruleCandidates = new ArrayList<Rule>();
@@ -810,31 +640,32 @@ public class Rule implements Comparable<Rule>
 		
 		return ruleCandidates;
 	}
-	
-	/*public static ArrayList<Rule> findRuleCandidatesByHeadphoneJack(boolean triggerParameter)
+
+	public static ArrayList<Rule> findRuleCandidatesByTriggerProfile(Profile profile)
 	{
 		ArrayList<Rule> ruleCandidates = new ArrayList<Rule>();
-		
+
 		for(Rule oneRule : ruleCollection)
 		{
 			innerloop:
 			for(Trigger oneTrigger : oneRule.getTriggerSet())
 			{
-				if(oneTrigger.getTriggerType() == Trigger.Trigger_Enum.headsetPlugged)
+				if(oneTrigger.getTriggerType() == Trigger.Trigger_Enum.profileActive)
 				{
-					if(oneTrigger.getTriggerParameter() == triggerParameter)
+					String profileName = oneTrigger.getTriggerParameter2().split(triggerParameter2Split)[0];
+					if(profileName.equals(profile.getName()))
 					{
 						ruleCandidates.add(oneRule);
-						break innerloop; //we don't need to search the other triggers in the same rule
+						break innerloop; //if the profile is found we don't need to search the other triggers in the same rule
 					}
 				}
 			}
 		}
-		
+
 		return ruleCandidates;
-	}*/
+	}
 	
-	public static ArrayList<Rule> findRuleCandidatesByProfile(Profile profile)
+	public static ArrayList<Rule> findRuleCandidatesByActionProfile(Profile profile)
 	{
 		ArrayList<Rule> ruleCandidates = new ArrayList<Rule>();
 		
@@ -907,4 +738,15 @@ public class Rule implements Comparable<Rule>
 	{
 		return ActivityPermissions.havePermissionsForRule(this, Miscellaneous.getAnyContext());
 	}
+
+	public static Rule getByName(String ruleName)
+	{
+		for(Rule r : Rule.getRuleCollection())
+		{
+			if(r.getName().equals(ruleName))
+				return r;
+		}
+
+		return null;
+	}
 }

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

@@ -2,6 +2,7 @@ package com.jens.automation2;
 
 import android.content.Context;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.util.Log;
 import android.widget.Toast;
 
@@ -17,7 +18,7 @@ public class Action
 	Rule parentRule = null;
 
 	public static final String actionParameter2Split = "ap2split";
-	public static final String intentPairSeperator = "intPairSplit";
+	public static final String intentPairSeparator = "intPairSplit";
 	public static final String vibrateSeparator = ",";
 
 	public enum Action_Enum {	
@@ -41,9 +42,12 @@ public class Action
 								setDataConnection,
 								speakText,
 								playMusic,
+								controlMediaPlayback,
 								setScreenBrightness,
 								playSound,
 								vibrate,
+								createNotification,
+								closeNotification,
 								sendTextMessage;
 								
 								public String getFullName(Context context)
@@ -102,12 +106,18 @@ public class Action
 											return context.getResources().getString(R.string.actionSpeakText);
 										case playMusic:
 											return context.getResources().getString(R.string.actionPlayMusic);
+										case controlMediaPlayback:
+											return context.getResources().getString(R.string.actionMediaControl);
 										case playSound:
 											return context.getResources().getString(R.string.playSound);
 										case sendTextMessage:
 											return context.getResources().getString(R.string.sendTextMessage);
 										case setScreenBrightness:
 											return context.getResources().getString(R.string.setScreenBrightness);
+										case createNotification:
+											return context.getResources().getString(R.string.createNotification);
+										case closeNotification:
+											return context.getResources().getString(R.string.closeNotifications);
 										default:
 											return "Unknown";
 									}
@@ -153,138 +163,195 @@ public class Action
 	public String toString()
 	{
 		StringBuilder returnString = new StringBuilder();
-		
-		if(this.getAction().equals(Action_Enum.setWifi))
-		{
-			if(this.getParameter1())
-				returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.actionTurnWifiOn));
-			else
-				returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.actionTurnWifiOff));
-		}
-		else if(this.getAction().equals(Action_Enum.setBluetooth))
-		{
-			if(this.getParameter1())
-				returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.actionTurnBluetoothOn));
-			else
-				returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.actionTurnBluetoothOff));
-		}
-		else if(this.getAction().equals(Action_Enum.setUsbTethering))
-		{
-			if(this.getParameter1())
-				returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.actionTurnUsbTetheringOn));
-			else
-				returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.actionTurnUsbTetheringOff));
-		}
-		else if(this.getAction().equals(Action_Enum.setWifiTethering))
-		{
-			if(this.getParameter1())
-				returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.actionTurnWifiTetheringOn));
-			else
-				returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.actionTurnWifiTetheringOff));
-		}
-		else if(this.getAction().equals(Action_Enum.setBluetoothTethering))
-		{
-			if(this.getParameter1())
-				returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.actionTurnBluetoothTetheringOn));
-			else
-				returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.actionTurnBluetoothTetheringOff));
-		}
-		else if(this.getAction().equals(Action_Enum.setDisplayRotation))
-		{
-			if(this.getParameter1())
-				returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.actionEnableScreenRotation));
-			else
-				returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.actionDisableScreenRotation));
-		}
-		else if(this.getAction().equals(Action_Enum.setAirplaneMode))
-		{
-			if(this.getParameter1())
-				returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.actionTurnAirplaneModeOn));
-			else
-				returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.actionTurnAirplaneModeOff));
-		}
-		else if(this.getAction().equals(Action_Enum.setDataConnection))
-		{
-			if(this.getParameter1())
-				returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.actionSetDataConnectionOn));
-			else
-				returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.actionSetDataConnectionOff));
-		}
-		else if(this.getAction().equals(Action_Enum.startOtherActivity))
-		{
-			returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.startOtherActivity));
-		}
-		else if(this.getAction().equals(Action_Enum.triggerUrl))
-		{
-			returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.actionTriggerUrl));
-		}
-		else if(this.getAction().equals(Action_Enum.speakText))
-		{
-			returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.actionSpeakText));
-		}
-		else if(this.getAction().equals(Action_Enum.playMusic))
-		{
-			returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.actionPlayMusic));
-		}
-		else if(this.getAction().equals(Action_Enum.sendTextMessage))
-		{
-			returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.sendTextMessage));
-		}
-		else if(this.getAction().equals(Action_Enum.turnScreenOnOrOff))
-		{
-			if(getParameter1())
-				returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.turnScreenOn));
-			else
-				returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.turnScreenOff));
-		}
-		else if(this.getAction().equals(Action_Enum.playSound))
-		{
-			returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.playSound));
-		}
-		else
-			returnString.append(action.toString());
 
-		if(this.getAction().equals(Action_Enum.triggerUrl))
+		try
 		{
-			String[] components = parameter2.split(";");
-			if(components.length >= 3)
+			switch (getAction())
 			{
-				returnString.append(": " + components[2]);
-				
-				if(parameter1)
-					returnString.append(" using authentication.");
+				case setWifi:
+					if (this.getParameter1())
+						returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.actionTurnWifiOn));
+					else
+						returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.actionTurnWifiOff));
+					break;
+				case setBluetooth:
+					if (this.getParameter1())
+						returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.actionTurnBluetoothOn));
+					else
+						returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.actionTurnBluetoothOff));
+					break;
+				case setUsbTethering:
+					if (this.getParameter1())
+						returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.actionTurnUsbTetheringOn));
+					else
+						returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.actionTurnUsbTetheringOff));
+					break;
+				case setWifiTethering:
+					if (this.getParameter1())
+						returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.actionTurnWifiTetheringOn));
+					else
+						returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.actionTurnWifiTetheringOff));
+					break;
+				case setBluetoothTethering:
+					if (this.getParameter1())
+						returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.actionTurnBluetoothTetheringOn));
+					else
+						returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.actionTurnBluetoothTetheringOff));
+					break;
+				case setDisplayRotation:
+					if (this.getParameter1())
+						returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.actionEnableScreenRotation));
+					else
+						returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.actionDisableScreenRotation));
+					break;
+				case setAirplaneMode:
+					if (this.getParameter1())
+						returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.actionTurnAirplaneModeOn));
+					else
+						returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.actionTurnAirplaneModeOff));
+					break;
+				case setDataConnection:
+					if (this.getParameter1())
+						returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.actionSetDataConnectionOn));
+					else
+						returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.actionSetDataConnectionOff));
+					break;
+				case startOtherActivity:
+					returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.startOtherActivity));
+					break;
+				case triggerUrl:
+					returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.actionTriggerUrl));
+					break;
+				case speakText:
+					returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.actionSpeakText));
+					break;
+				case playMusic:
+					returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.actionPlayMusic));
+					break;
+				case controlMediaPlayback:
+					returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.actionMediaControl));
+					break;
+				case sendTextMessage:
+					returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.sendTextMessage));
+					break;
+				case turnScreenOnOrOff:
+					if (getParameter1())
+						returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.turnScreenOn));
+					else
+						returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.turnScreenOff));
+					break;
+				case playSound:
+					returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.playSound));
+					break;
+				case changeSoundProfile:
+					returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.actionChangeSoundProfile));
+					break;
+				case waitBeforeNextAction:
+					returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.waitBeforeNextAction));
+					break;
+				case setScreenBrightness:
+					returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.setScreenBrightness));
+					break;
+				case createNotification:
+					returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.createNotification));
+					break;
+				case closeNotification:
+					returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.closeNotifications));
+					break;
+				default:
+					returnString.append(action.toString());
 			}
-			else
-				returnString.append(": " + components[0]);
-		}
-		else if(this.getAction().equals(Action_Enum.startOtherActivity))
-		{
-			returnString.append(": " + parameter2.replace(Action.intentPairSeperator, "/"));
-		}
-		else if(this.getAction().equals(Action_Enum.sendTextMessage))
-		{
-			String[] components = parameter2.split(Actions.smsSeparator);
-			if(components.length >= 2)
+
+			if (this.getAction().equals(Action_Enum.triggerUrl))
 			{
-				returnString.append(" to number " + components[0]);
+				String[] components = parameter2.split(";");
+				if (components.length >= 3)
+				{
+					returnString.append(": " + components[2]);
 
-				returnString.append(". Message: " + components[1]);
+					if (parameter1)
+						returnString.append(" " + Miscellaneous.getAnyContext().getResources().getString(R.string.usingAuthentication) + ".");
+				}
+				else
+					returnString.append(": " + components[0]);
 			}
+			else if (this.getAction().equals(Action_Enum.startOtherActivity))
+			{
+				returnString.append(": " + parameter2.replace(Action.intentPairSeparator, "/"));
+			}
+			else if (this.getAction().equals(Action_Enum.sendTextMessage))
+			{
+				String[] components = parameter2.split(Actions.smsSeparator);
+				if (components.length >= 2)
+				{
+					returnString.append(" " + Miscellaneous.getAnyContext().getResources().getString(R.string.toNumber) + " " + components[0]);
+
+					returnString.append(". " + Miscellaneous.getAnyContext().getResources().getString(R.string.message) + ": " + components[1]);
+				}
+			}
+			else if (this.getAction().equals(Action_Enum.setScreenBrightness))
+			{
+				returnString.append(" " + Miscellaneous.getAnyContext().getResources().getString(R.string.to) + " ");
+
+				if (parameter1)
+					returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.brightnessAuto));
+				else
+					returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.brightnessManual));
+
+				returnString.append(" / " + Integer.parseInt(parameter2) + "%");
+			}
+			else if (this.getAction().equals(Action_Enum.closeNotification))
+			{
+				returnString.append(" " + Miscellaneous.getAnyContext().getResources().getString(R.string.from) + " ");
+
+				String parts[] = this.getParameter2().split(Action.actionParameter2Split);
+				if (parts[0].equals(Trigger.anyAppString))
+					returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.anyApp));
+				else
+					returnString.append(parts[0]);
+
+				if (!StringUtils.isBlank(parts[2]))
+					returnString.append(", " + Miscellaneous.getAnyContext().getResources().getString(R.string.ifString) + " " + Miscellaneous.getAnyContext().getResources().getString(R.string.title) + " " + Trigger.getMatchString(parts[1]) + " " + parts[2]);
+
+				if (parts.length > 4 && !StringUtils.isBlank(parts[4]))
+					returnString.append(", " + Miscellaneous.getAnyContext().getResources().getString(R.string.ifString) + " " + Miscellaneous.getAnyContext().getResources().getString(R.string.text) + " " + Trigger.getMatchString(parts[3]) + " " + parts[4]);
+
+			}
+			else if(this.getAction().equals(Action_Enum.controlMediaPlayback))
+			{
+				returnString.append(": ");
+
+				switch (this.getParameter2())
+				{
+					case "0":
+						returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.playPause));
+						break;
+					case "1":
+						returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.play));
+						break;
+					case "2":
+						returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.pause));
+						break;
+					case "3":
+						returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.stop));
+						break;
+					case "4":
+						returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.previous));
+						break;
+					case "5":
+						returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.next));
+						break;
+					default:
+						returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.unknown));
+				}
+			}
+			else if (parameter2 != null && parameter2.length() > 0)
+				returnString.append(": " + parameter2.replace(Action.actionParameter2Split, "; "));
 		}
-		else if(this.getAction().equals(Action_Enum.setScreenBrightness))
+		catch (Exception e)
 		{
-			returnString.append(" to ");
-
-			if(parameter1)
-				returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.brightnessAuto));
-			else
-				returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.brightnessManual));
-
-			returnString.append(" / " + Integer.parseInt(parameter2) + "%");
+			returnString.append(": " + Miscellaneous.getAnyContext().getResources().getString(R.string.error));
 		}
-		else
-			if (parameter2 != null && parameter2.length() > 0)
-				returnString.append(": " + parameter2);
 		
 		return returnString.toString();
 	}
@@ -442,6 +509,9 @@ public class Action
 				case playMusic:
 					Actions.playMusic(this.getParameter1(), toggleActionIfPossible);
 					break;
+				case controlMediaPlayback:
+					Actions.controlMediaPlayback(context, Integer.parseInt(getParameter2()));
+					break;
 				case sendTextMessage:
 					Actions.sendTextMessage(context, this.getParameter2().split(Actions.smsSeparator));
 					break;
@@ -454,6 +524,15 @@ public class Action
 				case playSound:
 					Actions.playSound(getParameter1(), getParameter2());
 					break;
+				case createNotification:
+					Actions.createNotification(this);
+					break;
+				case closeNotification:
+					if(Build.VERSION.SDK_INT > Build.VERSION_CODES.M)
+						Actions.closeNotification(this);
+					else
+						Miscellaneous.logEvent("w", "Close notification", "Close notification was requested, but OS version is too low: " + String.valueOf(Build.VERSION.SDK_INT), 2);
+					break;
 				default:
 					Miscellaneous.logEvent("w", "Action", context.getResources().getString(R.string.unknownActionSpecified), 3);
 					break;

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

@@ -8,13 +8,15 @@ import android.app.PendingIntent;
 import android.app.admin.DevicePolicyManager;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothManager;
 import android.bluetooth.BluetoothProfile;
 import android.content.ActivityNotFoundException;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.media.AudioManager;
 import android.media.MediaPlayer;
+import android.media.session.MediaController;
+import android.media.session.MediaSessionManager;
 import android.net.ConnectivityManager;
 import android.net.Uri;
 import android.net.wifi.WifiManager;
@@ -24,11 +26,13 @@ import android.os.PowerManager.WakeLock;
 import android.os.VibrationEffect;
 import android.os.Vibrator;
 import android.provider.MediaStore;
+import android.service.notification.NotificationListenerService;
+import android.service.notification.StatusBarNotification;
 import android.telephony.SmsManager;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.util.Log;
-import android.view.WindowManager;
+import android.view.KeyEvent;
 import android.widget.Toast;
 
 import androidx.annotation.RequiresApi;
@@ -37,7 +41,9 @@ import com.jens.automation2.actions.wifi_router.MyOnStartTetheringCallback;
 import com.jens.automation2.actions.wifi_router.MyOreoWifiManager;
 import com.jens.automation2.location.WifiBroadcastReceiver;
 import com.jens.automation2.receivers.ConnectivityReceiver;
+import com.jens.automation2.receivers.NotificationListener;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.client.HttpClient;
 import org.apache.http.conn.ClientConnectionManager;
 import org.apache.http.conn.scheme.Scheme;
@@ -54,6 +60,7 @@ import java.lang.reflect.Method;
 import java.net.InetAddress;
 import java.net.NetworkInterface;
 import java.security.KeyStore;
+import java.util.Calendar;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
@@ -64,9 +71,8 @@ import eu.chainfire.libsuperuser.Shell;
 
 public class Actions
 {
-	public static AutomationService autoMationServerRef;
+	public static AutomationService automationServerRef;
 	public static Context context;
-	public static Context rootetcontext;
 	private static Intent playMusicIntent;
 	private static boolean suAvailable = false;
 	private static String suVersion = null;
@@ -79,6 +85,106 @@ public class Actions
 	public static final String wireguard_tunnel_down = "com.wireguard.android.action.SET_TUNNEL_DOWN";
 	public static final String wireguard_tunnel_refresh = "com.wireguard.android.action.REFRESH_TUNNEL_STATES";
 
+    public static void createNotification(Action action)
+    {
+		String[] elements = action.getParameter2().split(Action.actionParameter2Split);
+
+		Miscellaneous.logEvent("w", "createNotification", "Creating notification with title " + elements[0] + " and text " + elements[1], 3);
+
+    	int notificationId = Math.round(Calendar.getInstance().getTimeInMillis()/1000);
+
+    	try
+		{
+			String title = Miscellaneous.replaceVariablesInText(elements[0], Miscellaneous.getAnyContext());
+			String text = Miscellaneous.replaceVariablesInText(elements[1], Miscellaneous.getAnyContext());
+			Miscellaneous.createDismissibleNotification(title, text, notificationId, false, AutomationService.NOTIFICATION_CHANNEL_ID_RULES, null);
+		}
+    	catch (Exception e)
+		{
+			Miscellaneous.logEvent("w", "createNotification", "Error occurred while replacing vars: " + Log.getStackTraceString(e), 3);
+		}
+    }
+
+	@RequiresApi(api = Build.VERSION_CODES.M)
+	public static void closeNotification(Action action)
+	{
+		NotificationManager nm = (NotificationManager) Miscellaneous.getAnyContext().getSystemService(Context.NOTIFICATION_SERVICE);
+		for(StatusBarNotification n : nm.getActiveNotifications())
+		{
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)
+			{
+				String[] params = action.getParameter2().split(Action.actionParameter2Split);
+
+				String myApp = params[0];
+				String myTitleDir = params[1];
+				String requiredTitle = params[2];
+				String myTextDir = params[3];
+				String requiredText;
+				if (params.length >= 5)
+					requiredText = params[4];
+				else
+					requiredText = "";
+
+				for (StatusBarNotification sbn : NotificationListener.getInstance().getActiveNotifications())
+				{
+					NotificationListener.SimpleNotification sn = NotificationListener.convertNotificationToSimpleNotification(true, sbn);
+
+					Miscellaneous.logEvent("i", "NotificationCloseCheck", "Checking if this notification should be closed in the context of rule " + action.getParentRule().getName() + ": "+ sn.toString(), 5);
+
+					if (!myApp.equals(Trigger.anyAppString))
+					{
+						if (!myApp.equalsIgnoreCase(sn.getApp()))
+						{
+							Miscellaneous.logEvent("i", "NotificationCloseCheck", "Notification app name does not match rule.", 5);
+							continue;
+						}
+					}
+					else
+					{
+						/*
+						 	Notifications from Automation are disregarded to avoid infinite loops.
+						 */
+						if(myApp.equals(BuildConfig.APPLICATION_ID))
+						{
+							continue;
+						}
+					}
+
+				/*
+					If there are multiple notifications ("stacked") title or text might be null:
+					https://stackoverflow.com/questions/28047767/notificationlistenerservice-not-reading-text-of-stacked-notifications
+				 */
+
+					// T I T L E
+					if (!StringUtils.isEmpty(requiredTitle))
+					{
+						if (!Miscellaneous.compare(myTitleDir, requiredTitle, sn.getTitle()))
+						{
+							Miscellaneous.logEvent("i", "NotificationCloseCheck", "Notification title does not match rule.", 5);
+							continue;
+						}
+					}
+
+					// T E X T
+					if (!StringUtils.isEmpty(requiredText))
+					{
+						if (!Miscellaneous.compare(myTextDir, requiredText, sn.getText()))
+						{
+							Miscellaneous.logEvent("i", "NotificationCloseCheck", "Notification text does not match rule.", 5);
+							continue;
+						}
+					}
+
+					Miscellaneous.logEvent("i", "NotificationCloseCheck", "All criteria matches. Closing notification: " + sbn.getNotification().toString(), 3);
+					if(NotificationListener.getInstance() != null)
+						NotificationListener.getInstance().dismissNotification(sbn);
+					else
+						Miscellaneous.logEvent("i", "NotificationCloseCheck", "NotificationListener instance is null. Can\'t close notification.", 3);
+				}
+			}
+		}
+	}
+
 	public static class WifiStuff
 	{
 		public static Boolean setWifi(Context context, Boolean desiredState, boolean toggleActionIfPossible)
@@ -120,7 +226,7 @@ public class Actions
 			Miscellaneous.logEvent("i", "Wifi", "Changing wifi to " + String.valueOf(desiredState), 4);
 
 			if (desiredState && Settings.useWifiForPositioning)
-				WifiBroadcastReceiver.startWifiReceiver(autoMationServerRef.getLocationProvider());
+				WifiBroadcastReceiver.startWifiReceiver(automationServerRef.getLocationProvider());
 
 			WifiManager myWifi = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
 
@@ -687,14 +793,14 @@ public class Actions
 
 		AudioManager myAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
 
-		if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && desiredSoundSetting == AudioManager.RINGER_MODE_SILENT)
-		{
-			AudioManager am = (AudioManager) Miscellaneous.getAnyContext().getSystemService(Context.AUDIO_SERVICE);
-			am.setStreamVolume(AudioManager.STREAM_NOTIFICATION, 0, AudioManager.FLAG_PLAY_SOUND);
-			am.setVibrateSetting(AudioManager.VIBRATE_TYPE_RINGER, AudioManager.VIBRATE_SETTING_OFF);
-		}
-		else
-			myAudioManager.setRingerMode(desiredSoundSetting);
+//		if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && desiredSoundSetting == AudioManager.RINGER_MODE_SILENT)
+//		{
+//			AudioManager am = (AudioManager) Miscellaneous.getAnyContext().getSystemService(Context.AUDIO_SERVICE);
+//			am.setStreamVolume(AudioManager.STREAM_NOTIFICATION, 0, AudioManager.FLAG_PLAY_SOUND);
+//			am.setVibrateSetting(AudioManager.VIBRATE_TYPE_RINGER, AudioManager.VIBRATE_SETTING_OFF);
+//		}
+//		else
+		myAudioManager.setRingerMode(desiredSoundSetting);
 	}
 
 	private static String getIPAddressUsb(final boolean useIPv4)
@@ -930,7 +1036,7 @@ public class Actions
 			// Pack intents
 			for (int i = 3; i < params.length; i++)
 			{
-				String[] singleParam = params[i].split(Action.intentPairSeperator);
+				String[] singleParam = params[i].split(Action.intentPairSeparator);
 
     			/*Class c = Class.forName(singleParam[0]);
 				for(Method m : c.getMethods())
@@ -1010,14 +1116,14 @@ public class Actions
 			}
 
 			if (params[2].equals(ActivityManageActionStartActivity.startByActivityString))
-				autoMationServerRef.startActivity(externalActivityIntent);
+				automationServerRef.startActivity(externalActivityIntent);
 			else
-				autoMationServerRef.sendBroadcast(externalActivityIntent);
+				automationServerRef.sendBroadcast(externalActivityIntent);
 		}
 		catch (Exception e)
 		{
-			Miscellaneous.logEvent("e", "StartOtherApp", autoMationServerRef.getResources().getString(R.string.errorStartingOtherActivity) + ": " + Log.getStackTraceString(e), 2);
-			Toast.makeText(autoMationServerRef, autoMationServerRef.getResources().getString(R.string.errorStartingOtherActivity) + ": " + e.getMessage(), Toast.LENGTH_LONG).show();
+			Miscellaneous.logEvent("e", "StartOtherApp", automationServerRef.getResources().getString(R.string.errorStartingOtherActivity) + ": " + Log.getStackTraceString(e), 2);
+			Toast.makeText(automationServerRef, automationServerRef.getResources().getString(R.string.errorStartingOtherActivity) + ": " + e.getMessage(), Toast.LENGTH_LONG).show();
 		}
 	}
 
@@ -1074,7 +1180,7 @@ public class Actions
 
 			PendingIntent pi = PendingIntent.getActivity(context, 0, new Intent(context, Actions.class), 0);
 			SmsManager sms = SmsManager.getDefault();
-			sms.sendTextMessage(phoneNumber, null, message, pi, null);
+			sms.sendTextMessage(phoneNumber, null, textToSend, pi, null);
 		}
 		catch (Exception e)
 		{
@@ -1201,7 +1307,7 @@ public class Actions
 
 		try
 		{
-			boolean isEnabled = ConnectivityReceiver.isAirplaneMode(autoMationServerRef);
+			boolean isEnabled = ConnectivityReceiver.isAirplaneMode(automationServerRef);
 
 			if (isEnabled)
 				Miscellaneous.logEvent("i", "Airplane mode", "Current status is enabled.", 4);
@@ -1315,7 +1421,7 @@ public class Actions
 		try
 		{
 			String textToSpeak = Miscellaneous.replaceVariablesInText(parameter2, context);
-			autoMationServerRef.speak(textToSpeak, true);
+			automationServerRef.speak(textToSpeak, true);
 		}
 		catch (Exception e)
 		{
@@ -1345,23 +1451,7 @@ public class Actions
 			playMusicIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 			context.startActivity(playMusicIntent);
 
-			//			playMusicIntent = new Intent();
-			//			playMusicIntent.setAction(android.content.Intent.ACTION_VIEW);
-			//			File file = new File(YOUR_SONG_URI);
-			//			playMusicIntent.setDataAndType(Uri.fromFile(file), "audio/*");
-			//			context.startActivity(playMusicIntent);
-
 			return true;
-			//		}
-			//		else
-			//		{
-			//			if(playMusicIntent != null)
-			//			{
-			//				context.stopService(playMusicIntent);
-			//			}
-			//		}
-
-			//		return false;
 		}
 		catch (ActivityNotFoundException e)
 		{
@@ -1377,6 +1467,45 @@ public class Actions
 		}
 	}
 
+	@RequiresApi(api = Build.VERSION_CODES.KITKAT)
+	public static boolean controlMediaPlayback(Context context, int command)
+	{
+		int keyCode = -1;
+		switch(command)
+		{
+			case 0:
+				keyCode = KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE;
+				break;
+			case 1:
+				keyCode = KeyEvent.KEYCODE_MEDIA_PLAY;
+				break;
+			case 2:
+				keyCode = KeyEvent.KEYCODE_MEDIA_PAUSE;
+				break;
+			case 3:
+				keyCode = KeyEvent.KEYCODE_MEDIA_STOP;
+				break;
+			case 4:
+				keyCode = KeyEvent.KEYCODE_MEDIA_PREVIOUS;
+				break;
+			case 5:
+				keyCode = KeyEvent.KEYCODE_MEDIA_NEXT;
+				break;
+		}
+
+		return controlMediaByDispatch(keyCode);
+	}
+
+	@RequiresApi(api = Build.VERSION_CODES.KITKAT)
+	static boolean controlMediaByDispatch(int keyCode)
+	{
+		AudioManager mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
+		KeyEvent event = new KeyEvent(KeyEvent.ACTION_DOWN, keyCode);
+		mAudioManager.dispatchMediaKeyEvent(event);
+
+		return true;
+	}
+
 	private String getTransactionCode()
 	{
 		try
@@ -1490,7 +1619,7 @@ public class Actions
 			{
 				if(Build.VERSION.SDK_INT > Build.VERSION_CODES.O_MR1)
 				{
-					if(MobileDataStuff.setMobileNetworkFromAndroid9(desiredState, autoMationServerRef))
+					if(MobileDataStuff.setMobileNetworkFromAndroid9(desiredState, automationServerRef))
 					{
 						Miscellaneous.logEvent("i", "setDataConnectionWithRoot()", Miscellaneous.getAnyContext().getResources().getString(R.string.dataConWithRootSuccess), 2);
 						return true;
@@ -1503,7 +1632,7 @@ public class Actions
 				}
 				else if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP)
 				{
-					if (MobileDataStuff.setMobileNetworkTillAndroid5(desiredState, autoMationServerRef))
+					if (MobileDataStuff.setMobileNetworkTillAndroid5(desiredState, automationServerRef))
 					{
 						Miscellaneous.logEvent("i", "setDataConnectionWithRoot()", Miscellaneous.getAnyContext().getResources().getString(R.string.dataConWithRootSuccess), 2);
 						return true;
@@ -1516,7 +1645,7 @@ public class Actions
 				}
 				else
 				{
-					if (MobileDataStuff.setMobileNetworkAndroid6Till8(desiredState, autoMationServerRef))
+					if (MobileDataStuff.setMobileNetworkAndroid6Till8(desiredState, automationServerRef))
 					{
 						Miscellaneous.logEvent("i", "setDataConnectionWithRoot()", Miscellaneous.getAnyContext().getResources().getString(R.string.dataConWithRootSuccess), 2);
 						return true;

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

@@ -10,6 +10,7 @@ import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
+import android.widget.CheckBox;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -20,8 +21,9 @@ import org.apache.commons.lang3.StringUtils;
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Locale;
 
-public class ActivityMaintenance extends Activity
+public class ActivityControlCenter extends Activity
 {
     final static int requestCodeImport = 1001;
     final static int requestCodeExport = 1002;
@@ -30,13 +32,14 @@ public class ActivityMaintenance extends Activity
     final static String prefsFileName = "com.jens.automation2_preferences.xml";
 
     TextView tvFileStoreLocation, tvAppVersion;
-    Button bVolumeTest, bMoreSettings, bSettingsSetToDefault, bShareConfigAndLog, bImportConfiguration, bExportConfiguration;
+    Button bVolumeTest, bMoreSettings, bSettingsSetToDefault, bSendEmailToDev, bImportConfiguration, bExportConfiguration;
+    CheckBox chkShareConfigAndLog;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState)
     {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_maintenance);
+        setContentView(R.layout.activity_control_center);
 
         bVolumeTest = (Button) findViewById(R.id.bVolumeTest);
         bVolumeTest.setOnClickListener(new View.OnClickListener()
@@ -44,18 +47,25 @@ public class ActivityMaintenance extends Activity
             @Override
             public void onClick(View v)
             {
-                Intent intent = new Intent(ActivityMaintenance.this, ActivityVolumeTest.class);
+                Intent intent = new Intent(ActivityControlCenter.this, ActivityVolumeTest.class);
                 startActivity(intent);
             }
         });
 
-        bShareConfigAndLog = (Button) findViewById(R.id.bShareConfigAndLog);
-        bShareConfigAndLog.setOnClickListener(new View.OnClickListener()
+        chkShareConfigAndLog = (CheckBox)findViewById(R.id.chkShareConfigAndLog);
+        bSendEmailToDev = (Button) findViewById(R.id.bSendEmailToDev);
+        bSendEmailToDev.setOnClickListener(new View.OnClickListener()
         {
             @Override
             public void onClick(View v)
             {
-                getShareConfigAndLogDialogue(ActivityMaintenance.this).show();
+                if(chkShareConfigAndLog.isChecked())
+                    getShareConfigAndLogDialogue(ActivityControlCenter.this).show();
+                else
+                {
+                    String subject = "Automation";
+                    Miscellaneous.sendEmail(ActivityControlCenter.this, "android-development@gmx.de", "Automation logs", getSystemInfo(), null);
+                }
             }
         });
 
@@ -65,17 +75,17 @@ public class ActivityMaintenance extends Activity
             @Override
             public void onClick(View v)
             {
-                getDefaultSettingsDialog(ActivityMaintenance.this).show();
+                getDefaultSettingsDialog(ActivityControlCenter.this).show();
             }
         });
 
-        Button bMoreSettings = (Button) findViewById(R.id.bMoreSettings);
+        bMoreSettings = (Button) findViewById(R.id.bMoreSettings);
         bMoreSettings.setOnClickListener(new View.OnClickListener()
         {
             @Override
             public void onClick(View v)
             {
-                Intent myIntent = new Intent(ActivityMaintenance.this, ActivitySettings.class);
+                Intent myIntent = new Intent(ActivityControlCenter.this, ActivitySettings.class);
                 startActivityForResult(myIntent, requestCodeMoreSettings);
             }
         });
@@ -123,7 +133,7 @@ public class ActivityMaintenance extends Activity
                 if (AutomationService.isMyServiceRunning(this))
                     AutomationService.getInstance().serviceInterface(AutomationService.serviceCommands.reloadSettings);
 
-                if (AutomationService.isMyServiceRunning(ActivityMaintenance.this))
+                if (AutomationService.isMyServiceRunning(ActivityControlCenter.this))
                     Toast.makeText(this, getResources().getString(R.string.settingsWillTakeTime), Toast.LENGTH_LONG).show();
 
                 break;
@@ -170,7 +180,7 @@ public class ActivityMaintenance extends Activity
                         if (Miscellaneous.copyDocumentFileToFile(file, dstRules))
                             filesImported++;
                         else
-                            Toast.makeText(ActivityMaintenance.this, getResources().getString(R.string.rulesImportError), Toast.LENGTH_LONG).show();
+                            Toast.makeText(ActivityControlCenter.this, getResources().getString(R.string.rulesImportError), Toast.LENGTH_LONG).show();
                     }
                 }
                 else if (file.getName().equals(prefsFileName))
@@ -183,7 +193,7 @@ public class ActivityMaintenance extends Activity
                         if (Miscellaneous.copyDocumentFileToFile(file, dstPrefs))
                             filesImported++;
                         else
-                            Toast.makeText(ActivityMaintenance.this, getResources().getString(R.string.prefsImportError), Toast.LENGTH_LONG).show();
+                            Toast.makeText(ActivityControlCenter.this, getResources().getString(R.string.prefsImportError), Toast.LENGTH_LONG).show();
                     }
                 }
             }
@@ -191,12 +201,12 @@ public class ActivityMaintenance extends Activity
             if(applicableFilesFound > 0)
             {
                 if(filesImported == 0)
-                    Toast.makeText(ActivityMaintenance.this, getResources().getString(R.string.noFilesImported), Toast.LENGTH_LONG).show();
+                    Toast.makeText(ActivityControlCenter.this, getResources().getString(R.string.noFilesImported), Toast.LENGTH_LONG).show();
                 else if(filesImported < applicableFilesFound)
-                    Toast.makeText(ActivityMaintenance.this, getResources().getString(R.string.notAllFilesImported), Toast.LENGTH_LONG).show();
+                    Toast.makeText(ActivityControlCenter.this, getResources().getString(R.string.notAllFilesImported), Toast.LENGTH_LONG).show();
                 else if (filesImported == applicableFilesFound)
                 {
-                    Toast.makeText(ActivityMaintenance.this, getResources().getString(R.string.configurationImportedSuccessfully), Toast.LENGTH_LONG).show();
+                    Toast.makeText(ActivityControlCenter.this, getResources().getString(R.string.configurationImportedSuccessfully), Toast.LENGTH_LONG).show();
 
                     try
                     {
@@ -208,19 +218,19 @@ public class ActivityMaintenance extends Activity
                     catch (Exception e)
                     {
                         Miscellaneous.logEvent("e", "Reading import", "Rules re-read failed: " + Log.getStackTraceString(e), 1);
-                        Toast.makeText(ActivityMaintenance.this, getResources().getString(R.string.errorReadingPoisAndRulesFromFile), Toast.LENGTH_LONG).show();
+                        Toast.makeText(ActivityControlCenter.this, getResources().getString(R.string.errorReadingPoisAndRulesFromFile), Toast.LENGTH_LONG).show();
                     }
 
-                    Settings.readFromPersistentStorage(ActivityMaintenance.this);
+                    Settings.readFromPersistentStorage(ActivityControlCenter.this);
                 }
                 else
-                    Toast.makeText(ActivityMaintenance.this, getResources().getString(R.string.noFilesImported), Toast.LENGTH_LONG).show();
+                    Toast.makeText(ActivityControlCenter.this, getResources().getString(R.string.noFilesImported), Toast.LENGTH_LONG).show();
             }
             else
-                Toast.makeText(ActivityMaintenance.this, getResources().getString(R.string.noApplicableFilesFoundInDirectory), Toast.LENGTH_LONG).show();
+                Toast.makeText(ActivityControlCenter.this, getResources().getString(R.string.noApplicableFilesFoundInDirectory), Toast.LENGTH_LONG).show();
         }
         else
-            Toast.makeText(ActivityMaintenance.this, getResources().getString(R.string.noApplicableFilesFoundInDirectory), Toast.LENGTH_LONG).show();
+            Toast.makeText(ActivityControlCenter.this, getResources().getString(R.string.noApplicableFilesFoundInDirectory), Toast.LENGTH_LONG).show();
     }
 
     void exportFiles(Uri uriTree)
@@ -252,12 +262,12 @@ public class ActivityMaintenance extends Activity
         if(dstRules.canWrite() && dstPrefs.canWrite())
         {
             if(Miscellaneous.copyFileToDocumentFile(srcRules, dstRules) && Miscellaneous.copyFileToDocumentFile(srcPrefs, dstPrefs))
-                Toast.makeText(ActivityMaintenance.this, getResources().getString(R.string.configurationExportedSuccessfully), Toast.LENGTH_LONG).show();
+                Toast.makeText(ActivityControlCenter.this, getResources().getString(R.string.configurationExportedSuccessfully), Toast.LENGTH_LONG).show();
             else
-                Toast.makeText(ActivityMaintenance.this, getResources().getString(R.string.ConfigurationExportError), Toast.LENGTH_LONG).show();
+                Toast.makeText(ActivityControlCenter.this, getResources().getString(R.string.ConfigurationExportError), Toast.LENGTH_LONG).show();
         }
         else
-            Toast.makeText(ActivityMaintenance.this, getResources().getString(R.string.ConfigurationExportError), Toast.LENGTH_LONG).show();
+            Toast.makeText(ActivityControlCenter.this, getResources().getString(R.string.ConfigurationExportError), Toast.LENGTH_LONG).show();
     }
 
     private static AlertDialog getDefaultSettingsDialog(final Context context)
@@ -296,32 +306,33 @@ public class ActivityMaintenance extends Activity
                 srcFilesList.add(Miscellaneous.getWriteableFolder() + "/../shared_prefs/" + prefsFileName);
 
                 String logFilePath = Miscellaneous.getWriteableFolder() + "/" + Miscellaneous.logFileName;
-                if((new File(logFilePath)).exists())
+                if ((new File(logFilePath)).exists())
                     srcFilesList.add(logFilePath);
 
                 String logFilePathArchive = Miscellaneous.getWriteableFolder() + "/" + Miscellaneous.logFileName + "-old";
-                if((new File(logFilePathArchive)).exists())
+                if ((new File(logFilePathArchive)).exists())
                     srcFilesList.add(logFilePathArchive);
 
                 String[] srcFiles = srcFilesList.toArray(new String[srcFilesList.size()]);
 
-                if(dstZipFile.exists())
+                if (dstZipFile.exists())
                     dstZipFile.delete();
 
                 Miscellaneous.zip(srcFiles, dstZipFile.getAbsolutePath());
 
-				/*
-					Without root the zip file in the cache directory is not directly accessible.
-					But have to route it through this content provider crap.
-				 */
+            /*
+                Without root the zip file in the cache directory is not directly accessible.
+                But have to route it through this content provider crap.
+             */
 
                 String subject = "Automation logs";
 
                 Uri uri = Uri.parse("content://com.jens.automation2/" + Settings.zipFileName);
 
-                Miscellaneous.sendEmail(ActivityMaintenance.this, "android-development@gmx.de", "Automation logs", getSystemInfo(), uri);
+                Miscellaneous.sendEmail(ActivityControlCenter.this, "android-development@gmx.de", "Automation logs", getSystemInfo(), uri);
             }
         });
+
         alertDialogBuilder.setNegativeButton(context.getResources().getString(R.string.no), null);
         AlertDialog alertDialog = alertDialogBuilder.create();
 
@@ -337,7 +348,24 @@ public class ActivityMaintenance extends Activity
         systemInfoText.append("Device: " + android.os.Build.DEVICE + Miscellaneous.lineSeparator);
         systemInfoText.append("Model: " + android.os.Build.MODEL + Miscellaneous.lineSeparator);
         systemInfoText.append("Product: " + android.os.Build.PRODUCT + Miscellaneous.lineSeparator);
-        systemInfoText.append("Flavor: " + BuildConfig.FLAVOR);
+        systemInfoText.append("Flavor: " + BuildConfig.FLAVOR + Miscellaneous.lineSeparator);
+        systemInfoText.append("Country: " + Miscellaneous.getUserCountry(Miscellaneous.getAnyContext()) + Miscellaneous.lineSeparator);
+        systemInfoText.append("OS language: " + Locale.getDefault().getDisplayName());
+
+        /*
+            I've checked the Locale methods on my Android 4.1.2 device, and the results:
+
+            Locale.getDefault().getLanguage()       ---> en
+            Locale.getDefault().getISO3Language()   ---> eng
+            Locale.getDefault().getCountry()        ---> US
+            Locale.getDefault().getISO3Country()    ---> USA
+            Locale.getDefault().getDisplayCountry() ---> United States
+            Locale.getDefault().getDisplayName()    ---> English (United States)
+            Locale.getDefault().toString()          ---> en_US
+            Locale.getDefault().getDisplayLanguage()---> English
+            Locale.getDefault().toLanguageTag()     ---> en-US
+         */
+
         return systemInfoText.toString();
     }
 
@@ -367,7 +395,7 @@ public class ActivityMaintenance extends Activity
                     {
                         // if you reach this place, it means there is no any file
                         // explorer app installed on your device
-                        Toast.makeText(ActivityMaintenance.this, getResources().getString(R.string.noFileManageInstalled), Toast.LENGTH_LONG).show();
+                        Toast.makeText(ActivityControlCenter.this, getResources().getString(R.string.noFileManageInstalled), Toast.LENGTH_LONG).show();
                     }
 
                 }

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

@@ -184,8 +184,16 @@ public class ActivityMainProfiles extends ActivityGeneric
 						startActivityForResult(manageSpecificProfileIntent, 2000);
 						break;
 					case 2:
-						if(profile.delete(myAutomationService))
-							updateListView();
+						Rule user = profile.isInUseByRules();
+						if(user == null)
+						{
+							if (profile.delete(ActivityMainProfiles.this))
+								updateListView();
+							else
+								Toast.makeText(ActivityMainProfiles.this, getResources().getString(R.string.profileCouldNotBeDeleted), Toast.LENGTH_LONG).show();
+						}
+						else
+							Toast.makeText(ActivityMainProfiles.this, String.format(getResources().getString(R.string.ruleXIsUsingProfileY), user.getName(), profile.getName()), Toast.LENGTH_LONG).show();
 						break;
 				}
 			}

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

@@ -135,7 +135,7 @@ public class ActivityMainRules extends ActivityGeneric
 		    else
 		        holder = (RuleHolder) v.getTag();
 		 
-		    System.out.println("Position ["+position+"]");
+//		    System.out.println("Position ["+position+"]");
 		    Rule r = Rule.getRuleCollection().get(position);
 		    holder.tvRuleName.setText(r.getName());	 
 		    if(r.isRuleActive())
@@ -199,6 +199,7 @@ public class ActivityMainRules extends ActivityGeneric
 							AutomationService runContext = AutomationService.getInstance();
 							if(runContext != null)
 							{
+								Miscellaneous.logEvent("i", "ActivityMainRules", "Initiating manual execution of rule " + ruleThisIsAbout.getName(), 3);
 								ruleThisIsAbout.activate(runContext, true);
 								break;
 							}

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

@@ -3,7 +3,6 @@ package com.jens.automation2;
 import android.Manifest;
 import android.annotation.SuppressLint;
 import android.app.AlertDialog;
-import android.app.PendingIntent;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -11,7 +10,6 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
-import android.util.Xml;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -29,29 +27,25 @@ import androidx.core.text.HtmlCompat;
 
 import com.jens.automation2.AutomationService.serviceCommands;
 import com.jens.automation2.Trigger.Trigger_Enum;
-import com.jens.automation2.location.CellLocationChangedReceiver;
 import com.jens.automation2.location.LocationProvider;
 
-import java.io.File;
-import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.Calendar;
 
 @SuppressLint("NewApi")
 public class ActivityMainScreen extends ActivityGeneric
 {
-	private static boolean guiChangeInProgress = false;
+	static boolean guiChangeInProgress = false;
+	static ActivityMainScreen activityMainScreenInstance = null;
+	static boolean updateNoteDisplayed = false;
+	static boolean uiUpdateRunning = false;
 
-	private static ActivityMainScreen activityMainScreenInstance = null;
-	private ToggleButton toggleService, tbLockSound;
-	private Button bShowHelp, bPrivacy, bSettingsErase, bAddSoundLockTIme, bDonate;
-	private TextView tvActivePoi, tvClosestPoi, tvLastRule, tvMainScreenNotePermissions, tvMainScreenNoteFeaturesFromOtherFlavor, tvMainScreenNoteLocationImpossibleBlameGoogle, tvMainScreenNoteNews, tvlockSoundDuration;
-	private static boolean updateNoteDisplayed = false;
+	ToggleButton toggleService, tbLockSound;
+	Button bShowHelp, bPrivacy, bAddSoundLockTIme, bDonate, bControlCenter;
+	TextView tvActivePoi, tvClosestPoi, tvLastRule, tvLastProfile, tvMainScreenNotePermissions, tvMainScreenNoteFeaturesFromOtherFlavor, tvMainScreenNoteLocationImpossibleBlameGoogle, tvMainScreenNoteNews, tvLockSoundDuration;
 
-	private ListView lvRuleHistory;
-	private ArrayAdapter<Rule> ruleHistoryListViewAdapter;
-
-	private static boolean uiUpdateRunning = false;
+	ListView lvRuleHistory;
+	ArrayAdapter<Rule> ruleHistoryListViewAdapter;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState)
@@ -74,12 +68,13 @@ public class ActivityMainScreen extends ActivityGeneric
 		tvActivePoi = (TextView) findViewById(R.id.tvActivePoi);
 		tvClosestPoi = (TextView) findViewById(R.id.tvClosestPoi);
 		lvRuleHistory = (ListView) findViewById(R.id.lvRuleHistory);
-		tvLastRule = (TextView) findViewById(R.id.tvTimeFrameHelpText);
+		tvLastRule = (TextView) findViewById(R.id.tvLastRule);
+		tvLastProfile = (TextView)findViewById(R.id.tvLastProfile);
 		tvMainScreenNotePermissions = (TextView) findViewById(R.id.tvMainScreenNotePermissions);
 		tvMainScreenNoteFeaturesFromOtherFlavor = (TextView) findViewById(R.id.tvMainScreenNoteFeaturesFromOtherFlavor);
 		tvMainScreenNoteLocationImpossibleBlameGoogle = (TextView) findViewById(R.id.tvMainScreenNoteLocationImpossibleBlameGoogle);
 		tvMainScreenNoteNews = (TextView) findViewById(R.id.tvMainScreenNoteNews);
-		tvlockSoundDuration = (TextView)findViewById(R.id.tvlockSoundDuration);
+		tvLockSoundDuration = (TextView)findViewById(R.id.tvlockSoundDuration);
 		tbLockSound = (ToggleButton) findViewById(R.id.tbLockSound);
 		toggleService = (ToggleButton) findViewById(R.id.tbArmMastListener);
 
@@ -99,7 +94,8 @@ public class ActivityMainScreen extends ActivityGeneric
 					if (toggleService.isChecked())
 					{
 						startAutomationService(getBaseContext(), false);
-					} else
+					}
+					else
 					{
 						stopAutomationService();
 					}
@@ -147,13 +143,13 @@ public class ActivityMainScreen extends ActivityGeneric
 			}
 		});
 
-		Button bSettings = (Button) findViewById(R.id.bSettings);
-		bSettings.setOnClickListener(new OnClickListener()
+		bControlCenter = (Button) findViewById(R.id.bControlCenter);
+		bControlCenter.setOnClickListener(new OnClickListener()
 		{
 			@Override
 			public void onClick(View v)
 			{
-				Intent myIntent = new Intent(ActivityMainScreen.this, ActivityMaintenance.class);
+				Intent myIntent = new Intent(ActivityMainScreen.this, ActivityControlCenter.class);
 				startActivity(myIntent);
 			}
 		});
@@ -370,6 +366,16 @@ public class ActivityMainScreen extends ActivityGeneric
 				{
 					activityMainScreenInstance.tvLastRule.setText("n./a.");
 				}
+
+				try
+				{
+					activityMainScreenInstance.tvLastProfile.setText(Profile.getLastActivatedProfile().getName());
+					activityMainScreenInstance.updateListView();
+				}
+				catch (Exception e)
+				{
+					activityMainScreenInstance.tvLastProfile.setText("n./a.");
+				}
 			}
 			else
 			{
@@ -378,6 +384,7 @@ public class ActivityMainScreen extends ActivityGeneric
 				activityMainScreenInstance.tvActivePoi.setText(activityMainScreenInstance.getResources().getString(R.string.serviceNotRunning));
 				activityMainScreenInstance.tvClosestPoi.setText("");
 				activityMainScreenInstance.tvLastRule.setText("");
+				activityMainScreenInstance.tvLastProfile.setText("");
 			}
 
 //			uiUpdateRunning = true;
@@ -395,21 +402,21 @@ public class ActivityMainScreen extends ActivityGeneric
 					long millis = end.getTimeInMillis() - now.getTimeInMillis();
 					long minutes = millis/1000/60;
 					if(minutes < 60)
-						activityMainScreenInstance.tvlockSoundDuration.setText(String.valueOf(minutes + " min..."));
+						activityMainScreenInstance.tvLockSoundDuration.setText(String.valueOf(minutes + " min..."));
 					else
 					{
 						double hours = (double)minutes / 60.0;
-						activityMainScreenInstance.tvlockSoundDuration.setText(String.valueOf(Math.round(hours * 100.0) / 100.0) + " h...");
+						activityMainScreenInstance.tvLockSoundDuration.setText(String.valueOf(Math.round(hours * 100.0) / 100.0) + " h...");
 					}
 				}
 				else
-					activityMainScreenInstance.tvlockSoundDuration.setText(String.valueOf(""));
+					activityMainScreenInstance.tvLockSoundDuration.setText(String.valueOf(""));
 			}
 			else
 			{
 				activityMainScreenInstance.tbLockSound.setChecked(false);
 				activityMainScreenInstance.tbLockSound.setEnabled(false);
-				activityMainScreenInstance.tvlockSoundDuration.setText("");
+				activityMainScreenInstance.tvLockSoundDuration.setText("");
 			}
 			Settings.writeSettings(activityMainScreenInstance);
 //			uiUpdateRunning = false;

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

@@ -10,10 +10,13 @@ import android.widget.CompoundButton;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
-import androidx.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 public class ActivityManageActionBrightnessSetting extends Activity
 {
+    public static final String intentNameAutoBrightness = "autoBrightness";
+    public static final String intentNameBrightnessValue = "brightnessValue";
+
     CheckBox chkAutoBrightness;
     SeekBar sbBrightness;
     Button bApplyBrightness;
@@ -22,7 +25,7 @@ public class ActivityManageActionBrightnessSetting extends Activity
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState)
     {
-        setContentView(R.layout.activity_manage_brightness_setting);
+        setContentView(R.layout.activity_manage_action_brightness_settings);
         super.onCreate(savedInstanceState);
 
         chkAutoBrightness = (CheckBox)findViewById(R.id.chkAutoBrightness);
@@ -32,11 +35,11 @@ public class ActivityManageActionBrightnessSetting extends Activity
 
         Intent input = getIntent();
 
-        if(input.hasExtra("autoBrightness"))
-            chkAutoBrightness.setChecked(input.getBooleanExtra("autoBrightness", false));
+        if(input.hasExtra(intentNameAutoBrightness))
+            chkAutoBrightness.setChecked(input.getBooleanExtra(intentNameAutoBrightness, false));
 
-        if(input.hasExtra("brightnessValue"))
-            sbBrightness.setProgress(input.getIntExtra("brightnessValue", 0));
+        if(input.hasExtra(intentNameBrightnessValue))
+            sbBrightness.setProgress(input.getIntExtra(intentNameBrightnessValue, 0));
 
         bApplyBrightness.setOnClickListener(new View.OnClickListener()
         {
@@ -44,8 +47,8 @@ public class ActivityManageActionBrightnessSetting extends Activity
             public void onClick(View view)
             {
                 Intent answer = new Intent();
-                answer.putExtra("autoBrightness", chkAutoBrightness.isChecked());
-                answer.putExtra("brightnessValue", sbBrightness.getProgress());
+                answer.putExtra(intentNameAutoBrightness, chkAutoBrightness.isChecked());
+                answer.putExtra(intentNameBrightnessValue, sbBrightness.getProgress());
                 setResult(RESULT_OK, answer);
                 finish();
             }

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

@@ -0,0 +1,397 @@
+package com.jens.automation2;
+
+import static com.jens.automation2.Trigger.triggerParameter2Split;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.ProgressDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
+import android.widget.EditText;
+import android.widget.Spinner;
+import android.widget.TextView;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+public class ActivityManageActionCloseNotification extends Activity
+{
+	public static final String intentNameNotificationApp = "app";
+	public static final String intentNameNotificationTitleDir = "titleDir";
+	public static final String intentNameNotificationTitle = "title";
+	public static final String intentNameNotificationTextDir = "textDir";
+	public static final String intentNameNotificationText = "text";
+	public static final String intentNameNotificationDirection = "direction";
+
+	boolean edit = false;
+	ProgressDialog progressDialog = null;
+
+	EditText etNotificationTitle, etNotificationText;
+	Button bSelectApp, bSaveActionCloseNotification;
+	Spinner spinnerTitleDirection, spinnerTextDirection;
+	TextView tvSelectedApplication;
+	
+	private static List<PackageInfo> pInfos = null;
+	public static Trigger resultingTrigger;
+
+	private static String[] directions;
+
+	ArrayAdapter<String> directionSpinnerAdapter;
+	
+	public static void getActivityList(final Context context)
+	{
+		if(pInfos == null)
+		{
+			pInfos = context.getPackageManager().getInstalledPackages(PackageManager.GET_ACTIVITIES);
+			Collections.sort(pInfos, new Comparator<PackageInfo>()
+			{
+			    public int compare(PackageInfo obj1, PackageInfo obj2)
+			    {
+			    	String name1 = "";
+					String name2 = "";
+
+					ApplicationInfo aInfo1 = obj1.applicationInfo;
+					if (aInfo1 != null)
+					{
+						name1 = (String) context.getPackageManager().getApplicationLabel(aInfo1);
+					}
+					ApplicationInfo aInfo2 = obj2.applicationInfo;
+					if (aInfo2 != null)
+					{
+						name2 = (String) context.getPackageManager().getApplicationLabel(aInfo2);
+					}
+
+					return name1.compareTo(name2);
+			    }
+			});
+		}
+	}
+ 
+	public static String[] getApplicationNameListString(Context myContext)
+	{
+		// Generate the actual list
+		getActivityList(myContext);
+		
+		ArrayList<String> returnList = new ArrayList<String>();
+		
+		for (PackageInfo pInfo : pInfos)
+		{
+			ApplicationInfo aInfo = pInfo.applicationInfo;
+			if (aInfo != null)
+			{
+				String aLabel;
+	
+				aLabel = (String) myContext.getPackageManager().getApplicationLabel(aInfo);
+
+				ActivityInfo[] aInfos = pInfo.activities;
+				if (aInfos != null && aInfos.length > 0)		// Only put Applications into the list that have packages.
+				{
+					if(!returnList.contains(aLabel))
+						returnList.add(aLabel);
+				}
+			}
+		}
+		
+		return returnList.toArray(new String[returnList.size()]);
+	}
+
+	public static String[] getPackageListString(Context myContext, String applicationLabel)
+	{
+		// Generate the actual list
+		getActivityList(myContext);
+		
+		ArrayList<String> returnList = new ArrayList<String>();
+		
+		for (PackageInfo pInfo : pInfos)
+		{
+			if(myContext.getPackageManager().getApplicationLabel(pInfo.applicationInfo).equals(applicationLabel))
+			{
+				ActivityInfo[] aInfos = pInfo.activities;
+				if (aInfos != null && aInfos.length > 0)
+				{
+					returnList.add(pInfo.packageName);
+				}
+			}
+		}
+		
+		return returnList.toArray(new String[returnList.size()]);
+	}
+
+	public static String[] getPackageListString(Context myContext)
+	{
+		// Generate the actual list
+		getActivityList(myContext);
+		
+		ArrayList<String> returnList = new ArrayList<String>();
+		
+		for (PackageInfo pInfo : pInfos)
+		{
+			ActivityInfo[] aInfos = pInfo.activities;
+			if (aInfos != null && aInfos.length > 0)
+			{
+				returnList.add(pInfo.packageName);
+			}
+			else
+				Miscellaneous.logEvent("w", "Empty Application", "Application " + myContext.getPackageManager().getApplicationLabel(pInfo.applicationInfo) + " doesn\'t have packages.", 5);
+		}
+		
+		return returnList.toArray(new String[returnList.size()]);
+	}
+	
+	public static String[] getActivityListForPackageName(String packageName)
+	{
+		ArrayList<String> returnList = new ArrayList<String>();
+		
+		for (PackageInfo pInfo : pInfos)
+		{
+			if(pInfo.packageName.equals(packageName))
+			{
+				ActivityInfo[] aInfos = pInfo.activities;
+				if (aInfos != null)
+				{
+					for (ActivityInfo activityInfo : aInfos)
+					{
+						returnList.add(activityInfo.name);
+					}
+				}
+			}
+		}
+		
+		return returnList.toArray(new String[returnList.size()]);
+	}
+	
+	public static ActivityInfo getActivityInfoForPackageNameAndActivityName(String packageName, String activityName)
+	{
+		for (PackageInfo pInfo : pInfos)
+		{
+			if(pInfo.packageName.equals(packageName))
+			{
+				ActivityInfo[] aInfos = pInfo.activities;
+				if (aInfos != null)
+				{
+					for (ActivityInfo activityInfo : aInfos)
+					{
+						if(activityInfo.name.equals(activityName))
+							return activityInfo;
+					}
+				}
+			}
+		}
+		
+		return null;
+	}
+	
+	private AlertDialog getActionStartActivityDialog1()
+	{
+		AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this);
+		alertDialogBuilder.setTitle(getResources().getString(R.string.selectApplication));
+		final String[] applicationArray = ActivityManageActionCloseNotification.getApplicationNameListString(this);
+		alertDialogBuilder.setItems(applicationArray, new DialogInterface.OnClickListener()
+		{			
+			@Override
+			public void onClick(DialogInterface dialog, int which)
+			{
+				dialog.dismiss();
+				getActionStartActivityDialog2(applicationArray[which]).show();
+			}
+		});
+		AlertDialog alertDialog = alertDialogBuilder.create();
+		
+		return alertDialog;
+	}
+	private AlertDialog getActionStartActivityDialog2(String applicationName)
+	{
+		AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this);
+		alertDialogBuilder.setTitle(getResources().getString(R.string.selectPackageOfApplication));
+		final String[] packageArray = ActivityManageActionCloseNotification.getPackageListString(this, applicationName);
+		alertDialogBuilder.setItems(packageArray, new DialogInterface.OnClickListener()
+		{			
+			@Override
+			public void onClick(DialogInterface dialog, int which)
+			{
+				//getActionStartActivityDialog3(packageArray[which]).show();
+				//Miscellaneous.messageBox(getResources().getString(R.string.hint), getResources().getString(R.string.chooseActivityHint), ActivityManageNotificationTrigger.this).show();
+				tvSelectedApplication.setText(packageArray[which]);
+			}
+		});
+		AlertDialog alertDialog = alertDialogBuilder.create();
+		
+		return alertDialog;
+	}
+	private AlertDialog getActionStartActivityDialog3(final String packageName)
+	{
+		AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this);
+		alertDialogBuilder.setTitle(getResources().getString(R.string.selectActivityToBeStarted));
+		final String activityArray[] = ActivityManageActionCloseNotification.getActivityListForPackageName(packageName);
+		alertDialogBuilder.setItems(activityArray, new DialogInterface.OnClickListener()
+		{			
+			@Override
+			public void onClick(DialogInterface dialog, int which)
+			{
+				ActivityInfo ai = ActivityManageActionCloseNotification.getActivityInfoForPackageNameAndActivityName(packageName, activityArray[which]);
+				tvSelectedApplication.setText(ai.packageName + ";" + ai.name);
+			}
+		});
+		AlertDialog alertDialog = alertDialogBuilder.create();
+		
+		return alertDialog;
+	}
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState)
+	{
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.activity_manage_action_close_notification);
+
+		etNotificationTitle = (EditText)findViewById(R.id.etNotificationTitle);
+		etNotificationText = (EditText)findViewById(R.id.etNotificationText);
+		bSelectApp = (Button)findViewById(R.id.bSelectApp);
+		bSaveActionCloseNotification = (Button)findViewById(R.id.bSaveActionCloseNotification);
+		spinnerTitleDirection = (Spinner)findViewById(R.id.spinnerTitleDirection);
+		spinnerTextDirection = (Spinner)findViewById(R.id.spinnerTextDirection);
+		tvSelectedApplication = (TextView)findViewById(R.id.etActivityOrActionPath);
+
+		directions = new String[] {
+									getResources().getString(R.string.directionStringEquals),
+									getResources().getString(R.string.directionStringContains),
+									getResources().getString(R.string.directionStringStartsWith),
+									getResources().getString(R.string.directionStringEndsWith),
+									getResources().getString(R.string.directionStringNotEquals)
+								};
+
+		directionSpinnerAdapter = new ArrayAdapter<String>(this, R.layout.text_view_for_poi_listview_mediumtextsize, ActivityManageActionCloseNotification.directions);
+		spinnerTitleDirection.setAdapter(directionSpinnerAdapter);
+		spinnerTextDirection.setAdapter(directionSpinnerAdapter);
+		directionSpinnerAdapter.notifyDataSetChanged();
+		
+		bSelectApp.setOnClickListener(new OnClickListener()
+		{
+			@Override
+			public void onClick(View v)
+			{
+				GetActivityListTask getActivityListTask = new GetActivityListTask();
+				getActivityListTask.execute();
+				progressDialog = ProgressDialog.show(ActivityManageActionCloseNotification.this, "", ActivityManageActionCloseNotification.this.getResources().getString(R.string.gettingListOfInstalledApplications));
+			}
+		});
+
+		bSaveActionCloseNotification.setOnClickListener(new OnClickListener()
+		{		
+			@Override
+			public void onClick(View v)
+			{
+				String app;
+				if(tvSelectedApplication.getText().toString().equalsIgnoreCase(getResources().getString(R.string.anyApp)))
+					app = Trigger.anyAppString;
+				else
+					app = tvSelectedApplication.getText().toString();
+
+				String titleDir = Trigger.getMatchCode(spinnerTitleDirection.getSelectedItem().toString());
+				String title = etNotificationTitle.getText().toString();
+				String textDir = Trigger.getMatchCode(spinnerTextDirection.getSelectedItem().toString());
+				String text = etNotificationText.getText().toString();
+
+				Intent responseData = new Intent();
+				if(edit)
+				{
+//					editedNotificationAction.setTriggerParameter(chkNotificationDirection.isChecked());
+					responseData.putExtra(ActivityManageRule.intentNameActionParameter2, app + Action.actionParameter2Split + titleDir + Action.actionParameter2Split + title + Action.actionParameter2Split + textDir + Action.actionParameter2Split + text);
+					ActivityManageActionCloseNotification.this.setResult(RESULT_OK, responseData);
+				}
+				else
+				{
+//					data.putExtra(intentNameNotificationDirection, chkNotificationDirection.isChecked());
+					responseData.putExtra(ActivityManageRule.intentNameActionParameter2,
+													app + Action.actionParameter2Split +
+													titleDir + Action.actionParameter2Split +
+													title + Action.actionParameter2Split +
+													textDir + Action.actionParameter2Split +
+													text
+													);
+//					data.putExtra(intentNameNotificationApp, app);
+//					data.putExtra(intentNameNotificationTitleDir, titleDir);
+//					data.putExtra(intentNameNotificationTitle, title);
+//					data.putExtra(intentNameNotificationTextDir, textDir);
+//					data.putExtra(intentNameNotificationText, text);
+					ActivityManageActionCloseNotification.this.setResult(RESULT_OK, responseData);
+				}
+
+				finish();
+			}
+		});
+
+		Intent i = getIntent();
+		if(!StringUtils.isBlank(i.getStringExtra(ActivityManageRule.intentNameActionParameter2)))
+		{
+			edit = true;
+			loadValuesIntoGui(i.getStringExtra(ActivityManageRule.intentNameActionParameter2));
+		}
+	}
+	
+	private void loadValuesIntoGui(String param)
+	{
+		String[] params = param.split(Action.actionParameter2Split);
+
+		String app = params[0];
+		String titleDir = params[1];
+		String title = params[2];
+		String textDir = params[3];
+		String text;
+		if (params.length >= 5)
+			text = params[4];
+		else
+			text = "";
+
+		if(!app.equals(Trigger.anyAppString))
+			tvSelectedApplication.setText(app);
+
+		for(int i = 0; i < directions.length; i++)
+		{
+			if(Trigger.getMatchCode(directions[i]).equalsIgnoreCase(titleDir))
+				spinnerTitleDirection.setSelection(i);
+
+			if(Trigger.getMatchCode(directions[i]).equalsIgnoreCase(textDir))
+				spinnerTextDirection.setSelection(i);
+		}
+
+		if(title.length() > 0)
+			etNotificationTitle.setText(title);
+
+		if(text.length() > 0)
+			etNotificationText.setText(text);
+	}
+	
+	private class GetActivityListTask extends AsyncTask<Void, Void, Void>
+	{
+		@Override
+		protected Void doInBackground(Void... params)
+		{
+			getActivityList(ActivityManageActionCloseNotification.this);
+			return null;
+		}
+
+		@Override
+		protected void onPostExecute(Void result)
+		{
+			progressDialog.dismiss();
+			getActionStartActivityDialog1().show();
+		}
+	}
+}

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

@@ -0,0 +1,112 @@
+package com.jens.automation2;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.RadioButton;
+import android.widget.Toast;
+
+import androidx.annotation.Nullable;
+
+public class ActivityManageActionControlMedia extends Activity
+{
+    RadioButton rbMediaPlayPause, rbMediaPlay, rbMediaPause, rbMediaStop, rbMediaPrevious, rbMediaNext;
+    Button bSaveControlMediaAction;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_manage_action_control_media);
+
+        rbMediaPlayPause = (RadioButton)findViewById(R.id.rbMediaPlayPause);
+        rbMediaPlay = (RadioButton)findViewById(R.id.rbMediaPlay);
+        rbMediaPause = (RadioButton)findViewById(R.id.rbMediaPause);
+        rbMediaStop = (RadioButton)findViewById(R.id.rbMediaStop);
+        rbMediaPrevious = (RadioButton)findViewById(R.id.rbMediaPrevious);
+        rbMediaNext = (RadioButton)findViewById(R.id.rbMediaNext);
+
+        bSaveControlMediaAction = (Button)findViewById(R.id.bSaveControlMediaAction);
+
+        bSaveControlMediaAction.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View view)
+            {
+                if(checkInput())
+                {
+                    Intent answer = new Intent();
+
+                    if(rbMediaPlayPause.isChecked())
+                        answer.putExtra(ActivityManageRule.intentNameActionParameter2, "0");
+                    else if(rbMediaPlay.isChecked())
+                        answer.putExtra(ActivityManageRule.intentNameActionParameter2, "1");
+                    else if(rbMediaPause.isChecked())
+                        answer.putExtra(ActivityManageRule.intentNameActionParameter2, "2");
+                    else if(rbMediaStop.isChecked())
+                        answer.putExtra(ActivityManageRule.intentNameActionParameter2, "3");
+                    else if(rbMediaPrevious.isChecked())
+                        answer.putExtra(ActivityManageRule.intentNameActionParameter2, "4");
+                    else if(rbMediaNext.isChecked())
+                        answer.putExtra(ActivityManageRule.intentNameActionParameter2, "5");
+
+                    setResult(RESULT_OK, answer);
+                    finish();
+                }
+            }
+        });
+
+        Intent input = getIntent();
+
+        if(input.hasExtra(ActivityManageRule.intentNameActionParameter2))
+        {
+            String existing = input.getStringExtra(ActivityManageRule.intentNameActionParameter2);
+            switch (existing)
+            {
+                case "0":
+                    rbMediaPlayPause.setChecked(true);
+                    break;
+                case "1":
+                    rbMediaPlay.setChecked(true);
+                    break;
+                case "2":
+                    rbMediaPause.setChecked(true);
+                    break;
+                case "3":
+                    rbMediaStop.setChecked(true);
+                    break;
+                case "4":
+                    rbMediaPrevious.setChecked(true);
+                    break;
+                case "5":
+                    rbMediaNext.setChecked(true);
+                    break;
+            }
+        }
+    }
+
+    boolean checkInput()
+    {
+        if(
+                !rbMediaPlayPause.isChecked()
+                    &&
+                !rbMediaPlay.isChecked()
+                    &&
+                !rbMediaPause.isChecked()
+                    &&
+                !rbMediaStop.isChecked()
+                    &&
+                !rbMediaPrevious.isChecked()
+                    &&
+                !rbMediaNext.isChecked()
+        )
+        {
+            Toast.makeText(ActivityManageActionControlMedia.this, getResources().getString(R.string.pleaseSelectActionValue), Toast.LENGTH_SHORT).show();
+            return false;
+        }
+
+        return true;
+    }
+}

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

@@ -0,0 +1,66 @@
+package com.jens.automation2;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import androidx.annotation.Nullable;
+
+import org.apache.commons.lang3.StringUtils;
+
+public class ActivityManageActionCreateNotification extends Activity
+{
+    public static final String intentNameNotificationTitle = "notificationTitle";
+    public static final String intentNameNotificationText = "notificationText";
+
+    EditText etNotificationTitle, etNotificationText;
+    Button bSaveActionNotification;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_manage_action_create_notification);
+
+        etNotificationTitle = (EditText) findViewById(R.id.etNotificationTitle);
+        etNotificationText = (EditText)findViewById(R.id.etNotificationText);
+        bSaveActionNotification = (Button)findViewById(R.id.bSaveActionNotification);
+
+        Intent input = getIntent();
+
+        if(input.hasExtra(intentNameNotificationTitle))
+            etNotificationTitle.setText(input.getStringExtra(intentNameNotificationTitle));
+
+        if(input.hasExtra(intentNameNotificationText))
+            etNotificationText.setText(input.getStringExtra(intentNameNotificationText));
+
+        bSaveActionNotification.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View view)
+            {
+                if(StringUtils.isBlank(etNotificationTitle.getText().toString()))
+                {
+                    Toast.makeText(ActivityManageActionCreateNotification.this, getResources().getString(R.string.enterTitle), Toast.LENGTH_LONG).show();
+                    return;
+                }
+
+                if(StringUtils.isBlank(etNotificationText.getText().toString()))
+                {
+                    Toast.makeText(ActivityManageActionCreateNotification.this, getResources().getString(R.string.enterText), Toast.LENGTH_LONG).show();
+                    return;
+                }
+
+                Intent answer = new Intent();
+                answer.putExtra(intentNameNotificationTitle, etNotificationTitle.getText().toString());
+                answer.putExtra(intentNameNotificationText, etNotificationText.getText().toString());
+                setResult(RESULT_OK, answer);
+                finish();
+            }
+        });
+    }
+}

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

@@ -1,5 +1,6 @@
 package com.jens.automation2;
 
+import android.Manifest;
 import android.app.Activity;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -123,7 +124,7 @@ public class ActivityManageActionSendTextMessage extends Activity
 		{
 			for(int i=0; i<permissions.length; i++)
 			{
-				if(permissions[i].equals("android.permission.READ_CONTACTS"))
+				if(permissions[i].equals(Manifest.permission.READ_CONTACTS))
 				{
 					if(grantResults[i] == PackageManager.PERMISSION_GRANTED)
 					{

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

@@ -1,5 +1,6 @@
 package com.jens.automation2;
 
+import android.Manifest;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
@@ -12,6 +13,7 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Bundle;
 import android.text.InputType;
 import android.view.MotionEvent;
@@ -30,6 +32,8 @@ import android.widget.RadioButton;
 import android.widget.Spinner;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+
 import com.jens.automation2.Action.Action_Enum;
 
 import java.util.ArrayList;
@@ -54,6 +58,8 @@ public class ActivityManageActionStartActivity extends Activity
 	final String urlShowExamples = "https://server47.de/automation/examples_startProgram.html";
 	final static String startByActivityString = "0";
 	final static String startByBroadcastString = "1";
+
+	final static int requestCodeForRequestQueryAllPackagesPermission = 4711;
 	
 	private class CustomPackageInfo extends PackageInfo implements Comparable<CustomPackageInfo>
 	{
@@ -230,44 +236,89 @@ public class ActivityManageActionStartActivity extends Activity
 		return null;
 	}
 	
-	private AlertDialog getActionStartActivityDialog1()
+	private AlertDialog getActionStartActivityDialog1Application()
 	{
 		AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this);
 		alertDialogBuilder.setTitle(getResources().getString(R.string.selectApplication));
 		final String[] applicationArray = ActivityManageActionStartActivity.getApplicationNameListString(this);
 		alertDialogBuilder.setItems(applicationArray, new DialogInterface.OnClickListener()
-		{			
+		{
 			@Override
 			public void onClick(DialogInterface dialog, int which)
 			{
 				dialog.dismiss();
-				getActionStartActivityDialog2(applicationArray[which]).show();
+				getActionStartActivityDialog2(applicationArray[which]);
 			}
 		});
 		AlertDialog alertDialog = alertDialogBuilder.create();
 		
 		return alertDialog;
 	}
-	private AlertDialog getActionStartActivityDialog2(String applicationName)
+	private void getActionStartActivityDialog2(String applicationName)
 	{
 		AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this);
 		alertDialogBuilder.setTitle(getResources().getString(R.string.selectPackageOfApplication));
 		final String[] packageArray = ActivityManageActionStartActivity.getPackageListString(this, applicationName);
-		alertDialogBuilder.setItems(packageArray, new DialogInterface.OnClickListener()
-		{			
+		if(packageArray.length > 1)
+		{
+			alertDialogBuilder.setItems(packageArray, new DialogInterface.OnClickListener()
+			{
+				@Override
+				public void onClick(DialogInterface dialog, int which)
+				{
+						getActionStartActivityDialog4ActivityPickMethod(packageArray[which]).show();
+				}
+			});
+			AlertDialog alertDialog = alertDialogBuilder.create();
+			alertDialog.show();
+		}
+		else
+		{
+			getActionStartActivityDialog4ActivityPickMethod(packageArray[0]).show();
+		}
+	}
+
+	private AlertDialog getActionStartActivityDialog4ActivityPickMethod(final String packageName)
+	{
+		AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this);
+		alertDialogBuilder.setMessage(getResources().getString(R.string.launcherOrManualExplanation));
+		alertDialogBuilder.setPositiveButton(getResources().getString(R.string.takeLauncherActivity), new DialogInterface.OnClickListener()
+		{
 			@Override
 			public void onClick(DialogInterface dialog, int which)
 			{
-				getActionStartActivityDialog3(packageArray[which]).show();
-				Miscellaneous.messageBox(getResources().getString(R.string.hint), getResources().getString(R.string.chooseActivityHint), ActivityManageActionStartActivity.this).show();
-
+				// Pick the launcher automatically
+				Intent launchIntent = getPackageManager().getLaunchIntentForPackage(packageName);
+				if (launchIntent != null)
+				{
+					ActivityInfo ai = ActivityManageActionStartActivity.getActivityInfoForPackageNameAndActivityName(packageName, launchIntent.getComponent().getClassName());
+					etPackageName.setText(ai.packageName);
+					etActivityOrActionPath.setText(ai.name);
+				}
+				else
+				{
+					getActionStartActivityDialog5Activity(packageName).show();
+					Miscellaneous.messageBox(getResources().getString(R.string.hint), getResources().getString(R.string.launcherNotFound) + Miscellaneous.lineSeparator + getResources().getString(R.string.chooseActivityHint), ActivityManageActionStartActivity.this).show();
+				}
 			}
 		});
+		alertDialogBuilder.setNegativeButton(getResources().getString(R.string.pickActivityManually), new DialogInterface.OnClickListener()
+		{
+			@Override
+			public void onClick(DialogInterface dialog, int which)
+			{
+				getActionStartActivityDialog5Activity(packageName).show();
+				Miscellaneous.messageBox(getResources().getString(R.string.hint), getResources().getString(R.string.chooseActivityHint), ActivityManageActionStartActivity.this).show();
+			}
+		});
+
+		final String activityArray[] = ActivityManageActionStartActivity.getActivityListForPackageName(packageName);
 		AlertDialog alertDialog = alertDialogBuilder.create();
-		
+
 		return alertDialog;
 	}
-	private AlertDialog getActionStartActivityDialog3(final String packageName)
+
+	private AlertDialog getActionStartActivityDialog5Activity(final String packageName)
 	{
 		AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this);
 		alertDialogBuilder.setTitle(getResources().getString(R.string.selectActivityToBeStarted));
@@ -283,10 +334,16 @@ public class ActivityManageActionStartActivity extends Activity
 			}
 		});
 		AlertDialog alertDialog = alertDialogBuilder.create();
-		
 		return alertDialog;
 	}
 
+	void getAppList()
+	{
+		GetActivityListTask getActivityListTask = new GetActivityListTask();
+		getActivityListTask.execute();
+		progressDialog = ProgressDialog.show(ActivityManageActionStartActivity.this, "", ActivityManageActionStartActivity.this.getResources().getString(R.string.gettingListOfInstalledApplications));
+	}
+
 	@Override
 	protected void onCreate(Bundle savedInstanceState)
 	{
@@ -320,9 +377,13 @@ public class ActivityManageActionStartActivity extends Activity
 			@Override
 			public void onClick(View v)
 			{
-				GetActivityListTask getActivityListTask = new GetActivityListTask();
-				getActivityListTask.execute();
-				progressDialog = ProgressDialog.show(ActivityManageActionStartActivity.this, "", ActivityManageActionStartActivity.this.getResources().getString(R.string.gettingListOfInstalledApplications));
+				int targetSdkVersion = getApplicationContext().getApplicationInfo().targetSdkVersion;
+				if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && targetSdkVersion >= 30)
+				{
+					requestPermissions(new String[] {Manifest.permission.QUERY_ALL_PACKAGES}, requestCodeForRequestQueryAllPackagesPermission);
+				}
+				else
+					getAppList();
 			}
 		});
 		
@@ -343,9 +404,9 @@ public class ActivityManageActionStartActivity extends Activity
 					Toast.makeText(ActivityManageActionStartActivity.this, getResources().getString(R.string.enterNameForIntentPair), Toast.LENGTH_LONG).show();
 					return;
 				}
-				else if(etParameterName.getText().toString().contains(Action.intentPairSeperator))
+				else if(etParameterName.getText().toString().contains(Action.intentPairSeparator))
 				{
-					Toast.makeText(ActivityManageActionStartActivity.this, String.format(getResources().getString(R.string.stringNotAllowed), Action.intentPairSeperator), Toast.LENGTH_LONG).show();
+					Toast.makeText(ActivityManageActionStartActivity.this, String.format(getResources().getString(R.string.stringNotAllowed), Action.intentPairSeparator), Toast.LENGTH_LONG).show();
 					return;
 				}
 				else if(etParameterName.getText().toString().contains(";"))
@@ -359,9 +420,9 @@ public class ActivityManageActionStartActivity extends Activity
 					Toast.makeText(ActivityManageActionStartActivity.this, getResources().getString(R.string.enterValueForIntentPair), Toast.LENGTH_LONG).show();
 					return;
 				}
-				else if(etParameterValue.getText().toString().contains(Action.intentPairSeperator))
+				else if(etParameterValue.getText().toString().contains(Action.intentPairSeparator))
 				{
-					Toast.makeText(ActivityManageActionStartActivity.this, String.format(getResources().getString(R.string.stringNotAllowed), Action.intentPairSeperator), Toast.LENGTH_LONG).show();
+					Toast.makeText(ActivityManageActionStartActivity.this, String.format(getResources().getString(R.string.stringNotAllowed), Action.intentPairSeparator), Toast.LENGTH_LONG).show();
 					return;
 				}
 				else if(etParameterValue.getText().toString().contains(";"))
@@ -370,7 +431,7 @@ public class ActivityManageActionStartActivity extends Activity
 					return;
 				}
 				
-				String param = supportedIntentTypes[spinnerParameterType.getSelectedItemPosition()] + Action.intentPairSeperator + etParameterName.getText().toString() + Action.intentPairSeperator + etParameterValue.getText().toString();
+				String param = supportedIntentTypes[spinnerParameterType.getSelectedItemPosition()] + Action.intentPairSeparator + etParameterName.getText().toString() + Action.intentPairSeparator + etParameterValue.getText().toString();
 				intentPairList.add(param);
 				
 				spinnerParameterType.setSelection(0);
@@ -598,7 +659,6 @@ public class ActivityManageActionStartActivity extends Activity
 			}
 		});
 		AlertDialog alertDialog = alertDialogBuilder.create();
-		
 		return alertDialog;
 	}
 	
@@ -615,9 +675,25 @@ public class ActivityManageActionStartActivity extends Activity
 		protected void onPostExecute(Void result)
 		{
 			progressDialog.dismiss();
-			getActionStartActivityDialog1().show();
+			getActionStartActivityDialog1Application().show();
 		}
-		
-		
 	}
-}
+
+	@Override
+	public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults)
+	{
+		super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+
+		if(requestCode == requestCodeForRequestQueryAllPackagesPermission)
+		{
+			for(int i = 0; i < permissions.length; i++)
+			{
+				if(permissions[i].equals(Manifest.permission.QUERY_ALL_PACKAGES) && grantResults[i] == PackageManager.PERMISSION_GRANTED)
+				{
+					getAppList();
+					break;
+				}
+			}
+		}
+	}
+}

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

@@ -12,6 +12,7 @@ import android.location.Location;
 import android.location.LocationListener;
 import android.location.LocationManager;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Looper;
 import android.view.View;
@@ -83,17 +84,17 @@ public class ActivityManagePoi extends Activity
 		bSavePoi = (Button)findViewById(R.id.bSavePoi);
 		bSavePoi.setOnClickListener(new OnClickListener()
 		{
-        @Override
-        public void onClick(View v)
-        {
-			hideKeyboard();
+			@Override
+			public void onClick(View v)
+			{
+				hideKeyboard();
 
-            if(ActivityMainPoi.poiToEdit == null)
-				createPoi();
-            else
-				changePoi();
-        }
-    });
+				if(ActivityMainPoi.poiToEdit == null)
+					createPoi();
+				else
+					changePoi();
+			}
+		});
 		
 		ibShowOnMap.setOnClickListener(new OnClickListener()
 		{			
@@ -136,42 +137,45 @@ public class ActivityManagePoi extends Activity
 	
 	private void getLocation()
 	{
-		Criteria critNetwork = new Criteria();
-		critNetwork.setPowerRequirement(Criteria.POWER_LOW);
-		critNetwork.setAltitudeRequired(false);
-		critNetwork.setSpeedRequired(false);
-		critNetwork.setBearingRequired(false);
-		critNetwork.setCostAllowed(false);
-		critNetwork.setAccuracy(Criteria.ACCURACY_COARSE);
+		Criteria criteriaNetwork = new Criteria();
+		criteriaNetwork.setPowerRequirement(Criteria.POWER_LOW);
+		criteriaNetwork.setAltitudeRequired(false);
+		criteriaNetwork.setSpeedRequired(false);
+		criteriaNetwork.setBearingRequired(false);
+		criteriaNetwork.setCostAllowed(false);
+		criteriaNetwork.setAccuracy(Criteria.ACCURACY_COARSE);
+
+		Criteria criteriaGps = new Criteria();
+		criteriaGps.setAltitudeRequired(false);
+		criteriaGps.setSpeedRequired(false);
+		criteriaGps.setBearingRequired(false);
+		criteriaGps.setCostAllowed(true);
+		criteriaGps.setAccuracy(Criteria.ACCURACY_FINE);
 		
-		Criteria critGps = new Criteria();
-		critGps.setAltitudeRequired(false);
-		critGps.setSpeedRequired(false);
-		critGps.setBearingRequired(false);
-		critGps.setCostAllowed(true);
-		critGps.setAccuracy(Criteria.ACCURACY_FINE);
-		
-		String provider1 = myLocationManager.getBestProvider(critNetwork, true);
-		String provider2 = myLocationManager.getBestProvider(critGps, true);
+		String provider1 = myLocationManager.getBestProvider(criteriaNetwork, true);
+		String provider2 = myLocationManager.getBestProvider(criteriaGps, true);
 //		String provider3 = myLocationManager.getProvider("wifi");
 		
-		if(provider1 == null | provider2 == null)
+		if(provider1 == null || provider2 == null)
 		{
 			Toast.makeText(this, getResources().getString(R.string.logNoSuitableProvider), Toast.LENGTH_LONG).show();
 			return;
 		}
 		else
 		{
+			if(provider1.equals(provider2))
+				Miscellaneous.logEvent("i", "POI Manager", "Both location providers are equal. Only one will be used.", 4);
+
 			locationSearchStart = Calendar.getInstance();
 			startTimeout();
 
-			if(!Settings.privacyLocationing || !ConnectivityReceiver.isDataConnectionAvailable(AutomationService.getInstance()))
+			if(!Settings.privacyLocationing && !ConnectivityReceiver.isDataConnectionAvailable(Miscellaneous.getAnyContext()) && !provider1.equals(provider2))
 			{
 				Miscellaneous.logEvent("i", "POI Manager", getResources().getString(R.string.logGettingPositionWithProvider) + " " + provider1, 3);
 				myLocationManager.requestLocationUpdates(provider1, 500, Settings.satisfactoryAccuracyNetwork, myLocationListenerNetwork);
 			}
 			else
-				Miscellaneous.logEvent("i", "POI Manager", "Skipping network location query because private locationing is active.", 4);
+				Miscellaneous.logEvent("i", "POI Manager", "Skipping network location.", 4);
 
 			Miscellaneous.logEvent("i", "POI Manager", getResources().getString(R.string.logGettingPositionWithProvider) + " " + provider2, 3);
 			myLocationManager.requestLocationUpdates(provider2, 500, Settings.satisfactoryAccuracyGps, myLocationListenerGps);
@@ -310,7 +314,21 @@ public class ActivityManagePoi extends Activity
 			public void onClick(DialogInterface dialog, int which)
 			{
 				progressDialog = ProgressDialog.show(ActivityManagePoi.this, "", getResources().getString(R.string.gettingPosition), true, true);
-				getLocation();
+				if(Build.VERSION.SDK_INT >= 31)
+				{
+					AlertDialog dia = Miscellaneous.messageBox(getResources().getString(R.string.info), getResources().getString(R.string.locationNotWorkingOn12), ActivityManagePoi.this);
+					dia.setOnDismissListener(new DialogInterface.OnDismissListener()
+					{
+						@Override
+						public void onDismiss(DialogInterface dialogInterface)
+						{
+							getLocation();
+						}
+					});
+					dia.show();
+				}
+				else
+					getLocation();
 			}
 		};
 		alertDialogBuilder.setMessage(text).setPositiveButton("Ok", dialogClickListener);

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

@@ -44,6 +44,8 @@ public class ActivityManageProfile extends Activity
 	Button bChangeSoundIncomingCalls, bChangeSoundNotifications, bSaveProfile;
 	TextView tvIncomingCallsRingtone, tvNotificationsRingtone;
 	EditText etName;
+
+	boolean guiUpdate = false;
 	
 	File incomingCallsRingtone = null, notificationsRingtone = null;
 	
@@ -368,6 +370,8 @@ public class ActivityManageProfile extends Activity
 	
 	public void editProfile(Profile profileToEdit)
 	{
+		guiUpdate = true;
+
 		etName.setText(ActivityMainProfiles.profileToEdit.getName());
 		checkBoxChangeSoundMode.setChecked(ActivityMainProfiles.profileToEdit.getChangeSoundMode());
 		checkBoxChangeDnd.setChecked(ActivityMainProfiles.profileToEdit.getChangeDndMode());
@@ -393,6 +397,8 @@ public class ActivityManageProfile extends Activity
 		
 		setIncomingCallsRingtone(ActivityMainProfiles.profileToEdit.getIncomingCallsRingtone());		
 		setNotificationsRingtone(ActivityMainProfiles.profileToEdit.getNotificationRingtone());
+
+		guiUpdate = false;
 	}
 	
 	private boolean loadFormValuesToVariable()

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

@@ -3,7 +3,6 @@ package com.jens.automation2;
 import android.Manifest;
 import android.app.Activity;
 import android.app.AlertDialog;
-import android.app.Dialog;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -14,6 +13,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.text.InputType;
 import android.text.util.Linkify;
+import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -50,34 +50,32 @@ public class ActivityManageRule extends Activity
 {
 	final static String activityDetectionClassPath = "com.jens.automation2.receivers.ActivityDetectionReceiver";
 	public final static String intentNameTriggerParameter1 = "triggerParameter1";
+	public final static String intentNameTriggerParameter2 = "triggerParameter2";
 	public final static String intentNameActionParameter1 = "actionParameter1";
 	public final static String intentNameActionParameter2 = "actionParameter2";
 
 	public Context context;
-	private Button cmdTriggerAdd, cmdActionAdd, cmdSaveRule;
-	private ListView triggerListView, actionListView;
-	private EditText etRuleName;
-	private CheckBox chkRuleActive, chkRuleToggle;
-	private static ActivityManageRule instance = null;
+	Button cmdTriggerAdd, cmdActionAdd, cmdSaveRule;
+	ListView triggerListView, actionListView;
+	EditText etRuleName;
+	CheckBox chkRuleActive, chkRuleToggle;
+	static ActivityManageRule instance = null;
 	ImageView imageHelpButton;
 	
-	private static ProgressDialog progressDialog = null;
+	static ProgressDialog progressDialog = null;
 	
-	private static Trigger_Enum triggerType;
-	private static boolean triggerParameter;
-	private static PointOfInterest triggerPoi;
-	private static String triggerProcess;
-	private static int triggerBattery;
-	private static double triggerSpeed;
-	private static double triggerNoise;
-	private static TimeFrame triggerTimeFrame;
-	private static String triggerWifiName;
+	static Trigger_Enum triggerType;
+	static PointOfInterest triggerPoi;
+	static String triggerProcess;
+	static int triggerBattery;
+	static double triggerSpeed;
+	static double triggerNoise;
 	
-	private static Rule ruleToEdit;
-	private static boolean newRule;
+	static Rule ruleToEdit;
+	static boolean newRule;
 	
-	private static Trigger newTrigger;
-	private static Action newAction;
+	static Trigger newTrigger;
+	static Action newAction;
 
 	ArrayAdapter<Trigger> triggerListViewAdapter;
 	ArrayAdapter<Action> actionListViewAdapter;
@@ -101,17 +99,25 @@ public class ActivityManageRule extends Activity
 	final static int requestCodeTriggerDeviceOrientationAdd = 301;
 	final static int requestCodeTriggerDeviceOrientationEdit = 302;
 	final static int requestCodeTriggerNotificationAdd = 8000;
-	final static int requestCodeTriggerNfcNotificationEdit = 8001;
+	final static int requestCodeTriggerNotificationEdit = 8001;
 	final static int requestCodeActionPlaySoundAdd = 501;
 	final static int requestCodeActionPlaySoundEdit = 502;
 	final static int requestCodeTriggerPhoneCallAdd = 601;
 	final static int requestCodeTriggerPhoneCallEdit = 602;
+	final static int requestCodeTriggerProfileAdd = 603;
+	final static int requestCodeTriggerProfileEdit = 604;
 	final static int requestCodeTriggerWifiAdd = 723;
 	final static int requestCodeTriggerWifiEdit = 724;
 	final static int requestCodeActionSendTextMessageAdd = 5001;
 	final static int requestCodeActionSendTextMessageEdit = 5002;
 	final static int requestCodeActionVibrateAdd = 801;
 	final static int requestCodeActionVibrateEdit = 802;
+	final static int requestCodeActionCreateNotificationAdd = 803;
+	final static int requestCodeActionCreateNotificationEdit = 804;
+	final static int requestCodeActionCloseNotificationAdd = 805;
+	final static int requestCodeActionCloseNotificationEdit = 806;
+	final static int requestCodeActionControlMediaAdd = 807;
+	final static int requestCodeActionControlMediaEdit = 808;
 	
 	public static ActivityManageRule getInstance()
 	{
@@ -263,7 +269,7 @@ public class ActivityManageRule extends Activity
 						ActivityManageTriggerNotification.editedNotificationTrigger = selectedTrigger;
 						Intent notificationEditor = new Intent(ActivityManageRule.this, ActivityManageTriggerNotification.class);
 						notificationEditor.putExtra("edit", true);
-						startActivityForResult(notificationEditor, requestCodeTriggerNfcNotificationEdit);
+						startActivityForResult(notificationEditor, requestCodeTriggerNotificationEdit);
 						break;
 					case phoneCall:
 						ActivityManageTriggerPhoneCall.editedPhoneCallTrigger = selectedTrigger;
@@ -271,11 +277,17 @@ public class ActivityManageRule extends Activity
 						phoneCallEditor.putExtra("edit", true);
 						startActivityForResult(phoneCallEditor, requestCodeTriggerPhoneCallEdit);
 						break;
+					case profileActive:
+						Intent profileActiveEditor = new Intent(ActivityManageRule.this, ActivityManageTriggerProfile.class);
+						profileActiveEditor.putExtra(ActivityManageRule.intentNameTriggerParameter1, selectedTrigger.getTriggerParameter());
+						profileActiveEditor.putExtra(ActivityManageRule.intentNameTriggerParameter2, selectedTrigger.getTriggerParameter2());
+						startActivityForResult(profileActiveEditor, requestCodeTriggerProfileEdit);
+						break;
 					case wifiConnection:
 						Intent wifiEditor = new Intent(ActivityManageRule.this, ActivityManageTriggerWifi.class);
 						wifiEditor.putExtra("edit", true);
-						wifiEditor.putExtra("wifiState", selectedTrigger.getTriggerParameter());
-						wifiEditor.putExtra("wifiName", selectedTrigger.getTriggerParameter2());
+						wifiEditor.putExtra(ActivityManageTriggerWifi.intentNameWifiState, selectedTrigger.getTriggerParameter());
+						wifiEditor.putExtra(ActivityManageTriggerWifi.intentNameWifiName, selectedTrigger.getTriggerParameter2());
 						startActivityForResult(wifiEditor, requestCodeTriggerWifiEdit);
 						break;
 					case deviceOrientation:
@@ -285,7 +297,7 @@ public class ActivityManageRule extends Activity
 						startActivityForResult(devicePositionEditor, requestCodeTriggerDeviceOrientationEdit);
 						break;
 					default:
-						break;				
+						break;
 				}
 			}
 		});
@@ -344,8 +356,8 @@ public class ActivityManageRule extends Activity
 						break;
 					case setScreenBrightness:
 						Intent activityEditScreenBrightnessIntent = new Intent(ActivityManageRule.this, ActivityManageActionBrightnessSetting.class);
-						activityEditScreenBrightnessIntent.putExtra("autoBrightness", a.getParameter1());
-						activityEditScreenBrightnessIntent.putExtra("brightnessValue", Integer.parseInt(a.getParameter2()));
+						activityEditScreenBrightnessIntent.putExtra(ActivityManageActionBrightnessSetting.intentNameAutoBrightness, a.getParameter1());
+						activityEditScreenBrightnessIntent.putExtra(ActivityManageActionBrightnessSetting.intentNameBrightnessValue, Integer.parseInt(a.getParameter2()));
 						startActivityForResult(activityEditScreenBrightnessIntent, requestCodeActionScreenBrightnessEdit);
 						break;
 					case vibrate:
@@ -353,6 +365,23 @@ public class ActivityManageRule extends Activity
 						activityEditVibrateIntent.putExtra("vibratePattern", a.getParameter2());
 						startActivityForResult(activityEditVibrateIntent, requestCodeActionVibrateEdit);
 						break;
+					case controlMediaPlayback:
+						Intent activityEditControlMediaIntent = new Intent(ActivityManageRule.this, ActivityManageActionControlMedia.class);
+						activityEditControlMediaIntent.putExtra(ActivityManageRule.intentNameActionParameter2, a.getParameter2());
+						startActivityForResult(activityEditControlMediaIntent, requestCodeActionControlMediaEdit);
+						break;
+					case createNotification:
+						Intent activityEditCreateNotificationIntent = new Intent(ActivityManageRule.this, ActivityManageActionCreateNotification.class);
+						String[] elements = a.getParameter2().split(Action.actionParameter2Split);
+						activityEditCreateNotificationIntent.putExtra(ActivityManageActionCreateNotification.intentNameNotificationTitle, elements[0]);
+						activityEditCreateNotificationIntent.putExtra(ActivityManageActionCreateNotification.intentNameNotificationText, elements[1]);
+						startActivityForResult(activityEditCreateNotificationIntent, requestCodeActionCreateNotificationEdit);
+						break;
+					case closeNotification:
+						Intent activityEditCloseNotificationIntent = new Intent(ActivityManageRule.this, ActivityManageActionCloseNotification.class);
+						activityEditCloseNotificationIntent.putExtra(intentNameActionParameter2, a.getParameter2());
+						startActivityForResult(activityEditCloseNotificationIntent, requestCodeActionCloseNotificationEdit);
+						break;
 					case playSound:
 						Intent actionPlaySoundIntent = new Intent(context, ActivityManageActionPlaySound.class);
 						actionPlaySoundIntent.putExtra("edit", true);
@@ -455,7 +484,6 @@ public class ActivityManageRule extends Activity
 		
 		for(int i=0; i<types.length; i++)
 		{			
-			//pointOfInterest, timeFrame, charging, batteryLevel, usb_host_connection, speed, noiseLevel, wifiConnection, process_started_stopped;
 			if(types[i].toString().equals(Trigger_Enum.pointOfInterest.toString()))
 				items.add(new Item(typesLong[i].toString(), R.drawable.compass_small));
 			else if(types[i].toString().equals(Trigger_Enum.timeFrame.toString()))
@@ -480,7 +508,6 @@ public class ActivityManageRule extends Activity
 				items.add(new Item(typesLong[i].toString(), R.drawable.roaming));
 			else if(types[i].toString().equals(Trigger_Enum.phoneCall.toString()))
             {
-//                if(ActivityPermissions.isPermissionDeclaratedInManifest(ActivityManageSpecificRule.this, "android.permission.SEND_SMS") && !Miscellaneous.isGooglePlayInstalled(ActivityManageSpecificRule.this))
 				if(ActivityPermissions.isPermissionDeclaratedInManifest(ActivityManageRule.this, "android.permission.SEND_SMS"))
                     items.add(new Item(typesLong[i].toString(), R.drawable.phone));
             }
@@ -496,6 +523,12 @@ public class ActivityManageRule extends Activity
 				items.add(new Item(typesLong[i].toString(), R.drawable.notification));
 			else if(types[i].toString().equals(Trigger_Enum.deviceOrientation.toString()))
 				items.add(new Item(typesLong[i].toString(), R.drawable.smartphone));
+			else if(types[i].toString().equals(Trigger_Enum.profileActive.toString()))
+				items.add(new Item(typesLong[i].toString(), R.drawable.sound));
+			else if(types[i].toString().equals(Trigger_Enum.musicPlaying.toString()))
+				items.add(new Item(typesLong[i].toString(), R.drawable.sound));
+			else if(types[i].toString().equals(Trigger_Enum.screenState.toString()))
+				items.add(new Item(typesLong[i].toString(), R.drawable.smartphone));
 			else
 				items.add(new Item(typesLong[i].toString(), R.drawable.placeholder));
 		}
@@ -556,7 +589,7 @@ public class ActivityManageRule extends Activity
 						startActivityForResult(timeFrameEditor, requestCodeTriggerTimeframeAdd);
 						return;
 					}
-					else if(triggerType == Trigger_Enum.charging)
+					else if(triggerType == Trigger_Enum.charging || triggerType == Trigger_Enum.musicPlaying)
 						booleanChoices = new String[]{getResources().getString(R.string.started), getResources().getString(R.string.stopped)};
 					else if(triggerType == Trigger_Enum.usb_host_connection)
 						booleanChoices = new String[]{getResources().getString(R.string.connected), getResources().getString(R.string.disconnected)};
@@ -568,7 +601,6 @@ public class ActivityManageRule extends Activity
 						Intent wifiTriggerEditor = new Intent(myContext, ActivityManageTriggerWifi.class);
 						startActivityForResult(wifiTriggerEditor, requestCodeTriggerWifiAdd);
 						return;
-//							booleanChoices = new String[]{getResources().getString(R.string.started), getResources().getString(R.string.stopped)};
 					}
 					else if(triggerType == Trigger_Enum.deviceOrientation)
 					{
@@ -576,12 +608,11 @@ public class ActivityManageRule extends Activity
 						Intent devicePositionTriggerEditor = new Intent(myContext, ActivityManageTriggerDeviceOrientation.class);
 						startActivityForResult(devicePositionTriggerEditor, requestCodeTriggerDeviceOrientationAdd);
 						return;
-//							booleanChoices = new String[]{getResources().getString(R.string.started), getResources().getString(R.string.stopped)};
 					}
-//						else if(triggerType == Trigger_Enum.wifiConnection)
-//							booleanChoices = new String[]{getResources().getString(R.string.connected), getResources().getString(R.string.disconnected)};
 					else if(triggerType == Trigger_Enum.process_started_stopped)
+					{
 						booleanChoices = new String[]{getResources().getString(R.string.started), getResources().getString(R.string.stopped)};
+					}
 					else if(triggerType == Trigger_Enum.notification)
 					{
 						newTrigger.setTriggerType(Trigger_Enum.notification);
@@ -599,7 +630,21 @@ public class ActivityManageRule extends Activity
 						Intent phoneTriggerEditor = new Intent(myContext, ActivityManageTriggerPhoneCall.class);
 						startActivityForResult(phoneTriggerEditor, requestCodeTriggerPhoneCallAdd);
 						return;
-//							booleanChoices = new String[]{getResources().getString(R.string.started), getResources().getString(R.string.stopped)};
+					}
+					else if(triggerType == Trigger_Enum.profileActive)
+					{
+						if(Profile.getProfileCollection().size() > 0)
+						{
+							newTrigger.setTriggerType(Trigger_Enum.profileActive);
+							Intent profileTriggerEditor = new Intent(myContext, ActivityManageTriggerProfile.class);
+							startActivityForResult(profileTriggerEditor, requestCodeTriggerProfileAdd);
+							return;
+						}
+						else
+						{
+							Toast.makeText(context, getResources().getString(R.string.noProfilesCreateOneFirst), Toast.LENGTH_LONG).show();
+							return;
+						}
 					}
 					else if(triggerType == Trigger_Enum.activityDetection)
 					{
@@ -622,7 +667,7 @@ public class ActivityManageRule extends Activity
 						}
 						catch (IllegalAccessException | InvocationTargetException e)
 						{
-							e.printStackTrace();
+							Miscellaneous.logEvent("w", "ActivityDetection", "Either play services are not available or the ActivityDetection classes are not. " + Log.getStackTraceString(e), 4);
 						}
 						return;
 					}
@@ -647,6 +692,12 @@ public class ActivityManageRule extends Activity
 						startActivityForResult(bluetoothEditor, requestCodeTriggerBluetoothAdd);
 						return;
 					}
+					else if(triggerType == Trigger_Enum.screenState)
+					{
+						newTrigger.setTriggerType(Trigger_Enum.screenState);
+						getTriggerScreenStateDialog().show();
+						return;
+					}
 					else if(triggerType == Trigger_Enum.headsetPlugged)
 						booleanChoices = new String[]{getResources().getString(R.string.connected), getResources().getString(R.string.disconnected)};
 
@@ -657,6 +708,9 @@ public class ActivityManageRule extends Activity
 					}
 					else
 						getTriggerParameterDialog(context, booleanChoices).show();
+
+					if(triggerType.equals(Trigger_Enum.process_started_stopped))
+						Miscellaneous.messageBox(getResources().getString(R.string.info), String.format(getResources().getString(R.string.featureCeasedToWorkLastWorkingAndroidVersion), "7"), ActivityManageRule.this).show();
 				}
 			});
 
@@ -666,7 +720,7 @@ public class ActivityManageRule extends Activity
 	private AlertDialog getTriggerParameterDialog(final Context myContext, final String[] choices)
 	{
 		AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(context);
-		alertDialogBuilder.setTitle(getResources().getString(R.string.selectTypeOfTrigger));
+		alertDialogBuilder.setTitle(getResources().getString(R.string.selectParameters));
 		alertDialogBuilder.setItems(choices, new DialogInterface.OnClickListener()
 		{			
 			@Override
@@ -978,6 +1032,33 @@ public class ActivityManageRule extends Activity
 		
 		return alertDialog;
 	}
+
+	private AlertDialog getTriggerScreenStateDialog()
+	{
+		AlertDialog.Builder alertDialog = new AlertDialog.Builder(this);
+
+		alertDialog.setTitle(Miscellaneous.getAnyContext().getResources().getString(R.string.selectDesiredState));
+
+		String[] choices = {
+								Miscellaneous.getAnyContext().getResources().getString(R.string.off),
+								Miscellaneous.getAnyContext().getResources().getString(R.string.on),
+								Miscellaneous.getAnyContext().getResources().getString(R.string.unlocked)
+							};
+
+		alertDialog.setItems(choices, new DialogInterface.OnClickListener()
+		{
+			@Override
+			public void onClick(DialogInterface dialog, int which)
+			{
+				newTrigger.setTriggerParameter2(String.valueOf(which));
+				ruleToEdit.getTriggerSet().add(newTrigger);
+				refreshTriggerList();
+			}
+		});
+
+		return alertDialog.create();
+	}
+
 	@RequiresApi(api = Build.VERSION_CODES.KITKAT)
 	private AlertDialog getTriggerActivityDetectionDialog()
 	{
@@ -1030,7 +1111,6 @@ public class ActivityManageRule extends Activity
 		@Override
 		protected String[] doInBackground(ActivityManageRule... params)
 		{
-//			Looper.prepare();
 			final String[] applicationArray = ActivityManageActionStartActivity.getApplicationNameListString(params[0]);
 			return applicationArray;
 		}
@@ -1068,9 +1148,6 @@ public class ActivityManageRule extends Activity
 		});
 		AlertDialog alertDialog = alertDialogBuilder.create();
 		
-//		Log.i("Amount of Applications", String.valueOf(applicationArray.length));
-//		Log.i("Amount of Packages", String.valueOf(ActivityManageStartActivity.getPackageListString(myContext).length));
-		
 		return alertDialog;
 	}
 	
@@ -1107,6 +1184,7 @@ public class ActivityManageRule extends Activity
 				triggerProcess = activityArray[which];
 				newTrigger.setTriggerType(Trigger_Enum.process_started_stopped);
 				newTrigger.setProcessName(triggerProcess);
+				newTrigger.setTriggerParameter2(packageName + Trigger.triggerParameter2Split + triggerProcess);
 				ruleToEdit.getTriggerSet().add(newTrigger);
 				refreshTriggerList();
 			}
@@ -1166,8 +1244,8 @@ public class ActivityManageRule extends Activity
 		{
 			if(resultCode == RESULT_OK)
 			{
-				newTrigger.setTriggerParameter(data.getBooleanExtra("wifiState", false));
-				newTrigger.setTriggerParameter2(data.getStringExtra("wifiName"));
+				newTrigger.setTriggerParameter(data.getBooleanExtra(ActivityManageTriggerWifi.intentNameWifiState, false));
+				newTrigger.setTriggerParameter2(data.getStringExtra(ActivityManageTriggerWifi.intentNameWifiName));
 				newTrigger.setParentRule(ruleToEdit);
 				ruleToEdit.getTriggerSet().add(newTrigger);
 				this.refreshTriggerList();
@@ -1179,8 +1257,8 @@ public class ActivityManageRule extends Activity
 			{
 				Trigger editedTrigger = new Trigger();
 				editedTrigger.setTriggerType(Trigger_Enum.wifiConnection);
-				editedTrigger.setTriggerParameter(data.getBooleanExtra("wifiState", false));
-				editedTrigger.setTriggerParameter2(data.getStringExtra("wifiName"));
+				editedTrigger.setTriggerParameter(data.getBooleanExtra(ActivityManageTriggerWifi.intentNameWifiState, false));
+				editedTrigger.setTriggerParameter2(data.getStringExtra(ActivityManageTriggerWifi.intentNameWifiName));
 				editedTrigger.setParentRule(ruleToEdit);
 				ruleToEdit.getTriggerSet().set(editIndex, editedTrigger);
 				this.refreshTriggerList();
@@ -1228,19 +1306,19 @@ public class ActivityManageRule extends Activity
 			{
 				ruleToEdit.getTriggerSet().add(newTrigger);
 
-				newTrigger.setTriggerParameter(data.getBooleanExtra("direction", false));
+				newTrigger.setTriggerParameter(data.getBooleanExtra(ActivityManageTriggerNotification.intentNameNotificationDirection, false));
 				newTrigger.setTriggerParameter2(
-													data.getStringExtra("app") + Trigger.triggerParameter2Split +
-													data.getStringExtra("titleDir") + Trigger.triggerParameter2Split +
-													data.getStringExtra("title") + Trigger.triggerParameter2Split +
-													data.getStringExtra("textDir") + Trigger.triggerParameter2Split +
-													data.getStringExtra("text")
+													data.getStringExtra(ActivityManageTriggerNotification.intentNameNotificationApp) + Trigger.triggerParameter2Split +
+													data.getStringExtra(ActivityManageTriggerNotification.intentNameNotificationTitleDir) + Trigger.triggerParameter2Split +
+													data.getStringExtra(ActivityManageTriggerNotification.intentNameNotificationTitle) + Trigger.triggerParameter2Split +
+													data.getStringExtra(ActivityManageTriggerNotification.intentNameNotificationTextDir) + Trigger.triggerParameter2Split +
+													data.getStringExtra(ActivityManageTriggerNotification.intentNameNotificationText)
 												);
 				newTrigger.setParentRule(ruleToEdit);
 				this.refreshTriggerList();
 			}
 		}
-		else if(requestCode == requestCodeTriggerNfcNotificationEdit)
+		else if(requestCode == requestCodeTriggerNotificationEdit)
 		{
 			if(resultCode == RESULT_OK)
 			{
@@ -1315,8 +1393,8 @@ public class ActivityManageRule extends Activity
 		{
 			if(resultCode == RESULT_OK)
 			{
-				newAction.setParameter1(data.getBooleanExtra("autoBrightness", false));
-				newAction.setParameter2(String.valueOf(data.getIntExtra("brightnessValue", 0)));
+				newAction.setParameter1(data.getBooleanExtra(ActivityManageActionBrightnessSetting.intentNameAutoBrightness, false));
+				newAction.setParameter2(String.valueOf(data.getIntExtra(ActivityManageActionBrightnessSetting.intentNameBrightnessValue, 0)));
 				newAction.setParentRule(ruleToEdit);
 				ruleToEdit.getActionSet().add(newAction);
 				this.refreshActionList();
@@ -1347,6 +1425,40 @@ public class ActivityManageRule extends Activity
 				this.refreshActionList();
 			}
 		}
+		else if(requestCode == requestCodeActionControlMediaAdd)
+		{
+			if(resultCode == RESULT_OK)
+			{
+				newAction.setParentRule(ruleToEdit);
+				newAction.setParameter2(data.getStringExtra(ActivityManageRule.intentNameActionParameter2));
+				ruleToEdit.getActionSet().add(newAction);
+				this.refreshActionList();
+			}
+		}
+		else if(requestCode == requestCodeActionCreateNotificationAdd)
+		{
+			if(resultCode == RESULT_OK)
+			{
+				newAction.setParentRule(ruleToEdit);
+				newAction.setParameter2(
+											data.getStringExtra(ActivityManageActionCreateNotification.intentNameNotificationTitle)
+												+ Action.actionParameter2Split +
+											data.getStringExtra(ActivityManageActionCreateNotification.intentNameNotificationText)
+										);
+				ruleToEdit.getActionSet().add(newAction);
+				this.refreshActionList();
+			}
+		}
+		else if(requestCode == requestCodeActionCloseNotificationAdd)
+		{
+			if(resultCode == RESULT_OK)
+			{
+				newAction.setParentRule(ruleToEdit);
+				newAction.setParameter2(data.getStringExtra(intentNameActionParameter2));
+				ruleToEdit.getActionSet().add(newAction);
+				this.refreshActionList();
+			}
+		}
 		else if(requestCode == requestCodeActionVibrateEdit)
 		{
 			if(resultCode == RESULT_OK)
@@ -1359,6 +1471,46 @@ public class ActivityManageRule extends Activity
 				this.refreshActionList();
 			}
 		}
+		else if(requestCode == requestCodeActionControlMediaEdit)
+		{
+			if(resultCode == RESULT_OK)
+			{
+				ruleToEdit.getActionSet().get(editIndex).setParentRule(ruleToEdit);
+
+				if(data.hasExtra(intentNameActionParameter2))
+					ruleToEdit.getActionSet().get(editIndex).setParameter2(data.getStringExtra(intentNameActionParameter2));
+
+				this.refreshActionList();
+			}
+		}
+		else if(requestCode == requestCodeActionCreateNotificationEdit)
+		{
+			if(resultCode == RESULT_OK)
+			{
+				ruleToEdit.getActionSet().get(editIndex).setParentRule(ruleToEdit);
+
+				if(data.hasExtra(ActivityManageActionCreateNotification.intentNameNotificationTitle))
+					ruleToEdit.getActionSet().get(editIndex).setParameter2(
+										data.getStringExtra(ActivityManageActionCreateNotification.intentNameNotificationTitle)
+											+ Action.actionParameter2Split +
+										data.getStringExtra(ActivityManageActionCreateNotification.intentNameNotificationText)
+												);
+
+				this.refreshActionList();
+			}
+		}
+		else if(requestCode == requestCodeActionCloseNotificationEdit)
+		{
+			if(resultCode == RESULT_OK)
+			{
+				ruleToEdit.getActionSet().get(editIndex).setParentRule(ruleToEdit);
+
+				if(data.hasExtra(intentNameActionParameter2))
+					ruleToEdit.getActionSet().get(editIndex).setParameter2(data.getStringExtra(intentNameActionParameter2));
+
+				this.refreshActionList();
+			}
+		}
 		else if(requestCode == requestCodeActionPlaySoundAdd)
 		{
 			if(resultCode == RESULT_OK)
@@ -1428,6 +1580,30 @@ public class ActivityManageRule extends Activity
 				this.refreshTriggerList();
 			}
 		}
+		else if(requestCode == requestCodeTriggerProfileAdd)
+		{
+			if(resultCode == RESULT_OK)
+			{
+				newTrigger.setTriggerParameter(data.getBooleanExtra(ActivityManageRule.intentNameTriggerParameter1, true));
+				newTrigger.setTriggerParameter2(data.getStringExtra(ActivityManageRule.intentNameTriggerParameter2));
+				newTrigger.setParentRule(ruleToEdit);
+				ruleToEdit.getTriggerSet().add(newTrigger);
+				this.refreshTriggerList();
+			}
+		}
+		else if(requestCode == requestCodeTriggerProfileEdit)
+		{
+			if(resultCode == RESULT_OK)
+			{
+				Trigger editedTrigger = new Trigger();
+				editedTrigger.setTriggerType(Trigger_Enum.profileActive);
+				editedTrigger.setTriggerParameter(data.getBooleanExtra(ActivityManageRule.intentNameTriggerParameter1, true));
+				editedTrigger.setTriggerParameter2(data.getStringExtra(ActivityManageRule.intentNameTriggerParameter2));
+				editedTrigger.setParentRule(ruleToEdit);
+				ruleToEdit.getTriggerSet().set(editIndex, editedTrigger);
+				this.refreshTriggerList();
+			}
+		}
 	}
 
 	protected AlertDialog getActionTypeDialog()
@@ -1469,12 +1645,18 @@ public class ActivityManageRule extends Activity
 				items.add(new Item(typesLong[i].toString(), R.drawable.talking));
 			else if(types[i].toString().equals(Action_Enum.playMusic.toString()))
 				items.add(new Item(typesLong[i].toString(), R.drawable.tune));
+			else if(types[i].toString().equals(Action_Enum.controlMediaPlayback.toString()))
+				items.add(new Item(typesLong[i].toString(), R.drawable.tune));
 			else if(types[i].toString().equals(Action_Enum.setScreenBrightness.toString()))
 				items.add(new Item(typesLong[i].toString(), R.drawable.brightness));
 			else if(types[i].toString().equals(Action_Enum.playSound.toString()))
 				items.add(new Item(typesLong[i].toString(), R.drawable.sound));
 			else if(types[i].toString().equals(Action_Enum.vibrate.toString()))
 				items.add(new Item(typesLong[i].toString(), R.drawable.vibrate));
+			else if(types[i].toString().equals(Action_Enum.createNotification.toString()))
+				items.add(new Item(typesLong[i].toString(), R.drawable.notification));
+			else if(types[i].toString().equals(Action_Enum.closeNotification.toString()))
+				items.add(new Item(typesLong[i].toString(), R.drawable.notification));
 			else if(types[i].toString().equals(Action_Enum.sendTextMessage.toString()))
 			{
 //			    if(ActivityPermissions.isPermissionDeclaratedInManifest(ActivityManageSpecificRule.this, "android.permission.SEND_SMS") && !Miscellaneous.isGooglePlayInstalled(ActivityManageSpecificRule.this))
@@ -1637,6 +1819,24 @@ public class ActivityManageRule extends Activity
 						Intent intent = new Intent(ActivityManageRule.this, ActivityManageActionVibrate.class);
 						startActivityForResult(intent, requestCodeActionVibrateAdd);
 					}
+					else if(Action.getActionTypesAsArray()[which].toString().equals(Action_Enum.controlMediaPlayback.toString()))
+					{
+						newAction.setAction(Action_Enum.controlMediaPlayback);
+						Intent intent = new Intent(ActivityManageRule.this, ActivityManageActionControlMedia.class);
+						startActivityForResult(intent, requestCodeActionControlMediaAdd);
+					}
+					else if(Action.getActionTypesAsArray()[which].toString().equals(Action_Enum.createNotification.toString()))
+					{
+						newAction.setAction(Action_Enum.createNotification);
+						Intent intent = new Intent(ActivityManageRule.this, ActivityManageActionCreateNotification.class);
+						startActivityForResult(intent, requestCodeActionCreateNotificationAdd);
+					}
+					else if(Action.getActionTypesAsArray()[which].toString().equals(Action_Enum.closeNotification.toString()))
+					{
+						newAction.setAction(Action_Enum.closeNotification);
+						Intent intent = new Intent(ActivityManageRule.this, ActivityManageActionCloseNotification.class);
+						startActivityForResult(intent, requestCodeActionCloseNotificationAdd);
+					}
 					else if(Action.getActionTypesAsArray()[which].toString().equals(Action_Enum.setScreenBrightness.toString()))
 					{
 						newAction.setAction(Action_Enum.setScreenBrightness);
@@ -1860,8 +2060,8 @@ public class ActivityManageRule extends Activity
 		AlertDialog alertDialog = alertDialogBuilder.create();
 		
 		return alertDialog;
-	}	
-	
+	}
+
 	protected void refreshTriggerList()
 	{
 		Miscellaneous.logEvent("i", "ListView", "Attempting to update TriggerListView", 4);
@@ -1907,4 +2107,4 @@ public class ActivityManageRule extends Activity
 			imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
 		}
 	}
-}
+}

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

@@ -43,7 +43,7 @@ public class ActivityManageTriggerDeviceOrientation extends Activity
         {
             desiredAzimuth = Float.parseFloat(etDesiredAzimuth.getText().toString());
             desiredAzimuthTolerance = Float.parseFloat(etDesiredAzimuthTolerance.getText().toString());
-            if (Math.abs(azimuth) <= Math.abs(desiredAzimuth - desiredAzimuthTolerance) || Math.abs(azimuth) <= desiredAzimuth + desiredAzimuthTolerance)
+            if (desiredAzimuthTolerance == 180 || (desiredAzimuth - desiredAzimuthTolerance <= azimuth && azimuth <= desiredAzimuth + desiredAzimuthTolerance))
             {
                 tvAppliesAzimuth.setText(getResources().getString(R.string.yes));
                 tvAppliesAzimuth.setTextColor(Color.GREEN);
@@ -63,7 +63,7 @@ public class ActivityManageTriggerDeviceOrientation extends Activity
         {
             desiredPitch = Float.parseFloat(etDesiredPitch.getText().toString());
             desiredPitchTolerance = Float.parseFloat(etDesiredPitchTolerance.getText().toString());
-            if (Math.abs(pitch) <= Math.abs(desiredPitch - desiredPitchTolerance) || Math.abs(pitch) <= desiredPitch + desiredPitchTolerance)
+            if (desiredPitchTolerance == 180 || (desiredPitch - desiredPitchTolerance <= pitch && pitch <= desiredPitch + desiredPitchTolerance))
             {
                 tvAppliesPitch.setText(getResources().getString(R.string.yes));
                 tvAppliesPitch.setTextColor(Color.GREEN);
@@ -83,7 +83,7 @@ public class ActivityManageTriggerDeviceOrientation extends Activity
         {
             desiredRoll = Float.parseFloat(etDesiredRoll.getText().toString());
             desiredRollTolerance = Float.parseFloat(etDesiredRollTolerance.getText().toString());
-            if (Math.abs(roll) <= Math.abs(desiredRoll - desiredRollTolerance) || Math.abs(roll) <= desiredRoll + desiredRollTolerance)
+            if (desiredRollTolerance == 180 || (desiredRoll - desiredRollTolerance <= roll && roll <= desiredRoll + desiredRollTolerance))
             {
                 tvAppliesRoll.setText(getResources().getString(R.string.yes));
                 tvAppliesRoll.setTextColor(Color.GREEN);
@@ -159,14 +159,16 @@ public class ActivityManageTriggerDeviceOrientation extends Activity
             @Override
             public void onClick(View v)
             {
+                // Round the values. Too long decimals will destroy the layout
+
                 if(!StringUtils.isEmpty(currentAzimuth.getText()))
-                    etDesiredAzimuth.setText(currentAzimuth.getText());
+                    etDesiredAzimuth.setText(String.valueOf(Math.round(Float.parseFloat(currentAzimuth.getText().toString()))));
 
                 if(!StringUtils.isEmpty(currentPitch.getText()))
-                    etDesiredPitch.setText(currentPitch.getText());
+                    etDesiredPitch.setText(String.valueOf(Math.round(Float.parseFloat(currentPitch.getText().toString()))));
 
                 if(!StringUtils.isEmpty(currentRoll.getText()))
-                    etDesiredRoll.setText(currentRoll.getText());
+                    etDesiredRoll.setText(String.valueOf(Math.round(Float.parseFloat(currentRoll.getText().toString()))));
             }
         });
 

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

@@ -31,6 +31,13 @@ import static com.jens.automation2.Trigger.triggerParameter2Split;
 
 public class ActivityManageTriggerNotification extends Activity
 {
+	public static final String intentNameNotificationApp = "app";
+	public static final String intentNameNotificationTitleDir = "titleDir";
+	public static final String intentNameNotificationTitle = "title";
+	public static final String intentNameNotificationTextDir = "textDir";
+	public static final String intentNameNotificationText = "text";
+	public static final String intentNameNotificationDirection = "direction";
+
 	public static Trigger editedNotificationTrigger;
 	boolean edit = false;
 	ProgressDialog progressDialog = null;
@@ -256,7 +263,7 @@ public class ActivityManageTriggerNotification extends Activity
 		etNotificationTitle = (EditText)findViewById(R.id.etNotificationTitle);
 		etNotificationText = (EditText)findViewById(R.id.etNotificationText);
 		bSelectApp = (Button)findViewById(R.id.bSelectApp);
-		bSaveTriggerNotification = (Button)findViewById(R.id.bSaveTriggerNotification);
+		bSaveTriggerNotification = (Button)findViewById(R.id.bSaveActionCloseNotification);
 		spinnerTitleDirection = (Spinner)findViewById(R.id.spinnerTitleDirection);
 		spinnerTextDirection = (Spinner)findViewById(R.id.spinnerTextDirection);
 		tvSelectedApplication = (TextView)findViewById(R.id.etActivityOrActionPath);
@@ -305,7 +312,7 @@ public class ActivityManageTriggerNotification extends Activity
 			{
 				String app;
 				if(tvSelectedApplication.getText().toString().equalsIgnoreCase(getResources().getString(R.string.anyApp)))
-					app = "-1";
+					app = Trigger.anyAppString;
 				else
 					app = tvSelectedApplication.getText().toString();
 
@@ -323,12 +330,12 @@ public class ActivityManageTriggerNotification extends Activity
 				else
 				{
 					Intent data = new Intent();
-					data.putExtra("direction", chkNotificationDirection.isChecked());
-					data.putExtra("app", app);
-					data.putExtra("titleDir", titleDir);
-					data.putExtra("title", title);
-					data.putExtra("textDir", textDir);
-					data.putExtra("text", text);
+					data.putExtra(intentNameNotificationDirection, chkNotificationDirection.isChecked());
+					data.putExtra(intentNameNotificationApp, app);
+					data.putExtra(intentNameNotificationTitleDir, titleDir);
+					data.putExtra(intentNameNotificationTitle, title);
+					data.putExtra(intentNameNotificationTextDir, textDir);
+					data.putExtra(intentNameNotificationText, text);
 					ActivityManageTriggerNotification.this.setResult(RESULT_OK, data);
 				}
 
@@ -360,7 +367,7 @@ public class ActivityManageTriggerNotification extends Activity
 		else
 			text = "";
 
-		if(!app.equals("-1"))
+		if(!app.equals(Trigger.anyAppString))
 			tvSelectedApplication.setText(app);
 
 		for(int i = 0; i < directions.length; i++)
@@ -395,4 +402,4 @@ public class ActivityManageTriggerNotification extends Activity
 			getActionStartActivityDialog1().show();
 		}
 	}
-}
+}

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

@@ -0,0 +1,124 @@
+package com.jens.automation2;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.Spinner;
+import android.widget.Toast;
+
+import androidx.annotation.Nullable;
+
+import java.util.List;
+
+public class ActivityManageTriggerProfile extends Activity
+{
+    public static final String profileFieldName = "profileName";
+
+    boolean editMode = false;
+
+    Button bSaveTriggerProfile;
+    Spinner spinnerProfiles;
+    CheckBox chkProfileActive, chkProfileCheckSettings;
+
+    ArrayAdapter<Profile> profileSpinnerAdapter;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_manage_trigger_profile);
+
+        bSaveTriggerProfile = (Button)findViewById(R.id.bSaveTriggerProfile);
+        spinnerProfiles = (Spinner)findViewById(R.id.spinnerProfiles);
+        chkProfileActive = (CheckBox)findViewById(R.id.chkProfileActive);
+        chkProfileCheckSettings = (CheckBox)findViewById(R.id.chkProfileCheckSettings);
+
+        try
+        {
+            profileSpinnerAdapter = new ArrayAdapter<Profile>(this, R.layout.text_view_for_poi_listview_mediumtextsize, Profile.getProfileCollection());
+            loadProfileItems();
+        }
+        catch (Exception e)
+        {
+            Miscellaneous.logEvent("w", "ActivityManageTriggerProfile", Log.getStackTraceString(e), 1);
+        }
+
+        if(getIntent().hasExtra(ActivityManageRule.intentNameTriggerParameter2))
+        {
+            editMode = true;
+
+            boolean active = getIntent().getBooleanExtra(ActivityManageRule.intentNameTriggerParameter1, true);
+            chkProfileActive.setChecked(active);
+
+            try
+            {
+                String values[] = getIntent().getStringExtra(ActivityManageRule.intentNameTriggerParameter2).split(Trigger.triggerParameter2Split);
+                if(values.length >= 2)
+                {
+                    boolean checkSettings = Boolean.parseBoolean(values[0]);
+                    chkProfileCheckSettings.setChecked(checkSettings);
+
+                    String profileName = values[0];
+
+                    List<Profile> profileList = Profile.getProfileCollection();
+
+                    boolean found = false;
+
+                    for(int i = 0; i < profileList.size(); i++)
+                    {
+                        if(profileList.get(i).getName().equals(profileName))
+                        {
+                            spinnerProfiles.setSelection(i);
+                            found = true;
+                            break;
+                        }
+                    }
+
+                    if(!found)
+                        Miscellaneous.messageBox(getResources().getString(R.string.info), getResources().getString(R.string.profileWasNotFound), ActivityManageTriggerProfile.this).show();
+                }
+            }
+            catch(Exception e)
+            {
+                Toast.makeText(ActivityManageTriggerProfile.this, getResources().getString(R.string.triggerWrong), Toast.LENGTH_SHORT).show();
+                Miscellaneous.logEvent("e", "ActivityManageTriggerProfile", "There\'s something wrong with parameters. Content: " + getIntent().getStringExtra(ActivityManageRule.intentNameActionParameter2) + ", " + Log.getStackTraceString(e), 1);
+            }
+        }
+
+        bSaveTriggerProfile.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View v)
+            {
+                Intent returnData = new Intent();
+                returnData.putExtra(ActivityManageRule.intentNameTriggerParameter1, chkProfileActive.isChecked());
+                returnData.putExtra(ActivityManageRule.intentNameTriggerParameter2,
+                                spinnerProfiles.getSelectedItem().toString() + Trigger.triggerParameter2Split +
+                                chkProfileCheckSettings.isChecked());
+
+                setResult(RESULT_OK, returnData);
+                finish();
+            }
+        });
+    }
+
+    private void loadProfileItems()
+    {
+        try
+        {
+            if(spinnerProfiles.getAdapter() == null)
+                spinnerProfiles.setAdapter(profileSpinnerAdapter);
+
+            profileSpinnerAdapter.notifyDataSetChanged();
+        }
+        catch(NullPointerException e)
+        {
+            e.printStackTrace();
+        }
+    }
+}

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

@@ -35,6 +35,9 @@ import java.util.List;
 
 public class ActivityManageTriggerWifi extends Activity
 {
+    public final static String intentNameWifiState = "wifiState";
+    public final static String intentNameWifiName = "wifiName";
+
     RadioButton rbTriggerWifiConnected, rbTriggerWifiDisconnected;
     EditText etTriggerWifiName;
     Spinner spinnerWifiList;

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

@@ -3,7 +3,6 @@ package com.jens.automation2;
 import android.Manifest;
 import android.app.Activity;
 import android.app.AlertDialog;
-import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.admin.DevicePolicyManager;
 import android.content.ComponentName;
@@ -16,14 +15,13 @@ import android.content.res.Resources;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.PowerManager;
+import android.provider.Settings;
 import android.text.Html;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.core.app.NotificationManagerCompat;
 
 import com.jens.automation2.receivers.NotificationListener;
 
@@ -48,6 +46,7 @@ public class ActivityPermissions extends Activity
     private static final int requestCodeForPermissionsBackgroundLocation = 12045;
     private static final int requestCodeForPermissionsNotifications = 12046;
     private static final int requestCodeForPermissionsDeviceAdmin = 12047;
+    private static final int requestCodeForPermissionsBatteryOptimization = 12048;
     protected String[] specificPermissionsToRequest = null;
 
     public static String intentExtraName = "permissionsToBeRequested";
@@ -288,6 +287,12 @@ public class ActivityPermissions extends Activity
             {
                 return haveDeviceAdmin();
             }
+            else if (s.equals(Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS))
+            {
+                PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
+                String packageName = context.getApplicationContext().getPackageName();
+                return pm.isIgnoringBatteryOptimizations(packageName);
+            }
             else
             {
                 int res = context.checkCallingOrSelfPermission(s);
@@ -301,8 +306,7 @@ public class ActivityPermissions extends Activity
     public static boolean haveDeviceAdmin()
     {
         DevicePolicyManager deviceManger = (DevicePolicyManager)Miscellaneous.getAnyContext().getSystemService(Context.DEVICE_POLICY_SERVICE);
-//        ComponentName compName = new ComponentName(ActivityPermissions.getInstance(), DeviceAdmin.class ) ;
-        ComponentName compName = new ComponentName(Miscellaneous.getAnyContext(), DeviceAdmin.class) ;
+        ComponentName compName = new ComponentName(Miscellaneous.getAnyContext(), DeviceAdmin.class);
         boolean active = deviceManger.isAdminActive(compName);
         return active;
     }
@@ -311,11 +315,7 @@ public class ActivityPermissions extends Activity
     {
         if(!haveDeviceAdmin())
         {
-//            deviceManger.removeActiveAdmin(compName);
-//        }
-//        else
-//        {
-            DevicePolicyManager deviceManger = (DevicePolicyManager)Miscellaneous.getAnyContext().getSystemService(Context.DEVICE_POLICY_SERVICE);
+//            DevicePolicyManager deviceManger = (DevicePolicyManager)Miscellaneous.getAnyContext().getSystemService(Context.DEVICE_POLICY_SERVICE);
             ComponentName compName = new ComponentName(ActivityPermissions.getInstance(), DeviceAdmin.class) ;
 
             Intent intent = new Intent(DevicePolicyManager.ACTION_ADD_DEVICE_ADMIN );
@@ -341,47 +341,53 @@ public class ActivityPermissions extends Activity
             addToArrayListUnique("android.permission.RECEIVE_BOOT_COMPLETED", requiredPermissions);
         */
 
-//            if (!havePermission(ActivityPermissions.writeExternalStoragePermissionName, workingContext))
-//                addToArrayListUnique(ActivityPermissions.writeExternalStoragePermissionName, requiredPermissions);
-
             if(!havePermission(Manifest.permission.WRITE_SETTINGS, workingContext))
             {
                 for (Profile profile : Profile.getProfileCollection())
                 {
                     if (profile.changeIncomingCallsRingtone)
-                    {
                         addToArrayListUnique(Manifest.permission.WRITE_SETTINGS, requiredPermissions);
-                    }
                 }
             }
 
+            if(!havePermission(Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS, workingContext))
+                addToArrayListUnique(Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS, requiredPermissions);
+
+            for(Profile p : Profile.getProfileCollection())
+            {
+                if(p.changeIncomingCallsRingtone || p.changeNotificationRingtone)
+                    addToArrayListUnique(Manifest.permission.READ_EXTERNAL_STORAGE, requiredPermissions);
+            }
+
             if (!onlyGeneral)
             {
                 for (Rule rule : Rule.getRuleCollection())
                 {
                     for (String singlePermission : getPermissionsForRule(rule))
+                    {
                         if (!havePermission(singlePermission, workingContext))
                         {
-                            if(
+                            if (
 
                                     singlePermission.equalsIgnoreCase(Manifest.permission.ACCESS_BACKGROUND_LOCATION)
                                             ||
-                                            singlePermission.equalsIgnoreCase(Manifest.permission.ACCESS_FINE_LOCATION)
+                                    singlePermission.equalsIgnoreCase(Manifest.permission.ACCESS_FINE_LOCATION)
                                             ||
-                                            singlePermission.equalsIgnoreCase(Manifest.permission.ACCESS_COARSE_LOCATION)
+                                    singlePermission.equalsIgnoreCase(Manifest.permission.ACCESS_COARSE_LOCATION)
                             )
                             {
                                 if (!Miscellaneous.googleToBlameForLocation(true))
                                     addToArrayListUnique(singlePermission, requiredPermissions);
                             }
-                            else if(singlePermission.equalsIgnoreCase(Manifest.permission.ACTIVITY_RECOGNITION) || singlePermission.equalsIgnoreCase(permissionNameGoogleActivityDetection))
+                            else if (singlePermission.equalsIgnoreCase(Manifest.permission.ACTIVITY_RECOGNITION) || singlePermission.equalsIgnoreCase(permissionNameGoogleActivityDetection))
                             {
-                                if(!BuildConfig.FLAVOR.equalsIgnoreCase("fdroidFlavor"))
+                                if (!BuildConfig.FLAVOR.equalsIgnoreCase("fdroidFlavor"))
                                     addToArrayListUnique(singlePermission, requiredPermissions);
                             }
                             else
                                 addToArrayListUnique(singlePermission, requiredPermissions);
                         }
+                    }
                 }
             }
 
@@ -520,6 +526,9 @@ public class ActivityPermissions extends Activity
                         addToArrayListUnique(Manifest.permission.MODIFY_AUDIO_SETTINGS, requiredPermissions);
                         if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
                             addToArrayListUnique(Manifest.permission.ACCESS_NOTIFICATION_POLICY, requiredPermissions);
+                        Profile targetProfile = Profile.getByName(action.getParameter2());
+                        if(targetProfile.changeIncomingCallsRingtone || targetProfile.changeNotificationRingtone)
+                            addToArrayListUnique(Manifest.permission.READ_EXTERNAL_STORAGE, requiredPermissions);
                         break;
                     case disableScreenRotation:
                         addToArrayListUnique(Manifest.permission.WRITE_SETTINGS, requiredPermissions);
@@ -529,9 +538,13 @@ public class ActivityPermissions extends Activity
                         break;
                     case playMusic:
                         break;
+                    case controlMediaPlayback:
+//                        addToArrayListUnique(Manifest.permission.BIND_NOTIFICATION_LISTENER_SERVICE, requiredPermissions);
+//                        addToArrayListUnique(Manifest.permission.MEDIA_CONTENT_CONTROL, requiredPermissions);
+                        break;
                     case sendTextMessage:
                         addToArrayListUnique(Manifest.permission.SEND_SMS, requiredPermissions);
-                        checkPermissionsInVariableUse(action.getParameter2(), requiredPermissions);
+                        getPermissionsForVariablesInUse(action.getParameter2(), requiredPermissions);
                         break;
                     case setAirplaneMode:
                         addToArrayListUnique(Manifest.permission.WRITE_SETTINGS, requiredPermissions);
@@ -590,7 +603,7 @@ public class ActivityPermissions extends Activity
 //                            addToArrayListUnique("android.permission.TETHER_PRIVILEGED", requiredPermissions);
                         break;
                     case speakText:
-                        checkPermissionsInVariableUse(action.getParameter2(), requiredPermissions);
+                        getPermissionsForVariablesInUse(action.getParameter2(), requiredPermissions);
                         break;
                     case startOtherActivity:
                         if(
@@ -610,7 +623,7 @@ public class ActivityPermissions extends Activity
                         break;
                     case triggerUrl:
                         addToArrayListUnique(Manifest.permission.INTERNET, requiredPermissions);
-                        checkPermissionsInVariableUse(action.getParameter2(), requiredPermissions);
+                        getPermissionsForVariablesInUse(action.getParameter2(), requiredPermissions);
                         break;
                     case turnBluetoothOff:
                         addToArrayListUnique(Manifest.permission.BLUETOOTH_ADMIN, requiredPermissions);
@@ -651,6 +664,9 @@ public class ActivityPermissions extends Activity
                     case playSound:
                         addToArrayListUnique(Manifest.permission.READ_EXTERNAL_STORAGE, requiredPermissions);
                         break;
+                    case closeNotification:
+                        addToArrayListUnique(Manifest.permission.BIND_NOTIFICATION_LISTENER_SERVICE, requiredPermissions);
+                        break;
                     case turnScreenOnOrOff:
                         if(action.getParameter1())
                             addToArrayListUnique(Manifest.permission.WAKE_LOCK, requiredPermissions);
@@ -854,11 +870,40 @@ public class ActivityPermissions extends Activity
             case Manifest.permission.READ_EXTERNAL_STORAGE:
                 for(String ruleName : getRulesUsing(Action.Action_Enum.playSound))
                     usingElements.add(String.format(getResources().getString(R.string.ruleXrequiresThis), ruleName));
+
+                for(String ruleName : getRulesUsing(Action.Action_Enum.changeSoundProfile))
+                {
+                    Rule tempRule = Rule.getByName(ruleName);
+                    if(tempRule != null)
+                    {
+                        for (Action a : tempRule.getActionSet())
+                        {
+                            if (a.getAction().equals(Action.Action_Enum.changeSoundProfile))
+                            {
+                                Profile p = Profile.getByName(a.getParameter2());
+                                if (p.changeIncomingCallsRingtone || p.changeNotificationRingtone)
+                                    usingElements.add(String.format(getResources().getString(R.string.ruleXrequiresThis), ruleName));
+                            }
+                        }
+                    }
+                }
+
+                for(Profile p : Profile.getProfileCollection())
+                {
+                    if(p.changeIncomingCallsRingtone || p.changeNotificationRingtone)
+                    {
+                        usingElements.add(String.format(getResources().getString(R.string.profileXrequiresThis), p.getName()));
+                    }
+                }
+
                 break;
             case Manifest.permission.BIND_DEVICE_ADMIN:
                 for(String ruleName : getRulesUsing(Action.Action_Enum.turnScreenOnOrOff))
                     usingElements.add(String.format(getResources().getString(R.string.ruleXrequiresThis), ruleName));
                 break;
+            case Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS:
+                usingElements.add(getResources().getString(R.string.recommendedForBetterReliability));
+                break;
         }
 
         return usingElements;
@@ -885,6 +930,7 @@ public class ActivityPermissions extends Activity
                         requestPermissions(cachedPermissionsToRequest, true);
                 }
             }
+
             if (requestCode == requestCodeForPermissionsDeviceAdmin)
             {
                 NotificationManager mNotificationManager = (NotificationManager) ActivityPermissions.this.getSystemService(Context.NOTIFICATION_SERVICE);
@@ -905,6 +951,10 @@ public class ActivityPermissions extends Activity
             if (requestCode == requestCodeForPermissionsNotifications)
                 if(havePermission(Manifest.permission.BIND_NOTIFICATION_LISTENER_SERVICE, ActivityPermissions.this))
                     requestPermissions(cachedPermissionsToRequest, true);
+
+            if (requestCode == requestCodeForPermissionsBatteryOptimization)
+                if(havePermission(Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS, ActivityPermissions.this))
+                    requestPermissions(cachedPermissionsToRequest, true);
         }
     }
 
@@ -974,10 +1024,20 @@ public class ActivityPermissions extends Activity
                     {
                         requiredPermissions.remove(s);
                         cachedPermissionsToRequest = requiredPermissions;
-                        Intent intent = new Intent("android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS");
+                        Intent intent = new Intent(Settings.ACTION_NOTIFICATION_LISTENER_SETTINGS);
                         startActivityForResult(intent, requestCodeForPermissionsNotifications);
                         return;
                     }
+                    else if(s.equals(Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS))
+                    {
+                        requiredPermissions.remove(s);
+                        cachedPermissionsToRequest = requiredPermissions;
+                        String packageName = getApplicationContext().getPackageName();
+                        Intent intent = new Intent(android.provider.Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
+                        intent.setData(Uri.parse("package:" + packageName));
+                        startActivityForResult(intent, requestCodeForPermissionsBatteryOptimization);
+                        return;
+                    }
                     else if (s.equalsIgnoreCase(Manifest.permission.ACCESS_BACKGROUND_LOCATION) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
                     {
                         AlertDialog dialog = Miscellaneous.messageBox(getResources().getString(R.string.readLocation), getResources().getString(R.string.pleaseGiveBgLocation), ActivityPermissions.this);
@@ -1134,7 +1194,7 @@ public class ActivityPermissions extends Activity
         }
     }
 
-    static ArrayList<String> checkPermissionsInVariableUse(String text, ArrayList<String> permsList)
+    static ArrayList<String> getPermissionsForVariablesInUse(String text, ArrayList<String> permsList)
     {
         /*
              [uniqueid]

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

@@ -41,8 +41,14 @@ public class AutomationService extends Service implements OnInitListener
 	protected final static int notificationIdRestrictions = 1005;
 	protected final static int notificationIdLocationRestriction = 1006;
 
-	final static String NOTIFICATION_CHANNEL_ID = "com.jens.automation2";
-	final static String channelName = "Service notification";
+	final static String NOTIFICATION_CHANNEL_ID_SERVICE = "com.jens.automation2_service";
+	final static String NOTIFICATION_CHANNEL_NAME_SERVICE = "Service notification";
+
+	final static String NOTIFICATION_CHANNEL_ID_FUNCTIONALITY = "com.jens.automation2_functionality";
+	final static String NOTIFICATION_CHANNEL_NAME_FUNCTIONALITY = "Functionality information";
+
+	final static String NOTIFICATION_CHANNEL_ID_RULES = "com.jens.automation2_rules";
+	final static String NOTIFICATION_CHANNEL_NAME_RULES = "Rule notifications";
 
 	protected static Notification myNotification;
 	protected static NotificationCompat.Builder notificationBuilder = null;
@@ -65,7 +71,6 @@ public class AutomationService extends Service implements OnInitListener
 			lockSoundChangesEnd = Calendar.getInstance();
 
 		lockSoundChangesEnd.add(Calendar.MINUTE, Settings.lockSoundChangesInterval);
-//		ActivityMainScreen.getActivityMainScreenInstance().updateMainScreen();
 	}
 
 	public void checkLockSoundChangesTimeElapsed()
@@ -109,18 +114,6 @@ public class AutomationService extends Service implements OnInitListener
 
 	public boolean checkStartupRequirements(Context context, boolean startAtBoot)
 	{
-//		if (!ActivityPermissions.havePermission(ActivityPermissions.writeExternalStoragePermissionName, AutomationService.this))
-//		{
-//			/*
-//				Don't have permission to access external storage. This is a show stopper as
-//				the configuration file is stored on external storage.
-//			 */
-//			Miscellaneous.logEvent("e", "Permission", "Don't have permission to access external storage. Will request it now.", 4);
-////			Toast.makeText(AutomationService.this, getResources().getString(R.string.appRequiresPermissiontoAccessExternalStorage), Toast.LENGTH_LONG).show();
-//			ActivityPermissions.requestSpecificPermission(ActivityPermissions.writeExternalStoragePermissionName);
-//			return false;
-//		}
-
 		if(Build.VERSION.SDK_INT >= 28)
 		{
 			if (!ActivityPermissions.havePermission(Manifest.permission.FOREGROUND_SERVICE, AutomationService.this))
@@ -135,10 +128,15 @@ public class AutomationService extends Service implements OnInitListener
 			}
 		}
 
-		if (PointOfInterest.getPointOfInterestCollection() == null | PointOfInterest.getPointOfInterestCollection().size() == 0
-				|
-				Rule.getRuleCollection() == null | Rule.getRuleCollection().size() == 0
-				)
+		if (
+				PointOfInterest.getPointOfInterestCollection() == null
+							||
+				PointOfInterest.getPointOfInterestCollection().size() == 0
+							||
+				Rule.getRuleCollection() == null
+							||
+				Rule.getRuleCollection().size() == 0
+			)
 		{
 			if (startAtBoot)
 			{
@@ -173,7 +171,7 @@ public class AutomationService extends Service implements OnInitListener
 		}
 
 		//if still no POIs...
-		if (Rule.getRuleCollection() == null | Rule.getRuleCollection().size() == 0)
+		if (Rule.getRuleCollection() == null || Rule.getRuleCollection().size() == 0)
 		{
 			Miscellaneous.logEvent("w", "AutomationService", context.getResources().getString(R.string.serviceWontStart), 1);
 			Toast.makeText(context, context.getResources().getString(R.string.serviceWontStart), Toast.LENGTH_LONG).show();
@@ -199,13 +197,13 @@ public class AutomationService extends Service implements OnInitListener
 		if (checkStartupRequirements(this, startAtBoot))
 		{
 			Miscellaneous.logEvent("i", "Service", this.getResources().getString(R.string.logServiceStarting) + " VERSION_CODE: " + BuildConfig.VERSION_CODE + ", VERSION_NAME: " + BuildConfig.VERSION_NAME + ", flavor: " + BuildConfig.FLAVOR, 1);
-			Miscellaneous.logEvent("i", "Service", ActivityMaintenance.getSystemInfo(), 1);
+			Miscellaneous.logEvent("i", "Service", ActivityControlCenter.getSystemInfo(), 1);
 
 			startUpRoutine();
 
 			Intent myIntent = new Intent(this, ActivityMainTabLayout.class);
 			myPendingIntent = PendingIntent.getActivity(this, 0, myIntent, 0);
-			notificationBuilder = createDefaultNotificationBuilder();
+			notificationBuilder = createServiceNotificationBuilder();
 
 			updateNotification();
 
@@ -220,7 +218,14 @@ public class AutomationService extends Service implements OnInitListener
 //			Actions.setData(true);
 			// ********** Test area **********
 
-			return START_STICKY;
+			/*
+				On normal phones the app is supposed to automatically restart in case of any problems.
+				In the emulator we want it to stop to be able to better pinpoint the root cause.
+			 */
+			if(Miscellaneous.isAndroidEmulator())
+				return START_NOT_STICKY;
+			else
+				return START_STICKY;
 		}
 		else
 		{
@@ -316,12 +321,18 @@ public class AutomationService extends Service implements OnInitListener
 		checkForMissingBackgroundLocationPermission();
 
 		Actions.context = this;
-		Actions.autoMationServerRef = this;
+		Actions.automationServerRef = this;
 
 		startLocationProvider();
 		ReceiverCoordinator.startAllReceivers();
 
 		PackageReplacedReceiver.setHasServiceBeenRunning(true, this);
+
+		for(Rule r : Rule.getRuleCollection())
+		{
+			if(r.getsGreenLight(AutomationService.this))
+				r.activate(AutomationService.this, false);
+		}
 	}
 
 	protected void startLocationProvider()
@@ -365,9 +376,9 @@ public class AutomationService extends Service implements OnInitListener
 				Miscellaneous.logEvent("w", "Features disabled", "Features disabled because of rule " + rule, 5);
 
 				if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1)
-					Miscellaneous.createDismissableNotificationWithDelay(1010, getResources().getString(R.string.featuresDisabled), ActivityPermissions.notificationIdPermissions, pi);
+					Miscellaneous.createDismissibleNotificationWithDelay(1010, null, getResources().getString(R.string.featuresDisabled), ActivityPermissions.notificationIdPermissions, AutomationService.NOTIFICATION_CHANNEL_ID_SERVICE, pi);
 				else
-					Miscellaneous.createDismissableNotification(getResources().getString(R.string.featuresDisabled), ActivityPermissions.notificationIdPermissions, pi);
+					Miscellaneous.createDismissibleNotification(null, getResources().getString(R.string.featuresDisabled), ActivityPermissions.notificationIdPermissions, false, AutomationService.NOTIFICATION_CHANNEL_ID_SERVICE, pi);
 			}
 		}
 	}
@@ -389,9 +400,9 @@ public class AutomationService extends Service implements OnInitListener
 				Miscellaneous.logEvent("w", "Features disabled", "Background location disabled because Google to blame.", 5);
 
 				if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1)
-					Miscellaneous.createDismissableNotificationWithDelay(3300, getResources().getString(R.string.featuresDisabled), notificationIdRestrictions, pi);
+					Miscellaneous.createDismissibleNotificationWithDelay(3300, null, getResources().getString(R.string.featuresDisabled), notificationIdRestrictions, AutomationService.NOTIFICATION_CHANNEL_ID_SERVICE, pi);
 				else
-					Miscellaneous.createDismissableNotification(getResources().getString(R.string.featuresDisabled), notificationIdRestrictions, pi);
+					Miscellaneous.createDismissibleNotification(null, getResources().getString(R.string.featuresDisabled), notificationIdRestrictions, false, AutomationService.NOTIFICATION_CHANNEL_ID_SERVICE, pi);
 			}
 		}
 	}
@@ -411,9 +422,9 @@ public class AutomationService extends Service implements OnInitListener
 			Miscellaneous.logEvent("w", "Features disabled", "Background location disabled because Google to blame.", 5);
 
 			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1)
-				Miscellaneous.createDismissableNotificationWithDelay(2200, getResources().getString(R.string.featuresDisabled), notificationIdLocationRestriction, pi);
+				Miscellaneous.createDismissibleNotificationWithDelay(2200, null, getResources().getString(R.string.featuresDisabled), notificationIdLocationRestriction, AutomationService.NOTIFICATION_CHANNEL_ID_SERVICE, pi);
 			else
-				Miscellaneous.createDismissableNotification(getResources().getString(R.string.featuresDisabled), notificationIdLocationRestriction, pi);
+				Miscellaneous.createDismissibleNotification(null, getResources().getString(R.string.featuresDisabled), notificationIdLocationRestriction, false, AutomationService.NOTIFICATION_CHANNEL_ID_SERVICE, pi);
 		}
 	}
 
@@ -482,7 +493,7 @@ public class AutomationService extends Service implements OnInitListener
 		return builder;
 	}
 	
-	protected static NotificationCompat.Builder createDefaultNotificationBuilder()
+	protected static NotificationCompat.Builder createServiceNotificationBuilder()
 	{
 		NotificationManager mNotificationManager = (NotificationManager) AutomationService.getInstance().getSystemService(Context.NOTIFICATION_SERVICE);
 
@@ -490,14 +501,14 @@ public class AutomationService extends Service implements OnInitListener
 
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
 		{
-			NotificationChannel chan = new NotificationChannel(NOTIFICATION_CHANNEL_ID, channelName, NotificationManager.IMPORTANCE_LOW);
-//			chan.setLightColor(Color.BLUE);
-			chan.enableVibration(false);
-			chan.setSound(null, null);
-			chan.setLockscreenVisibility(Notification.VISIBILITY_PRIVATE);
-			mNotificationManager.createNotificationChannel(chan);
+			NotificationChannel channel = Miscellaneous.getNotificationChannel(AutomationService.NOTIFICATION_CHANNEL_ID_SERVICE);
+//			channel.setLightColor(Color.BLUE);
+			channel.enableVibration(false);
+			channel.setSound(null, null);
+			channel.setLockscreenVisibility(Notification.VISIBILITY_PRIVATE);
+			mNotificationManager.createNotificationChannel(channel);
 
-			builder = new NotificationCompat.Builder(AutomationService.getInstance(), NOTIFICATION_CHANNEL_ID);
+			builder = new NotificationCompat.Builder(AutomationService.getInstance(), NOTIFICATION_CHANNEL_ID_SERVICE);
 		}
 		else
 			builder = new NotificationCompat.Builder(AutomationService.getInstance());
@@ -576,7 +587,7 @@ public class AutomationService extends Service implements OnInitListener
 			String textToDisplay = bodyText + " " + lastRuleString;
 
 			if(notificationBuilder == null)
-					notificationBuilder = createDefaultNotificationBuilder();
+					notificationBuilder = createServiceNotificationBuilder();
 
 			notificationBuilder.setContentText(textToDisplay);
 			notificationBuilder.setStyle(new NotificationCompat.BigTextStyle().bigText(textToDisplay));

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

@@ -8,7 +8,7 @@ import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
-import android.content.ContentProvider;
+import android.content.ContentUris;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -16,6 +16,8 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.database.Cursor;
+import android.media.AudioAttributes;
+import android.media.RingtoneManager;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.Uri;
@@ -23,6 +25,7 @@ import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Environment;
 import android.os.IBinder;
+import android.provider.DocumentsContract;
 import android.provider.MediaStore;
 import android.provider.Settings.Secure;
 import android.telephony.PhoneNumberUtils;
@@ -72,8 +75,10 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.security.DigestInputStream;
 import java.security.KeyManagementException;
 import java.security.KeyStore;
+import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
@@ -83,7 +88,10 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.List;
+import java.util.Locale;
 import java.util.Scanner;
+import java.util.Set;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 import java.util.zip.ZipOutputStream;
@@ -98,13 +106,10 @@ import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
+import androidx.annotation.RequiresApi;
 import androidx.core.app.NotificationCompat;
 import androidx.documentfile.provider.DocumentFile;
 
-import static android.provider.CalendarContract.CalendarCache.URI;
-import static com.jens.automation2.AutomationService.NOTIFICATION_CHANNEL_ID;
-import static com.jens.automation2.AutomationService.channelName;
-
 public class Miscellaneous extends Service
 {
 	protected static String writeableFolderStringCache = null;
@@ -216,7 +221,15 @@ public class Miscellaneous extends Service
         return null;
 	}
 
-	@Override
+    public static int boolToInt(boolean input)
+    {
+    	if(input)
+    		return 1;
+    	else
+    		return 0;
+    }
+
+    @Override
 	public IBinder onBind(Intent arg0)
 	{
 		// TODO Auto-generated method stub
@@ -623,27 +636,43 @@ public class Miscellaneous extends Service
 
 		if(source.contains("[notificationTitle]"))
 		{
-			String notificationTitle = NotificationListener.getLastNotification().getTitle();
+			if(NotificationListener.getLastNotification() != null)
+			{
+				String notificationTitle = NotificationListener.getLastNotification().getTitle();
 
-			if(notificationTitle != null && notificationTitle.length() > 0)
-				source = source.replace("[notificationTitle]", notificationTitle);
+				if (notificationTitle != null && notificationTitle.length() > 0)
+					source = source.replace("[notificationTitle]", notificationTitle);
+				else
+				{
+					source = source.replace("[notificationTitle]", "notificationTitle unknown");
+					Miscellaneous.logEvent("w", "Variable replacement", "notificationTitle was empty.", 3);
+				}
+			}
 			else
 			{
-				source = source.replace("notificationTitle unknown", notificationTitle);
-				Miscellaneous.logEvent("w", "Variable replacement", "notificationTitle was empty.", 3);
+				source = source.replace("[notificationTitle]", "notificationTitle unknown");
+				Miscellaneous.logEvent("w", "Variable replacement", "lastNotification was empty.", 3);
 			}
 		}
 
 		if(source.contains("[notificationText]"))
 		{
-			String notificationText = NotificationListener.getLastNotification().getText();
+			if(NotificationListener.getLastNotification() != null)
+			{
+				String notificationText = NotificationListener.getLastNotification().getText();
 
-			if(notificationText != null && notificationText.length() > 0)
-				source = source.replace("[notificationText]", notificationText);
+				if (notificationText != null && notificationText.length() > 0)
+					source = source.replace("[notificationText]", notificationText);
+				else
+				{
+					source = source.replace("[notificationText]", "notificationText unknown");
+					Miscellaneous.logEvent("w", "Variable replacement", "notificationText was empty.", 3);
+				}
+			}
 			else
 			{
-				source = source.replace("notificationText unknown", notificationText);
-				Miscellaneous.logEvent("w", "Variable replacement", "notificationText was empty.", 3);
+				source = source.replace("[notificationText]", "notificationText unknown");
+				Miscellaneous.logEvent("w", "Variable replacement", "lastNotification was empty.", 3);
 			}
 		}
 		
@@ -869,7 +898,7 @@ public class Miscellaneous extends Service
 
 	@SuppressLint("NewApi")
 	@SuppressWarnings("deprecation")
-	public static void createDismissableNotificationWithDelay(long delay, String textToDisplay, int notificationId, PendingIntent pendingIntent)
+	public static void createDismissibleNotificationWithDelay(long delay, String title, String textToDisplay, int notificationId, String notificationChannelId, PendingIntent pendingIntent)
 	{
 		/*
 			Now what's this about?
@@ -895,7 +924,7 @@ public class Miscellaneous extends Service
 				catch(Exception e)
 				{}
 
-				createDismissableNotification(textToDisplay, notificationId, pendingIntent);
+				createDismissibleNotification(title, textToDisplay, notificationId, true, notificationChannelId, pendingIntent);
 
 				return null;
 			}
@@ -916,40 +945,88 @@ public class Miscellaneous extends Service
 
 	@SuppressLint("NewApi")
 	@SuppressWarnings("deprecation")
-	public static void createDismissableNotification(String textToDisplay, int notificationId, PendingIntent pendingIntent)
+	public static void createDismissibleNotification(String title, String textToDisplay, int notificationId, boolean vibrate, String notificationChannelId, PendingIntent pendingIntent)
 	{
 		if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
 		{
-			createDismissableNotificationSdk26(textToDisplay, notificationId, pendingIntent);
+			createDismissibleNotificationSdk26(title, textToDisplay, notificationId, vibrate, notificationChannelId, pendingIntent);
 			return;
 		}
 
 		NotificationManager mNotificationManager = (NotificationManager) Miscellaneous.getAnyContext().getSystemService(Context.NOTIFICATION_SERVICE);
 
-		NotificationCompat.Builder dismissableNotificationBuilder = createDismissableNotificationBuilder(pendingIntent);
-		dismissableNotificationBuilder.setContentText(textToDisplay);
-		dismissableNotificationBuilder.setContentIntent(pendingIntent);
-		dismissableNotificationBuilder.setStyle(new NotificationCompat.BigTextStyle().bigText(textToDisplay));
-		dismissableNotificationBuilder.setAutoCancel(true);
+		NotificationCompat.Builder dismissibleNotificationBuilder = createDismissibleNotificationBuilder(vibrate, notificationChannelId, pendingIntent);
 
-		Notification dismissableNotification = dismissableNotificationBuilder.build();
+		if(title == null)
+			dismissibleNotificationBuilder.setContentTitle(AutomationService.getInstance().getResources().getString(R.string.app_name));
+		else
+			dismissibleNotificationBuilder.setContentTitle(title);
 
-		mNotificationManager.notify(notificationId, dismissableNotification);
+		dismissibleNotificationBuilder.setContentText(textToDisplay);
+		dismissibleNotificationBuilder.setContentIntent(pendingIntent);
+		dismissibleNotificationBuilder.setStyle(new NotificationCompat.BigTextStyle().bigText(textToDisplay));
+		dismissibleNotificationBuilder.setAutoCancel(true);
 
-				/*NotificationCompat.Builder mBuilder =   new NotificationCompat.Builder(this)
-						.setSmallIcon(R.drawable.ic_launcher) // notification icon
-						.setContentTitle("Notification!") // title for notification
-						.setContentText("Hello word") // message for notification
-						.setAutoCancel(true); // clear notification after click
-				Intent intent = new Intent(this, MainActivity.class);
-				PendingIntent pi = PendingIntent.getActivity(this,0,intent,Intent.FLAG_ACTIVITY_NEW_TASK);
-				mBuilder.setContentIntent(pi);
-				NotificationManager mNotificationManager =
-						(NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
-				mNotificationManager.notify(0, dismissableNotification);*/
+		if(notificationChannelId.equals(AutomationService.NOTIFICATION_CHANNEL_ID_RULES))
+			dismissibleNotificationBuilder.setSmallIcon(R.drawable.info);
+
+		Notification dismissibleNotification = dismissibleNotificationBuilder.build();
+
+		mNotificationManager.notify(notificationId, dismissibleNotification);
 	}
 
-	static void createDismissableNotificationSdk26(String textToDisplay, int notificationId, PendingIntent pendingIntent)
+	@RequiresApi(api = Build.VERSION_CODES.O)
+	static NotificationChannel findExistingChannel(List<NotificationChannel> channels, String channelId)
+	{
+		for(NotificationChannel c : channels)
+		{
+			if(c.getId().equals(channelId))
+				return c;
+		}
+
+		return null;
+	}
+	@RequiresApi(api = Build.VERSION_CODES.O)
+	static NotificationChannel getNotificationChannel(String channelId)
+	{
+		NotificationManager nm = (NotificationManager) Miscellaneous.getAnyContext().getSystemService(Context.NOTIFICATION_SERVICE);
+		List<NotificationChannel> channels = nm.getNotificationChannels();
+
+		if(!Settings.hasBeenDone(Settings.constNotificationChannelCleanupApk118) && BuildConfig.VERSION_CODE < 120)
+		{
+			// Perform a one-time cleanup of notification channels as they have been redesigned.
+
+			for(NotificationChannel c : channels)
+				nm.deleteNotificationChannel(c.getId());
+
+			Settings.considerDone(Settings.constNotificationChannelCleanupApk118);
+			Settings.writeSettings(Miscellaneous.getAnyContext());
+		}
+
+		NotificationChannel channel = findExistingChannel(channels, channelId);
+
+		if(channel == null)
+		{
+			switch (channelId)
+			{
+				case AutomationService.NOTIFICATION_CHANNEL_ID_SERVICE:
+					channel = new NotificationChannel(AutomationService.NOTIFICATION_CHANNEL_ID_SERVICE, AutomationService.NOTIFICATION_CHANNEL_NAME_SERVICE, NotificationManager.IMPORTANCE_LOW);
+					break;
+				case AutomationService.NOTIFICATION_CHANNEL_ID_FUNCTIONALITY:
+					channel = new NotificationChannel(AutomationService.NOTIFICATION_CHANNEL_ID_FUNCTIONALITY, AutomationService.NOTIFICATION_CHANNEL_NAME_FUNCTIONALITY, NotificationManager.IMPORTANCE_HIGH);
+					break;
+				case AutomationService.NOTIFICATION_CHANNEL_ID_RULES:
+					channel = new NotificationChannel(AutomationService.NOTIFICATION_CHANNEL_ID_RULES, AutomationService.NOTIFICATION_CHANNEL_NAME_RULES, NotificationManager.IMPORTANCE_HIGH);
+					break;
+				default:
+					break;
+			}
+		}
+
+		return channel;
+	}
+
+	static void createDismissibleNotificationSdk26(String title, String textToDisplay, int notificationId, boolean vibrate, String notificationChannelId, PendingIntent pendingIntent)
 	{
 		NotificationManager mNotificationManager = (NotificationManager) AutomationService.getInstance().getSystemService(Context.NOTIFICATION_SERVICE);
 
@@ -957,29 +1034,44 @@ public class Miscellaneous extends Service
 
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
 		{
-			NotificationChannel chan = new NotificationChannel(NOTIFICATION_CHANNEL_ID, "Functionality warnings", NotificationManager.IMPORTANCE_HIGH);
-//			chan.setLightColor(Color.BLUE);
-			chan.enableVibration(false);
-//			chan.setSound(null, null);
-			chan.setLockscreenVisibility(Notification.VISIBILITY_PRIVATE);
-			mNotificationManager.createNotificationChannel(chan);
+			NotificationChannel notificationChannel = getNotificationChannel(notificationChannelId);
+//			notificationChannel.setLightColor(Color.BLUE);
+			notificationChannel.enableVibration(vibrate);
+			try
+			{
+				Uri notificationSound = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION);
+//				Uri notificationSound = Uri.parse(ContentResolver.SCHEME_ANDROID_RESOURCE+ "://" +mContext.getPackageName()+"/"+R.raw.apple_ring));
+//				Ringtone r = RingtoneManager.getRingtone(Miscellaneous.getAnyContext(), notification);
+				AudioAttributes.Builder b = new AudioAttributes.Builder();
+				b.setContentType(AudioAttributes.CONTENT_TYPE_UNKNOWN);
+				notificationChannel.setSound(notificationSound, b.build());
+			}
+			catch (Exception e)
+			{
+				Miscellaneous.logEvent("i", "Notification", Log.getStackTraceString(e), 2);
+			}
+			notificationChannel.setLockscreenVisibility(Notification.VISIBILITY_PRIVATE);
+			mNotificationManager.createNotificationChannel(notificationChannel);
 
-			builder = new NotificationCompat.Builder(AutomationService.getInstance(), NOTIFICATION_CHANNEL_ID);
+			builder = new NotificationCompat.Builder(AutomationService.getInstance(), notificationChannel.getId());
 		}
 		else
 			builder = new NotificationCompat.Builder(AutomationService.getInstance());
 
-//		if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
-//			builder.setCategory(Notification.CATEGORY_SERVICE);
-
 		builder.setWhen(System.currentTimeMillis());
 		builder.setContentIntent(pendingIntent);
 
-		builder.setContentTitle(AutomationService.getInstance().getResources().getString(R.string.app_name));
+		if(title == null)
+			builder.setContentTitle(AutomationService.getInstance().getResources().getString(R.string.app_name));
+		else
+			builder.setContentTitle(title);
+
 		builder.setOnlyAlertOnce(true);
 
-		if(Settings.showIconWhenServiceIsRunning)
+		if(Settings.showIconWhenServiceIsRunning && notificationChannelId.equals(AutomationService.NOTIFICATION_CHANNEL_ID_SERVICE))
 			builder.setSmallIcon(R.drawable.ic_launcher);
+		else if(!notificationChannelId.equals(AutomationService.NOTIFICATION_CHANNEL_ID_SERVICE))
+			builder.setSmallIcon(R.drawable.info);
 
 		builder.setContentText(textToDisplay);
 		builder.setStyle(new NotificationCompat.BigTextStyle().bigText(textToDisplay));
@@ -987,7 +1079,6 @@ public class Miscellaneous extends Service
 		NotificationManager notificationManager = (NotificationManager) Miscellaneous.getAnyContext().getSystemService(Context.NOTIFICATION_SERVICE);
 		notificationManager.notify(1, builder.build());
 
-
 //		Intent notifyIntent = new Intent(context, notification.class);
 //		notifyIntent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
 //
@@ -1009,7 +1100,7 @@ public class Miscellaneous extends Service
 //		notificationManager.notify(1, notification);
 	}
 
-	protected static NotificationCompat.Builder createDismissableNotificationBuilder(PendingIntent myPendingIntent)
+	protected static NotificationCompat.Builder createDismissibleNotificationBuilder(boolean vibrate, String notificationChannelId, PendingIntent myPendingIntent)
 	{
 		NotificationManager mNotificationManager = (NotificationManager) AutomationService.getInstance().getSystemService(Context.NOTIFICATION_SERVICE);
 
@@ -1017,14 +1108,14 @@ public class Miscellaneous extends Service
 
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
 		{
-			NotificationChannel chan = new NotificationChannel(NOTIFICATION_CHANNEL_ID, channelName, NotificationManager.IMPORTANCE_HIGH);
-//			chan.setLightColor(Color.BLUE);
-//			chan.enableVibration(false);
-//			chan.setSound(null, null);
-			chan.setLockscreenVisibility(Notification.VISIBILITY_PRIVATE);
-			mNotificationManager.createNotificationChannel(chan);
+			NotificationChannel notificationChannel = getNotificationChannel(notificationChannelId);
+//			notificationChannel.setLightColor(Color.BLUE);
+			notificationChannel.enableVibration(vibrate);
+//			notificationChannel.setSound(null, null);
+			notificationChannel.setLockscreenVisibility(Notification.VISIBILITY_PRIVATE);
+			mNotificationManager.createNotificationChannel(notificationChannel);
 
-			builder = new NotificationCompat.Builder(AutomationService.getInstance(), NOTIFICATION_CHANNEL_ID);
+			builder = new NotificationCompat.Builder(AutomationService.getInstance(), notificationChannelId);
 		}
 		else
 			builder = new NotificationCompat.Builder(AutomationService.getInstance());
@@ -1065,6 +1156,23 @@ public class Miscellaneous extends Service
 			return "";
 	}
 
+	public static String explode(String glue, String[] inputArray)
+	{
+		if(inputArray != null)
+		{
+			StringBuilder builder = new StringBuilder();
+			for (String s : inputArray)
+				builder.append(s + glue);
+
+			if (builder.length() > 0)
+				builder.delete(builder.length() - glue.length(), builder.length());
+
+			return builder.toString();
+		}
+		else
+			return "";
+	}
+
 	public static boolean isGooglePlayInstalled(Context context)
 	{
 //		return false;
@@ -1085,7 +1193,8 @@ public class Miscellaneous extends Service
 
 	public static double round(double value, int places)
 	{
-		if (places < 0) throw new IllegalArgumentException();
+		if (places < 0)
+			throw new IllegalArgumentException();
 
 		BigDecimal bd = new BigDecimal(Double.toString(value));
 		bd = bd.setScale(places, RoundingMode.HALF_UP);
@@ -1097,7 +1206,7 @@ public class Miscellaneous extends Service
 		Cursor cursor = null;
 		try
 		{
-			String[] proj = { MediaStore.Images.Media.DATA };
+			String[] proj = { MediaStore.Images.Media.DATA, MediaStore.Audio.Media.DATA };
 			cursor = context.getContentResolver().query(contentUri,  proj, null, null, null);
 			int column_index = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
 			cursor.moveToFirst();
@@ -1117,6 +1226,114 @@ public class Miscellaneous extends Service
 		}
 	}
 
+	public static String getRealPathFromURI2(final Context context, final Uri uri)
+	{
+		final boolean isKitKat = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;
+
+		// DocumentProvider
+		if (isKitKat && DocumentsContract.isDocumentUri(context, uri))
+		{
+			// ExternalStorageProvider
+			if (isExternalStorageDocument(uri))
+			{
+				final String docId = DocumentsContract.getDocumentId(uri);
+				final String[] split = docId.split(":");
+				final String type = split[0];
+
+				if ("primary".equalsIgnoreCase(type))
+				{
+					return Environment.getExternalStorageDirectory() + "/" + split[1];
+				}
+			}
+			// DownloadsProvider
+			else if (isDownloadsDocument(uri))
+			{
+
+				final String id = DocumentsContract.getDocumentId(uri);
+				final Uri contentUri = ContentUris.withAppendedId(Uri.parse("content://downloads/public_downloads"), Long.valueOf(id));
+
+				return getDataColumn(context, contentUri, null, null);
+			}
+			// MediaProvider
+			else if (isMediaDocument(uri))
+			{
+				final String docId = DocumentsContract.getDocumentId(uri);
+				final String[] split = docId.split(":");
+				final String type = split[0];
+
+				Uri contentUri = null;
+				if ("image".equals(type))
+				{
+					contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
+				}
+				else if ("video".equals(type))
+				{
+					contentUri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI;
+				}
+				else if ("audio".equals(type))
+				{
+					contentUri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI;
+				}
+
+				final String selection = "_id=?";
+				final String[] selectionArgs = new String[] { split[1] };
+
+				return getDataColumn(context, contentUri, selection, selectionArgs);
+			}
+		}
+		// MediaStore (and general)
+		else if ("content".equalsIgnoreCase(uri.getScheme()))
+		{
+			return getDataColumn(context, uri, null, null);
+		}
+		// File
+		else if ("file".equalsIgnoreCase(uri.getScheme()))
+		{
+			return uri.getPath();
+		}
+
+		return null;
+	}
+
+	public static String getDataColumn(Context context, Uri uri, String selection, String[] selectionArgs)
+	{
+		Cursor cursor = null;
+		final String column = "_data";
+		final String[] projection = { column };
+
+		try
+		{
+			cursor = context.getContentResolver().query(uri, projection, selection, selectionArgs,
+					null);
+			if (cursor != null && cursor.moveToFirst())
+			{
+				final int column_index = cursor.getColumnIndexOrThrow(column);
+				return cursor.getString(column_index);
+			}
+		}
+		finally
+		{
+			if (cursor != null)
+				cursor.close();
+		}
+		return null;
+	}
+
+	public static boolean isExternalStorageDocument(Uri uri)
+	{
+		return "com.android.externalstorage.documents".equals(uri.getAuthority());
+	}
+
+	public static boolean isDownloadsDocument(Uri uri)
+	{
+		return "com.android.providers.downloads.documents".equals(uri.getAuthority());
+	}
+
+	public static boolean isMediaDocument(Uri uri)
+	{
+		return "com.android.providers.media.documents".equals(uri.getAuthority());
+	}
+
 	public static Method getClassMethodReflective(String className, String methodName)
 	{
 		Class foundClass = null;
@@ -1568,4 +1785,117 @@ public class Miscellaneous extends Service
 
 		return formattedDate;
 	}
+
+	public static boolean arraySearch(String[] haystack, String needle, boolean caseSensitive, boolean matchFullLine)
+	{
+		if(matchFullLine)
+		{
+			if(caseSensitive)
+			{
+				for (String s : haystack)
+				{
+					if (s.equals(needle))
+						return true;
+				}
+			}
+			else
+			{
+				for (String s : haystack)
+				{
+					if (s.toLowerCase().equals(needle.toLowerCase()))
+						return true;
+				}
+			}
+		}
+		else
+		{
+			if(caseSensitive)
+			{
+				for (String s : haystack)
+				{
+					if (s.contains(needle))
+						return true;
+				}
+			}
+			else
+			{
+				for (String s : haystack)
+				{
+					if (s.toLowerCase().contains(needle.toLowerCase()))
+						return true;
+				}
+			}
+		}
+
+		return false;
+	}
+
+	public static boolean arraySearch(ArrayList<String> requestList, String needle, boolean caseSensitive, boolean matchFullLine)
+	{
+		return arraySearch(requestList.toArray(new String[requestList.size()]), needle, caseSensitive, matchFullLine);
+	}
+
+	/**
+	 * Get ISO 3166-1 alpha-2 country code for this device (or null if not available)
+	 * @param context Context reference to get the TelephonyManager instance from
+	 * @return country code or null
+	 */
+	public static String getUserCountry(Context c